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.505 by root, Sun Jan 31 03:46:20 2010 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 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
… …
1729=cut 1822=cut
1730 1823
1731sub find_by_path($) { 1824sub find_by_path($) {
1732 my ($path) = @_; 1825 my ($path) = @_;
1733 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1734 my ($match, $specificity); 1829 my ($match, $specificity);
1735 1830
1736 for my $region (list) { 1831 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1865
1771 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1867 $self->_create_random_map (
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
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";
… …
2091 2186
2092 $self->in_memory (cf::MAP_ACTIVE); 2187 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2188 }
2094 2189
2095 $self->post_load; 2190 $self->post_load;
2096}
2097 2191
2192 1
2193}
2194
2195# customize the map for a given player, i.e.
2196# return the _real_ map. used by e.g. per-player
2197# maps to change the path to ~playername/mappath
2098sub customise_for { 2198sub customise_for {
2099 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
2100 2200
2101 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2202 if $self->per_player;
… …
2118 or next; 2218 or next;
2119 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2120 or next; 2220 or next;
2121 $neigh->load; 2221 $neigh->load;
2122 2222
2223 # now find the diagonal neighbours
2123 push @neigh, 2224 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2227 }
2127 2228
… …
2134} 2235}
2135 2236
2136sub find_sync { 2237sub find_sync {
2137 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2138 2239
2139 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2140} 2244}
2141 2245
2142sub do_load_sync { 2246sub do_load_sync {
2143 my ($map) = @_; 2247 my ($map) = @_;
2144 2248
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2147 2251
2148 cf::sync_job { $map->load }; 2252 $map->load;
2149} 2253}
2150 2254
2151our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2153 2257
… …
2179 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2180 2284
2181 () 2285 ()
2182} 2286}
2183 2287
2288# common code, used by both ->save and ->swapout
2184sub save { 2289sub _save {
2185 my ($self) = @_; 2290 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2291
2189 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2190 2293
2191 return unless $self->dirty; 2294 return unless $self->dirty;
2192 2295
… …
2212 } else { 2315 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2317 }
2215} 2318}
2216 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2217sub swap_out { 2328sub swap_out {
2218 my ($self) = @_; 2329 my ($self) = @_;
2219 2330
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2332
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2333 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2334 return if $self->{deny_save};
2335 return if $self->players;
2228 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2230 2387
2231 $self->deactivate; 2388 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2390 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2391
2279 $self->unlink_save; 2392 $self->unlink_save;
2280 $self->destroy; 2393 $self->destroy;
2281} 2394}
2282 2395
… …
2290 2403
2291 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2292 2405
2293 $self->unlink_save; 2406 $self->unlink_save;
2294 2407
2295 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2413
… …
2530 2643
2531Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2532 2645
2533The player should be reasonably safe there for short amounts of time (e.g. 2646The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2648though, as the player cannot control the character while it is on the link
2536map. 2649map.
2537 2650
2538Will never block. 2651Will never block.
2539 2652
2540=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2562 my ($self) = @_; 2675 my ($self) = @_;
2563 2676
2564 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2565 2678
2679 ++$self->{_link_recursion};
2680
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2682
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2570 2685
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2687}
2573 2688
2574sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2576 2691
… …
2601 $map->load_neighbours; 2716 $map->load_neighbours;
2602 2717
2603 return unless $self->contr->active; 2718 return unless $self->contr->active;
2604 2719
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2607 2722 # entering was successful
2723 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2724 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2725 $self->activate_recursive;
2610} 2726 }
2611 2727
2728}
2729
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2731
2614Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2734that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2735the new (success) or old (failed) map position. In either case, $done will
… …
2624 2742
2625our $GOTOGEN; 2743our $GOTOGEN;
2626 2744
2627sub cf::object::player::goto { 2745sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2629 2753
2630 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2756
2633 $self->enter_link; 2757 $self->enter_link;
… …
2657 my $map = eval { 2781 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2782 my $map = defined $path ? cf::map::find $path : undef;
2659 2783
2660 if ($map) { 2784 if ($map) {
2661 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2787 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2789 }
2666 2790
2667 $map 2791 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2678 } 2802 }
2679 2803
2680 $done->() if $done; 2804 $done->($self) if $done;
2681 })->prio (1); 2805 })->prio (1);
2682} 2806}
2683 2807
2684=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2685 2809
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2906
2783 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2908 $self->leave_link;
2785 } 2909 }
2786 })->prio (1); 2910 })->prio (1);
2787} 2911}
2788 2912
… …
3101 3225
3102 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3227 if $reply;
3104 3228
3105 } else { 3229 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3231 }
3108 3232
3109 cf::override; 3233 cf::override;
3110 }, 3234 },
3111); 3235);
… …
3131 3255
3132 $coro 3256 $coro
3133} 3257}
3134 3258
3135cf::client->attach ( 3259cf::client->attach (
3136 on_destroy => sub { 3260 on_client_destroy => sub {
3137 my ($ns) = @_; 3261 my ($ns) = @_;
3138 3262
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3264 },
3141); 3265);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3316 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3318 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
3196) { 3320) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3323 for @funs;
3201} 3324}
3202 3325
… …
3241 local @cf::_safe_eval_args = values %vars; 3364 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3365 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3366 }
3244 3367
3245 if ($@) { 3368 if ($@) {
3246 warn "$@"; 3369 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
3249 } 3372 }
3250 3373
3251 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
3252} 3375}
3253 3376
… …
3287 # for this (global event?) 3410 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3412
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3414
3292 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3293 3416
3294 my $facedata;
3295 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
3296 or die "$path: $!"; 3418 or die "$path: $!";
3297 3419
3298 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
3299 3421
3300 $facedata->{version} == 2 3422 $facedata->{version} == 2
… …
3331 3453
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3457 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3459 }
3338 3460
3339 cf::cede_to_tick; 3461 cf::cede_to_tick;
3340 } 3462 }
3341 } 3463 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3482
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3363 } else { 3485 } else {
3364 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3365 } 3487 }
3366 3488
3367 cf::cede_to_tick; 3489 cf::cede_to_tick;
3368 } 3490 }
3369 } 3491 }
3370 3492
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3494
3373 1 3495 1
3374} 3496}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3497
3396register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3398 3500
3399 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3540sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3441} 3543}
3442 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3443sub reload_resources { 3568sub reload_resources {
3444 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3445 3570
3571 reload_exp_table;
3572 reload_materials;
3446 reload_facedata; 3573 reload_facedata;
3574 reload_sound;
3447 reload_archetypes; 3575 reload_archetypes;
3448 reload_regions; 3576 reload_regions;
3449 reload_treasures; 3577 reload_treasures;
3450 3578
3451 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3452} 3580}
3453 3581
3454sub reload_config { 3582sub reload_config {
3455 warn "reloading config file...\n"; 3583 trace "reloading config file...\n";
3456 3584
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3585 0 < aio_load "$CONFDIR/config", my $config
3458 or return; 3586 or die "$CONFDIR/config: $!";
3459 3587
3460 local $/; 3588 utf8::decode $config;
3461 *CFG = YAML::XS::Load scalar <$fh>; 3589 *CFG = yaml_load $config;
3462 3590
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3592
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3595
3468 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3598 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3599 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3600 };
3473 warn $@ if $@; 3601 warn $@ if $@;
3474 } 3602 }
3475
3476 warn "finished reloading resource files\n";
3477} 3603}
3478 3604
3479sub pidfile() { 3605sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3606 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3607 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3495 print $fh $$; 3621 print $fh $$;
3496} 3622}
3497 3623
3498sub main_loop { 3624sub main_loop {
3499 warn "EV::loop starting\n"; 3625 trace "EV::loop starting\n";
3500 if (1) { 3626 if (1) {
3501 EV::loop; 3627 EV::loop;
3502 } 3628 }
3503 warn "EV::loop returned\n"; 3629 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3630 goto &main_loop unless $REALLY_UNLOOP;
3505} 3631}
3506 3632
3507sub main { 3633sub main {
3508 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3509 3635
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3640
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3642
3522 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
… …
3529 }; 3650 };
3530 3651
3531 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3532 3653
3533 cf::sync_job { 3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3534 cf::load_settings; 3661 cf::load_settings;
3535 cf::load_materials;
3536 3662
3537 reload_resources; 3663 reload_resources;
3538 reload_config; 3664 reload_config;
3539 db_init; 3665 db_init;
3540 3666
3541 cf::init_uuid; 3667 cf::init_uuid;
3542 cf::init_signals; 3668 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3669 cf::init_skills;
3545 3670
3546 cf::init_beforeplay; 3671 cf::init_beforeplay;
3547 3672
3548 atomic; 3673 atomic;
… …
3553 3678
3554 # no (long-running) fork's whatsoever before this point(!) 3679 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3680 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3682
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3683 cf::_post_init 0;
3559 }; 3684 };
3560 3685
3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3561 main_loop; 3694 goto &main_loop;
3562} 3695}
3563 3696
3564############################################################################# 3697#############################################################################
3565# initialisation and cleanup 3698# initialisation and cleanup
3566 3699
3567# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
3568BEGIN { 3701BEGIN {
3569 our %SIGWATCHER = (); 3702 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3704 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3705 cf::cleanup "SIG$signal";
3573 }; 3706 };
3574 } 3707 }
3575} 3708}
3576 3709
3577sub write_runtime_sync { 3710sub write_runtime_sync {
3711 my $t0 = AE::time;
3712
3578 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
3579 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
3580 3715
3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3582 3717
… …
3603 or return; 3738 or return;
3604 3739
3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3606 and return; 3741 and return;
3607 3742
3608 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3609 3744
3610 1 3745 1
3611} 3746}
3612 3747
3613our $uuid_lock; 3748our $uuid_lock;
… …
3625 or return; 3760 or return;
3626 3761
3627 my $value = uuid_seq uuid_cur; 3762 my $value = uuid_seq uuid_cur;
3628 3763
3629 unless ($value) { 3764 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n"; 3765 info "cowardly refusing to write zero uuid value!\n";
3631 return; 3766 return;
3632 } 3767 }
3633 3768
3634 my $value = uuid_str $value + $uuid_skip; 3769 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0; 3770 $uuid_skip = 0;
… …
3645 or return; 3780 or return;
3646 3781
3647 aio_rename "$uuid~", $uuid 3782 aio_rename "$uuid~", $uuid
3648 and return; 3783 and return;
3649 3784
3650 warn "uuid file written ($value).\n"; 3785 trace "uuid file written ($value).\n";
3651 3786
3652 1 3787 1
3653 3788
3654} 3789}
3655 3790
… …
3661} 3796}
3662 3797
3663sub emergency_save() { 3798sub emergency_save() {
3664 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3665 3800
3666 warn "emergency_perl_save: enter\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3667 3807
3668 cf::sync_job { 3808 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so 3809 cf::write_runtime_sync; # external watchdog should not bark
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673 3810
3674 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3675 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3676 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3677 warn "emergency_perl_save: begin player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3678 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3679 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3680 $pl->valid or next; 3817 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3682 $pl->save; 3819 $pl->save;
3683 } 3820 }
3684 warn "emergency_perl_save: end player save\n"; 3821 info "emergency_perl_save: end player save\n";
3685 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3686 warn "emergency_perl_save: begin map save\n"; 3825 info "emergency_perl_save: begin map save\n";
3687 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3688 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3689 $map->valid or next; 3828 $map->valid or next;
3690 $map->save; 3829 $map->save;
3691 } 3830 }
3692 warn "emergency_perl_save: end map save\n"; 3831 info "emergency_perl_save: end map save\n";
3693 3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3694 warn "emergency_perl_save: begin database checkpoint\n"; 3835 info "emergency_perl_save: begin database checkpoint\n";
3695 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3696 warn "emergency_perl_save: end database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3697 3838
3698 warn "emergency_perl_save: begin write uuid\n"; 3839 info "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1; 3840 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n"; 3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3701 }; 3861 };
3702 3862
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3708 warn "emergency_perl_save: leave\n"; 3863 info "emergency_perl_save: leave\n";
3709} 3864}
3710 3865
3711sub post_cleanup { 3866sub post_cleanup {
3712 my ($make_core) = @_; 3867 my ($make_core) = @_;
3713 3868
3869 IO::AIO::flush;
3870
3714 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3715 if $make_core; 3872 if $make_core;
3716 3873
3717 my $fh = pidfile; 3874 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$; 3875 unlink $PIDFILE if <$fh> == $$;
3719} 3876}
… …
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) { 3897 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"}; 3898 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 } 3900 }
3744 warn "cleared package $pkg\n";#d#
3745} 3901}
3746 3902
3747sub do_reload_perl() { 3903sub do_reload_perl() {
3748 # can/must only be called in main 3904 # can/must only be called in main
3749 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3750 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3751 return; 3907 return;
3752 } 3908 }
3753 3909
3754 return if $RELOAD++; 3910 return if $RELOAD++;
3755 3911
3756 my $t1 = EV::time; 3912 my $t1 = AE::time;
3757 3913
3758 while ($RELOAD) { 3914 while ($RELOAD) {
3759 warn "reloading..."; 3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3760 3917
3761 warn "entering sync_job"; 3918 trace "perl_reload: entering sync_job";
3762 3919
3763 cf::sync_job { 3920 cf::sync_job {
3764 cf::write_runtime_sync; # external watchdog should not bark
3765 cf::emergency_save; 3921 #cf::emergency_save;
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 3922
3768 warn "syncing database to disk";
3769 BDB::db_env_txn_checkpoint $DB_ENV;
3770
3771 # if anything goes wrong in here, we should simply crash as we already saved
3772
3773 warn "flushing outstanding aio requests";
3774 while (IO::AIO::nreqs || BDB::nreqs) {
3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3776 }
3777
3778 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3779 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3780 %EXT_CORO = (); 3925 %EXT_CORO = ();
3781 3926
3782 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3783 %COMMAND = (); 3928 %COMMAND = ();
3784 3929
3785 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3786 %EXTCMD = (); 3931 %EXTCMD = ();
3787 %EXTICMD = (); 3932 %EXTICMD = ();
3788 3933
3789 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3790 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3791 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3792 3937
3793 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3794 eval { 3939 eval {
3795 $cb->($pkg); 3940 $cb->($pkg);
3796 1 3941 1
3797 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3798 } 3943 }
3799 3944
3800 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3801 clear_package $pkg; 3946 clear_package $pkg;
3802 } 3947 }
3803 3948
3804 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807 3952
3808 warn "... unloading $k"; 3953 trace "... unloading $k";
3809 delete $INC{$k}; 3954 delete $INC{$k};
3810 3955
3811 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3813 3958
… …
3816 } 3961 }
3817 3962
3818 clear_package $k; 3963 clear_package $k;
3819 } 3964 }
3820 3965
3821 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3822 clear_package "safe::$_" 3967 clear_package "safe::$_"
3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3824 3969
3825 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3826 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3828 3973
3829 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3830 # and global variables created in xs 3975 # and global variables created in xs
3831 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3832 3977
3833 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3834 3979
3835 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3836 require cf; 3981 require cf;
3837 cf::_connect_to_perl_1; 3982 cf::_connect_to_perl_1;
3838 3983
3839 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3840 cf::reload_config; 3985 cf::reload_config;
3841 3986
3842 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3843 cf::load_extensions; 3988 cf::load_extensions;
3844 3989
3845 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3846 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3847 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3848 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3849 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3850 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3851 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3852 } 3997 }
3853 3998
3854 warn "running post_init jobs"; 3999 cf::_post_init 1;
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856 4000
3857 warn "leaving sync_job"; 4001 trace "perl_reload: leaving sync_job";
3858 4002
3859 1 4003 1
3860 } or do { 4004 } or do {
3861 warn $@; 4005 error $@;
3862 cf::cleanup "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3863 }; 4007 };
3864 4008
3865 warn "reloaded";
3866 --$RELOAD; 4009 --$RELOAD;
3867 } 4010 }
3868 4011
3869 $t1 = EV::time - $t1; 4012 $t1 = AE::time - $t1;
3870 warn "reload completed in ${t1}s\n"; 4013 info "perl_reload: completed in ${t1}s\n";
3871}; 4014};
3872 4015
3873our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3874 4017
3875sub reload_perl() { 4018sub reload_perl() {
… …
3877 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3878 4021
3879 $RELOAD_WATCHER ||= cf::async { 4022 $RELOAD_WATCHER ||= cf::async {
3880 Coro::AIO::aio_wait cache_extensions; 4023 Coro::AIO::aio_wait cache_extensions;
3881 4024
3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3883 do_reload_perl; 4026 do_reload_perl;
3884 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3885 }; 4028 };
3886 }; 4029 };
3887} 4030}
… …
3896 reload_perl; 4039 reload_perl;
3897 }; 4040 };
3898 } 4041 }
3899}; 4042};
3900 4043
3901unshift @INC, $LIBDIR; 4044#############################################################################
3902 4045
3903my $bug_warning = 0; 4046my $bug_warning = 0;
3904 4047
3905our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3906our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3907 4050
3908sub wait_for_tick { 4051sub wait_for_tick() {
3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4053
3911 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3913 $signal->wait; 4056 $signal->wait;
3914} 4057}
3915 4058
3916sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3918 4061
3919 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3920 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3921 $signal->wait; 4064 $signal->wait;
… …
3928 return; 4071 return;
3929 } 4072 }
3930 4073
3931 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3932 4075
3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3934 4077
3935 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3937 Coro::async_pool { 4080 Coro::async_pool {
3938 $Coro::current->{desc} = "runtime saver"; 4081 $Coro::current->{desc} = "runtime saver";
3939 write_runtime_sync 4082 write_runtime_sync
3940 or warn "ERROR: unable to write runtime file: $!"; 4083 or error "ERROR: unable to write runtime file: $!";
3941 }; 4084 };
3942 } 4085 }
3943 4086
3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3945 $sig->send; 4088 $sig->send;
… …
3953 4096
3954 if (0) { 4097 if (0) {
3955 if ($NEXT_TICK) { 4098 if ($NEXT_TICK) {
3956 my $jitter = $TICK_START - $NEXT_TICK; 4099 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d# 4101 debug "jitter $JITTER\n";#d#
3959 } 4102 }
3960 } 4103 }
3961} 4104}
3962 4105
3963{ 4106{
… …
4008 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
4009 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
4010 undef $AnyEvent::AIO::WATCHER; 4153 undef $AnyEvent::AIO::WATCHER;
4011} 4154}
4012 4155
4013my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
4014 4158
4015sub _log_backtrace { 4159sub _log_backtrace {
4016 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
4017 4161
4018 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
4019 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4020 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
4021 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
4022 ++$_log_backtrace; 4170 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg; 4171 my $perl_bt = Carp::longmess $msg;
4024 async { 4172 async {
4025 $Coro::current->{desc} = "abt $msg"; 4173 $Coro::current->{desc} = "abt $msg";
4026 4174
… …
4046 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
4047 --$_log_backtrace; 4195 --$_log_backtrace;
4048 }; 4196 };
4049 } else { 4197 } else {
4050 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
4051 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4052 } 4200 }
4053} 4201}
4054 4202
4055# load additional modules 4203# load additional modules
4056require "cf/$_.pm" for @EXTRA_MODULES; 4204require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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