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.504 by root, Sat Jan 30 23:50:16 2010 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 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;
1402 } 1472 }
1403 1473
1474 my $pass = 0;
1404 my %done; 1475 my %done;
1405 while (%todo) { 1476 while (%todo) {
1406 my $progress; 1477 my $progress;
1407 1478
1479 ++$pass;
1480
1481 ext:
1408 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1409 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1410 goto skip 1484 next ext
1411 unless exists $done{$_}; 1485 unless exists $done{$_};
1412 } 1486 }
1413 1487
1414 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415 1489
1416 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1417 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1418 : "$v->{base}: extension inactive.\n";
1419 1494
1420 if (exists $v->{meta}{mandatory}) {
1421 warn $msg;
1422 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423 } 1496 if exists $v->{meta}{mandatory};
1424 1497
1425 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1426 } 1507 }
1427
1428 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg};
1430 $progress = 1;
1431 } 1508 }
1432 1509
1433 skip: 1510 unless ($progress) {
1434 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1436 } 1518 }
1437 }; 1519 };
1438} 1520}
1439 1521
1440############################################################################# 1522#############################################################################
… …
1524 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1525 } 1607 }
1526 } 1608 }
1527} 1609}
1528 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
1529sub save($) { 1624sub save($) {
1530 my ($pl) = @_; 1625 my ($pl) = @_;
1531 1626
1532 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1533 1628
… …
1538 1633
1539 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1540 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1541 1636
1542 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];
1543 1641
1544 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1545 cf::cede_to_tick; 1643 cf::cede_to_tick;
1546} 1644}
1547 1645
… …
1581 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1582 1680
1583 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1584 $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
1585 1683
1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587 $pl->deactivate; 1685 $pl->deactivate;
1686
1588 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;
1589 $pl->ob->check_score;
1590 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1591 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1592 1692
1593 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1594 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1595 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1649 \@logins 1749 \@logins
1650} 1750}
1651 1751
1652=item $player->maps 1752=item $player->maps
1653 1753
1754=item cf::player::maps $login
1755
1654Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1655player. May block. 1757player. May block.
1656 1758
1657=cut 1759=cut
1658 1760
… …
1720=cut 1822=cut
1721 1823
1722sub find_by_path($) { 1824sub find_by_path($) {
1723 my ($path) = @_; 1825 my ($path) = @_;
1724 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1725 my ($match, $specificity); 1829 my ($match, $specificity);
1726 1830
1727 for my $region (list) { 1831 for my $region (list) {
1728 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1729 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1760 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
1761 1865
1762 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1763 $self->_create_random_map ( 1867 $self->_create_random_map (
1764 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1766 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1768 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1769 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1785 1889
1786sub register { 1890sub register {
1787 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1788 my $pkg = caller; 1892 my $pkg = caller;
1789 1893
1790 no strict;
1791 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1792 1895
1793 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794} 1897}
1795 1898
1796# also paths starting with '/' 1899# also paths starting with '/'
1797$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798 1901
1799sub thawer_merge { 1902sub thawer_merge {
1800 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1801 1904
1802 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1807} 1910}
1808 1911
1809sub normalise { 1912sub normalise {
1810 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1811 1914
1812 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1813 1916
1814 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1815 1918
1816 # map plan: 1919 # map plan:
1817 # 1920 #
… …
1832 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1833 $path = "$base/$path"; 1936 $path = "$base/$path";
1834 } 1937 }
1835 1938
1836 for ($path) { 1939 for ($path) {
1837 redo if s{//}{/};
1838 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1839 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1840 } 1942 }
1841 1943
1842 $path 1944 $path
… …
1856 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1857 return $self; 1959 return $self;
1858 } 1960 }
1859 } 1961 }
1860 1962
1861 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1862 () 1964 ()
1863} 1965}
1864 1966
1865sub init { 1967sub init {
1866 my ($self) = @_; 1968 my ($self) = @_;
… …
1988} 2090}
1989 2091
1990sub find; 2092sub find;
1991sub find { 2093sub find {
1992 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
1993 2097
1994 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1995 2099
1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2084 } 2188 }
2085 2189
2086 $self->post_load; 2190 $self->post_load;
2087} 2191}
2088 2192
2193# customize the map for a given player, i.e.
2194# return the _real_ map. used by e.g. per-player
2195# maps to change the path to ~playername/mappath
2089sub customise_for { 2196sub customise_for {
2090 my ($self, $ob) = @_; 2197 my ($self, $ob) = @_;
2091 2198
2092 return find "~" . $ob->name . "/" . $self->{path} 2199 return find "~" . $ob->name . "/" . $self->{path}
2093 if $self->per_player; 2200 if $self->per_player;
… …
2109 or next; 2216 or next;
2110 $neigh = find $neigh, $map 2217 $neigh = find $neigh, $map
2111 or next; 2218 or next;
2112 $neigh->load; 2219 $neigh->load;
2113 2220
2221 # now find the diagonal neighbours
2114 push @neigh, 2222 push @neigh,
2115 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2223 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2116 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2224 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2117 } 2225 }
2118 2226
… …
2125} 2233}
2126 2234
2127sub find_sync { 2235sub find_sync {
2128 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2129 2237
2130 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
2131} 2242}
2132 2243
2133sub do_load_sync { 2244sub do_load_sync {
2134 my ($map) = @_; 2245 my ($map) = @_;
2135 2246
2136 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2138 2249
2139 cf::sync_job { $map->load }; 2250 $map->load;
2140} 2251}
2141 2252
2142our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2143our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2144 2255
… …
2170 $MAP_PREFETCHER->prio (6); 2281 $MAP_PREFETCHER->prio (6);
2171 2282
2172 () 2283 ()
2173} 2284}
2174 2285
2286# common code, used by both ->save and ->swapout
2175sub save { 2287sub _save {
2176 my ($self) = @_; 2288 my ($self) = @_;
2177
2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2179 2289
2180 $self->{last_save} = $cf::RUNTIME; 2290 $self->{last_save} = $cf::RUNTIME;
2181 2291
2182 return unless $self->dirty; 2292 return unless $self->dirty;
2183 2293
… …
2203 } else { 2313 } else {
2204 $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);
2205 } 2315 }
2206} 2316}
2207 2317
2318sub save {
2319 my ($self) = @_;
2320
2321 my $lock = cf::lock_acquire "map_data:$self->{path}";
2322
2323 $self->_save;
2324}
2325
2208sub swap_out { 2326sub swap_out {
2209 my ($self) = @_; 2327 my ($self) = @_;
2210 2328
2211 # save first because save cedes
2212 $self->save;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215 2330
2216 return if $self->players;
2217 return if $self->in_memory != cf::MAP_ACTIVE; 2331 return if $self->in_memory != cf::MAP_ACTIVE;
2218 return if $self->{deny_save}; 2332 return if $self->{deny_save};
2333 return if $self->players;
2219 2334
2335 # first deactivate the map and "unlink" it from the core
2336 $self->deactivate;
2337 $_->clear_links_to ($self) for values %cf::MAP;
2220 $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};
2221 2385
2222 $self->deactivate; 2386 $self->deactivate;
2223 $_->clear_links_to ($self) for values %cf::MAP; 2387 $_->clear_links_to ($self) for values %cf::MAP;
2224 $self->clear; 2388 $self->clear;
2225}
2226
2227sub reset_at {
2228 my ($self) = @_;
2229
2230 # TODO: safety, remove and allow resettable per-player maps
2231 return 1e99 if $self->{deny_reset};
2232
2233 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236 $time + $to
2237}
2238
2239sub should_reset {
2240 my ($self) = @_;
2241
2242 $self->reset_at <= $cf::RUNTIME
2243}
2244
2245sub reset {
2246 my ($self) = @_;
2247
2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250 return if $self->players;
2251
2252 warn "resetting map ", $self->path, "\n";
2253
2254 $self->in_memory (cf::MAP_SWAPPED);
2255
2256 # need to save uniques path
2257 unless ($self->{deny_save}) {
2258 my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2261 if $uniq;
2262 }
2263
2264 delete $cf::MAP{$self->path};
2265
2266 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear;
2269 2389
2270 $self->unlink_save; 2390 $self->unlink_save;
2271 $self->destroy; 2391 $self->destroy;
2272} 2392}
2273 2393
… …
2281 2401
2282 delete $cf::MAP{$self->path}; 2402 delete $cf::MAP{$self->path};
2283 2403
2284 $self->unlink_save; 2404 $self->unlink_save;
2285 2405
2286 bless $self, "cf::map"; 2406 bless $self, "cf::map::wrap";
2287 delete $self->{deny_reset}; 2407 delete $self->{deny_reset};
2288 $self->{deny_save} = 1; 2408 $self->{deny_save} = 1;
2289 $self->reset_timeout (1); 2409 $self->reset_timeout (1);
2290 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2410 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291 2411
… …
2521 2641
2522Freezes 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}>).
2523 2643
2524The 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.
2525for 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,
2526though, 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
2527map. 2647map.
2528 2648
2529Will never block. 2649Will never block.
2530 2650
2531=item $player_object->leave_link ($map, $x, $y) 2651=item $player_object->leave_link ($map, $x, $y)
… …
2552sub cf::object::player::enter_link { 2672sub cf::object::player::enter_link {
2553 my ($self) = @_; 2673 my ($self) = @_;
2554 2674
2555 $self->deactivate_recursive; 2675 $self->deactivate_recursive;
2556 2676
2677 ++$self->{_link_recursion};
2678
2557 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2679 return if UNIVERSAL::isa $self->map, "ext::map_link";
2558 2680
2559 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2681 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560 if $self->map && $self->map->{path} ne "{link}"; 2682 if $self->map && $self->map->{path} ne "{link}";
2561 2683
2562 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2684 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2563} 2685}
2564 2686
2565sub cf::object::player::leave_link { 2687sub cf::object::player::leave_link {
2566 my ($self, $map, $x, $y) = @_; 2688 my ($self, $map, $x, $y) = @_;
2567 2689
… …
2592 $map->load_neighbours; 2714 $map->load_neighbours;
2593 2715
2594 return unless $self->contr->active; 2716 return unless $self->contr->active;
2595 2717
2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2718 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597 $self->enter_map ($map, $x, $y); 2719 if ($self->enter_map ($map, $x, $y)) {
2598 2720 # entering was successful
2721 delete $self->{_link_recursion};
2599 # only activate afterwards, to support waiting in hooks 2722 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive; 2723 $self->activate_recursive;
2601} 2724 }
2602 2725
2726}
2727
2603=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)]])
2604 2729
2605Moves 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
2606her, loading and preparing them map, calling the provided $check callback 2731her, loading and preparing them map, calling the provided $check callback
2607that 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
2608the 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
… …
2615 2740
2616our $GOTOGEN; 2741our $GOTOGEN;
2617 2742
2618sub cf::object::player::goto { 2743sub cf::object::player::goto {
2619 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 }
2620 2751
2621 # 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
2622 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2753 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623 2754
2624 $self->enter_link; 2755 $self->enter_link;
… …
2648 my $map = eval { 2779 my $map = eval {
2649 my $map = defined $path ? cf::map::find $path : undef; 2780 my $map = defined $path ? cf::map::find $path : undef;
2650 2781
2651 if ($map) { 2782 if ($map) {
2652 $map = $map->customise_for ($self); 2783 $map = $map->customise_for ($self);
2653 $map = $check->($map) if $check && $map; 2784 $map = $check->($map, $x, $y, $self) if $check && $map;
2654 } else { 2785 } else {
2655 $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);
2656 } 2787 }
2657 2788
2658 $map 2789 $map
… …
2666 if ($gen == $self->{_goto_generation}) { 2797 if ($gen == $self->{_goto_generation}) {
2667 delete $self->{_goto_generation}; 2798 delete $self->{_goto_generation};
2668 $self->leave_link ($map, $x, $y); 2799 $self->leave_link ($map, $x, $y);
2669 } 2800 }
2670 2801
2671 $done->() if $done; 2802 $done->($self) if $done;
2672 })->prio (1); 2803 })->prio (1);
2673} 2804}
2674 2805
2675=item $player_object->enter_exit ($exit_object) 2806=item $player_object->enter_exit ($exit_object)
2676 2807
… …
2769 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2770 . "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. "
2771 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2772 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2773 2904
2774 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2775 $self->leave_link; 2906 $self->leave_link;
2776 } 2907 }
2777 })->prio (1); 2908 })->prio (1);
2778} 2909}
2779 2910
… …
3092 3223
3093 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3094 if $reply; 3225 if $reply;
3095 3226
3096 } else { 3227 } else {
3097 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";
3098 } 3229 }
3099 3230
3100 cf::override; 3231 cf::override;
3101 }, 3232 },
3102); 3233);
… …
3122 3253
3123 $coro 3254 $coro
3124} 3255}
3125 3256
3126cf::client->attach ( 3257cf::client->attach (
3127 on_destroy => sub { 3258 on_client_destroy => sub {
3128 my ($ns) = @_; 3259 my ($ns) = @_;
3129 3260
3130 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3261 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131 }, 3262 },
3132); 3263);
… …
3183 decrease split destroy change_exp value msg lore send_msg)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3184 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3185 ["cf::player" => qw(peaceful send_msg)], 3316 ["cf::player" => qw(peaceful send_msg)],
3186 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3187) { 3318) {
3188 no strict 'refs';
3189 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191 for @funs; 3321 for @funs;
3192} 3322}
3193 3323
… …
3232 local @cf::_safe_eval_args = values %vars; 3362 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval; 3363 @res = wantarray ? eval eval : scalar eval $eval;
3234 } 3364 }
3235 3365
3236 if ($@) { 3366 if ($@) {
3237 warn "$@"; 3367 warn "$@",
3238 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3239 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3240 } 3370 }
3241 3371
3242 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3243} 3373}
3244 3374
… …
3278 # for this (global event?) 3408 # for this (global event?)
3279 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3280 3410
3281 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282 3412
3283 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3284 3414
3285 my $facedata;
3286 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3287 or die "$path: $!"; 3416 or die "$path: $!";
3288 3417
3289 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3290 3419
3291 $facedata->{version} == 2 3420 $facedata->{version} == 2
… …
3322 3451
3323 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3324 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3325 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326 } else { 3455 } else {
3327 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3328 } 3457 }
3329 3458
3330 cf::cede_to_tick; 3459 cf::cede_to_tick;
3331 } 3460 }
3332 } 3461 }
… …
3350 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351 3480
3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3354 } else { 3483 } else {
3355 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3356 } 3485 }
3357 3486
3358 cf::cede_to_tick; 3487 cf::cede_to_tick;
3359 } 3488 }
3360 } 3489 }
3361 3490
3362 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363 3492
3364 1 3493 1
3365} 3494}
3366
3367cf::global->attach (on_resource_update => sub {
3368 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372 my $sound = $soundconf->{compat}[$_]
3373 or next;
3374
3375 my $face = cf::face::find "sound/$sound->[1]";
3376 cf::sound::set $sound->[0] => $face;
3377 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378 }
3379
3380 while (my ($k, $v) = each %{$soundconf->{event}}) {
3381 my $face = cf::face::find "sound/$v";
3382 cf::sound::set $k => $face;
3383 }
3384 }
3385});
3386 3495
3387register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3388 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3389 3498
3390 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
… …
3429sub reload_treasures { 3538sub reload_treasures {
3430 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3431 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3432} 3541}
3433 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
3434sub reload_resources { 3566sub reload_resources {
3435 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3436 3568
3569 reload_exp_table;
3570 reload_materials;
3437 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3438 reload_archetypes; 3573 reload_archetypes;
3439 reload_regions; 3574 reload_regions;
3440 reload_treasures; 3575 reload_treasures;
3441 3576
3442 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3443} 3578}
3444 3579
3445sub reload_config { 3580sub reload_config {
3446 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3447 3582
3448 open my $fh, "<:utf8", "$CONFDIR/config" 3583 0 < aio_load "$CONFDIR/config", my $config
3449 or return; 3584 or die "$CONFDIR/config: $!";
3450 3585
3451 local $/; 3586 utf8::decode $config;
3452 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = yaml_load $config;
3453 3588
3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455 3590
3456 $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};
3457 $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};
3458 3593
3459 if (exists $CFG{mlockall}) { 3594 if (exists $CFG{mlockall}) {
… …
3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3463 }; 3598 };
3464 warn $@ if $@; 3599 warn $@ if $@;
3465 } 3600 }
3466
3467 warn "finished reloading resource files\n";
3468} 3601}
3469 3602
3470sub pidfile() { 3603sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!"; 3605 or die "$PIDFILE: $!";
… …
3485 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3486 print $fh $$; 3619 print $fh $$;
3487} 3620}
3488 3621
3489sub main_loop { 3622sub main_loop {
3490 warn "EV::loop starting\n"; 3623 trace "EV::loop starting\n";
3491 if (1) { 3624 if (1) {
3492 EV::loop; 3625 EV::loop;
3493 } 3626 }
3494 warn "EV::loop returned\n"; 3627 trace "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP; 3628 goto &main_loop unless $REALLY_UNLOOP;
3496} 3629}
3497 3630
3498sub main { 3631sub main {
3499 cf::init_globals; # initialise logging 3632 cf::init_globals; # initialise logging
3500 3633
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 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.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510 3638
3511 $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
3512 3640
3513 # we must not ever block the main coroutine 3641 # we must not ever block the main coroutine
3514 local $Coro::idle = sub { 3642 local $Coro::idle = sub {
… …
3520 }; 3648 };
3521 3649
3522 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3523 3651
3524 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
3525 cf::load_settings; 3659 cf::load_settings;
3526 cf::load_materials;
3527 3660
3528 reload_resources; 3661 reload_resources;
3529 reload_config; 3662 reload_config;
3530 db_init; 3663 db_init;
3531 3664
3532 cf::init_uuid; 3665 cf::init_uuid;
3533 cf::init_signals; 3666 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills; 3667 cf::init_skills;
3536 3668
3537 cf::init_beforeplay; 3669 cf::init_beforeplay;
3538 3670
3539 atomic; 3671 atomic;
… …
3544 3676
3545 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX (); 3678 use POSIX ();
3547 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};
3548 3680
3549 (pop @POST_INIT)->(0) while @POST_INIT; 3681 cf::_post_init 0;
3550 }; 3682 };
3551 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
3552 main_loop; 3692 goto &main_loop;
3553} 3693}
3554 3694
3555############################################################################# 3695#############################################################################
3556# initialisation and cleanup 3696# initialisation and cleanup
3557 3697
3558# install some emergency cleanup handlers 3698# install some emergency cleanup handlers
3559BEGIN { 3699BEGIN {
3560 our %SIGWATCHER = (); 3700 our %SIGWATCHER = ();
3561 for my $signal (qw(INT HUP TERM)) { 3701 for my $signal (qw(INT HUP TERM)) {
3562 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3702 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3563 cf::cleanup "SIG$signal"; 3703 cf::cleanup "SIG$signal";
3564 }; 3704 };
3565 } 3705 }
3566} 3706}
3567 3707
3568sub write_runtime_sync { 3708sub write_runtime_sync {
3709 my $t0 = AE::time;
3710
3569 # first touch the runtime file to show we are still running: 3711 # first touch the runtime file to show we are still running:
3570 # the fsync below can take a very very long time. 3712 # the fsync below can take a very very long time.
3571 3713
3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3714 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573 3715
3574 my $guard = cf::lock_acquire "write_runtime"; 3716 my $guard = cf::lock_acquire "write_runtime";
3575 3717
3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3718 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577 or return; 3719 or return;
3578 3720
3579 my $value = $cf::RUNTIME + 90 + 10; 3721 my $value = $cf::RUNTIME + 90 + 10;
3580 # 10 is the runtime save interval, for a monotonic clock 3722 # 10 is the runtime save interval, for a monotonic clock
3581 # 60 allows for the watchdog to kill the server. 3723 # 60 allows for the watchdog to kill the server.
… …
3594 or return; 3736 or return;
3595 3737
3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597 and return; 3739 and return;
3598 3740
3599 warn "runtime file written.\n"; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600 3742
3601 1 3743 1
3602} 3744}
3603 3745
3604our $uuid_lock; 3746our $uuid_lock;
… …
3616 or return; 3758 or return;
3617 3759
3618 my $value = uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3619 3761
3620 unless ($value) { 3762 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n"; 3763 info "cowardly refusing to write zero uuid value!\n";
3622 return; 3764 return;
3623 } 3765 }
3624 3766
3625 my $value = uuid_str $value + $uuid_skip; 3767 my $value = uuid_str $value + $uuid_skip;
3626 $uuid_skip = 0; 3768 $uuid_skip = 0;
… …
3636 or return; 3778 or return;
3637 3779
3638 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3639 and return; 3781 and return;
3640 3782
3641 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3642 3784
3643 1 3785 1
3644 3786
3645} 3787}
3646 3788
… …
3652} 3794}
3653 3795
3654sub emergency_save() { 3796sub emergency_save() {
3655 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3656 3798
3657 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;
3658 3805
3659 cf::sync_job { 3806 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so 3807 cf::write_runtime_sync; # external watchdog should not bark
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664 3808
3665 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3666 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3667 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3668 warn "emergency_perl_save: begin player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3669 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3670 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3671 $pl->valid or next; 3815 $pl->valid or next;
3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673 $pl->save; 3817 $pl->save;
3674 } 3818 }
3675 warn "emergency_perl_save: end player save\n"; 3819 info "emergency_perl_save: end player save\n";
3676 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3677 warn "emergency_perl_save: begin map save\n"; 3823 info "emergency_perl_save: begin map save\n";
3678 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3679 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3680 $map->valid or next; 3826 $map->valid or next;
3681 $map->save; 3827 $map->save;
3682 } 3828 }
3683 warn "emergency_perl_save: end map save\n"; 3829 info "emergency_perl_save: end map save\n";
3684 3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3685 warn "emergency_perl_save: begin database checkpoint\n"; 3833 info "emergency_perl_save: begin database checkpoint\n";
3686 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3687 warn "emergency_perl_save: end database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3688 3836
3689 warn "emergency_perl_save: begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3690 write_uuid_sync 1; 3838 write_uuid_sync 1;
3691 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
3692 }; 3859 };
3693 3860
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3699 warn "emergency_perl_save: leave\n"; 3861 info "emergency_perl_save: leave\n";
3700} 3862}
3701 3863
3702sub post_cleanup { 3864sub post_cleanup {
3703 my ($make_core) = @_; 3865 my ($make_core) = @_;
3704 3866
3867 IO::AIO::flush;
3868
3705 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3706 if $make_core; 3870 if $make_core;
3707 3871
3708 my $fh = pidfile; 3872 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3710} 3874}
… …
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3894 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) { 3895 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"}; 3896 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3897# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 } 3898 }
3735 warn "cleared package $pkg\n";#d#
3736} 3899}
3737 3900
3738sub do_reload_perl() { 3901sub do_reload_perl() {
3739 # can/must only be called in main 3902 # can/must only be called in main
3740 if ($Coro::current != $Coro::main) { 3903 unless (in_main) {
3741 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3742 return; 3905 return;
3743 } 3906 }
3744 3907
3745 return if $RELOAD++; 3908 return if $RELOAD++;
3746 3909
3747 my $t1 = EV::time; 3910 my $t1 = AE::time;
3748 3911
3749 while ($RELOAD) { 3912 while ($RELOAD) {
3750 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3751 3915
3752 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3753 3917
3754 cf::sync_job { 3918 cf::sync_job {
3755 cf::write_runtime_sync; # external watchdog should not bark
3756 cf::emergency_save; 3919 #cf::emergency_save;
3757 cf::write_runtime_sync; # external watchdog should not bark
3758 3920
3759 warn "syncing database to disk";
3760 BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762 # if anything goes wrong in here, we should simply crash as we already saved
3763
3764 warn "flushing outstanding aio requests";
3765 while (IO::AIO::nreqs || BDB::nreqs) {
3766 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767 }
3768
3769 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3770 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3771 %EXT_CORO = (); 3923 %EXT_CORO = ();
3772 3924
3773 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3774 %COMMAND = (); 3926 %COMMAND = ();
3775 3927
3776 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3777 %EXTCMD = (); 3929 %EXTCMD = ();
3778 %EXTICMD = (); 3930 %EXTICMD = ();
3779 3931
3780 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3781 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3782 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3783 3935
3784 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3785 eval { 3937 eval {
3786 $cb->($pkg); 3938 $cb->($pkg);
3787 1 3939 1
3788 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3789 } 3941 }
3790 3942
3791 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3792 clear_package $pkg; 3944 clear_package $pkg;
3793 } 3945 }
3794 3946
3795 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798 3950
3799 warn "... unloading $k"; 3951 trace "... unloading $k";
3800 delete $INC{$k}; 3952 delete $INC{$k};
3801 3953
3802 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3804 3956
… …
3807 } 3959 }
3808 3960
3809 clear_package $k; 3961 clear_package $k;
3810 } 3962 }
3811 3963
3812 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3813 clear_package "safe::$_" 3965 clear_package "safe::$_"
3814 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);
3815 3967
3816 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3817 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819 3971
3820 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3821 # and global variables created in xs 3973 # and global variables created in xs
3822 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3823 3975
3824 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3825 3977
3826 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3827 require cf; 3979 require cf;
3828 cf::_connect_to_perl_1; 3980 cf::_connect_to_perl_1;
3829 3981
3830 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3831 cf::reload_config; 3983 cf::reload_config;
3832 3984
3833 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3834 cf::load_extensions; 3986 cf::load_extensions;
3835 3987
3836 if ($REATTACH_ON_RELOAD) { 3988 if ($REATTACH_ON_RELOAD) {
3837 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3838 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3839 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3840 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3841 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3842 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3843 } 3995 }
3844 3996
3845 warn "running post_init jobs"; 3997 cf::_post_init 1;
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847 3998
3848 warn "leaving sync_job"; 3999 trace "perl_reload: leaving sync_job";
3849 4000
3850 1 4001 1
3851 } or do { 4002 } or do {
3852 warn $@; 4003 error $@;
3853 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3854 }; 4005 };
3855 4006
3856 warn "reloaded";
3857 --$RELOAD; 4007 --$RELOAD;
3858 } 4008 }
3859 4009
3860 $t1 = EV::time - $t1; 4010 $t1 = AE::time - $t1;
3861 warn "reload completed in ${t1}s\n"; 4011 info "perl_reload: completed in ${t1}s\n";
3862}; 4012};
3863 4013
3864our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3865 4015
3866sub reload_perl() { 4016sub reload_perl() {
… …
3868 # coro crashes during coro_state_free->destroy here. 4018 # coro crashes during coro_state_free->destroy here.
3869 4019
3870 $RELOAD_WATCHER ||= cf::async { 4020 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions; 4021 Coro::AIO::aio_wait cache_extensions;
3872 4022
3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4023 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874 do_reload_perl; 4024 do_reload_perl;
3875 undef $RELOAD_WATCHER; 4025 undef $RELOAD_WATCHER;
3876 }; 4026 };
3877 }; 4027 };
3878} 4028}
… …
3887 reload_perl; 4037 reload_perl;
3888 }; 4038 };
3889 } 4039 }
3890}; 4040};
3891 4041
3892unshift @INC, $LIBDIR; 4042#############################################################################
3893 4043
3894my $bug_warning = 0; 4044my $bug_warning = 0;
3895 4045
3896our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3897our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3898 4048
3899sub wait_for_tick { 4049sub wait_for_tick() {
3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3901 4051
3902 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3903 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3904 $signal->wait; 4054 $signal->wait;
3905} 4055}
3906 4056
3907sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3909 4059
3910 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3911 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3912 $signal->wait; 4062 $signal->wait;
… …
3919 return; 4069 return;
3920 } 4070 }
3921 4071
3922 cf::server_tick; # one server iteration 4072 cf::server_tick; # one server iteration
3923 4073
3924 #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#
3925 4075
3926 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927 $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.;
3928 Coro::async_pool { 4078 Coro::async_pool {
3929 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
3930 write_runtime_sync 4080 write_runtime_sync
3931 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
3932 }; 4082 };
3933 } 4083 }
3934 4084
3935 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936 $sig->send; 4086 $sig->send;
… …
3944 4094
3945 if (0) { 4095 if (0) {
3946 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
3947 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
3948 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
3950 } 4100 }
3951 } 4101 }
3952} 4102}
3953 4103
3954{ 4104{

Diff Legend

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