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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.557 by root, Tue Oct 5 21:40:05 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 112
113our $OUTPUT_RATE_MIN = 3000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 114our $OUTPUT_RATE_MAX = 1000000;
115 115
116our $MAX_LINKS = 32; # how many chained exits to follow 116our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 127our $DB_ENV;
128 128
129our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 130
131our %CFG; 131our %CFG;
132 132
133our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 134our $RUNTIME;
… …
233from wherever your confdir points to. 233from wherever your confdir points to.
234 234
235=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
236 236
237These 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
238returns 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
239per 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();
240 245
241=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
242 247
243This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
244C<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
… …
252 257
253=back 258=back
254 259
255=cut 260=cut
256 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
257$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 269 my $msg = join "", @_;
259 270
260 $msg .= "\n" 271 $msg .= "\n"
261 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
262 273
263 $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;
264 275
265 LOG llevError, $msg; 276 LOG llevWarn, $msg;
266}; 277};
267 278
268$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
270 281
271 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
272 283
273 if (in_main) {#d# 284 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 286 return;#d#
276 }#d# 287 }#d#
277 288
278 # kill coroutine otherwise 289 # kill coroutine otherwise
279 Coro::terminate 290 Coro::terminate
… …
346our $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
347 358
348sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
352 375
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
355 378
356The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 380is a reload or not.
358 381
359=cut 382=cut
360 383
361sub post_init(&) { 384sub post_init(&) {
362 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 }
363} 403}
364 404
365=item cf::lock_wait $string 405=item cf::lock_wait $string
366 406
367Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
512=cut 552=cut
513 553
514sub sync_job(&) { 554sub sync_job(&) {
515 my ($job) = @_; 555 my ($job) = @_;
516 556
517 if ($Coro::current == $Coro::main) { 557 if (in_main) {
518 my $time = AE::time; 558 my $time = AE::time;
519 559
520 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
522 562
523 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
524 564
525 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
526 566
527 my $busy = 1; 567 my $busy = 1;
528 my @res; 568 my @res;
529 569
530 (async { 570 (async {
531 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 572 @res = eval { $job->() };
533 warn $@ if $@; 573 error $@ if $@;
534 undef $busy; 574 undef $busy;
535 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
536 576
537 while ($busy) { 577 while ($busy) {
538 if (Coro::nready) { 578 if (Coro::nready) {
… …
572 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
573 613
574 $coro 614 $coro
575} 615}
576 616
577=item fork_call { }, $args 617=item fork_call { }, @args
578 618
579Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 622never block itself or use any form of event handling.
583 623
584=cut 624=cut
585 625
626sub post_fork {
627 reset_signals;
628}
629
586sub fork_call(&@) { 630sub fork_call(&@) {
587 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
588 632
589 # 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,
590 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
592 636
593 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
594 reset_signals; 638 cf::post_fork;
595 &$cb 639 &$cb
596 }, @args; 640 } @args;
597 641
598 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
599} 643}
600 644
601sub objinfo { 645sub objinfo {
… …
651within each server. 695within each server.
652 696
653=cut 697=cut
654 698
655sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
656 my ($name) = @_; 703 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
658 705
659 eval { 706 eval {
660 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
670} 717}
671 718
672our $DB; 719our $DB;
673 720
674sub db_init { 721sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
677 };
678} 723}
679 724
680sub db_get($$) { 725sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
682 727
683 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
684 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
685 732
686 $! ? () 733 $! ? ()
687 : $data 734 : $data
688 }
689} 735}
690 736
691sub db_put($$$) { 737sub db_put($$$) {
692 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
749 795
750 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
751 my $data = $process->(\@data); 797 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
753 799
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 801
756 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
759 805
… …
769 815
770=cut 816=cut
771 817
772sub datalog($@) { 818sub datalog($@) {
773 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 821}
776 822
777=back 823=back
778 824
779=cut 825=cut
… …
974 1020
975 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1023
978 } elsif (ref $type) { 1024 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
980 1026
981 } else { 1027 } else {
982 shift @arg; 1028 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
984 } 1030 }
985 } 1031 }
986} 1032}
987 1033
988sub _object_attach { 1034sub _object_attach {
… …
998 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
999 } 1045 }
1000 1046
1001 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
1002 } else { 1048 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1050 }
1005 1051
1006 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1007} 1053}
1008 1054
… …
1067 1113
1068 for (@$callbacks) { 1114 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1070 1116
1071 if ($@) { 1117 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1119 override;
1075 } 1120 }
1076 1121
1077 return 1 if $override; 1122 return 1 if $override;
1078 } 1123 }
… …
1157 for (@$attach) { 1202 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1160 } 1205 }
1161 } else { 1206 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1208 }
1164 } 1209 }
1165} 1210}
1166 1211
1167cf::attachable->attach ( 1212cf::attachable->attach (
… …
1194 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1195 1240
1196 sync_job { 1241 sync_job {
1197 if (length $$rdata) { 1242 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1245 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1246 if $VERBOSE_IO;
1202 1247
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
… …
1228 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1229 1274
1230 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1277 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1234 } 1279 }
1235 } else { 1280 } else {
1236 aio_unlink $filename; 1281 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1238 } 1283 }
… …
1262 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1308 $av = $st->{objs};
1264 } 1309 }
1265 1310
1266 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1313 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1314 if $VERBOSE_IO;
1270 1315
1271 ($data, $av) 1316 ($data, $av)
1272} 1317}
1273 1318
… …
1366 1411
1367 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1368 if $reply; 1413 if $reply;
1369 1414
1370 } else { 1415 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1417 }
1373 1418
1374 cf::override; 1419 cf::override;
1375 }, 1420 },
1376); 1421);
… …
1387 1432
1388 $grp 1433 $grp
1389} 1434}
1390 1435
1391sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1392 cf::sync_job { 1439 cf::sync_job {
1393 my %todo; 1440 my %todo;
1394 1441
1395 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1443 next unless -r $path;
… …
1414 1461
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1464
1418 $ext{source} = 1465 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1421 . $source 1468 . $source
1422 . "\n};\n1"; 1469 . "\n};\n1";
1423 1470
1424 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1436 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1484 next ext
1438 unless exists $done{$_}; 1485 unless exists $done{$_};
1439 } 1486 }
1440 1487
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1489
1443 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1444 1491
1445 if (length $@) { 1492 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1447 1494
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1450 1497
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1453 } else { 1500 } else {
1454 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1456 $progress = 1; 1503 $progress = 1;
1457 1504
1458 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1506 unless $active;
1460 } 1507 }
1461 } 1508 }
1462 1509
1463 unless ($progress) { 1510 unless ($progress) {
… …
1632 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1633 1680
1634 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1635 $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
1636 1683
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1685 $pl->deactivate;
1686
1639 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;
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1641 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1642 1692
1643 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1645 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1811sub generate_random_map { 1861sub generate_random_map {
1812 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1813 1863
1814 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
1815 1865
1816 # mit "rum" bekleckern, nicht
1817 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821 $rmp->{exit_on_final_map},
1822 $rmp->{xsize}, $rmp->{ysize},
1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828 (cf::region::find $rmp->{region}), $rmp->{custom}
1829 )
1830} 1867}
1831 1868
1832=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1833 1870
1834Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1839 1876
1840sub register { 1877sub register {
1841 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 1879 my $pkg = caller;
1843 1880
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 1882
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 1884}
1849 1885
… …
1861} 1897}
1862 1898
1863sub normalise { 1899sub normalise {
1864 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1865 1901
1866 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1867 1903
1868 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1869 1905
1870 # map plan: 1906 # map plan:
1871 # 1907 #
… …
1886 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1887 $path = "$base/$path"; 1923 $path = "$base/$path";
1888 } 1924 }
1889 1925
1890 for ($path) { 1926 for ($path) {
1891 redo if s{//}{/};
1892 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1893 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1894 } 1929 }
1895 1930
1896 $path 1931 $path
… …
1910 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1911 return $self; 1946 return $self;
1912 } 1947 }
1913 } 1948 }
1914 1949
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 1951 ()
1917} 1952}
1918 1953
1919sub init { 1954sub init {
1920 my ($self) = @_; 1955 my ($self) = @_;
… …
2042} 2077}
2043 2078
2044sub find; 2079sub find;
2045sub find { 2080sub find {
2046 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2047 2084
2048 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2049 2086
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2136 2173
2137 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2175 }
2139 2176
2140 $self->post_load; 2177 $self->post_load;
2178
2179 1
2141} 2180}
2142 2181
2143# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2183} 2222}
2184 2223
2185sub find_sync { 2224sub find_sync {
2186 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2187 2226
2188 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2189} 2231}
2190 2232
2191sub do_load_sync { 2233sub do_load_sync {
2192 my ($map) = @_; 2234 my ($map) = @_;
2193 2235
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2196 2238
2197 cf::sync_job { $map->load }; 2239 $map->load;
2198} 2240}
2199 2241
2200our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2202 2244
… …
2314 2356
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2358
2317 return if $self->players; 2359 return if $self->players;
2318 2360
2319 warn "resetting map ", $self->path, "\n"; 2361 cf::trace "resetting map ", $self->path, "\n";
2320 2362
2321 $self->in_memory (cf::MAP_SWAPPED); 2363 $self->in_memory (cf::MAP_SWAPPED);
2322 2364
2323 # need to save uniques path 2365 # need to save uniques path
2324 unless ($self->{deny_save}) { 2366 unless ($self->{deny_save}) {
… …
2689 2731
2690sub cf::object::player::goto { 2732sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2734
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2739 }
2698 2740
2699 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
… …
2847 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2851 2893
2852 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 2895 $self->leave_link;
2854 } 2896 }
2855 })->prio (1); 2897 })->prio (1);
2856} 2898}
2857 2899
… …
3170 3212
3171 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3172 if $reply; 3214 if $reply;
3173 3215
3174 } else { 3216 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3218 }
3177 3219
3178 cf::override; 3220 cf::override;
3179 }, 3221 },
3180); 3222);
… …
3261 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3265) { 3307) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3310 for @funs;
3270} 3311}
3271 3312
… …
3310 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3353 }
3313 3354
3314 if ($@) { 3355 if ($@) {
3315 warn "$@"; 3356 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3318 } 3359 }
3319 3360
3320 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3321} 3362}
3322 3363
… …
3356 # for this (global event?) 3397 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3358 3399
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3401
3361 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3362 3403
3363 my $facedata;
3364 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3365 or die "$path: $!"; 3405 or die "$path: $!";
3366 3406
3367 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3368 3408
3369 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3386 3426
3387 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, "-", chr $idx & 255;
3391 3432
3392 cf::cede_to_tick; 3433 cf::cede_to_tick;
3393 } 3434 }
3394 3435
3395 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3400 3441
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3445 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3447 }
3407 3448
3408 cf::cede_to_tick; 3449 cf::cede_to_tick;
3409 } 3450 }
3410 } 3451 }
… …
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3470
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3432 } else { 3473 } else {
3433 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3434 } 3475 }
3435 3476
3436 cf::cede_to_tick; 3477 cf::cede_to_tick;
3437 } 3478 }
3438 } 3479 }
3439 3480
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441 3482
3442 1 3483 1
3443} 3484}
3444
3445cf::global->attach (on_resource_update => sub {
3446 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450 my $sound = $soundconf->{compat}[$_]
3451 or next;
3452
3453 my $face = cf::face::find "sound/$sound->[1]";
3454 cf::sound::set $sound->[0] => $face;
3455 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456 }
3457
3458 while (my ($k, $v) = each %{$soundconf->{event}}) {
3459 my $face = cf::face::find "sound/$v";
3460 cf::sound::set $k => $face;
3461 }
3462 }
3463});
3464 3485
3465register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3466 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3467 3488
3468 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3507sub reload_treasures { 3528sub reload_treasures {
3508 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3509 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3510} 3531}
3511 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3512sub reload_resources { 3556sub reload_resources {
3513 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3514 3558
3559 reload_exp_table;
3560 reload_materials;
3515 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3516 reload_archetypes; 3563 reload_archetypes;
3517 reload_regions; 3564 reload_regions;
3518 reload_treasures; 3565 reload_treasures;
3519 3566
3520 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3521} 3568}
3522 3569
3523sub reload_config { 3570sub reload_config {
3524 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3525 3572
3526 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3527 or return; 3574 or die "$CONFDIR/config: $!";
3528 3575
3529 local $/; 3576 utf8::decode $config;
3530 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3531 3578
3532 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533 3580
3534 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3535 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3539 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3541 }; 3588 };
3542 warn $@ if $@; 3589 warn $@ if $@;
3543 } 3590 }
3544
3545 warn "finished reloading resource files\n";
3546} 3591}
3547 3592
3548sub pidfile() { 3593sub pidfile() {
3549 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3563 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3564 print $fh $$; 3609 print $fh $$;
3565} 3610}
3566 3611
3567sub main_loop { 3612sub main_loop {
3568 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3569 if (1) { 3614 if (1) {
3570 EV::loop; 3615 EV::loop;
3571 } 3616 }
3572 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3573 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3574} 3619}
3575 3620
3576sub main { 3621sub main {
3577 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3578 3623
3579 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583 3628
3584 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585 3630
… …
3593 }; 3638 };
3594 3639
3595 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3596 3641
3597 cf::sync_job { 3642 cf::sync_job {
3598 cf::init_experience; 3643 cf::incloader::init ();
3644
3599 cf::init_anim; 3645 cf::init_anim;
3600 cf::init_attackmess; 3646 cf::init_attackmess;
3601 cf::init_dynamic; 3647 cf::init_dynamic;
3602 3648
3603 cf::load_settings; 3649 cf::load_settings;
3604 cf::load_materials;
3605 3650
3606 reload_resources; 3651 reload_resources;
3607 reload_config; 3652 reload_config;
3608 db_init; 3653 db_init;
3609 3654
… …
3621 3666
3622 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3623 use POSIX (); 3668 use POSIX ();
3624 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625 3670
3626 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3627 }; 3672 };
3628 3673
3629 cf::object::thawer::errors_are_fatal 0; 3674 cf::object::thawer::errors_are_fatal 0;
3630 warn "parse errors in files are no longer fatal from this point on.\n"; 3675 info "parse errors in files are no longer fatal from this point on.\n";
3631 3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3632 main_loop; 3682 goto &main_loop;
3633} 3683}
3634 3684
3635############################################################################# 3685#############################################################################
3636# initialisation and cleanup 3686# initialisation and cleanup
3637 3687
… …
3676 or return; 3726 or return;
3677 3727
3678 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679 and return; 3729 and return;
3680 3730
3681 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682 3732
3683 1 3733 1
3684} 3734}
3685 3735
3686our $uuid_lock; 3736our $uuid_lock;
… …
3698 or return; 3748 or return;
3699 3749
3700 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3701 3751
3702 unless ($value) { 3752 unless ($value) {
3703 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3704 return; 3754 return;
3705 } 3755 }
3706 3756
3707 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3708 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3718 or return; 3768 or return;
3719 3769
3720 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3721 and return; 3771 and return;
3722 3772
3723 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3724 3774
3725 1 3775 1
3726 3776
3727} 3777}
3728 3778
… …
3734} 3784}
3735 3785
3736sub emergency_save() { 3786sub emergency_save() {
3737 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3738 3788
3739 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3740 3795
3741 cf::sync_job { 3796 cf::sync_job {
3742 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3743 # save all maps without fsync, and later call a global sync
3744 # (which in turn might be very very slow)
3745 local $USE_FSYNC = 0;
3746 3798
3747 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3748 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3749 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3750 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3751 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3752 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3753 $pl->valid or next; 3805 $pl->valid or next;
3754 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755 $pl->save; 3807 $pl->save;
3756 } 3808 }
3757 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3758 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3759 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3760 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3761 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3762 $map->valid or next; 3816 $map->valid or next;
3763 $map->save; 3817 $map->save;
3764 } 3818 }
3765 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3766 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3767 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3768 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3769 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3770 3826
3771 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3772 write_uuid_sync 1; 3828 write_uuid_sync 1;
3773 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3774 }; 3849 };
3775 3850
3776 warn "emergency_perl_save: starting sync()\n";
3777 IO::AIO::aio_sync sub {
3778 warn "emergency_perl_save: finished sync()\n";
3779 };
3780
3781 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3782} 3852}
3783 3853
3784sub post_cleanup { 3854sub post_cleanup {
3785 my ($make_core) = @_; 3855 my ($make_core) = @_;
3786 3856
3857 IO::AIO::flush;
3858
3787 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3788 if $make_core; 3860 if $make_core;
3789 3861
3790 my $fh = pidfile; 3862 my $fh = pidfile;
3791 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3792} 3864}
… …
3816 } 3888 }
3817} 3889}
3818 3890
3819sub do_reload_perl() { 3891sub do_reload_perl() {
3820 # can/must only be called in main 3892 # can/must only be called in main
3821 if (in_main) { 3893 unless (in_main) {
3822 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3823 return; 3895 return;
3824 } 3896 }
3825 3897
3826 return if $RELOAD++; 3898 return if $RELOAD++;
3827 3899
3828 my $t1 = AE::time; 3900 my $t1 = AE::time;
3829 3901
3830 while ($RELOAD) { 3902 while ($RELOAD) {
3831 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3832 3905
3833 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3834 3907
3835 cf::sync_job { 3908 cf::sync_job {
3836 cf::write_runtime_sync; # external watchdog should not bark
3837 cf::emergency_save; 3909 #cf::emergency_save;
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 3910
3840 warn "syncing database to disk";
3841 BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843 # if anything goes wrong in here, we should simply crash as we already saved
3844
3845 warn "flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3851 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3852 %EXT_CORO = (); 3913 %EXT_CORO = ();
3853 3914
3854 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3855 %COMMAND = (); 3916 %COMMAND = ();
3856 3917
3857 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3858 %EXTCMD = (); 3919 %EXTCMD = ();
3859 %EXTICMD = (); 3920 %EXTICMD = ();
3860 3921
3861 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3862 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3863 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3864 3925
3865 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3866 eval { 3927 eval {
3867 $cb->($pkg); 3928 $cb->($pkg);
3868 1 3929 1
3869 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3870 } 3931 }
3871 3932
3872 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3873 clear_package $pkg; 3934 clear_package $pkg;
3874 } 3935 }
3875 3936
3876 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3878 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879 3940
3880 warn "... unloading $k"; 3941 trace "... unloading $k";
3881 delete $INC{$k}; 3942 delete $INC{$k};
3882 3943
3883 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3884 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3885 3946
… …
3888 } 3949 }
3889 3950
3890 clear_package $k; 3951 clear_package $k;
3891 } 3952 }
3892 3953
3893 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3894 clear_package "safe::$_" 3955 clear_package "safe::$_"
3895 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3896 3957
3897 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3898 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3899 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900 3961
3901 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3902 # and global variables created in xs 3963 # and global variables created in xs
3903 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3904 3965
3905 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3906 3967
3907 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3908 require cf; 3969 require cf;
3909 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3910 3971
3911 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3912 cf::reload_config; 3973 cf::reload_config;
3913 3974
3914 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3915 cf::load_extensions; 3976 cf::load_extensions;
3916 3977
3917 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3918 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3919 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3920 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3921 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3922 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3923 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3924 } 3985 }
3925 3986
3926 warn "running post_init jobs"; 3987 cf::_post_init 1;
3927 (pop @POST_INIT)->(1) while @POST_INIT;
3928 3988
3929 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3930 3990
3931 1 3991 1
3932 } or do { 3992 } or do {
3933 warn $@; 3993 error $@;
3934 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3935 }; 3995 };
3936 3996
3937 warn "reloaded";
3938 --$RELOAD; 3997 --$RELOAD;
3939 } 3998 }
3940 3999
3941 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3942 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3943}; 4002};
3944 4003
3945our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3946 4005
3947sub reload_perl() { 4006sub reload_perl() {
… …
3968 reload_perl; 4027 reload_perl;
3969 }; 4028 };
3970 } 4029 }
3971}; 4030};
3972 4031
3973unshift @INC, $LIBDIR; 4032#############################################################################
3974 4033
3975my $bug_warning = 0; 4034my $bug_warning = 0;
3976 4035
3977our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3978our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3979 4038
3980sub wait_for_tick { 4039sub wait_for_tick() {
3981 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3982 4041
3983 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3984 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3985 $signal->wait; 4044 $signal->wait;
3986} 4045}
3987 4046
3988sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3989 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3990 4049
3991 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3992 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3993 $signal->wait; 4052 $signal->wait;
… …
4007 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4009 Coro::async_pool { 4068 Coro::async_pool {
4010 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
4011 write_runtime_sync 4070 write_runtime_sync
4012 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
4013 }; 4072 };
4014 } 4073 }
4015 4074
4016 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017 $sig->send; 4076 $sig->send;
… …
4025 4084
4026 if (0) { 4085 if (0) {
4027 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
4028 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
4029 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
4031 } 4090 }
4032 } 4091 }
4033} 4092}
4034 4093
4035{ 4094{
… …
4080 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4081 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4082 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4083} 4142}
4084 4143
4085my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4086 4146
4087sub _log_backtrace { 4147sub _log_backtrace {
4088 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4089 4149
4090 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4091 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4093 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4094 ++$_log_backtrace; 4158 ++$_log_backtrace;
4095 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4096 async { 4160 async {
4097 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4098 4162
… …
4118 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4119 --$_log_backtrace; 4183 --$_log_backtrace;
4120 }; 4184 };
4121 } else { 4185 } else {
4122 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4123 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124 } 4188 }
4125} 4189}
4126 4190
4127# load additional modules 4191# load additional modules
4128require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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