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.555 by root, Wed Jun 30 01:32:56 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, $rmp->{total_map_hp},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom} 1869 (cf::region::find $rmp->{region})
1800 ) 1870 )
1801} 1871}
1802 1872
1803=item cf::map->register ($regex, $prio) 1873=item cf::map->register ($regex, $prio)
1804 1874
… …
1810 1880
1811sub register { 1881sub register {
1812 my (undef, $regex, $prio) = @_; 1882 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1883 my $pkg = caller;
1814 1884
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1885 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1886
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1887 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 1888}
1820 1889
1821# also paths starting with '/' 1890# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1891$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 1892
1824sub thawer_merge { 1893sub thawer_merge {
1825 my ($self, $merge) = @_; 1894 my ($self, $merge) = @_;
1826 1895
1827 # we have to keep some variables in memory intact 1896 # we have to keep some variables in memory intact
… …
1832} 1901}
1833 1902
1834sub normalise { 1903sub normalise {
1835 my ($path, $base) = @_; 1904 my ($path, $base) = @_;
1836 1905
1837 $path = "$path"; # make sure its a string 1906 $path = "$path"; # make sure it's a string
1838 1907
1839 $path =~ s/\.map$//; 1908 $path =~ s/\.map$//;
1840 1909
1841 # map plan: 1910 # map plan:
1842 # 1911 #
… …
1857 $base =~ s{[^/]+/?$}{}; 1926 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 1927 $path = "$base/$path";
1859 } 1928 }
1860 1929
1861 for ($path) { 1930 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 1931 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 1932 redo if s{/[^/]+/\.\./}{/};
1865 } 1933 }
1866 1934
1867 $path 1935 $path
… …
1881 $self->init; # pass $1 etc. 1949 $self->init; # pass $1 etc.
1882 return $self; 1950 return $self;
1883 } 1951 }
1884 } 1952 }
1885 1953
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1954 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 1955 ()
1888} 1956}
1889 1957
1890sub init { 1958sub init {
1891 my ($self) = @_; 1959 my ($self) = @_;
… …
2013} 2081}
2014 2082
2015sub find; 2083sub find;
2016sub find { 2084sub find {
2017 my ($path, $origin) = @_; 2085 my ($path, $origin) = @_;
2086
2087 cf::cede_to_tick;
2018 2088
2019 $path = normalise $path, $origin && $origin->path; 2089 $path = normalise $path, $origin && $origin->path;
2020 2090
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2091 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2092 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2107 2177
2108 $self->in_memory (cf::MAP_ACTIVE); 2178 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2179 }
2110 2180
2111 $self->post_load; 2181 $self->post_load;
2182
2183 1
2112} 2184}
2113 2185
2114# customize the map for a given player, i.e. 2186# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2187# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2188# maps to change the path to ~playername/mappath
… …
2137 or next; 2209 or next;
2138 $neigh = find $neigh, $map 2210 $neigh = find $neigh, $map
2139 or next; 2211 or next;
2140 $neigh->load; 2212 $neigh->load;
2141 2213
2214 # now find the diagonal neighbours
2142 push @neigh, 2215 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2216 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2217 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 } 2218 }
2146 2219
… …
2153} 2226}
2154 2227
2155sub find_sync { 2228sub find_sync {
2156 my ($path, $origin) = @_; 2229 my ($path, $origin) = @_;
2157 2230
2158 cf::sync_job { find $path, $origin } 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2232 if $Coro::current == $Coro::main;
2233
2234 find $path, $origin
2159} 2235}
2160 2236
2161sub do_load_sync { 2237sub do_load_sync {
2162 my ($map) = @_; 2238 my ($map) = @_;
2163 2239
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2241 if $Coro::current == $Coro::main;
2166 2242
2167 cf::sync_job { $map->load }; 2243 $map->load;
2168} 2244}
2169 2245
2170our %MAP_PREFETCH; 2246our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2247our $MAP_PREFETCHER = undef;
2172 2248
… …
2198 $MAP_PREFETCHER->prio (6); 2274 $MAP_PREFETCHER->prio (6);
2199 2275
2200 () 2276 ()
2201} 2277}
2202 2278
2279# common code, used by both ->save and ->swapout
2203sub save { 2280sub _save {
2204 my ($self) = @_; 2281 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2282
2208 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2209 2284
2210 return unless $self->dirty; 2285 return unless $self->dirty;
2211 2286
… …
2231 } else { 2306 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2307 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2308 }
2234} 2309}
2235 2310
2311sub save {
2312 my ($self) = @_;
2313
2314 my $lock = cf::lock_acquire "map_data:$self->{path}";
2315
2316 $self->_save;
2317}
2318
2236sub swap_out { 2319sub swap_out {
2237 my ($self) = @_; 2320 my ($self) = @_;
2238 2321
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2323
2244 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2324 return if $self->in_memory != cf::MAP_ACTIVE;
2246 return if $self->{deny_save}; 2325 return if $self->{deny_save};
2326 return if $self->players;
2247 2327
2328 # first deactivate the map and "unlink" it from the core
2329 $self->deactivate;
2330 $_->clear_links_to ($self) for values %cf::MAP;
2248 $self->in_memory (cf::MAP_SWAPPED); 2331 $self->in_memory (cf::MAP_SWAPPED);
2332
2333 # then atomically save
2334 $self->_save;
2335
2336 # then free the map
2337 $self->clear;
2338}
2339
2340sub reset_at {
2341 my ($self) = @_;
2342
2343 # TODO: safety, remove and allow resettable per-player maps
2344 return 1e99 if $self->{deny_reset};
2345
2346 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2347 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2348
2349 $time + $to
2350}
2351
2352sub should_reset {
2353 my ($self) = @_;
2354
2355 $self->reset_at <= $cf::RUNTIME
2356}
2357
2358sub reset {
2359 my ($self) = @_;
2360
2361 my $lock = cf::lock_acquire "map_data:$self->{path}";
2362
2363 return if $self->players;
2364
2365 cf::trace "resetting map ", $self->path, "\n";
2366
2367 $self->in_memory (cf::MAP_SWAPPED);
2368
2369 # need to save uniques path
2370 unless ($self->{deny_save}) {
2371 my $uniq = $self->uniq_path; utf8::encode $uniq;
2372
2373 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2374 if $uniq;
2375 }
2376
2377 delete $cf::MAP{$self->path};
2249 2378
2250 $self->deactivate; 2379 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2380 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2381 $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 2382
2298 $self->unlink_save; 2383 $self->unlink_save;
2299 $self->destroy; 2384 $self->destroy;
2300} 2385}
2301 2386
… …
2309 2394
2310 delete $cf::MAP{$self->path}; 2395 delete $cf::MAP{$self->path};
2311 2396
2312 $self->unlink_save; 2397 $self->unlink_save;
2313 2398
2314 bless $self, "cf::map"; 2399 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2400 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2401 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2402 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2403 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2404
… …
2549 2634
2550Freezes the player and moves him/her to a special map (C<{link}>). 2635Freezes the player and moves him/her to a special map (C<{link}>).
2551 2636
2552The player should be reasonably safe there for short amounts of time (e.g. 2637The 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, 2638for 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 2639though, as the player cannot control the character while it is on the link
2555map. 2640map.
2556 2641
2557Will never block. 2642Will never block.
2558 2643
2559=item $player_object->leave_link ($map, $x, $y) 2644=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2665sub cf::object::player::enter_link {
2581 my ($self) = @_; 2666 my ($self) = @_;
2582 2667
2583 $self->deactivate_recursive; 2668 $self->deactivate_recursive;
2584 2669
2670 ++$self->{_link_recursion};
2671
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2672 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2673
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2674 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2675 if $self->map && $self->map->{path} ne "{link}";
2589 2676
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2677 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2678}
2592 2679
2593sub cf::object::player::leave_link { 2680sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2681 my ($self, $map, $x, $y) = @_;
2595 2682
… …
2620 $map->load_neighbours; 2707 $map->load_neighbours;
2621 2708
2622 return unless $self->contr->active; 2709 return unless $self->contr->active;
2623 2710
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2711 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2712 if ($self->enter_map ($map, $x, $y)) {
2626 2713 # entering was successful
2714 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2715 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2716 $self->activate_recursive;
2629} 2717 }
2630 2718
2719}
2720
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2721=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2722
2633Moves the player to the given map-path and coordinates by first freezing 2723Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2724her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2725that 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 2726the new (success) or old (failed) map position. In either case, $done will
… …
2643 2733
2644our $GOTOGEN; 2734our $GOTOGEN;
2645 2735
2646sub cf::object::player::goto { 2736sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2737 my ($self, $path, $x, $y, $check, $done) = @_;
2738
2739 if ($self->{_link_recursion} >= $MAX_LINKS) {
2740 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2741 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2742 ($path, $x, $y) = @$EMERGENCY_POSITION;
2743 }
2648 2744
2649 # do generation counting so two concurrent goto's will be executed in-order 2745 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2746 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2747
2652 $self->enter_link; 2748 $self->enter_link;
… …
2676 my $map = eval { 2772 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2773 my $map = defined $path ? cf::map::find $path : undef;
2678 2774
2679 if ($map) { 2775 if ($map) {
2680 $map = $map->customise_for ($self); 2776 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2777 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2778 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2779 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2780 }
2685 2781
2686 $map 2782 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2790 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2791 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2792 $self->leave_link ($map, $x, $y);
2697 } 2793 }
2698 2794
2699 $done->() if $done; 2795 $done->($self) if $done;
2700 })->prio (1); 2796 })->prio (1);
2701} 2797}
2702 2798
2703=item $player_object->enter_exit ($exit_object) 2799=item $player_object->enter_exit ($exit_object)
2704 2800
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 2893 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 2894 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 2895 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 2896 cf::NDI_UNIQUE | cf::NDI_RED);
2801 2897
2802 warn "ERROR in enter_exit: $@"; 2898 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 2899 $self->leave_link;
2804 } 2900 }
2805 })->prio (1); 2901 })->prio (1);
2806} 2902}
2807 2903
… …
3120 3216
3121 $ns->ext_reply ($reply, @reply) 3217 $ns->ext_reply ($reply, @reply)
3122 if $reply; 3218 if $reply;
3123 3219
3124 } else { 3220 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3221 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3222 }
3127 3223
3128 cf::override; 3224 cf::override;
3129 }, 3225 },
3130); 3226);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3307 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3308 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3309 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3310 ["cf::map" => qw(trigger)],
3215) { 3311) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3312 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3313 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3314 for @funs;
3220} 3315}
3221 3316
… …
3260 local @cf::_safe_eval_args = values %vars; 3355 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3356 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3357 }
3263 3358
3264 if ($@) { 3359 if ($@) {
3265 warn "$@"; 3360 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3361 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3362 "with arguments " . (join " ", %vars) . "\n";
3268 } 3363 }
3269 3364
3270 wantarray ? @res : $res[0] 3365 wantarray ? @res : $res[0]
3271} 3366}
3272 3367
… …
3306 # for this (global event?) 3401 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3402 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3403
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3404 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3405
3311 warn "loading facedata from $path\n"; 3406 trace "loading facedata from $path\n";
3312 3407
3313 my $facedata;
3314 0 < aio_load $path, $facedata 3408 0 < aio_load $path, my $facedata
3315 or die "$path: $!"; 3409 or die "$path: $!";
3316 3410
3317 $facedata = Coro::Storable::thaw $facedata; 3411 $facedata = Coro::Storable::thaw $facedata;
3318 3412
3319 $facedata->{version} == 2 3413 $facedata->{version} == 2
… …
3350 3444
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3445 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3446 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3447 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3448 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3449 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3450 }
3357 3451
3358 cf::cede_to_tick; 3452 cf::cede_to_tick;
3359 } 3453 }
3360 } 3454 }
… …
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3472 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3473
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3474 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3475 cf::face::set_type $idx, $info->{type};
3382 } else { 3476 } else {
3383 $RESOURCE{$name} = $info; 3477 $RESOURCE{$name} = $info; # unused
3384 } 3478 }
3385 3479
3386 cf::cede_to_tick; 3480 cf::cede_to_tick;
3387 } 3481 }
3388 } 3482 }
3389 3483
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3484 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3485
3392 1 3486 1
3393} 3487}
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 3488
3415register_exticmd fx_want => sub { 3489register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3490 my ($ns, $want) = @_;
3417 3491
3418 while (my ($k, $v) = each %$want) { 3492 while (my ($k, $v) = each %$want) {
… …
3457sub reload_treasures { 3531sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3532 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3533 or die "unable to load treasurelists\n";
3460} 3534}
3461 3535
3536sub reload_sound {
3537 trace "loading sound config from $DATADIR/sound\n";
3538
3539 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540 or die "$DATADIR/sound $!";
3541
3542 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3543
3544 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545 my $sound = $soundconf->{compat}[$_]
3546 or next;
3547
3548 my $face = cf::face::find "sound/$sound->[1]";
3549 cf::sound::set $sound->[0] => $face;
3550 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3551 }
3552
3553 while (my ($k, $v) = each %{$soundconf->{event}}) {
3554 my $face = cf::face::find "sound/$v";
3555 cf::sound::set $k => $face;
3556 }
3557}
3558
3462sub reload_resources { 3559sub reload_resources {
3463 warn "reloading resource files...\n"; 3560 trace "reloading resource files...\n";
3464 3561
3562 reload_exp_table;
3563 reload_materials;
3465 reload_facedata; 3564 reload_facedata;
3565 reload_sound;
3466 reload_archetypes; 3566 reload_archetypes;
3467 reload_regions; 3567 reload_regions;
3468 reload_treasures; 3568 reload_treasures;
3469 3569
3470 warn "finished reloading resource files\n"; 3570 trace "finished reloading resource files\n";
3471} 3571}
3472 3572
3473sub reload_config { 3573sub reload_config {
3474 warn "reloading config file...\n"; 3574 trace "reloading config file...\n";
3475 3575
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3576 0 < aio_load "$CONFDIR/config", my $config
3477 or return; 3577 or die "$CONFDIR/config: $!";
3478 3578
3479 local $/; 3579 utf8::decode $config;
3480 *CFG = YAML::XS::Load scalar <$fh>; 3580 *CFG = yaml_load $config;
3481 3581
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3583
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3584 $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}; 3585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3586
3487 if (exists $CFG{mlockall}) { 3587 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3589 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3590 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3591 };
3492 warn $@ if $@; 3592 warn $@ if $@;
3493 } 3593 }
3494
3495 warn "finished reloading resource files\n";
3496} 3594}
3497 3595
3498sub pidfile() { 3596sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3597 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3598 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3611 seek $fh, 0, 0;
3514 print $fh $$; 3612 print $fh $$;
3515} 3613}
3516 3614
3517sub main_loop { 3615sub main_loop {
3518 warn "EV::loop starting\n"; 3616 trace "EV::loop starting\n";
3519 if (1) { 3617 if (1) {
3520 EV::loop; 3618 EV::loop;
3521 } 3619 }
3522 warn "EV::loop returned\n"; 3620 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3621 goto &main_loop unless $REALLY_UNLOOP;
3524} 3622}
3525 3623
3526sub main { 3624sub main {
3527 cf::init_globals; # initialise logging 3625 cf::init_globals; # initialise logging
3528 3626
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3627 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3628 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3629 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3630 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 3631
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3632 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3633
3541 # we must not ever block the main coroutine 3634 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3635 local $Coro::idle = sub {
… …
3548 }; 3641 };
3549 3642
3550 evthread_start IO::AIO::poll_fileno; 3643 evthread_start IO::AIO::poll_fileno;
3551 3644
3552 cf::sync_job { 3645 cf::sync_job {
3646 cf::incloader::init ();
3647
3648 cf::init_anim;
3649 cf::init_attackmess;
3650 cf::init_dynamic;
3651
3553 cf::load_settings; 3652 cf::load_settings;
3554 cf::load_materials;
3555 3653
3556 reload_resources; 3654 reload_resources;
3557 reload_config; 3655 reload_config;
3558 db_init; 3656 db_init;
3559 3657
… …
3571 3669
3572 # no (long-running) fork's whatsoever before this point(!) 3670 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3671 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3672 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3673
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3674 cf::_post_init 0;
3577 }; 3675 };
3578 3676
3677 cf::object::thawer::errors_are_fatal 0;
3678 info "parse errors in files are no longer fatal from this point on.\n";
3679
3680 my $free_main; $free_main = EV::idle sub {
3681 undef $free_main;
3682 undef &main; # free gobs of memory :)
3683 };
3684
3579 main_loop; 3685 goto &main_loop;
3580} 3686}
3581 3687
3582############################################################################# 3688#############################################################################
3583# initialisation and cleanup 3689# initialisation and cleanup
3584 3690
… …
3623 or return; 3729 or return;
3624 3730
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3731 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3732 and return;
3627 3733
3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3734 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3735
3630 1 3736 1
3631} 3737}
3632 3738
3633our $uuid_lock; 3739our $uuid_lock;
… …
3645 or return; 3751 or return;
3646 3752
3647 my $value = uuid_seq uuid_cur; 3753 my $value = uuid_seq uuid_cur;
3648 3754
3649 unless ($value) { 3755 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3756 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3757 return;
3652 } 3758 }
3653 3759
3654 my $value = uuid_str $value + $uuid_skip; 3760 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3761 $uuid_skip = 0;
… …
3665 or return; 3771 or return;
3666 3772
3667 aio_rename "$uuid~", $uuid 3773 aio_rename "$uuid~", $uuid
3668 and return; 3774 and return;
3669 3775
3670 warn "uuid file written ($value).\n"; 3776 trace "uuid file written ($value).\n";
3671 3777
3672 1 3778 1
3673 3779
3674} 3780}
3675 3781
… …
3681} 3787}
3682 3788
3683sub emergency_save() { 3789sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3790 my $freeze_guard = cf::freeze_mainloop;
3685 3791
3686 warn "emergency_perl_save: enter\n"; 3792 info "emergency_perl_save: enter\n";
3793
3794 # this is a trade-off: we want to be very quick here, so
3795 # save all maps without fsync, and later call a global sync
3796 # (which in turn might be very very slow)
3797 local $USE_FSYNC = 0;
3687 3798
3688 cf::sync_job { 3799 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3800 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 3801
3694 # use a peculiar iteration method to avoid tripping on perl 3802 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3803 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3804 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3805 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3806 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3807 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3808 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3809 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3810 $pl->save;
3703 } 3811 }
3704 warn "emergency_perl_save: end player save\n"; 3812 info "emergency_perl_save: end player save\n";
3705 3813
3814 cf::write_runtime_sync; # external watchdog should not bark
3815
3706 warn "emergency_perl_save: begin map save\n"; 3816 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 3817 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 3818 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 3819 $map->valid or next;
3710 $map->save; 3820 $map->save;
3711 } 3821 }
3712 warn "emergency_perl_save: end map save\n"; 3822 info "emergency_perl_save: end map save\n";
3713 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3714 warn "emergency_perl_save: begin database checkpoint\n"; 3826 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 3827 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 3828 info "emergency_perl_save: end database checkpoint\n";
3717 3829
3718 warn "emergency_perl_save: begin write uuid\n"; 3830 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 3831 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 3832 info "emergency_perl_save: end write uuid\n";
3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3836 trace "emergency_perl_save: syncing database to disk";
3837 BDB::db_env_txn_checkpoint $DB_ENV;
3838
3839 info "emergency_perl_save: starting sync\n";
3840 IO::AIO::aio_sync sub {
3841 info "emergency_perl_save: finished sync\n";
3842 };
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 3852 };
3722 3853
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"; 3854 info "emergency_perl_save: leave\n";
3729} 3855}
3730 3856
3731sub post_cleanup { 3857sub post_cleanup {
3732 my ($make_core) = @_; 3858 my ($make_core) = @_;
3733 3859
3860 IO::AIO::flush;
3861
3734 warn Carp::longmess "post_cleanup backtrace" 3862 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 3863 if $make_core;
3736 3864
3737 my $fh = pidfile; 3865 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 3866 unlink $PIDFILE if <$fh> == $$;
3739} 3867}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3887 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 3888 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 3889 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3890# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 3891 }
3764 warn "cleared package $pkg\n";#d#
3765} 3892}
3766 3893
3767sub do_reload_perl() { 3894sub do_reload_perl() {
3768 # can/must only be called in main 3895 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 3896 unless (in_main) {
3770 warn "can only reload from main coroutine"; 3897 error "can only reload from main coroutine";
3771 return; 3898 return;
3772 } 3899 }
3773 3900
3774 return if $RELOAD++; 3901 return if $RELOAD++;
3775 3902
3776 my $t1 = AE::time; 3903 my $t1 = AE::time;
3777 3904
3778 while ($RELOAD) { 3905 while ($RELOAD) {
3779 warn "reloading..."; 3906 cf::get_slot 0.1, -1, "reload_perl";
3907 info "perl_reload: reloading...";
3780 3908
3781 warn "entering sync_job"; 3909 trace "perl_reload: entering sync_job";
3782 3910
3783 cf::sync_job { 3911 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 3912 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 3913
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"; 3914 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 3915 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 3916 %EXT_CORO = ();
3801 3917
3802 warn "removing commands"; 3918 trace "perl_reload: removing commands";
3803 %COMMAND = (); 3919 %COMMAND = ();
3804 3920
3805 warn "removing ext/exti commands"; 3921 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 3922 %EXTCMD = ();
3807 %EXTICMD = (); 3923 %EXTICMD = ();
3808 3924
3809 warn "unloading/nuking all extensions"; 3925 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 3926 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 3927 trace "... unloading $pkg";
3812 3928
3813 if (my $cb = $pkg->can ("unload")) { 3929 if (my $cb = $pkg->can ("unload")) {
3814 eval { 3930 eval {
3815 $cb->($pkg); 3931 $cb->($pkg);
3816 1 3932 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 3933 } or error "$pkg unloaded, but with errors: $@";
3818 } 3934 }
3819 3935
3820 warn "... clearing $pkg"; 3936 trace "... clearing $pkg";
3821 clear_package $pkg; 3937 clear_package $pkg;
3822 } 3938 }
3823 3939
3824 warn "unloading all perl modules loaded from $LIBDIR"; 3940 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 3941 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 3943
3828 warn "... unloading $k"; 3944 trace "... unloading $k";
3829 delete $INC{$k}; 3945 delete $INC{$k};
3830 3946
3831 $k =~ s/\.pm$//; 3947 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 3948 $k =~ s/\//::/g;
3833 3949
… …
3836 } 3952 }
3837 3953
3838 clear_package $k; 3954 clear_package $k;
3839 } 3955 }
3840 3956
3841 warn "getting rid of safe::, as good as possible"; 3957 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 3958 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3959 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 3960
3845 warn "unloading cf.pm \"a bit\""; 3961 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 3962 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3963 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 3964
3849 # don't, removes xs symbols, too, 3965 # don't, removes xs symbols, too,
3850 # and global variables created in xs 3966 # and global variables created in xs
3851 #clear_package __PACKAGE__; 3967 #clear_package __PACKAGE__;
3852 3968
3853 warn "unload completed, starting to reload now"; 3969 info "perl_reload: unload completed, starting to reload now";
3854 3970
3855 warn "reloading cf.pm"; 3971 trace "perl_reload: reloading cf.pm";
3856 require cf; 3972 require cf;
3857 cf::_connect_to_perl_1; 3973 cf::_connect_to_perl_1;
3858 3974
3859 warn "loading config and database again"; 3975 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 3976 cf::reload_config;
3861 3977
3862 warn "loading extensions"; 3978 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 3979 cf::load_extensions;
3864 3980
3865 if ($REATTACH_ON_RELOAD) { 3981 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 3982 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 3983 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 3984 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 3985 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 3986 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 3987 reattach $_ for values %PLAYER;
3872 } 3988 }
3873 3989
3874 warn "running post_init jobs"; 3990 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 3991
3877 warn "leaving sync_job"; 3992 trace "perl_reload: leaving sync_job";
3878 3993
3879 1 3994 1
3880 } or do { 3995 } or do {
3881 warn $@; 3996 error $@;
3882 cf::cleanup "error while reloading, exiting."; 3997 cf::cleanup "perl_reload: error, exiting.";
3883 }; 3998 };
3884 3999
3885 warn "reloaded";
3886 --$RELOAD; 4000 --$RELOAD;
3887 } 4001 }
3888 4002
3889 $t1 = AE::time - $t1; 4003 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4004 info "perl_reload: completed in ${t1}s\n";
3891}; 4005};
3892 4006
3893our $RELOAD_WATCHER; # used only during reload 4007our $RELOAD_WATCHER; # used only during reload
3894 4008
3895sub reload_perl() { 4009sub reload_perl() {
… …
3916 reload_perl; 4030 reload_perl;
3917 }; 4031 };
3918 } 4032 }
3919}; 4033};
3920 4034
3921unshift @INC, $LIBDIR; 4035#############################################################################
3922 4036
3923my $bug_warning = 0; 4037my $bug_warning = 0;
3924 4038
3925our @WAIT_FOR_TICK; 4039our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN; 4040our @WAIT_FOR_TICK_BEGIN;
3927 4041
3928sub wait_for_tick { 4042sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4043 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3930 4044
3931 my $signal = new Coro::Signal; 4045 my $signal = new Coro::Signal;
3932 push @WAIT_FOR_TICK, $signal; 4046 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait; 4047 $signal->wait;
3934} 4048}
3935 4049
3936sub wait_for_tick_begin { 4050sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4051 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3938 4052
3939 my $signal = new Coro::Signal; 4053 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4054 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4055 $signal->wait;
… …
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4069 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4070 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4071 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4072 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4073 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4074 or error "ERROR: unable to write runtime file: $!";
3961 }; 4075 };
3962 } 4076 }
3963 4077
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4078 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4079 $sig->send;
… …
3973 4087
3974 if (0) { 4088 if (0) {
3975 if ($NEXT_TICK) { 4089 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4090 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4091 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4092 debug "jitter $JITTER\n";#d#
3979 } 4093 }
3980 } 4094 }
3981} 4095}
3982 4096
3983{ 4097{
… …
4028 IO::AIO::min_parallel 8; 4142 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4143 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4144 undef $AnyEvent::AIO::WATCHER;
4031} 4145}
4032 4146
4033my $_log_backtrace; 4147our $_log_backtrace;
4148our $_log_backtrace_last;
4034 4149
4035sub _log_backtrace { 4150sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4151 my ($msg, @addr) = @_;
4037 4152
4038 $msg =~ s/\n//; 4153 $msg =~ s/\n$//;
4039 4154
4155 if ($_log_backtrace_last eq $msg) {
4156 LOG llevInfo, "[ABT] $msg\n";
4157 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4158 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4159 } elsif ($_log_backtrace < 2) {
4160 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4161 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4162 my $perl_bt = Carp::longmess $msg;
4044 async { 4163 async {
4045 $Coro::current->{desc} = "abt $msg"; 4164 $Coro::current->{desc} = "abt $msg";
4046 4165
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4185 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4186 --$_log_backtrace;
4068 }; 4187 };
4069 } else { 4188 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4189 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4190 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4191 }
4073} 4192}
4074 4193
4075# load additional modules 4194# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4195require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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