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.509 by root, Mon Apr 5 03:22:25 2010 UTC vs.
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 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 = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This 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 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 261
262sub error(@) { LOG llevError, join "", @_ }
263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
352 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
353} 403}
354 404
355=item cf::lock_wait $string 405=item cf::lock_wait $string
356 406
357Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
396} 446}
397 447
398=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
399 449
400Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 451get spread over time.
402 452
403=cut 453=cut
404 454
405sub periodic($$) { 455sub periodic($$) {
406 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
502=cut 552=cut
503 553
504sub sync_job(&) { 554sub sync_job(&) {
505 my ($job) = @_; 555 my ($job) = @_;
506 556
507 if ($Coro::current == $Coro::main) { 557 if (in_main) {
508 my $time = EV::time; 558 my $time = AE::time;
509 559
510 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
512 562
513 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
514 564
515 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
516 566
517 my $busy = 1; 567 my $busy = 1;
518 my @res; 568 my @res;
519 569
520 (async { 570 (async {
521 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 572 @res = eval { $job->() };
523 warn $@ if $@; 573 error $@ if $@;
524 undef $busy; 574 undef $busy;
525 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
526 576
527 while ($busy) { 577 while ($busy) {
528 if (Coro::nready) { 578 if (Coro::nready) {
… …
530 } else { 580 } else {
531 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
532 } 582 }
533 } 583 }
534 584
535 my $time = EV::time - $time; 585 my $time = AE::time - $time;
536 586
537 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
538 588
539 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
540 } else { 590 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
563 613
564 $coro 614 $coro
565} 615}
566 616
567=item fork_call { }, $args 617=item fork_call { }, @args
568 618
569Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 622never block itself or use any form of event handling.
573 623
574=cut 624=cut
575 625
626sub post_fork {
627 reset_signals;
628}
629
576sub fork_call(&@) { 630sub fork_call(&@) {
577 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
578 632
579 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
582 636
583 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
584 reset_signals; 638 cf::post_fork;
585 &$cb 639 &$cb
586 }, @args; 640 } @args;
587 641
588 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
589} 654}
590 655
591=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
592 657
593=cut 658=cut
… …
630within each server. 695within each server.
631 696
632=cut 697=cut
633 698
634sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
635 my ($name) = @_; 703 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
637 705
638 eval { 706 eval {
639 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
649} 717}
650 718
651our $DB; 719our $DB;
652 720
653sub db_init { 721sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
656 };
657} 723}
658 724
659sub db_get($$) { 725sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
661 727
662 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
663 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
664 732
665 $! ? () 733 $! ? ()
666 : $data 734 : $data
667 }
668} 735}
669 736
670sub db_put($$$) { 737sub db_put($$$) {
671 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 795
729 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 797 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
732 799
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 801
735 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
738 805
… …
748 815
749=cut 816=cut
750 817
751sub datalog($@) { 818sub datalog($@) {
752 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 821}
755 822
756=back 823=back
757 824
758=cut 825=cut
… …
953 1020
954 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1023
957 } elsif (ref $type) { 1024 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
959 1026
960 } else { 1027 } else {
961 shift @arg; 1028 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
963 } 1030 }
964 } 1031 }
965} 1032}
966 1033
967sub _object_attach { 1034sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
978 } 1045 }
979 1046
980 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
981 } else { 1048 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1050 }
984 1051
985 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
986} 1053}
987 1054
… …
1046 1113
1047 for (@$callbacks) { 1114 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1049 1116
1050 if ($@) { 1117 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1119 override;
1054 } 1120 }
1055 1121
1056 return 1 if $override; 1122 return 1 if $override;
1057 } 1123 }
… …
1136 for (@$attach) { 1202 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1139 } 1205 }
1140 } else { 1206 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1208 }
1143 } 1209 }
1144} 1210}
1145 1211
1146cf::attachable->attach ( 1212cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1174 1240
1175 sync_job { 1241 sync_job {
1176 if (length $$rdata) { 1242 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1180 1247
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1207 1274
1208 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1277 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1212 } 1279 }
1213 } else { 1280 } else {
1214 aio_unlink $filename; 1281 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1216 } 1283 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1308 $av = $st->{objs};
1242 } 1309 }
1243 1310
1244 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1247 1315
1248 ($data, $av) 1316 ($data, $av)
1249} 1317}
1250 1318
1251=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1343 1411
1344 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1413 if $reply;
1346 1414
1347 } else { 1415 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1417 }
1350 1418
1351 cf::override; 1419 cf::override;
1352 }, 1420 },
1353); 1421);
… …
1364 1432
1365 $grp 1433 $grp
1366} 1434}
1367 1435
1368sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1369 cf::sync_job { 1439 cf::sync_job {
1370 my %todo; 1440 my %todo;
1371 1441
1372 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1443 next unless -r $path;
… …
1391 1461
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1464
1395 $ext{source} = 1465 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1398 . $source 1468 . $source
1399 . "\n};\n1"; 1469 . "\n};\n1";
1400 1470
1401 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1484 next ext
1415 unless exists $done{$_}; 1485 unless exists $done{$_};
1416 } 1486 }
1417 1487
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1489
1420 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1421 1491
1422 if (length $@) { 1492 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1424 1494
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1497
1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1427 } else { 1500 } else {
1428 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1430 $progress = 1; 1503 $progress = 1;
1431 1504
1432 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1506 unless $active;
1434 } 1507 }
1435 } 1508 }
1436 1509
1437 unless ($progress) { 1510 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1534 } 1607 }
1535 } 1608 }
1536} 1609}
1537 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1538sub save($) { 1624sub save($) {
1539 my ($pl) = @_; 1625 my ($pl) = @_;
1540 1626
1541 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1542 1628
… …
1547 1633
1548 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1550 1636
1551 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1641
1553 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1643 cf::cede_to_tick;
1555} 1644}
1556 1645
… …
1590 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1591 1680
1592 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1683
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1685 $pl->deactivate;
1686
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1600 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1601 1692
1602 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1658 \@logins 1749 \@logins
1659} 1750}
1660 1751
1661=item $player->maps 1752=item $player->maps
1662 1753
1754=item cf::player::maps $login
1755
1663Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1664player. May block. 1757player. May block.
1665 1758
1666=cut 1759=cut
1667 1760
… …
1729=cut 1822=cut
1730 1823
1731sub find_by_path($) { 1824sub find_by_path($) {
1732 my ($path) = @_; 1825 my ($path) = @_;
1733 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1734 my ($match, $specificity); 1829 my ($match, $specificity);
1735 1830
1736 for my $region (list) { 1831 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1768 1863
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1865
1771 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1867 $self->_create_random_map (
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp, $rmp->{total_map_hp},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom} 1869 (cf::region::find $rmp->{region})
1784 ) 1870 )
1785} 1871}
1786 1872
1787=item cf::map->register ($regex, $prio) 1873=item cf::map->register ($regex, $prio)
1788 1874
… …
1794 1880
1795sub register { 1881sub register {
1796 my (undef, $regex, $prio) = @_; 1882 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1883 my $pkg = caller;
1798 1884
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1885 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1886
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1887 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1888}
1804 1889
1805# also paths starting with '/' 1890# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1891$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1892
1808sub thawer_merge { 1893sub thawer_merge {
1809 my ($self, $merge) = @_; 1894 my ($self, $merge) = @_;
1810 1895
1811 # we have to keep some variables in memory intact 1896 # we have to keep some variables in memory intact
… …
1816} 1901}
1817 1902
1818sub normalise { 1903sub normalise {
1819 my ($path, $base) = @_; 1904 my ($path, $base) = @_;
1820 1905
1821 $path = "$path"; # make sure its a string 1906 $path = "$path"; # make sure it's a string
1822 1907
1823 $path =~ s/\.map$//; 1908 $path =~ s/\.map$//;
1824 1909
1825 # map plan: 1910 # map plan:
1826 # 1911 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1926 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1927 $path = "$base/$path";
1843 } 1928 }
1844 1929
1845 for ($path) { 1930 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1931 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1932 redo if s{/[^/]+/\.\./}{/};
1849 } 1933 }
1850 1934
1851 $path 1935 $path
… …
1865 $self->init; # pass $1 etc. 1949 $self->init; # pass $1 etc.
1866 return $self; 1950 return $self;
1867 } 1951 }
1868 } 1952 }
1869 1953
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1954 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1955 ()
1872} 1956}
1873 1957
1874sub init { 1958sub init {
1875 my ($self) = @_; 1959 my ($self) = @_;
… …
1997} 2081}
1998 2082
1999sub find; 2083sub find;
2000sub find { 2084sub find {
2001 my ($path, $origin) = @_; 2085 my ($path, $origin) = @_;
2086
2087 cf::cede_to_tick;
2002 2088
2003 $path = normalise $path, $origin && $origin->path; 2089 $path = normalise $path, $origin && $origin->path;
2004 2090
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2092 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2091 2177
2092 $self->in_memory (cf::MAP_ACTIVE); 2178 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2179 }
2094 2180
2095 $self->post_load; 2181 $self->post_load;
2182
2183 1
2096} 2184}
2097 2185
2098# customize the map for a given player, i.e. 2186# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2187# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2188# maps to change the path to ~playername/mappath
… …
2121 or next; 2209 or next;
2122 $neigh = find $neigh, $map 2210 $neigh = find $neigh, $map
2123 or next; 2211 or next;
2124 $neigh->load; 2212 $neigh->load;
2125 2213
2214 # now find the diagonal neighbours
2126 push @neigh, 2215 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2218 }
2130 2219
… …
2137} 2226}
2138 2227
2139sub find_sync { 2228sub find_sync {
2140 my ($path, $origin) = @_; 2229 my ($path, $origin) = @_;
2141 2230
2142 cf::sync_job { find $path, $origin } 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main;
2233
2234 find $path, $origin
2143} 2235}
2144 2236
2145sub do_load_sync { 2237sub do_load_sync {
2146 my ($map) = @_; 2238 my ($map) = @_;
2147 2239
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2241 if $Coro::current == $Coro::main;
2150 2242
2151 cf::sync_job { $map->load }; 2243 $map->load;
2152} 2244}
2153 2245
2154our %MAP_PREFETCH; 2246our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2247our $MAP_PREFETCHER = undef;
2156 2248
… …
2182 $MAP_PREFETCHER->prio (6); 2274 $MAP_PREFETCHER->prio (6);
2183 2275
2184 () 2276 ()
2185} 2277}
2186 2278
2279# common code, used by both ->save and ->swapout
2187sub save { 2280sub _save {
2188 my ($self) = @_; 2281 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2282
2192 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2193 2284
2194 return unless $self->dirty; 2285 return unless $self->dirty;
2195 2286
… …
2215 } else { 2306 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2307 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2308 }
2218} 2309}
2219 2310
2311sub save {
2312 my ($self) = @_;
2313
2314 my $lock = cf::lock_acquire "map_data:$self->{path}";
2315
2316 $self->_save;
2317}
2318
2220sub swap_out { 2319sub swap_out {
2221 my ($self) = @_; 2320 my ($self) = @_;
2222 2321
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2323
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2324 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2325 return if $self->{deny_save};
2326 return if $self->players;
2231 2327
2328 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # then atomically save
2334 $self->_save;
2335
2336 # then free the map
2337 $self->clear;
2338}
2339
2340sub reset_at {
2341 my ($self) = @_;
2342
2343 # TODO: safety, remove and allow resettable per-player maps
2344 return 1e99 if $self->{deny_reset};
2345
2346 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2347 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2348
2349 $time + $to
2350}
2351
2352sub should_reset {
2353 my ($self) = @_;
2354
2355 $self->reset_at <= $cf::RUNTIME
2356}
2357
2358sub reset {
2359 my ($self) = @_;
2360
2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362
2363 return if $self->players;
2364
2365 cf::trace "resetting map ", $self->path, "\n";
2366
2367 $self->in_memory (cf::MAP_SWAPPED);
2368
2369 # need to save uniques path
2370 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372
2373 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2374 if $uniq;
2375 }
2376
2377 delete $cf::MAP{$self->path};
2233 2378
2234 $self->deactivate; 2379 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2380 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2381 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2382
2282 $self->unlink_save; 2383 $self->unlink_save;
2283 $self->destroy; 2384 $self->destroy;
2284} 2385}
2285 2386
… …
2293 2394
2294 delete $cf::MAP{$self->path}; 2395 delete $cf::MAP{$self->path};
2295 2396
2296 $self->unlink_save; 2397 $self->unlink_save;
2297 2398
2298 bless $self, "cf::map"; 2399 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2400 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2401 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2402 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2403 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2404
… …
2533 2634
2534Freezes the player and moves him/her to a special map (C<{link}>). 2635Freezes the player and moves him/her to a special map (C<{link}>).
2535 2636
2536The player should be reasonably safe there for short amounts of time (e.g. 2637The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2638for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2639though, as the player cannot control the character while it is on the link
2539map. 2640map.
2540 2641
2541Will never block. 2642Will never block.
2542 2643
2543=item $player_object->leave_link ($map, $x, $y) 2644=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2665sub cf::object::player::enter_link {
2565 my ($self) = @_; 2666 my ($self) = @_;
2566 2667
2567 $self->deactivate_recursive; 2668 $self->deactivate_recursive;
2568 2669
2670 ++$self->{_link_recursion};
2671
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2672 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2673
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2674 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2675 if $self->map && $self->map->{path} ne "{link}";
2573 2676
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2677 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2678}
2576 2679
2577sub cf::object::player::leave_link { 2680sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2681 my ($self, $map, $x, $y) = @_;
2579 2682
… …
2604 $map->load_neighbours; 2707 $map->load_neighbours;
2605 2708
2606 return unless $self->contr->active; 2709 return unless $self->contr->active;
2607 2710
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2712 if ($self->enter_map ($map, $x, $y)) {
2610 2713 # entering was successful
2714 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2715 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2716 $self->activate_recursive;
2613} 2717 }
2614 2718
2719}
2720
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2721=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2722
2617Moves the player to the given map-path and coordinates by first freezing 2723Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2724her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2725that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2726the new (success) or old (failed) map position. In either case, $done will
… …
2627 2733
2628our $GOTOGEN; 2734our $GOTOGEN;
2629 2735
2630sub cf::object::player::goto { 2736sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2737 my ($self, $path, $x, $y, $check, $done) = @_;
2738
2739 if ($self->{_link_recursion} >= $MAX_LINKS) {
2740 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2741 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2742 ($path, $x, $y) = @$EMERGENCY_POSITION;
2743 }
2632 2744
2633 # do generation counting so two concurrent goto's will be executed in-order 2745 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2746 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2747
2636 $self->enter_link; 2748 $self->enter_link;
… …
2660 my $map = eval { 2772 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2773 my $map = defined $path ? cf::map::find $path : undef;
2662 2774
2663 if ($map) { 2775 if ($map) {
2664 $map = $map->customise_for ($self); 2776 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2777 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2778 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2779 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2780 }
2669 2781
2670 $map 2782 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2790 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2791 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2792 $self->leave_link ($map, $x, $y);
2681 } 2793 }
2682 2794
2683 $done->() if $done; 2795 $done->($self) if $done;
2684 })->prio (1); 2796 })->prio (1);
2685} 2797}
2686 2798
2687=item $player_object->enter_exit ($exit_object) 2799=item $player_object->enter_exit ($exit_object)
2688 2800
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2893 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 2894 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 2895 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2896 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2897
2786 warn "ERROR in enter_exit: $@"; 2898 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2899 $self->leave_link;
2788 } 2900 }
2789 })->prio (1); 2901 })->prio (1);
2790} 2902}
2791 2903
… …
3104 3216
3105 $ns->ext_reply ($reply, @reply) 3217 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3218 if $reply;
3107 3219
3108 } else { 3220 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3221 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3222 }
3111 3223
3112 cf::override; 3224 cf::override;
3113 }, 3225 },
3114); 3226);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3307 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3308 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3309 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3310 ["cf::map" => qw(trigger)],
3199) { 3311) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3312 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3313 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3314 for @funs;
3204} 3315}
3205 3316
… …
3244 local @cf::_safe_eval_args = values %vars; 3355 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3356 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3357 }
3247 3358
3248 if ($@) { 3359 if ($@) {
3249 warn "$@"; 3360 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3361 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3362 "with arguments " . (join " ", %vars) . "\n";
3252 } 3363 }
3253 3364
3254 wantarray ? @res : $res[0] 3365 wantarray ? @res : $res[0]
3255} 3366}
3256 3367
… …
3290 # for this (global event?) 3401 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3402 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3403
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3404 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3405
3295 warn "loading facedata from $path\n"; 3406 trace "loading facedata from $path\n";
3296 3407
3297 my $facedata;
3298 0 < aio_load $path, $facedata 3408 0 < aio_load $path, my $facedata
3299 or die "$path: $!"; 3409 or die "$path: $!";
3300 3410
3301 $facedata = Coro::Storable::thaw $facedata; 3411 $facedata = Coro::Storable::thaw $facedata;
3302 3412
3303 $facedata->{version} == 2 3413 $facedata->{version} == 2
… …
3334 3444
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3445 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3446 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3447 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3448 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3449 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3450 }
3341 3451
3342 cf::cede_to_tick; 3452 cf::cede_to_tick;
3343 } 3453 }
3344 } 3454 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3472 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3473
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3475 cf::face::set_type $idx, $info->{type};
3366 } else { 3476 } else {
3367 $RESOURCE{$name} = $info; 3477 $RESOURCE{$name} = $info; # unused
3368 } 3478 }
3369 3479
3370 cf::cede_to_tick; 3480 cf::cede_to_tick;
3371 } 3481 }
3372 } 3482 }
3373 3483
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3484 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3485
3376 1 3486 1
3377} 3487}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3488
3399register_exticmd fx_want => sub { 3489register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3490 my ($ns, $want) = @_;
3401 3491
3402 while (my ($k, $v) = each %$want) { 3492 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3531sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3532 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3533 or die "unable to load treasurelists\n";
3444} 3534}
3445 3535
3536sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n";
3538
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3543
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_]
3546 or next;
3547
3548 my $face = cf::face::find "sound/$sound->[1]";
3549 cf::sound::set $sound->[0] => $face;
3550 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3551 }
3552
3553 while (my ($k, $v) = each %{$soundconf->{event}}) {
3554 my $face = cf::face::find "sound/$v";
3555 cf::sound::set $k => $face;
3556 }
3557}
3558
3446sub reload_resources { 3559sub reload_resources {
3447 warn "reloading resource files...\n"; 3560 trace "reloading resource files...\n";
3448 3561
3562 reload_exp_table;
3563 reload_materials;
3449 reload_facedata; 3564 reload_facedata;
3565 reload_sound;
3450 reload_archetypes; 3566 reload_archetypes;
3451 reload_regions; 3567 reload_regions;
3452 reload_treasures; 3568 reload_treasures;
3453 3569
3454 warn "finished reloading resource files\n"; 3570 trace "finished reloading resource files\n";
3455} 3571}
3456 3572
3457sub reload_config { 3573sub reload_config {
3458 warn "reloading config file...\n"; 3574 trace "reloading config file...\n";
3459 3575
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3576 0 < aio_load "$CONFDIR/config", my $config
3461 or return; 3577 or die "$CONFDIR/config: $!";
3462 3578
3463 local $/; 3579 utf8::decode $config;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3580 *CFG = yaml_load $config;
3465 3581
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3583
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3586
3471 if (exists $CFG{mlockall}) { 3587 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3589 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3590 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3591 };
3476 warn $@ if $@; 3592 warn $@ if $@;
3477 } 3593 }
3478
3479 warn "finished reloading resource files\n";
3480} 3594}
3481 3595
3482sub pidfile() { 3596sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3597 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3598 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3611 seek $fh, 0, 0;
3498 print $fh $$; 3612 print $fh $$;
3499} 3613}
3500 3614
3501sub main_loop { 3615sub main_loop {
3502 warn "EV::loop starting\n"; 3616 trace "EV::loop starting\n";
3503 if (1) { 3617 if (1) {
3504 EV::loop; 3618 EV::loop;
3505 } 3619 }
3506 warn "EV::loop returned\n"; 3620 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3621 goto &main_loop unless $REALLY_UNLOOP;
3508} 3622}
3509 3623
3510sub main { 3624sub main {
3511 cf::init_globals; # initialise logging 3625 cf::init_globals; # initialise logging
3512 3626
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3630 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3631
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3633
3525 # we must not ever block the main coroutine 3634 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3635 local $Coro::idle = sub {
… …
3532 }; 3641 };
3533 3642
3534 evthread_start IO::AIO::poll_fileno; 3643 evthread_start IO::AIO::poll_fileno;
3535 3644
3536 cf::sync_job { 3645 cf::sync_job {
3646 cf::incloader::init ();
3647
3648 cf::init_anim;
3649 cf::init_attackmess;
3650 cf::init_dynamic;
3651
3537 cf::load_settings; 3652 cf::load_settings;
3538 cf::load_materials;
3539 3653
3540 reload_resources; 3654 reload_resources;
3541 reload_config; 3655 reload_config;
3542 db_init; 3656 db_init;
3543 3657
3544 cf::init_uuid; 3658 cf::init_uuid;
3545 cf::init_signals; 3659 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3660 cf::init_skills;
3548 3661
3549 cf::init_beforeplay; 3662 cf::init_beforeplay;
3550 3663
3551 atomic; 3664 atomic;
… …
3556 3669
3557 # no (long-running) fork's whatsoever before this point(!) 3670 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3671 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3672 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3673
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3674 cf::_post_init 0;
3562 }; 3675 };
3563 3676
3677 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n";
3679
3680 my $free_main; $free_main = EV::idle sub {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :)
3683 };
3684
3564 main_loop; 3685 goto &main_loop;
3565} 3686}
3566 3687
3567############################################################################# 3688#############################################################################
3568# initialisation and cleanup 3689# initialisation and cleanup
3569 3690
3570# install some emergency cleanup handlers 3691# install some emergency cleanup handlers
3571BEGIN { 3692BEGIN {
3572 our %SIGWATCHER = (); 3693 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3694 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3695 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3696 cf::cleanup "SIG$signal";
3576 }; 3697 };
3577 } 3698 }
3578} 3699}
3579 3700
3580sub write_runtime_sync { 3701sub write_runtime_sync {
3581 my $t0 = EV::time; 3702 my $t0 = AE::time;
3582 3703
3583 # first touch the runtime file to show we are still running: 3704 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3705 # the fsync below can take a very very long time.
3585 3706
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3707 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3729 or return;
3609 3730
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3731 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3732 and return;
3612 3733
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3734 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3735
3615 1 3736 1
3616} 3737}
3617 3738
3618our $uuid_lock; 3739our $uuid_lock;
… …
3630 or return; 3751 or return;
3631 3752
3632 my $value = uuid_seq uuid_cur; 3753 my $value = uuid_seq uuid_cur;
3633 3754
3634 unless ($value) { 3755 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3756 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3757 return;
3637 } 3758 }
3638 3759
3639 my $value = uuid_str $value + $uuid_skip; 3760 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3761 $uuid_skip = 0;
… …
3650 or return; 3771 or return;
3651 3772
3652 aio_rename "$uuid~", $uuid 3773 aio_rename "$uuid~", $uuid
3653 and return; 3774 and return;
3654 3775
3655 warn "uuid file written ($value).\n"; 3776 trace "uuid file written ($value).\n";
3656 3777
3657 1 3778 1
3658 3779
3659} 3780}
3660 3781
… …
3666} 3787}
3667 3788
3668sub emergency_save() { 3789sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3790 my $freeze_guard = cf::freeze_mainloop;
3670 3791
3671 warn "emergency_perl_save: enter\n"; 3792 info "emergency_perl_save: enter\n";
3793
3794 # this is a trade-off: we want to be very quick here, so
3795 # save all maps without fsync, and later call a global sync
3796 # (which in turn might be very very slow)
3797 local $USE_FSYNC = 0;
3672 3798
3673 cf::sync_job { 3799 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3800 cf::write_runtime_sync; # external watchdog should not bark
3675 # save all maps without fsync, and later call a global sync
3676 # (which in turn might be very very slow)
3677 local $USE_FSYNC = 0;
3678 3801
3679 # use a peculiar iteration method to avoid tripping on perl 3802 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3803 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3804 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3805 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3806 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3807 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3808 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3809 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3810 $pl->save;
3688 } 3811 }
3689 warn "emergency_perl_save: end player save\n"; 3812 info "emergency_perl_save: end player save\n";
3690 3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3691 warn "emergency_perl_save: begin map save\n"; 3816 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3817 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3818 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3819 $map->valid or next;
3695 $map->save; 3820 $map->save;
3696 } 3821 }
3697 warn "emergency_perl_save: end map save\n"; 3822 info "emergency_perl_save: end map save\n";
3698 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3826 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3827 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3828 info "emergency_perl_save: end database checkpoint\n";
3702 3829
3703 warn "emergency_perl_save: begin write uuid\n"; 3830 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3831 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3832 info "emergency_perl_save: end write uuid\n";
3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 trace "emergency_perl_save: syncing database to disk";
3837 BDB::db_env_txn_checkpoint $DB_ENV;
3838
3839 info "emergency_perl_save: starting sync\n";
3840 IO::AIO::aio_sync sub {
3841 info "emergency_perl_save: finished sync\n";
3842 };
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3852 };
3707 3853
3708 warn "emergency_perl_save: starting sync()\n";
3709 IO::AIO::aio_sync sub {
3710 warn "emergency_perl_save: finished sync()\n";
3711 };
3712
3713 warn "emergency_perl_save: leave\n"; 3854 info "emergency_perl_save: leave\n";
3714} 3855}
3715 3856
3716sub post_cleanup { 3857sub post_cleanup {
3717 my ($make_core) = @_; 3858 my ($make_core) = @_;
3718 3859
3860 IO::AIO::flush;
3861
3719 warn Carp::longmess "post_cleanup backtrace" 3862 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3863 if $make_core;
3721 3864
3722 my $fh = pidfile; 3865 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3866 unlink $PIDFILE if <$fh> == $$;
3724} 3867}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3887 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3888 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3889 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3890# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3891 }
3749 warn "cleared package $pkg\n";#d#
3750} 3892}
3751 3893
3752sub do_reload_perl() { 3894sub do_reload_perl() {
3753 # can/must only be called in main 3895 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3896 unless (in_main) {
3755 warn "can only reload from main coroutine"; 3897 error "can only reload from main coroutine";
3756 return; 3898 return;
3757 } 3899 }
3758 3900
3759 return if $RELOAD++; 3901 return if $RELOAD++;
3760 3902
3761 my $t1 = EV::time; 3903 my $t1 = AE::time;
3762 3904
3763 while ($RELOAD) { 3905 while ($RELOAD) {
3764 warn "reloading..."; 3906 cf::get_slot 0.1, -1, "reload_perl";
3907 info "perl_reload: reloading...";
3765 3908
3766 warn "entering sync_job"; 3909 trace "perl_reload: entering sync_job";
3767 3910
3768 cf::sync_job { 3911 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3912 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3913
3773 warn "syncing database to disk";
3774 BDB::db_env_txn_checkpoint $DB_ENV;
3775
3776 # if anything goes wrong in here, we should simply crash as we already saved
3777
3778 warn "flushing outstanding aio requests";
3779 while (IO::AIO::nreqs || BDB::nreqs) {
3780 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3781 }
3782
3783 warn "cancelling all extension coros"; 3914 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3915 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3916 %EXT_CORO = ();
3786 3917
3787 warn "removing commands"; 3918 trace "perl_reload: removing commands";
3788 %COMMAND = (); 3919 %COMMAND = ();
3789 3920
3790 warn "removing ext/exti commands"; 3921 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 3922 %EXTCMD = ();
3792 %EXTICMD = (); 3923 %EXTICMD = ();
3793 3924
3794 warn "unloading/nuking all extensions"; 3925 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3926 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3927 trace "... unloading $pkg";
3797 3928
3798 if (my $cb = $pkg->can ("unload")) { 3929 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3930 eval {
3800 $cb->($pkg); 3931 $cb->($pkg);
3801 1 3932 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3933 } or error "$pkg unloaded, but with errors: $@";
3803 } 3934 }
3804 3935
3805 warn "... clearing $pkg"; 3936 trace "... clearing $pkg";
3806 clear_package $pkg; 3937 clear_package $pkg;
3807 } 3938 }
3808 3939
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3940 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3941 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3943
3813 warn "... unloading $k"; 3944 trace "... unloading $k";
3814 delete $INC{$k}; 3945 delete $INC{$k};
3815 3946
3816 $k =~ s/\.pm$//; 3947 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3948 $k =~ s/\//::/g;
3818 3949
… …
3821 } 3952 }
3822 3953
3823 clear_package $k; 3954 clear_package $k;
3824 } 3955 }
3825 3956
3826 warn "getting rid of safe::, as good as possible"; 3957 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 3958 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 3960
3830 warn "unloading cf.pm \"a bit\""; 3961 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 3962 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3963 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 3964
3834 # don't, removes xs symbols, too, 3965 # don't, removes xs symbols, too,
3835 # and global variables created in xs 3966 # and global variables created in xs
3836 #clear_package __PACKAGE__; 3967 #clear_package __PACKAGE__;
3837 3968
3838 warn "unload completed, starting to reload now"; 3969 info "perl_reload: unload completed, starting to reload now";
3839 3970
3840 warn "reloading cf.pm"; 3971 trace "perl_reload: reloading cf.pm";
3841 require cf; 3972 require cf;
3842 cf::_connect_to_perl_1; 3973 cf::_connect_to_perl_1;
3843 3974
3844 warn "loading config and database again"; 3975 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 3976 cf::reload_config;
3846 3977
3847 warn "loading extensions"; 3978 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 3979 cf::load_extensions;
3849 3980
3850 if ($REATTACH_ON_RELOAD) { 3981 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 3982 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 3983 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 3984 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 3985 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 3986 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 3987 reattach $_ for values %PLAYER;
3857 } 3988 }
3858 3989
3859 warn "running post_init jobs"; 3990 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 3991
3862 warn "leaving sync_job"; 3992 trace "perl_reload: leaving sync_job";
3863 3993
3864 1 3994 1
3865 } or do { 3995 } or do {
3866 warn $@; 3996 error $@;
3867 cf::cleanup "error while reloading, exiting."; 3997 cf::cleanup "perl_reload: error, exiting.";
3868 }; 3998 };
3869 3999
3870 warn "reloaded";
3871 --$RELOAD; 4000 --$RELOAD;
3872 } 4001 }
3873 4002
3874 $t1 = EV::time - $t1; 4003 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4004 info "perl_reload: completed in ${t1}s\n";
3876}; 4005};
3877 4006
3878our $RELOAD_WATCHER; # used only during reload 4007our $RELOAD_WATCHER; # used only during reload
3879 4008
3880sub reload_perl() { 4009sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4011 # coro crashes during coro_state_free->destroy here.
3883 4012
3884 $RELOAD_WATCHER ||= cf::async { 4013 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4014 Coro::AIO::aio_wait cache_extensions;
3886 4015
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4016 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4017 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4018 undef $RELOAD_WATCHER;
3890 }; 4019 };
3891 }; 4020 };
3892} 4021}
… …
3901 reload_perl; 4030 reload_perl;
3902 }; 4031 };
3903 } 4032 }
3904}; 4033};
3905 4034
3906unshift @INC, $LIBDIR; 4035#############################################################################
3907 4036
3908my $bug_warning = 0; 4037my $bug_warning = 0;
3909 4038
3910our @WAIT_FOR_TICK; 4039our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN; 4040our @WAIT_FOR_TICK_BEGIN;
3912 4041
3913sub wait_for_tick { 4042sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3915 4044
3916 my $signal = new Coro::Signal; 4045 my $signal = new Coro::Signal;
3917 push @WAIT_FOR_TICK, $signal; 4046 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait; 4047 $signal->wait;
3919} 4048}
3920 4049
3921sub wait_for_tick_begin { 4050sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3923 4052
3924 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4054 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4055 $signal->wait;
… …
3933 return; 4062 return;
3934 } 4063 }
3935 4064
3936 cf::server_tick; # one server iteration 4065 cf::server_tick; # one server iteration
3937 4066
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4067 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4068
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4069 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4071 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4072 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4073 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4074 or error "ERROR: unable to write runtime file: $!";
3946 }; 4075 };
3947 } 4076 }
3948 4077
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4079 $sig->send;
… …
3958 4087
3959 if (0) { 4088 if (0) {
3960 if ($NEXT_TICK) { 4089 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4090 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4091 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4092 debug "jitter $JITTER\n";#d#
3964 } 4093 }
3965 } 4094 }
3966} 4095}
3967 4096
3968{ 4097{
… …
4013 IO::AIO::min_parallel 8; 4142 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4143 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4144 undef $AnyEvent::AIO::WATCHER;
4016} 4145}
4017 4146
4018my $_log_backtrace; 4147our $_log_backtrace;
4148our $_log_backtrace_last;
4019 4149
4020sub _log_backtrace { 4150sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4151 my ($msg, @addr) = @_;
4022 4152
4023 $msg =~ s/\n//; 4153 $msg =~ s/\n$//;
4024 4154
4155 if ($_log_backtrace_last eq $msg) {
4156 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4158 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4159 } elsif ($_log_backtrace < 2) {
4160 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4161 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4162 my $perl_bt = Carp::longmess $msg;
4029 async { 4163 async {
4030 $Coro::current->{desc} = "abt $msg"; 4164 $Coro::current->{desc} = "abt $msg";
4031 4165
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4185 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4186 --$_log_backtrace;
4053 }; 4187 };
4054 } else { 4188 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4190 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4191 }
4058} 4192}
4059 4193
4060# load additional modules 4194# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4195require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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