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.514 by root, Mon Apr 12 17:13:36 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 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)
… …
1796sub generate_random_map { 1861sub generate_random_map {
1797 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
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
1802 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1803 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806 $rmp->{exit_on_final_map},
1807 $rmp->{xsize}, $rmp->{ysize},
1808 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813 (cf::region::find $rmp->{region}), $rmp->{custom}
1814 )
1815} 1867}
1816 1868
1817=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1818 1870
1819Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1824 1876
1825sub register { 1877sub register {
1826 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1827 my $pkg = caller; 1879 my $pkg = caller;
1828 1880
1829 no strict;
1830 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1831 1882
1832 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833} 1884}
1834 1885
1835# also paths starting with '/' 1886# also paths starting with '/'
1836$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837 1888
1838sub thawer_merge { 1889sub thawer_merge {
1839 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1840 1891
1841 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1846} 1897}
1847 1898
1848sub normalise { 1899sub normalise {
1849 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1850 1901
1851 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1852 1903
1853 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1854 1905
1855 # map plan: 1906 # map plan:
1856 # 1907 #
… …
1871 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1872 $path = "$base/$path"; 1923 $path = "$base/$path";
1873 } 1924 }
1874 1925
1875 for ($path) { 1926 for ($path) {
1876 redo if s{//}{/};
1877 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1878 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1879 } 1929 }
1880 1930
1881 $path 1931 $path
… …
1895 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1896 return $self; 1946 return $self;
1897 } 1947 }
1898 } 1948 }
1899 1949
1900 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1901 () 1951 ()
1902} 1952}
1903 1953
1904sub init { 1954sub init {
1905 my ($self) = @_; 1955 my ($self) = @_;
… …
2027} 2077}
2028 2078
2029sub find; 2079sub find;
2030sub find { 2080sub find {
2031 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2032 2084
2033 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2034 2086
2035 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2121 2173
2122 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2123 } 2175 }
2124 2176
2125 $self->post_load; 2177 $self->post_load;
2178
2179 1
2126} 2180}
2127 2181
2128# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2129# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2130# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2151 or next; 2205 or next;
2152 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2153 or next; 2207 or next;
2154 $neigh->load; 2208 $neigh->load;
2155 2209
2210 # now find the diagonal neighbours
2156 push @neigh, 2211 push @neigh,
2157 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2158 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2159 } 2214 }
2160 2215
… …
2167} 2222}
2168 2223
2169sub find_sync { 2224sub find_sync {
2170 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2171 2226
2172 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2173} 2231}
2174 2232
2175sub do_load_sync { 2233sub do_load_sync {
2176 my ($map) = @_; 2234 my ($map) = @_;
2177 2235
2178 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2180 2238
2181 cf::sync_job { $map->load }; 2239 $map->load;
2182} 2240}
2183 2241
2184our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2185our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2186 2244
… …
2212 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2213 2271
2214 () 2272 ()
2215} 2273}
2216 2274
2275# common code, used by both ->save and ->swapout
2217sub save { 2276sub _save {
2218 my ($self) = @_; 2277 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221 2278
2222 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2223 2280
2224 return unless $self->dirty; 2281 return unless $self->dirty;
2225 2282
… …
2245 } else { 2302 } else {
2246 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2247 } 2304 }
2248} 2305}
2249 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2250sub swap_out { 2315sub swap_out {
2251 my ($self) = @_; 2316 my ($self) = @_;
2252 2317
2253 # save first because save cedes
2254 $self->save;
2255
2256 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257 2319
2258 return if $self->players;
2259 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2260 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2261 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2263 2374
2264 $self->deactivate; 2375 $self->deactivate;
2265 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2266 $self->clear; 2377 $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 2378
2312 $self->unlink_save; 2379 $self->unlink_save;
2313 $self->destroy; 2380 $self->destroy;
2314} 2381}
2315 2382
… …
2323 2390
2324 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2325 2392
2326 $self->unlink_save; 2393 $self->unlink_save;
2327 2394
2328 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2329 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2330 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2331 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2332 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333 2400
… …
2563 2630
2564Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2565 2632
2566The player should be reasonably safe there for short amounts of time (e.g. 2633The 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, 2634for 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 2635though, as the player cannot control the character while it is on the link
2569map. 2636map.
2570 2637
2571Will never block. 2638Will never block.
2572 2639
2573=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2594sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2595 my ($self) = @_; 2662 my ($self) = @_;
2596 2663
2597 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2598 2665
2666 ++$self->{_link_recursion};
2667
2599 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2600 2669
2601 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2603 2672
2604 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2605} 2674}
2606 2675
2607sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2608 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2609 2678
… …
2634 $map->load_neighbours; 2703 $map->load_neighbours;
2635 2704
2636 return unless $self->contr->active; 2705 return unless $self->contr->active;
2637 2706
2638 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2640 2709 # entering was successful
2710 delete $self->{_link_recursion};
2641 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2642 $self->activate_recursive; 2712 $self->activate_recursive;
2643} 2713 }
2644 2714
2715}
2716
2645=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2646 2718
2647Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2648her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2649that has to return the map if sucecssful, and then unfreezes the player on 2721that 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 2722the new (success) or old (failed) map position. In either case, $done will
… …
2657 2729
2658our $GOTOGEN; 2730our $GOTOGEN;
2659 2731
2660sub cf::object::player::goto { 2732sub cf::object::player::goto {
2661 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2662 2740
2663 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2664 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665 2743
2666 $self->enter_link; 2744 $self->enter_link;
… …
2690 my $map = eval { 2768 my $map = eval {
2691 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2692 2770
2693 if ($map) { 2771 if ($map) {
2694 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2695 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2696 } else { 2774 } else {
2697 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2698 } 2776 }
2699 2777
2700 $map 2778 $map
… …
2708 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2709 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2710 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2711 } 2789 }
2712 2790
2713 $done->() if $done; 2791 $done->($self) if $done;
2714 })->prio (1); 2792 })->prio (1);
2715} 2793}
2716 2794
2717=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2718 2796
… …
2811 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2812 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2813 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2814 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2815 2893
2816 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2817 $self->leave_link; 2895 $self->leave_link;
2818 } 2896 }
2819 })->prio (1); 2897 })->prio (1);
2820} 2898}
2821 2899
… …
3134 3212
3135 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3136 if $reply; 3214 if $reply;
3137 3215
3138 } else { 3216 } else {
3139 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3140 } 3218 }
3141 3219
3142 cf::override; 3220 cf::override;
3143 }, 3221 },
3144); 3222);
… …
3225 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3226 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3227 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3228 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3229) { 3307) {
3230 no strict 'refs';
3231 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3232 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233 for @funs; 3310 for @funs;
3234} 3311}
3235 3312
… …
3274 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3275 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3276 } 3353 }
3277 3354
3278 if ($@) { 3355 if ($@) {
3279 warn "$@"; 3356 warn "$@",
3280 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3281 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3282 } 3359 }
3283 3360
3284 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3285} 3362}
3286 3363
… …
3320 # for this (global event?) 3397 # for this (global event?)
3321 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3322 3399
3323 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324 3401
3325 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3326 3403
3327 my $facedata;
3328 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3329 or die "$path: $!"; 3405 or die "$path: $!";
3330 3406
3331 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3332 3408
3333 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3350 3426
3351 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3352 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3353 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3354 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3355 3432
3356 cf::cede_to_tick; 3433 cf::cede_to_tick;
3357 } 3434 }
3358 3435
3359 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3364 3441
3365 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3366 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3367 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368 } else { 3445 } else {
3369 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3370 } 3447 }
3371 3448
3372 cf::cede_to_tick; 3449 cf::cede_to_tick;
3373 } 3450 }
3374 } 3451 }
… …
3392 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393 3470
3394 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3396 } else { 3473 } else {
3397 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3398 } 3475 }
3399 3476
3400 cf::cede_to_tick; 3477 cf::cede_to_tick;
3401 } 3478 }
3402 } 3479 }
3403 3480
3404 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405 3482
3406 1 3483 1
3407} 3484}
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 3485
3429register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3430 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3431 3488
3432 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3471sub reload_treasures { 3528sub reload_treasures {
3472 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3473 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3474} 3531}
3475 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3476sub reload_resources { 3556sub reload_resources {
3477 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3478 3558
3559 reload_exp_table;
3560 reload_materials;
3479 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3480 reload_archetypes; 3563 reload_archetypes;
3481 reload_regions; 3564 reload_regions;
3482 reload_treasures; 3565 reload_treasures;
3483 3566
3484 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3485} 3568}
3486 3569
3487sub reload_config { 3570sub reload_config {
3488 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3489 3572
3490 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3491 or return; 3574 or die "$CONFDIR/config: $!";
3492 3575
3493 local $/; 3576 utf8::decode $config;
3494 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3495 3578
3496 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497 3580
3498 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3499 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3500 3583
3501 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3503 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3505 }; 3588 };
3506 warn $@ if $@; 3589 warn $@ if $@;
3507 } 3590 }
3508
3509 warn "finished reloading resource files\n";
3510} 3591}
3511 3592
3512sub pidfile() { 3593sub pidfile() {
3513 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3527 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3528 print $fh $$; 3609 print $fh $$;
3529} 3610}
3530 3611
3531sub main_loop { 3612sub main_loop {
3532 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3533 if (1) { 3614 if (1) {
3534 EV::loop; 3615 EV::loop;
3535 } 3616 }
3536 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3537 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3538} 3619}
3539 3620
3540sub main { 3621sub main {
3541 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3542 3623
3543 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3544 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3545 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547
3548 cf::init_experience;
3549 cf::init_anim;
3550 cf::init_attackmess;
3551 cf::init_dynamic;
3552 3628
3553 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3554 3630
3555 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3556 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
… …
3562 }; 3638 };
3563 3639
3564 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3565 3641
3566 cf::sync_job { 3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3567 cf::load_settings; 3649 cf::load_settings;
3568 cf::load_materials;
3569 3650
3570 reload_resources; 3651 reload_resources;
3571 reload_config; 3652 reload_config;
3572 db_init; 3653 db_init;
3573 3654
… …
3585 3666
3586 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3587 use POSIX (); 3668 use POSIX ();
3588 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3589 3670
3590 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3591 }; 3672 };
3592 3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3593 main_loop; 3682 goto &main_loop;
3594} 3683}
3595 3684
3596############################################################################# 3685#############################################################################
3597# initialisation and cleanup 3686# initialisation and cleanup
3598 3687
… …
3637 or return; 3726 or return;
3638 3727
3639 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3640 and return; 3729 and return;
3641 3730
3642 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3643 3732
3644 1 3733 1
3645} 3734}
3646 3735
3647our $uuid_lock; 3736our $uuid_lock;
… …
3659 or return; 3748 or return;
3660 3749
3661 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3662 3751
3663 unless ($value) { 3752 unless ($value) {
3664 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3665 return; 3754 return;
3666 } 3755 }
3667 3756
3668 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3669 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3679 or return; 3768 or return;
3680 3769
3681 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3682 and return; 3771 and return;
3683 3772
3684 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3685 3774
3686 1 3775 1
3687 3776
3688} 3777}
3689 3778
… …
3695} 3784}
3696 3785
3697sub emergency_save() { 3786sub emergency_save() {
3698 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3699 3788
3700 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3701 3795
3702 cf::sync_job { 3796 cf::sync_job {
3703 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3704 # save all maps without fsync, and later call a global sync
3705 # (which in turn might be very very slow)
3706 local $USE_FSYNC = 0;
3707 3798
3708 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3709 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3710 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3711 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3712 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3713 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3714 $pl->valid or next; 3805 $pl->valid or next;
3715 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3716 $pl->save; 3807 $pl->save;
3717 } 3808 }
3718 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3719 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3720 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3721 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3722 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3723 $map->valid or next; 3816 $map->valid or next;
3724 $map->save; 3817 $map->save;
3725 } 3818 }
3726 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3727 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3728 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3729 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3730 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3731 3826
3732 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3733 write_uuid_sync 1; 3828 write_uuid_sync 1;
3734 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3735 }; 3849 };
3736 3850
3737 warn "emergency_perl_save: starting sync()\n";
3738 IO::AIO::aio_sync sub {
3739 warn "emergency_perl_save: finished sync()\n";
3740 };
3741
3742 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3743} 3852}
3744 3853
3745sub post_cleanup { 3854sub post_cleanup {
3746 my ($make_core) = @_; 3855 my ($make_core) = @_;
3747 3856
3857 IO::AIO::flush;
3858
3748 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3749 if $make_core; 3860 if $make_core;
3750 3861
3751 my $fh = pidfile; 3862 my $fh = pidfile;
3752 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3753} 3864}
… …
3773 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3774 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3775 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3776# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3777 } 3888 }
3778 warn "cleared package $pkg\n";#d#
3779} 3889}
3780 3890
3781sub do_reload_perl() { 3891sub do_reload_perl() {
3782 # can/must only be called in main 3892 # can/must only be called in main
3783 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3784 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3785 return; 3895 return;
3786 } 3896 }
3787 3897
3788 return if $RELOAD++; 3898 return if $RELOAD++;
3789 3899
3790 my $t1 = AE::time; 3900 my $t1 = AE::time;
3791 3901
3792 while ($RELOAD) { 3902 while ($RELOAD) {
3793 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3794 3905
3795 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3796 3907
3797 cf::sync_job { 3908 cf::sync_job {
3798 cf::write_runtime_sync; # external watchdog should not bark
3799 cf::emergency_save; 3909 #cf::emergency_save;
3800 cf::write_runtime_sync; # external watchdog should not bark
3801 3910
3802 warn "syncing database to disk";
3803 BDB::db_env_txn_checkpoint $DB_ENV;
3804
3805 # if anything goes wrong in here, we should simply crash as we already saved
3806
3807 warn "flushing outstanding aio requests";
3808 while (IO::AIO::nreqs || BDB::nreqs) {
3809 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3810 }
3811
3812 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3813 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3814 %EXT_CORO = (); 3913 %EXT_CORO = ();
3815 3914
3816 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3817 %COMMAND = (); 3916 %COMMAND = ();
3818 3917
3819 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3820 %EXTCMD = (); 3919 %EXTCMD = ();
3821 %EXTICMD = (); 3920 %EXTICMD = ();
3822 3921
3823 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3824 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3825 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3826 3925
3827 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3828 eval { 3927 eval {
3829 $cb->($pkg); 3928 $cb->($pkg);
3830 1 3929 1
3831 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3832 } 3931 }
3833 3932
3834 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3835 clear_package $pkg; 3934 clear_package $pkg;
3836 } 3935 }
3837 3936
3838 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3839 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3840 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3841 3940
3842 warn "... unloading $k"; 3941 trace "... unloading $k";
3843 delete $INC{$k}; 3942 delete $INC{$k};
3844 3943
3845 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3846 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3847 3946
… …
3850 } 3949 }
3851 3950
3852 clear_package $k; 3951 clear_package $k;
3853 } 3952 }
3854 3953
3855 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3856 clear_package "safe::$_" 3955 clear_package "safe::$_"
3857 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3858 3957
3859 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3860 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3861 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3862 3961
3863 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3864 # and global variables created in xs 3963 # and global variables created in xs
3865 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3866 3965
3867 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3868 3967
3869 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3870 require cf; 3969 require cf;
3871 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3872 3971
3873 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3874 cf::reload_config; 3973 cf::reload_config;
3875 3974
3876 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3877 cf::load_extensions; 3976 cf::load_extensions;
3878 3977
3879 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3880 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3881 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3882 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3883 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3884 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3885 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3886 } 3985 }
3887 3986
3888 warn "running post_init jobs"; 3987 cf::_post_init 1;
3889 (pop @POST_INIT)->(1) while @POST_INIT;
3890 3988
3891 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3892 3990
3893 1 3991 1
3894 } or do { 3992 } or do {
3895 warn $@; 3993 error $@;
3896 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3897 }; 3995 };
3898 3996
3899 warn "reloaded";
3900 --$RELOAD; 3997 --$RELOAD;
3901 } 3998 }
3902 3999
3903 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3904 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3905}; 4002};
3906 4003
3907our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3908 4005
3909sub reload_perl() { 4006sub reload_perl() {
… …
3930 reload_perl; 4027 reload_perl;
3931 }; 4028 };
3932 } 4029 }
3933}; 4030};
3934 4031
3935unshift @INC, $LIBDIR; 4032#############################################################################
3936 4033
3937my $bug_warning = 0; 4034my $bug_warning = 0;
3938 4035
3939our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3940our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3941 4038
3942sub wait_for_tick { 4039sub wait_for_tick() {
3943 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3944 4041
3945 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3946 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3947 $signal->wait; 4044 $signal->wait;
3948} 4045}
3949 4046
3950sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3951 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3952 4049
3953 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3954 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3955 $signal->wait; 4052 $signal->wait;
… …
3969 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3970 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3971 Coro::async_pool { 4068 Coro::async_pool {
3972 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3973 write_runtime_sync 4070 write_runtime_sync
3974 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3975 }; 4072 };
3976 } 4073 }
3977 4074
3978 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3979 $sig->send; 4076 $sig->send;
… …
3987 4084
3988 if (0) { 4085 if (0) {
3989 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3990 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3991 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3992 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3993 } 4090 }
3994 } 4091 }
3995} 4092}
3996 4093
3997{ 4094{
… …
4042 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4043 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4044 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4045} 4142}
4046 4143
4047my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4048 4146
4049sub _log_backtrace { 4147sub _log_backtrace {
4050 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4051 4149
4052 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4053 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4054 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4055 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4056 ++$_log_backtrace; 4158 ++$_log_backtrace;
4057 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4058 async { 4160 async {
4059 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4060 4162
… …
4080 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4081 --$_log_backtrace; 4183 --$_log_backtrace;
4082 }; 4184 };
4083 } else { 4185 } else {
4084 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4085 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4086 } 4188 }
4087} 4189}
4088 4190
4089# load additional modules 4191# load additional modules
4090require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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