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.505 by root, Sun Jan 31 03:46:20 2010 UTC vs.
Revision 1.559 by root, Sat Feb 26 12:50:27 2011 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 = ();
… …
93our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS 94our @REFLECT; # set by XS
95our %REFLECT; # set by us 95our %REFLECT; # set by us
96 96
97our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
98our $DATADIR = datadir; 99our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
102our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 112
111our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
112 120
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 123our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 129our $DB_ENV;
122 130
123our @EXTRA_MODULES = qw(pod match mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 132
125our %CFG; 133our %CFG;
126 134
127our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 136our $RUNTIME;
… …
162 170
163our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
164 172
165sub cf::map::normalise; 173sub cf::map::normalise;
166 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
167############################################################################# 179#############################################################################
168 180
169%REFLECT = (); 181%REFLECT = ();
170for (@REFLECT) { 182for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 183 my $reflect = JSON::XS::decode_json $_;
… …
223from wherever your confdir points to. 235from wherever your confdir points to.
224 236
225=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
226 238
227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These 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 240returns 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. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
230 247
231=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
232 249
233This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 259
243=back 260=back
244 261
245=cut 262=cut
246 263
264sub error(@) { LOG llevError, join "", @_ }
265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
247$Coro::State::WARNHOOK = sub { 270$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 271 my $msg = join "", @_;
249 272
250 $msg .= "\n" 273 $msg .= "\n"
251 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
252 275
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 277
255 LOG llevError, $msg; 278 LOG llevWarn, $msg;
256}; 279};
257 280
258$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
260 283
261 warn Carp::longmess $_[0]; 284 error Carp::longmess $_[0];
262 285
263 if ($Coro::current == $Coro::main) {#d# 286 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 288 return;#d#
266 }#d# 289 }#d#
267 290
268 # kill coroutine otherwise 291 # kill coroutine otherwise
269 Coro::terminate 292 Coro::terminate
… …
336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 359our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337 360
338sub encode_json($) { $json_coder->encode ($_[0]) } 361sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 362sub decode_json($) { $json_coder->decode ($_[0]) }
340 363
364=item $ref = cf::yaml_load $scalar
365
366Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
367
368=cut
369
370sub fork_call(&@);
371
372sub yaml_load($) {
373 fork_call { YAML::XS::Load $_[0] } @_
374}
375
341=item cf::post_init { BLOCK } 376=item cf::post_init { BLOCK }
342 377
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 378Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 379but I<before> the server starts ticking again.
345 380
346The cdoeblock will have a single boolean argument to indicate whether this 381The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 382is a reload or not.
348 383
349=cut 384=cut
350 385
351sub post_init(&) { 386sub post_init(&) {
352 push @POST_INIT, shift; 387 push @POST_INIT, shift;
388}
389
390sub _post_init {
391 trace "running post_init jobs";
392
393 # run them in parallel...
394
395 my @join;
396
397 while () {
398 push @join, map &Coro::async ($_, 0), @POST_INIT;
399 @POST_INIT = ();
400
401 @join or last;
402
403 (pop @join)->join;
404 }
353} 405}
354 406
355=item cf::lock_wait $string 407=item cf::lock_wait $string
356 408
357Wait until the given lock is available. See cf::lock_acquire. 409Wait until the given lock is available. See cf::lock_acquire.
… …
396} 448}
397 449
398=item cf::periodic $interval, $cb 450=item cf::periodic $interval, $cb
399 451
400Like EV::periodic, but randomly selects a starting point so that the actions 452Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 453get spread over time.
402 454
403=cut 455=cut
404 456
405sub periodic($$) { 457sub periodic($$) {
406 my ($interval, $cb) = @_; 458 my ($interval, $cb) = @_;
… …
502=cut 554=cut
503 555
504sub sync_job(&) { 556sub sync_job(&) {
505 my ($job) = @_; 557 my ($job) = @_;
506 558
507 if ($Coro::current == $Coro::main) { 559 if (in_main) {
508 my $time = EV::time; 560 my $time = AE::time;
509 561
510 # this is the main coro, too bad, we have to block 562 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 563 # till the operation succeeds, freezing the server :/
512 564
513 LOG llevError, Carp::longmess "sync job";#d# 565 #LOG llevError, Carp::longmess "sync job";#d#
514 566
515 my $freeze_guard = freeze_mainloop; 567 my $freeze_guard = freeze_mainloop;
516 568
517 my $busy = 1; 569 my $busy = 1;
518 my @res; 570 my @res;
519 571
520 (async { 572 (async {
521 $Coro::current->desc ("sync job coro"); 573 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 574 @res = eval { $job->() };
523 warn $@ if $@; 575 error $@ if $@;
524 undef $busy; 576 undef $busy;
525 })->prio (Coro::PRIO_MAX); 577 })->prio (Coro::PRIO_MAX);
526 578
527 while ($busy) { 579 while ($busy) {
528 if (Coro::nready) { 580 if (Coro::nready) {
… …
530 } else { 582 } else {
531 EV::loop EV::LOOP_ONESHOT; 583 EV::loop EV::LOOP_ONESHOT;
532 } 584 }
533 } 585 }
534 586
535 my $time = EV::time - $time; 587 my $time = AE::time - $time;
536 588
537 $TICK_START += $time; # do not account sync jobs to server load 589 $TICK_START += $time; # do not account sync jobs to server load
538 590
539 wantarray ? @res : $res[0] 591 wantarray ? @res : $res[0]
540 } else { 592 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 614 $EXT_CORO{$coro+0} = $coro;
563 615
564 $coro 616 $coro
565} 617}
566 618
567=item fork_call { }, $args 619=item fork_call { }, @args
568 620
569Executes the given code block with the given arguments in a seperate 621Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 622process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 623Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 624never block itself or use any form of event handling.
573 625
574=cut 626=cut
575 627
628sub post_fork {
629 reset_signals;
630}
631
576sub fork_call(&@) { 632sub fork_call(&@) {
577 my ($cb, @args) = @_; 633 my ($cb, @args) = @_;
578 634
579 # we seemingly have to make a local copy of the whole thing, 635 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 636 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 637 # TODO: investigate and fix (likely this will be rather laborious)
582 638
583 my @res = Coro::Util::fork_eval { 639 my @res = Coro::Util::fork_eval {
584 reset_signals; 640 cf::post_fork;
585 &$cb 641 &$cb
586 }, @args; 642 } @args;
587 643
588 wantarray ? @res : $res[-1] 644 wantarray ? @res : $res[-1]
645}
646
647sub objinfo {
648 (
649 "counter value" => cf::object::object_count,
650 "objects created" => cf::object::create_count,
651 "objects destroyed" => cf::object::destroy_count,
652 "freelist size" => cf::object::free_count,
653 "allocated objects" => cf::object::objects_size,
654 "active objects" => cf::object::actives_size,
655 )
589} 656}
590 657
591=item $coin = coin_from_name $name 658=item $coin = coin_from_name $name
592 659
593=cut 660=cut
… …
630within each server. 697within each server.
631 698
632=cut 699=cut
633 700
634sub db_table($) { 701sub db_table($) {
702 cf::error "db_get called from main context"
703 if $Coro::current == $Coro::main;
704
635 my ($name) = @_; 705 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 706 my $db = BDB::db_create $DB_ENV;
637 707
638 eval { 708 eval {
639 $db->set_flags (BDB::CHKSUM); 709 $db->set_flags (BDB::CHKSUM);
… …
649} 719}
650 720
651our $DB; 721our $DB;
652 722
653sub db_init { 723sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 724 $DB ||= db_table "db";
656 };
657} 725}
658 726
659sub db_get($$) { 727sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 728 my $key = "$_[0]/$_[1]";
661 729
662 cf::sync_job { 730 cf::error "db_get called from main context"
731 if $Coro::current == $Coro::main;
732
663 BDB::db_get $DB, undef, $key, my $data; 733 BDB::db_get $DB, undef, $key, my $data;
664 734
665 $! ? () 735 $! ? ()
666 : $data 736 : $data
667 }
668} 737}
669 738
670sub db_put($$$) { 739sub db_put($$$) {
671 BDB::dbreq_pri 4; 740 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 741 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
728 797
729 my $t1 = Time::HiRes::time; 798 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 799 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 800 my $t2 = Time::HiRes::time;
732 801
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 802 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 803
735 db_put cache => "$id/data", $data; 804 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 805 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 806 db_put cache => "$id/meta", $meta;
738 807
… …
748 817
749=cut 818=cut
750 819
751sub datalog($@) { 820sub datalog($@) {
752 my ($type, %kv) = @_; 821 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 822 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 823}
755 824
756=back 825=back
757 826
758=cut 827=cut
… …
953 1022
954 } elsif (exists $cb_id{$type}) { 1023 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1024 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1025
957 } elsif (ref $type) { 1026 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1027 error "attaching objects not supported, ignoring.\n";
959 1028
960 } else { 1029 } else {
961 shift @arg; 1030 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1031 error "attach argument '$type' not supported, ignoring.\n";
963 } 1032 }
964 } 1033 }
965} 1034}
966 1035
967sub _object_attach { 1036sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1046 _attach $registry, $klass, @attach;
978 } 1047 }
979 1048
980 $obj->{$name} = \%arg; 1049 $obj->{$name} = \%arg;
981 } else { 1050 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1051 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1052 }
984 1053
985 $obj->{_attachment}{$name} = undef; 1054 $obj->{_attachment}{$name} = undef;
986} 1055}
987 1056
… …
1046 1115
1047 for (@$callbacks) { 1116 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1117 eval { &{$_->[1]} };
1049 1118
1050 if ($@) { 1119 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1120 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1121 override;
1054 } 1122 }
1055 1123
1056 return 1 if $override; 1124 return 1 if $override;
1057 } 1125 }
… …
1136 for (@$attach) { 1204 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1205 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1206 _attach $registry, $klass, @attach;
1139 } 1207 }
1140 } else { 1208 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1209 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1210 }
1143 } 1211 }
1144} 1212}
1145 1213
1146cf::attachable->attach ( 1214cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1241 my ($filename, $rdata, $objs) = @_;
1174 1242
1175 sync_job { 1243 sync_job {
1176 if (length $$rdata) { 1244 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1245 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1246 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1247 $decname, length $$rdata, scalar @$objs
1248 if $VERBOSE_IO;
1180 1249
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1250 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1251 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1252 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1253 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1275 aio_rename "$filename~", $filename;
1207 1276
1208 $filename =~ s%/[^/]+$%%; 1277 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1278 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1279 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1280 error "unable to save objects: $filename~: $!\n";
1212 } 1281 }
1213 } else { 1282 } else {
1214 aio_unlink $filename; 1283 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1284 aio_unlink "$filename.pst";
1216 } 1285 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1309 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1310 $av = $st->{objs};
1242 } 1311 }
1243 1312
1244 utf8::decode (my $decname = $filename); 1313 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1314 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1315 $decname, length $data, scalar @{$av || []}
1316 if $VERBOSE_IO;
1247 1317
1248 ($data, $av) 1318 ($data, $av)
1249} 1319}
1250 1320
1251=head2 COMMAND CALLBACKS 1321=head2 COMMAND CALLBACKS
… …
1310} 1380}
1311 1381
1312use File::Glob (); 1382use File::Glob ();
1313 1383
1314cf::player->attach ( 1384cf::player->attach (
1315 on_command => sub { 1385 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1386 my ($pl, $name, $params) = @_;
1317 1387
1318 my $cb = $COMMAND{$name} 1388 my $cb = $COMMAND{$name}
1319 or return; 1389 or return;
1320 1390
… …
1343 1413
1344 $pl->ext_reply ($reply, @reply) 1414 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1415 if $reply;
1346 1416
1347 } else { 1417 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1418 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1419 }
1350 1420
1351 cf::override; 1421 cf::override;
1352 }, 1422 },
1353); 1423);
… …
1364 1434
1365 $grp 1435 $grp
1366} 1436}
1367 1437
1368sub load_extensions { 1438sub load_extensions {
1439 info "loading extensions...";
1440
1369 cf::sync_job { 1441 cf::sync_job {
1370 my %todo; 1442 my %todo;
1371 1443
1372 for my $path (<$LIBDIR/*.ext>) { 1444 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1445 next unless -r $path;
… …
1391 1463
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1464 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1465 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1466
1395 $ext{source} = 1467 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1468 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1469 . "#line 1 \"$path\"\n{\n"
1398 . $source 1470 . $source
1399 . "\n};\n1"; 1471 . "\n};\n1";
1400 1472
1401 $todo{$base} = \%ext; 1473 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1485 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1486 next ext
1415 unless exists $done{$_}; 1487 unless exists $done{$_};
1416 } 1488 }
1417 1489
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1490 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 1491
1420 my $active = eval $v->{source}; 1492 my $active = eval $v->{source};
1421 1493
1422 if (length $@) { 1494 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1495 error "$v->{path}: $@\n";
1424 1496
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1497 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1498 if exists $v->{meta}{mandatory};
1499
1500 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1501 delete $todo{$k};
1427 } else { 1502 } else {
1428 $done{$k} = delete $todo{$k}; 1503 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1504 push @EXTS, $v->{pkg};
1430 $progress = 1; 1505 $progress = 1;
1431 1506
1432 warn "$v->{base}: extension inactive.\n" 1507 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1508 unless $active;
1434 } 1509 }
1435 } 1510 }
1436 1511
1437 unless ($progress) { 1512 unless ($progress) {
… …
1533 $cf::PLAYER{$login} = $pl 1608 $cf::PLAYER{$login} = $pl
1534 } 1609 }
1535 } 1610 }
1536} 1611}
1537 1612
1613cf::player->attach (
1614 on_load => sub {
1615 my ($pl, $path) = @_;
1616
1617 # restore slots saved in save, below
1618 my $slots = delete $pl->{_slots};
1619
1620 $pl->ob->current_weapon ($slots->[0]);
1621 $pl->combat_ob ($slots->[1]);
1622 $pl->ranged_ob ($slots->[2]);
1623 },
1624);
1625
1538sub save($) { 1626sub save($) {
1539 my ($pl) = @_; 1627 my ($pl) = @_;
1540 1628
1541 return if $pl->{deny_save}; 1629 return if $pl->{deny_save};
1542 1630
… …
1547 1635
1548 aio_mkdir playerdir $pl, 0770; 1636 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1637 $pl->{last_save} = $cf::RUNTIME;
1550 1638
1551 cf::get_slot 0.01; 1639 cf::get_slot 0.01;
1640
1641 # save slots, to be restored later
1642 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1643
1553 $pl->save_pl ($path); 1644 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1645 cf::cede_to_tick;
1555} 1646}
1556 1647
… …
1590 my $name = $pl->ob->name; 1681 my $name = $pl->ob->name;
1591 1682
1592 $pl->{deny_save} = 1; 1683 $pl->{deny_save} = 1;
1593 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1684 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1594 1685
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1686 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1687 $pl->deactivate;
1688
1597 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1689 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1690 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1691 ext::highscore::check ($pl->ob);
1692
1600 $pl->ns->destroy if $pl->ns; 1693 $pl->ns->destroy if $pl->ns;
1601 1694
1602 my $path = playerdir $pl; 1695 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1696 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1697 aio_rename $path, $temp;
… …
1658 \@logins 1751 \@logins
1659} 1752}
1660 1753
1661=item $player->maps 1754=item $player->maps
1662 1755
1756=item cf::player::maps $login
1757
1663Returns an arrayref of map paths that are private for this 1758Returns an arrayref of map paths that are private for this
1664player. May block. 1759player. May block.
1665 1760
1666=cut 1761=cut
1667 1762
… …
1729=cut 1824=cut
1730 1825
1731sub find_by_path($) { 1826sub find_by_path($) {
1732 my ($path) = @_; 1827 my ($path) = @_;
1733 1828
1829 $path =~ s/^~[^\/]*//; # skip ~login
1830
1734 my ($match, $specificity); 1831 my ($match, $specificity);
1735 1832
1736 for my $region (list) { 1833 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1834 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1835 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1863sub generate_random_map {
1767 my ($self, $rmp) = @_; 1864 my ($self, $rmp) = @_;
1768 1865
1769 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1866 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770 1867
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1868 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
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} 1869}
1786 1870
1787=item cf::map->register ($regex, $prio) 1871=item cf::map->register ($regex, $prio)
1788 1872
1789Register a handler for the map path matching the given regex at the 1873Register a handler for the map path matching the given regex at the
… …
1794 1878
1795sub register { 1879sub register {
1796 my (undef, $regex, $prio) = @_; 1880 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 1881 my $pkg = caller;
1798 1882
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 1883 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 1884
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1885 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 1886}
1804 1887
1805# also paths starting with '/' 1888# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1889$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 1890
1808sub thawer_merge { 1891sub thawer_merge {
1809 my ($self, $merge) = @_; 1892 my ($self, $merge) = @_;
1810 1893
1811 # we have to keep some variables in memory intact 1894 # we have to keep some variables in memory intact
… …
1816} 1899}
1817 1900
1818sub normalise { 1901sub normalise {
1819 my ($path, $base) = @_; 1902 my ($path, $base) = @_;
1820 1903
1821 $path = "$path"; # make sure its a string 1904 $path = "$path"; # make sure it's a string
1822 1905
1823 $path =~ s/\.map$//; 1906 $path =~ s/\.map$//;
1824 1907
1825 # map plan: 1908 # map plan:
1826 # 1909 #
… …
1841 $base =~ s{[^/]+/?$}{}; 1924 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 1925 $path = "$base/$path";
1843 } 1926 }
1844 1927
1845 for ($path) { 1928 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 1929 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 1930 redo if s{/[^/]+/\.\./}{/};
1849 } 1931 }
1850 1932
1851 $path 1933 $path
… …
1865 $self->init; # pass $1 etc. 1947 $self->init; # pass $1 etc.
1866 return $self; 1948 return $self;
1867 } 1949 }
1868 } 1950 }
1869 1951
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1952 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 1953 ()
1872} 1954}
1873 1955
1874sub init { 1956sub init {
1875 my ($self) = @_; 1957 my ($self) = @_;
… …
1997} 2079}
1998 2080
1999sub find; 2081sub find;
2000sub find { 2082sub find {
2001 my ($path, $origin) = @_; 2083 my ($path, $origin) = @_;
2084
2085 cf::cede_to_tick;
2002 2086
2003 $path = normalise $path, $origin && $origin->path; 2087 $path = normalise $path, $origin && $origin->path;
2004 2088
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2089 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2090 my $guard2 = cf::lock_acquire "map_find:$path";
… …
2091 2175
2092 $self->in_memory (cf::MAP_ACTIVE); 2176 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2177 }
2094 2178
2095 $self->post_load; 2179 $self->post_load;
2096}
2097 2180
2181 1
2182}
2183
2184# customize the map for a given player, i.e.
2185# return the _real_ map. used by e.g. per-player
2186# maps to change the path to ~playername/mappath
2098sub customise_for { 2187sub customise_for {
2099 my ($self, $ob) = @_; 2188 my ($self, $ob) = @_;
2100 2189
2101 return find "~" . $ob->name . "/" . $self->{path} 2190 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2191 if $self->per_player;
… …
2118 or next; 2207 or next;
2119 $neigh = find $neigh, $map 2208 $neigh = find $neigh, $map
2120 or next; 2209 or next;
2121 $neigh->load; 2210 $neigh->load;
2122 2211
2212 # now find the diagonal neighbours
2123 push @neigh, 2213 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2214 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2215 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2216 }
2127 2217
… …
2134} 2224}
2135 2225
2136sub find_sync { 2226sub find_sync {
2137 my ($path, $origin) = @_; 2227 my ($path, $origin) = @_;
2138 2228
2139 cf::sync_job { find $path, $origin } 2229 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230 if $Coro::current == $Coro::main;
2231
2232 find $path, $origin
2140} 2233}
2141 2234
2142sub do_load_sync { 2235sub do_load_sync {
2143 my ($map) = @_; 2236 my ($map) = @_;
2144 2237
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2238 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2239 if $Coro::current == $Coro::main;
2147 2240
2148 cf::sync_job { $map->load }; 2241 $map->load;
2149} 2242}
2150 2243
2151our %MAP_PREFETCH; 2244our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2245our $MAP_PREFETCHER = undef;
2153 2246
… …
2179 $MAP_PREFETCHER->prio (6); 2272 $MAP_PREFETCHER->prio (6);
2180 2273
2181 () 2274 ()
2182} 2275}
2183 2276
2277# common code, used by both ->save and ->swapout
2184sub save { 2278sub _save {
2185 my ($self) = @_; 2279 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2280
2189 $self->{last_save} = $cf::RUNTIME; 2281 $self->{last_save} = $cf::RUNTIME;
2190 2282
2191 return unless $self->dirty; 2283 return unless $self->dirty;
2192 2284
… …
2212 } else { 2304 } else {
2213 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2305 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214 } 2306 }
2215} 2307}
2216 2308
2309sub save {
2310 my ($self) = @_;
2311
2312 my $lock = cf::lock_acquire "map_data:$self->{path}";
2313
2314 $self->_save;
2315}
2316
2217sub swap_out { 2317sub swap_out {
2218 my ($self) = @_; 2318 my ($self) = @_;
2219 2319
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2320 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2321
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2322 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2323 return if $self->{deny_save};
2324 return if $self->players;
2228 2325
2326 # first deactivate the map and "unlink" it from the core
2327 $self->deactivate;
2328 $_->clear_links_to ($self) for values %cf::MAP;
2229 $self->in_memory (cf::MAP_SWAPPED); 2329 $self->in_memory (cf::MAP_SWAPPED);
2330
2331 # then atomically save
2332 $self->_save;
2333
2334 # then free the map
2335 $self->clear;
2336}
2337
2338sub reset_at {
2339 my ($self) = @_;
2340
2341 # TODO: safety, remove and allow resettable per-player maps
2342 return 1e99 if $self->{deny_reset};
2343
2344 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2345 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2346
2347 $time + $to
2348}
2349
2350sub should_reset {
2351 my ($self) = @_;
2352
2353 $self->reset_at <= $cf::RUNTIME
2354}
2355
2356sub reset {
2357 my ($self) = @_;
2358
2359 my $lock = cf::lock_acquire "map_data:$self->{path}";
2360
2361 return if $self->players;
2362
2363 cf::trace "resetting map ", $self->path, "\n";
2364
2365 $self->in_memory (cf::MAP_SWAPPED);
2366
2367 # need to save uniques path
2368 unless ($self->{deny_save}) {
2369 my $uniq = $self->uniq_path; utf8::encode $uniq;
2370
2371 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2372 if $uniq;
2373 }
2374
2375 delete $cf::MAP{$self->path};
2230 2376
2231 $self->deactivate; 2377 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2378 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2379 $self->clear;
2234}
2235
2236sub reset_at {
2237 my ($self) = @_;
2238
2239 # TODO: safety, remove and allow resettable per-player maps
2240 return 1e99 if $self->{deny_reset};
2241
2242 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245 $time + $to
2246}
2247
2248sub should_reset {
2249 my ($self) = @_;
2250
2251 $self->reset_at <= $cf::RUNTIME
2252}
2253
2254sub reset {
2255 my ($self) = @_;
2256
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259 return if $self->players;
2260
2261 warn "resetting map ", $self->path, "\n";
2262
2263 $self->in_memory (cf::MAP_SWAPPED);
2264
2265 # need to save uniques path
2266 unless ($self->{deny_save}) {
2267 my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2270 if $uniq;
2271 }
2272
2273 delete $cf::MAP{$self->path};
2274
2275 $self->deactivate;
2276 $_->clear_links_to ($self) for values %cf::MAP;
2277 $self->clear;
2278 2380
2279 $self->unlink_save; 2381 $self->unlink_save;
2280 $self->destroy; 2382 $self->destroy;
2281} 2383}
2282 2384
… …
2290 2392
2291 delete $cf::MAP{$self->path}; 2393 delete $cf::MAP{$self->path};
2292 2394
2293 $self->unlink_save; 2395 $self->unlink_save;
2294 2396
2295 bless $self, "cf::map"; 2397 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2398 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2399 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2400 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2401 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2402
… …
2530 2632
2531Freezes the player and moves him/her to a special map (C<{link}>). 2633Freezes the player and moves him/her to a special map (C<{link}>).
2532 2634
2533The player should be reasonably safe there for short amounts of time (e.g. 2635The player should be reasonably safe there for short amounts of time (e.g.
2534for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2636for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535though, as the palyer cannot control the character while it is on the link 2637though, as the player cannot control the character while it is on the link
2536map. 2638map.
2537 2639
2538Will never block. 2640Will never block.
2539 2641
2540=item $player_object->leave_link ($map, $x, $y) 2642=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2663sub cf::object::player::enter_link {
2562 my ($self) = @_; 2664 my ($self) = @_;
2563 2665
2564 $self->deactivate_recursive; 2666 $self->deactivate_recursive;
2565 2667
2668 ++$self->{_link_recursion};
2669
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2670 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2671
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2672 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2673 if $self->map && $self->map->{path} ne "{link}";
2570 2674
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2675 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2676}
2573 2677
2574sub cf::object::player::leave_link { 2678sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2679 my ($self, $map, $x, $y) = @_;
2576 2680
… …
2601 $map->load_neighbours; 2705 $map->load_neighbours;
2602 2706
2603 return unless $self->contr->active; 2707 return unless $self->contr->active;
2604 2708
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2709 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2710 if ($self->enter_map ($map, $x, $y)) {
2607 2711 # entering was successful
2712 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2713 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2714 $self->activate_recursive;
2610} 2715 }
2611 2716
2717}
2718
2612=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2719=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613 2720
2614Moves the player to the given map-path and coordinates by first freezing 2721Moves the player to the given map-path and coordinates by first freezing
2615her, loading and preparing them map, calling the provided $check callback 2722her, loading and preparing them map, calling the provided $check callback
2616that has to return the map if sucecssful, and then unfreezes the player on 2723that has to return the map if sucecssful, and then unfreezes the player on
2617the new (success) or old (failed) map position. In either case, $done will 2724the new (success) or old (failed) map position. In either case, $done will
… …
2624 2731
2625our $GOTOGEN; 2732our $GOTOGEN;
2626 2733
2627sub cf::object::player::goto { 2734sub cf::object::player::goto {
2628 my ($self, $path, $x, $y, $check, $done) = @_; 2735 my ($self, $path, $x, $y, $check, $done) = @_;
2736
2737 if ($self->{_link_recursion} >= $MAX_LINKS) {
2738 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2739 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2740 ($path, $x, $y) = @$EMERGENCY_POSITION;
2741 }
2629 2742
2630 # do generation counting so two concurrent goto's will be executed in-order 2743 # do generation counting so two concurrent goto's will be executed in-order
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2744 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2745
2633 $self->enter_link; 2746 $self->enter_link;
… …
2657 my $map = eval { 2770 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2771 my $map = defined $path ? cf::map::find $path : undef;
2659 2772
2660 if ($map) { 2773 if ($map) {
2661 $map = $map->customise_for ($self); 2774 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2775 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2776 } else {
2664 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2777 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665 } 2778 }
2666 2779
2667 $map 2780 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2788 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2789 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2790 $self->leave_link ($map, $x, $y);
2678 } 2791 }
2679 2792
2680 $done->() if $done; 2793 $done->($self) if $done;
2681 })->prio (1); 2794 })->prio (1);
2682} 2795}
2683 2796
2684=item $player_object->enter_exit ($exit_object) 2797=item $player_object->enter_exit ($exit_object)
2685 2798
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2891 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "I'll try to bring you back to the map you were before. " 2892 . "I'll try to bring you back to the map you were before. "
2780 . "Please report this to the dungeon master!", 2893 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2894 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2895
2783 warn "ERROR in enter_exit: $@"; 2896 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2897 $self->leave_link;
2785 } 2898 }
2786 })->prio (1); 2899 })->prio (1);
2787} 2900}
2788 2901
… …
3101 3214
3102 $ns->ext_reply ($reply, @reply) 3215 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3216 if $reply;
3104 3217
3105 } else { 3218 } else {
3106 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3219 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107 } 3220 }
3108 3221
3109 cf::override; 3222 cf::override;
3110 }, 3223 },
3111); 3224);
… …
3131 3244
3132 $coro 3245 $coro
3133} 3246}
3134 3247
3135cf::client->attach ( 3248cf::client->attach (
3136 on_destroy => sub { 3249 on_client_destroy => sub {
3137 my ($ns) = @_; 3250 my ($ns) = @_;
3138 3251
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3252 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3253 },
3141); 3254);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3305 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3306 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3307 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3308 ["cf::map" => qw(trigger)],
3196) { 3309) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3310 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3311 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3312 for @funs;
3201} 3313}
3202 3314
… …
3241 local @cf::_safe_eval_args = values %vars; 3353 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3354 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3355 }
3244 3356
3245 if ($@) { 3357 if ($@) {
3246 warn "$@"; 3358 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3359 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3360 "with arguments " . (join " ", %vars) . "\n";
3249 } 3361 }
3250 3362
3251 wantarray ? @res : $res[0] 3363 wantarray ? @res : $res[0]
3252} 3364}
3253 3365
… …
3287 # for this (global event?) 3399 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3400 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3401
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3402 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3403
3292 warn "loading facedata from $path\n"; 3404 trace "loading facedata from $path\n";
3293 3405
3294 my $facedata;
3295 0 < aio_load $path, $facedata 3406 0 < aio_load $path, my $facedata
3296 or die "$path: $!"; 3407 or die "$path: $!";
3297 3408
3298 $facedata = Coro::Storable::thaw $facedata; 3409 $facedata = Coro::Storable::thaw $facedata;
3299 3410
3300 $facedata->{version} == 2 3411 $facedata->{version} == 2
… …
3317 3428
3318 cf::face::set_visibility $idx, $info->{visibility}; 3429 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3430 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3431 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3432 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3433 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3322 3434
3323 cf::cede_to_tick; 3435 cf::cede_to_tick;
3324 } 3436 }
3325 3437
3326 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
… …
3331 3443
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3444 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3445 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3446 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3447 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3448 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3449 }
3338 3450
3339 cf::cede_to_tick; 3451 cf::cede_to_tick;
3340 } 3452 }
3341 } 3453 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3471 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3472
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3473 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3474 cf::face::set_type $idx, $info->{type};
3363 } else { 3475 } else {
3364 $RESOURCE{$name} = $info; 3476 $RESOURCE{$name} = $info; # unused
3365 } 3477 }
3366 3478
3367 cf::cede_to_tick; 3479 cf::cede_to_tick;
3368 } 3480 }
3369 } 3481 }
3370 3482
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3483 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3484
3373 1 3485 1
3374} 3486}
3375
3376cf::global->attach (on_resource_update => sub {
3377 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381 my $sound = $soundconf->{compat}[$_]
3382 or next;
3383
3384 my $face = cf::face::find "sound/$sound->[1]";
3385 cf::sound::set $sound->[0] => $face;
3386 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387 }
3388
3389 while (my ($k, $v) = each %{$soundconf->{event}}) {
3390 my $face = cf::face::find "sound/$v";
3391 cf::sound::set $k => $face;
3392 }
3393 }
3394});
3395 3487
3396register_exticmd fx_want => sub { 3488register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3489 my ($ns, $want) = @_;
3398 3490
3399 while (my ($k, $v) = each %$want) { 3491 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3530sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3531 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3532 or die "unable to load treasurelists\n";
3441} 3533}
3442 3534
3535sub reload_sound {
3536 trace "loading sound config from $DATADIR/sound\n";
3537
3538 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539 or die "$DATADIR/sound $!";
3540
3541 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3542
3543 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544 my $sound = $soundconf->{compat}[$_]
3545 or next;
3546
3547 my $face = cf::face::find "sound/$sound->[1]";
3548 cf::sound::set $sound->[0] => $face;
3549 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3550 }
3551
3552 while (my ($k, $v) = each %{$soundconf->{event}}) {
3553 my $face = cf::face::find "sound/$v";
3554 cf::sound::set $k => $face;
3555 }
3556}
3557
3443sub reload_resources { 3558sub reload_resources {
3444 warn "reloading resource files...\n"; 3559 trace "reloading resource files...\n";
3445 3560
3561 reload_exp_table;
3562 reload_materials;
3446 reload_facedata; 3563 reload_facedata;
3564 reload_sound;
3447 reload_archetypes; 3565 reload_archetypes;
3448 reload_regions; 3566 reload_regions;
3449 reload_treasures; 3567 reload_treasures;
3450 3568
3451 warn "finished reloading resource files\n"; 3569 trace "finished reloading resource files\n";
3452} 3570}
3453 3571
3454sub reload_config { 3572sub reload_config {
3455 warn "reloading config file...\n"; 3573 trace "reloading config file...\n";
3456 3574
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3575 0 < aio_load "$CONFDIR/config", my $config
3458 or return; 3576 or die "$CONFDIR/config: $!";
3459 3577
3460 local $/; 3578 utf8::decode $config;
3461 *CFG = YAML::XS::Load scalar <$fh>; 3579 *CFG = yaml_load $config;
3462 3580
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3581 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3582
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3583 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3584 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3585
3468 if (exists $CFG{mlockall}) { 3586 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3588 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3589 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3590 };
3473 warn $@ if $@; 3591 warn $@ if $@;
3474 } 3592 }
3475
3476 warn "finished reloading resource files\n";
3477} 3593}
3478 3594
3479sub pidfile() { 3595sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3596 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3597 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3610 seek $fh, 0, 0;
3495 print $fh $$; 3611 print $fh $$;
3496} 3612}
3497 3613
3498sub main_loop { 3614sub main_loop {
3499 warn "EV::loop starting\n"; 3615 trace "EV::loop starting\n";
3500 if (1) { 3616 if (1) {
3501 EV::loop; 3617 EV::loop;
3502 } 3618 }
3503 warn "EV::loop returned\n"; 3619 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3620 goto &main_loop unless $REALLY_UNLOOP;
3505} 3621}
3506 3622
3507sub main { 3623sub main {
3508 cf::init_globals; # initialise logging 3624 cf::init_globals; # initialise logging
3509 3625
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3626 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3627 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3628 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3629 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514
3515 cf::init_experience;
3516 cf::init_anim;
3517 cf::init_attackmess;
3518 cf::init_dynamic;
3519 3630
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3631 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3632
3522 # we must not ever block the main coroutine 3633 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3634 local $Coro::idle = sub {
… …
3529 }; 3640 };
3530 3641
3531 evthread_start IO::AIO::poll_fileno; 3642 evthread_start IO::AIO::poll_fileno;
3532 3643
3533 cf::sync_job { 3644 cf::sync_job {
3645 cf::incloader::init ();
3646
3647 cf::init_anim;
3648 cf::init_attackmess;
3649 cf::init_dynamic;
3650
3534 cf::load_settings; 3651 cf::load_settings;
3535 cf::load_materials;
3536 3652
3537 reload_resources; 3653 reload_resources;
3538 reload_config; 3654 reload_config;
3539 db_init; 3655 db_init;
3540 3656
3541 cf::init_uuid; 3657 cf::init_uuid;
3542 cf::init_signals; 3658 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3659 cf::init_skills;
3545 3660
3546 cf::init_beforeplay; 3661 cf::init_beforeplay;
3547 3662
3548 atomic; 3663 atomic;
… …
3553 3668
3554 # no (long-running) fork's whatsoever before this point(!) 3669 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3670 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3671 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3672
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3673 cf::_post_init 0;
3559 }; 3674 };
3560 3675
3676 cf::object::thawer::errors_are_fatal 0;
3677 info "parse errors in files are no longer fatal from this point on.\n";
3678
3679 my $free_main; $free_main = EV::idle sub {
3680 undef $free_main;
3681 undef &main; # free gobs of memory :)
3682 };
3683
3561 main_loop; 3684 goto &main_loop;
3562} 3685}
3563 3686
3564############################################################################# 3687#############################################################################
3565# initialisation and cleanup 3688# initialisation and cleanup
3566 3689
3567# install some emergency cleanup handlers 3690# install some emergency cleanup handlers
3568BEGIN { 3691BEGIN {
3569 our %SIGWATCHER = (); 3692 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3693 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3694 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3695 cf::cleanup "SIG$signal";
3573 }; 3696 };
3574 } 3697 }
3575} 3698}
3576 3699
3577sub write_runtime_sync { 3700sub write_runtime_sync {
3701 my $t0 = AE::time;
3702
3578 # first touch the runtime file to show we are still running: 3703 # first touch the runtime file to show we are still running:
3579 # the fsync below can take a very very long time. 3704 # the fsync below can take a very very long time.
3580 3705
3581 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3706 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3582 3707
… …
3603 or return; 3728 or return;
3604 3729
3605 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3730 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3606 and return; 3731 and return;
3607 3732
3608 warn "runtime file written.\n"; 3733 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3609 3734
3610 1 3735 1
3611} 3736}
3612 3737
3613our $uuid_lock; 3738our $uuid_lock;
… …
3625 or return; 3750 or return;
3626 3751
3627 my $value = uuid_seq uuid_cur; 3752 my $value = uuid_seq uuid_cur;
3628 3753
3629 unless ($value) { 3754 unless ($value) {
3630 warn "cowardly refusing to write zero uuid value!\n"; 3755 info "cowardly refusing to write zero uuid value!\n";
3631 return; 3756 return;
3632 } 3757 }
3633 3758
3634 my $value = uuid_str $value + $uuid_skip; 3759 my $value = uuid_str $value + $uuid_skip;
3635 $uuid_skip = 0; 3760 $uuid_skip = 0;
… …
3645 or return; 3770 or return;
3646 3771
3647 aio_rename "$uuid~", $uuid 3772 aio_rename "$uuid~", $uuid
3648 and return; 3773 and return;
3649 3774
3650 warn "uuid file written ($value).\n"; 3775 trace "uuid file written ($value).\n";
3651 3776
3652 1 3777 1
3653 3778
3654} 3779}
3655 3780
… …
3661} 3786}
3662 3787
3663sub emergency_save() { 3788sub emergency_save() {
3664 my $freeze_guard = cf::freeze_mainloop; 3789 my $freeze_guard = cf::freeze_mainloop;
3665 3790
3666 warn "emergency_perl_save: enter\n"; 3791 info "emergency_perl_save: enter\n";
3792
3793 # this is a trade-off: we want to be very quick here, so
3794 # save all maps without fsync, and later call a global sync
3795 # (which in turn might be very very slow)
3796 local $USE_FSYNC = 0;
3667 3797
3668 cf::sync_job { 3798 cf::sync_job {
3669 # this is a trade-off: we want to be very quick here, so 3799 cf::write_runtime_sync; # external watchdog should not bark
3670 # save all maps without fsync, and later call a global sync
3671 # (which in turn might be very very slow)
3672 local $USE_FSYNC = 0;
3673 3800
3674 # use a peculiar iteration method to avoid tripping on perl 3801 # use a peculiar iteration method to avoid tripping on perl
3675 # refcount bugs in for. also avoids problems with players 3802 # refcount bugs in for. also avoids problems with players
3676 # and maps saved/destroyed asynchronously. 3803 # and maps saved/destroyed asynchronously.
3677 warn "emergency_perl_save: begin player save\n"; 3804 info "emergency_perl_save: begin player save\n";
3678 for my $login (keys %cf::PLAYER) { 3805 for my $login (keys %cf::PLAYER) {
3679 my $pl = $cf::PLAYER{$login} or next; 3806 my $pl = $cf::PLAYER{$login} or next;
3680 $pl->valid or next; 3807 $pl->valid or next;
3681 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3808 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3682 $pl->save; 3809 $pl->save;
3683 } 3810 }
3684 warn "emergency_perl_save: end player save\n"; 3811 info "emergency_perl_save: end player save\n";
3685 3812
3813 cf::write_runtime_sync; # external watchdog should not bark
3814
3686 warn "emergency_perl_save: begin map save\n"; 3815 info "emergency_perl_save: begin map save\n";
3687 for my $path (keys %cf::MAP) { 3816 for my $path (keys %cf::MAP) {
3688 my $map = $cf::MAP{$path} or next; 3817 my $map = $cf::MAP{$path} or next;
3689 $map->valid or next; 3818 $map->valid or next;
3690 $map->save; 3819 $map->save;
3691 } 3820 }
3692 warn "emergency_perl_save: end map save\n"; 3821 info "emergency_perl_save: end map save\n";
3693 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3694 warn "emergency_perl_save: begin database checkpoint\n"; 3825 info "emergency_perl_save: begin database checkpoint\n";
3695 BDB::db_env_txn_checkpoint $DB_ENV; 3826 BDB::db_env_txn_checkpoint $DB_ENV;
3696 warn "emergency_perl_save: end database checkpoint\n"; 3827 info "emergency_perl_save: end database checkpoint\n";
3697 3828
3698 warn "emergency_perl_save: begin write uuid\n"; 3829 info "emergency_perl_save: begin write uuid\n";
3699 write_uuid_sync 1; 3830 write_uuid_sync 1;
3700 warn "emergency_perl_save: end write uuid\n"; 3831 info "emergency_perl_save: end write uuid\n";
3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3835 trace "emergency_perl_save: syncing database to disk";
3836 BDB::db_env_txn_checkpoint $DB_ENV;
3837
3838 info "emergency_perl_save: starting sync\n";
3839 IO::AIO::aio_sync sub {
3840 info "emergency_perl_save: finished sync\n";
3841 };
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: flushing outstanding aio requests";
3846 while (IO::AIO::nreqs || BDB::nreqs) {
3847 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848 }
3849
3850 cf::write_runtime_sync; # external watchdog should not bark
3701 }; 3851 };
3702 3852
3703 warn "emergency_perl_save: starting sync()\n";
3704 IO::AIO::aio_sync sub {
3705 warn "emergency_perl_save: finished sync()\n";
3706 };
3707
3708 warn "emergency_perl_save: leave\n"; 3853 info "emergency_perl_save: leave\n";
3709} 3854}
3710 3855
3711sub post_cleanup { 3856sub post_cleanup {
3712 my ($make_core) = @_; 3857 my ($make_core) = @_;
3713 3858
3859 IO::AIO::flush;
3860
3714 warn Carp::longmess "post_cleanup backtrace" 3861 error Carp::longmess "post_cleanup backtrace"
3715 if $make_core; 3862 if $make_core;
3716 3863
3717 my $fh = pidfile; 3864 my $fh = pidfile;
3718 unlink $PIDFILE if <$fh> == $$; 3865 unlink $PIDFILE if <$fh> == $$;
3719} 3866}
… …
3739 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3886 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740 for my $name (keys %$leaf_symtab) { 3887 for my $name (keys %$leaf_symtab) {
3741 _gv_clear *{"$pkg$name"}; 3888 _gv_clear *{"$pkg$name"};
3742# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3889# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743 } 3890 }
3744 warn "cleared package $pkg\n";#d#
3745} 3891}
3746 3892
3747sub do_reload_perl() { 3893sub do_reload_perl() {
3748 # can/must only be called in main 3894 # can/must only be called in main
3749 if ($Coro::current != $Coro::main) { 3895 unless (in_main) {
3750 warn "can only reload from main coroutine"; 3896 error "can only reload from main coroutine";
3751 return; 3897 return;
3752 } 3898 }
3753 3899
3754 return if $RELOAD++; 3900 return if $RELOAD++;
3755 3901
3756 my $t1 = EV::time; 3902 my $t1 = AE::time;
3757 3903
3758 while ($RELOAD) { 3904 while ($RELOAD) {
3759 warn "reloading..."; 3905 cf::get_slot 0.1, -1, "reload_perl";
3906 info "perl_reload: reloading...";
3760 3907
3761 warn "entering sync_job"; 3908 trace "perl_reload: entering sync_job";
3762 3909
3763 cf::sync_job { 3910 cf::sync_job {
3764 cf::write_runtime_sync; # external watchdog should not bark
3765 cf::emergency_save; 3911 #cf::emergency_save;
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 3912
3768 warn "syncing database to disk";
3769 BDB::db_env_txn_checkpoint $DB_ENV;
3770
3771 # if anything goes wrong in here, we should simply crash as we already saved
3772
3773 warn "flushing outstanding aio requests";
3774 while (IO::AIO::nreqs || BDB::nreqs) {
3775 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3776 }
3777
3778 warn "cancelling all extension coros"; 3913 trace "perl_reload: cancelling all extension coros";
3779 $_->cancel for values %EXT_CORO; 3914 $_->cancel for values %EXT_CORO;
3780 %EXT_CORO = (); 3915 %EXT_CORO = ();
3781 3916
3782 warn "removing commands"; 3917 trace "perl_reload: removing commands";
3783 %COMMAND = (); 3918 %COMMAND = ();
3784 3919
3785 warn "removing ext/exti commands"; 3920 trace "perl_reload: removing ext/exti commands";
3786 %EXTCMD = (); 3921 %EXTCMD = ();
3787 %EXTICMD = (); 3922 %EXTICMD = ();
3788 3923
3789 warn "unloading/nuking all extensions"; 3924 trace "perl_reload: unloading/nuking all extensions";
3790 for my $pkg (@EXTS) { 3925 for my $pkg (@EXTS) {
3791 warn "... unloading $pkg"; 3926 trace "... unloading $pkg";
3792 3927
3793 if (my $cb = $pkg->can ("unload")) { 3928 if (my $cb = $pkg->can ("unload")) {
3794 eval { 3929 eval {
3795 $cb->($pkg); 3930 $cb->($pkg);
3796 1 3931 1
3797 } or warn "$pkg unloaded, but with errors: $@"; 3932 } or error "$pkg unloaded, but with errors: $@";
3798 } 3933 }
3799 3934
3800 warn "... clearing $pkg"; 3935 trace "... clearing $pkg";
3801 clear_package $pkg; 3936 clear_package $pkg;
3802 } 3937 }
3803 3938
3804 warn "unloading all perl modules loaded from $LIBDIR"; 3939 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3805 while (my ($k, $v) = each %INC) { 3940 while (my ($k, $v) = each %INC) {
3806 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3941 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807 3942
3808 warn "... unloading $k"; 3943 trace "... unloading $k";
3809 delete $INC{$k}; 3944 delete $INC{$k};
3810 3945
3811 $k =~ s/\.pm$//; 3946 $k =~ s/\.pm$//;
3812 $k =~ s/\//::/g; 3947 $k =~ s/\//::/g;
3813 3948
… …
3816 } 3951 }
3817 3952
3818 clear_package $k; 3953 clear_package $k;
3819 } 3954 }
3820 3955
3821 warn "getting rid of safe::, as good as possible"; 3956 trace "perl_reload: getting rid of safe::, as good as possible";
3822 clear_package "safe::$_" 3957 clear_package "safe::$_"
3823 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3958 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3824 3959
3825 warn "unloading cf.pm \"a bit\""; 3960 trace "perl_reload: unloading cf.pm \"a bit\"";
3826 delete $INC{"cf.pm"}; 3961 delete $INC{"cf.pm"};
3827 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3962 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3828 3963
3829 # don't, removes xs symbols, too, 3964 # don't, removes xs symbols, too,
3830 # and global variables created in xs 3965 # and global variables created in xs
3831 #clear_package __PACKAGE__; 3966 #clear_package __PACKAGE__;
3832 3967
3833 warn "unload completed, starting to reload now"; 3968 info "perl_reload: unload completed, starting to reload now";
3834 3969
3835 warn "reloading cf.pm"; 3970 trace "perl_reload: reloading cf.pm";
3836 require cf; 3971 require cf;
3837 cf::_connect_to_perl_1; 3972 cf::_connect_to_perl_1;
3838 3973
3839 warn "loading config and database again"; 3974 trace "perl_reload: loading config and database again";
3840 cf::reload_config; 3975 cf::reload_config;
3841 3976
3842 warn "loading extensions"; 3977 trace "perl_reload: loading extensions";
3843 cf::load_extensions; 3978 cf::load_extensions;
3844 3979
3845 if ($REATTACH_ON_RELOAD) { 3980 if ($REATTACH_ON_RELOAD) {
3846 warn "reattaching attachments to objects/players"; 3981 trace "perl_reload: reattaching attachments to objects/players";
3847 _global_reattach; # objects, sockets 3982 _global_reattach; # objects, sockets
3848 warn "reattaching attachments to maps"; 3983 trace "perl_reload: reattaching attachments to maps";
3849 reattach $_ for values %MAP; 3984 reattach $_ for values %MAP;
3850 warn "reattaching attachments to players"; 3985 trace "perl_reload: reattaching attachments to players";
3851 reattach $_ for values %PLAYER; 3986 reattach $_ for values %PLAYER;
3852 } 3987 }
3853 3988
3854 warn "running post_init jobs"; 3989 cf::_post_init 1;
3855 (pop @POST_INIT)->(1) while @POST_INIT;
3856 3990
3857 warn "leaving sync_job"; 3991 trace "perl_reload: leaving sync_job";
3858 3992
3859 1 3993 1
3860 } or do { 3994 } or do {
3861 warn $@; 3995 error $@;
3862 cf::cleanup "error while reloading, exiting."; 3996 cf::cleanup "perl_reload: error, exiting.";
3863 }; 3997 };
3864 3998
3865 warn "reloaded";
3866 --$RELOAD; 3999 --$RELOAD;
3867 } 4000 }
3868 4001
3869 $t1 = EV::time - $t1; 4002 $t1 = AE::time - $t1;
3870 warn "reload completed in ${t1}s\n"; 4003 info "perl_reload: completed in ${t1}s\n";
3871}; 4004};
3872 4005
3873our $RELOAD_WATCHER; # used only during reload 4006our $RELOAD_WATCHER; # used only during reload
3874 4007
3875sub reload_perl() { 4008sub reload_perl() {
… …
3877 # coro crashes during coro_state_free->destroy here. 4010 # coro crashes during coro_state_free->destroy here.
3878 4011
3879 $RELOAD_WATCHER ||= cf::async { 4012 $RELOAD_WATCHER ||= cf::async {
3880 Coro::AIO::aio_wait cache_extensions; 4013 Coro::AIO::aio_wait cache_extensions;
3881 4014
3882 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4015 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3883 do_reload_perl; 4016 do_reload_perl;
3884 undef $RELOAD_WATCHER; 4017 undef $RELOAD_WATCHER;
3885 }; 4018 };
3886 }; 4019 };
3887} 4020}
… …
3896 reload_perl; 4029 reload_perl;
3897 }; 4030 };
3898 } 4031 }
3899}; 4032};
3900 4033
3901unshift @INC, $LIBDIR; 4034#############################################################################
3902 4035
3903my $bug_warning = 0; 4036my $bug_warning = 0;
3904 4037
3905our @WAIT_FOR_TICK; 4038our @WAIT_FOR_TICK;
3906our @WAIT_FOR_TICK_BEGIN; 4039our @WAIT_FOR_TICK_BEGIN;
3907 4040
3908sub wait_for_tick { 4041sub wait_for_tick() {
3909 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4042 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3910 4043
3911 my $signal = new Coro::Signal; 4044 my $signal = new Coro::Signal;
3912 push @WAIT_FOR_TICK, $signal; 4045 push @WAIT_FOR_TICK, $signal;
3913 $signal->wait; 4046 $signal->wait;
3914} 4047}
3915 4048
3916sub wait_for_tick_begin { 4049sub wait_for_tick_begin() {
3917 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4050 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3918 4051
3919 my $signal = new Coro::Signal; 4052 my $signal = new Coro::Signal;
3920 push @WAIT_FOR_TICK_BEGIN, $signal; 4053 push @WAIT_FOR_TICK_BEGIN, $signal;
3921 $signal->wait; 4054 $signal->wait;
… …
3928 return; 4061 return;
3929 } 4062 }
3930 4063
3931 cf::server_tick; # one server iteration 4064 cf::server_tick; # one server iteration
3932 4065
3933 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4066 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3934 4067
3935 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4068 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3936 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4069 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3937 Coro::async_pool { 4070 Coro::async_pool {
3938 $Coro::current->{desc} = "runtime saver"; 4071 $Coro::current->{desc} = "runtime saver";
3939 write_runtime_sync 4072 write_runtime_sync
3940 or warn "ERROR: unable to write runtime file: $!"; 4073 or error "ERROR: unable to write runtime file: $!";
3941 }; 4074 };
3942 } 4075 }
3943 4076
3944 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4077 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3945 $sig->send; 4078 $sig->send;
… …
3953 4086
3954 if (0) { 4087 if (0) {
3955 if ($NEXT_TICK) { 4088 if ($NEXT_TICK) {
3956 my $jitter = $TICK_START - $NEXT_TICK; 4089 my $jitter = $TICK_START - $NEXT_TICK;
3957 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4090 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958 warn "jitter $JITTER\n";#d# 4091 debug "jitter $JITTER\n";#d#
3959 } 4092 }
3960 } 4093 }
3961} 4094}
3962 4095
3963{ 4096{
… …
4008 IO::AIO::min_parallel 8; 4141 IO::AIO::min_parallel 8;
4009 IO::AIO::max_poll_time $TICK * 0.1; 4142 IO::AIO::max_poll_time $TICK * 0.1;
4010 undef $AnyEvent::AIO::WATCHER; 4143 undef $AnyEvent::AIO::WATCHER;
4011} 4144}
4012 4145
4013my $_log_backtrace; 4146our $_log_backtrace;
4147our $_log_backtrace_last;
4014 4148
4015sub _log_backtrace { 4149sub _log_backtrace {
4016 my ($msg, @addr) = @_; 4150 my ($msg, @addr) = @_;
4017 4151
4018 $msg =~ s/\n//; 4152 $msg =~ s/\n$//;
4019 4153
4154 if ($_log_backtrace_last eq $msg) {
4155 LOG llevInfo, "[ABT] $msg\n";
4156 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4020 # limit the # of concurrent backtraces 4157 # limit the # of concurrent backtraces
4021 if ($_log_backtrace < 2) { 4158 } elsif ($_log_backtrace < 2) {
4159 $_log_backtrace_last = $msg;
4022 ++$_log_backtrace; 4160 ++$_log_backtrace;
4023 my $perl_bt = Carp::longmess $msg; 4161 my $perl_bt = Carp::longmess $msg;
4024 async { 4162 async {
4025 $Coro::current->{desc} = "abt $msg"; 4163 $Coro::current->{desc} = "abt $msg";
4026 4164
… …
4046 LOG llevInfo, "[ABT] $_\n" for @bt; 4184 LOG llevInfo, "[ABT] $_\n" for @bt;
4047 --$_log_backtrace; 4185 --$_log_backtrace;
4048 }; 4186 };
4049 } else { 4187 } else {
4050 LOG llevInfo, "[ABT] $msg\n"; 4188 LOG llevInfo, "[ABT] $msg\n";
4051 LOG llevInfo, "[ABT] [suppressed]\n"; 4189 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4052 } 4190 }
4053} 4191}
4054 4192
4055# load additional modules 4193# load additional modules
4056require "cf/$_.pm" for @EXTRA_MODULES; 4194require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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