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.512 by root, Sun Apr 11 04:52:07 2010 UTC vs.
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
112 118
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 121our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 127our $DB_ENV;
122 128
123our @EXTRA_MODULES = qw(pod match mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 130
125our %CFG; 131our %CFG;
126 132
127our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 134our $RUNTIME;
… …
162 168
163our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
164 170
165sub cf::map::normalise; 171sub cf::map::normalise;
166 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
167############################################################################# 177#############################################################################
168 178
169%REFLECT = (); 179%REFLECT = ();
170for (@REFLECT) { 180for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 233from wherever your confdir points to.
224 234
225=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
226 236
227These 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
228returns 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
229per 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();
230 245
231=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
232 247
233This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
234C<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
… …
242 257
243=back 258=back
244 259
245=cut 260=cut
246 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
247$Coro::State::WARNHOOK = sub { 268$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 269 my $msg = join "", @_;
249 270
250 $msg .= "\n" 271 $msg .= "\n"
251 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
252 273
253 $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;
254 275
255 LOG llevError, $msg; 276 LOG llevWarn, $msg;
256}; 277};
257 278
258$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
260 281
261 warn Carp::longmess $_[0]; 282 error Carp::longmess $_[0];
262 283
263 if ($Coro::current == $Coro::main) {#d# 284 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 286 return;#d#
266 }#d# 287 }#d#
267 288
268 # kill coroutine otherwise 289 # kill coroutine otherwise
269 Coro::terminate 290 Coro::terminate
… …
336our $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
337 358
338sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
342 375
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
345 378
346The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 380is a reload or not.
348 381
349=cut 382=cut
350 383
351sub post_init(&) { 384sub post_init(&) {
352 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 }
353} 403}
354 404
355=item cf::lock_wait $string 405=item cf::lock_wait $string
356 406
357Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
… …
396} 446}
397 447
398=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
399 449
400Like 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
401get spread over timer. 451get spread over time.
402 452
403=cut 453=cut
404 454
405sub periodic($$) { 455sub periodic($$) {
406 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
… …
502=cut 552=cut
503 553
504sub sync_job(&) { 554sub sync_job(&) {
505 my ($job) = @_; 555 my ($job) = @_;
506 556
507 if ($Coro::current == $Coro::main) { 557 if (in_main) {
508 my $time = AE::time; 558 my $time = AE::time;
509 559
510 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
512 562
513 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
514 564
515 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
516 566
517 my $busy = 1; 567 my $busy = 1;
518 my @res; 568 my @res;
519 569
520 (async { 570 (async {
521 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 572 @res = eval { $job->() };
523 warn $@ if $@; 573 error $@ if $@;
524 undef $busy; 574 undef $busy;
525 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
526 576
527 while ($busy) { 577 while ($busy) {
528 if (Coro::nready) { 578 if (Coro::nready) {
… …
562 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
563 613
564 $coro 614 $coro
565} 615}
566 616
567=item fork_call { }, $args 617=item fork_call { }, @args
568 618
569Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 622never block itself or use any form of event handling.
573 623
574=cut 624=cut
575 625
626sub post_fork {
627 reset_signals;
628}
629
576sub fork_call(&@) { 630sub fork_call(&@) {
577 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
578 632
579 # 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,
580 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
582 636
583 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
584 reset_signals; 638 cf::post_fork;
585 &$cb 639 &$cb
586 }, @args; 640 } @args;
587 641
588 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 )
589} 654}
590 655
591=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
592 657
593=cut 658=cut
… …
630within each server. 695within each server.
631 696
632=cut 697=cut
633 698
634sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
635 my ($name) = @_; 703 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
637 705
638 eval { 706 eval {
639 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
… …
649} 717}
650 718
651our $DB; 719our $DB;
652 720
653sub db_init { 721sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
656 };
657} 723}
658 724
659sub db_get($$) { 725sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
661 727
662 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
663 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
664 732
665 $! ? () 733 $! ? ()
666 : $data 734 : $data
667 }
668} 735}
669 736
670sub db_put($$$) { 737sub db_put($$$) {
671 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 795
729 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 797 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
732 799
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 801
735 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
738 805
… …
748 815
749=cut 816=cut
750 817
751sub datalog($@) { 818sub datalog($@) {
752 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 821}
755 822
756=back 823=back
757 824
758=cut 825=cut
… …
953 1020
954 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1023
957 } elsif (ref $type) { 1024 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
959 1026
960 } else { 1027 } else {
961 shift @arg; 1028 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
963 } 1030 }
964 } 1031 }
965} 1032}
966 1033
967sub _object_attach { 1034sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
978 } 1045 }
979 1046
980 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
981 } else { 1048 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1050 }
984 1051
985 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
986} 1053}
987 1054
… …
1046 1113
1047 for (@$callbacks) { 1114 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1049 1116
1050 if ($@) { 1117 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1119 override;
1054 } 1120 }
1055 1121
1056 return 1 if $override; 1122 return 1 if $override;
1057 } 1123 }
… …
1136 for (@$attach) { 1202 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1139 } 1205 }
1140 } else { 1206 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1208 }
1143 } 1209 }
1144} 1210}
1145 1211
1146cf::attachable->attach ( 1212cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1174 1240
1175 sync_job { 1241 sync_job {
1176 if (length $$rdata) { 1242 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1180 1247
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1251 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1207 1274
1208 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1277 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1212 } 1279 }
1213 } else { 1280 } else {
1214 aio_unlink $filename; 1281 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1216 } 1283 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1308 $av = $st->{objs};
1242 } 1309 }
1243 1310
1244 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1247 1315
1248 ($data, $av) 1316 ($data, $av)
1249} 1317}
1250 1318
1251=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
… …
1343 1411
1344 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1413 if $reply;
1346 1414
1347 } else { 1415 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1417 }
1350 1418
1351 cf::override; 1419 cf::override;
1352 }, 1420 },
1353); 1421);
… …
1364 1432
1365 $grp 1433 $grp
1366} 1434}
1367 1435
1368sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1369 cf::sync_job { 1439 cf::sync_job {
1370 my %todo; 1440 my %todo;
1371 1441
1372 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1443 next unless -r $path;
… …
1391 1461
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1464
1395 $ext{source} = 1465 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1398 . $source 1468 . $source
1399 . "\n};\n1"; 1469 . "\n};\n1";
1400 1470
1401 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1484 next ext
1415 unless exists $done{$_}; 1485 unless exists $done{$_};
1416 } 1486 }
1417 1487
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1489
1420 my $active = eval $v->{source}; 1490 my $active = eval $v->{source};
1421 1491
1422 if (length $@) { 1492 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1493 error "$v->{path}: $@\n";
1424 1494
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 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};
1427 } else { 1500 } else {
1428 $done{$k} = delete $todo{$k}; 1501 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1502 push @EXTS, $v->{pkg};
1430 $progress = 1; 1503 $progress = 1;
1431 1504
1432 warn "$v->{base}: extension inactive.\n" 1505 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1506 unless $active;
1434 } 1507 }
1435 } 1508 }
1436 1509
1437 unless ($progress) { 1510 unless ($progress) {
… …
1606 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1607 1680
1608 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1609 $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
1610 1683
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1685 $pl->deactivate;
1686
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1616 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1617 1692
1618 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1674 \@logins 1749 \@logins
1675} 1750}
1676 1751
1677=item $player->maps 1752=item $player->maps
1678 1753
1754=item cf::player::maps $login
1755
1679Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1680player. May block. 1757player. May block.
1681 1758
1682=cut 1759=cut
1683 1760
… …
1745=cut 1822=cut
1746 1823
1747sub find_by_path($) { 1824sub find_by_path($) {
1748 my ($path) = @_; 1825 my ($path) = @_;
1749 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1750 my ($match, $specificity); 1829 my ($match, $specificity);
1751 1830
1752 for my $region (list) { 1831 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1754 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1784 1863
1785 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
1786 1865
1787 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1867 $self->_create_random_map (
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp,
1869 $rmp->{wall_name}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle}, 1870 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1871 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map}, 1872 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize}, 1873 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1874 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1875 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation}, 1876 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp}, 1877 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used}, 1878 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom} 1879 (cf::region::find $rmp->{region})
1800 ) 1880 )
1801} 1881}
1802 1882
1803=item cf::map->register ($regex, $prio) 1883=item cf::map->register ($regex, $prio)
1804 1884
… …
1810 1890
1811sub register { 1891sub register {
1812 my (undef, $regex, $prio) = @_; 1892 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1893 my $pkg = caller;
1814 1894
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1895 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1896
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1897 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1898}
1820 1899
1821# also paths starting with '/' 1900# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1901$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1902
1824sub thawer_merge { 1903sub thawer_merge {
1825 my ($self, $merge) = @_; 1904 my ($self, $merge) = @_;
1826 1905
1827 # we have to keep some variables in memory intact 1906 # we have to keep some variables in memory intact
… …
1832} 1911}
1833 1912
1834sub normalise { 1913sub normalise {
1835 my ($path, $base) = @_; 1914 my ($path, $base) = @_;
1836 1915
1837 $path = "$path"; # make sure its a string 1916 $path = "$path"; # make sure it's a string
1838 1917
1839 $path =~ s/\.map$//; 1918 $path =~ s/\.map$//;
1840 1919
1841 # map plan: 1920 # map plan:
1842 # 1921 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1936 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1937 $path = "$base/$path";
1859 } 1938 }
1860 1939
1861 for ($path) { 1940 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1941 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1942 redo if s{/[^/]+/\.\./}{/};
1865 } 1943 }
1866 1944
1867 $path 1945 $path
… …
1881 $self->init; # pass $1 etc. 1959 $self->init; # pass $1 etc.
1882 return $self; 1960 return $self;
1883 } 1961 }
1884 } 1962 }
1885 1963
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1964 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1965 ()
1888} 1966}
1889 1967
1890sub init { 1968sub init {
1891 my ($self) = @_; 1969 my ($self) = @_;
… …
2013} 2091}
2014 2092
2015sub find; 2093sub find;
2016sub find { 2094sub find {
2017 my ($path, $origin) = @_; 2095 my ($path, $origin) = @_;
2096
2097 cf::cede_to_tick;
2018 2098
2019 $path = normalise $path, $origin && $origin->path; 2099 $path = normalise $path, $origin && $origin->path;
2020 2100
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2101 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2102 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2107 2187
2108 $self->in_memory (cf::MAP_ACTIVE); 2188 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2189 }
2110 2190
2111 $self->post_load; 2191 $self->post_load;
2192
2193 1
2112} 2194}
2113 2195
2114# customize the map for a given player, i.e. 2196# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2197# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2198# maps to change the path to ~playername/mappath
… …
2137 or next; 2219 or next;
2138 $neigh = find $neigh, $map 2220 $neigh = find $neigh, $map
2139 or next; 2221 or next;
2140 $neigh->load; 2222 $neigh->load;
2141 2223
2224 # now find the diagonal neighbours
2142 push @neigh, 2225 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2226 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2227 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2228 }
2146 2229
… …
2153} 2236}
2154 2237
2155sub find_sync { 2238sub find_sync {
2156 my ($path, $origin) = @_; 2239 my ($path, $origin) = @_;
2157 2240
2158 cf::sync_job { find $path, $origin } 2241 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242 if $Coro::current == $Coro::main;
2243
2244 find $path, $origin
2159} 2245}
2160 2246
2161sub do_load_sync { 2247sub do_load_sync {
2162 my ($map) = @_; 2248 my ($map) = @_;
2163 2249
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2250 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2251 if $Coro::current == $Coro::main;
2166 2252
2167 cf::sync_job { $map->load }; 2253 $map->load;
2168} 2254}
2169 2255
2170our %MAP_PREFETCH; 2256our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2257our $MAP_PREFETCHER = undef;
2172 2258
… …
2198 $MAP_PREFETCHER->prio (6); 2284 $MAP_PREFETCHER->prio (6);
2199 2285
2200 () 2286 ()
2201} 2287}
2202 2288
2289# common code, used by both ->save and ->swapout
2203sub save { 2290sub _save {
2204 my ($self) = @_; 2291 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2292
2208 $self->{last_save} = $cf::RUNTIME; 2293 $self->{last_save} = $cf::RUNTIME;
2209 2294
2210 return unless $self->dirty; 2295 return unless $self->dirty;
2211 2296
… …
2231 } else { 2316 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2317 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2318 }
2234} 2319}
2235 2320
2321sub save {
2322 my ($self) = @_;
2323
2324 my $lock = cf::lock_acquire "map_data:$self->{path}";
2325
2326 $self->_save;
2327}
2328
2236sub swap_out { 2329sub swap_out {
2237 my ($self) = @_; 2330 my ($self) = @_;
2238 2331
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2332 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2333
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2334 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2335 return if $self->{deny_save};
2336 return if $self->players;
2247 2337
2338 # first deactivate the map and "unlink" it from the core
2339 $self->deactivate;
2340 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2341 $self->in_memory (cf::MAP_SWAPPED);
2342
2343 # then atomically save
2344 $self->_save;
2345
2346 # then free the map
2347 $self->clear;
2348}
2349
2350sub reset_at {
2351 my ($self) = @_;
2352
2353 # TODO: safety, remove and allow resettable per-player maps
2354 return 1e99 if $self->{deny_reset};
2355
2356 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2357 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2358
2359 $time + $to
2360}
2361
2362sub should_reset {
2363 my ($self) = @_;
2364
2365 $self->reset_at <= $cf::RUNTIME
2366}
2367
2368sub reset {
2369 my ($self) = @_;
2370
2371 my $lock = cf::lock_acquire "map_data:$self->{path}";
2372
2373 return if $self->players;
2374
2375 cf::trace "resetting map ", $self->path, "\n";
2376
2377 $self->in_memory (cf::MAP_SWAPPED);
2378
2379 # need to save uniques path
2380 unless ($self->{deny_save}) {
2381 my $uniq = $self->uniq_path; utf8::encode $uniq;
2382
2383 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2384 if $uniq;
2385 }
2386
2387 delete $cf::MAP{$self->path};
2249 2388
2250 $self->deactivate; 2389 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2390 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2391 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2392
2298 $self->unlink_save; 2393 $self->unlink_save;
2299 $self->destroy; 2394 $self->destroy;
2300} 2395}
2301 2396
… …
2309 2404
2310 delete $cf::MAP{$self->path}; 2405 delete $cf::MAP{$self->path};
2311 2406
2312 $self->unlink_save; 2407 $self->unlink_save;
2313 2408
2314 bless $self, "cf::map"; 2409 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2410 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2411 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2412 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2413 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2414
… …
2549 2644
2550Freezes the player and moves him/her to a special map (C<{link}>). 2645Freezes the player and moves him/her to a special map (C<{link}>).
2551 2646
2552The player should be reasonably safe there for short amounts of time (e.g. 2647The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2648for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2649though, as the player cannot control the character while it is on the link
2555map. 2650map.
2556 2651
2557Will never block. 2652Will never block.
2558 2653
2559=item $player_object->leave_link ($map, $x, $y) 2654=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2675sub cf::object::player::enter_link {
2581 my ($self) = @_; 2676 my ($self) = @_;
2582 2677
2583 $self->deactivate_recursive; 2678 $self->deactivate_recursive;
2584 2679
2680 ++$self->{_link_recursion};
2681
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2682 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2683
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2684 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2685 if $self->map && $self->map->{path} ne "{link}";
2589 2686
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2687 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2688}
2592 2689
2593sub cf::object::player::leave_link { 2690sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2691 my ($self, $map, $x, $y) = @_;
2595 2692
… …
2620 $map->load_neighbours; 2717 $map->load_neighbours;
2621 2718
2622 return unless $self->contr->active; 2719 return unless $self->contr->active;
2623 2720
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2721 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2722 if ($self->enter_map ($map, $x, $y)) {
2626 2723 # entering was successful
2724 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2725 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2726 $self->activate_recursive;
2629} 2727 }
2630 2728
2729}
2730
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2731=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2732
2633Moves the player to the given map-path and coordinates by first freezing 2733Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2734her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2735that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2736the new (success) or old (failed) map position. In either case, $done will
… …
2643 2743
2644our $GOTOGEN; 2744our $GOTOGEN;
2645 2745
2646sub cf::object::player::goto { 2746sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2747 my ($self, $path, $x, $y, $check, $done) = @_;
2748
2749 if ($self->{_link_recursion} >= $MAX_LINKS) {
2750 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2751 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2752 ($path, $x, $y) = @$EMERGENCY_POSITION;
2753 }
2648 2754
2649 # do generation counting so two concurrent goto's will be executed in-order 2755 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2756 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2757
2652 $self->enter_link; 2758 $self->enter_link;
… …
2676 my $map = eval { 2782 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2783 my $map = defined $path ? cf::map::find $path : undef;
2678 2784
2679 if ($map) { 2785 if ($map) {
2680 $map = $map->customise_for ($self); 2786 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2787 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2788 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2789 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2790 }
2685 2791
2686 $map 2792 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2800 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2801 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2802 $self->leave_link ($map, $x, $y);
2697 } 2803 }
2698 2804
2699 $done->() if $done; 2805 $done->($self) if $done;
2700 })->prio (1); 2806 })->prio (1);
2701} 2807}
2702 2808
2703=item $player_object->enter_exit ($exit_object) 2809=item $player_object->enter_exit ($exit_object)
2704 2810
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2903 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2904 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2905 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2906 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2907
2802 warn "ERROR in enter_exit: $@"; 2908 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2909 $self->leave_link;
2804 } 2910 }
2805 })->prio (1); 2911 })->prio (1);
2806} 2912}
2807 2913
… …
3120 3226
3121 $ns->ext_reply ($reply, @reply) 3227 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3228 if $reply;
3123 3229
3124 } else { 3230 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3231 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3232 }
3127 3233
3128 cf::override; 3234 cf::override;
3129 }, 3235 },
3130); 3236);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3317 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3318 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3319 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3320 ["cf::map" => qw(trigger)],
3215) { 3321) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3322 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3323 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3324 for @funs;
3220} 3325}
3221 3326
… …
3260 local @cf::_safe_eval_args = values %vars; 3365 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3366 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3367 }
3263 3368
3264 if ($@) { 3369 if ($@) {
3265 warn "$@"; 3370 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3371 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3372 "with arguments " . (join " ", %vars) . "\n";
3268 } 3373 }
3269 3374
3270 wantarray ? @res : $res[0] 3375 wantarray ? @res : $res[0]
3271} 3376}
3272 3377
… …
3306 # for this (global event?) 3411 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3412 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3413
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3414 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3415
3311 warn "loading facedata from $path\n"; 3416 trace "loading facedata from $path\n";
3312 3417
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3418 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3419 or die "$path: $!";
3316 3420
3317 $facedata = Coro::Storable::thaw $facedata; 3421 $facedata = Coro::Storable::thaw $facedata;
3318 3422
3319 $facedata->{version} == 2 3423 $facedata->{version} == 2
… …
3350 3454
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3458 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3460 }
3357 3461
3358 cf::cede_to_tick; 3462 cf::cede_to_tick;
3359 } 3463 }
3360 } 3464 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3483
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3382 } else { 3486 } else {
3383 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3384 } 3488 }
3385 3489
3386 cf::cede_to_tick; 3490 cf::cede_to_tick;
3387 } 3491 }
3388 } 3492 }
3389 3493
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3495
3392 1 3496 1
3393} 3497}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3498
3415register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3417 3501
3418 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3541sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3460} 3544}
3461 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3462sub reload_resources { 3569sub reload_resources {
3463 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3464 3571
3572 reload_exp_table;
3573 reload_materials;
3465 reload_facedata; 3574 reload_facedata;
3575 reload_sound;
3466 reload_archetypes; 3576 reload_archetypes;
3467 reload_regions; 3577 reload_regions;
3468 reload_treasures; 3578 reload_treasures;
3469 3579
3470 warn "finished reloading resource files\n"; 3580 trace "finished reloading resource files\n";
3471} 3581}
3472 3582
3473sub reload_config { 3583sub reload_config {
3474 warn "reloading config file...\n"; 3584 trace "reloading config file...\n";
3475 3585
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3586 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3587 or die "$CONFDIR/config: $!";
3478 3588
3479 local $/; 3589 utf8::decode $config;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3590 *CFG = yaml_load $config;
3481 3591
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3592 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3593
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3594 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3595 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3596
3487 if (exists $CFG{mlockall}) { 3597 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3599 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3600 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3601 };
3492 warn $@ if $@; 3602 warn $@ if $@;
3493 } 3603 }
3494
3495 warn "finished reloading resource files\n";
3496} 3604}
3497 3605
3498sub pidfile() { 3606sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3514 print $fh $$; 3622 print $fh $$;
3515} 3623}
3516 3624
3517sub main_loop { 3625sub main_loop {
3518 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3519 if (1) { 3627 if (1) {
3520 EV::loop; 3628 EV::loop;
3521 } 3629 }
3522 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3524} 3632}
3525 3633
3526sub main { 3634sub main {
3527 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3528 3636
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538 3641
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3643
3541 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
… …
3548 }; 3651 };
3549 3652
3550 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3551 3654
3552 cf::sync_job { 3655 cf::sync_job {
3656 cf::incloader::init ();
3657
3658 cf::init_anim;
3659 cf::init_attackmess;
3660 cf::init_dynamic;
3661
3553 cf::load_settings; 3662 cf::load_settings;
3554 cf::load_materials;
3555 3663
3556 reload_resources; 3664 reload_resources;
3557 reload_config; 3665 reload_config;
3558 db_init; 3666 db_init;
3559 3667
… …
3571 3679
3572 # no (long-running) fork's whatsoever before this point(!) 3680 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3681 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3683
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3684 cf::_post_init 0;
3577 }; 3685 };
3578 3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3579 main_loop; 3695 goto &main_loop;
3580} 3696}
3581 3697
3582############################################################################# 3698#############################################################################
3583# initialisation and cleanup 3699# initialisation and cleanup
3584 3700
… …
3623 or return; 3739 or return;
3624 3740
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3742 and return;
3627 3743
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3745
3630 1 3746 1
3631} 3747}
3632 3748
3633our $uuid_lock; 3749our $uuid_lock;
… …
3645 or return; 3761 or return;
3646 3762
3647 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3648 3764
3649 unless ($value) { 3765 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3767 return;
3652 } 3768 }
3653 3769
3654 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3771 $uuid_skip = 0;
… …
3665 or return; 3781 or return;
3666 3782
3667 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3668 and return; 3784 and return;
3669 3785
3670 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3671 3787
3672 1 3788 1
3673 3789
3674} 3790}
3675 3791
… …
3681} 3797}
3682 3798
3683sub emergency_save() { 3799sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3685 3801
3686 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3687 3808
3688 cf::sync_job { 3809 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3811
3694 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3818 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3820 $pl->save;
3703 } 3821 }
3704 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3705 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3706 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3829 $map->valid or next;
3710 $map->save; 3830 $map->save;
3711 } 3831 }
3712 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3713 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3717 3839
3718 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3841 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3862 };
3722 3863
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3729} 3865}
3730 3866
3731sub post_cleanup { 3867sub post_cleanup {
3732 my ($make_core) = @_; 3868 my ($make_core) = @_;
3733 3869
3870 IO::AIO::flush;
3871
3734 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3873 if $make_core;
3736 3874
3737 my $fh = pidfile; 3875 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3739} 3877}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3901 }
3764 warn "cleared package $pkg\n";#d#
3765} 3902}
3766 3903
3767sub do_reload_perl() { 3904sub do_reload_perl() {
3768 # can/must only be called in main 3905 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3906 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3771 return; 3908 return;
3772 } 3909 }
3773 3910
3774 return if $RELOAD++; 3911 return if $RELOAD++;
3775 3912
3776 my $t1 = AE::time; 3913 my $t1 = AE::time;
3777 3914
3778 while ($RELOAD) { 3915 while ($RELOAD) {
3779 warn "reloading..."; 3916 cf::get_slot 0.1, -1, "reload_perl";
3917 info "perl_reload: reloading...";
3780 3918
3781 warn "entering sync_job"; 3919 trace "perl_reload: entering sync_job";
3782 3920
3783 cf::sync_job { 3921 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3922 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3923
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 3924 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3925 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3926 %EXT_CORO = ();
3801 3927
3802 warn "removing commands"; 3928 trace "perl_reload: removing commands";
3803 %COMMAND = (); 3929 %COMMAND = ();
3804 3930
3805 warn "removing ext/exti commands"; 3931 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 3932 %EXTCMD = ();
3807 %EXTICMD = (); 3933 %EXTICMD = ();
3808 3934
3809 warn "unloading/nuking all extensions"; 3935 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3936 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3937 trace "... unloading $pkg";
3812 3938
3813 if (my $cb = $pkg->can ("unload")) { 3939 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3940 eval {
3815 $cb->($pkg); 3941 $cb->($pkg);
3816 1 3942 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3943 } or error "$pkg unloaded, but with errors: $@";
3818 } 3944 }
3819 3945
3820 warn "... clearing $pkg"; 3946 trace "... clearing $pkg";
3821 clear_package $pkg; 3947 clear_package $pkg;
3822 } 3948 }
3823 3949
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3950 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3951 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3952 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3953
3828 warn "... unloading $k"; 3954 trace "... unloading $k";
3829 delete $INC{$k}; 3955 delete $INC{$k};
3830 3956
3831 $k =~ s/\.pm$//; 3957 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3958 $k =~ s/\//::/g;
3833 3959
… …
3836 } 3962 }
3837 3963
3838 clear_package $k; 3964 clear_package $k;
3839 } 3965 }
3840 3966
3841 warn "getting rid of safe::, as good as possible"; 3967 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3968 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3969 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3970
3845 warn "unloading cf.pm \"a bit\""; 3971 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3972 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3973 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3974
3849 # don't, removes xs symbols, too, 3975 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3976 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3977 #clear_package __PACKAGE__;
3852 3978
3853 warn "unload completed, starting to reload now"; 3979 info "perl_reload: unload completed, starting to reload now";
3854 3980
3855 warn "reloading cf.pm"; 3981 trace "perl_reload: reloading cf.pm";
3856 require cf; 3982 require cf;
3857 cf::_connect_to_perl_1; 3983 cf::_connect_to_perl_1;
3858 3984
3859 warn "loading config and database again"; 3985 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 3986 cf::reload_config;
3861 3987
3862 warn "loading extensions"; 3988 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 3989 cf::load_extensions;
3864 3990
3865 if ($REATTACH_ON_RELOAD) { 3991 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3992 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3993 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3994 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3995 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3996 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3997 reattach $_ for values %PLAYER;
3872 } 3998 }
3873 3999
3874 warn "running post_init jobs"; 4000 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4001
3877 warn "leaving sync_job"; 4002 trace "perl_reload: leaving sync_job";
3878 4003
3879 1 4004 1
3880 } or do { 4005 } or do {
3881 warn $@; 4006 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4008 };
3884 4009
3885 warn "reloaded";
3886 --$RELOAD; 4010 --$RELOAD;
3887 } 4011 }
3888 4012
3889 $t1 = AE::time - $t1; 4013 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4014 info "perl_reload: completed in ${t1}s\n";
3891}; 4015};
3892 4016
3893our $RELOAD_WATCHER; # used only during reload 4017our $RELOAD_WATCHER; # used only during reload
3894 4018
3895sub reload_perl() { 4019sub reload_perl() {
… …
3916 reload_perl; 4040 reload_perl;
3917 }; 4041 };
3918 } 4042 }
3919}; 4043};
3920 4044
3921unshift @INC, $LIBDIR; 4045#############################################################################
3922 4046
3923my $bug_warning = 0; 4047my $bug_warning = 0;
3924 4048
3925our @WAIT_FOR_TICK; 4049our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4050our @WAIT_FOR_TICK_BEGIN;
3927 4051
3928sub wait_for_tick { 4052sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4053 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4054
3931 my $signal = new Coro::Signal; 4055 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4056 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4057 $signal->wait;
3934} 4058}
3935 4059
3936sub wait_for_tick_begin { 4060sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4061 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4062
3939 my $signal = new Coro::Signal; 4063 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4064 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4065 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4079 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4080 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4081 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4082 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4083 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4084 or error "ERROR: unable to write runtime file: $!";
3961 }; 4085 };
3962 } 4086 }
3963 4087
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4088 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4089 $sig->send;
… …
3973 4097
3974 if (0) { 4098 if (0) {
3975 if ($NEXT_TICK) { 4099 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4100 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4101 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4102 debug "jitter $JITTER\n";#d#
3979 } 4103 }
3980 } 4104 }
3981} 4105}
3982 4106
3983{ 4107{
… …
4028 IO::AIO::min_parallel 8; 4152 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4153 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4154 undef $AnyEvent::AIO::WATCHER;
4031} 4155}
4032 4156
4033my $_log_backtrace; 4157our $_log_backtrace;
4158our $_log_backtrace_last;
4034 4159
4035sub _log_backtrace { 4160sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4161 my ($msg, @addr) = @_;
4037 4162
4038 $msg =~ s/\n//; 4163 $msg =~ s/\n$//;
4039 4164
4165 if ($_log_backtrace_last eq $msg) {
4166 LOG llevInfo, "[ABT] $msg\n";
4167 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4168 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4169 } elsif ($_log_backtrace < 2) {
4170 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4171 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4172 my $perl_bt = Carp::longmess $msg;
4044 async { 4173 async {
4045 $Coro::current->{desc} = "abt $msg"; 4174 $Coro::current->{desc} = "abt $msg";
4046 4175
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4195 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4196 --$_log_backtrace;
4068 }; 4197 };
4069 } else { 4198 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4199 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4200 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4201 }
4073} 4202}
4074 4203
4075# load additional modules 4204# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4205require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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