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.513 by root, Mon Apr 12 05:22:38 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.
… …
399} 446}
400 447
401=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
402 449
403Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
404get spread over timer. 451get spread over time.
405 452
406=cut 453=cut
407 454
408sub periodic($$) { 455sub periodic($$) {
409 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
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]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
592} 654}
593 655
594=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
595 657
596=cut 658=cut
… …
633within each server. 695within each server.
634 696
635=cut 697=cut
636 698
637sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
638 my ($name) = @_; 703 my ($name) = @_;
639 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
640 705
641 eval { 706 eval {
642 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
652} 717}
653 718
654our $DB; 719our $DB;
655 720
656sub db_init { 721sub db_init {
657 cf::sync_job {
658 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
659 };
660} 723}
661 724
662sub db_get($$) { 725sub db_get($$) {
663 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
664 727
665 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
666 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
667 732
668 $! ? () 733 $! ? ()
669 : $data 734 : $data
670 }
671} 735}
672 736
673sub db_put($$$) { 737sub db_put($$$) {
674 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
675 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
731 795
732 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
733 my $data = $process->(\@data); 797 my $data = $process->(\@data);
734 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
735 799
736 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737 801
738 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
739 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
740 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
741 805
… …
751 815
752=cut 816=cut
753 817
754sub datalog($@) { 818sub datalog($@) {
755 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
756 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757} 821}
758 822
759=back 823=back
760 824
761=cut 825=cut
… …
956 1020
957 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
958 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959 1023
960 } elsif (ref $type) { 1024 } elsif (ref $type) {
961 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
962 1026
963 } else { 1027 } else {
964 shift @arg; 1028 shift @arg;
965 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
966 } 1030 }
967 } 1031 }
968} 1032}
969 1033
970sub _object_attach { 1034sub _object_attach {
… …
980 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
981 } 1045 }
982 1046
983 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
984 } else { 1048 } else {
985 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
986 } 1050 }
987 1051
988 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
989} 1053}
990 1054
… …
1049 1113
1050 for (@$callbacks) { 1114 for (@$callbacks) {
1051 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1052 1116
1053 if ($@) { 1117 if ($@) {
1054 warn "$@";
1055 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056 override; 1119 override;
1057 } 1120 }
1058 1121
1059 return 1 if $override; 1122 return 1 if $override;
1060 } 1123 }
… …
1139 for (@$attach) { 1202 for (@$attach) {
1140 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1141 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1142 } 1205 }
1143 } else { 1206 } else {
1144 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1145 } 1208 }
1146 } 1209 }
1147} 1210}
1148 1211
1149cf::attachable->attach ( 1212cf::attachable->attach (
… …
1176 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1177 1240
1178 sync_job { 1241 sync_job {
1179 if (length $$rdata) { 1242 if (length $$rdata) {
1180 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1181 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1182 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1183 1247
1184 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1186 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1209 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1210 1274
1211 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1212 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1213 } else { 1277 } else {
1214 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1215 } 1279 }
1216 } else { 1280 } else {
1217 aio_unlink $filename; 1281 aio_unlink $filename;
1218 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1219 } 1283 }
… …
1243 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1244 $av = $st->{objs}; 1308 $av = $st->{objs};
1245 } 1309 }
1246 1310
1247 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1248 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1249 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1250 1315
1251 ($data, $av) 1316 ($data, $av)
1252} 1317}
1253 1318
1254=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1346 1411
1347 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1348 if $reply; 1413 if $reply;
1349 1414
1350 } else { 1415 } else {
1351 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352 } 1417 }
1353 1418
1354 cf::override; 1419 cf::override;
1355 }, 1420 },
1356); 1421);
… …
1367 1432
1368 $grp 1433 $grp
1369} 1434}
1370 1435
1371sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1372 cf::sync_job { 1439 cf::sync_job {
1373 my %todo; 1440 my %todo;
1374 1441
1375 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1376 next unless -r $path; 1443 next unless -r $path;
… …
1394 1461
1395 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397 1464
1398 $ext{source} = 1465 $ext{source} =
1399 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1400 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1401 . $source 1468 . $source
1402 . "\n};\n1"; 1469 . "\n};\n1";
1403 1470
1404 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1416 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1417 next ext 1484 next ext
1418 unless exists $done{$_}; 1485 unless exists $done{$_};
1419 } 1486 }
1420 1487
1421 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422 1489
1423 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1424 1491
1425 if (length $@) { 1492 if (length $@) {
1426 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1427 1494
1428 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429 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};
1430 } else { 1500 } else {
1431 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1432 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1433 $progress = 1; 1503 $progress = 1;
1434 1504
1435 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1436 unless $active; 1506 unless $active;
1437 } 1507 }
1438 } 1508 }
1439 1509
1440 unless ($progress) { 1510 unless ($progress) {
… …
1609 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1610 1680
1611 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1612 $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
1613 1683
1614 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615 $pl->deactivate; 1685 $pl->deactivate;
1686
1616 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;
1617 $pl->ob->check_score;
1618 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1619 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1620 1692
1621 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1622 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1623 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1677 \@logins 1749 \@logins
1678} 1750}
1679 1751
1680=item $player->maps 1752=item $player->maps
1681 1753
1754=item cf::player::maps $login
1755
1682Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1683player. May block. 1757player. May block.
1684 1758
1685=cut 1759=cut
1686 1760
… …
1748=cut 1822=cut
1749 1823
1750sub find_by_path($) { 1824sub find_by_path($) {
1751 my ($path) = @_; 1825 my ($path) = @_;
1752 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1753 my ($match, $specificity); 1829 my ($match, $specificity);
1754 1830
1755 for my $region (list) { 1831 for my $region (list) {
1756 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1757 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1785sub generate_random_map { 1861sub generate_random_map {
1786 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1787 1863
1788 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
1789 1865
1790 # mit "rum" bekleckern, nicht
1791 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1792 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795 $rmp->{exit_on_final_map},
1796 $rmp->{xsize}, $rmp->{ysize},
1797 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802 (cf::region::find $rmp->{region}), $rmp->{custom}
1803 )
1804} 1867}
1805 1868
1806=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1807 1870
1808Register 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
… …
1813 1876
1814sub register { 1877sub register {
1815 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1816 my $pkg = caller; 1879 my $pkg = caller;
1817 1880
1818 no strict;
1819 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1820 1882
1821 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822} 1884}
1823 1885
1824# also paths starting with '/' 1886# also paths starting with '/'
1825$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826 1888
1827sub thawer_merge { 1889sub thawer_merge {
1828 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1829 1891
1830 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1835} 1897}
1836 1898
1837sub normalise { 1899sub normalise {
1838 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1839 1901
1840 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1841 1903
1842 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1843 1905
1844 # map plan: 1906 # map plan:
1845 # 1907 #
… …
1860 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1861 $path = "$base/$path"; 1923 $path = "$base/$path";
1862 } 1924 }
1863 1925
1864 for ($path) { 1926 for ($path) {
1865 redo if s{//}{/};
1866 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1867 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1868 } 1929 }
1869 1930
1870 $path 1931 $path
… …
1884 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1885 return $self; 1946 return $self;
1886 } 1947 }
1887 } 1948 }
1888 1949
1889 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1890 () 1951 ()
1891} 1952}
1892 1953
1893sub init { 1954sub init {
1894 my ($self) = @_; 1955 my ($self) = @_;
… …
2016} 2077}
2017 2078
2018sub find; 2079sub find;
2019sub find { 2080sub find {
2020 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2021 2084
2022 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2023 2086
2024 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2110 2173
2111 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2112 } 2175 }
2113 2176
2114 $self->post_load; 2177 $self->post_load;
2178
2179 1
2115} 2180}
2116 2181
2117# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2118# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2119# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2140 or next; 2205 or next;
2141 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2142 or next; 2207 or next;
2143 $neigh->load; 2208 $neigh->load;
2144 2209
2210 # now find the diagonal neighbours
2145 push @neigh, 2211 push @neigh,
2146 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2147 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2148 } 2214 }
2149 2215
… …
2156} 2222}
2157 2223
2158sub find_sync { 2224sub find_sync {
2159 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2160 2226
2161 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
2162} 2231}
2163 2232
2164sub do_load_sync { 2233sub do_load_sync {
2165 my ($map) = @_; 2234 my ($map) = @_;
2166 2235
2167 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2169 2238
2170 cf::sync_job { $map->load }; 2239 $map->load;
2171} 2240}
2172 2241
2173our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2174our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2175 2244
… …
2201 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2202 2271
2203 () 2272 ()
2204} 2273}
2205 2274
2275# common code, used by both ->save and ->swapout
2206sub save { 2276sub _save {
2207 my ($self) = @_; 2277 my ($self) = @_;
2208
2209 my $lock = cf::lock_acquire "map_data:$self->{path}";
2210 2278
2211 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2212 2280
2213 return unless $self->dirty; 2281 return unless $self->dirty;
2214 2282
… …
2234 } else { 2302 } else {
2235 $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);
2236 } 2304 }
2237} 2305}
2238 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2239sub swap_out { 2315sub swap_out {
2240 my ($self) = @_; 2316 my ($self) = @_;
2241 2317
2242 # save first because save cedes
2243 $self->save;
2244
2245 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2246 2319
2247 return if $self->players;
2248 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2249 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2250 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2251 $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};
2252 2374
2253 $self->deactivate; 2375 $self->deactivate;
2254 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2255 $self->clear; 2377 $self->clear;
2256}
2257
2258sub reset_at {
2259 my ($self) = @_;
2260
2261 # TODO: safety, remove and allow resettable per-player maps
2262 return 1e99 if $self->{deny_reset};
2263
2264 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267 $time + $to
2268}
2269
2270sub should_reset {
2271 my ($self) = @_;
2272
2273 $self->reset_at <= $cf::RUNTIME
2274}
2275
2276sub reset {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 return if $self->players;
2282
2283 warn "resetting map ", $self->path, "\n";
2284
2285 $self->in_memory (cf::MAP_SWAPPED);
2286
2287 # need to save uniques path
2288 unless ($self->{deny_save}) {
2289 my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2292 if $uniq;
2293 }
2294
2295 delete $cf::MAP{$self->path};
2296
2297 $self->deactivate;
2298 $_->clear_links_to ($self) for values %cf::MAP;
2299 $self->clear;
2300 2378
2301 $self->unlink_save; 2379 $self->unlink_save;
2302 $self->destroy; 2380 $self->destroy;
2303} 2381}
2304 2382
… …
2312 2390
2313 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2314 2392
2315 $self->unlink_save; 2393 $self->unlink_save;
2316 2394
2317 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2318 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2319 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2320 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2321 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322 2400
… …
2552 2630
2553Freezes 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}>).
2554 2632
2555The 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.
2556for 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,
2557though, 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
2558map. 2636map.
2559 2637
2560Will never block. 2638Will never block.
2561 2639
2562=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2583sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2584 my ($self) = @_; 2662 my ($self) = @_;
2585 2663
2586 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2587 2665
2666 ++$self->{_link_recursion};
2667
2588 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2589 2669
2590 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2592 2672
2593 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2594} 2674}
2595 2675
2596sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2597 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2598 2678
… …
2623 $map->load_neighbours; 2703 $map->load_neighbours;
2624 2704
2625 return unless $self->contr->active; 2705 return unless $self->contr->active;
2626 2706
2627 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2629 2709 # entering was successful
2710 delete $self->{_link_recursion};
2630 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2631 $self->activate_recursive; 2712 $self->activate_recursive;
2632} 2713 }
2633 2714
2715}
2716
2634=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)]])
2635 2718
2636Moves 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
2637her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2638that 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
2639the 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
… …
2646 2729
2647our $GOTOGEN; 2730our $GOTOGEN;
2648 2731
2649sub cf::object::player::goto { 2732sub cf::object::player::goto {
2650 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 }
2651 2740
2652 # 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
2653 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654 2743
2655 $self->enter_link; 2744 $self->enter_link;
… …
2679 my $map = eval { 2768 my $map = eval {
2680 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2681 2770
2682 if ($map) { 2771 if ($map) {
2683 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2684 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2685 } else { 2774 } else {
2686 $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);
2687 } 2776 }
2688 2777
2689 $map 2778 $map
… …
2697 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2698 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2699 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2700 } 2789 }
2701 2790
2702 $done->() if $done; 2791 $done->($self) if $done;
2703 })->prio (1); 2792 })->prio (1);
2704} 2793}
2705 2794
2706=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2707 2796
… …
2800 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2801 . "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. "
2802 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2803 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2804 2893
2805 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2806 $self->leave_link; 2895 $self->leave_link;
2807 } 2896 }
2808 })->prio (1); 2897 })->prio (1);
2809} 2898}
2810 2899
… …
3123 3212
3124 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3125 if $reply; 3214 if $reply;
3126 3215
3127 } else { 3216 } else {
3128 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";
3129 } 3218 }
3130 3219
3131 cf::override; 3220 cf::override;
3132 }, 3221 },
3133); 3222);
… …
3214 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3215 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3216 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3217 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3218) { 3307) {
3219 no strict 'refs';
3220 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3221 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222 for @funs; 3310 for @funs;
3223} 3311}
3224 3312
… …
3263 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3264 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3265 } 3353 }
3266 3354
3267 if ($@) { 3355 if ($@) {
3268 warn "$@"; 3356 warn "$@",
3269 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3270 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3271 } 3359 }
3272 3360
3273 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3274} 3362}
3275 3363
… …
3309 # for this (global event?) 3397 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3311 3399
3312 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313 3401
3314 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3315 3403
3316 my $facedata;
3317 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3318 or die "$path: $!"; 3405 or die "$path: $!";
3319 3406
3320 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3321 3408
3322 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3339 3426
3340 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3341 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3342 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3343 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} ;
3344 3432
3345 cf::cede_to_tick; 3433 cf::cede_to_tick;
3346 } 3434 }
3347 3435
3348 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3353 3441
3354 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3355 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3356 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357 } else { 3445 } else {
3358 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3359 } 3447 }
3360 3448
3361 cf::cede_to_tick; 3449 cf::cede_to_tick;
3362 } 3450 }
3363 } 3451 }
… …
3381 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382 3470
3383 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3385 } else { 3473 } else {
3386 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3387 } 3475 }
3388 3476
3389 cf::cede_to_tick; 3477 cf::cede_to_tick;
3390 } 3478 }
3391 } 3479 }
3392 3480
3393 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394 3482
3395 1 3483 1
3396} 3484}
3397
3398cf::global->attach (on_resource_update => sub {
3399 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403 my $sound = $soundconf->{compat}[$_]
3404 or next;
3405
3406 my $face = cf::face::find "sound/$sound->[1]";
3407 cf::sound::set $sound->[0] => $face;
3408 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409 }
3410
3411 while (my ($k, $v) = each %{$soundconf->{event}}) {
3412 my $face = cf::face::find "sound/$v";
3413 cf::sound::set $k => $face;
3414 }
3415 }
3416});
3417 3485
3418register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3419 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3420 3488
3421 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3460sub reload_treasures { 3528sub reload_treasures {
3461 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3462 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3463} 3531}
3464 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
3465sub reload_resources { 3556sub reload_resources {
3466 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3467 3558
3559 reload_exp_table;
3560 reload_materials;
3468 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3469 reload_archetypes; 3563 reload_archetypes;
3470 reload_regions; 3564 reload_regions;
3471 reload_treasures; 3565 reload_treasures;
3472 3566
3473 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3474} 3568}
3475 3569
3476sub reload_config { 3570sub reload_config {
3477 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3478 3572
3479 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3480 or return; 3574 or die "$CONFDIR/config: $!";
3481 3575
3482 local $/; 3576 utf8::decode $config;
3483 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3484 3578
3485 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486 3580
3487 $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};
3488 $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};
3489 3583
3490 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3492 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3494 }; 3588 };
3495 warn $@ if $@; 3589 warn $@ if $@;
3496 } 3590 }
3497
3498 warn "finished reloading resource files\n";
3499} 3591}
3500 3592
3501sub pidfile() { 3593sub pidfile() {
3502 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3516 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3517 print $fh $$; 3609 print $fh $$;
3518} 3610}
3519 3611
3520sub main_loop { 3612sub main_loop {
3521 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3522 if (1) { 3614 if (1) {
3523 EV::loop; 3615 EV::loop;
3524 } 3616 }
3525 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3526 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3527} 3619}
3528 3620
3529sub main { 3621sub main {
3530 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3531 3623
3532 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533 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.";
3534 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536
3537 cf::init_experience;
3538 cf::init_anim;
3539 cf::init_attackmess;
3540 cf::init_dynamic;
3541 3628
3542 $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
3543 3630
3544 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3545 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
… …
3551 }; 3638 };
3552 3639
3553 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3554 3641
3555 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
3556 cf::load_settings; 3649 cf::load_settings;
3557 cf::load_materials;
3558 3650
3559 reload_resources; 3651 reload_resources;
3560 reload_config; 3652 reload_config;
3561 db_init; 3653 db_init;
3562 3654
… …
3574 3666
3575 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3576 use POSIX (); 3668 use POSIX ();
3577 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};
3578 3670
3579 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3580 }; 3672 };
3581 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
3582 main_loop; 3682 goto &main_loop;
3583} 3683}
3584 3684
3585############################################################################# 3685#############################################################################
3586# initialisation and cleanup 3686# initialisation and cleanup
3587 3687
… …
3626 or return; 3726 or return;
3627 3727
3628 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629 and return; 3729 and return;
3630 3730
3631 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632 3732
3633 1 3733 1
3634} 3734}
3635 3735
3636our $uuid_lock; 3736our $uuid_lock;
… …
3648 or return; 3748 or return;
3649 3749
3650 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3651 3751
3652 unless ($value) { 3752 unless ($value) {
3653 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3654 return; 3754 return;
3655 } 3755 }
3656 3756
3657 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3658 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3668 or return; 3768 or return;
3669 3769
3670 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3671 and return; 3771 and return;
3672 3772
3673 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3674 3774
3675 1 3775 1
3676 3776
3677} 3777}
3678 3778
… …
3684} 3784}
3685 3785
3686sub emergency_save() { 3786sub emergency_save() {
3687 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3688 3788
3689 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;
3690 3795
3691 cf::sync_job { 3796 cf::sync_job {
3692 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3693 # save all maps without fsync, and later call a global sync
3694 # (which in turn might be very very slow)
3695 local $USE_FSYNC = 0;
3696 3798
3697 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3698 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3699 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3700 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3701 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3702 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3703 $pl->valid or next; 3805 $pl->valid or next;
3704 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705 $pl->save; 3807 $pl->save;
3706 } 3808 }
3707 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3708 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3709 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3710 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3711 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3712 $map->valid or next; 3816 $map->valid or next;
3713 $map->save; 3817 $map->save;
3714 } 3818 }
3715 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3716 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3717 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3718 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3719 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3720 3826
3721 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3722 write_uuid_sync 1; 3828 write_uuid_sync 1;
3723 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
3724 }; 3849 };
3725 3850
3726 warn "emergency_perl_save: starting sync()\n";
3727 IO::AIO::aio_sync sub {
3728 warn "emergency_perl_save: finished sync()\n";
3729 };
3730
3731 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3732} 3852}
3733 3853
3734sub post_cleanup { 3854sub post_cleanup {
3735 my ($make_core) = @_; 3855 my ($make_core) = @_;
3736 3856
3857 IO::AIO::flush;
3858
3737 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3738 if $make_core; 3860 if $make_core;
3739 3861
3740 my $fh = pidfile; 3862 my $fh = pidfile;
3741 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3742} 3864}
… …
3762 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3764 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3765# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766 } 3888 }
3767 warn "cleared package $pkg\n";#d#
3768} 3889}
3769 3890
3770sub do_reload_perl() { 3891sub do_reload_perl() {
3771 # can/must only be called in main 3892 # can/must only be called in main
3772 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3773 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3774 return; 3895 return;
3775 } 3896 }
3776 3897
3777 return if $RELOAD++; 3898 return if $RELOAD++;
3778 3899
3779 my $t1 = AE::time; 3900 my $t1 = AE::time;
3780 3901
3781 while ($RELOAD) { 3902 while ($RELOAD) {
3782 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3783 3905
3784 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3785 3907
3786 cf::sync_job { 3908 cf::sync_job {
3787 cf::write_runtime_sync; # external watchdog should not bark
3788 cf::emergency_save; 3909 #cf::emergency_save;
3789 cf::write_runtime_sync; # external watchdog should not bark
3790 3910
3791 warn "syncing database to disk";
3792 BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794 # if anything goes wrong in here, we should simply crash as we already saved
3795
3796 warn "flushing outstanding aio requests";
3797 while (IO::AIO::nreqs || BDB::nreqs) {
3798 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799 }
3800
3801 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3802 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3803 %EXT_CORO = (); 3913 %EXT_CORO = ();
3804 3914
3805 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3806 %COMMAND = (); 3916 %COMMAND = ();
3807 3917
3808 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3809 %EXTCMD = (); 3919 %EXTCMD = ();
3810 %EXTICMD = (); 3920 %EXTICMD = ();
3811 3921
3812 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3813 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3814 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3815 3925
3816 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3817 eval { 3927 eval {
3818 $cb->($pkg); 3928 $cb->($pkg);
3819 1 3929 1
3820 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3821 } 3931 }
3822 3932
3823 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3824 clear_package $pkg; 3934 clear_package $pkg;
3825 } 3935 }
3826 3936
3827 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3829 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830 3940
3831 warn "... unloading $k"; 3941 trace "... unloading $k";
3832 delete $INC{$k}; 3942 delete $INC{$k};
3833 3943
3834 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3835 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3836 3946
… …
3839 } 3949 }
3840 3950
3841 clear_package $k; 3951 clear_package $k;
3842 } 3952 }
3843 3953
3844 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3845 clear_package "safe::$_" 3955 clear_package "safe::$_"
3846 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);
3847 3957
3848 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3849 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3850 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851 3961
3852 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3853 # and global variables created in xs 3963 # and global variables created in xs
3854 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3855 3965
3856 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3857 3967
3858 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3859 require cf; 3969 require cf;
3860 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3861 3971
3862 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3863 cf::reload_config; 3973 cf::reload_config;
3864 3974
3865 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3866 cf::load_extensions; 3976 cf::load_extensions;
3867 3977
3868 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3869 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3870 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3871 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3872 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3873 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3874 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3875 } 3985 }
3876 3986
3877 warn "running post_init jobs"; 3987 cf::_post_init 1;
3878 (pop @POST_INIT)->(1) while @POST_INIT;
3879 3988
3880 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3881 3990
3882 1 3991 1
3883 } or do { 3992 } or do {
3884 warn $@; 3993 error $@;
3885 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3886 }; 3995 };
3887 3996
3888 warn "reloaded";
3889 --$RELOAD; 3997 --$RELOAD;
3890 } 3998 }
3891 3999
3892 $t1 = AE::time - $t1; 4000 $t1 = AE::time - $t1;
3893 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3894}; 4002};
3895 4003
3896our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3897 4005
3898sub reload_perl() { 4006sub reload_perl() {
… …
3919 reload_perl; 4027 reload_perl;
3920 }; 4028 };
3921 } 4029 }
3922}; 4030};
3923 4031
3924unshift @INC, $LIBDIR; 4032#############################################################################
3925 4033
3926my $bug_warning = 0; 4034my $bug_warning = 0;
3927 4035
3928our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3929our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3930 4038
3931sub wait_for_tick { 4039sub wait_for_tick() {
3932 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3933 4041
3934 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3935 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3936 $signal->wait; 4044 $signal->wait;
3937} 4045}
3938 4046
3939sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3940 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3941 4049
3942 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3943 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3944 $signal->wait; 4052 $signal->wait;
… …
3958 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959 $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.;
3960 Coro::async_pool { 4068 Coro::async_pool {
3961 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3962 write_runtime_sync 4070 write_runtime_sync
3963 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3964 }; 4072 };
3965 } 4073 }
3966 4074
3967 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968 $sig->send; 4076 $sig->send;
… …
3976 4084
3977 if (0) { 4085 if (0) {
3978 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3979 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3980 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3982 } 4090 }
3983 } 4091 }
3984} 4092}
3985 4093
3986{ 4094{
… …
4031 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4032 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4033 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4034} 4142}
4035 4143
4036my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4037 4146
4038sub _log_backtrace { 4147sub _log_backtrace {
4039 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4040 4149
4041 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4042 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4044 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4045 ++$_log_backtrace; 4158 ++$_log_backtrace;
4046 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4047 async { 4160 async {
4048 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4049 4162
… …
4069 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4070 --$_log_backtrace; 4183 --$_log_backtrace;
4071 }; 4184 };
4072 } else { 4185 } else {
4073 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4074 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075 } 4188 }
4076} 4189}
4077 4190
4078# load additional modules 4191# load additional modules
4079require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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