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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.548 by root, Mon May 10 21:40:22 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 = 4000; 113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
115 118
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 121our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 127our $DB_ENV;
125 128
126our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 130
128our %CFG; 131our %CFG;
129 132
130our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 134our $RUNTIME;
… …
230from wherever your confdir points to. 233from wherever your confdir points to.
231 234
232=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
233 236
234These 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
235returns 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
236per 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();
237 245
238=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
239 247
240This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
241C<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
… …
249 257
250=back 258=back
251 259
252=cut 260=cut
253 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
254$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 269 my $msg = join "", @_;
256 270
257 $msg .= "\n" 271 $msg .= "\n"
258 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
259 273
260 $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;
261 275
262 LOG llevError, $msg; 276 LOG llevWarn, $msg;
263}; 277};
264 278
265$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
267 281
268 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
269 283
270 if (in_main) {#d# 284 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 286 return;#d#
273 }#d# 287 }#d#
274 288
275 # kill coroutine otherwise 289 # kill coroutine otherwise
276 Coro::terminate 290 Coro::terminate
… …
343our $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
344 358
345sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
347 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
348=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
349 375
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
352 378
353The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 380is a reload or not.
355 381
356=cut 382=cut
357 383
358sub post_init(&) { 384sub post_init(&) {
… …
509=cut 535=cut
510 536
511sub sync_job(&) { 537sub sync_job(&) {
512 my ($job) = @_; 538 my ($job) = @_;
513 539
514 if ($Coro::current == $Coro::main) { 540 if (in_main) {
515 my $time = AE::time; 541 my $time = AE::time;
516 542
517 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
519 545
520 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
521 547
522 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
523 549
524 my $busy = 1; 550 my $busy = 1;
525 my @res; 551 my @res;
526 552
527 (async { 553 (async {
528 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 555 @res = eval { $job->() };
530 warn $@ if $@; 556 error $@ if $@;
531 undef $busy; 557 undef $busy;
532 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
533 559
534 while ($busy) { 560 while ($busy) {
535 if (Coro::nready) { 561 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
570 596
571 $coro 597 $coro
572} 598}
573 599
574=item fork_call { }, $args 600=item fork_call { }, @args
575 601
576Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 605never block itself or use any form of event handling.
580 606
581=cut 607=cut
582 608
609sub post_fork {
610 reset_signals;
611}
612
583sub fork_call(&@) { 613sub fork_call(&@) {
584 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
585 615
586 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
589 619
590 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
591 reset_signals; 621 cf::post_fork;
592 &$cb 622 &$cb
593 }, @args; 623 } @args;
594 624
595 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
596} 626}
597 627
598sub objinfo { 628sub objinfo {
… …
648within each server. 678within each server.
649 679
650=cut 680=cut
651 681
652sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
653 my ($name) = @_; 686 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
655 688
656 eval { 689 eval {
657 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
… …
667} 700}
668 701
669our $DB; 702our $DB;
670 703
671sub db_init { 704sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
674 };
675} 706}
676 707
677sub db_get($$) { 708sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
679 710
680 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
681 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
682 715
683 $! ? () 716 $! ? ()
684 : $data 717 : $data
685 }
686} 718}
687 719
688sub db_put($$$) { 720sub db_put($$$) {
689 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 778
747 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 780 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
750 782
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 784
753 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
756 788
… …
766 798
767=cut 799=cut
768 800
769sub datalog($@) { 801sub datalog($@) {
770 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 804}
773 805
774=back 806=back
775 807
776=cut 808=cut
… …
971 1003
972 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1006
975 } elsif (ref $type) { 1007 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
977 1009
978 } else { 1010 } else {
979 shift @arg; 1011 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
981 } 1013 }
982 } 1014 }
983} 1015}
984 1016
985sub _object_attach { 1017sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
996 } 1028 }
997 1029
998 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
999 } else { 1031 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1033 }
1002 1034
1003 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
1004} 1036}
1005 1037
… …
1064 1096
1065 for (@$callbacks) { 1097 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1067 1099
1068 if ($@) { 1100 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1102 override;
1072 } 1103 }
1073 1104
1074 return 1 if $override; 1105 return 1 if $override;
1075 } 1106 }
… …
1154 for (@$attach) { 1185 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1157 } 1188 }
1158 } else { 1189 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1191 }
1161 } 1192 }
1162} 1193}
1163 1194
1164cf::attachable->attach ( 1195cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1192 1223
1193 sync_job { 1224 sync_job {
1194 if (length $$rdata) { 1225 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1198 1230
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1234 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1225 1257
1226 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1260 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1230 } 1262 }
1231 } else { 1263 } else {
1232 aio_unlink $filename; 1264 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1234 } 1266 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1291 $av = $st->{objs};
1260 } 1292 }
1261 1293
1262 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1265 1298
1266 ($data, $av) 1299 ($data, $av)
1267} 1300}
1268 1301
1269=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
… …
1361 1394
1362 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1396 if $reply;
1364 1397
1365 } else { 1398 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1400 }
1368 1401
1369 cf::override; 1402 cf::override;
1370 }, 1403 },
1371); 1404);
… …
1382 1415
1383 $grp 1416 $grp
1384} 1417}
1385 1418
1386sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1387 cf::sync_job { 1422 cf::sync_job {
1388 my %todo; 1423 my %todo;
1389 1424
1390 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1426 next unless -r $path;
… …
1409 1444
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1447
1413 $ext{source} = 1448 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1416 . $source 1451 . $source
1417 . "\n};\n1"; 1452 . "\n};\n1";
1418 1453
1419 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1467 next ext
1433 unless exists $done{$_}; 1468 unless exists $done{$_};
1434 } 1469 }
1435 1470
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1472
1438 my $active = eval $v->{source}; 1473 my $active = eval $v->{source};
1439 1474
1440 if (length $@) { 1475 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1476 error "$v->{path}: $@\n";
1442 1477
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1479 if exists $v->{meta}{mandatory};
1445 1480
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1483 } else {
1449 $done{$k} = delete $todo{$k}; 1484 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1485 push @EXTS, $v->{pkg};
1451 $progress = 1; 1486 $progress = 1;
1452 1487
1453 warn "$v->{base}: extension inactive.\n" 1488 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1489 unless $active;
1455 } 1490 }
1456 } 1491 }
1457 1492
1458 unless ($progress) { 1493 unless ($progress) {
… …
1629 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1666
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1633 $pl->deactivate; 1668 $pl->deactivate;
1669
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score; 1671 ext::highscore::check ($pl->ob);
1672
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1673 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1637 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1638 1675
1639 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1835 1872
1836sub register { 1873sub register {
1837 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1875 my $pkg = caller;
1839 1876
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1878
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1880}
1845 1881
1846# also paths starting with '/' 1882# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1884
1849sub thawer_merge { 1885sub thawer_merge {
1850 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1851 1887
1852 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
… …
1857} 1893}
1858 1894
1859sub normalise { 1895sub normalise {
1860 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1861 1897
1862 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1863 1899
1864 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1865 1901
1866 # map plan: 1902 # map plan:
1867 # 1903 #
… …
1906 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1907 return $self; 1943 return $self;
1908 } 1944 }
1909 } 1945 }
1910 1946
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1948 ()
1913} 1949}
1914 1950
1915sub init { 1951sub init {
1916 my ($self) = @_; 1952 my ($self) = @_;
… …
2038} 2074}
2039 2075
2040sub find; 2076sub find;
2041sub find { 2077sub find {
2042 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
2079
2080 cf::cede_to_tick;
2043 2081
2044 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
2045 2083
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2162 or next; 2200 or next;
2163 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2164 or next; 2202 or next;
2165 $neigh->load; 2203 $neigh->load;
2166 2204
2205 # now find the diagonal neighbours
2167 push @neigh, 2206 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2209 }
2171 2210
… …
2178} 2217}
2179 2218
2180sub find_sync { 2219sub find_sync {
2181 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2182 2221
2183 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2184} 2226}
2185 2227
2186sub do_load_sync { 2228sub do_load_sync {
2187 my ($map) = @_; 2229 my ($map) = @_;
2188 2230
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2191 2233
2192 cf::sync_job { $map->load }; 2234 $map->load;
2193} 2235}
2194 2236
2195our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2197 2239
… …
2309 2351
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2353
2312 return if $self->players; 2354 return if $self->players;
2313 2355
2314 warn "resetting map ", $self->path, "\n"; 2356 cf::trace "resetting map ", $self->path, "\n";
2315 2357
2316 $self->in_memory (cf::MAP_SWAPPED); 2358 $self->in_memory (cf::MAP_SWAPPED);
2317 2359
2318 # need to save uniques path 2360 # need to save uniques path
2319 unless ($self->{deny_save}) { 2361 unless ($self->{deny_save}) {
… …
2343 2385
2344 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2345 2387
2346 $self->unlink_save; 2388 $self->unlink_save;
2347 2389
2348 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2395
… …
2583 2625
2584Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2585 2627
2586The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2589map. 2631map.
2590 2632
2591Will never block. 2633Will never block.
2592 2634
2593=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2615 my ($self) = @_; 2657 my ($self) = @_;
2616 2658
2617 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2618 2660
2661 ++$self->{_link_recursion};
2662
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2664
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2623 2667
… …
2654 $map->load_neighbours; 2698 $map->load_neighbours;
2655 2699
2656 return unless $self->contr->active; 2700 return unless $self->contr->active;
2657 2701
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2660 2704 # entering was successful
2705 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2706 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2707 $self->activate_recursive;
2663} 2708 }
2664 2709
2710}
2711
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2713
2667Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
… …
2677 2724
2678our $GOTOGEN; 2725our $GOTOGEN;
2679 2726
2680sub cf::object::player::goto { 2727sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2682 2735
2683 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2738
2686 $self->enter_link; 2739 $self->enter_link;
… …
2710 my $map = eval { 2763 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2712 2765
2713 if ($map) { 2766 if ($map) {
2714 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2769 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2771 }
2719 2772
2720 $map 2773 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2731 } 2784 }
2732 2785
2733 $done->() if $done; 2786 $done->($self) if $done;
2734 })->prio (1); 2787 })->prio (1);
2735} 2788}
2736 2789
2737=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2738 2791
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2888
2836 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2890 $self->leave_link;
2838 } 2891 }
2839 })->prio (1); 2892 })->prio (1);
2840} 2893}
2841 2894
… …
3154 3207
3155 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3209 if $reply;
3157 3210
3158 } else { 3211 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3213 }
3161 3214
3162 cf::override; 3215 cf::override;
3163 }, 3216 },
3164); 3217);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3300 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3249) { 3302) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3305 for @funs;
3254} 3306}
3255 3307
… …
3294 local @cf::_safe_eval_args = values %vars; 3346 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3347 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3348 }
3297 3349
3298 if ($@) { 3350 if ($@) {
3299 warn "$@"; 3351 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3302 } 3354 }
3303 3355
3304 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3305} 3357}
3306 3358
… …
3340 # for this (global event?) 3392 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3394
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3396
3345 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3346 3398
3347 my $facedata;
3348 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3349 or die "$path: $!"; 3400 or die "$path: $!";
3350 3401
3351 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3352 3403
3353 $facedata->{version} == 2 3404 $facedata->{version} == 2
… …
3384 3435
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3439 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3441 }
3391 3442
3392 cf::cede_to_tick; 3443 cf::cede_to_tick;
3393 } 3444 }
3394 } 3445 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3464
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3416 } else { 3467 } else {
3417 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3418 } 3469 }
3419 3470
3420 cf::cede_to_tick; 3471 cf::cede_to_tick;
3421 } 3472 }
3422 } 3473 }
3423 3474
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3476
3426 1 3477 1
3427} 3478}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3479
3449register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3451 3482
3452 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3522sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3494} 3525}
3495 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3496sub reload_resources { 3550sub reload_resources {
3497 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3498 3552
3553 reload_exp_table;
3554 reload_materials;
3499 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3500 reload_archetypes; 3557 reload_archetypes;
3501 reload_regions; 3558 reload_regions;
3502 reload_treasures; 3559 reload_treasures;
3503 3560
3504 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3505} 3562}
3506 3563
3507sub reload_config { 3564sub reload_config {
3508 warn "reloading config file...\n"; 3565 trace "reloading config file...\n";
3509 3566
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3567 0 < aio_load "$CONFDIR/config", my $config
3511 or return; 3568 or die "$CONFDIR/config: $!";
3512 3569
3513 local $/; 3570 utf8::decode $config;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3571 *CFG = yaml_load $config;
3515 3572
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3574
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3577
3521 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3580 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3581 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3582 };
3526 warn $@ if $@; 3583 warn $@ if $@;
3527 } 3584 }
3528
3529 warn "finished reloading resource files\n";
3530} 3585}
3531 3586
3532sub pidfile() { 3587sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3588 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3589 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3548 print $fh $$; 3603 print $fh $$;
3549} 3604}
3550 3605
3551sub main_loop { 3606sub main_loop {
3552 warn "EV::loop starting\n"; 3607 trace "EV::loop starting\n";
3553 if (1) { 3608 if (1) {
3554 EV::loop; 3609 EV::loop;
3555 } 3610 }
3556 warn "EV::loop returned\n"; 3611 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3612 goto &main_loop unless $REALLY_UNLOOP;
3558} 3613}
3559 3614
3560sub main { 3615sub main {
3561 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3562 3617
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3622
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3624
… …
3577 }; 3632 };
3578 3633
3579 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3580 3635
3581 cf::sync_job { 3636 cf::sync_job {
3582 cf::init_experience; 3637 cf::incloader::init ();
3638
3583 cf::init_anim; 3639 cf::init_anim;
3584 cf::init_attackmess; 3640 cf::init_attackmess;
3585 cf::init_dynamic; 3641 cf::init_dynamic;
3586 3642
3587 cf::load_settings; 3643 cf::load_settings;
3588 cf::load_materials;
3589 3644
3590 reload_resources; 3645 reload_resources;
3591 reload_config; 3646 reload_config;
3592 db_init; 3647 db_init;
3593 3648
… …
3609 3664
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3611 }; 3666 };
3612 3667
3613 cf::object::thawer::errors_are_fatal 0; 3668 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3669 info "parse errors in files are no longer fatal from this point on.\n";
3615 3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3616 main_loop; 3676 goto &main_loop;
3617} 3677}
3618 3678
3619############################################################################# 3679#############################################################################
3620# initialisation and cleanup 3680# initialisation and cleanup
3621 3681
… …
3660 or return; 3720 or return;
3661 3721
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3723 and return;
3664 3724
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3726
3667 1 3727 1
3668} 3728}
3669 3729
3670our $uuid_lock; 3730our $uuid_lock;
… …
3682 or return; 3742 or return;
3683 3743
3684 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3685 3745
3686 unless ($value) { 3746 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3748 return;
3689 } 3749 }
3690 3750
3691 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3752 $uuid_skip = 0;
… …
3702 or return; 3762 or return;
3703 3763
3704 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3705 and return; 3765 and return;
3706 3766
3707 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3708 3768
3709 1 3769 1
3710 3770
3711} 3771}
3712 3772
… …
3718} 3778}
3719 3779
3720sub emergency_save() { 3780sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3722 3782
3723 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3724 3789
3725 cf::sync_job { 3790 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 3792
3731 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3799 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3801 $pl->save;
3740 } 3802 }
3741 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3742 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3743 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3810 $map->valid or next;
3747 $map->save; 3811 $map->save;
3748 } 3812 }
3749 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3750 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3754 3820
3755 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3822 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3843 };
3759 3844
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3766} 3846}
3767 3847
3768sub post_cleanup { 3848sub post_cleanup {
3769 my ($make_core) = @_; 3849 my ($make_core) = @_;
3770 3850
3851 IO::AIO::flush;
3852
3771 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3854 if $make_core;
3773 3855
3774 my $fh = pidfile; 3856 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3776} 3858}
… …
3800 } 3882 }
3801} 3883}
3802 3884
3803sub do_reload_perl() { 3885sub do_reload_perl() {
3804 # can/must only be called in main 3886 # can/must only be called in main
3805 if (in_main) { 3887 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3807 return; 3889 return;
3808 } 3890 }
3809 3891
3810 return if $RELOAD++; 3892 return if $RELOAD++;
3811 3893
3812 my $t1 = AE::time; 3894 my $t1 = AE::time;
3813 3895
3814 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3815 warn "reloading..."; 3898 info "reloading...";
3816 3899
3817 warn "entering sync_job"; 3900 trace "entering sync_job";
3818 3901
3819 cf::sync_job { 3902 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3903 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3904
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3907 %EXT_CORO = ();
3837 3908
3838 warn "removing commands"; 3909 trace "removing commands";
3839 %COMMAND = (); 3910 %COMMAND = ();
3840 3911
3841 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3842 %EXTCMD = (); 3913 %EXTCMD = ();
3843 %EXTICMD = (); 3914 %EXTICMD = ();
3844 3915
3845 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3848 3919
3849 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3921 eval {
3851 $cb->($pkg); 3922 $cb->($pkg);
3852 1 3923 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3854 } 3925 }
3855 3926
3856 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3857 clear_package $pkg; 3928 clear_package $pkg;
3858 } 3929 }
3859 3930
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3934
3864 warn "... unloading $k"; 3935 trace "... unloading $k";
3865 delete $INC{$k}; 3936 delete $INC{$k};
3866 3937
3867 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3869 3940
… …
3872 } 3943 }
3873 3944
3874 clear_package $k; 3945 clear_package $k;
3875 } 3946 }
3876 3947
3877 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3949 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3951
3881 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3955
3885 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3957 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3888 3959
3889 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3890 3961
3891 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3892 require cf; 3963 require cf;
3893 cf::_connect_to_perl_1; 3964 cf::_connect_to_perl_1;
3894 3965
3895 warn "loading config and database again"; 3966 trace "loading config and database again";
3896 cf::reload_config; 3967 cf::reload_config;
3897 3968
3898 warn "loading extensions"; 3969 trace "loading extensions";
3899 cf::load_extensions; 3970 cf::load_extensions;
3900 3971
3901 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3908 } 3979 }
3909 3980
3910 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3912 3983
3913 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3914 3985
3915 1 3986 1
3916 } or do { 3987 } or do {
3917 warn $@; 3988 error $@;
3918 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3919 }; 3990 };
3920 3991
3921 warn "reloaded"; 3992 info "reloaded";
3922 --$RELOAD; 3993 --$RELOAD;
3923 } 3994 }
3924 3995
3925 $t1 = AE::time - $t1; 3996 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3927}; 3998};
3928 3999
3929our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3930 4001
3931sub reload_perl() { 4002sub reload_perl() {
… …
3952 reload_perl; 4023 reload_perl;
3953 }; 4024 };
3954 } 4025 }
3955}; 4026};
3956 4027
3957unshift @INC, $LIBDIR; 4028#############################################################################
3958 4029
3959my $bug_warning = 0; 4030my $bug_warning = 0;
3960 4031
3961our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3963 4034
3964sub wait_for_tick { 4035sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4037
3967 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait; 4040 $signal->wait;
3970} 4041}
3971 4042
3972sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3974 4045
3975 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4048 $signal->wait;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4064 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4066 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3997 }; 4068 };
3998 } 4069 }
3999 4070
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4072 $sig->send;
… …
4009 4080
4010 if (0) { 4081 if (0) {
4011 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
4015 } 4086 }
4016 } 4087 }
4017} 4088}
4018 4089
4019{ 4090{

Diff Legend

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