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.508 by root, Sun Mar 28 22:29:50 2010 UTC vs.
Revision 1.552 by root, Mon May 17 21:12:59 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
… …
1310} 1378}
1311 1379
1312use File::Glob (); 1380use File::Glob ();
1313 1381
1314cf::player->attach ( 1382cf::player->attach (
1315 on_command => sub { 1383 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1317 1385
1318 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1319 or return; 1387 or return;
1320 1388
… …
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
… …
1728 1821
1729=cut 1822=cut
1730 1823
1731sub find_by_path($) { 1824sub find_by_path($) {
1732 my ($path) = @_; 1825 my ($path) = @_;
1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1733 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}) {
… …
1794 1889
1795sub register { 1890sub register {
1796 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1892 my $pkg = caller;
1798 1893
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1895
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1897}
1804 1898
1805# also paths starting with '/' 1899# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1901
1808sub thawer_merge { 1902sub thawer_merge {
1809 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1810 1904
1811 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1816} 1910}
1817 1911
1818sub normalise { 1912sub normalise {
1819 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1820 1914
1821 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1822 1916
1823 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1824 1918
1825 # map plan: 1919 # map plan:
1826 # 1920 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1936 $path = "$base/$path";
1843 } 1937 }
1844 1938
1845 for ($path) { 1939 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1849 } 1942 }
1850 1943
1851 $path 1944 $path
… …
1865 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1866 return $self; 1959 return $self;
1867 } 1960 }
1868 } 1961 }
1869 1962
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1964 ()
1872} 1965}
1873 1966
1874sub init { 1967sub init {
1875 my ($self) = @_; 1968 my ($self) = @_;
… …
1997} 2090}
1998 2091
1999sub find; 2092sub find;
2000sub find { 2093sub find {
2001 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
2002 2097
2003 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2004 2099
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2121 or next; 2216 or next;
2122 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2123 or next; 2218 or next;
2124 $neigh->load; 2219 $neigh->load;
2125 2220
2221 # now find the diagonal neighbours
2126 push @neigh, 2222 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2225 }
2130 2226
… …
2137} 2233}
2138 2234
2139sub find_sync { 2235sub find_sync {
2140 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2141 2237
2142 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2143} 2242}
2144 2243
2145sub do_load_sync { 2244sub do_load_sync {
2146 my ($map) = @_; 2245 my ($map) = @_;
2147 2246
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2150 2249
2151 cf::sync_job { $map->load }; 2250 $map->load;
2152} 2251}
2153 2252
2154our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2156 2255
… …
2182 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2183 2282
2184 () 2283 ()
2185} 2284}
2186 2285
2286# common code, used by both ->save and ->swapout
2187sub save { 2287sub _save {
2188 my ($self) = @_; 2288 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2289
2192 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2193 2291
2194 return unless $self->dirty; 2292 return unless $self->dirty;
2195 2293
… …
2215 } else { 2313 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2314 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2315 }
2218} 2316}
2219 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2220sub swap_out { 2326sub swap_out {
2221 my ($self) = @_; 2327 my ($self) = @_;
2222 2328
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2330
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2231 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->in_memory (cf::MAP_SWAPPED); 2338 $self->in_memory (cf::MAP_SWAPPED);
2339
2340 # then atomically save
2341 $self->_save;
2342
2343 # then free the map
2344 $self->clear;
2345}
2346
2347sub reset_at {
2348 my ($self) = @_;
2349
2350 # TODO: safety, remove and allow resettable per-player maps
2351 return 1e99 if $self->{deny_reset};
2352
2353 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2354 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2355
2356 $time + $to
2357}
2358
2359sub should_reset {
2360 my ($self) = @_;
2361
2362 $self->reset_at <= $cf::RUNTIME
2363}
2364
2365sub reset {
2366 my ($self) = @_;
2367
2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2369
2370 return if $self->players;
2371
2372 cf::trace "resetting map ", $self->path, "\n";
2373
2374 $self->in_memory (cf::MAP_SWAPPED);
2375
2376 # need to save uniques path
2377 unless ($self->{deny_save}) {
2378 my $uniq = $self->uniq_path; utf8::encode $uniq;
2379
2380 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2381 if $uniq;
2382 }
2383
2384 delete $cf::MAP{$self->path};
2233 2385
2234 $self->deactivate; 2386 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2388 $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 2389
2282 $self->unlink_save; 2390 $self->unlink_save;
2283 $self->destroy; 2391 $self->destroy;
2284} 2392}
2285 2393
… …
2293 2401
2294 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2295 2403
2296 $self->unlink_save; 2404 $self->unlink_save;
2297 2405
2298 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2411
… …
2533 2641
2534Freezes the player and moves him/her to a special map (C<{link}>). 2642Freezes the player and moves him/her to a special map (C<{link}>).
2535 2643
2536The player should be reasonably safe there for short amounts of time (e.g. 2644The 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, 2645for 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 2646though, as the player cannot control the character while it is on the link
2539map. 2647map.
2540 2648
2541Will never block. 2649Will never block.
2542 2650
2543=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2565 my ($self) = @_; 2673 my ($self) = @_;
2566 2674
2567 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2568 2676
2677 ++$self->{_link_recursion};
2678
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2680
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2573 2683
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2685}
2576 2686
2577sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2579 2689
… …
2604 $map->load_neighbours; 2714 $map->load_neighbours;
2605 2715
2606 return unless $self->contr->active; 2716 return unless $self->contr->active;
2607 2717
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2610 2720 # entering was successful
2721 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2722 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2723 $self->activate_recursive;
2613} 2724 }
2614 2725
2726}
2727
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2728=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2729
2617Moves the player to the given map-path and coordinates by first freezing 2730Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2732that 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 2733the new (success) or old (failed) map position. In either case, $done will
… …
2627 2740
2628our $GOTOGEN; 2741our $GOTOGEN;
2629 2742
2630sub cf::object::player::goto { 2743sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2745
2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2750 }
2632 2751
2633 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2754
2636 $self->enter_link; 2755 $self->enter_link;
… …
2660 my $map = eval { 2779 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2662 2781
2663 if ($map) { 2782 if ($map) {
2664 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2785 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2786 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2787 }
2669 2788
2670 $map 2789 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2681 } 2800 }
2682 2801
2683 $done->() if $done; 2802 $done->($self) if $done;
2684 })->prio (1); 2803 })->prio (1);
2685} 2804}
2686 2805
2687=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2688 2807
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2904
2786 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2906 $self->leave_link;
2788 } 2907 }
2789 })->prio (1); 2908 })->prio (1);
2790} 2909}
2791 2910
… …
3104 3223
3105 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3225 if $reply;
3107 3226
3108 } else { 3227 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3229 }
3111 3230
3112 cf::override; 3231 cf::override;
3113 }, 3232 },
3114); 3233);
… …
3134 3253
3135 $coro 3254 $coro
3136} 3255}
3137 3256
3138cf::client->attach ( 3257cf::client->attach (
3139 on_destroy => sub { 3258 on_client_destroy => sub {
3140 my ($ns) = @_; 3259 my ($ns) = @_;
3141 3260
3142 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3143 }, 3262 },
3144); 3263);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3316 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3199) { 3318) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3321 for @funs;
3204} 3322}
3205 3323
… …
3244 local @cf::_safe_eval_args = values %vars; 3362 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3363 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3364 }
3247 3365
3248 if ($@) { 3366 if ($@) {
3249 warn "$@"; 3367 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3252 } 3370 }
3253 3371
3254 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3255} 3373}
3256 3374
… …
3290 # for this (global event?) 3408 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3410
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3412
3295 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3296 3414
3297 my $facedata;
3298 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3299 or die "$path: $!"; 3416 or die "$path: $!";
3300 3417
3301 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3302 3419
3303 $facedata->{version} == 2 3420 $facedata->{version} == 2
… …
3334 3451
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3455 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3457 }
3341 3458
3342 cf::cede_to_tick; 3459 cf::cede_to_tick;
3343 } 3460 }
3344 } 3461 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3480
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3366 } else { 3483 } else {
3367 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3368 } 3485 }
3369 3486
3370 cf::cede_to_tick; 3487 cf::cede_to_tick;
3371 } 3488 }
3372 } 3489 }
3373 3490
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3492
3376 1 3493 1
3377} 3494}
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 3495
3399register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3401 3498
3402 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3538sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3444} 3541}
3445 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3446sub reload_resources { 3566sub reload_resources {
3447 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3448 3568
3569 reload_exp_table;
3570 reload_materials;
3449 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3450 reload_archetypes; 3573 reload_archetypes;
3451 reload_regions; 3574 reload_regions;
3452 reload_treasures; 3575 reload_treasures;
3453 3576
3454 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3455} 3578}
3456 3579
3457sub reload_config { 3580sub reload_config {
3458 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3459 3582
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3583 0 < aio_load "$CONFDIR/config", my $config
3461 or return; 3584 or die "$CONFDIR/config: $!";
3462 3585
3463 local $/; 3586 utf8::decode $config;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = yaml_load $config;
3465 3588
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3590
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $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}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3593
3471 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3598 };
3476 warn $@ if $@; 3599 warn $@ if $@;
3477 } 3600 }
3478
3479 warn "finished reloading resource files\n";
3480} 3601}
3481 3602
3482sub pidfile() { 3603sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3605 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3498 print $fh $$; 3619 print $fh $$;
3499} 3620}
3500 3621
3501sub main_loop { 3622sub main_loop {
3502 warn "EV::loop starting\n"; 3623 trace "EV::loop starting\n";
3503 if (1) { 3624 if (1) {
3504 EV::loop; 3625 EV::loop;
3505 } 3626 }
3506 warn "EV::loop returned\n"; 3627 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3628 goto &main_loop unless $REALLY_UNLOOP;
3508} 3629}
3509 3630
3510sub main { 3631sub main {
3511 cf::init_globals; # initialise logging 3632 cf::init_globals; # initialise logging
3512 3633
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3637 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 3638
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3640
3525 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
… …
3532 }; 3648 };
3533 3649
3534 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3535 3651
3536 cf::sync_job { 3652 cf::sync_job {
3653 cf::incloader::init ();
3654
3655 cf::init_anim;
3656 cf::init_attackmess;
3657 cf::init_dynamic;
3658
3537 cf::load_settings; 3659 cf::load_settings;
3538 cf::load_materials;
3539 3660
3540 reload_resources; 3661 reload_resources;
3541 reload_config; 3662 reload_config;
3542 db_init; 3663 db_init;
3543 3664
3544 cf::init_uuid; 3665 cf::init_uuid;
3545 cf::init_signals; 3666 cf::init_signals;
3546 cf::init_commands;
3547 cf::init_skills; 3667 cf::init_skills;
3548 3668
3549 cf::init_beforeplay; 3669 cf::init_beforeplay;
3550 3670
3551 atomic; 3671 atomic;
… …
3556 3676
3557 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3558 use POSIX (); 3678 use POSIX ();
3559 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3560 3680
3561 (pop @POST_INIT)->(0) while @POST_INIT; 3681 cf::_post_init 0;
3562 }; 3682 };
3563 3683
3684 cf::object::thawer::errors_are_fatal 0;
3685 info "parse errors in files are no longer fatal from this point on.\n";
3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3564 main_loop; 3692 goto &main_loop;
3565} 3693}
3566 3694
3567############################################################################# 3695#############################################################################
3568# initialisation and cleanup 3696# initialisation and cleanup
3569 3697
3570# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3571BEGIN { 3699BEGIN {
3572 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3573 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3574 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3575 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3576 }; 3704 };
3577 } 3705 }
3578} 3706}
3579 3707
3580sub write_runtime_sync { 3708sub write_runtime_sync {
3581 my $t0 = EV::time; 3709 my $t0 = AE::time;
3582 3710
3583 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3584 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3585 3713
3586 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3608 or return; 3736 or return;
3609 3737
3610 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3611 and return; 3739 and return;
3612 3740
3613 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3614 3742
3615 1 3743 1
3616} 3744}
3617 3745
3618our $uuid_lock; 3746our $uuid_lock;
… …
3630 or return; 3758 or return;
3631 3759
3632 my $value = uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3633 3761
3634 unless ($value) { 3762 unless ($value) {
3635 warn "cowardly refusing to write zero uuid value!\n"; 3763 info "cowardly refusing to write zero uuid value!\n";
3636 return; 3764 return;
3637 } 3765 }
3638 3766
3639 my $value = uuid_str $value + $uuid_skip; 3767 my $value = uuid_str $value + $uuid_skip;
3640 $uuid_skip = 0; 3768 $uuid_skip = 0;
… …
3650 or return; 3778 or return;
3651 3779
3652 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3653 and return; 3781 and return;
3654 3782
3655 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3656 3784
3657 1 3785 1
3658 3786
3659} 3787}
3660 3788
… …
3666} 3794}
3667 3795
3668sub emergency_save() { 3796sub emergency_save() {
3669 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3670 3798
3671 warn "emergency_perl_save: enter\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3672 3805
3673 cf::sync_job { 3806 cf::sync_job {
3674 # this is a trade-off: we want to be very quick here, so 3807 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 3808
3679 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3680 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3681 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3682 warn "emergency_perl_save: begin player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3683 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3684 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3685 $pl->valid or next; 3815 $pl->valid or next;
3686 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3687 $pl->save; 3817 $pl->save;
3688 } 3818 }
3689 warn "emergency_perl_save: end player save\n"; 3819 info "emergency_perl_save: end player save\n";
3690 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3691 warn "emergency_perl_save: begin map save\n"; 3823 info "emergency_perl_save: begin map save\n";
3692 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3693 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3694 $map->valid or next; 3826 $map->valid or next;
3695 $map->save; 3827 $map->save;
3696 } 3828 }
3697 warn "emergency_perl_save: end map save\n"; 3829 info "emergency_perl_save: end map save\n";
3698 3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3699 warn "emergency_perl_save: begin database checkpoint\n"; 3833 info "emergency_perl_save: begin database checkpoint\n";
3700 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3701 warn "emergency_perl_save: end database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3702 3836
3703 warn "emergency_perl_save: begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3704 write_uuid_sync 1; 3838 write_uuid_sync 1;
3705 warn "emergency_perl_save: end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3706 }; 3859 };
3707 3860
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"; 3861 info "emergency_perl_save: leave\n";
3714} 3862}
3715 3863
3716sub post_cleanup { 3864sub post_cleanup {
3717 my ($make_core) = @_; 3865 my ($make_core) = @_;
3718 3866
3867 IO::AIO::flush;
3868
3719 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3720 if $make_core; 3870 if $make_core;
3721 3871
3722 my $fh = pidfile; 3872 my $fh = pidfile;
3723 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3724} 3874}
… …
3744 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3745 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3746 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3747# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3748 } 3898 }
3749 warn "cleared package $pkg\n";#d#
3750} 3899}
3751 3900
3752sub do_reload_perl() { 3901sub do_reload_perl() {
3753 # can/must only be called in main 3902 # can/must only be called in main
3754 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3755 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3756 return; 3905 return;
3757 } 3906 }
3758 3907
3759 return if $RELOAD++; 3908 return if $RELOAD++;
3760 3909
3761 my $t1 = EV::time; 3910 my $t1 = AE::time;
3762 3911
3763 while ($RELOAD) { 3912 while ($RELOAD) {
3764 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3765 3915
3766 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3767 3917
3768 cf::sync_job { 3918 cf::sync_job {
3769 cf::write_runtime_sync; # external watchdog should not bark
3770 cf::emergency_save; 3919 #cf::emergency_save;
3771 cf::write_runtime_sync; # external watchdog should not bark
3772 3920
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"; 3921 trace "perl_reload: cancelling all extension coros";
3784 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3785 %EXT_CORO = (); 3923 %EXT_CORO = ();
3786 3924
3787 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3788 %COMMAND = (); 3926 %COMMAND = ();
3789 3927
3790 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3791 %EXTCMD = (); 3929 %EXTCMD = ();
3792 %EXTICMD = (); 3930 %EXTICMD = ();
3793 3931
3794 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3795 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3796 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3797 3935
3798 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3799 eval { 3937 eval {
3800 $cb->($pkg); 3938 $cb->($pkg);
3801 1 3939 1
3802 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3803 } 3941 }
3804 3942
3805 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3806 clear_package $pkg; 3944 clear_package $pkg;
3807 } 3945 }
3808 3946
3809 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3810 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3811 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3812 3950
3813 warn "... unloading $k"; 3951 trace "... unloading $k";
3814 delete $INC{$k}; 3952 delete $INC{$k};
3815 3953
3816 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3817 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3818 3956
… …
3821 } 3959 }
3822 3960
3823 clear_package $k; 3961 clear_package $k;
3824 } 3962 }
3825 3963
3826 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3827 clear_package "safe::$_" 3965 clear_package "safe::$_"
3828 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3829 3967
3830 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3831 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3832 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3833 3971
3834 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3835 # and global variables created in xs 3973 # and global variables created in xs
3836 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3837 3975
3838 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3839 3977
3840 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3841 require cf; 3979 require cf;
3842 cf::_connect_to_perl_1; 3980 cf::_connect_to_perl_1;
3843 3981
3844 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3845 cf::reload_config; 3983 cf::reload_config;
3846 3984
3847 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3848 cf::load_extensions; 3986 cf::load_extensions;
3849 3987
3850 if ($REATTACH_ON_RELOAD) { 3988 if ($REATTACH_ON_RELOAD) {
3851 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3852 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3853 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3854 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3855 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3856 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3857 } 3995 }
3858 3996
3859 warn "running post_init jobs"; 3997 cf::_post_init 1;
3860 (pop @POST_INIT)->(1) while @POST_INIT;
3861 3998
3862 warn "leaving sync_job"; 3999 trace "perl_reload: leaving sync_job";
3863 4000
3864 1 4001 1
3865 } or do { 4002 } or do {
3866 warn $@; 4003 error $@;
3867 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3868 }; 4005 };
3869 4006
3870 warn "reloaded";
3871 --$RELOAD; 4007 --$RELOAD;
3872 } 4008 }
3873 4009
3874 $t1 = EV::time - $t1; 4010 $t1 = AE::time - $t1;
3875 warn "reload completed in ${t1}s\n"; 4011 info "perl_reload: completed in ${t1}s\n";
3876}; 4012};
3877 4013
3878our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3879 4015
3880sub reload_perl() { 4016sub reload_perl() {
… …
3882 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3883 4019
3884 $RELOAD_WATCHER ||= cf::async { 4020 $RELOAD_WATCHER ||= cf::async {
3885 Coro::AIO::aio_wait cache_extensions; 4021 Coro::AIO::aio_wait cache_extensions;
3886 4022
3887 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3888 do_reload_perl; 4024 do_reload_perl;
3889 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
3890 }; 4026 };
3891 }; 4027 };
3892} 4028}
… …
3901 reload_perl; 4037 reload_perl;
3902 }; 4038 };
3903 } 4039 }
3904}; 4040};
3905 4041
3906unshift @INC, $LIBDIR; 4042#############################################################################
3907 4043
3908my $bug_warning = 0; 4044my $bug_warning = 0;
3909 4045
3910our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3911our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3912 4048
3913sub wait_for_tick { 4049sub wait_for_tick() {
3914 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3915 4051
3916 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3917 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3918 $signal->wait; 4054 $signal->wait;
3919} 4055}
3920 4056
3921sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3922 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3923 4059
3924 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3925 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3926 $signal->wait; 4062 $signal->wait;
… …
3933 return; 4069 return;
3934 } 4070 }
3935 4071
3936 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3937 4073
3938 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4074 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3939 4075
3940 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3941 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3942 Coro::async_pool { 4078 Coro::async_pool {
3943 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3944 write_runtime_sync 4080 write_runtime_sync
3945 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3946 }; 4082 };
3947 } 4083 }
3948 4084
3949 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3950 $sig->send; 4086 $sig->send;
… …
3958 4094
3959 if (0) { 4095 if (0) {
3960 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3961 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3962 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3963 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3964 } 4100 }
3965 } 4101 }
3966} 4102}
3967 4103
3968{ 4104{
… …
4013 IO::AIO::min_parallel 8; 4149 IO::AIO::min_parallel 8;
4014 IO::AIO::max_poll_time $TICK * 0.1; 4150 IO::AIO::max_poll_time $TICK * 0.1;
4015 undef $AnyEvent::AIO::WATCHER; 4151 undef $AnyEvent::AIO::WATCHER;
4016} 4152}
4017 4153
4018my $_log_backtrace; 4154our $_log_backtrace;
4155our $_log_backtrace_last;
4019 4156
4020sub _log_backtrace { 4157sub _log_backtrace {
4021 my ($msg, @addr) = @_; 4158 my ($msg, @addr) = @_;
4022 4159
4023 $msg =~ s/\n//; 4160 $msg =~ s/\n$//;
4024 4161
4162 if ($_log_backtrace_last eq $msg) {
4163 LOG llevInfo, "[ABT] $msg\n";
4164 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4025 # limit the # of concurrent backtraces 4165 # limit the # of concurrent backtraces
4026 if ($_log_backtrace < 2) { 4166 } elsif ($_log_backtrace < 2) {
4167 $_log_backtrace_last = $msg;
4027 ++$_log_backtrace; 4168 ++$_log_backtrace;
4028 my $perl_bt = Carp::longmess $msg; 4169 my $perl_bt = Carp::longmess $msg;
4029 async { 4170 async {
4030 $Coro::current->{desc} = "abt $msg"; 4171 $Coro::current->{desc} = "abt $msg";
4031 4172
… …
4051 LOG llevInfo, "[ABT] $_\n" for @bt; 4192 LOG llevInfo, "[ABT] $_\n" for @bt;
4052 --$_log_backtrace; 4193 --$_log_backtrace;
4053 }; 4194 };
4054 } else { 4195 } else {
4055 LOG llevInfo, "[ABT] $msg\n"; 4196 LOG llevInfo, "[ABT] $msg\n";
4056 LOG llevInfo, "[ABT] [suppressed]\n"; 4197 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4057 } 4198 }
4058} 4199}
4059 4200
4060# load additional modules 4201# load additional modules
4061require "cf/$_.pm" for @EXTRA_MODULES; 4202require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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