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.527 by root, Fri Apr 23 04:32:47 2010 UTC vs.
Revision 1.551 by root, Sun May 16 13:48:07 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112 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
117our $VERBOSE_IO = 0;#d# 117our $VERBOSE_IO = 1;
118 118
119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
121our $NEXT_TICK; 121our $NEXT_TICK;
122our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
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->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1642 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1643 1692
1644 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1840 1889
1841sub register { 1890sub register {
1842 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 1892 my $pkg = caller;
1844 1893
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 1895
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 1897}
1850 1898
… …
1862} 1910}
1863 1911
1864sub normalise { 1912sub normalise {
1865 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1866 1914
1867 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1868 1916
1869 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1870 1918
1871 # map plan: 1919 # map plan:
1872 # 1920 #
… …
1887 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 1936 $path = "$base/$path";
1889 } 1937 }
1890 1938
1891 for ($path) { 1939 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1895 } 1942 }
1896 1943
1897 $path 1944 $path
… …
1911 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1912 return $self; 1959 return $self;
1913 } 1960 }
1914 } 1961 }
1915 1962
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 1964 ()
1918} 1965}
1919 1966
1920sub init { 1967sub init {
1921 my ($self) = @_; 1968 my ($self) = @_;
… …
2043} 2090}
2044 2091
2045sub find; 2092sub find;
2046sub find { 2093sub find {
2047 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
2048 2097
2049 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
2050 2099
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2184} 2233}
2185 2234
2186sub find_sync { 2235sub find_sync {
2187 my ($path, $origin) = @_; 2236 my ($path, $origin) = @_;
2188 2237
2189 cf::sync_job { find $path, $origin } 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2239 if $Coro::current == $Coro::main;
2240
2241 find $path, $origin
2190} 2242}
2191 2243
2192sub do_load_sync { 2244sub do_load_sync {
2193 my ($map) = @_; 2245 my ($map) = @_;
2194 2246
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2247 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2248 if $Coro::current == $Coro::main;
2197 2249
2198 cf::sync_job { $map->load }; 2250 $map->load;
2199} 2251}
2200 2252
2201our %MAP_PREFETCH; 2253our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2254our $MAP_PREFETCHER = undef;
2203 2255
… …
2315 2367
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2368 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2369
2318 return if $self->players; 2370 return if $self->players;
2319 2371
2320 warn "resetting map ", $self->path, "\n"; 2372 cf::trace "resetting map ", $self->path, "\n";
2321 2373
2322 $self->in_memory (cf::MAP_SWAPPED); 2374 $self->in_memory (cf::MAP_SWAPPED);
2323 2375
2324 # need to save uniques path 2376 # need to save uniques path
2325 unless ($self->{deny_save}) { 2377 unless ($self->{deny_save}) {
… …
2690 2742
2691sub cf::object::player::goto { 2743sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2744 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2745
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2746 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2747 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2748 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2749 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2750 }
2699 2751
2700 # do generation counting so two concurrent goto's will be executed in-order 2752 # do generation counting so two concurrent goto's will be executed in-order
… …
2848 $self->message ("Something went wrong deep within the deliantra server. " 2900 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 2901 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 2902 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 2903 cf::NDI_UNIQUE | cf::NDI_RED);
2852 2904
2853 warn "ERROR in enter_exit: $@"; 2905 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 2906 $self->leave_link;
2855 } 2907 }
2856 })->prio (1); 2908 })->prio (1);
2857} 2909}
2858 2910
… …
3171 3223
3172 $ns->ext_reply ($reply, @reply) 3224 $ns->ext_reply ($reply, @reply)
3173 if $reply; 3225 if $reply;
3174 3226
3175 } else { 3227 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3228 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3229 }
3178 3230
3179 cf::override; 3231 cf::override;
3180 }, 3232 },
3181); 3233);
… …
3262 decrease split destroy change_exp value msg lore send_msg)], 3314 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3315 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3316 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3317 ["cf::map" => qw(trigger)],
3266) { 3318) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3319 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3320 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3321 for @funs;
3271} 3322}
3272 3323
… …
3311 local @cf::_safe_eval_args = values %vars; 3362 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3363 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3364 }
3314 3365
3315 if ($@) { 3366 if ($@) {
3316 warn "$@"; 3367 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3368 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3369 "with arguments " . (join " ", %vars) . "\n";
3319 } 3370 }
3320 3371
3321 wantarray ? @res : $res[0] 3372 wantarray ? @res : $res[0]
3322} 3373}
3323 3374
… …
3357 # for this (global event?) 3408 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3359 3410
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3412
3362 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3363 3414
3364 my $facedata;
3365 0 < aio_load $path, $facedata 3415 0 < aio_load $path, my $facedata
3366 or die "$path: $!"; 3416 or die "$path: $!";
3367 3417
3368 $facedata = Coro::Storable::thaw $facedata; 3418 $facedata = Coro::Storable::thaw $facedata;
3369 3419
3370 $facedata->{version} == 2 3420 $facedata->{version} == 2
… …
3401 3451
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3452 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3453 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3454 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3455 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3456 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3457 }
3408 3458
3409 cf::cede_to_tick; 3459 cf::cede_to_tick;
3410 } 3460 }
3411 } 3461 }
… …
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3479 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3480
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3481 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3482 cf::face::set_type $idx, $info->{type};
3433 } else { 3483 } else {
3434 $RESOURCE{$name} = $info; 3484 $RESOURCE{$name} = $info; # unused
3435 } 3485 }
3436 3486
3437 cf::cede_to_tick; 3487 cf::cede_to_tick;
3438 } 3488 }
3439 } 3489 }
3440 3490
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3491 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3492
3443 1 3493 1
3444} 3494}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3495
3466register_exticmd fx_want => sub { 3496register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3497 my ($ns, $want) = @_;
3468 3498
3469 while (my ($k, $v) = each %$want) { 3499 while (my ($k, $v) = each %$want) {
… …
3508sub reload_treasures { 3538sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3539 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3540 or die "unable to load treasurelists\n";
3511} 3541}
3512 3542
3543sub reload_sound {
3544 trace "loading sound config from $DATADIR/sound\n";
3545
3546 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3547 or die "$DATADIR/sound $!";
3548
3549 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3550
3551 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3552 my $sound = $soundconf->{compat}[$_]
3553 or next;
3554
3555 my $face = cf::face::find "sound/$sound->[1]";
3556 cf::sound::set $sound->[0] => $face;
3557 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3558 }
3559
3560 while (my ($k, $v) = each %{$soundconf->{event}}) {
3561 my $face = cf::face::find "sound/$v";
3562 cf::sound::set $k => $face;
3563 }
3564}
3565
3513sub reload_resources { 3566sub reload_resources {
3514 warn "reloading resource files...\n"; 3567 trace "reloading resource files...\n";
3515 3568
3569 reload_exp_table;
3570 reload_materials;
3516 reload_facedata; 3571 reload_facedata;
3572 reload_sound;
3517 reload_archetypes; 3573 reload_archetypes;
3518 reload_regions; 3574 reload_regions;
3519 reload_treasures; 3575 reload_treasures;
3520 3576
3521 warn "finished reloading resource files\n"; 3577 trace "finished reloading resource files\n";
3522} 3578}
3523 3579
3524sub reload_config { 3580sub reload_config {
3525 warn "reloading config file...\n"; 3581 trace "reloading config file...\n";
3526 3582
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3583 0 < aio_load "$CONFDIR/config", my $config
3528 or return; 3584 or die "$CONFDIR/config: $!";
3529 3585
3530 local $/; 3586 utf8::decode $config;
3531 *CFG = YAML::XS::Load scalar <$fh>; 3587 *CFG = yaml_load $config;
3532 3588
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3589 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3590
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3591 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3592 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3596 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3597 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3598 };
3543 warn $@ if $@; 3599 warn $@ if $@;
3544 } 3600 }
3545
3546 warn "finished reloading resource files\n";
3547} 3601}
3548 3602
3549sub pidfile() { 3603sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3604 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3605 or die "$PIDFILE: $!";
… …
3564 seek $fh, 0, 0; 3618 seek $fh, 0, 0;
3565 print $fh $$; 3619 print $fh $$;
3566} 3620}
3567 3621
3568sub main_loop { 3622sub main_loop {
3569 warn "EV::loop starting\n"; 3623 trace "EV::loop starting\n";
3570 if (1) { 3624 if (1) {
3571 EV::loop; 3625 EV::loop;
3572 } 3626 }
3573 warn "EV::loop returned\n"; 3627 trace "EV::loop returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3628 goto &main_loop unless $REALLY_UNLOOP;
3575} 3629}
3576 3630
3577sub main { 3631sub main {
3578 cf::init_globals; # initialise logging 3632 cf::init_globals; # initialise logging
3579 3633
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3634 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3635 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3636 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3637 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3638
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3639 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3640
… …
3594 }; 3648 };
3595 3649
3596 evthread_start IO::AIO::poll_fileno; 3650 evthread_start IO::AIO::poll_fileno;
3597 3651
3598 cf::sync_job { 3652 cf::sync_job {
3599 cf::init_experience; 3653 cf::incloader::init ();
3654
3600 cf::init_anim; 3655 cf::init_anim;
3601 cf::init_attackmess; 3656 cf::init_attackmess;
3602 cf::init_dynamic; 3657 cf::init_dynamic;
3603 3658
3604 cf::load_settings; 3659 cf::load_settings;
3605 cf::load_materials;
3606 3660
3607 reload_resources; 3661 reload_resources;
3608 reload_config; 3662 reload_config;
3609 db_init; 3663 db_init;
3610 3664
… …
3622 3676
3623 # no (long-running) fork's whatsoever before this point(!) 3677 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3678 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3679 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3680
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3681 cf::_post_init 0;
3628 }; 3682 };
3629 3683
3630 cf::object::thawer::errors_are_fatal 0; 3684 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3685 info "parse errors in files are no longer fatal from this point on.\n";
3632 3686
3687 my $free_main; $free_main = EV::idle sub {
3688 undef $free_main;
3689 undef &main; # free gobs of memory :)
3690 };
3691
3633 main_loop; 3692 goto &main_loop;
3634} 3693}
3635 3694
3636############################################################################# 3695#############################################################################
3637# initialisation and cleanup 3696# initialisation and cleanup
3638 3697
… …
3677 or return; 3736 or return;
3678 3737
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3738 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 3739 and return;
3681 3740
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3741 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 3742
3684 1 3743 1
3685} 3744}
3686 3745
3687our $uuid_lock; 3746our $uuid_lock;
… …
3699 or return; 3758 or return;
3700 3759
3701 my $value = uuid_seq uuid_cur; 3760 my $value = uuid_seq uuid_cur;
3702 3761
3703 unless ($value) { 3762 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 3763 info "cowardly refusing to write zero uuid value!\n";
3705 return; 3764 return;
3706 } 3765 }
3707 3766
3708 my $value = uuid_str $value + $uuid_skip; 3767 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 3768 $uuid_skip = 0;
… …
3719 or return; 3778 or return;
3720 3779
3721 aio_rename "$uuid~", $uuid 3780 aio_rename "$uuid~", $uuid
3722 and return; 3781 and return;
3723 3782
3724 warn "uuid file written ($value).\n"; 3783 trace "uuid file written ($value).\n";
3725 3784
3726 1 3785 1
3727 3786
3728} 3787}
3729 3788
… …
3735} 3794}
3736 3795
3737sub emergency_save() { 3796sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 3797 my $freeze_guard = cf::freeze_mainloop;
3739 3798
3740 warn "emergency_perl_save: enter\n"; 3799 info "emergency_perl_save: enter\n";
3800
3801 # this is a trade-off: we want to be very quick here, so
3802 # save all maps without fsync, and later call a global sync
3803 # (which in turn might be very very slow)
3804 local $USE_FSYNC = 0;
3741 3805
3742 cf::sync_job { 3806 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 3807 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 3808
3748 # use a peculiar iteration method to avoid tripping on perl 3809 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 3810 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 3811 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 3812 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 3813 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 3814 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 3815 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3816 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 3817 $pl->save;
3757 } 3818 }
3758 warn "emergency_perl_save: end player save\n"; 3819 info "emergency_perl_save: end player save\n";
3759 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3760 warn "emergency_perl_save: begin map save\n"; 3823 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 3824 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 3825 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 3826 $map->valid or next;
3764 $map->save; 3827 $map->save;
3765 } 3828 }
3766 warn "emergency_perl_save: end map save\n"; 3829 info "emergency_perl_save: end map save\n";
3767 3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3768 warn "emergency_perl_save: begin database checkpoint\n"; 3833 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 3834 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 3835 info "emergency_perl_save: end database checkpoint\n";
3771 3836
3772 warn "emergency_perl_save: begin write uuid\n"; 3837 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 3838 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 3839 info "emergency_perl_save: end write uuid\n";
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: syncing database to disk";
3844 BDB::db_env_txn_checkpoint $DB_ENV;
3845
3846 info "emergency_perl_save: starting sync\n";
3847 IO::AIO::aio_sync sub {
3848 info "emergency_perl_save: finished sync\n";
3849 };
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3853 trace "emergency_perl_save: flushing outstanding aio requests";
3854 while (IO::AIO::nreqs || BDB::nreqs) {
3855 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3856 }
3857
3858 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 3859 };
3776 3860
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 3861 info "emergency_perl_save: leave\n";
3783} 3862}
3784 3863
3785sub post_cleanup { 3864sub post_cleanup {
3786 my ($make_core) = @_; 3865 my ($make_core) = @_;
3787 3866
3867 IO::AIO::flush;
3868
3788 warn Carp::longmess "post_cleanup backtrace" 3869 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 3870 if $make_core;
3790 3871
3791 my $fh = pidfile; 3872 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 3873 unlink $PIDFILE if <$fh> == $$;
3793} 3874}
… …
3817 } 3898 }
3818} 3899}
3819 3900
3820sub do_reload_perl() { 3901sub do_reload_perl() {
3821 # can/must only be called in main 3902 # can/must only be called in main
3822 if (in_main) { 3903 unless (in_main) {
3823 warn "can only reload from main coroutine"; 3904 error "can only reload from main coroutine";
3824 return; 3905 return;
3825 } 3906 }
3826 3907
3827 return if $RELOAD++; 3908 return if $RELOAD++;
3828 3909
3829 my $t1 = AE::time; 3910 my $t1 = AE::time;
3830 3911
3831 while ($RELOAD) { 3912 while ($RELOAD) {
3832 warn "reloading..."; 3913 cf::get_slot 0.1, -1, "reload_perl";
3914 info "perl_reload: reloading...";
3833 3915
3834 warn "entering sync_job"; 3916 trace "perl_reload: entering sync_job";
3835 3917
3836 cf::sync_job { 3918 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 3919 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 3920
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 3921 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 3922 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 3923 %EXT_CORO = ();
3854 3924
3855 warn "removing commands"; 3925 trace "perl_reload: removing commands";
3856 %COMMAND = (); 3926 %COMMAND = ();
3857 3927
3858 warn "removing ext/exti commands"; 3928 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 3929 %EXTCMD = ();
3860 %EXTICMD = (); 3930 %EXTICMD = ();
3861 3931
3862 warn "unloading/nuking all extensions"; 3932 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 3933 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 3934 trace "... unloading $pkg";
3865 3935
3866 if (my $cb = $pkg->can ("unload")) { 3936 if (my $cb = $pkg->can ("unload")) {
3867 eval { 3937 eval {
3868 $cb->($pkg); 3938 $cb->($pkg);
3869 1 3939 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 3940 } or error "$pkg unloaded, but with errors: $@";
3871 } 3941 }
3872 3942
3873 warn "... clearing $pkg"; 3943 trace "... clearing $pkg";
3874 clear_package $pkg; 3944 clear_package $pkg;
3875 } 3945 }
3876 3946
3877 warn "unloading all perl modules loaded from $LIBDIR"; 3947 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 3948 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3949 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 3950
3881 warn "... unloading $k"; 3951 trace "... unloading $k";
3882 delete $INC{$k}; 3952 delete $INC{$k};
3883 3953
3884 $k =~ s/\.pm$//; 3954 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 3955 $k =~ s/\//::/g;
3886 3956
… …
3889 } 3959 }
3890 3960
3891 clear_package $k; 3961 clear_package $k;
3892 } 3962 }
3893 3963
3894 warn "getting rid of safe::, as good as possible"; 3964 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 3965 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3966 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 3967
3898 warn "unloading cf.pm \"a bit\""; 3968 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 3969 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3970 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 3971
3902 # don't, removes xs symbols, too, 3972 # don't, removes xs symbols, too,
3903 # and global variables created in xs 3973 # and global variables created in xs
3904 #clear_package __PACKAGE__; 3974 #clear_package __PACKAGE__;
3905 3975
3906 warn "unload completed, starting to reload now"; 3976 info "perl_reload: unload completed, starting to reload now";
3907 3977
3908 warn "reloading cf.pm"; 3978 trace "perl_reload: reloading cf.pm";
3909 require cf; 3979 require cf;
3910 cf::_connect_to_perl_1; 3980 cf::_connect_to_perl_1;
3911 3981
3912 warn "loading config and database again"; 3982 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 3983 cf::reload_config;
3914 3984
3915 warn "loading extensions"; 3985 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 3986 cf::load_extensions;
3917 3987
3918 if ($REATTACH_ON_RELOAD) { 3988 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 3989 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 3990 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 3991 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 3992 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 3993 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 3994 reattach $_ for values %PLAYER;
3925 } 3995 }
3926 3996
3927 warn "running post_init jobs"; 3997 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 3998
3930 warn "leaving sync_job"; 3999 trace "perl_reload: leaving sync_job";
3931 4000
3932 1 4001 1
3933 } or do { 4002 } or do {
3934 warn $@; 4003 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4004 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4005 };
3937 4006
3938 warn "reloaded";
3939 --$RELOAD; 4007 --$RELOAD;
3940 } 4008 }
3941 4009
3942 $t1 = AE::time - $t1; 4010 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4011 info "perl_reload: completed in ${t1}s\n";
3944}; 4012};
3945 4013
3946our $RELOAD_WATCHER; # used only during reload 4014our $RELOAD_WATCHER; # used only during reload
3947 4015
3948sub reload_perl() { 4016sub reload_perl() {
… …
3969 reload_perl; 4037 reload_perl;
3970 }; 4038 };
3971 } 4039 }
3972}; 4040};
3973 4041
3974unshift @INC, $LIBDIR; 4042#############################################################################
3975 4043
3976my $bug_warning = 0; 4044my $bug_warning = 0;
3977 4045
3978our @WAIT_FOR_TICK; 4046our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN; 4047our @WAIT_FOR_TICK_BEGIN;
3980 4048
3981sub wait_for_tick { 4049sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3983 4051
3984 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3985 push @WAIT_FOR_TICK, $signal; 4053 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait; 4054 $signal->wait;
3987} 4055}
3988 4056
3989sub wait_for_tick_begin { 4057sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4058 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3991 4059
3992 my $signal = new Coro::Signal; 4060 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4061 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4062 $signal->wait;
… …
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4076 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4077 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4078 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4079 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4080 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4081 or error "ERROR: unable to write runtime file: $!";
4014 }; 4082 };
4015 } 4083 }
4016 4084
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4085 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4086 $sig->send;
… …
4026 4094
4027 if (0) { 4095 if (0) {
4028 if ($NEXT_TICK) { 4096 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4097 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4098 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4099 debug "jitter $JITTER\n";#d#
4032 } 4100 }
4033 } 4101 }
4034} 4102}
4035 4103
4036{ 4104{

Diff Legend

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