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.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC

… …
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
230 247
231=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
232 249
233This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
291} 314}
292 315
293$EV::DIED = sub { 316$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
295}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
296 324
297############################################################################# 325#############################################################################
298 326
299=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
300 328
… …
321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322 $d 350 $d
323 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
324} 352}
325 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
326=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
327 369
328Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
329 371
330=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 379
338sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
340 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
341=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
342 415
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
345 418
346The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 420is a reload or not.
348 421
349=cut 422=cut
350 423
351sub post_init(&) { 424sub post_init(&) {
352 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
353} 443}
354 444
355=item cf::lock_wait $string 445=item cf::lock_wait $string
356 446
357Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
396} 486}
397 487
398=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
399 489
400Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 491get spread over time.
402 492
403=cut 493=cut
404 494
405sub periodic($$) { 495sub periodic($$) {
406 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
411} 501}
412 502
413=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
414 504
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
416This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
417of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
418 512
419The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
421 515
422Useful for short background jobs. 516Useful for short background jobs.
… …
502=cut 596=cut
503 597
504sub sync_job(&) { 598sub sync_job(&) {
505 my ($job) = @_; 599 my ($job) = @_;
506 600
507 if ($Coro::current == $Coro::main) { 601 if (in_main) {
508 my $time = EV::time; 602 my $time = AE::time;
509 603
510 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
512 606
513 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
514 608
515 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
516 610
517 my $busy = 1; 611 my $busy = 1;
518 my @res; 612 my @res;
519 613
520 (async { 614 (async {
521 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 616 @res = eval { $job->() };
523 warn $@ if $@; 617 error $@ if $@;
524 undef $busy; 618 undef $busy;
525 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
526 620
527 while ($busy) { 621 while ($busy) {
528 if (Coro::nready) { 622 if (Coro::nready) {
… …
530 } else { 624 } else {
531 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
532 } 626 }
533 } 627 }
534 628
535 my $time = EV::time - $time; 629 my $time = AE::time - $time;
536 630
537 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
538 632
539 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
540 } else { 634 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
563 657
564 $coro 658 $coro
565} 659}
566 660
567=item fork_call { }, $args 661=item fork_call { }, @args
568 662
569Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 666never block itself or use any form of event handling.
573 667
574=cut 668=cut
575 669
670sub post_fork {
671 reset_signals;
672}
673
576sub fork_call(&@) { 674sub fork_call(&@) {
577 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
578 676
579 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
582 680
583 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
584 reset_signals; 682 cf::post_fork;
585 &$cb 683 &$cb
586 }, @args; 684 } @args;
587 685
588 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
589} 698}
590 699
591=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
592 701
593=cut 702=cut
… …
630within each server. 739within each server.
631 740
632=cut 741=cut
633 742
634sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
635 my ($name) = @_; 747 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
637 749
638 eval { 750 eval {
639 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
649} 761}
650 762
651our $DB; 763our $DB;
652 764
653sub db_init { 765sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
656 };
657} 767}
658 768
659sub db_get($$) { 769sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
661 771
662 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
663 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
664 776
665 $! ? () 777 $! ? ()
666 : $data 778 : $data
667 }
668} 779}
669 780
670sub db_put($$$) { 781sub db_put($$$) {
671 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 811
701 my @data; 812 my @data;
702 my $md5; 813 my $md5;
703 814
704 for (0 .. $#$src) { 815 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 817 }
708 818
709 # if processing is expensive, check 819 # if processing is expensive, check
710 # checksum first 820 # checksum first
711 if (1) { 821 if (1) {
… …
728 838
729 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 840 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
732 842
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 844
735 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
738 848
… …
748 858
749=cut 859=cut
750 860
751sub datalog($@) { 861sub datalog($@) {
752 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 864}
755 865
756=back 866=back
757 867
758=cut 868=cut
… …
953 1063
954 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1066
957 } elsif (ref $type) { 1067 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
959 1069
960 } else { 1070 } else {
961 shift @arg; 1071 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
963 } 1073 }
964 } 1074 }
965} 1075}
966 1076
967sub _object_attach { 1077sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
978 } 1088 }
979 1089
980 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
981 } else { 1091 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1093 }
984 1094
985 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
986} 1096}
987 1097
… …
1046 1156
1047 for (@$callbacks) { 1157 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1049 1159
1050 if ($@) { 1160 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1162 override;
1054 } 1163 }
1055 1164
1056 return 1 if $override; 1165 return 1 if $override;
1057 } 1166 }
… …
1136 for (@$attach) { 1245 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1139 } 1248 }
1140 } else { 1249 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1251 }
1143 } 1252 }
1144} 1253}
1145 1254
1146cf::attachable->attach ( 1255cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1174 1283
1175 sync_job { 1284 sync_job {
1176 if (length $$rdata) { 1285 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1180 1290
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1207 1317
1208 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1320 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1212 } 1322 }
1213 } else { 1323 } else {
1214 aio_unlink $filename; 1324 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1216 } 1326 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1351 $av = $st->{objs};
1242 } 1352 }
1243 1353
1244 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1247 1358
1248 ($data, $av) 1359 ($data, $av)
1249} 1360}
1250 1361
1251=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1343 1454
1344 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1456 if $reply;
1346 1457
1347 } else { 1458 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1460 }
1350 1461
1351 cf::override; 1462 cf::override;
1352 }, 1463 },
1353); 1464);
… …
1364 1475
1365 $grp 1476 $grp
1366} 1477}
1367 1478
1368sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1369 cf::sync_job { 1482 cf::sync_job {
1370 my %todo; 1483 my %todo;
1371 1484
1372 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1486 next unless -r $path;
… …
1391 1504
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1507
1395 $ext{source} = 1508 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1398 . $source 1511 . $source
1399 . "\n};\n1"; 1512 . "\n};\n1";
1400 1513
1401 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1527 next ext
1415 unless exists $done{$_}; 1528 unless exists $done{$_};
1416 } 1529 }
1417 1530
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1532
1420 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1421 1534
1422 if (length $@) { 1535 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1424 1537
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1540
1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1427 } else { 1543 } else {
1428 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1430 $progress = 1; 1546 $progress = 1;
1431 1547
1432 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1549 unless $active;
1434 } 1550 }
1435 } 1551 }
1436 1552
1437 unless ($progress) { 1553 unless ($progress) {
… …
1606 my $name = $pl->ob->name; 1722 my $name = $pl->ob->name;
1607 1723
1608 $pl->{deny_save} = 1; 1724 $pl->{deny_save} = 1;
1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1725 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1610 1726
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1727 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1728 $pl->deactivate;
1729
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1730 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1731 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1732 ext::highscore::check ($pl->ob);
1733
1616 $pl->ns->destroy if $pl->ns; 1734 $pl->ns->destroy if $pl->ns;
1617 1735
1618 my $path = playerdir $pl; 1736 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1737 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1738 aio_rename $path, $temp;
… …
1674 \@logins 1792 \@logins
1675} 1793}
1676 1794
1677=item $player->maps 1795=item $player->maps
1678 1796
1797=item cf::player::maps $login
1798
1679Returns an arrayref of map paths that are private for this 1799Returns an arrayref of map paths that are private for this
1680player. May block. 1800player. May block.
1681 1801
1682=cut 1802=cut
1683 1803
… …
1745=cut 1865=cut
1746 1866
1747sub find_by_path($) { 1867sub find_by_path($) {
1748 my ($path) = @_; 1868 my ($path) = @_;
1749 1869
1870 $path =~ s/^~[^\/]*//; # skip ~login
1871
1750 my ($match, $specificity); 1872 my ($match, $specificity);
1751 1873
1752 for my $region (list) { 1874 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1875 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1876 ($match, $specificity) = ($region, $region->specificity)
… …
1782sub generate_random_map { 1904sub generate_random_map {
1783 my ($self, $rmp) = @_; 1905 my ($self, $rmp) = @_;
1784 1906
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1907 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1908
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1909 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1910}
1802 1911
1803=item cf::map->register ($regex, $prio) 1912=item cf::map->register ($regex, $prio)
1804 1913
1805Register a handler for the map path matching the given regex at the 1914Register a handler for the map path matching the given regex at the
… …
1810 1919
1811sub register { 1920sub register {
1812 my (undef, $regex, $prio) = @_; 1921 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1922 my $pkg = caller;
1814 1923
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1924 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1925
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1926 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1927}
1820 1928
1821# also paths starting with '/' 1929# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1930$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1931
1824sub thawer_merge { 1932sub thawer_merge {
1825 my ($self, $merge) = @_; 1933 my ($self, $merge) = @_;
1826 1934
1827 # we have to keep some variables in memory intact 1935 # we have to keep some variables in memory intact
… …
1832} 1940}
1833 1941
1834sub normalise { 1942sub normalise {
1835 my ($path, $base) = @_; 1943 my ($path, $base) = @_;
1836 1944
1837 $path = "$path"; # make sure its a string 1945 $path = "$path"; # make sure it's a string
1838 1946
1839 $path =~ s/\.map$//; 1947 $path =~ s/\.map$//;
1840 1948
1841 # map plan: 1949 # map plan:
1842 # 1950 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1965 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1966 $path = "$base/$path";
1859 } 1967 }
1860 1968
1861 for ($path) { 1969 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1970 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1971 redo if s{/[^/]+/\.\./}{/};
1865 } 1972 }
1866 1973
1867 $path 1974 $path
… …
1881 $self->init; # pass $1 etc. 1988 $self->init; # pass $1 etc.
1882 return $self; 1989 return $self;
1883 } 1990 }
1884 } 1991 }
1885 1992
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1993 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1994 ()
1888} 1995}
1889 1996
1890sub init { 1997sub init {
1891 my ($self) = @_; 1998 my ($self) = @_;
… …
2013} 2120}
2014 2121
2015sub find; 2122sub find;
2016sub find { 2123sub find {
2017 my ($path, $origin) = @_; 2124 my ($path, $origin) = @_;
2125
2126 cf::cede_to_tick;
2018 2127
2019 $path = normalise $path, $origin && $origin->path; 2128 $path = normalise $path, $origin && $origin->path;
2020 2129
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2130 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2131 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2107 2216
2108 $self->in_memory (cf::MAP_ACTIVE); 2217 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2218 }
2110 2219
2111 $self->post_load; 2220 $self->post_load;
2221
2222 1
2112} 2223}
2113 2224
2114# customize the map for a given player, i.e. 2225# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2226# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2227# maps to change the path to ~playername/mappath
… …
2137 or next; 2248 or next;
2138 $neigh = find $neigh, $map 2249 $neigh = find $neigh, $map
2139 or next; 2250 or next;
2140 $neigh->load; 2251 $neigh->load;
2141 2252
2253 # now find the diagonal neighbours
2142 push @neigh, 2254 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2255 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2256 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2257 }
2146 2258
… …
2153} 2265}
2154 2266
2155sub find_sync { 2267sub find_sync {
2156 my ($path, $origin) = @_; 2268 my ($path, $origin) = @_;
2157 2269
2158 cf::sync_job { find $path, $origin } 2270 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2271 if $Coro::current == $Coro::main;
2272
2273 find $path, $origin
2159} 2274}
2160 2275
2161sub do_load_sync { 2276sub do_load_sync {
2162 my ($map) = @_; 2277 my ($map) = @_;
2163 2278
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2279 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2280 if $Coro::current == $Coro::main;
2166 2281
2167 cf::sync_job { $map->load }; 2282 $map->load;
2168} 2283}
2169 2284
2170our %MAP_PREFETCH; 2285our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2286our $MAP_PREFETCHER = undef;
2172 2287
… …
2198 $MAP_PREFETCHER->prio (6); 2313 $MAP_PREFETCHER->prio (6);
2199 2314
2200 () 2315 ()
2201} 2316}
2202 2317
2318# common code, used by both ->save and ->swapout
2203sub save { 2319sub _save {
2204 my ($self) = @_; 2320 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2321
2208 $self->{last_save} = $cf::RUNTIME; 2322 $self->{last_save} = $cf::RUNTIME;
2209 2323
2210 return unless $self->dirty; 2324 return unless $self->dirty;
2211 2325
… …
2231 } else { 2345 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2346 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2347 }
2234} 2348}
2235 2349
2350sub save {
2351 my ($self) = @_;
2352
2353 my $lock = cf::lock_acquire "map_data:$self->{path}";
2354
2355 $self->_save;
2356}
2357
2236sub swap_out { 2358sub swap_out {
2237 my ($self) = @_; 2359 my ($self) = @_;
2238 2360
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2362
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2363 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2364 return if $self->{deny_save};
2365 return if $self->players;
2247 2366
2367 # first deactivate the map and "unlink" it from the core
2368 $self->deactivate;
2369 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2370 $self->in_memory (cf::MAP_SWAPPED);
2371
2372 # then atomically save
2373 $self->_save;
2374
2375 # then free the map
2376 $self->clear;
2377}
2378
2379sub reset_at {
2380 my ($self) = @_;
2381
2382 # TODO: safety, remove and allow resettable per-player maps
2383 return 1e99 if $self->{deny_reset};
2384
2385 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2386 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2387
2388 $time + $to
2389}
2390
2391sub should_reset {
2392 my ($self) = @_;
2393
2394 $self->reset_at <= $cf::RUNTIME
2395}
2396
2397sub reset {
2398 my ($self) = @_;
2399
2400 my $lock = cf::lock_acquire "map_data:$self->{path}";
2401
2402 return if $self->players;
2403
2404 cf::trace "resetting map ", $self->path, "\n";
2405
2406 $self->in_memory (cf::MAP_SWAPPED);
2407
2408 # need to save uniques path
2409 unless ($self->{deny_save}) {
2410 my $uniq = $self->uniq_path; utf8::encode $uniq;
2411
2412 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2413 if $uniq;
2414 }
2415
2416 delete $cf::MAP{$self->path};
2249 2417
2250 $self->deactivate; 2418 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2419 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2420 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2421
2298 $self->unlink_save; 2422 $self->unlink_save;
2299 $self->destroy; 2423 $self->destroy;
2300} 2424}
2301 2425
… …
2309 2433
2310 delete $cf::MAP{$self->path}; 2434 delete $cf::MAP{$self->path};
2311 2435
2312 $self->unlink_save; 2436 $self->unlink_save;
2313 2437
2314 bless $self, "cf::map"; 2438 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2439 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2440 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2441 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2442 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2443
… …
2549 2673
2550Freezes the player and moves him/her to a special map (C<{link}>). 2674Freezes the player and moves him/her to a special map (C<{link}>).
2551 2675
2552The player should be reasonably safe there for short amounts of time (e.g. 2676The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2677for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2678though, as the player cannot control the character while it is on the link
2555map. 2679map.
2556 2680
2557Will never block. 2681Will never block.
2558 2682
2559=item $player_object->leave_link ($map, $x, $y) 2683=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2704sub cf::object::player::enter_link {
2581 my ($self) = @_; 2705 my ($self) = @_;
2582 2706
2583 $self->deactivate_recursive; 2707 $self->deactivate_recursive;
2584 2708
2709 ++$self->{_link_recursion};
2710
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2711 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2712
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2713 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2714 if $self->map && $self->map->{path} ne "{link}";
2589 2715
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2716 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2717}
2592 2718
2593sub cf::object::player::leave_link { 2719sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2720 my ($self, $map, $x, $y) = @_;
2595 2721
… …
2620 $map->load_neighbours; 2746 $map->load_neighbours;
2621 2747
2622 return unless $self->contr->active; 2748 return unless $self->contr->active;
2623 2749
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2750 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2751 if ($self->enter_map ($map, $x, $y)) {
2626 2752 # entering was successful
2753 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2754 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2755 $self->activate_recursive;
2629} 2756 }
2630 2757
2758}
2759
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2760=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2761
2633Moves the player to the given map-path and coordinates by first freezing 2762Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2763her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2764that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2765the new (success) or old (failed) map position. In either case, $done will
… …
2643 2772
2644our $GOTOGEN; 2773our $GOTOGEN;
2645 2774
2646sub cf::object::player::goto { 2775sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2776 my ($self, $path, $x, $y, $check, $done) = @_;
2777
2778 if ($self->{_link_recursion} >= $MAX_LINKS) {
2779 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2780 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2781 ($path, $x, $y) = @$EMERGENCY_POSITION;
2782 }
2648 2783
2649 # do generation counting so two concurrent goto's will be executed in-order 2784 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2785 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2786
2652 $self->enter_link; 2787 $self->enter_link;
… …
2676 my $map = eval { 2811 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2812 my $map = defined $path ? cf::map::find $path : undef;
2678 2813
2679 if ($map) { 2814 if ($map) {
2680 $map = $map->customise_for ($self); 2815 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2816 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2817 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2818 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2819 }
2685 2820
2686 $map 2821 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2829 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2830 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2831 $self->leave_link ($map, $x, $y);
2697 } 2832 }
2698 2833
2699 $done->() if $done; 2834 $done->($self) if $done;
2700 })->prio (1); 2835 })->prio (1);
2701} 2836}
2702 2837
2703=item $player_object->enter_exit ($exit_object) 2838=item $player_object->enter_exit ($exit_object)
2704 2839
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2932 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2933 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2934 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2935 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2936
2802 warn "ERROR in enter_exit: $@"; 2937 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2938 $self->leave_link;
2804 } 2939 }
2805 })->prio (1); 2940 })->prio (1);
2806} 2941}
2807 2942
… …
3120 3255
3121 $ns->ext_reply ($reply, @reply) 3256 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3257 if $reply;
3123 3258
3124 } else { 3259 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3260 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3261 }
3127 3262
3128 cf::override; 3263 cf::override;
3129 }, 3264 },
3130); 3265);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3346 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3347 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3348 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3349 ["cf::map" => qw(trigger)],
3215) { 3350) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3351 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3352 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3353 for @funs;
3220} 3354}
3221 3355
… …
3260 local @cf::_safe_eval_args = values %vars; 3394 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3395 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3396 }
3263 3397
3264 if ($@) { 3398 if ($@) {
3265 warn "$@"; 3399 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3400 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3401 "with arguments " . (join " ", %vars) . "\n";
3268 } 3402 }
3269 3403
3270 wantarray ? @res : $res[0] 3404 wantarray ? @res : $res[0]
3271} 3405}
3272 3406
… …
3306 # for this (global event?) 3440 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3441 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3442
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3443 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3444
3311 warn "loading facedata from $path\n"; 3445 trace "loading facedata from $path\n";
3312 3446
3313 my $facedata; 3447 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3448
3319 $facedata->{version} == 2 3449 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3450 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3451
3322 # patch in the exptable 3452 # patch in the exptable
… …
3336 3466
3337 cf::face::set_visibility $idx, $info->{visibility}; 3467 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3468 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3469 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3470 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3471 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3341 3472
3342 cf::cede_to_tick; 3473 cf::cede_to_tick;
3343 } 3474 }
3344 3475
3345 while (my ($face, $info) = each %$faces) { 3476 while (my ($face, $info) = each %$faces) {
… …
3350 3481
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3482 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3483 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3484 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3485 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3486 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3487 }
3357 3488
3358 cf::cede_to_tick; 3489 cf::cede_to_tick;
3359 } 3490 }
3360 } 3491 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3509 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3510
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3511 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3512 cf::face::set_type $idx, $info->{type};
3382 } else { 3513 } else {
3383 $RESOURCE{$name} = $info; 3514 $RESOURCE{$name} = $info; # unused
3384 } 3515 }
3385 3516
3386 cf::cede_to_tick; 3517 cf::cede_to_tick;
3387 } 3518 }
3388 } 3519 }
3389 3520
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3521 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3522
3392 1 3523 1
3393} 3524}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3525
3415register_exticmd fx_want => sub { 3526register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3527 my ($ns, $want) = @_;
3417 3528
3418 while (my ($k, $v) = each %$want) { 3529 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3568sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3569 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3570 or die "unable to load treasurelists\n";
3460} 3571}
3461 3572
3573sub reload_sound {
3574 trace "loading sound config from $DATADIR/sound\n";
3575
3576 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3577
3578 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3579 my $sound = $soundconf->{compat}[$_]
3580 or next;
3581
3582 my $face = cf::face::find "sound/$sound->[1]";
3583 cf::sound::set $sound->[0] => $face;
3584 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3585 }
3586
3587 while (my ($k, $v) = each %{$soundconf->{event}}) {
3588 my $face = cf::face::find "sound/$v";
3589 cf::sound::set $k => $face;
3590 }
3591}
3592
3462sub reload_resources { 3593sub reload_resources {
3463 warn "reloading resource files...\n"; 3594 trace "reloading resource files...\n";
3464 3595
3596 reload_exp_table;
3597 reload_materials;
3465 reload_facedata; 3598 reload_facedata;
3599 reload_sound;
3466 reload_archetypes; 3600 reload_archetypes;
3467 reload_regions; 3601 reload_regions;
3468 reload_treasures; 3602 reload_treasures;
3469 3603
3470 warn "finished reloading resource files\n"; 3604 trace "finished reloading resource files\n";
3471} 3605}
3472 3606
3473sub reload_config { 3607sub reload_config {
3474 warn "reloading config file...\n"; 3608 trace "reloading config file...\n";
3475 3609
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3610 my $config = load_file "$CONFDIR/config";
3477 or return; 3611 utf8::decode $config;
3612 *CFG = decode_yaml $config;
3478 3613
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3614 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3615
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3616 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3617 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3618
3487 if (exists $CFG{mlockall}) { 3619 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3621 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3622 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3623 };
3492 warn $@ if $@; 3624 warn $@ if $@;
3493 } 3625 }
3494
3495 warn "finished reloading resource files\n";
3496} 3626}
3497 3627
3498sub pidfile() { 3628sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3629 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3630 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3643 seek $fh, 0, 0;
3514 print $fh $$; 3644 print $fh $$;
3515} 3645}
3516 3646
3517sub main_loop { 3647sub main_loop {
3518 warn "EV::loop starting\n"; 3648 trace "EV::loop starting\n";
3519 if (1) { 3649 if (1) {
3520 EV::loop; 3650 EV::loop;
3521 } 3651 }
3522 warn "EV::loop returned\n"; 3652 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3653 goto &main_loop unless $REALLY_UNLOOP;
3524} 3654}
3525 3655
3526sub main { 3656sub main {
3527 cf::init_globals; # initialise logging 3657 cf::init_globals; # initialise logging
3528 3658
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3659 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3660 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3661 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3662 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3663
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3664 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3665
3541 # we must not ever block the main coroutine 3666 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3667 local $Coro::idle = sub {
… …
3548 }; 3673 };
3549 3674
3550 evthread_start IO::AIO::poll_fileno; 3675 evthread_start IO::AIO::poll_fileno;
3551 3676
3552 cf::sync_job { 3677 cf::sync_job {
3678 cf::incloader::init ();
3679
3680 cf::init_anim;
3681 cf::init_attackmess;
3682 cf::init_dynamic;
3683
3553 cf::load_settings; 3684 cf::load_settings;
3554 cf::load_materials;
3555 3685
3556 reload_resources; 3686 reload_resources;
3557 reload_config; 3687 reload_config;
3558 db_init; 3688 db_init;
3559 3689
… …
3571 3701
3572 # no (long-running) fork's whatsoever before this point(!) 3702 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3703 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3704 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3705
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3706 cf::_post_init 0;
3577 }; 3707 };
3578 3708
3709 cf::object::thawer::errors_are_fatal 0;
3710 info "parse errors in files are no longer fatal from this point on.\n";
3711
3712 my $free_main; $free_main = EV::idle sub {
3713 undef $free_main;
3714 undef &main; # free gobs of memory :)
3715 };
3716
3579 main_loop; 3717 goto &main_loop;
3580} 3718}
3581 3719
3582############################################################################# 3720#############################################################################
3583# initialisation and cleanup 3721# initialisation and cleanup
3584 3722
3585# install some emergency cleanup handlers 3723# install some emergency cleanup handlers
3586BEGIN { 3724BEGIN {
3587 our %SIGWATCHER = (); 3725 our %SIGWATCHER = ();
3588 for my $signal (qw(INT HUP TERM)) { 3726 for my $signal (qw(INT HUP TERM)) {
3589 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3727 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3590 cf::cleanup "SIG$signal"; 3728 cf::cleanup "SIG$signal";
3591 }; 3729 };
3592 } 3730 }
3593} 3731}
3594 3732
3595sub write_runtime_sync { 3733sub write_runtime_sync {
3596 my $t0 = EV::time; 3734 my $t0 = AE::time;
3597 3735
3598 # first touch the runtime file to show we are still running: 3736 # first touch the runtime file to show we are still running:
3599 # the fsync below can take a very very long time. 3737 # the fsync below can take a very very long time.
3600 3738
3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3739 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3623 or return; 3761 or return;
3624 3762
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3763 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3764 and return;
3627 3765
3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3766 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3767
3630 1 3768 1
3631} 3769}
3632 3770
3633our $uuid_lock; 3771our $uuid_lock;
… …
3645 or return; 3783 or return;
3646 3784
3647 my $value = uuid_seq uuid_cur; 3785 my $value = uuid_seq uuid_cur;
3648 3786
3649 unless ($value) { 3787 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3788 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3789 return;
3652 } 3790 }
3653 3791
3654 my $value = uuid_str $value + $uuid_skip; 3792 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3793 $uuid_skip = 0;
… …
3665 or return; 3803 or return;
3666 3804
3667 aio_rename "$uuid~", $uuid 3805 aio_rename "$uuid~", $uuid
3668 and return; 3806 and return;
3669 3807
3670 warn "uuid file written ($value).\n"; 3808 trace "uuid file written ($value).\n";
3671 3809
3672 1 3810 1
3673 3811
3674} 3812}
3675 3813
… …
3681} 3819}
3682 3820
3683sub emergency_save() { 3821sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3822 my $freeze_guard = cf::freeze_mainloop;
3685 3823
3686 warn "emergency_perl_save: enter\n"; 3824 info "emergency_perl_save: enter\n";
3825
3826 # this is a trade-off: we want to be very quick here, so
3827 # save all maps without fsync, and later call a global sync
3828 # (which in turn might be very very slow)
3829 local $USE_FSYNC = 0;
3687 3830
3688 cf::sync_job { 3831 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3832 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3833
3694 # use a peculiar iteration method to avoid tripping on perl 3834 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3835 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3836 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3837 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3838 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3839 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3840 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3841 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3842 $pl->save;
3703 } 3843 }
3704 warn "emergency_perl_save: end player save\n"; 3844 info "emergency_perl_save: end player save\n";
3705 3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3706 warn "emergency_perl_save: begin map save\n"; 3848 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3849 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3850 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3851 $map->valid or next;
3710 $map->save; 3852 $map->save;
3711 } 3853 }
3712 warn "emergency_perl_save: end map save\n"; 3854 info "emergency_perl_save: end map save\n";
3713 3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3858 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3859 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3860 info "emergency_perl_save: end database checkpoint\n";
3717 3861
3718 warn "emergency_perl_save: begin write uuid\n"; 3862 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3863 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3864 info "emergency_perl_save: end write uuid\n";
3865
3866 cf::write_runtime_sync; # external watchdog should not bark
3867
3868 trace "emergency_perl_save: syncing database to disk";
3869 BDB::db_env_txn_checkpoint $DB_ENV;
3870
3871 info "emergency_perl_save: starting sync\n";
3872 IO::AIO::aio_sync sub {
3873 info "emergency_perl_save: finished sync\n";
3874 };
3875
3876 cf::write_runtime_sync; # external watchdog should not bark
3877
3878 trace "emergency_perl_save: flushing outstanding aio requests";
3879 while (IO::AIO::nreqs || BDB::nreqs) {
3880 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3881 }
3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3884 };
3722 3885
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3886 info "emergency_perl_save: leave\n";
3729} 3887}
3730 3888
3731sub post_cleanup { 3889sub post_cleanup {
3732 my ($make_core) = @_; 3890 my ($make_core) = @_;
3733 3891
3892 IO::AIO::flush;
3893
3734 warn Carp::longmess "post_cleanup backtrace" 3894 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3895 if $make_core;
3736 3896
3737 my $fh = pidfile; 3897 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3898 unlink $PIDFILE if <$fh> == $$;
3739} 3899}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3919 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3920 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3921 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3922# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3923 }
3764 warn "cleared package $pkg\n";#d#
3765} 3924}
3766 3925
3767sub do_reload_perl() { 3926sub do_reload_perl() {
3768 # can/must only be called in main 3927 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3928 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3929 error "can only reload from main coroutine";
3771 return; 3930 return;
3772 } 3931 }
3773 3932
3774 return if $RELOAD++; 3933 return if $RELOAD++;
3775 3934
3776 my $t1 = EV::time; 3935 my $t1 = AE::time;
3777 3936
3778 while ($RELOAD) { 3937 while ($RELOAD) {
3779 warn "reloading..."; 3938 cf::get_slot 0.1, -1, "reload_perl";
3939 info "perl_reload: reloading...";
3780 3940
3781 warn "entering sync_job"; 3941 trace "perl_reload: entering sync_job";
3782 3942
3783 cf::sync_job { 3943 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3944 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3945
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3946 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3947 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3948 %EXT_CORO = ();
3801 3949
3802 warn "removing commands"; 3950 trace "perl_reload: removing commands";
3803 %COMMAND = (); 3951 %COMMAND = ();
3804 3952
3805 warn "removing ext/exti commands"; 3953 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 3954 %EXTCMD = ();
3807 %EXTICMD = (); 3955 %EXTICMD = ();
3808 3956
3809 warn "unloading/nuking all extensions"; 3957 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3958 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3959 trace "... unloading $pkg";
3812 3960
3813 if (my $cb = $pkg->can ("unload")) { 3961 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3962 eval {
3815 $cb->($pkg); 3963 $cb->($pkg);
3816 1 3964 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3965 } or error "$pkg unloaded, but with errors: $@";
3818 } 3966 }
3819 3967
3820 warn "... clearing $pkg"; 3968 trace "... clearing $pkg";
3821 clear_package $pkg; 3969 clear_package $pkg;
3822 } 3970 }
3823 3971
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3972 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3973 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3974 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3975
3828 warn "... unloading $k"; 3976 trace "... unloading $k";
3829 delete $INC{$k}; 3977 delete $INC{$k};
3830 3978
3831 $k =~ s/\.pm$//; 3979 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3980 $k =~ s/\//::/g;
3833 3981
… …
3836 } 3984 }
3837 3985
3838 clear_package $k; 3986 clear_package $k;
3839 } 3987 }
3840 3988
3841 warn "getting rid of safe::, as good as possible"; 3989 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3990 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3991 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3992
3845 warn "unloading cf.pm \"a bit\""; 3993 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3994 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3995 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3996
3849 # don't, removes xs symbols, too, 3997 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3998 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3999 #clear_package __PACKAGE__;
3852 4000
3853 warn "unload completed, starting to reload now"; 4001 info "perl_reload: unload completed, starting to reload now";
3854 4002
3855 warn "reloading cf.pm"; 4003 trace "perl_reload: reloading cf.pm";
3856 require cf; 4004 require cf;
3857 cf::_connect_to_perl_1; 4005 cf::_connect_to_perl_1;
3858 4006
3859 warn "loading config and database again"; 4007 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4008 cf::reload_config;
3861 4009
3862 warn "loading extensions"; 4010 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4011 cf::load_extensions;
3864 4012
3865 if ($REATTACH_ON_RELOAD) { 4013 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4014 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4015 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4016 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4017 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4018 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4019 reattach $_ for values %PLAYER;
3872 } 4020 }
3873 4021
3874 warn "running post_init jobs"; 4022 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4023
3877 warn "leaving sync_job"; 4024 trace "perl_reload: leaving sync_job";
3878 4025
3879 1 4026 1
3880 } or do { 4027 } or do {
3881 warn $@; 4028 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4029 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4030 };
3884 4031
3885 warn "reloaded";
3886 --$RELOAD; 4032 --$RELOAD;
3887 } 4033 }
3888 4034
3889 $t1 = EV::time - $t1; 4035 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4036 info "perl_reload: completed in ${t1}s\n";
3891}; 4037};
3892 4038
3893our $RELOAD_WATCHER; # used only during reload 4039our $RELOAD_WATCHER; # used only during reload
3894 4040
3895sub reload_perl() { 4041sub reload_perl() {
… …
3897 # coro crashes during coro_state_free->destroy here. 4043 # coro crashes during coro_state_free->destroy here.
3898 4044
3899 $RELOAD_WATCHER ||= cf::async { 4045 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions; 4046 Coro::AIO::aio_wait cache_extensions;
3901 4047
3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4048 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl; 4049 do_reload_perl;
3904 undef $RELOAD_WATCHER; 4050 undef $RELOAD_WATCHER;
3905 }; 4051 };
3906 }; 4052 };
3907} 4053}
… …
3916 reload_perl; 4062 reload_perl;
3917 }; 4063 };
3918 } 4064 }
3919}; 4065};
3920 4066
3921unshift @INC, $LIBDIR; 4067#############################################################################
3922 4068
3923my $bug_warning = 0; 4069my $bug_warning = 0;
3924 4070
3925our @WAIT_FOR_TICK; 4071our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4072our @WAIT_FOR_TICK_BEGIN;
3927 4073
3928sub wait_for_tick { 4074sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4075 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4076
3931 my $signal = new Coro::Signal; 4077 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4078 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4079 $signal->wait;
3934} 4080}
3935 4081
3936sub wait_for_tick_begin { 4082sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4083 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4084
3939 my $signal = new Coro::Signal; 4085 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4086 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4087 $signal->wait;
… …
3948 return; 4094 return;
3949 } 4095 }
3950 4096
3951 cf::server_tick; # one server iteration 4097 cf::server_tick; # one server iteration
3952 4098
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4099 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4100
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4101 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4102 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4103 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4104 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4105 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4106 or error "ERROR: unable to write runtime file: $!";
3961 }; 4107 };
3962 } 4108 }
3963 4109
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4110 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4111 $sig->send;
… …
3973 4119
3974 if (0) { 4120 if (0) {
3975 if ($NEXT_TICK) { 4121 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4122 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4123 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4124 debug "jitter $JITTER\n";#d#
3979 } 4125 }
3980 } 4126 }
3981} 4127}
3982 4128
3983{ 4129{
… …
4028 IO::AIO::min_parallel 8; 4174 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4175 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4176 undef $AnyEvent::AIO::WATCHER;
4031} 4177}
4032 4178
4033my $_log_backtrace; 4179our $_log_backtrace;
4180our $_log_backtrace_last;
4034 4181
4035sub _log_backtrace { 4182sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4183 my ($msg, @addr) = @_;
4037 4184
4038 $msg =~ s/\n//; 4185 $msg =~ s/\n$//;
4039 4186
4187 if ($_log_backtrace_last eq $msg) {
4188 LOG llevInfo, "[ABT] $msg\n";
4189 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4190 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4191 } elsif ($_log_backtrace < 2) {
4192 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4193 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4194 my $perl_bt = Carp::longmess $msg;
4044 async { 4195 async {
4045 $Coro::current->{desc} = "abt $msg"; 4196 $Coro::current->{desc} = "abt $msg";
4046 4197
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4217 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4218 --$_log_backtrace;
4068 }; 4219 };
4069 } else { 4220 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4221 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4222 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4223 }
4073} 4224}
4074 4225
4075# load additional modules 4226# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4227require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines