ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.468 by root, Thu Jan 8 19:23:44 2009 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
205from wherever your confdir points to. 233from wherever your confdir points to.
206 234
207=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
208 236
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
213=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
214 247
215This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 250that call.
218 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
219=back 258=back
220 259
221=cut 260=cut
222 261
223BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 269 my $msg = join "", @_;
226 270
227 $msg .= "\n" 271 $msg .= "\n"
228 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
229 273
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 275
232 LOG llevError, $msg; 276 LOG llevWarn, $msg;
233 }; 277};
234}
235 278
236$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
238 281
239 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 286 return;#d#
242 }#d# 287 }#d#
243 288
244 # kill coroutine otherwise 289 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 290 Coro::terminate
247}; 291};
248
249$SIG{__DIE__} = sub { }; #d#?
250 292
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 310)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 312}
271 313
272$EV::DIED = sub { 314$EV::DIED = sub {
273 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
274}; 316};
275 317
276############################################################################# 318#############################################################################
277 319
278=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 358
317sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
319 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
320=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
321 375
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
324 378
325The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 380is a reload or not.
327 381
328=cut 382=cut
329 383
330sub post_init(&) { 384sub post_init(&) {
331 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
332} 403}
333 404
334=item cf::lock_wait $string 405=item cf::lock_wait $string
335 406
336Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
375} 446}
376 447
377=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
378 449
379Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 451get spread over time.
381 452
382=cut 453=cut
383 454
384sub periodic($$) { 455sub periodic($$) {
385 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
402 473
403=cut 474=cut
404 475
405our @SLOT_QUEUE; 476our @SLOT_QUEUE;
406our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
407 479
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
411 483
412 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
413 486
414 while () { 487 while () {
415 next_job: 488 next_job:
489
416 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 491
418 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 496 $job->[2]->send;
422 Coro::cede; 497 Coro::cede;
423 goto next_job; 498 goto next_job;
424 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 501 }
426 } 502 }
427 503
428 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 507 $signal->wait;
432 } else { 508 } else {
509 $busy = 0;
433 Coro::schedule; 510 Coro::schedule;
434 } 511 }
435 } 512 }
436}; 513};
437 514
438sub get_slot($;$$) { 515sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
440 517
441 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
442 519
443 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
444 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
445 523
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
474=cut 552=cut
475 553
476sub sync_job(&) { 554sub sync_job(&) {
477 my ($job) = @_; 555 my ($job) = @_;
478 556
479 if ($Coro::current == $Coro::main) { 557 if (in_main) {
480 my $time = EV::time; 558 my $time = AE::time;
481 559
482 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
484 562
485 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
486 564
487 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
488 566
489 my $busy = 1; 567 my $busy = 1;
490 my @res; 568 my @res;
491 569
492 (async { 570 (async {
493 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 572 @res = eval { $job->() };
495 warn $@ if $@; 573 error $@ if $@;
496 undef $busy; 574 undef $busy;
497 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
498 576
499 while ($busy) { 577 while ($busy) {
500 if (Coro::nready) { 578 if (Coro::nready) {
502 } else { 580 } else {
503 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
504 } 582 }
505 } 583 }
506 584
507 my $time = EV::time - $time; 585 my $time = AE::time - $time;
508 586
509 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
510 588
511 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
512 } else { 590 } else {
534 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
535 613
536 $coro 614 $coro
537} 615}
538 616
539=item fork_call { }, $args 617=item fork_call { }, @args
540 618
541Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 622never block itself or use any form of event handling.
545 623
546=cut 624=cut
547 625
626sub post_fork {
627 reset_signals;
628}
629
548sub fork_call(&@) { 630sub fork_call(&@) {
549 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
550 632
551 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
554 636
555 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
556 reset_signals; 638 cf::post_fork;
557 &$cb 639 &$cb
558 }, @args; 640 } @args;
559 641
560 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
561} 654}
562 655
563=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
564 657
565=cut 658=cut
602within each server. 695within each server.
603 696
604=cut 697=cut
605 698
606sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
607 my ($name) = @_; 703 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
609 705
610 eval { 706 eval {
611 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
621} 717}
622 718
623our $DB; 719our $DB;
624 720
625sub db_init { 721sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
628 };
629} 723}
630 724
631sub db_get($$) { 725sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
633 727
634 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
635 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
636 732
637 $! ? () 733 $! ? ()
638 : $data 734 : $data
639 }
640} 735}
641 736
642sub db_put($$$) { 737sub db_put($$$) {
643 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
700 795
701 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 797 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
704 799
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 801
707 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
710 805
720 815
721=cut 816=cut
722 817
723sub datalog($@) { 818sub datalog($@) {
724 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 821}
727 822
728=back 823=back
729 824
730=cut 825=cut
925 1020
926 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1023
929 } elsif (ref $type) { 1024 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
931 1026
932 } else { 1027 } else {
933 shift @arg; 1028 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
935 } 1030 }
936 } 1031 }
937} 1032}
938 1033
939sub _object_attach { 1034sub _object_attach {
949 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
950 } 1045 }
951 1046
952 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
953 } else { 1048 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1050 }
956 1051
957 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
958} 1053}
959 1054
1018 1113
1019 for (@$callbacks) { 1114 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1021 1116
1022 if ($@) { 1117 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1119 override;
1026 } 1120 }
1027 1121
1028 return 1 if $override; 1122 return 1 if $override;
1029 } 1123 }
1108 for (@$attach) { 1202 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1111 } 1205 }
1112 } else { 1206 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1208 }
1115 } 1209 }
1116} 1210}
1117 1211
1118cf::attachable->attach ( 1212cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1146 1240
1147 sync_job { 1241 sync_job {
1148 if (length $$rdata) { 1242 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1152 1247
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1253 aio_fsync $fh;
1254 }
1157 aio_close $fh; 1255 aio_close $fh;
1158 1256
1159 if (@$objs) { 1257 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1264 aio_fsync $fh;
1265 }
1165 aio_close $fh; 1266 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1268 }
1168 } else { 1269 } else {
1169 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1173 1274
1174 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1277 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1178 } 1279 }
1179 } else { 1280 } else {
1180 aio_unlink $filename; 1281 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1182 } 1283 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1308 $av = $st->{objs};
1208 } 1309 }
1209 1310
1210 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1213 1315
1214 ($data, $av) 1316 ($data, $av)
1215} 1317}
1216 1318
1217=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1276} 1378}
1277 1379
1278use File::Glob (); 1380use File::Glob ();
1279 1381
1280cf::player->attach ( 1382cf::player->attach (
1281 on_command => sub { 1383 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1283 1385
1284 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1285 or return; 1387 or return;
1286 1388
1309 1411
1310 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1413 if $reply;
1312 1414
1313 } else { 1415 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1417 }
1316 1418
1317 cf::override; 1419 cf::override;
1318 }, 1420 },
1319); 1421);
1320 1422
1321# "readahead" all extensions 1423# "readahead" all extensions
1322sub cache_extensions { 1424sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1324 1426
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1430 }
1329 }; 1431 };
1330 1432
1331 $grp 1433 $grp
1332} 1434}
1333 1435
1334sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1335 cf::sync_job { 1439 cf::sync_job {
1336 my %todo; 1440 my %todo;
1337 1441
1338 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1443 next unless -r $path;
1357 1461
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1464
1361 $ext{source} = 1465 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1364 . $source 1468 . $source
1365 . "\n};\n1"; 1469 . "\n};\n1";
1366 1470
1367 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1368 } 1472 }
1369 1473
1474 my $pass = 0;
1370 my %done; 1475 my %done;
1371 while (%todo) { 1476 while (%todo) {
1372 my $progress; 1477 my $progress;
1373 1478
1479 ++$pass;
1480
1481 ext:
1374 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1484 next ext
1377 unless exists $done{$_}; 1485 unless exists $done{$_};
1378 } 1486 }
1379 1487
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1489
1382 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1494
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1496 if exists $v->{meta}{mandatory};
1390 1497
1391 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1392 } 1507 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1508 }
1398 1509
1399 skip: 1510 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1402 } 1518 }
1403 }; 1519 };
1404} 1520}
1405 1521
1406############################################################################# 1522#############################################################################
1490 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1491 } 1607 }
1492 } 1608 }
1493} 1609}
1494 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1495sub save($) { 1624sub save($) {
1496 my ($pl) = @_; 1625 my ($pl) = @_;
1497 1626
1498 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1499 1628
1504 1633
1505 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1507 1636
1508 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1641
1510 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1643 cf::cede_to_tick;
1512} 1644}
1513 1645
1547 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1548 1680
1549 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1683
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1685 $pl->deactivate;
1686
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1557 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1558 1692
1559 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1615 \@logins 1749 \@logins
1616} 1750}
1617 1751
1618=item $player->maps 1752=item $player->maps
1619 1753
1754=item cf::player::maps $login
1755
1620Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1621player. May block. 1757player. May block.
1622 1758
1623=cut 1759=cut
1624 1760
1686=cut 1822=cut
1687 1823
1688sub find_by_path($) { 1824sub find_by_path($) {
1689 my ($path) = @_; 1825 my ($path) = @_;
1690 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1691 my ($match, $specificity); 1829 my ($match, $specificity);
1692 1830
1693 for my $region (list) { 1831 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1725 1863
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1865
1728 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1867 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp, $rmp->{total_map_hp},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom} 1869 (cf::region::find $rmp->{region})
1741 ) 1870 )
1742} 1871}
1743 1872
1744=item cf::map->register ($regex, $prio) 1873=item cf::map->register ($regex, $prio)
1745 1874
1751 1880
1752sub register { 1881sub register {
1753 my (undef, $regex, $prio) = @_; 1882 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1883 my $pkg = caller;
1755 1884
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1885 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1886
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1887 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1888}
1761 1889
1762# also paths starting with '/' 1890# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1891$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1892
1765sub thawer_merge { 1893sub thawer_merge {
1766 my ($self, $merge) = @_; 1894 my ($self, $merge) = @_;
1767 1895
1768 # we have to keep some variables in memory intact 1896 # we have to keep some variables in memory intact
1773} 1901}
1774 1902
1775sub normalise { 1903sub normalise {
1776 my ($path, $base) = @_; 1904 my ($path, $base) = @_;
1777 1905
1778 $path = "$path"; # make sure its a string 1906 $path = "$path"; # make sure it's a string
1779 1907
1780 $path =~ s/\.map$//; 1908 $path =~ s/\.map$//;
1781 1909
1782 # map plan: 1910 # map plan:
1783 # 1911 #
1798 $base =~ s{[^/]+/?$}{}; 1926 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1927 $path = "$base/$path";
1800 } 1928 }
1801 1929
1802 for ($path) { 1930 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1931 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1932 redo if s{/[^/]+/\.\./}{/};
1806 } 1933 }
1807 1934
1808 $path 1935 $path
1822 $self->init; # pass $1 etc. 1949 $self->init; # pass $1 etc.
1823 return $self; 1950 return $self;
1824 } 1951 }
1825 } 1952 }
1826 1953
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1954 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 1955 ()
1829} 1956}
1830 1957
1831sub init { 1958sub init {
1832 my ($self) = @_; 1959 my ($self) = @_;
1954} 2081}
1955 2082
1956sub find; 2083sub find;
1957sub find { 2084sub find {
1958 my ($path, $origin) = @_; 2085 my ($path, $origin) = @_;
2086
2087 cf::cede_to_tick;
1959 2088
1960 $path = normalise $path, $origin && $origin->path; 2089 $path = normalise $path, $origin && $origin->path;
1961 2090
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2092 my $guard2 = cf::lock_acquire "map_find:$path";
1982 2111
1983 $cf::MAP{$path} = $map 2112 $cf::MAP{$path} = $map
1984 } 2113 }
1985} 2114}
1986 2115
1987sub pre_load { } 2116sub pre_load { }
1988sub post_load { } 2117#sub post_load { } # XS
1989 2118
1990sub load { 2119sub load {
1991 my ($self) = @_; 2120 my ($self) = @_;
1992 2121
1993 local $self->{deny_reset} = 1; # loading can take a long time 2122 local $self->{deny_reset} = 1; # loading can take a long time
2048 2177
2049 $self->in_memory (cf::MAP_ACTIVE); 2178 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2179 }
2051 2180
2052 $self->post_load; 2181 $self->post_load;
2053}
2054 2182
2183 1
2184}
2185
2186# customize the map for a given player, i.e.
2187# return the _real_ map. used by e.g. per-player
2188# maps to change the path to ~playername/mappath
2055sub customise_for { 2189sub customise_for {
2056 my ($self, $ob) = @_; 2190 my ($self, $ob) = @_;
2057 2191
2058 return find "~" . $ob->name . "/" . $self->{path} 2192 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2193 if $self->per_player;
2075 or next; 2209 or next;
2076 $neigh = find $neigh, $map 2210 $neigh = find $neigh, $map
2077 or next; 2211 or next;
2078 $neigh->load; 2212 $neigh->load;
2079 2213
2214 # now find the diagonal neighbours
2080 push @neigh, 2215 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2218 }
2084 2219
2091} 2226}
2092 2227
2093sub find_sync { 2228sub find_sync {
2094 my ($path, $origin) = @_; 2229 my ($path, $origin) = @_;
2095 2230
2096 cf::sync_job { find $path, $origin } 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main;
2233
2234 find $path, $origin
2097} 2235}
2098 2236
2099sub do_load_sync { 2237sub do_load_sync {
2100 my ($map) = @_; 2238 my ($map) = @_;
2101 2239
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2241 if $Coro::current == $Coro::main;
2104 2242
2105 cf::sync_job { $map->load }; 2243 $map->load;
2106} 2244}
2107 2245
2108our %MAP_PREFETCH; 2246our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2247our $MAP_PREFETCHER = undef;
2110 2248
2136 $MAP_PREFETCHER->prio (6); 2274 $MAP_PREFETCHER->prio (6);
2137 2275
2138 () 2276 ()
2139} 2277}
2140 2278
2279# common code, used by both ->save and ->swapout
2141sub save { 2280sub _save {
2142 my ($self) = @_; 2281 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2282
2146 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2147 2284
2148 return unless $self->dirty; 2285 return unless $self->dirty;
2149 2286
2169 } else { 2306 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2307 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2308 }
2172} 2309}
2173 2310
2311sub save {
2312 my ($self) = @_;
2313
2314 my $lock = cf::lock_acquire "map_data:$self->{path}";
2315
2316 $self->_save;
2317}
2318
2174sub swap_out { 2319sub swap_out {
2175 my ($self) = @_; 2320 my ($self) = @_;
2176 2321
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2323
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2324 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2325 return if $self->{deny_save};
2326 return if $self->players;
2185 2327
2328 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # then atomically save
2334 $self->_save;
2335
2336 # then free the map
2337 $self->clear;
2338}
2339
2340sub reset_at {
2341 my ($self) = @_;
2342
2343 # TODO: safety, remove and allow resettable per-player maps
2344 return 1e99 if $self->{deny_reset};
2345
2346 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2347 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2348
2349 $time + $to
2350}
2351
2352sub should_reset {
2353 my ($self) = @_;
2354
2355 $self->reset_at <= $cf::RUNTIME
2356}
2357
2358sub reset {
2359 my ($self) = @_;
2360
2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362
2363 return if $self->players;
2364
2365 cf::trace "resetting map ", $self->path, "\n";
2366
2367 $self->in_memory (cf::MAP_SWAPPED);
2368
2369 # need to save uniques path
2370 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372
2373 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2374 if $uniq;
2375 }
2376
2377 delete $cf::MAP{$self->path};
2187 2378
2188 $self->deactivate; 2379 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2380 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2381 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2382
2236 $self->unlink_save; 2383 $self->unlink_save;
2237 $self->destroy; 2384 $self->destroy;
2238} 2385}
2239 2386
2247 2394
2248 delete $cf::MAP{$self->path}; 2395 delete $cf::MAP{$self->path};
2249 2396
2250 $self->unlink_save; 2397 $self->unlink_save;
2251 2398
2252 bless $self, "cf::map"; 2399 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2400 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2401 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2402 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2403 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2404
2314 : normalise $_ 2461 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2462 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2463 ]
2317} 2464}
2318 2465
2466=item cf::map::static_maps
2467
2468Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2469file in the shared directory excluding F</styles> and F</editor>). May
2470block.
2471
2472=cut
2473
2474sub static_maps() {
2475 my @dirs = "";
2476 my @maps;
2477
2478 while (@dirs) {
2479 my $dir = shift @dirs;
2480
2481 next if $dir eq "/styles" || $dir eq "/editor";
2482
2483 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2484 or return;
2485
2486 for (@$files) {
2487 s/\.map$// or next;
2488 utf8::decode $_;
2489 push @maps, "$dir/$_";
2490 }
2491
2492 push @dirs, map "$dir/$_", @$dirs;
2493 }
2494
2495 \@maps
2496}
2497
2319=back 2498=back
2320 2499
2321=head3 cf::object 2500=head3 cf::object
2322 2501
2323=cut 2502=cut
2455 2634
2456Freezes the player and moves him/her to a special map (C<{link}>). 2635Freezes the player and moves him/her to a special map (C<{link}>).
2457 2636
2458The player should be reasonably safe there for short amounts of time (e.g. 2637The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2638for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2639though, as the player cannot control the character while it is on the link
2461map. 2640map.
2462 2641
2463Will never block. 2642Will never block.
2464 2643
2465=item $player_object->leave_link ($map, $x, $y) 2644=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2665sub cf::object::player::enter_link {
2487 my ($self) = @_; 2666 my ($self) = @_;
2488 2667
2489 $self->deactivate_recursive; 2668 $self->deactivate_recursive;
2490 2669
2670 ++$self->{_link_recursion};
2671
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2672 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2673
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2674 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2675 if $self->map && $self->map->{path} ne "{link}";
2495 2676
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2677 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2678}
2498 2679
2499sub cf::object::player::leave_link { 2680sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2681 my ($self, $map, $x, $y) = @_;
2501 2682
2518 ($x, $y) = (-1, -1) 2699 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2700 unless (defined $x) && (defined $y);
2520 2701
2521 # use -1 or undef as default coordinates, not 0, 0 2702 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2703 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2704 if $x <= 0 && $y <= 0;
2524 2705
2525 $map->load; 2706 $map->load;
2526 $map->load_neighbours; 2707 $map->load_neighbours;
2527 2708
2528 return unless $self->contr->active; 2709 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2710
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2712 if ($self->enter_map ($map, $x, $y)) {
2534} 2713 # entering was successful
2714 delete $self->{_link_recursion};
2715 # only activate afterwards, to support waiting in hooks
2716 $self->activate_recursive;
2717 }
2535 2718
2719}
2720
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2721=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2722
2538Moves the player to the given map-path and coordinates by first freezing 2723Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2724her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2725that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2726the new (success) or old (failed) map position. In either case, $done will
2548 2733
2549our $GOTOGEN; 2734our $GOTOGEN;
2550 2735
2551sub cf::object::player::goto { 2736sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2737 my ($self, $path, $x, $y, $check, $done) = @_;
2738
2739 if ($self->{_link_recursion} >= $MAX_LINKS) {
2740 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2741 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2742 ($path, $x, $y) = @$EMERGENCY_POSITION;
2743 }
2553 2744
2554 # do generation counting so two concurrent goto's will be executed in-order 2745 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2746 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2747
2557 $self->enter_link; 2748 $self->enter_link;
2581 my $map = eval { 2772 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2773 my $map = defined $path ? cf::map::find $path : undef;
2583 2774
2584 if ($map) { 2775 if ($map) {
2585 $map = $map->customise_for ($self); 2776 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2777 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2778 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2779 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2780 }
2590 2781
2591 $map 2782 $map
2599 if ($gen == $self->{_goto_generation}) { 2790 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2791 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2792 $self->leave_link ($map, $x, $y);
2602 } 2793 }
2603 2794
2604 $done->() if $done; 2795 $done->($self) if $done;
2605 })->prio (1); 2796 })->prio (1);
2606} 2797}
2607 2798
2608=item $player_object->enter_exit ($exit_object) 2799=item $player_object->enter_exit ($exit_object)
2609 2800
2702 $self->message ("Something went wrong deep within the deliantra server. " 2893 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2894 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2895 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2896 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2897
2707 warn "ERROR in enter_exit: $@"; 2898 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2899 $self->leave_link;
2709 } 2900 }
2710 })->prio (1); 2901 })->prio (1);
2711} 2902}
2712 2903
2724sub cf::client::send_drawinfo { 2915sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2916 my ($self, $text, $flags) = @_;
2726 2917
2727 utf8::encode $text; 2918 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2919 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2920}
2921
2922=item $client->send_big_packet ($pkt)
2923
2924Like C<send_packet>, but tries to compress large packets, and fragments
2925them as required.
2926
2927=cut
2928
2929our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2930
2931sub cf::client::send_big_packet {
2932 my ($self, $pkt) = @_;
2933
2934 # try lzf for large packets
2935 $pkt = "lzf " . Compress::LZF::compress $pkt
2936 if 1024 <= length $pkt and $self->{can_lzf};
2937
2938 # split very large packets
2939 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2940 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2941 $pkt = "frag";
2942 }
2943
2944 $self->send_packet ($pkt);
2729} 2945}
2730 2946
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2947=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2948
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2949Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2953
2738=cut 2954=cut
2739 2955
2740# non-persistent channels (usually the info channel) 2956# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2957our %CHANNEL = (
2958 "c/motd" => {
2959 id => "infobox",
2960 title => "MOTD",
2961 reply => undef,
2962 tooltip => "The message of the day",
2963 },
2742 "c/identify" => { 2964 "c/identify" => {
2743 id => "infobox", 2965 id => "infobox",
2744 title => "Identify", 2966 title => "Identify",
2745 reply => undef, 2967 reply => undef,
2746 tooltip => "Items recently identified", 2968 tooltip => "Items recently identified",
2748 "c/examine" => { 2970 "c/examine" => {
2749 id => "infobox", 2971 id => "infobox",
2750 title => "Examine", 2972 title => "Examine",
2751 reply => undef, 2973 reply => undef,
2752 tooltip => "Signs and other items you examined", 2974 tooltip => "Signs and other items you examined",
2975 },
2976 "c/shopinfo" => {
2977 id => "infobox",
2978 title => "Shop Info",
2979 reply => undef,
2980 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2981 },
2754 "c/book" => { 2982 "c/book" => {
2755 id => "infobox", 2983 id => "infobox",
2756 title => "Book", 2984 title => "Book",
2757 reply => undef, 2985 reply => undef,
2785 id => "infobox", 3013 id => "infobox",
2786 title => "Skills", 3014 title => "Skills",
2787 reply => undef, 3015 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 3016 tooltip => "Shows your experience per skill and item power",
2789 }, 3017 },
3018 "c/shopitems" => {
3019 id => "infobox",
3020 title => "Shop Items",
3021 reply => undef,
3022 tooltip => "Shows the items currently for sale in this shop",
3023 },
2790 "c/resistances" => { 3024 "c/resistances" => {
2791 id => "infobox", 3025 id => "infobox",
2792 title => "Resistances", 3026 title => "Resistances",
2793 reply => undef, 3027 reply => undef,
2794 tooltip => "Shows your resistances", 3028 tooltip => "Shows your resistances",
2796 "c/pets" => { 3030 "c/pets" => {
2797 id => "infobox", 3031 id => "infobox",
2798 title => "Pets", 3032 title => "Pets",
2799 reply => undef, 3033 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 3034 tooltip => "Shows information abotu your pets/a specific pet",
3035 },
3036 "c/perceiveself" => {
3037 id => "infobox",
3038 title => "Perceive Self",
3039 reply => undef,
3040 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3041 },
2802 "c/uptime" => { 3042 "c/uptime" => {
2803 id => "infobox", 3043 id => "infobox",
2804 title => "Uptime", 3044 title => "Uptime",
2805 reply => undef, 3045 reply => undef,
2861 my $pkt = "msg " 3101 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3102 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3103 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3104 );
2865 3105
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3106 $self->send_big_packet ($pkt);
2877} 3107}
2878 3108
2879=item $client->ext_msg ($type, @msg) 3109=item $client->ext_msg ($type, @msg)
2880 3110
2881Sends an ext event to the client. 3111Sends an ext event to the client.
2884 3114
2885sub cf::client::ext_msg($$@) { 3115sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3116 my ($self, $type, @msg) = @_;
2887 3117
2888 if ($self->extcmd == 2) { 3118 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3120 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3121 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3122 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3123 }
2894} 3124}
2895 3125
2896=item $client->ext_reply ($msgid, @msg) 3126=item $client->ext_reply ($msgid, @msg)
2897 3127
2901 3131
2902sub cf::client::ext_reply($$@) { 3132sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3133 my ($self, $id, @msg) = @_;
2904 3134
2905 if ($self->extcmd == 2) { 3135 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3136 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3137 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3138 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3139 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3140 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3141 }
2912} 3142}
2913 3143
2914=item $success = $client->query ($flags, "text", \&cb) 3144=item $success = $client->query ($flags, "text", \&cb)
2915 3145
2986 3216
2987 $ns->ext_reply ($reply, @reply) 3217 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3218 if $reply;
2989 3219
2990 } else { 3220 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3221 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3222 }
2993 3223
2994 cf::override; 3224 cf::override;
2995 }, 3225 },
2996); 3226);
3016 3246
3017 $coro 3247 $coro
3018} 3248}
3019 3249
3020cf::client->attach ( 3250cf::client->attach (
3021 on_destroy => sub { 3251 on_client_destroy => sub {
3022 my ($ns) = @_; 3252 my ($ns) = @_;
3023 3253
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3254 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3255 },
3026); 3256);
3042our $safe_hole = new Safe::Hole; 3272our $safe_hole = new Safe::Hole;
3043 3273
3044$SIG{FPE} = 'IGNORE'; 3274$SIG{FPE} = 'IGNORE';
3045 3275
3046$safe->permit_only (Opcode::opset qw( 3276$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3277 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3278 grepstart grepwhile mapstart mapwhile
3049 sort time 3279 sort time
3050)); 3280));
3051 3281
3052# here we export the classes and methods available to script code 3282# here we export the classes and methods available to script code
3077 decrease split destroy change_exp value msg lore send_msg)], 3307 decrease split destroy change_exp value msg lore send_msg)],
3078 ["cf::object::player" => qw(player)], 3308 ["cf::object::player" => qw(player)],
3079 ["cf::player" => qw(peaceful send_msg)], 3309 ["cf::player" => qw(peaceful send_msg)],
3080 ["cf::map" => qw(trigger)], 3310 ["cf::map" => qw(trigger)],
3081) { 3311) {
3082 no strict 'refs';
3083 my ($pkg, @funs) = @$_; 3312 my ($pkg, @funs) = @$_;
3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3313 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3085 for @funs; 3314 for @funs;
3086} 3315}
3087 3316
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3333 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3334 $qcode =~ s/\n/\\n/g;
3106 3335
3107 %vars = (_dummy => 0) unless %vars; 3336 %vars = (_dummy => 0) unless %vars;
3108 3337
3338 my @res;
3109 local $_; 3339 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3340
3112 my $eval = 3341 my $eval =
3113 "do {\n" 3342 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3343 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3344 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3345 . $code
3117 . "\n}" 3346 . "\n}"
3118 ; 3347 ;
3119 3348
3349 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3350 sub_generation_inc;
3351 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3352 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3353 sub_generation_inc;
3354 } else {
3355 local @cf::_safe_eval_args = values %vars;
3356 @res = wantarray ? eval eval : scalar eval $eval;
3357 }
3123 3358
3124 if ($@) { 3359 if ($@) {
3125 warn "$@"; 3360 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3361 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3362 "with arguments " . (join " ", %vars) . "\n";
3128 } 3363 }
3129 3364
3130 wantarray ? @res : $res[0] 3365 wantarray ? @res : $res[0]
3131} 3366}
3132 3367
3146=cut 3381=cut
3147 3382
3148sub register_script_function { 3383sub register_script_function {
3149 my ($fun, $cb) = @_; 3384 my ($fun, $cb) = @_;
3150 3385
3151 no strict 'refs'; 3386 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3387 *$fun = $safe_hole->wrap ($cb);
3153} 3388}
3154 3389
3155=back 3390=back
3156 3391
3157=cut 3392=cut
3166 # for this (global event?) 3401 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3402 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3403
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3404 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3405
3171 warn "loading facedata from $path\n"; 3406 trace "loading facedata from $path\n";
3172 3407
3173 my $facedata;
3174 0 < aio_load $path, $facedata 3408 0 < aio_load $path, my $facedata
3175 or die "$path: $!"; 3409 or die "$path: $!";
3176 3410
3177 $facedata = Coro::Storable::thaw $facedata; 3411 $facedata = Coro::Storable::thaw $facedata;
3178 3412
3179 $facedata->{version} == 2 3413 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3414 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3415
3182 # patch in the exptable 3416 # patch in the exptable
3417 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3418 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3419 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3420 data => $exp_table,
3421 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3422 };
3187 cf::cede_to_tick; 3423 cf::cede_to_tick;
3188 3424
3189 { 3425 {
3190 my $faces = $facedata->{faceinfo}; 3426 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3428 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3429 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3430
3195 cf::face::set_visibility $idx, $info->{visibility}; 3431 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3432 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3433 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3434 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3435
3200 cf::cede_to_tick; 3436 cf::cede_to_tick;
3201 } 3437 }
3202 3438
3203 while (my ($face, $info) = each %$faces) { 3439 while (my ($face, $info) = each %$faces) {
3208 3444
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3445 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3446 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3447 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3448 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3449 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3450 }
3215 3451
3216 cf::cede_to_tick; 3452 cf::cede_to_tick;
3217 } 3453 }
3218 } 3454 }
3227 3463
3228 cf::anim::invalidate_all; # d'oh 3464 cf::anim::invalidate_all; # d'oh
3229 } 3465 }
3230 3466
3231 { 3467 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3468 my $res = $facedata->{resource};
3235 3469
3236 while (my ($name, $info) = each %$res) { 3470 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3471 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3472 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3473
3241 if ($info->{type} & 1) { 3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3475 cf::face::set_type $idx, $info->{type};
3256 } else { 3476 } else {
3257 $RESOURCE{$name} = $info; 3477 $RESOURCE{$name} = $info; # unused
3258 } 3478 }
3259 3479
3260 cf::cede_to_tick; 3480 cf::cede_to_tick;
3261 } 3481 }
3262 } 3482 }
3263 3483
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3484 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3485
3266 1 3486 1
3267} 3487}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3488
3289register_exticmd fx_want => sub { 3489register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3490 my ($ns, $want) = @_;
3291 3491
3292 while (my ($k, $v) = each %$want) { 3492 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3531sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3532 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3533 or die "unable to load treasurelists\n";
3334} 3534}
3335 3535
3536sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n";
3538
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3543
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_]
3546 or next;
3547
3548 my $face = cf::face::find "sound/$sound->[1]";
3549 cf::sound::set $sound->[0] => $face;
3550 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3551 }
3552
3553 while (my ($k, $v) = each %{$soundconf->{event}}) {
3554 my $face = cf::face::find "sound/$v";
3555 cf::sound::set $k => $face;
3556 }
3557}
3558
3336sub reload_resources { 3559sub reload_resources {
3337 warn "reloading resource files...\n"; 3560 trace "reloading resource files...\n";
3338 3561
3562 reload_exp_table;
3563 reload_materials;
3339 reload_facedata; 3564 reload_facedata;
3565 reload_sound;
3340 reload_archetypes; 3566 reload_archetypes;
3341 reload_regions; 3567 reload_regions;
3342 reload_treasures; 3568 reload_treasures;
3343 3569
3344 warn "finished reloading resource files\n"; 3570 trace "finished reloading resource files\n";
3345} 3571}
3346 3572
3347sub reload_config { 3573sub reload_config {
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3574 trace "reloading config file...\n";
3349 or return;
3350 3575
3351 local $/; 3576 0 < aio_load "$CONFDIR/config", my $config
3352 *CFG = YAML::Load <$fh>; 3577 or die "$CONFDIR/config: $!";
3353 3578
3579 utf8::decode $config;
3580 *CFG = yaml_load $config;
3581
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3583
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3586
3359 if (exists $CFG{mlockall}) { 3587 if (exists $CFG{mlockall}) {
3382 3610
3383 seek $fh, 0, 0; 3611 seek $fh, 0, 0;
3384 print $fh $$; 3612 print $fh $$;
3385} 3613}
3386 3614
3615sub main_loop {
3616 trace "EV::loop starting\n";
3617 if (1) {
3618 EV::loop;
3619 }
3620 trace "EV::loop returned\n";
3621 goto &main_loop unless $REALLY_UNLOOP;
3622}
3623
3387sub main { 3624sub main {
3388 cf::init_globals; # initialise logging 3625 cf::init_globals; # initialise logging
3389 3626
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3631
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3633
3402 # we must not ever block the main coroutine 3634 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3635 local $Coro::idle = sub {
3409 }; 3641 };
3410 3642
3411 evthread_start IO::AIO::poll_fileno; 3643 evthread_start IO::AIO::poll_fileno;
3412 3644
3413 cf::sync_job { 3645 cf::sync_job {
3646 cf::incloader::init ();
3647
3648 cf::init_anim;
3649 cf::init_attackmess;
3650 cf::init_dynamic;
3651
3652 cf::load_settings;
3653
3414 reload_resources; 3654 reload_resources;
3415 reload_config; 3655 reload_config;
3416 db_init; 3656 db_init;
3417 3657
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3658 cf::init_uuid;
3421 cf::init_signals; 3659 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3660 cf::init_skills;
3424 3661
3425 cf::init_beforeplay; 3662 cf::init_beforeplay;
3426 3663
3427 atomic; 3664 atomic;
3429 load_extensions; 3666 load_extensions;
3430 3667
3431 utime time, time, $RUNTIMEFILE; 3668 utime time, time, $RUNTIMEFILE;
3432 3669
3433 # no (long-running) fork's whatsoever before this point(!) 3670 # no (long-running) fork's whatsoever before this point(!)
3671 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3672 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3673
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3674 cf::_post_init 0;
3437 }; 3675 };
3438 3676
3439 EV::loop; 3677 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n";
3679
3680 my $free_main; $free_main = EV::idle sub {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :)
3683 };
3684
3685 goto &main_loop;
3440} 3686}
3441 3687
3442############################################################################# 3688#############################################################################
3443# initialisation and cleanup 3689# initialisation and cleanup
3444 3690
3445# install some emergency cleanup handlers 3691# install some emergency cleanup handlers
3446BEGIN { 3692BEGIN {
3447 our %SIGWATCHER = (); 3693 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3694 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3695 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3696 cf::cleanup "SIG$signal";
3451 }; 3697 };
3452 } 3698 }
3453} 3699}
3454 3700
3455sub write_runtime_sync { 3701sub write_runtime_sync {
3702 my $t0 = AE::time;
3703
3456 # first touch the runtime file to show we are still running: 3704 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3705 # the fsync below can take a very very long time.
3458 3706
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3707 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3708
3461 my $guard = cf::lock_acquire "write_runtime"; 3709 my $guard = cf::lock_acquire "write_runtime";
3462 3710
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3711 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3712 or return;
3465 3713
3466 my $value = $cf::RUNTIME + 90 + 10; 3714 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3715 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3716 # 60 allows for the watchdog to kill the server.
3481 or return; 3729 or return;
3482 3730
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3731 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3732 and return;
3485 3733
3486 warn "runtime file written.\n"; 3734 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3735
3488 1 3736 1
3489} 3737}
3490 3738
3491our $uuid_lock; 3739our $uuid_lock;
3503 or return; 3751 or return;
3504 3752
3505 my $value = uuid_seq uuid_cur; 3753 my $value = uuid_seq uuid_cur;
3506 3754
3507 unless ($value) { 3755 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3756 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3757 return;
3510 } 3758 }
3511 3759
3512 my $value = uuid_str $value + $uuid_skip; 3760 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3761 $uuid_skip = 0;
3523 or return; 3771 or return;
3524 3772
3525 aio_rename "$uuid~", $uuid 3773 aio_rename "$uuid~", $uuid
3526 and return; 3774 and return;
3527 3775
3528 warn "uuid file written ($value).\n"; 3776 trace "uuid file written ($value).\n";
3529 3777
3530 1 3778 1
3531 3779
3532} 3780}
3533 3781
3539} 3787}
3540 3788
3541sub emergency_save() { 3789sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3790 my $freeze_guard = cf::freeze_mainloop;
3543 3791
3544 warn "emergency_perl_save: enter\n"; 3792 info "emergency_perl_save: enter\n";
3793
3794 # this is a trade-off: we want to be very quick here, so
3795 # save all maps without fsync, and later call a global sync
3796 # (which in turn might be very very slow)
3797 local $USE_FSYNC = 0;
3545 3798
3546 cf::sync_job { 3799 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3800 cf::write_runtime_sync; # external watchdog should not bark
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551 3801
3552 # use a peculiar iteration method to avoid tripping on perl 3802 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3803 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3804 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3805 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3806 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3807 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3808 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3809 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3810 $pl->save;
3561 } 3811 }
3562 warn "emergency_perl_save: end player save\n"; 3812 info "emergency_perl_save: end player save\n";
3563 3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3564 warn "emergency_perl_save: begin map save\n"; 3816 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3817 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3818 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3819 $map->valid or next;
3568 $map->save; 3820 $map->save;
3569 } 3821 }
3570 warn "emergency_perl_save: end map save\n"; 3822 info "emergency_perl_save: end map save\n";
3571 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3826 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3827 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3828 info "emergency_perl_save: end database checkpoint\n";
3575 3829
3576 warn "emergency_perl_save: begin write uuid\n"; 3830 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3831 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3832 info "emergency_perl_save: end write uuid\n";
3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 trace "emergency_perl_save: syncing database to disk";
3837 BDB::db_env_txn_checkpoint $DB_ENV;
3838
3839 info "emergency_perl_save: starting sync\n";
3840 IO::AIO::aio_sync sub {
3841 info "emergency_perl_save: finished sync\n";
3842 };
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 3852 };
3580 3853
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3586 warn "emergency_perl_save: leave\n"; 3854 info "emergency_perl_save: leave\n";
3587} 3855}
3588 3856
3589sub post_cleanup { 3857sub post_cleanup {
3590 my ($make_core) = @_; 3858 my ($make_core) = @_;
3591 3859
3860 IO::AIO::flush;
3861
3592 warn Carp::longmess "post_cleanup backtrace" 3862 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3863 if $make_core;
3594 3864
3595 my $fh = pidfile; 3865 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3866 unlink $PIDFILE if <$fh> == $$;
3597} 3867}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3887 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3888 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3889 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3890# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3891 }
3622 warn "cleared package $pkg\n";#d#
3623} 3892}
3624 3893
3625sub do_reload_perl() { 3894sub do_reload_perl() {
3626 # can/must only be called in main 3895 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3896 unless (in_main) {
3628 warn "can only reload from main coroutine"; 3897 error "can only reload from main coroutine";
3629 return; 3898 return;
3630 } 3899 }
3631 3900
3632 return if $RELOAD++; 3901 return if $RELOAD++;
3633 3902
3634 my $t1 = EV::time; 3903 my $t1 = AE::time;
3635 3904
3636 while ($RELOAD) { 3905 while ($RELOAD) {
3637 warn "reloading..."; 3906 cf::get_slot 0.1, -1, "reload_perl";
3907 info "perl_reload: reloading...";
3638 3908
3639 warn "entering sync_job"; 3909 trace "perl_reload: entering sync_job";
3640 3910
3641 cf::sync_job { 3911 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3912 #cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark
3645 3913
3646 warn "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV;
3648
3649 # if anything goes wrong in here, we should simply crash as we already saved
3650
3651 warn "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 }
3655
3656 warn "cancelling all extension coros"; 3914 trace "perl_reload: cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3915 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3916 %EXT_CORO = ();
3659 3917
3660 warn "removing commands"; 3918 trace "perl_reload: removing commands";
3661 %COMMAND = (); 3919 %COMMAND = ();
3662 3920
3663 warn "removing ext/exti commands"; 3921 trace "perl_reload: removing ext/exti commands";
3664 %EXTCMD = (); 3922 %EXTCMD = ();
3665 %EXTICMD = (); 3923 %EXTICMD = ();
3666 3924
3667 warn "unloading/nuking all extensions"; 3925 trace "perl_reload: unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3926 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3927 trace "... unloading $pkg";
3670 3928
3671 if (my $cb = $pkg->can ("unload")) { 3929 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3930 eval {
3673 $cb->($pkg); 3931 $cb->($pkg);
3674 1 3932 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3933 } or error "$pkg unloaded, but with errors: $@";
3676 } 3934 }
3677 3935
3678 warn "... clearing $pkg"; 3936 trace "... clearing $pkg";
3679 clear_package $pkg; 3937 clear_package $pkg;
3680 } 3938 }
3681 3939
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3940 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3941 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3943
3686 warn "... unloading $k"; 3944 trace "... unloading $k";
3687 delete $INC{$k}; 3945 delete $INC{$k};
3688 3946
3689 $k =~ s/\.pm$//; 3947 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3948 $k =~ s/\//::/g;
3691 3949
3694 } 3952 }
3695 3953
3696 clear_package $k; 3954 clear_package $k;
3697 } 3955 }
3698 3956
3699 warn "getting rid of safe::, as good as possible"; 3957 trace "perl_reload: getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3958 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 3960
3703 warn "unloading cf.pm \"a bit\""; 3961 trace "perl_reload: unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3962 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3963 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3964
3707 # don't, removes xs symbols, too, 3965 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3966 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3967 #clear_package __PACKAGE__;
3710 3968
3711 warn "unload completed, starting to reload now"; 3969 info "perl_reload: unload completed, starting to reload now";
3712 3970
3713 warn "reloading cf.pm"; 3971 trace "perl_reload: reloading cf.pm";
3714 require cf; 3972 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3973 cf::_connect_to_perl_1;
3716 3974
3717 warn "loading config and database again"; 3975 trace "perl_reload: loading config and database again";
3718 cf::reload_config; 3976 cf::reload_config;
3719 3977
3720 warn "loading extensions"; 3978 trace "perl_reload: loading extensions";
3721 cf::load_extensions; 3979 cf::load_extensions;
3722 3980
3723 if ($REATTACH_ON_RELOAD) { 3981 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3982 trace "perl_reload: reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3983 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3984 trace "perl_reload: reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3985 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3986 trace "perl_reload: reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3987 reattach $_ for values %PLAYER;
3730 } 3988 }
3731 3989
3732 warn "running post_init jobs"; 3990 cf::_post_init 1;
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3991
3735 warn "leaving sync_job"; 3992 trace "perl_reload: leaving sync_job";
3736 3993
3737 1 3994 1
3738 } or do { 3995 } or do {
3739 warn $@; 3996 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3997 cf::cleanup "perl_reload: error, exiting.";
3741 }; 3998 };
3742 3999
3743 warn "reloaded";
3744 --$RELOAD; 4000 --$RELOAD;
3745 } 4001 }
3746 4002
3747 $t1 = EV::time - $t1; 4003 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 4004 info "perl_reload: completed in ${t1}s\n";
3749}; 4005};
3750 4006
3751our $RELOAD_WATCHER; # used only during reload 4007our $RELOAD_WATCHER; # used only during reload
3752 4008
3753sub reload_perl() { 4009sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 4011 # coro crashes during coro_state_free->destroy here.
3756 4012
3757 $RELOAD_WATCHER ||= cf::async { 4013 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 4014 Coro::AIO::aio_wait cache_extensions;
3759 4015
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4016 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 4017 do_reload_perl;
3762 undef $RELOAD_WATCHER; 4018 undef $RELOAD_WATCHER;
3763 }; 4019 };
3764 }; 4020 };
3765} 4021}
3774 reload_perl; 4030 reload_perl;
3775 }; 4031 };
3776 } 4032 }
3777}; 4033};
3778 4034
3779unshift @INC, $LIBDIR; 4035#############################################################################
3780 4036
3781my $bug_warning = 0; 4037my $bug_warning = 0;
3782 4038
3783our @WAIT_FOR_TICK; 4039our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 4040our @WAIT_FOR_TICK_BEGIN;
3785 4041
3786sub wait_for_tick { 4042sub wait_for_tick() {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 4044
3789 my $signal = new Coro::Signal; 4045 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 4046 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 4047 $signal->wait;
3792} 4048}
3793 4049
3794sub wait_for_tick_begin { 4050sub wait_for_tick_begin() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4052
3797 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4054 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4055 $signal->wait;
3800} 4056}
3806 return; 4062 return;
3807 } 4063 }
3808 4064
3809 cf::server_tick; # one server iteration 4065 cf::server_tick; # one server iteration
3810 4066
4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4069 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4071 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4072 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4073 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4074 or error "ERROR: unable to write runtime file: $!";
3817 }; 4075 };
3818 } 4076 }
3819 4077
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4079 $sig->send;
3829 4087
3830 if (0) { 4088 if (0) {
3831 if ($NEXT_TICK) { 4089 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4090 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4091 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4092 debug "jitter $JITTER\n";#d#
3835 } 4093 }
3836 } 4094 }
3837} 4095}
3838 4096
3839{ 4097{
3840 # configure BDB 4098 # configure BDB
3841 4099
3842 BDB::min_parallel 8; 4100 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4101 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4102 $AnyEvent::BDB::WATCHER->priority (1);
3845 4103
3846 unless ($DB_ENV) { 4104 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4105 $DB_ENV = BDB::db_env_create;
3884 IO::AIO::min_parallel 8; 4142 IO::AIO::min_parallel 8;
3885 IO::AIO::max_poll_time $TICK * 0.1; 4143 IO::AIO::max_poll_time $TICK * 0.1;
3886 undef $AnyEvent::AIO::WATCHER; 4144 undef $AnyEvent::AIO::WATCHER;
3887} 4145}
3888 4146
3889my $_log_backtrace; 4147our $_log_backtrace;
4148our $_log_backtrace_last;
3890 4149
3891sub _log_backtrace { 4150sub _log_backtrace {
3892 my ($msg, @addr) = @_; 4151 my ($msg, @addr) = @_;
3893 4152
3894 $msg =~ s/\n//; 4153 $msg =~ s/\n$//;
3895 4154
4155 if ($_log_backtrace_last eq $msg) {
4156 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3896 # limit the # of concurrent backtraces 4158 # limit the # of concurrent backtraces
3897 if ($_log_backtrace < 2) { 4159 } elsif ($_log_backtrace < 2) {
4160 $_log_backtrace_last = $msg;
3898 ++$_log_backtrace; 4161 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg; 4162 my $perl_bt = Carp::longmess $msg;
3900 async { 4163 async {
3901 $Coro::current->{desc} = "abt $msg"; 4164 $Coro::current->{desc} = "abt $msg";
3902 4165
3922 LOG llevInfo, "[ABT] $_\n" for @bt; 4185 LOG llevInfo, "[ABT] $_\n" for @bt;
3923 --$_log_backtrace; 4186 --$_log_backtrace;
3924 }; 4187 };
3925 } else { 4188 } else {
3926 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $msg\n";
3927 LOG llevInfo, "[ABT] [suppressed]\n"; 4190 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3928 } 4191 }
3929} 4192}
3930 4193
3931# load additional modules 4194# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4195require "cf/$_.pm" for @EXTRA_MODULES;
4196cf::_connect_to_perl_2;
3933 4197
3934END { cf::emergency_save } 4198END { cf::emergency_save }
3935 4199
39361 42001
3937 4201

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines