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.550 by root, Fri May 14 22:56:47 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(&) {
359 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 }
360} 403}
361 404
362=item cf::lock_wait $string 405=item cf::lock_wait $string
363 406
364Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
509=cut 552=cut
510 553
511sub sync_job(&) { 554sub sync_job(&) {
512 my ($job) = @_; 555 my ($job) = @_;
513 556
514 if ($Coro::current == $Coro::main) { 557 if (in_main) {
515 my $time = AE::time; 558 my $time = AE::time;
516 559
517 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
519 562
520 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
521 564
522 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
523 566
524 my $busy = 1; 567 my $busy = 1;
525 my @res; 568 my @res;
526 569
527 (async { 570 (async {
528 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 572 @res = eval { $job->() };
530 warn $@ if $@; 573 error $@ if $@;
531 undef $busy; 574 undef $busy;
532 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
533 576
534 while ($busy) { 577 while ($busy) {
535 if (Coro::nready) { 578 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
570 613
571 $coro 614 $coro
572} 615}
573 616
574=item fork_call { }, $args 617=item fork_call { }, @args
575 618
576Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 622never block itself or use any form of event handling.
580 623
581=cut 624=cut
582 625
626sub post_fork {
627 reset_signals;
628}
629
583sub fork_call(&@) { 630sub fork_call(&@) {
584 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
585 632
586 # 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,
587 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
589 636
590 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
591 reset_signals; 638 cf::post_fork;
592 &$cb 639 &$cb
593 }, @args; 640 } @args;
594 641
595 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
596} 643}
597 644
598sub objinfo { 645sub objinfo {
… …
648within each server. 695within each server.
649 696
650=cut 697=cut
651 698
652sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
653 my ($name) = @_; 703 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
655 705
656 eval { 706 eval {
657 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
667} 717}
668 718
669our $DB; 719our $DB;
670 720
671sub db_init { 721sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
674 };
675} 723}
676 724
677sub db_get($$) { 725sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
679 727
680 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
681 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
682 732
683 $! ? () 733 $! ? ()
684 : $data 734 : $data
685 }
686} 735}
687 736
688sub db_put($$$) { 737sub db_put($$$) {
689 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
746 795
747 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
748 my $data = $process->(\@data); 797 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
750 799
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 801
753 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
756 805
… …
766 815
767=cut 816=cut
768 817
769sub datalog($@) { 818sub datalog($@) {
770 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 821}
773 822
774=back 823=back
775 824
776=cut 825=cut
… …
971 1020
972 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1023
975 } elsif (ref $type) { 1024 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
977 1026
978 } else { 1027 } else {
979 shift @arg; 1028 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
981 } 1030 }
982 } 1031 }
983} 1032}
984 1033
985sub _object_attach { 1034sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
996 } 1045 }
997 1046
998 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
999 } else { 1048 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1050 }
1002 1051
1003 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1004} 1053}
1005 1054
… …
1064 1113
1065 for (@$callbacks) { 1114 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1067 1116
1068 if ($@) { 1117 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1119 override;
1072 } 1120 }
1073 1121
1074 return 1 if $override; 1122 return 1 if $override;
1075 } 1123 }
… …
1154 for (@$attach) { 1202 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1157 } 1205 }
1158 } else { 1206 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1208 }
1161 } 1209 }
1162} 1210}
1163 1211
1164cf::attachable->attach ( 1212cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1192 1240
1193 sync_job { 1241 sync_job {
1194 if (length $$rdata) { 1242 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1198 1247
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1225 1274
1226 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1277 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1230 } 1279 }
1231 } else { 1280 } else {
1232 aio_unlink $filename; 1281 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1234 } 1283 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1308 $av = $st->{objs};
1260 } 1309 }
1261 1310
1262 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1265 1315
1266 ($data, $av) 1316 ($data, $av)
1267} 1317}
1268 1318
1269=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1361 1411
1362 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1363 if $reply; 1413 if $reply;
1364 1414
1365 } else { 1415 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1417 }
1368 1418
1369 cf::override; 1419 cf::override;
1370 }, 1420 },
1371); 1421);
… …
1382 1432
1383 $grp 1433 $grp
1384} 1434}
1385 1435
1386sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1387 cf::sync_job { 1439 cf::sync_job {
1388 my %todo; 1440 my %todo;
1389 1441
1390 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1443 next unless -r $path;
… …
1409 1461
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1464
1413 $ext{source} = 1465 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1416 . $source 1468 . $source
1417 . "\n};\n1"; 1469 . "\n};\n1";
1418 1470
1419 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1484 next ext
1433 unless exists $done{$_}; 1485 unless exists $done{$_};
1434 } 1486 }
1435 1487
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1489
1438 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1439 1491
1440 if (length $@) { 1492 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1442 1494
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1445 1497
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1500 } else {
1449 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1451 $progress = 1; 1503 $progress = 1;
1452 1504
1453 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1506 unless $active;
1455 } 1507 }
1456 } 1508 }
1457 1509
1458 unless ($progress) { 1510 unless ($progress) {
… …
1627 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1628 1680
1629 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1630 $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
1631 1683
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1685 $pl->deactivate;
1686
1634 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;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1637 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1638 1692
1639 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1835 1889
1836sub register { 1890sub register {
1837 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 1892 my $pkg = caller;
1839 1893
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 1895
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 1897}
1845 1898
1846# also paths starting with '/' 1899# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 1901
1849sub thawer_merge { 1902sub thawer_merge {
1850 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1851 1904
1852 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
… …
1857} 1910}
1858 1911
1859sub normalise { 1912sub normalise {
1860 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1861 1914
1862 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1863 1916
1864 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1865 1918
1866 # map plan: 1919 # map plan:
1867 # 1920 #
… …
1906 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1907 return $self; 1960 return $self;
1908 } 1961 }
1909 } 1962 }
1910 1963
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 1965 ()
1913} 1966}
1914 1967
1915sub init { 1968sub init {
1916 my ($self) = @_; 1969 my ($self) = @_;
… …
2038} 2091}
2039 2092
2040sub find; 2093sub find;
2041sub find { 2094sub find {
2042 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
2043 2098
2044 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2045 2100
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2162 or next; 2217 or next;
2163 $neigh = find $neigh, $map 2218 $neigh = find $neigh, $map
2164 or next; 2219 or next;
2165 $neigh->load; 2220 $neigh->load;
2166 2221
2222 # now find the diagonal neighbours
2167 push @neigh, 2223 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2224 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2225 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 } 2226 }
2171 2227
… …
2178} 2234}
2179 2235
2180sub find_sync { 2236sub find_sync {
2181 my ($path, $origin) = @_; 2237 my ($path, $origin) = @_;
2182 2238
2183 cf::sync_job { find $path, $origin } 2239 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2240 if $Coro::current == $Coro::main;
2241
2242 find $path, $origin
2184} 2243}
2185 2244
2186sub do_load_sync { 2245sub do_load_sync {
2187 my ($map) = @_; 2246 my ($map) = @_;
2188 2247
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2248 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2249 if $Coro::current == $Coro::main;
2191 2250
2192 cf::sync_job { $map->load }; 2251 $map->load;
2193} 2252}
2194 2253
2195our %MAP_PREFETCH; 2254our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2255our $MAP_PREFETCHER = undef;
2197 2256
… …
2309 2368
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2369 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2370
2312 return if $self->players; 2371 return if $self->players;
2313 2372
2314 warn "resetting map ", $self->path, "\n"; 2373 cf::trace "resetting map ", $self->path, "\n";
2315 2374
2316 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2317 2376
2318 # need to save uniques path 2377 # need to save uniques path
2319 unless ($self->{deny_save}) { 2378 unless ($self->{deny_save}) {
… …
2343 2402
2344 delete $cf::MAP{$self->path}; 2403 delete $cf::MAP{$self->path};
2345 2404
2346 $self->unlink_save; 2405 $self->unlink_save;
2347 2406
2348 bless $self, "cf::map"; 2407 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2408 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2409 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2410 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2411 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2412
… …
2583 2642
2584Freezes the player and moves him/her to a special map (C<{link}>). 2643Freezes the player and moves him/her to a special map (C<{link}>).
2585 2644
2586The player should be reasonably safe there for short amounts of time (e.g. 2645The 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, 2646for 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 2647though, as the player cannot control the character while it is on the link
2589map. 2648map.
2590 2649
2591Will never block. 2650Will never block.
2592 2651
2593=item $player_object->leave_link ($map, $x, $y) 2652=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2673sub cf::object::player::enter_link {
2615 my ($self) = @_; 2674 my ($self) = @_;
2616 2675
2617 $self->deactivate_recursive; 2676 $self->deactivate_recursive;
2618 2677
2678 ++$self->{_link_recursion};
2679
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2680 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2681
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2682 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2683 if $self->map && $self->map->{path} ne "{link}";
2623 2684
… …
2654 $map->load_neighbours; 2715 $map->load_neighbours;
2655 2716
2656 return unless $self->contr->active; 2717 return unless $self->contr->active;
2657 2718
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2719 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2720 if ($self->enter_map ($map, $x, $y)) {
2660 2721 # entering was successful
2722 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2723 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2724 $self->activate_recursive;
2663} 2725 }
2664 2726
2727}
2728
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2729=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2730
2667Moves the player to the given map-path and coordinates by first freezing 2731Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2732her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2733that 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 2734the new (success) or old (failed) map position. In either case, $done will
… …
2677 2741
2678our $GOTOGEN; 2742our $GOTOGEN;
2679 2743
2680sub cf::object::player::goto { 2744sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2745 my ($self, $path, $x, $y, $check, $done) = @_;
2746
2747 if ($self->{_link_recursion} >= $MAX_LINKS) {
2748 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2749 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2750 ($path, $x, $y) = @$EMERGENCY_POSITION;
2751 }
2682 2752
2683 # do generation counting so two concurrent goto's will be executed in-order 2753 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2754 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2755
2686 $self->enter_link; 2756 $self->enter_link;
… …
2710 my $map = eval { 2780 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2781 my $map = defined $path ? cf::map::find $path : undef;
2712 2782
2713 if ($map) { 2783 if ($map) {
2714 $map = $map->customise_for ($self); 2784 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2785 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2786 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2787 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2788 }
2719 2789
2720 $map 2790 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2798 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2799 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2800 $self->leave_link ($map, $x, $y);
2731 } 2801 }
2732 2802
2733 $done->() if $done; 2803 $done->($self) if $done;
2734 })->prio (1); 2804 })->prio (1);
2735} 2805}
2736 2806
2737=item $player_object->enter_exit ($exit_object) 2807=item $player_object->enter_exit ($exit_object)
2738 2808
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 2901 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 2902 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 2903 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 2904 cf::NDI_UNIQUE | cf::NDI_RED);
2835 2905
2836 warn "ERROR in enter_exit: $@"; 2906 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 2907 $self->leave_link;
2838 } 2908 }
2839 })->prio (1); 2909 })->prio (1);
2840} 2910}
2841 2911
… …
3154 3224
3155 $ns->ext_reply ($reply, @reply) 3225 $ns->ext_reply ($reply, @reply)
3156 if $reply; 3226 if $reply;
3157 3227
3158 } else { 3228 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3229 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3230 }
3161 3231
3162 cf::override; 3232 cf::override;
3163 }, 3233 },
3164); 3234);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3315 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3316 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3317 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3318 ["cf::map" => qw(trigger)],
3249) { 3319) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3320 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3321 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3322 for @funs;
3254} 3323}
3255 3324
… …
3294 local @cf::_safe_eval_args = values %vars; 3363 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3364 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3365 }
3297 3366
3298 if ($@) { 3367 if ($@) {
3299 warn "$@"; 3368 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3369 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3370 "with arguments " . (join " ", %vars) . "\n";
3302 } 3371 }
3303 3372
3304 wantarray ? @res : $res[0] 3373 wantarray ? @res : $res[0]
3305} 3374}
3306 3375
… …
3340 # for this (global event?) 3409 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = (); 3410 %ext::player_env::MUSIC_FACE_CACHE = ();
3342 3411
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3412 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3413
3345 warn "loading facedata from $path\n"; 3414 trace "loading facedata from $path\n";
3346 3415
3347 my $facedata;
3348 0 < aio_load $path, $facedata 3416 0 < aio_load $path, my $facedata
3349 or die "$path: $!"; 3417 or die "$path: $!";
3350 3418
3351 $facedata = Coro::Storable::thaw $facedata; 3419 $facedata = Coro::Storable::thaw $facedata;
3352 3420
3353 $facedata->{version} == 2 3421 $facedata->{version} == 2
… …
3384 3452
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3456 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3458 }
3391 3459
3392 cf::cede_to_tick; 3460 cf::cede_to_tick;
3393 } 3461 }
3394 } 3462 }
… …
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3481
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3416 } else { 3484 } else {
3417 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3418 } 3486 }
3419 3487
3420 cf::cede_to_tick; 3488 cf::cede_to_tick;
3421 } 3489 }
3422 } 3490 }
3423 3491
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3493
3426 1 3494 1
3427} 3495}
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 3496
3449register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3451 3499
3452 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3491sub reload_treasures { 3539sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3494} 3542}
3495 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3496sub reload_resources { 3567sub reload_resources {
3497 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3498 3569
3570 reload_exp_table;
3571 reload_materials;
3499 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3500 reload_archetypes; 3574 reload_archetypes;
3501 reload_regions; 3575 reload_regions;
3502 reload_treasures; 3576 reload_treasures;
3503 3577
3504 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3505} 3579}
3506 3580
3507sub reload_config { 3581sub reload_config {
3508 warn "reloading config file...\n"; 3582 trace "reloading config file...\n";
3509 3583
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3584 0 < aio_load "$CONFDIR/config", my $config
3511 or return; 3585 or die "$CONFDIR/config: $!";
3512 3586
3513 local $/; 3587 utf8::decode $config;
3514 *CFG = YAML::XS::Load scalar <$fh>; 3588 *CFG = yaml_load $config;
3515 3589
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3591
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $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}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3594
3521 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3599 };
3526 warn $@ if $@; 3600 warn $@ if $@;
3527 } 3601 }
3528
3529 warn "finished reloading resource files\n";
3530} 3602}
3531 3603
3532sub pidfile() { 3604sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3548 print $fh $$; 3620 print $fh $$;
3549} 3621}
3550 3622
3551sub main_loop { 3623sub main_loop {
3552 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3553 if (1) { 3625 if (1) {
3554 EV::loop; 3626 EV::loop;
3555 } 3627 }
3556 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3558} 3630}
3559 3631
3560sub main { 3632sub main {
3561 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3562 3634
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3639
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3641
… …
3577 }; 3649 };
3578 3650
3579 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3580 3652
3581 cf::sync_job { 3653 cf::sync_job {
3582 cf::init_experience; 3654 cf::incloader::init ();
3655
3583 cf::init_anim; 3656 cf::init_anim;
3584 cf::init_attackmess; 3657 cf::init_attackmess;
3585 cf::init_dynamic; 3658 cf::init_dynamic;
3586 3659
3587 cf::load_settings; 3660 cf::load_settings;
3588 cf::load_materials;
3589 3661
3590 reload_resources; 3662 reload_resources;
3591 reload_config; 3663 reload_config;
3592 db_init; 3664 db_init;
3593 3665
… …
3605 3677
3606 # no (long-running) fork's whatsoever before this point(!) 3678 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3679 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3680 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3681
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3682 cf::_post_init 0;
3611 }; 3683 };
3612 3684
3613 cf::object::thawer::errors_are_fatal 0; 3685 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3686 info "parse errors in files are no longer fatal from this point on.\n";
3615 3687
3688 my $free_main; $free_main = EV::idle sub {
3689 undef $free_main;
3690 undef &main; # free gobs of memory :)
3691 };
3692
3616 main_loop; 3693 goto &main_loop;
3617} 3694}
3618 3695
3619############################################################################# 3696#############################################################################
3620# initialisation and cleanup 3697# initialisation and cleanup
3621 3698
… …
3660 or return; 3737 or return;
3661 3738
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3739 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3740 and return;
3664 3741
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3742 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3743
3667 1 3744 1
3668} 3745}
3669 3746
3670our $uuid_lock; 3747our $uuid_lock;
… …
3682 or return; 3759 or return;
3683 3760
3684 my $value = uuid_seq uuid_cur; 3761 my $value = uuid_seq uuid_cur;
3685 3762
3686 unless ($value) { 3763 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3764 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3765 return;
3689 } 3766 }
3690 3767
3691 my $value = uuid_str $value + $uuid_skip; 3768 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3769 $uuid_skip = 0;
… …
3702 or return; 3779 or return;
3703 3780
3704 aio_rename "$uuid~", $uuid 3781 aio_rename "$uuid~", $uuid
3705 and return; 3782 and return;
3706 3783
3707 warn "uuid file written ($value).\n"; 3784 trace "uuid file written ($value).\n";
3708 3785
3709 1 3786 1
3710 3787
3711} 3788}
3712 3789
… …
3718} 3795}
3719 3796
3720sub emergency_save() { 3797sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 3798 my $freeze_guard = cf::freeze_mainloop;
3722 3799
3723 warn "emergency_perl_save: enter\n"; 3800 info "emergency_perl_save: enter\n";
3801
3802 # this is a trade-off: we want to be very quick here, so
3803 # save all maps without fsync, and later call a global sync
3804 # (which in turn might be very very slow)
3805 local $USE_FSYNC = 0;
3724 3806
3725 cf::sync_job { 3807 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 3808 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 3809
3731 # use a peculiar iteration method to avoid tripping on perl 3810 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 3811 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 3812 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 3813 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 3814 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 3815 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 3816 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3817 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 3818 $pl->save;
3740 } 3819 }
3741 warn "emergency_perl_save: end player save\n"; 3820 info "emergency_perl_save: end player save\n";
3742 3821
3822 cf::write_runtime_sync; # external watchdog should not bark
3823
3743 warn "emergency_perl_save: begin map save\n"; 3824 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 3825 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 3826 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 3827 $map->valid or next;
3747 $map->save; 3828 $map->save;
3748 } 3829 }
3749 warn "emergency_perl_save: end map save\n"; 3830 info "emergency_perl_save: end map save\n";
3750 3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3833
3751 warn "emergency_perl_save: begin database checkpoint\n"; 3834 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 3835 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 3836 info "emergency_perl_save: end database checkpoint\n";
3754 3837
3755 warn "emergency_perl_save: begin write uuid\n"; 3838 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 3839 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 3840 info "emergency_perl_save: end write uuid\n";
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3843
3844 trace "emergency_perl_save: syncing database to disk";
3845 BDB::db_env_txn_checkpoint $DB_ENV;
3846
3847 info "emergency_perl_save: starting sync\n";
3848 IO::AIO::aio_sync sub {
3849 info "emergency_perl_save: finished sync\n";
3850 };
3851
3852 cf::write_runtime_sync; # external watchdog should not bark
3853
3854 trace "emergency_perl_save: flushing outstanding aio requests";
3855 while (IO::AIO::nreqs || BDB::nreqs) {
3856 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3857 }
3858
3859 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 3860 };
3759 3861
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"; 3862 info "emergency_perl_save: leave\n";
3766} 3863}
3767 3864
3768sub post_cleanup { 3865sub post_cleanup {
3769 my ($make_core) = @_; 3866 my ($make_core) = @_;
3770 3867
3868 IO::AIO::flush;
3869
3771 warn Carp::longmess "post_cleanup backtrace" 3870 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 3871 if $make_core;
3773 3872
3774 my $fh = pidfile; 3873 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 3874 unlink $PIDFILE if <$fh> == $$;
3776} 3875}
… …
3800 } 3899 }
3801} 3900}
3802 3901
3803sub do_reload_perl() { 3902sub do_reload_perl() {
3804 # can/must only be called in main 3903 # can/must only be called in main
3805 if (in_main) { 3904 unless (in_main) {
3806 warn "can only reload from main coroutine"; 3905 error "can only reload from main coroutine";
3807 return; 3906 return;
3808 } 3907 }
3809 3908
3810 return if $RELOAD++; 3909 return if $RELOAD++;
3811 3910
3812 my $t1 = AE::time; 3911 my $t1 = AE::time;
3813 3912
3814 while ($RELOAD) { 3913 while ($RELOAD) {
3815 warn "reloading..."; 3914 cf::get_slot 0.1, -1, "reload_perl";
3915 info "perl_reload: reloading...";
3816 3916
3817 warn "entering sync_job"; 3917 trace "perl_reload: entering sync_job";
3818 3918
3819 cf::sync_job { 3919 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 3920 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 3921
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"; 3922 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 3923 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 3924 %EXT_CORO = ();
3837 3925
3838 warn "removing commands"; 3926 trace "perl_reload: removing commands";
3839 %COMMAND = (); 3927 %COMMAND = ();
3840 3928
3841 warn "removing ext/exti commands"; 3929 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 3930 %EXTCMD = ();
3843 %EXTICMD = (); 3931 %EXTICMD = ();
3844 3932
3845 warn "unloading/nuking all extensions"; 3933 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 3934 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 3935 trace "... unloading $pkg";
3848 3936
3849 if (my $cb = $pkg->can ("unload")) { 3937 if (my $cb = $pkg->can ("unload")) {
3850 eval { 3938 eval {
3851 $cb->($pkg); 3939 $cb->($pkg);
3852 1 3940 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 3941 } or error "$pkg unloaded, but with errors: $@";
3854 } 3942 }
3855 3943
3856 warn "... clearing $pkg"; 3944 trace "... clearing $pkg";
3857 clear_package $pkg; 3945 clear_package $pkg;
3858 } 3946 }
3859 3947
3860 warn "unloading all perl modules loaded from $LIBDIR"; 3948 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 3949 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3950 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 3951
3864 warn "... unloading $k"; 3952 trace "... unloading $k";
3865 delete $INC{$k}; 3953 delete $INC{$k};
3866 3954
3867 $k =~ s/\.pm$//; 3955 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 3956 $k =~ s/\//::/g;
3869 3957
… …
3872 } 3960 }
3873 3961
3874 clear_package $k; 3962 clear_package $k;
3875 } 3963 }
3876 3964
3877 warn "getting rid of safe::, as good as possible"; 3965 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 3966 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3967 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 3968
3881 warn "unloading cf.pm \"a bit\""; 3969 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 3970 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3971 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 3972
3885 # don't, removes xs symbols, too, 3973 # don't, removes xs symbols, too,
3886 # and global variables created in xs 3974 # and global variables created in xs
3887 #clear_package __PACKAGE__; 3975 #clear_package __PACKAGE__;
3888 3976
3889 warn "unload completed, starting to reload now"; 3977 info "perl_reload: unload completed, starting to reload now";
3890 3978
3891 warn "reloading cf.pm"; 3979 trace "perl_reload: reloading cf.pm";
3892 require cf; 3980 require cf;
3893 cf::_connect_to_perl_1; 3981 cf::_connect_to_perl_1;
3894 3982
3895 warn "loading config and database again"; 3983 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 3984 cf::reload_config;
3897 3985
3898 warn "loading extensions"; 3986 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 3987 cf::load_extensions;
3900 3988
3901 if ($REATTACH_ON_RELOAD) { 3989 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 3990 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 3991 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 3992 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 3993 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 3994 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 3995 reattach $_ for values %PLAYER;
3908 } 3996 }
3909 3997
3910 warn "running post_init jobs"; 3998 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 3999
3913 warn "leaving sync_job"; 4000 trace "perl_reload: leaving sync_job";
3914 4001
3915 1 4002 1
3916 } or do { 4003 } or do {
3917 warn $@; 4004 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4005 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4006 };
3920 4007
3921 warn "reloaded";
3922 --$RELOAD; 4008 --$RELOAD;
3923 } 4009 }
3924 4010
3925 $t1 = AE::time - $t1; 4011 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4012 info "perl_reload: completed in ${t1}s\n";
3927}; 4013};
3928 4014
3929our $RELOAD_WATCHER; # used only during reload 4015our $RELOAD_WATCHER; # used only during reload
3930 4016
3931sub reload_perl() { 4017sub reload_perl() {
… …
3952 reload_perl; 4038 reload_perl;
3953 }; 4039 };
3954 } 4040 }
3955}; 4041};
3956 4042
3957unshift @INC, $LIBDIR; 4043#############################################################################
3958 4044
3959my $bug_warning = 0; 4045my $bug_warning = 0;
3960 4046
3961our @WAIT_FOR_TICK; 4047our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN; 4048our @WAIT_FOR_TICK_BEGIN;
3963 4049
3964sub wait_for_tick { 4050sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3966 4052
3967 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3968 push @WAIT_FOR_TICK, $signal; 4054 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait; 4055 $signal->wait;
3970} 4056}
3971 4057
3972sub wait_for_tick_begin { 4058sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4059 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3974 4060
3975 my $signal = new Coro::Signal; 4061 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4062 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4063 $signal->wait;
… …
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4077 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4078 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4079 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4080 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4081 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4082 or error "ERROR: unable to write runtime file: $!";
3997 }; 4083 };
3998 } 4084 }
3999 4085
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4086 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4087 $sig->send;
… …
4009 4095
4010 if (0) { 4096 if (0) {
4011 if ($NEXT_TICK) { 4097 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4098 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4099 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4100 debug "jitter $JITTER\n";#d#
4015 } 4101 }
4016 } 4102 }
4017} 4103}
4018 4104
4019{ 4105{

Diff Legend

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