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.522 by root, Sat Apr 17 02:22:14 2010 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 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
112 114
113our $OUTPUT_RATE_MIN = 4000; 115our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
115 120
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 123our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 129our $DB_ENV;
125 130
126our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 132
128our %CFG; 133our %CFG;
129 134
130our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 136our $RUNTIME;
… …
230from wherever your confdir points to. 235from wherever your confdir points to.
231 236
232=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
233 238
234These 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
235returns 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
236per 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();
237 247
238=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
239 249
240This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 259
250=back 260=back
251 261
252=cut 262=cut
253 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
254$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 271 my $msg = join "", @_;
256 272
257 $msg .= "\n" 273 $msg .= "\n"
258 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
259 275
260 $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;
261 277
262 LOG llevError, $msg; 278 LOG llevWarn, $msg;
263}; 279};
264 280
265$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
267 283
268 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
269 285
270 if (in_main) {#d# 286 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 288 return;#d#
273 }#d# 289 }#d#
274 290
275 # kill coroutine otherwise 291 # kill coroutine otherwise
276 Coro::terminate 292 Coro::terminate
… …
298} 314}
299 315
300$EV::DIED = sub { 316$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
302}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
303 324
304############################################################################# 325#############################################################################
305 326
306=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
307 328
… …
328 $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;
329 $d 350 $d
330 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
331} 352}
332 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
333=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
334 369
335Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
336 371
337=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
… …
343our $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
344 379
345sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
347 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
348=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
349 415
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
352 418
353The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 420is a reload or not.
355 421
356=cut 422=cut
357 423
358sub post_init(&) { 424sub post_init(&) {
359 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 }
360} 443}
361 444
362=item cf::lock_wait $string 445=item cf::lock_wait $string
363 446
364Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
418} 501}
419 502
420=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
421 504
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
423This 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
424of 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.
425 512
426The 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
427used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
428 515
429Useful for short background jobs. 516Useful for short background jobs.
… …
509=cut 596=cut
510 597
511sub sync_job(&) { 598sub sync_job(&) {
512 my ($job) = @_; 599 my ($job) = @_;
513 600
514 if ($Coro::current == $Coro::main) { 601 if (in_main) {
515 my $time = AE::time; 602 my $time = AE::time;
516 603
517 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
519 606
520 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
521 608
522 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
523 610
524 my $busy = 1; 611 my $busy = 1;
525 my @res; 612 my @res;
526 613
527 (async { 614 (async {
528 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 616 @res = eval { $job->() };
530 warn $@ if $@; 617 error $@ if $@;
531 undef $busy; 618 undef $busy;
532 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
533 620
534 while ($busy) { 621 while ($busy) {
535 if (Coro::nready) { 622 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
570 657
571 $coro 658 $coro
572} 659}
573 660
574=item fork_call { }, $args 661=item fork_call { }, @args
575 662
576Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 666never block itself or use any form of event handling.
580 667
581=cut 668=cut
582 669
670sub post_fork {
671 reset_signals;
672}
673
583sub fork_call(&@) { 674sub fork_call(&@) {
584 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
585 676
586 # 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,
587 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
589 680
590 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
591 reset_signals; 682 cf::post_fork;
592 &$cb 683 &$cb
593 }, @args; 684 } @args;
594 685
595 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
596} 687}
597 688
598sub objinfo { 689sub objinfo {
… …
648within each server. 739within each server.
649 740
650=cut 741=cut
651 742
652sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
653 my ($name) = @_; 747 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
655 749
656 eval { 750 eval {
657 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
… …
667} 761}
668 762
669our $DB; 763our $DB;
670 764
671sub db_init { 765sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
674 };
675} 767}
676 768
677sub db_get($$) { 769sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
679 771
680 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
681 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
682 776
683 $! ? () 777 $! ? ()
684 : $data 778 : $data
685 }
686} 779}
687 780
688sub db_put($$$) { 781sub db_put($$$) {
689 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 811
719 my @data; 812 my @data;
720 my $md5; 813 my $md5;
721 814
722 for (0 .. $#$src) { 815 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 817 }
726 818
727 # if processing is expensive, check 819 # if processing is expensive, check
728 # checksum first 820 # checksum first
729 if (1) { 821 if (1) {
… …
746 838
747 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 840 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
750 842
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 844
753 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
756 848
… …
766 858
767=cut 859=cut
768 860
769sub datalog($@) { 861sub datalog($@) {
770 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 864}
773 865
774=back 866=back
775 867
776=cut 868=cut
… …
971 1063
972 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1066
975 } elsif (ref $type) { 1067 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
977 1069
978 } else { 1070 } else {
979 shift @arg; 1071 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
981 } 1073 }
982 } 1074 }
983} 1075}
984 1076
985sub _object_attach { 1077sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
996 } 1088 }
997 1089
998 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
999 } else { 1091 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1093 }
1002 1094
1003 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
1004} 1096}
1005 1097
… …
1064 1156
1065 for (@$callbacks) { 1157 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1067 1159
1068 if ($@) { 1160 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1162 override;
1072 } 1163 }
1073 1164
1074 return 1 if $override; 1165 return 1 if $override;
1075 } 1166 }
… …
1154 for (@$attach) { 1245 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1157 } 1248 }
1158 } else { 1249 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1251 }
1161 } 1252 }
1162} 1253}
1163 1254
1164cf::attachable->attach ( 1255cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1192 1283
1193 sync_job { 1284 sync_job {
1194 if (length $$rdata) { 1285 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1198 1290
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1225 1317
1226 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1320 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1230 } 1322 }
1231 } else { 1323 } else {
1232 aio_unlink $filename; 1324 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1234 } 1326 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1351 $av = $st->{objs};
1260 } 1352 }
1261 1353
1262 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1265 1358
1266 ($data, $av) 1359 ($data, $av)
1267} 1360}
1268 1361
1269=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
… …
1361 1454
1362 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1456 if $reply;
1364 1457
1365 } else { 1458 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1460 }
1368 1461
1369 cf::override; 1462 cf::override;
1370 }, 1463 },
1371); 1464);
… …
1382 1475
1383 $grp 1476 $grp
1384} 1477}
1385 1478
1386sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1387 cf::sync_job { 1482 cf::sync_job {
1388 my %todo; 1483 my %todo;
1389 1484
1390 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1486 next unless -r $path;
… …
1409 1504
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1507
1413 $ext{source} = 1508 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1416 . $source 1511 . $source
1417 . "\n};\n1"; 1512 . "\n};\n1";
1418 1513
1419 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1527 next ext
1433 unless exists $done{$_}; 1528 unless exists $done{$_};
1434 } 1529 }
1435 1530
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1532
1438 my $active = eval $v->{source}; 1533 my $active = eval $v->{source};
1439 1534
1440 if (length $@) { 1535 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1536 error "$v->{path}: $@\n";
1442 1537
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1539 if exists $v->{meta}{mandatory};
1445 1540
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1543 } else {
1449 $done{$k} = delete $todo{$k}; 1544 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1545 push @EXTS, $v->{pkg};
1451 $progress = 1; 1546 $progress = 1;
1452 1547
1453 warn "$v->{base}: extension inactive.\n" 1548 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1549 unless $active;
1455 } 1550 }
1456 } 1551 }
1457 1552
1458 unless ($progress) { 1553 unless ($progress) {
… …
1460 1555
1461 while (my ($k, $v) = each %todo) { 1556 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1558 if exists $v->{meta}{mandatory};
1464 } 1559 }
1560
1561 last;
1465 } 1562 }
1466 } 1563 }
1467 }; 1564 };
1468} 1565}
1469 1566
… …
1627 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1628 1725
1629 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1728
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1730 $pl->deactivate;
1731
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1637 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1638 1737
1639 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
… …
1695 \@logins 1794 \@logins
1696} 1795}
1697 1796
1698=item $player->maps 1797=item $player->maps
1699 1798
1799=item cf::player::maps $login
1800
1700Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1701player. May block. 1802player. May block.
1702 1803
1703=cut 1804=cut
1704 1805
… …
1766=cut 1867=cut
1767 1868
1768sub find_by_path($) { 1869sub find_by_path($) {
1769 my ($path) = @_; 1870 my ($path) = @_;
1770 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1771 my ($match, $specificity); 1874 my ($match, $specificity);
1772 1875
1773 for my $region (list) { 1876 for my $region (list) {
1774 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1775 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
… …
1803sub generate_random_map { 1906sub generate_random_map {
1804 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1805 1908
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807 1910
1808 # mit "rum" bekleckern, nicht
1809 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1813 $rmp->{exit_on_final_map},
1814 $rmp->{xsize}, $rmp->{ysize},
1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1817 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1818 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1819 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1820 (cf::region::find $rmp->{region}), $rmp->{custom}
1821 )
1822} 1912}
1823 1913
1824=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1825 1915
1826Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
… …
1831 1921
1832sub register { 1922sub register {
1833 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1834 my $pkg = caller; 1924 my $pkg = caller;
1835 1925
1836 no strict;
1837 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1838 1927
1839 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1840} 1929}
1841 1930
1842# also paths starting with '/' 1931# also paths starting with '/'
1843$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1844 1933
1845sub thawer_merge { 1934sub thawer_merge {
1846 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1847 1936
1848 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
… …
1853} 1942}
1854 1943
1855sub normalise { 1944sub normalise {
1856 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1857 1946
1858 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1859 1948
1860 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1861 1950
1862 # map plan: 1951 # map plan:
1863 # 1952 #
… …
1878 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1879 $path = "$base/$path"; 1968 $path = "$base/$path";
1880 } 1969 }
1881 1970
1882 for ($path) { 1971 for ($path) {
1883 redo if s{//}{/};
1884 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1885 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1886 } 1974 }
1887 1975
1888 $path 1976 $path
… …
1902 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1903 return $self; 1991 return $self;
1904 } 1992 }
1905 } 1993 }
1906 1994
1907 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1908 () 1996 ()
1909} 1997}
1910 1998
1999# may re-bless or do other evil things
1911sub init { 2000sub init {
1912 my ($self) = @_; 2001 my ($self) = @_;
1913 2002
1914 $self 2003 $self
1915} 2004}
… …
2034} 2123}
2035 2124
2036sub find; 2125sub find;
2037sub find { 2126sub find {
2038 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
2039 2130
2040 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
2041 2132
2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2043 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2085 $self->alloc; 2176 $self->alloc;
2086 2177
2087 $self->pre_load; 2178 $self->pre_load;
2088 cf::cede_to_tick; 2179 cf::cede_to_tick;
2089 2180
2181 if (exists $self->{load_path}) {
2090 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2091 $f->skip_block; 2183 $f->skip_block;
2092 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2093 or return; 2185 or return;
2094 2186
2095 $self->post_load_original 2187 $self->post_load_original
2096 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2097 2189
2098 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2099 utf8::encode $uniq; 2191 utf8::encode $uniq;
2100 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2101 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2102 $self->clear_unique_items; 2194 $self->clear_unique_items;
2103 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2104 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2105 } 2198 }
2106 } 2199 }
2107 }
2108 2200
2109 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2110 2203
2111 cf::cede_to_tick; 2204 cf::cede_to_tick;
2112 # now do the right thing for maps 2205 # now do the right thing for maps
2113 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2114 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
… …
2128 2221
2129 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2130 } 2223 }
2131 2224
2132 $self->post_load; 2225 $self->post_load;
2226
2227 1
2133} 2228}
2134 2229
2135# customize the map for a given player, i.e. 2230# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player 2231# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath 2232# maps to change the path to ~playername/mappath
… …
2158 or next; 2253 or next;
2159 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
2160 or next; 2255 or next;
2161 $neigh->load; 2256 $neigh->load;
2162 2257
2258 # now find the diagonal neighbours
2163 push @neigh, 2259 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 } 2262 }
2167 2263
… …
2174} 2270}
2175 2271
2176sub find_sync { 2272sub find_sync {
2177 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2178 2274
2179 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2180} 2279}
2181 2280
2182sub do_load_sync { 2281sub do_load_sync {
2183 my ($map) = @_; 2282 my ($map) = @_;
2184 2283
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2187 2286
2188 cf::sync_job { $map->load }; 2287 $map->load;
2189} 2288}
2190 2289
2191our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2193 2292
… …
2305 2404
2306 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2307 2406
2308 return if $self->players; 2407 return if $self->players;
2309 2408
2310 warn "resetting map ", $self->path, "\n"; 2409 cf::trace "resetting map ", $self->path, "\n";
2311 2410
2312 $self->in_memory (cf::MAP_SWAPPED); 2411 $self->in_memory (cf::MAP_SWAPPED);
2313 2412
2314 # need to save uniques path 2413 # need to save uniques path
2315 unless ($self->{deny_save}) { 2414 unless ($self->{deny_save}) {
… …
2339 2438
2340 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2341 2440
2342 $self->unlink_save; 2441 $self->unlink_save;
2343 2442
2344 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2345 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2346 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2347 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2349 2448
… …
2579 2678
2580Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2581 2680
2582The player should be reasonably safe there for short amounts of time (e.g. 2681The player should be reasonably safe there for short amounts of time (e.g.
2583for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link 2683though, as the player cannot control the character while it is on the link
2585map. 2684map.
2586 2685
2587Will never block. 2686Will never block.
2588 2687
2589=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
… …
2610sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2611 my ($self) = @_; 2710 my ($self) = @_;
2612 2711
2613 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2614 2713
2714 ++$self->{_link_recursion};
2715
2615 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2616 2717
2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2618 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2619 2720
… …
2650 $map->load_neighbours; 2751 $map->load_neighbours;
2651 2752
2652 return unless $self->contr->active; 2753 return unless $self->contr->active;
2653 2754
2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2655 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2656 2757 # entering was successful
2758 delete $self->{_link_recursion};
2657 # only activate afterwards, to support waiting in hooks 2759 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive; 2760 $self->activate_recursive;
2659} 2761 }
2660 2762
2763}
2764
2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2662 2766
2663Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2664her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2665that has to return the map if sucecssful, and then unfreezes the player on 2769that has to return the map if sucecssful, and then unfreezes the player on
2666the new (success) or old (failed) map position. In either case, $done will 2770the new (success) or old (failed) map position. In either case, $done will
… …
2673 2777
2674our $GOTOGEN; 2778our $GOTOGEN;
2675 2779
2676sub cf::object::player::goto { 2780sub cf::object::player::goto {
2677 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2678 2788
2679 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2681 2791
2682 $self->enter_link; 2792 $self->enter_link;
… …
2706 my $map = eval { 2816 my $map = eval {
2707 my $map = defined $path ? cf::map::find $path : undef; 2817 my $map = defined $path ? cf::map::find $path : undef;
2708 2818
2709 if ($map) { 2819 if ($map) {
2710 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2711 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2712 } else { 2822 } else {
2713 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2714 } 2824 }
2715 2825
2716 $map 2826 $map
… …
2724 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2725 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2726 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2727 } 2837 }
2728 2838
2729 $done->() if $done; 2839 $done->($self) if $done;
2730 })->prio (1); 2840 })->prio (1);
2731} 2841}
2732 2842
2733=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2734 2844
… …
2827 $self->message ("Something went wrong deep within the deliantra server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2828 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2829 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2830 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2831 2941
2832 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2833 $self->leave_link; 2943 $self->leave_link;
2834 } 2944 }
2835 })->prio (1); 2945 })->prio (1);
2836} 2946}
2837 2947
… …
3150 3260
3151 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
3152 if $reply; 3262 if $reply;
3153 3263
3154 } else { 3264 } else {
3155 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3156 } 3266 }
3157 3267
3158 cf::override; 3268 cf::override;
3159 }, 3269 },
3160); 3270);
… …
3241 decrease split destroy change_exp value msg lore send_msg)], 3351 decrease split destroy change_exp value msg lore send_msg)],
3242 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
3243 ["cf::player" => qw(peaceful send_msg)], 3353 ["cf::player" => qw(peaceful send_msg)],
3244 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
3245) { 3355) {
3246 no strict 'refs';
3247 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3249 for @funs; 3358 for @funs;
3250} 3359}
3251 3360
… …
3290 local @cf::_safe_eval_args = values %vars; 3399 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval; 3400 @res = wantarray ? eval eval : scalar eval $eval;
3292 } 3401 }
3293 3402
3294 if ($@) { 3403 if ($@) {
3295 warn "$@"; 3404 warn "$@",
3296 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
3297 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
3298 } 3407 }
3299 3408
3300 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
3301} 3410}
3302 3411
… …
3336 # for this (global event?) 3445 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3338 3447
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3340 3449
3341 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3342 3451
3343 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3344 0 < aio_load $path, $facedata
3345 or die "$path: $!";
3346
3347 $facedata = Coro::Storable::thaw $facedata;
3348 3453
3349 $facedata->{version} == 2 3454 $facedata->{version} == 2
3350 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3351 3456
3352 # patch in the exptable 3457 # patch in the exptable
… …
3366 3471
3367 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3368 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3371 3477
3372 cf::cede_to_tick; 3478 cf::cede_to_tick;
3373 } 3479 }
3374 3480
3375 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
… …
3380 3486
3381 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
3382 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3384 } else { 3490 } else {
3385 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3386 } 3492 }
3387 3493
3388 cf::cede_to_tick; 3494 cf::cede_to_tick;
3389 } 3495 }
3390 } 3496 }
… …
3408 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3409 3515
3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type}; 3517 cf::face::set_type $idx, $info->{type};
3412 } else { 3518 } else {
3413 $RESOURCE{$name} = $info; 3519 $RESOURCE{$name} = $info; # unused
3414 } 3520 }
3415 3521
3416 cf::cede_to_tick; 3522 cf::cede_to_tick;
3417 } 3523 }
3418 } 3524 }
3419 3525
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3421 3527
3422 1 3528 1
3423} 3529}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
3444 3530
3445register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3446 my ($ns, $want) = @_; 3532 my ($ns, $want) = @_;
3447 3533
3448 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
… …
3487sub reload_treasures { 3573sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3490} 3576}
3491 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3492sub reload_resources { 3598sub reload_resources {
3493 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3494 3600
3601 reload_exp_table;
3602 reload_materials;
3495 reload_facedata; 3603 reload_facedata;
3604 reload_sound;
3496 reload_archetypes; 3605 reload_archetypes;
3497 reload_regions; 3606 reload_regions;
3498 reload_treasures; 3607 reload_treasures;
3499 3608
3500 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3501} 3610}
3502 3611
3503sub reload_config { 3612sub reload_config {
3504 warn "reloading config file...\n"; 3613 trace "reloading config file...\n";
3505 3614
3506 open my $fh, "<:utf8", "$CONFDIR/config" 3615 my $config = load_file "$CONFDIR/config";
3507 or return; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3508 3618
3509 local $/;
3510 *CFG = YAML::XS::Load scalar <$fh>;
3511
3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3513 3620
3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3516 3623
3517 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
… …
3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3626 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3520 and die "WARNING: m(un)lockall failed: $!\n"; 3627 and die "WARNING: m(un)lockall failed: $!\n";
3521 }; 3628 };
3522 warn $@ if $@; 3629 warn $@ if $@;
3523 } 3630 }
3524
3525 warn "finished reloading resource files\n";
3526} 3631}
3527 3632
3528sub pidfile() { 3633sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3634 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!"; 3635 or die "$PIDFILE: $!";
… …
3543 seek $fh, 0, 0; 3648 seek $fh, 0, 0;
3544 print $fh $$; 3649 print $fh $$;
3545} 3650}
3546 3651
3547sub main_loop { 3652sub main_loop {
3548 warn "EV::loop starting\n"; 3653 trace "EV::loop starting\n";
3549 if (1) { 3654 if (1) {
3550 EV::loop; 3655 EV::loop;
3551 } 3656 }
3552 warn "EV::loop returned\n"; 3657 trace "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP; 3658 goto &main_loop unless $REALLY_UNLOOP;
3554} 3659}
3555 3660
3556sub main { 3661sub main {
3557 cf::init_globals; # initialise logging 3662 cf::init_globals; # initialise logging
3558 3663
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563 3668
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565 3670
… …
3573 }; 3678 };
3574 3679
3575 evthread_start IO::AIO::poll_fileno; 3680 evthread_start IO::AIO::poll_fileno;
3576 3681
3577 cf::sync_job { 3682 cf::sync_job {
3578 cf::init_experience; 3683 cf::incloader::init ();
3684
3579 cf::init_anim; 3685 cf::init_anim;
3580 cf::init_attackmess; 3686 cf::init_attackmess;
3581 cf::init_dynamic; 3687 cf::init_dynamic;
3582 3688
3583 cf::load_settings; 3689 cf::load_settings;
3584 cf::load_materials;
3585 3690
3586 reload_resources; 3691 reload_resources;
3587 reload_config; 3692 reload_config;
3588 db_init; 3693 db_init;
3589 3694
… …
3601 3706
3602 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX (); 3708 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605 3710
3606 (pop @POST_INIT)->(0) while @POST_INIT; 3711 cf::_post_init 0;
3607 }; 3712 };
3608 3713
3609 cf::object::thawer::errors_are_fatal 0; 3714 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n"; 3715 info "parse errors in files are no longer fatal from this point on.\n";
3611 3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3612 main_loop; 3722 goto &main_loop;
3613} 3723}
3614 3724
3615############################################################################# 3725#############################################################################
3616# initialisation and cleanup 3726# initialisation and cleanup
3617 3727
… …
3656 or return; 3766 or return;
3657 3767
3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3659 and return; 3769 and return;
3660 3770
3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3662 3772
3663 1 3773 1
3664} 3774}
3665 3775
3666our $uuid_lock; 3776our $uuid_lock;
… …
3678 or return; 3788 or return;
3679 3789
3680 my $value = uuid_seq uuid_cur; 3790 my $value = uuid_seq uuid_cur;
3681 3791
3682 unless ($value) { 3792 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n"; 3793 info "cowardly refusing to write zero uuid value!\n";
3684 return; 3794 return;
3685 } 3795 }
3686 3796
3687 my $value = uuid_str $value + $uuid_skip; 3797 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0; 3798 $uuid_skip = 0;
… …
3698 or return; 3808 or return;
3699 3809
3700 aio_rename "$uuid~", $uuid 3810 aio_rename "$uuid~", $uuid
3701 and return; 3811 and return;
3702 3812
3703 warn "uuid file written ($value).\n"; 3813 trace "uuid file written ($value).\n";
3704 3814
3705 1 3815 1
3706 3816
3707} 3817}
3708 3818
… …
3714} 3824}
3715 3825
3716sub emergency_save() { 3826sub emergency_save() {
3717 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3718 3828
3719 warn "emergency_perl_save: enter\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3720 3835
3721 cf::sync_job { 3836 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so 3837 cf::write_runtime_sync; # external watchdog should not bark
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726 3838
3727 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3728 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3729 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3730 warn "emergency_perl_save: begin player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3731 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3732 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3733 $pl->valid or next; 3845 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3735 $pl->save; 3847 $pl->save;
3736 } 3848 }
3737 warn "emergency_perl_save: end player save\n"; 3849 info "emergency_perl_save: end player save\n";
3738 3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3739 warn "emergency_perl_save: begin map save\n"; 3853 info "emergency_perl_save: begin map save\n";
3740 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3741 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3742 $map->valid or next; 3856 $map->valid or next;
3743 $map->save; 3857 $map->save;
3744 } 3858 }
3745 warn "emergency_perl_save: end map save\n"; 3859 info "emergency_perl_save: end map save\n";
3746 3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3747 warn "emergency_perl_save: begin database checkpoint\n"; 3863 info "emergency_perl_save: begin database checkpoint\n";
3748 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3749 warn "emergency_perl_save: end database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3750 3866
3751 warn "emergency_perl_save: begin write uuid\n"; 3867 info "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1; 3868 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n"; 3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3754 }; 3889 };
3755 3890
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3761 warn "emergency_perl_save: leave\n"; 3891 info "emergency_perl_save: leave\n";
3762} 3892}
3763 3893
3764sub post_cleanup { 3894sub post_cleanup {
3765 my ($make_core) = @_; 3895 my ($make_core) = @_;
3766 3896
3897 IO::AIO::flush;
3898
3767 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3768 if $make_core; 3900 if $make_core;
3769 3901
3770 my $fh = pidfile; 3902 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$; 3903 unlink $PIDFILE if <$fh> == $$;
3772} 3904}
… …
3796 } 3928 }
3797} 3929}
3798 3930
3799sub do_reload_perl() { 3931sub do_reload_perl() {
3800 # can/must only be called in main 3932 # can/must only be called in main
3801 if (in_main) { 3933 unless (in_main) {
3802 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3803 return; 3935 return;
3804 } 3936 }
3805 3937
3806 return if $RELOAD++; 3938 return if $RELOAD++;
3807 3939
3808 my $t1 = AE::time; 3940 my $t1 = AE::time;
3809 3941
3810 while ($RELOAD) { 3942 while ($RELOAD) {
3811 warn "reloading..."; 3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3812 3945
3813 warn "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3814 3947
3815 cf::sync_job { 3948 cf::sync_job {
3816 cf::write_runtime_sync; # external watchdog should not bark
3817 cf::emergency_save; 3949 #cf::emergency_save;
3818 cf::write_runtime_sync; # external watchdog should not bark
3819 3950
3820 warn "syncing database to disk";
3821 BDB::db_env_txn_checkpoint $DB_ENV;
3822
3823 # if anything goes wrong in here, we should simply crash as we already saved
3824
3825 warn "flushing outstanding aio requests";
3826 while (IO::AIO::nreqs || BDB::nreqs) {
3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3828 }
3829
3830 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3831 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3832 %EXT_CORO = (); 3953 %EXT_CORO = ();
3833 3954
3834 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3835 %COMMAND = (); 3956 %COMMAND = ();
3836 3957
3837 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3838 %EXTCMD = (); 3959 %EXTCMD = ();
3839 %EXTICMD = (); 3960 %EXTICMD = ();
3840 3961
3841 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3842 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3843 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3844 3965
3845 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3846 eval { 3967 eval {
3847 $cb->($pkg); 3968 $cb->($pkg);
3848 1 3969 1
3849 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3850 } 3971 }
3851 3972
3852 warn "... clearing $pkg"; 3973 trace "... clearing $pkg";
3853 clear_package $pkg; 3974 clear_package $pkg;
3854 } 3975 }
3855 3976
3856 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859 3980
3860 warn "... unloading $k"; 3981 trace "... unloading $k";
3861 delete $INC{$k}; 3982 delete $INC{$k};
3862 3983
3863 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3865 3986
… …
3868 } 3989 }
3869 3990
3870 clear_package $k; 3991 clear_package $k;
3871 } 3992 }
3872 3993
3873 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3874 clear_package "safe::$_" 3995 clear_package "safe::$_"
3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3876 3997
3877 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3878 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3880 4001
3881 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3882 # and global variables created in xs 4003 # and global variables created in xs
3883 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3884 4005
3885 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3886 4007
3887 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3888 require cf; 4009 require cf;
3889 cf::_connect_to_perl_1; 4010 cf::_connect_to_perl_1;
3890 4011
3891 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3892 cf::reload_config; 4013 cf::reload_config;
3893 4014
3894 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3895 cf::load_extensions; 4016 cf::load_extensions;
3896 4017
3897 if ($REATTACH_ON_RELOAD) { 4018 if ($REATTACH_ON_RELOAD) {
3898 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3899 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3900 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3901 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3902 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3903 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
3904 } 4025 }
3905 4026
3906 warn "running post_init jobs"; 4027 cf::_post_init 1;
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908 4028
3909 warn "leaving sync_job"; 4029 trace "perl_reload: leaving sync_job";
3910 4030
3911 1 4031 1
3912 } or do { 4032 } or do {
3913 warn $@; 4033 error $@;
3914 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3915 }; 4035 };
3916 4036
3917 warn "reloaded";
3918 --$RELOAD; 4037 --$RELOAD;
3919 } 4038 }
3920 4039
3921 $t1 = AE::time - $t1; 4040 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n"; 4041 info "perl_reload: completed in ${t1}s\n";
3923}; 4042};
3924 4043
3925our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3926 4045
3927sub reload_perl() { 4046sub reload_perl() {
… …
3948 reload_perl; 4067 reload_perl;
3949 }; 4068 };
3950 } 4069 }
3951}; 4070};
3952 4071
3953unshift @INC, $LIBDIR; 4072#############################################################################
3954 4073
3955my $bug_warning = 0; 4074my $bug_warning = 0;
3956 4075
3957our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3958our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3959 4078
3960sub wait_for_tick { 4079sub wait_for_tick() {
3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3962 4081
3963 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3964 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3965 $signal->wait; 4084 $signal->wait;
3966} 4085}
3967 4086
3968sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3970 4089
3971 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3972 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3973 $signal->wait; 4092 $signal->wait;
… …
3987 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3989 Coro::async_pool { 4108 Coro::async_pool {
3990 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3991 write_runtime_sync 4110 write_runtime_sync
3992 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3993 }; 4112 };
3994 } 4113 }
3995 4114
3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3997 $sig->send; 4116 $sig->send;
… …
4005 4124
4006 if (0) { 4125 if (0) {
4007 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
4008 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
4011 } 4130 }
4012 } 4131 }
4013} 4132}
4014 4133
4015{ 4134{
… …
4060 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
4061 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
4062 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
4063} 4182}
4064 4183
4065my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
4066 4186
4067sub _log_backtrace { 4187sub _log_backtrace {
4068 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
4069 4189
4070 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
4071 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4072 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
4073 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
4074 ++$_log_backtrace; 4198 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
4076 async { 4200 async {
4077 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
4078 4202
… …
4098 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
4099 --$_log_backtrace; 4223 --$_log_backtrace;
4100 }; 4224 };
4101 } else { 4225 } else {
4102 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
4103 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4104 } 4228 }
4105} 4229}
4106 4230
4107# load additional modules 4231# load additional modules
4108require "cf/$_.pm" for @EXTRA_MODULES; 4232require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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