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.510 by root, Tue Apr 6 22:59:28 2010 UTC vs.
Revision 1.556 by root, Sat Jul 3 01:49: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 = EV::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) {
… …
530 } else { 580 } else {
531 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
532 } 582 }
533 } 583 }
534 584
535 my $time = EV::time - $time; 585 my $time = AE::time - $time;
536 586
537 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
538 588
539 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
540 } else { 590 } else {
… …
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) {
… …
1533 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1534 } 1607 }
1535 } 1608 }
1536} 1609}
1537 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1538sub save($) { 1624sub save($) {
1539 my ($pl) = @_; 1625 my ($pl) = @_;
1540 1626
1541 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1542 1628
… …
1547 1633
1548 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1550 1636
1551 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1641
1553 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1643 cf::cede_to_tick;
1555} 1644}
1556 1645
… …
1590 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1591 1680
1592 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1593 $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
1594 1683
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1685 $pl->deactivate;
1686
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1600 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1601 1692
1602 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
… …
1658 \@logins 1749 \@logins
1659} 1750}
1660 1751
1661=item $player->maps 1752=item $player->maps
1662 1753
1754=item cf::player::maps $login
1755
1663Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1664player. May block. 1757player. May block.
1665 1758
1666=cut 1759=cut
1667 1760
… …
1729=cut 1822=cut
1730 1823
1731sub find_by_path($) { 1824sub find_by_path($) {
1732 my ($path) = @_; 1825 my ($path) = @_;
1733 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1734 my ($match, $specificity); 1829 my ($match, $specificity);
1735 1830
1736 for my $region (list) { 1831 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1861sub generate_random_map {
1767 my ($self, $rmp) = @_; 1862 my ($self, $rmp) = @_;
1768 1863
1769 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
1770 1865
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1866 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1867}
1786 1868
1787=item cf::map->register ($regex, $prio) 1869=item cf::map->register ($regex, $prio)
1788 1870
1789Register a handler for the map path matching the given regex at the 1871Register a handler for the map path matching the given regex at the
… …
1794 1876
1795sub register { 1877sub register {
1796 my (undef, $regex, $prio) = @_; 1878 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1879 my $pkg = caller;
1798 1880
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1881 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1882
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1883 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1884}
1804 1885
1805# also paths starting with '/' 1886# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1887$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1888
1808sub thawer_merge { 1889sub thawer_merge {
1809 my ($self, $merge) = @_; 1890 my ($self, $merge) = @_;
1810 1891
1811 # we have to keep some variables in memory intact 1892 # we have to keep some variables in memory intact
… …
1816} 1897}
1817 1898
1818sub normalise { 1899sub normalise {
1819 my ($path, $base) = @_; 1900 my ($path, $base) = @_;
1820 1901
1821 $path = "$path"; # make sure its a string 1902 $path = "$path"; # make sure it's a string
1822 1903
1823 $path =~ s/\.map$//; 1904 $path =~ s/\.map$//;
1824 1905
1825 # map plan: 1906 # map plan:
1826 # 1907 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1922 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1923 $path = "$base/$path";
1843 } 1924 }
1844 1925
1845 for ($path) { 1926 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1927 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1928 redo if s{/[^/]+/\.\./}{/};
1849 } 1929 }
1850 1930
1851 $path 1931 $path
… …
1865 $self->init; # pass $1 etc. 1945 $self->init; # pass $1 etc.
1866 return $self; 1946 return $self;
1867 } 1947 }
1868 } 1948 }
1869 1949
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1950 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1951 ()
1872} 1952}
1873 1953
1874sub init { 1954sub init {
1875 my ($self) = @_; 1955 my ($self) = @_;
… …
1997} 2077}
1998 2078
1999sub find; 2079sub find;
2000sub find { 2080sub find {
2001 my ($path, $origin) = @_; 2081 my ($path, $origin) = @_;
2082
2083 cf::cede_to_tick;
2002 2084
2003 $path = normalise $path, $origin && $origin->path; 2085 $path = normalise $path, $origin && $origin->path;
2004 2086
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2087 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2088 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2091 2173
2092 $self->in_memory (cf::MAP_ACTIVE); 2174 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2175 }
2094 2176
2095 $self->post_load; 2177 $self->post_load;
2178
2179 1
2096} 2180}
2097 2181
2098# customize the map for a given player, i.e. 2182# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2183# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2184# maps to change the path to ~playername/mappath
… …
2121 or next; 2205 or next;
2122 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2123 or next; 2207 or next;
2124 $neigh->load; 2208 $neigh->load;
2125 2209
2210 # now find the diagonal neighbours
2126 push @neigh, 2211 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 } 2214 }
2130 2215
… …
2137} 2222}
2138 2223
2139sub find_sync { 2224sub find_sync {
2140 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2141 2226
2142 cf::sync_job { find $path, $origin } 2227 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228 if $Coro::current == $Coro::main;
2229
2230 find $path, $origin
2143} 2231}
2144 2232
2145sub do_load_sync { 2233sub do_load_sync {
2146 my ($map) = @_; 2234 my ($map) = @_;
2147 2235
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2150 2238
2151 cf::sync_job { $map->load }; 2239 $map->load;
2152} 2240}
2153 2241
2154our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2156 2244
… …
2182 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2183 2271
2184 () 2272 ()
2185} 2273}
2186 2274
2275# common code, used by both ->save and ->swapout
2187sub save { 2276sub _save {
2188 my ($self) = @_; 2277 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2278
2192 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2193 2280
2194 return unless $self->dirty; 2281 return unless $self->dirty;
2195 2282
… …
2215 } else { 2302 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2303 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2304 }
2218} 2305}
2219 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2220sub swap_out { 2315sub swap_out {
2221 my ($self) = @_; 2316 my ($self) = @_;
2222 2317
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2319
2228 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2230 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2231 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2232 $self->in_memory (cf::MAP_SWAPPED); 2327 $self->in_memory (cf::MAP_SWAPPED);
2328
2329 # then atomically save
2330 $self->_save;
2331
2332 # then free the map
2333 $self->clear;
2334}
2335
2336sub reset_at {
2337 my ($self) = @_;
2338
2339 # TODO: safety, remove and allow resettable per-player maps
2340 return 1e99 if $self->{deny_reset};
2341
2342 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2343 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2344
2345 $time + $to
2346}
2347
2348sub should_reset {
2349 my ($self) = @_;
2350
2351 $self->reset_at <= $cf::RUNTIME
2352}
2353
2354sub reset {
2355 my ($self) = @_;
2356
2357 my $lock = cf::lock_acquire "map_data:$self->{path}";
2358
2359 return if $self->players;
2360
2361 cf::trace "resetting map ", $self->path, "\n";
2362
2363 $self->in_memory (cf::MAP_SWAPPED);
2364
2365 # need to save uniques path
2366 unless ($self->{deny_save}) {
2367 my $uniq = $self->uniq_path; utf8::encode $uniq;
2368
2369 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2370 if $uniq;
2371 }
2372
2373 delete $cf::MAP{$self->path};
2233 2374
2234 $self->deactivate; 2375 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2377 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2378
2282 $self->unlink_save; 2379 $self->unlink_save;
2283 $self->destroy; 2380 $self->destroy;
2284} 2381}
2285 2382
… …
2293 2390
2294 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2295 2392
2296 $self->unlink_save; 2393 $self->unlink_save;
2297 2394
2298 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2400
… …
2533 2630
2534Freezes the player and moves him/her to a special map (C<{link}>). 2631Freezes the player and moves him/her to a special map (C<{link}>).
2535 2632
2536The player should be reasonably safe there for short amounts of time (e.g. 2633The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2634for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2635though, as the player cannot control the character while it is on the link
2539map. 2636map.
2540 2637
2541Will never block. 2638Will never block.
2542 2639
2543=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2565 my ($self) = @_; 2662 my ($self) = @_;
2566 2663
2567 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2568 2665
2666 ++$self->{_link_recursion};
2667
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2669
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2573 2672
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2674}
2576 2675
2577sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2579 2678
… …
2604 $map->load_neighbours; 2703 $map->load_neighbours;
2605 2704
2606 return unless $self->contr->active; 2705 return unless $self->contr->active;
2607 2706
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2610 2709 # entering was successful
2710 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2712 $self->activate_recursive;
2613} 2713 }
2614 2714
2715}
2716
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2717=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2718
2617Moves the player to the given map-path and coordinates by first freezing 2719Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2721that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2722the new (success) or old (failed) map position. In either case, $done will
… …
2627 2729
2628our $GOTOGEN; 2730our $GOTOGEN;
2629 2731
2630sub cf::object::player::goto { 2732sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2733 my ($self, $path, $x, $y, $check, $done) = @_;
2734
2735 if ($self->{_link_recursion} >= $MAX_LINKS) {
2736 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2737 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2738 ($path, $x, $y) = @$EMERGENCY_POSITION;
2739 }
2632 2740
2633 # do generation counting so two concurrent goto's will be executed in-order 2741 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2743
2636 $self->enter_link; 2744 $self->enter_link;
… …
2660 my $map = eval { 2768 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2662 2770
2663 if ($map) { 2771 if ($map) {
2664 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2774 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2775 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2776 }
2669 2777
2670 $map 2778 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2681 } 2789 }
2682 2790
2683 $done->() if $done; 2791 $done->($self) if $done;
2684 })->prio (1); 2792 })->prio (1);
2685} 2793}
2686 2794
2687=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2688 2796
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 2890 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2785 2893
2786 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 2895 $self->leave_link;
2788 } 2896 }
2789 })->prio (1); 2897 })->prio (1);
2790} 2898}
2791 2899
… …
3104 3212
3105 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3214 if $reply;
3107 3215
3108 } else { 3216 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3217 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3218 }
3111 3219
3112 cf::override; 3220 cf::override;
3113 }, 3221 },
3114); 3222);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3199) { 3307) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3310 for @funs;
3204} 3311}
3205 3312
… …
3244 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3353 }
3247 3354
3248 if ($@) { 3355 if ($@) {
3249 warn "$@"; 3356 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3252 } 3359 }
3253 3360
3254 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3255} 3362}
3256 3363
… …
3290 # for this (global event?) 3397 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3399
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3401
3295 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3296 3403
3297 my $facedata;
3298 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3299 or die "$path: $!"; 3405 or die "$path: $!";
3300 3406
3301 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3302 3408
3303 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3334 3440
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3441 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3442 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3443 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3444 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3445 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3446 }
3341 3447
3342 cf::cede_to_tick; 3448 cf::cede_to_tick;
3343 } 3449 }
3344 } 3450 }
… …
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3468 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3469
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3470 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 cf::face::set_type $idx, $info->{type}; 3471 cf::face::set_type $idx, $info->{type};
3366 } else { 3472 } else {
3367 $RESOURCE{$name} = $info; 3473 $RESOURCE{$name} = $info; # unused
3368 } 3474 }
3369 3475
3370 cf::cede_to_tick; 3476 cf::cede_to_tick;
3371 } 3477 }
3372 } 3478 }
3373 3479
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3480 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3481
3376 1 3482 1
3377} 3483}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3484
3399register_exticmd fx_want => sub { 3485register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3486 my ($ns, $want) = @_;
3401 3487
3402 while (my ($k, $v) = each %$want) { 3488 while (my ($k, $v) = each %$want) {
… …
3441sub reload_treasures { 3527sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3528 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3529 or die "unable to load treasurelists\n";
3444} 3530}
3445 3531
3532sub reload_sound {
3533 trace "loading sound config from $DATADIR/sound\n";
3534
3535 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536 or die "$DATADIR/sound $!";
3537
3538 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3539
3540 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541 my $sound = $soundconf->{compat}[$_]
3542 or next;
3543
3544 my $face = cf::face::find "sound/$sound->[1]";
3545 cf::sound::set $sound->[0] => $face;
3546 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3547 }
3548
3549 while (my ($k, $v) = each %{$soundconf->{event}}) {
3550 my $face = cf::face::find "sound/$v";
3551 cf::sound::set $k => $face;
3552 }
3553}
3554
3446sub reload_resources { 3555sub reload_resources {
3447 warn "reloading resource files...\n"; 3556 trace "reloading resource files...\n";
3448 3557
3558 reload_exp_table;
3559 reload_materials;
3449 reload_facedata; 3560 reload_facedata;
3561 reload_sound;
3450 reload_archetypes; 3562 reload_archetypes;
3451 reload_regions; 3563 reload_regions;
3452 reload_treasures; 3564 reload_treasures;
3453 3565
3454 warn "finished reloading resource files\n"; 3566 trace "finished reloading resource files\n";
3455} 3567}
3456 3568
3457sub reload_config { 3569sub reload_config {
3458 warn "reloading config file...\n"; 3570 trace "reloading config file...\n";
3459 3571
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3572 0 < aio_load "$CONFDIR/config", my $config
3461 or return; 3573 or die "$CONFDIR/config: $!";
3462 3574
3463 local $/; 3575 utf8::decode $config;
3464 *CFG = YAML::XS::Load scalar <$fh>; 3576 *CFG = yaml_load $config;
3465 3577
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3578 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3579
3468 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3580 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3469 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3581 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3470 3582
3471 if (exists $CFG{mlockall}) { 3583 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3585 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3586 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3587 };
3476 warn $@ if $@; 3588 warn $@ if $@;
3477 } 3589 }
3478
3479 warn "finished reloading resource files\n";
3480} 3590}
3481 3591
3482sub pidfile() { 3592sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3593 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3594 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3607 seek $fh, 0, 0;
3498 print $fh $$; 3608 print $fh $$;
3499} 3609}
3500 3610
3501sub main_loop { 3611sub main_loop {
3502 warn "EV::loop starting\n"; 3612 trace "EV::loop starting\n";
3503 if (1) { 3613 if (1) {
3504 EV::loop; 3614 EV::loop;
3505 } 3615 }
3506 warn "EV::loop returned\n"; 3616 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3617 goto &main_loop unless $REALLY_UNLOOP;
3508} 3618}
3509 3619
3510sub main { 3620sub main {
3511 cf::init_globals; # initialise logging 3621 cf::init_globals; # initialise logging
3512 3622
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3623 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3624 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3625 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3626 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522 3627
3523 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3628 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3524 3629
3525 # we must not ever block the main coroutine 3630 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3631 local $Coro::idle = sub {
… …
3532 }; 3637 };
3533 3638
3534 evthread_start IO::AIO::poll_fileno; 3639 evthread_start IO::AIO::poll_fileno;
3535 3640
3536 cf::sync_job { 3641 cf::sync_job {
3642 cf::incloader::init ();
3643
3644 cf::init_anim;
3645 cf::init_attackmess;
3646 cf::init_dynamic;
3647
3537 cf::load_settings; 3648 cf::load_settings;
3538 cf::load_materials;
3539 3649
3540 reload_resources; 3650 reload_resources;
3541 reload_config; 3651 reload_config;
3542 db_init; 3652 db_init;
3543 3653
… …
3555 3665
3556 # no (long-running) fork's whatsoever before this point(!) 3666 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX (); 3667 use POSIX ();
3558 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3668 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3559 3669
3560 (pop @POST_INIT)->(0) while @POST_INIT; 3670 cf::_post_init 0;
3561 }; 3671 };
3562 3672
3673 cf::object::thawer::errors_are_fatal 0;
3674 info "parse errors in files are no longer fatal from this point on.\n";
3675
3676 my $free_main; $free_main = EV::idle sub {
3677 undef $free_main;
3678 undef &main; # free gobs of memory :)
3679 };
3680
3563 main_loop; 3681 goto &main_loop;
3564} 3682}
3565 3683
3566############################################################################# 3684#############################################################################
3567# initialisation and cleanup 3685# initialisation and cleanup
3568 3686
3569# install some emergency cleanup handlers 3687# install some emergency cleanup handlers
3570BEGIN { 3688BEGIN {
3571 our %SIGWATCHER = (); 3689 our %SIGWATCHER = ();
3572 for my $signal (qw(INT HUP TERM)) { 3690 for my $signal (qw(INT HUP TERM)) {
3573 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3691 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3574 cf::cleanup "SIG$signal"; 3692 cf::cleanup "SIG$signal";
3575 }; 3693 };
3576 } 3694 }
3577} 3695}
3578 3696
3579sub write_runtime_sync { 3697sub write_runtime_sync {
3580 my $t0 = EV::time; 3698 my $t0 = AE::time;
3581 3699
3582 # first touch the runtime file to show we are still running: 3700 # first touch the runtime file to show we are still running:
3583 # the fsync below can take a very very long time. 3701 # the fsync below can take a very very long time.
3584 3702
3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3703 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3607 or return; 3725 or return;
3608 3726
3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3727 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3610 and return; 3728 and return;
3611 3729
3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3730 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3613 3731
3614 1 3732 1
3615} 3733}
3616 3734
3617our $uuid_lock; 3735our $uuid_lock;
… …
3629 or return; 3747 or return;
3630 3748
3631 my $value = uuid_seq uuid_cur; 3749 my $value = uuid_seq uuid_cur;
3632 3750
3633 unless ($value) { 3751 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n"; 3752 info "cowardly refusing to write zero uuid value!\n";
3635 return; 3753 return;
3636 } 3754 }
3637 3755
3638 my $value = uuid_str $value + $uuid_skip; 3756 my $value = uuid_str $value + $uuid_skip;
3639 $uuid_skip = 0; 3757 $uuid_skip = 0;
… …
3649 or return; 3767 or return;
3650 3768
3651 aio_rename "$uuid~", $uuid 3769 aio_rename "$uuid~", $uuid
3652 and return; 3770 and return;
3653 3771
3654 warn "uuid file written ($value).\n"; 3772 trace "uuid file written ($value).\n";
3655 3773
3656 1 3774 1
3657 3775
3658} 3776}
3659 3777
… …
3665} 3783}
3666 3784
3667sub emergency_save() { 3785sub emergency_save() {
3668 my $freeze_guard = cf::freeze_mainloop; 3786 my $freeze_guard = cf::freeze_mainloop;
3669 3787
3670 warn "emergency_perl_save: enter\n"; 3788 info "emergency_perl_save: enter\n";
3789
3790 # this is a trade-off: we want to be very quick here, so
3791 # save all maps without fsync, and later call a global sync
3792 # (which in turn might be very very slow)
3793 local $USE_FSYNC = 0;
3671 3794
3672 cf::sync_job { 3795 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so 3796 cf::write_runtime_sync; # external watchdog should not bark
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677 3797
3678 # use a peculiar iteration method to avoid tripping on perl 3798 # use a peculiar iteration method to avoid tripping on perl
3679 # refcount bugs in for. also avoids problems with players 3799 # refcount bugs in for. also avoids problems with players
3680 # and maps saved/destroyed asynchronously. 3800 # and maps saved/destroyed asynchronously.
3681 warn "emergency_perl_save: begin player save\n"; 3801 info "emergency_perl_save: begin player save\n";
3682 for my $login (keys %cf::PLAYER) { 3802 for my $login (keys %cf::PLAYER) {
3683 my $pl = $cf::PLAYER{$login} or next; 3803 my $pl = $cf::PLAYER{$login} or next;
3684 $pl->valid or next; 3804 $pl->valid or next;
3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3805 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3686 $pl->save; 3806 $pl->save;
3687 } 3807 }
3688 warn "emergency_perl_save: end player save\n"; 3808 info "emergency_perl_save: end player save\n";
3689 3809
3810 cf::write_runtime_sync; # external watchdog should not bark
3811
3690 warn "emergency_perl_save: begin map save\n"; 3812 info "emergency_perl_save: begin map save\n";
3691 for my $path (keys %cf::MAP) { 3813 for my $path (keys %cf::MAP) {
3692 my $map = $cf::MAP{$path} or next; 3814 my $map = $cf::MAP{$path} or next;
3693 $map->valid or next; 3815 $map->valid or next;
3694 $map->save; 3816 $map->save;
3695 } 3817 }
3696 warn "emergency_perl_save: end map save\n"; 3818 info "emergency_perl_save: end map save\n";
3697 3819
3820 cf::write_runtime_sync; # external watchdog should not bark
3821
3698 warn "emergency_perl_save: begin database checkpoint\n"; 3822 info "emergency_perl_save: begin database checkpoint\n";
3699 BDB::db_env_txn_checkpoint $DB_ENV; 3823 BDB::db_env_txn_checkpoint $DB_ENV;
3700 warn "emergency_perl_save: end database checkpoint\n"; 3824 info "emergency_perl_save: end database checkpoint\n";
3701 3825
3702 warn "emergency_perl_save: begin write uuid\n"; 3826 info "emergency_perl_save: begin write uuid\n";
3703 write_uuid_sync 1; 3827 write_uuid_sync 1;
3704 warn "emergency_perl_save: end write uuid\n"; 3828 info "emergency_perl_save: end write uuid\n";
3829
3830 cf::write_runtime_sync; # external watchdog should not bark
3831
3832 trace "emergency_perl_save: syncing database to disk";
3833 BDB::db_env_txn_checkpoint $DB_ENV;
3834
3835 info "emergency_perl_save: starting sync\n";
3836 IO::AIO::aio_sync sub {
3837 info "emergency_perl_save: finished sync\n";
3838 };
3839
3840 cf::write_runtime_sync; # external watchdog should not bark
3841
3842 trace "emergency_perl_save: flushing outstanding aio requests";
3843 while (IO::AIO::nreqs || BDB::nreqs) {
3844 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3845 }
3846
3847 cf::write_runtime_sync; # external watchdog should not bark
3705 }; 3848 };
3706 3849
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3712 warn "emergency_perl_save: leave\n"; 3850 info "emergency_perl_save: leave\n";
3713} 3851}
3714 3852
3715sub post_cleanup { 3853sub post_cleanup {
3716 my ($make_core) = @_; 3854 my ($make_core) = @_;
3717 3855
3856 IO::AIO::flush;
3857
3718 warn Carp::longmess "post_cleanup backtrace" 3858 error Carp::longmess "post_cleanup backtrace"
3719 if $make_core; 3859 if $make_core;
3720 3860
3721 my $fh = pidfile; 3861 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$; 3862 unlink $PIDFILE if <$fh> == $$;
3723} 3863}
… …
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3883 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) { 3884 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"}; 3885 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3886# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 } 3887 }
3748 warn "cleared package $pkg\n";#d#
3749} 3888}
3750 3889
3751sub do_reload_perl() { 3890sub do_reload_perl() {
3752 # can/must only be called in main 3891 # can/must only be called in main
3753 if ($Coro::current != $Coro::main) { 3892 unless (in_main) {
3754 warn "can only reload from main coroutine"; 3893 error "can only reload from main coroutine";
3755 return; 3894 return;
3756 } 3895 }
3757 3896
3758 return if $RELOAD++; 3897 return if $RELOAD++;
3759 3898
3760 my $t1 = EV::time; 3899 my $t1 = AE::time;
3761 3900
3762 while ($RELOAD) { 3901 while ($RELOAD) {
3763 warn "reloading..."; 3902 cf::get_slot 0.1, -1, "reload_perl";
3903 info "perl_reload: reloading...";
3764 3904
3765 warn "entering sync_job"; 3905 trace "perl_reload: entering sync_job";
3766 3906
3767 cf::sync_job { 3907 cf::sync_job {
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 cf::emergency_save; 3908 #cf::emergency_save;
3770 cf::write_runtime_sync; # external watchdog should not bark
3771 3909
3772 warn "syncing database to disk";
3773 BDB::db_env_txn_checkpoint $DB_ENV;
3774
3775 # if anything goes wrong in here, we should simply crash as we already saved
3776
3777 warn "flushing outstanding aio requests";
3778 while (IO::AIO::nreqs || BDB::nreqs) {
3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3780 }
3781
3782 warn "cancelling all extension coros"; 3910 trace "perl_reload: cancelling all extension coros";
3783 $_->cancel for values %EXT_CORO; 3911 $_->cancel for values %EXT_CORO;
3784 %EXT_CORO = (); 3912 %EXT_CORO = ();
3785 3913
3786 warn "removing commands"; 3914 trace "perl_reload: removing commands";
3787 %COMMAND = (); 3915 %COMMAND = ();
3788 3916
3789 warn "removing ext/exti commands"; 3917 trace "perl_reload: removing ext/exti commands";
3790 %EXTCMD = (); 3918 %EXTCMD = ();
3791 %EXTICMD = (); 3919 %EXTICMD = ();
3792 3920
3793 warn "unloading/nuking all extensions"; 3921 trace "perl_reload: unloading/nuking all extensions";
3794 for my $pkg (@EXTS) { 3922 for my $pkg (@EXTS) {
3795 warn "... unloading $pkg"; 3923 trace "... unloading $pkg";
3796 3924
3797 if (my $cb = $pkg->can ("unload")) { 3925 if (my $cb = $pkg->can ("unload")) {
3798 eval { 3926 eval {
3799 $cb->($pkg); 3927 $cb->($pkg);
3800 1 3928 1
3801 } or warn "$pkg unloaded, but with errors: $@"; 3929 } or error "$pkg unloaded, but with errors: $@";
3802 } 3930 }
3803 3931
3804 warn "... clearing $pkg"; 3932 trace "... clearing $pkg";
3805 clear_package $pkg; 3933 clear_package $pkg;
3806 } 3934 }
3807 3935
3808 warn "unloading all perl modules loaded from $LIBDIR"; 3936 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) { 3937 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3938 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811 3939
3812 warn "... unloading $k"; 3940 trace "... unloading $k";
3813 delete $INC{$k}; 3941 delete $INC{$k};
3814 3942
3815 $k =~ s/\.pm$//; 3943 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g; 3944 $k =~ s/\//::/g;
3817 3945
… …
3820 } 3948 }
3821 3949
3822 clear_package $k; 3950 clear_package $k;
3823 } 3951 }
3824 3952
3825 warn "getting rid of safe::, as good as possible"; 3953 trace "perl_reload: getting rid of safe::, as good as possible";
3826 clear_package "safe::$_" 3954 clear_package "safe::$_"
3827 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3955 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3828 3956
3829 warn "unloading cf.pm \"a bit\""; 3957 trace "perl_reload: unloading cf.pm \"a bit\"";
3830 delete $INC{"cf.pm"}; 3958 delete $INC{"cf.pm"};
3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3959 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3832 3960
3833 # don't, removes xs symbols, too, 3961 # don't, removes xs symbols, too,
3834 # and global variables created in xs 3962 # and global variables created in xs
3835 #clear_package __PACKAGE__; 3963 #clear_package __PACKAGE__;
3836 3964
3837 warn "unload completed, starting to reload now"; 3965 info "perl_reload: unload completed, starting to reload now";
3838 3966
3839 warn "reloading cf.pm"; 3967 trace "perl_reload: reloading cf.pm";
3840 require cf; 3968 require cf;
3841 cf::_connect_to_perl_1; 3969 cf::_connect_to_perl_1;
3842 3970
3843 warn "loading config and database again"; 3971 trace "perl_reload: loading config and database again";
3844 cf::reload_config; 3972 cf::reload_config;
3845 3973
3846 warn "loading extensions"; 3974 trace "perl_reload: loading extensions";
3847 cf::load_extensions; 3975 cf::load_extensions;
3848 3976
3849 if ($REATTACH_ON_RELOAD) { 3977 if ($REATTACH_ON_RELOAD) {
3850 warn "reattaching attachments to objects/players"; 3978 trace "perl_reload: reattaching attachments to objects/players";
3851 _global_reattach; # objects, sockets 3979 _global_reattach; # objects, sockets
3852 warn "reattaching attachments to maps"; 3980 trace "perl_reload: reattaching attachments to maps";
3853 reattach $_ for values %MAP; 3981 reattach $_ for values %MAP;
3854 warn "reattaching attachments to players"; 3982 trace "perl_reload: reattaching attachments to players";
3855 reattach $_ for values %PLAYER; 3983 reattach $_ for values %PLAYER;
3856 } 3984 }
3857 3985
3858 warn "running post_init jobs"; 3986 cf::_post_init 1;
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860 3987
3861 warn "leaving sync_job"; 3988 trace "perl_reload: leaving sync_job";
3862 3989
3863 1 3990 1
3864 } or do { 3991 } or do {
3865 warn $@; 3992 error $@;
3866 cf::cleanup "error while reloading, exiting."; 3993 cf::cleanup "perl_reload: error, exiting.";
3867 }; 3994 };
3868 3995
3869 warn "reloaded";
3870 --$RELOAD; 3996 --$RELOAD;
3871 } 3997 }
3872 3998
3873 $t1 = EV::time - $t1; 3999 $t1 = AE::time - $t1;
3874 warn "reload completed in ${t1}s\n"; 4000 info "perl_reload: completed in ${t1}s\n";
3875}; 4001};
3876 4002
3877our $RELOAD_WATCHER; # used only during reload 4003our $RELOAD_WATCHER; # used only during reload
3878 4004
3879sub reload_perl() { 4005sub reload_perl() {
… …
3881 # coro crashes during coro_state_free->destroy here. 4007 # coro crashes during coro_state_free->destroy here.
3882 4008
3883 $RELOAD_WATCHER ||= cf::async { 4009 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions; 4010 Coro::AIO::aio_wait cache_extensions;
3885 4011
3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4012 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3887 do_reload_perl; 4013 do_reload_perl;
3888 undef $RELOAD_WATCHER; 4014 undef $RELOAD_WATCHER;
3889 }; 4015 };
3890 }; 4016 };
3891} 4017}
… …
3900 reload_perl; 4026 reload_perl;
3901 }; 4027 };
3902 } 4028 }
3903}; 4029};
3904 4030
3905unshift @INC, $LIBDIR; 4031#############################################################################
3906 4032
3907my $bug_warning = 0; 4033my $bug_warning = 0;
3908 4034
3909our @WAIT_FOR_TICK; 4035our @WAIT_FOR_TICK;
3910our @WAIT_FOR_TICK_BEGIN; 4036our @WAIT_FOR_TICK_BEGIN;
3911 4037
3912sub wait_for_tick { 4038sub wait_for_tick() {
3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4039 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3914 4040
3915 my $signal = new Coro::Signal; 4041 my $signal = new Coro::Signal;
3916 push @WAIT_FOR_TICK, $signal; 4042 push @WAIT_FOR_TICK, $signal;
3917 $signal->wait; 4043 $signal->wait;
3918} 4044}
3919 4045
3920sub wait_for_tick_begin { 4046sub wait_for_tick_begin() {
3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4047 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3922 4048
3923 my $signal = new Coro::Signal; 4049 my $signal = new Coro::Signal;
3924 push @WAIT_FOR_TICK_BEGIN, $signal; 4050 push @WAIT_FOR_TICK_BEGIN, $signal;
3925 $signal->wait; 4051 $signal->wait;
… …
3932 return; 4058 return;
3933 } 4059 }
3934 4060
3935 cf::server_tick; # one server iteration 4061 cf::server_tick; # one server iteration
3936 4062
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4063 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3938 4064
3939 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4065 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3940 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4066 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3941 Coro::async_pool { 4067 Coro::async_pool {
3942 $Coro::current->{desc} = "runtime saver"; 4068 $Coro::current->{desc} = "runtime saver";
3943 write_runtime_sync 4069 write_runtime_sync
3944 or warn "ERROR: unable to write runtime file: $!"; 4070 or error "ERROR: unable to write runtime file: $!";
3945 }; 4071 };
3946 } 4072 }
3947 4073
3948 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4074 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3949 $sig->send; 4075 $sig->send;
… …
3957 4083
3958 if (0) { 4084 if (0) {
3959 if ($NEXT_TICK) { 4085 if ($NEXT_TICK) {
3960 my $jitter = $TICK_START - $NEXT_TICK; 4086 my $jitter = $TICK_START - $NEXT_TICK;
3961 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4087 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3962 warn "jitter $JITTER\n";#d# 4088 debug "jitter $JITTER\n";#d#
3963 } 4089 }
3964 } 4090 }
3965} 4091}
3966 4092
3967{ 4093{
… …
4012 IO::AIO::min_parallel 8; 4138 IO::AIO::min_parallel 8;
4013 IO::AIO::max_poll_time $TICK * 0.1; 4139 IO::AIO::max_poll_time $TICK * 0.1;
4014 undef $AnyEvent::AIO::WATCHER; 4140 undef $AnyEvent::AIO::WATCHER;
4015} 4141}
4016 4142
4017my $_log_backtrace; 4143our $_log_backtrace;
4144our $_log_backtrace_last;
4018 4145
4019sub _log_backtrace { 4146sub _log_backtrace {
4020 my ($msg, @addr) = @_; 4147 my ($msg, @addr) = @_;
4021 4148
4022 $msg =~ s/\n//; 4149 $msg =~ s/\n$//;
4023 4150
4151 if ($_log_backtrace_last eq $msg) {
4152 LOG llevInfo, "[ABT] $msg\n";
4153 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4024 # limit the # of concurrent backtraces 4154 # limit the # of concurrent backtraces
4025 if ($_log_backtrace < 2) { 4155 } elsif ($_log_backtrace < 2) {
4156 $_log_backtrace_last = $msg;
4026 ++$_log_backtrace; 4157 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg; 4158 my $perl_bt = Carp::longmess $msg;
4028 async { 4159 async {
4029 $Coro::current->{desc} = "abt $msg"; 4160 $Coro::current->{desc} = "abt $msg";
4030 4161
… …
4050 LOG llevInfo, "[ABT] $_\n" for @bt; 4181 LOG llevInfo, "[ABT] $_\n" for @bt;
4051 --$_log_backtrace; 4182 --$_log_backtrace;
4052 }; 4183 };
4053 } else { 4184 } else {
4054 LOG llevInfo, "[ABT] $msg\n"; 4185 LOG llevInfo, "[ABT] $msg\n";
4055 LOG llevInfo, "[ABT] [suppressed]\n"; 4186 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4056 } 4187 }
4057} 4188}
4058 4189
4059# load additional modules 4190# load additional modules
4060require "cf/$_.pm" for @EXTRA_MODULES; 4191require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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