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.517 by root, Thu Apr 15 06:07:51 2010 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 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;
… …
165 168
166our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
167 170
168sub cf::map::normalise; 171sub cf::map::normalise;
169 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
170############################################################################# 177#############################################################################
171 178
172%REFLECT = (); 179%REFLECT = ();
173for (@REFLECT) { 180for (@REFLECT) {
174 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
226from wherever your confdir points to. 233from wherever your confdir points to.
227 234
228=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
229 236
230These 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
231returns 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
232per 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();
233 245
234=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
235 247
236This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
237C<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
… …
245 257
246=back 258=back
247 259
248=cut 260=cut
249 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
250$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
251 my $msg = join "", @_; 269 my $msg = join "", @_;
252 270
253 $msg .= "\n" 271 $msg .= "\n"
254 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
255 273
256 $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;
257 275
258 LOG llevError, $msg; 276 LOG llevWarn, $msg;
259}; 277};
260 278
261$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
262 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
263 281
264 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
265 283
266 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
267 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
268 return;#d# 286 return;#d#
269 }#d# 287 }#d#
270 288
271 # kill coroutine otherwise 289 # kill coroutine otherwise
272 Coro::terminate 290 Coro::terminate
… …
339our $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
340 358
341sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
342sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
343 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
344=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
345 375
346Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
348 378
349The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
350is a reload or not. 380is a reload or not.
351 381
352=cut 382=cut
353 383
354sub post_init(&) { 384sub post_init(&) {
355 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 }
356} 403}
357 404
358=item cf::lock_wait $string 405=item cf::lock_wait $string
359 406
360Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
505=cut 552=cut
506 553
507sub sync_job(&) { 554sub sync_job(&) {
508 my ($job) = @_; 555 my ($job) = @_;
509 556
510 if ($Coro::current == $Coro::main) { 557 if (in_main) {
511 my $time = AE::time; 558 my $time = AE::time;
512 559
513 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
514 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
515 562
516 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
517 564
518 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
519 566
520 my $busy = 1; 567 my $busy = 1;
521 my @res; 568 my @res;
522 569
523 (async { 570 (async {
524 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
525 @res = eval { $job->() }; 572 @res = eval { $job->() };
526 warn $@ if $@; 573 error $@ if $@;
527 undef $busy; 574 undef $busy;
528 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
529 576
530 while ($busy) { 577 while ($busy) {
531 if (Coro::nready) { 578 if (Coro::nready) {
… …
565 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
566 613
567 $coro 614 $coro
568} 615}
569 616
570=item fork_call { }, $args 617=item fork_call { }, @args
571 618
572Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
573process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
574Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
575never block itself or use any form of event handling. 622never block itself or use any form of event handling.
576 623
577=cut 624=cut
578 625
626sub post_fork {
627 reset_signals;
628}
629
579sub fork_call(&@) { 630sub fork_call(&@) {
580 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
581 632
582 # 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,
583 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
584 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
585 636
586 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
587 reset_signals; 638 cf::post_fork;
588 &$cb 639 &$cb
589 }, @args; 640 } @args;
590 641
591 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
592} 643}
593 644
594sub objinfo { 645sub objinfo {
… …
644within each server. 695within each server.
645 696
646=cut 697=cut
647 698
648sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
649 my ($name) = @_; 703 my ($name) = @_;
650 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
651 705
652 eval { 706 eval {
653 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
663} 717}
664 718
665our $DB; 719our $DB;
666 720
667sub db_init { 721sub db_init {
668 cf::sync_job {
669 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
670 };
671} 723}
672 724
673sub db_get($$) { 725sub db_get($$) {
674 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
675 727
676 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
677 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
678 732
679 $! ? () 733 $! ? ()
680 : $data 734 : $data
681 }
682} 735}
683 736
684sub db_put($$$) { 737sub db_put($$$) {
685 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
686 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
742 795
743 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
744 my $data = $process->(\@data); 797 my $data = $process->(\@data);
745 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
746 799
747 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748 801
749 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
750 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
751 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
752 805
… …
762 815
763=cut 816=cut
764 817
765sub datalog($@) { 818sub datalog($@) {
766 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
767 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768} 821}
769 822
770=back 823=back
771 824
772=cut 825=cut
… …
967 1020
968 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
969 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970 1023
971 } elsif (ref $type) { 1024 } elsif (ref $type) {
972 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
973 1026
974 } else { 1027 } else {
975 shift @arg; 1028 shift @arg;
976 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
977 } 1030 }
978 } 1031 }
979} 1032}
980 1033
981sub _object_attach { 1034sub _object_attach {
… …
991 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
992 } 1045 }
993 1046
994 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
995 } else { 1048 } else {
996 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
997 } 1050 }
998 1051
999 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
1000} 1053}
1001 1054
… …
1060 1113
1061 for (@$callbacks) { 1114 for (@$callbacks) {
1062 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1063 1116
1064 if ($@) { 1117 if ($@) {
1065 warn "$@";
1066 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067 override; 1119 override;
1068 } 1120 }
1069 1121
1070 return 1 if $override; 1122 return 1 if $override;
1071 } 1123 }
… …
1150 for (@$attach) { 1202 for (@$attach) {
1151 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1152 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1153 } 1205 }
1154 } else { 1206 } else {
1155 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1156 } 1208 }
1157 } 1209 }
1158} 1210}
1159 1211
1160cf::attachable->attach ( 1212cf::attachable->attach (
… …
1187 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1188 1240
1189 sync_job { 1241 sync_job {
1190 if (length $$rdata) { 1242 if (length $$rdata) {
1191 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1192 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1193 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1194 1247
1195 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1197 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1220 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1221 1274
1222 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1223 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1224 } else { 1277 } else {
1225 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1226 } 1279 }
1227 } else { 1280 } else {
1228 aio_unlink $filename; 1281 aio_unlink $filename;
1229 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1230 } 1283 }
… …
1254 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1255 $av = $st->{objs}; 1308 $av = $st->{objs};
1256 } 1309 }
1257 1310
1258 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1259 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1260 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1261 1315
1262 ($data, $av) 1316 ($data, $av)
1263} 1317}
1264 1318
1265=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1357 1411
1358 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1359 if $reply; 1413 if $reply;
1360 1414
1361 } else { 1415 } else {
1362 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363 } 1417 }
1364 1418
1365 cf::override; 1419 cf::override;
1366 }, 1420 },
1367); 1421);
… …
1378 1432
1379 $grp 1433 $grp
1380} 1434}
1381 1435
1382sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1383 cf::sync_job { 1439 cf::sync_job {
1384 my %todo; 1440 my %todo;
1385 1441
1386 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1387 next unless -r $path; 1443 next unless -r $path;
… …
1405 1461
1406 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408 1464
1409 $ext{source} = 1465 $ext{source} =
1410 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1411 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1412 . $source 1468 . $source
1413 . "\n};\n1"; 1469 . "\n};\n1";
1414 1470
1415 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1427 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1428 next ext 1484 next ext
1429 unless exists $done{$_}; 1485 unless exists $done{$_};
1430 } 1486 }
1431 1487
1432 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433 1489
1434 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1435 1491
1436 if (length $@) { 1492 if (length $@) {
1437 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1438 1494
1439 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440 if exists $v->{meta}{mandatory}; 1496 if exists $v->{meta}{mandatory};
1497
1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1441 } else { 1500 } else {
1442 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1443 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1444 $progress = 1; 1503 $progress = 1;
1445 1504
1446 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1447 unless $active; 1506 unless $active;
1448 } 1507 }
1449 } 1508 }
1450 1509
1451 unless ($progress) { 1510 unless ($progress) {
… …
1620 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1621 1680
1622 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1623 $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
1624 1683
1625 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626 $pl->deactivate; 1685 $pl->deactivate;
1686
1627 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;
1628 $pl->ob->check_score;
1629 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1630 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1631 1692
1632 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1633 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1634 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1688 \@logins 1749 \@logins
1689} 1750}
1690 1751
1691=item $player->maps 1752=item $player->maps
1692 1753
1754=item cf::player::maps $login
1755
1693Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1694player. May block. 1757player. May block.
1695 1758
1696=cut 1759=cut
1697 1760
… …
1759=cut 1822=cut
1760 1823
1761sub find_by_path($) { 1824sub find_by_path($) {
1762 my ($path) = @_; 1825 my ($path) = @_;
1763 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1764 my ($match, $specificity); 1829 my ($match, $specificity);
1765 1830
1766 for my $region (list) { 1831 for my $region (list) {
1767 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1768 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1798 1863
1799 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800 1865
1801 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1802 $self->_create_random_map ( 1867 $self->_create_random_map (
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1814 ) 1880 )
1815} 1881}
1816 1882
1817=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1818 1884
… …
1824 1890
1825sub register { 1891sub register {
1826 my (undef, $regex, $prio) = @_; 1892 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1893 my $pkg = caller;
1828 1894
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1895 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1896
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1897 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1898}
1834 1899
1835# also paths starting with '/' 1900# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1901$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1902
1838sub thawer_merge { 1903sub thawer_merge {
1839 my ($self, $merge) = @_; 1904 my ($self, $merge) = @_;
1840 1905
1841 # we have to keep some variables in memory intact 1906 # we have to keep some variables in memory intact
… …
1846} 1911}
1847 1912
1848sub normalise { 1913sub normalise {
1849 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1850 1915
1851 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1852 1917
1853 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1854 1919
1855 # map plan: 1920 # map plan:
1856 # 1921 #
… …
1871 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 1937 $path = "$base/$path";
1873 } 1938 }
1874 1939
1875 for ($path) { 1940 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1879 } 1943 }
1880 1944
1881 $path 1945 $path
… …
1895 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1896 return $self; 1960 return $self;
1897 } 1961 }
1898 } 1962 }
1899 1963
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1965 ()
1902} 1966}
1903 1967
1904sub init { 1968sub init {
1905 my ($self) = @_; 1969 my ($self) = @_;
… …
2027} 2091}
2028 2092
2029sub find; 2093sub find;
2030sub find { 2094sub find {
2031 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
2032 2098
2033 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2034 2100
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2121 2187
2122 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2189 }
2124 2190
2125 $self->post_load; 2191 $self->post_load;
2192
2193 1
2126} 2194}
2127 2195
2128# customize the map for a given player, i.e. 2196# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2197# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2198# maps to change the path to ~playername/mappath
… …
2151 or next; 2219 or next;
2152 $neigh = find $neigh, $map 2220 $neigh = find $neigh, $map
2153 or next; 2221 or next;
2154 $neigh->load; 2222 $neigh->load;
2155 2223
2224 # now find the diagonal neighbours
2156 push @neigh, 2225 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2226 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2227 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2228 }
2160 2229
… …
2167} 2236}
2168 2237
2169sub find_sync { 2238sub find_sync {
2170 my ($path, $origin) = @_; 2239 my ($path, $origin) = @_;
2171 2240
2172 cf::sync_job { find $path, $origin } 2241 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242 if $Coro::current == $Coro::main;
2243
2244 find $path, $origin
2173} 2245}
2174 2246
2175sub do_load_sync { 2247sub do_load_sync {
2176 my ($map) = @_; 2248 my ($map) = @_;
2177 2249
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2250 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2251 if $Coro::current == $Coro::main;
2180 2252
2181 cf::sync_job { $map->load }; 2253 $map->load;
2182} 2254}
2183 2255
2184our %MAP_PREFETCH; 2256our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2257our $MAP_PREFETCHER = undef;
2186 2258
… …
2212 $MAP_PREFETCHER->prio (6); 2284 $MAP_PREFETCHER->prio (6);
2213 2285
2214 () 2286 ()
2215} 2287}
2216 2288
2289# common code, used by both ->save and ->swapout
2217sub save { 2290sub _save {
2218 my ($self) = @_; 2291 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2292
2222 $self->{last_save} = $cf::RUNTIME; 2293 $self->{last_save} = $cf::RUNTIME;
2223 2294
2224 return unless $self->dirty; 2295 return unless $self->dirty;
2225 2296
… …
2245 } else { 2316 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2317 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2318 }
2248} 2319}
2249 2320
2321sub save {
2322 my ($self) = @_;
2323
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2326 $self->_save;
2327}
2328
2250sub swap_out { 2329sub swap_out {
2251 my ($self) = @_; 2330 my ($self) = @_;
2252 2331
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2332 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2333
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2334 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2336 return if $self->players;
2261 2337
2338 # first deactivate the map and "unlink" it from the core
2339 $self->deactivate;
2340 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2341 $self->in_memory (cf::MAP_SWAPPED);
2342
2343 # then atomically save
2344 $self->_save;
2345
2346 # then free the map
2347 $self->clear;
2348}
2349
2350sub reset_at {
2351 my ($self) = @_;
2352
2353 # TODO: safety, remove and allow resettable per-player maps
2354 return 1e99 if $self->{deny_reset};
2355
2356 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2357 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2358
2359 $time + $to
2360}
2361
2362sub should_reset {
2363 my ($self) = @_;
2364
2365 $self->reset_at <= $cf::RUNTIME
2366}
2367
2368sub reset {
2369 my ($self) = @_;
2370
2371 my $lock = cf::lock_acquire "map_data:$self->{path}";
2372
2373 return if $self->players;
2374
2375 cf::trace "resetting map ", $self->path, "\n";
2376
2377 $self->in_memory (cf::MAP_SWAPPED);
2378
2379 # need to save uniques path
2380 unless ($self->{deny_save}) {
2381 my $uniq = $self->uniq_path; utf8::encode $uniq;
2382
2383 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2384 if $uniq;
2385 }
2386
2387 delete $cf::MAP{$self->path};
2263 2388
2264 $self->deactivate; 2389 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2390 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2391 $self->clear;
2267}
2268
2269sub reset_at {
2270 my ($self) = @_;
2271
2272 # TODO: safety, remove and allow resettable per-player maps
2273 return 1e99 if $self->{deny_reset};
2274
2275 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278 $time + $to
2279}
2280
2281sub should_reset {
2282 my ($self) = @_;
2283
2284 $self->reset_at <= $cf::RUNTIME
2285}
2286
2287sub reset {
2288 my ($self) = @_;
2289
2290 my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292 return if $self->players;
2293
2294 warn "resetting map ", $self->path, "\n";
2295
2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # need to save uniques path
2299 unless ($self->{deny_save}) {
2300 my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2303 if $uniq;
2304 }
2305
2306 delete $cf::MAP{$self->path};
2307
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->clear;
2311 2392
2312 $self->unlink_save; 2393 $self->unlink_save;
2313 $self->destroy; 2394 $self->destroy;
2314} 2395}
2315 2396
… …
2323 2404
2324 delete $cf::MAP{$self->path}; 2405 delete $cf::MAP{$self->path};
2325 2406
2326 $self->unlink_save; 2407 $self->unlink_save;
2327 2408
2328 bless $self, "cf::map"; 2409 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2410 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2411 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2412 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2413 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2414
… …
2563 2644
2564Freezes the player and moves him/her to a special map (C<{link}>). 2645Freezes the player and moves him/her to a special map (C<{link}>).
2565 2646
2566The player should be reasonably safe there for short amounts of time (e.g. 2647The player should be reasonably safe there for short amounts of time (e.g.
2567for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2648for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2568though, as the palyer cannot control the character while it is on the link 2649though, as the player cannot control the character while it is on the link
2569map. 2650map.
2570 2651
2571Will never block. 2652Will never block.
2572 2653
2573=item $player_object->leave_link ($map, $x, $y) 2654=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2675sub cf::object::player::enter_link {
2595 my ($self) = @_; 2676 my ($self) = @_;
2596 2677
2597 $self->deactivate_recursive; 2678 $self->deactivate_recursive;
2598 2679
2680 ++$self->{_link_recursion};
2681
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2682 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2683
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2684 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2685 if $self->map && $self->map->{path} ne "{link}";
2603 2686
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2687 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2688}
2606 2689
2607sub cf::object::player::leave_link { 2690sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2691 my ($self, $map, $x, $y) = @_;
2609 2692
… …
2634 $map->load_neighbours; 2717 $map->load_neighbours;
2635 2718
2636 return unless $self->contr->active; 2719 return unless $self->contr->active;
2637 2720
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2721 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2722 if ($self->enter_map ($map, $x, $y)) {
2640 2723 # entering was successful
2724 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2725 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2726 $self->activate_recursive;
2643} 2727 }
2644 2728
2729}
2730
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2731=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2732
2647Moves the player to the given map-path and coordinates by first freezing 2733Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2734her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2735that has to return the map if sucecssful, and then unfreezes the player on
2650the new (success) or old (failed) map position. In either case, $done will 2736the new (success) or old (failed) map position. In either case, $done will
… …
2657 2743
2658our $GOTOGEN; 2744our $GOTOGEN;
2659 2745
2660sub cf::object::player::goto { 2746sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2747 my ($self, $path, $x, $y, $check, $done) = @_;
2748
2749 if ($self->{_link_recursion} >= $MAX_LINKS) {
2750 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2751 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2752 ($path, $x, $y) = @$EMERGENCY_POSITION;
2753 }
2662 2754
2663 # do generation counting so two concurrent goto's will be executed in-order 2755 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2756 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2757
2666 $self->enter_link; 2758 $self->enter_link;
… …
2690 my $map = eval { 2782 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2783 my $map = defined $path ? cf::map::find $path : undef;
2692 2784
2693 if ($map) { 2785 if ($map) {
2694 $map = $map->customise_for ($self); 2786 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2787 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2788 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2789 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2790 }
2699 2791
2700 $map 2792 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2800 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2801 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2802 $self->leave_link ($map, $x, $y);
2711 } 2803 }
2712 2804
2713 $done->() if $done; 2805 $done->($self) if $done;
2714 })->prio (1); 2806 })->prio (1);
2715} 2807}
2716 2808
2717=item $player_object->enter_exit ($exit_object) 2809=item $player_object->enter_exit ($exit_object)
2718 2810
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2903 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2904 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2905 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2906 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2907
2816 warn "ERROR in enter_exit: $@"; 2908 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2909 $self->leave_link;
2818 } 2910 }
2819 })->prio (1); 2911 })->prio (1);
2820} 2912}
2821 2913
… …
3134 3226
3135 $ns->ext_reply ($reply, @reply) 3227 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3228 if $reply;
3137 3229
3138 } else { 3230 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3231 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3232 }
3141 3233
3142 cf::override; 3234 cf::override;
3143 }, 3235 },
3144); 3236);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3317 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3318 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3319 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3320 ["cf::map" => qw(trigger)],
3229) { 3321) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3322 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3323 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3324 for @funs;
3234} 3325}
3235 3326
… …
3274 local @cf::_safe_eval_args = values %vars; 3365 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3366 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3367 }
3277 3368
3278 if ($@) { 3369 if ($@) {
3279 warn "$@"; 3370 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3371 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3372 "with arguments " . (join " ", %vars) . "\n";
3282 } 3373 }
3283 3374
3284 wantarray ? @res : $res[0] 3375 wantarray ? @res : $res[0]
3285} 3376}
3286 3377
… …
3320 # for this (global event?) 3411 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3412 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3413
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3415
3325 warn "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3326 3417
3327 my $facedata;
3328 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3329 or die "$path: $!"; 3419 or die "$path: $!";
3330 3420
3331 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3332 3422
3333 $facedata->{version} == 2 3423 $facedata->{version} == 2
… …
3364 3454
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3458 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3460 }
3371 3461
3372 cf::cede_to_tick; 3462 cf::cede_to_tick;
3373 } 3463 }
3374 } 3464 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3483
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3396 } else { 3486 } else {
3397 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3398 } 3488 }
3399 3489
3400 cf::cede_to_tick; 3490 cf::cede_to_tick;
3401 } 3491 }
3402 } 3492 }
3403 3493
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3495
3406 1 3496 1
3407} 3497}
3408
3409cf::global->attach (on_resource_update => sub {
3410 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414 my $sound = $soundconf->{compat}[$_]
3415 or next;
3416
3417 my $face = cf::face::find "sound/$sound->[1]";
3418 cf::sound::set $sound->[0] => $face;
3419 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420 }
3421
3422 while (my ($k, $v) = each %{$soundconf->{event}}) {
3423 my $face = cf::face::find "sound/$v";
3424 cf::sound::set $k => $face;
3425 }
3426 }
3427});
3428 3498
3429register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3431 3501
3432 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3541sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3474} 3544}
3475 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3476sub reload_resources { 3569sub reload_resources {
3477 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3478 3571
3572 reload_exp_table;
3573 reload_materials;
3479 reload_facedata; 3574 reload_facedata;
3575 reload_sound;
3480 reload_archetypes; 3576 reload_archetypes;
3481 reload_regions; 3577 reload_regions;
3482 reload_treasures; 3578 reload_treasures;
3483 3579
3484 warn "finished reloading resource files\n"; 3580 trace "finished reloading resource files\n";
3485} 3581}
3486 3582
3487sub reload_config { 3583sub reload_config {
3488 warn "reloading config file...\n"; 3584 trace "reloading config file...\n";
3489 3585
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3586 0 < aio_load "$CONFDIR/config", my $config
3491 or return; 3587 or die "$CONFDIR/config: $!";
3492 3588
3493 local $/; 3589 utf8::decode $config;
3494 *CFG = YAML::XS::Load scalar <$fh>; 3590 *CFG = yaml_load $config;
3495 3591
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3593
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3596
3501 if (exists $CFG{mlockall}) { 3597 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3599 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3600 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3601 };
3506 warn $@ if $@; 3602 warn $@ if $@;
3507 } 3603 }
3508
3509 warn "finished reloading resource files\n";
3510} 3604}
3511 3605
3512sub pidfile() { 3606sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3528 print $fh $$; 3622 print $fh $$;
3529} 3623}
3530 3624
3531sub main_loop { 3625sub main_loop {
3532 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3533 if (1) { 3627 if (1) {
3534 EV::loop; 3628 EV::loop;
3535 } 3629 }
3536 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3538} 3632}
3539 3633
3540sub main { 3634sub main {
3541 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3542 3636
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547 3641
3548 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3549 3643
… …
3557 }; 3651 };
3558 3652
3559 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3560 3654
3561 cf::sync_job { 3655 cf::sync_job {
3562 cf::init_experience; 3656 cf::incloader::init ();
3657
3563 cf::init_anim; 3658 cf::init_anim;
3564 cf::init_attackmess; 3659 cf::init_attackmess;
3565 cf::init_dynamic; 3660 cf::init_dynamic;
3566 3661
3567 cf::load_settings; 3662 cf::load_settings;
3568 cf::load_materials;
3569 3663
3570 reload_resources; 3664 reload_resources;
3571 reload_config; 3665 reload_config;
3572 db_init; 3666 db_init;
3573 3667
… …
3585 3679
3586 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3681 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3683
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3684 cf::_post_init 0;
3591 }; 3685 };
3592 3686
3593 cf::object::thawer::errors_are_fatal 0; 3687 cf::object::thawer::errors_are_fatal 0;
3594 warn "parse errors in files are no longer fatal from this point on.\n"; 3688 info "parse errors in files are no longer fatal from this point on.\n";
3595 3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3596 main_loop; 3695 goto &main_loop;
3597} 3696}
3598 3697
3599############################################################################# 3698#############################################################################
3600# initialisation and cleanup 3699# initialisation and cleanup
3601 3700
… …
3640 or return; 3739 or return;
3641 3740
3642 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3643 and return; 3742 and return;
3644 3743
3645 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3646 3745
3647 1 3746 1
3648} 3747}
3649 3748
3650our $uuid_lock; 3749our $uuid_lock;
… …
3662 or return; 3761 or return;
3663 3762
3664 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3665 3764
3666 unless ($value) { 3765 unless ($value) {
3667 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3668 return; 3767 return;
3669 } 3768 }
3670 3769
3671 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3672 $uuid_skip = 0; 3771 $uuid_skip = 0;
… …
3682 or return; 3781 or return;
3683 3782
3684 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3685 and return; 3784 and return;
3686 3785
3687 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3688 3787
3689 1 3788 1
3690 3789
3691} 3790}
3692 3791
… …
3698} 3797}
3699 3798
3700sub emergency_save() { 3799sub emergency_save() {
3701 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3702 3801
3703 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3704 3808
3705 cf::sync_job { 3809 cf::sync_job {
3706 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3707 # save all maps without fsync, and later call a global sync
3708 # (which in turn might be very very slow)
3709 local $USE_FSYNC = 0;
3710 3811
3711 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3712 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3713 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3714 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3715 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3716 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3717 $pl->valid or next; 3818 $pl->valid or next;
3718 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3719 $pl->save; 3820 $pl->save;
3720 } 3821 }
3721 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3722 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3723 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3724 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3725 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3726 $map->valid or next; 3829 $map->valid or next;
3727 $map->save; 3830 $map->save;
3728 } 3831 }
3729 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3730 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3731 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3732 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3733 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3734 3839
3735 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3736 write_uuid_sync 1; 3841 write_uuid_sync 1;
3737 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3738 }; 3862 };
3739 3863
3740 warn "emergency_perl_save: starting sync()\n";
3741 IO::AIO::aio_sync sub {
3742 warn "emergency_perl_save: finished sync()\n";
3743 };
3744
3745 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3746} 3865}
3747 3866
3748sub post_cleanup { 3867sub post_cleanup {
3749 my ($make_core) = @_; 3868 my ($make_core) = @_;
3750 3869
3870 IO::AIO::flush;
3871
3751 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3752 if $make_core; 3873 if $make_core;
3753 3874
3754 my $fh = pidfile; 3875 my $fh = pidfile;
3755 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3756} 3877}
… …
3776 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3777 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3778 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3779# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3780 } 3901 }
3781 warn "cleared package $pkg\n";#d#
3782} 3902}
3783 3903
3784sub do_reload_perl() { 3904sub do_reload_perl() {
3785 # can/must only be called in main 3905 # can/must only be called in main
3786 if ($Coro::current != $Coro::main) { 3906 unless (in_main) {
3787 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3788 return; 3908 return;
3789 } 3909 }
3790 3910
3791 return if $RELOAD++; 3911 return if $RELOAD++;
3792 3912
3793 my $t1 = AE::time; 3913 my $t1 = AE::time;
3794 3914
3795 while ($RELOAD) { 3915 while ($RELOAD) {
3796 warn "reloading..."; 3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "perl_reload: reloading...";
3797 3918
3798 warn "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3799 3920
3800 cf::sync_job { 3921 cf::sync_job {
3801 cf::write_runtime_sync; # external watchdog should not bark
3802 cf::emergency_save; 3922 #cf::emergency_save;
3803 cf::write_runtime_sync; # external watchdog should not bark
3804 3923
3805 warn "syncing database to disk";
3806 BDB::db_env_txn_checkpoint $DB_ENV;
3807
3808 # if anything goes wrong in here, we should simply crash as we already saved
3809
3810 warn "flushing outstanding aio requests";
3811 while (IO::AIO::nreqs || BDB::nreqs) {
3812 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3813 }
3814
3815 warn "cancelling all extension coros"; 3924 trace "perl_reload: cancelling all extension coros";
3816 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3817 %EXT_CORO = (); 3926 %EXT_CORO = ();
3818 3927
3819 warn "removing commands"; 3928 trace "perl_reload: removing commands";
3820 %COMMAND = (); 3929 %COMMAND = ();
3821 3930
3822 warn "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3823 %EXTCMD = (); 3932 %EXTCMD = ();
3824 %EXTICMD = (); 3933 %EXTICMD = ();
3825 3934
3826 warn "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3827 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3828 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3829 3938
3830 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3831 eval { 3940 eval {
3832 $cb->($pkg); 3941 $cb->($pkg);
3833 1 3942 1
3834 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3835 } 3944 }
3836 3945
3837 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3838 clear_package $pkg; 3947 clear_package $pkg;
3839 } 3948 }
3840 3949
3841 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3842 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3843 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3844 3953
3845 warn "... unloading $k"; 3954 trace "... unloading $k";
3846 delete $INC{$k}; 3955 delete $INC{$k};
3847 3956
3848 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3849 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3850 3959
… …
3853 } 3962 }
3854 3963
3855 clear_package $k; 3964 clear_package $k;
3856 } 3965 }
3857 3966
3858 warn "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3859 clear_package "safe::$_" 3968 clear_package "safe::$_"
3860 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3861 3970
3862 warn "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3863 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3864 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3865 3974
3866 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3867 # and global variables created in xs 3976 # and global variables created in xs
3868 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3869 3978
3870 warn "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3871 3980
3872 warn "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3873 require cf; 3982 require cf;
3874 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3875 3984
3876 warn "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3877 cf::reload_config; 3986 cf::reload_config;
3878 3987
3879 warn "loading extensions"; 3988 trace "perl_reload: loading extensions";
3880 cf::load_extensions; 3989 cf::load_extensions;
3881 3990
3882 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3883 warn "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3884 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3885 warn "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3886 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3887 warn "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3888 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3889 } 3998 }
3890 3999
3891 warn "running post_init jobs"; 4000 cf::_post_init 1;
3892 (pop @POST_INIT)->(1) while @POST_INIT;
3893 4001
3894 warn "leaving sync_job"; 4002 trace "perl_reload: leaving sync_job";
3895 4003
3896 1 4004 1
3897 } or do { 4005 } or do {
3898 warn $@; 4006 error $@;
3899 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
3900 }; 4008 };
3901 4009
3902 warn "reloaded";
3903 --$RELOAD; 4010 --$RELOAD;
3904 } 4011 }
3905 4012
3906 $t1 = AE::time - $t1; 4013 $t1 = AE::time - $t1;
3907 warn "reload completed in ${t1}s\n"; 4014 info "perl_reload: completed in ${t1}s\n";
3908}; 4015};
3909 4016
3910our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
3911 4018
3912sub reload_perl() { 4019sub reload_perl() {
… …
3933 reload_perl; 4040 reload_perl;
3934 }; 4041 };
3935 } 4042 }
3936}; 4043};
3937 4044
3938unshift @INC, $LIBDIR; 4045#############################################################################
3939 4046
3940my $bug_warning = 0; 4047my $bug_warning = 0;
3941 4048
3942our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
3943our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
3944 4051
3945sub wait_for_tick { 4052sub wait_for_tick() {
3946 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3947 4054
3948 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
3949 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
3950 $signal->wait; 4057 $signal->wait;
3951} 4058}
3952 4059
3953sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
3954 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3955 4062
3956 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
3957 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
3958 $signal->wait; 4065 $signal->wait;
… …
3972 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4079 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3973 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4080 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3974 Coro::async_pool { 4081 Coro::async_pool {
3975 $Coro::current->{desc} = "runtime saver"; 4082 $Coro::current->{desc} = "runtime saver";
3976 write_runtime_sync 4083 write_runtime_sync
3977 or warn "ERROR: unable to write runtime file: $!"; 4084 or error "ERROR: unable to write runtime file: $!";
3978 }; 4085 };
3979 } 4086 }
3980 4087
3981 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4088 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3982 $sig->send; 4089 $sig->send;
… …
3990 4097
3991 if (0) { 4098 if (0) {
3992 if ($NEXT_TICK) { 4099 if ($NEXT_TICK) {
3993 my $jitter = $TICK_START - $NEXT_TICK; 4100 my $jitter = $TICK_START - $NEXT_TICK;
3994 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4101 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3995 warn "jitter $JITTER\n";#d# 4102 debug "jitter $JITTER\n";#d#
3996 } 4103 }
3997 } 4104 }
3998} 4105}
3999 4106
4000{ 4107{
… …
4045 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
4046 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
4047 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
4048} 4155}
4049 4156
4050my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
4051 4159
4052sub _log_backtrace { 4160sub _log_backtrace {
4053 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
4054 4162
4055 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
4056 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4057 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
4058 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
4059 ++$_log_backtrace; 4171 ++$_log_backtrace;
4060 my $perl_bt = Carp::longmess $msg; 4172 my $perl_bt = Carp::longmess $msg;
4061 async { 4173 async {
4062 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
4063 4175
… …
4083 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
4084 --$_log_backtrace; 4196 --$_log_backtrace;
4085 }; 4197 };
4086 } else { 4198 } else {
4087 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
4088 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4089 } 4201 }
4090} 4202}
4091 4203
4092# load additional modules 4204# load additional modules
4093require "cf/$_.pm" for @EXTRA_MODULES; 4205require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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