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.506 by root, Wed Feb 3 20:48:22 2010 UTC vs.
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC

… …
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
78# strictly for debugging 76# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 78
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 80
81our @ORIG_INC;
82
83our %COMMAND = (); 83our %COMMAND = ();
84our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85 85
86our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 87our %EXTCMD = ();
… …
106our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 110
111our %RESOURCE; 111our %RESOURCE; # unused
112
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
… …
1310} 1378}
1311 1379
1312use File::Glob (); 1380use File::Glob ();
1313 1381
1314cf::player->attach ( 1382cf::player->attach (
1315 on_command => sub { 1383 on_unknown_command => sub {
1316 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1317 1385
1318 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1319 or return; 1387 or return;
1320 1388
… …
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},
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;
2096}
2097 2178
2179 1
2180}
2181
2182# customize the map for a given player, i.e.
2183# return the _real_ map. used by e.g. per-player
2184# maps to change the path to ~playername/mappath
2098sub customise_for { 2185sub customise_for {
2099 my ($self, $ob) = @_; 2186 my ($self, $ob) = @_;
2100 2187
2101 return find "~" . $ob->name . "/" . $self->{path} 2188 return find "~" . $ob->name . "/" . $self->{path}
2102 if $self->per_player; 2189 if $self->per_player;
… …
2118 or next; 2205 or next;
2119 $neigh = find $neigh, $map 2206 $neigh = find $neigh, $map
2120 or next; 2207 or next;
2121 $neigh->load; 2208 $neigh->load;
2122 2209
2210 # now find the diagonal neighbours
2123 push @neigh, 2211 push @neigh,
2124 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2212 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2125 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2213 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2126 } 2214 }
2127 2215
… …
2134} 2222}
2135 2223
2136sub find_sync { 2224sub find_sync {
2137 my ($path, $origin) = @_; 2225 my ($path, $origin) = @_;
2138 2226
2139 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
2140} 2231}
2141 2232
2142sub do_load_sync { 2233sub do_load_sync {
2143 my ($map) = @_; 2234 my ($map) = @_;
2144 2235
2145 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2236 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146 if $Coro::current == $Coro::main; 2237 if $Coro::current == $Coro::main;
2147 2238
2148 cf::sync_job { $map->load }; 2239 $map->load;
2149} 2240}
2150 2241
2151our %MAP_PREFETCH; 2242our %MAP_PREFETCH;
2152our $MAP_PREFETCHER = undef; 2243our $MAP_PREFETCHER = undef;
2153 2244
… …
2179 $MAP_PREFETCHER->prio (6); 2270 $MAP_PREFETCHER->prio (6);
2180 2271
2181 () 2272 ()
2182} 2273}
2183 2274
2275# common code, used by both ->save and ->swapout
2184sub save { 2276sub _save {
2185 my ($self) = @_; 2277 my ($self) = @_;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2278
2189 $self->{last_save} = $cf::RUNTIME; 2279 $self->{last_save} = $cf::RUNTIME;
2190 2280
2191 return unless $self->dirty; 2281 return unless $self->dirty;
2192 2282
… …
2212 } else { 2302 } else {
2213 $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);
2214 } 2304 }
2215} 2305}
2216 2306
2307sub save {
2308 my ($self) = @_;
2309
2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311
2312 $self->_save;
2313}
2314
2217sub swap_out { 2315sub swap_out {
2218 my ($self) = @_; 2316 my ($self) = @_;
2219 2317
2220 # save first because save cedes
2221 $self->save;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2318 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2319
2225 return if $self->players;
2226 return if $self->in_memory != cf::MAP_ACTIVE; 2320 return if $self->in_memory != cf::MAP_ACTIVE;
2227 return if $self->{deny_save}; 2321 return if $self->{deny_save};
2322 return if $self->players;
2228 2323
2324 # first deactivate the map and "unlink" it from the core
2325 $self->deactivate;
2326 $_->clear_links_to ($self) for values %cf::MAP;
2229 $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};
2230 2374
2231 $self->deactivate; 2375 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP; 2376 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear; 2377 $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 2378
2279 $self->unlink_save; 2379 $self->unlink_save;
2280 $self->destroy; 2380 $self->destroy;
2281} 2381}
2282 2382
… …
2290 2390
2291 delete $cf::MAP{$self->path}; 2391 delete $cf::MAP{$self->path};
2292 2392
2293 $self->unlink_save; 2393 $self->unlink_save;
2294 2394
2295 bless $self, "cf::map"; 2395 bless $self, "cf::map::wrap";
2296 delete $self->{deny_reset}; 2396 delete $self->{deny_reset};
2297 $self->{deny_save} = 1; 2397 $self->{deny_save} = 1;
2298 $self->reset_timeout (1); 2398 $self->reset_timeout (1);
2299 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2399 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300 2400
… …
2530 2630
2531Freezes 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}>).
2532 2632
2533The 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.
2534for 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,
2535though, 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
2536map. 2636map.
2537 2637
2538Will never block. 2638Will never block.
2539 2639
2540=item $player_object->leave_link ($map, $x, $y) 2640=item $player_object->leave_link ($map, $x, $y)
… …
2561sub cf::object::player::enter_link { 2661sub cf::object::player::enter_link {
2562 my ($self) = @_; 2662 my ($self) = @_;
2563 2663
2564 $self->deactivate_recursive; 2664 $self->deactivate_recursive;
2565 2665
2666 ++$self->{_link_recursion};
2667
2566 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2668 return if UNIVERSAL::isa $self->map, "ext::map_link";
2567 2669
2568 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2670 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569 if $self->map && $self->map->{path} ne "{link}"; 2671 if $self->map && $self->map->{path} ne "{link}";
2570 2672
2571 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2673 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2572} 2674}
2573 2675
2574sub cf::object::player::leave_link { 2676sub cf::object::player::leave_link {
2575 my ($self, $map, $x, $y) = @_; 2677 my ($self, $map, $x, $y) = @_;
2576 2678
… …
2601 $map->load_neighbours; 2703 $map->load_neighbours;
2602 2704
2603 return unless $self->contr->active; 2705 return unless $self->contr->active;
2604 2706
2605 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2707 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606 $self->enter_map ($map, $x, $y); 2708 if ($self->enter_map ($map, $x, $y)) {
2607 2709 # entering was successful
2710 delete $self->{_link_recursion};
2608 # only activate afterwards, to support waiting in hooks 2711 # only activate afterwards, to support waiting in hooks
2609 $self->activate_recursive; 2712 $self->activate_recursive;
2610} 2713 }
2611 2714
2715}
2716
2612=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)]])
2613 2718
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2720her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
… …
2624 2729
2625our $GOTOGEN; 2730our $GOTOGEN;
2626 2731
2627sub cf::object::player::goto { 2732sub cf::object::player::goto {
2628 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 }
2629 2740
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2742 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2743
2633 $self->enter_link; 2744 $self->enter_link;
… …
2657 my $map = eval { 2768 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2769 my $map = defined $path ? cf::map::find $path : undef;
2659 2770
2660 if ($map) { 2771 if ($map) {
2661 $map = $map->customise_for ($self); 2772 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2773 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2774 } else {
2664 $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);
2665 } 2776 }
2666 2777
2667 $map 2778 $map
… …
2675 if ($gen == $self->{_goto_generation}) { 2786 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2787 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2788 $self->leave_link ($map, $x, $y);
2678 } 2789 }
2679 2790
2680 $done->() if $done; 2791 $done->($self) if $done;
2681 })->prio (1); 2792 })->prio (1);
2682} 2793}
2683 2794
2684=item $player_object->enter_exit ($exit_object) 2795=item $player_object->enter_exit ($exit_object)
2685 2796
… …
2778 $self->message ("Something went wrong deep within the deliantra server. " 2889 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 2891 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 2892 cf::NDI_UNIQUE | cf::NDI_RED);
2782 2893
2783 warn "ERROR in enter_exit: $@"; 2894 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 2895 $self->leave_link;
2785 } 2896 }
2786 })->prio (1); 2897 })->prio (1);
2787} 2898}
2788 2899
… …
3101 3212
3102 $ns->ext_reply ($reply, @reply) 3213 $ns->ext_reply ($reply, @reply)
3103 if $reply; 3214 if $reply;
3104 3215
3105 } else { 3216 } else {
3106 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";
3107 } 3218 }
3108 3219
3109 cf::override; 3220 cf::override;
3110 }, 3221 },
3111); 3222);
… …
3131 3242
3132 $coro 3243 $coro
3133} 3244}
3134 3245
3135cf::client->attach ( 3246cf::client->attach (
3136 on_destroy => sub { 3247 on_client_destroy => sub {
3137 my ($ns) = @_; 3248 my ($ns) = @_;
3138 3249
3139 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3250 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140 }, 3251 },
3141); 3252);
… …
3192 decrease split destroy change_exp value msg lore send_msg)], 3303 decrease split destroy change_exp value msg lore send_msg)],
3193 ["cf::object::player" => qw(player)], 3304 ["cf::object::player" => qw(player)],
3194 ["cf::player" => qw(peaceful send_msg)], 3305 ["cf::player" => qw(peaceful send_msg)],
3195 ["cf::map" => qw(trigger)], 3306 ["cf::map" => qw(trigger)],
3196) { 3307) {
3197 no strict 'refs';
3198 my ($pkg, @funs) = @$_; 3308 my ($pkg, @funs) = @$_;
3199 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3309 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200 for @funs; 3310 for @funs;
3201} 3311}
3202 3312
… …
3241 local @cf::_safe_eval_args = values %vars; 3351 local @cf::_safe_eval_args = values %vars;
3242 @res = wantarray ? eval eval : scalar eval $eval; 3352 @res = wantarray ? eval eval : scalar eval $eval;
3243 } 3353 }
3244 3354
3245 if ($@) { 3355 if ($@) {
3246 warn "$@"; 3356 warn "$@",
3247 warn "while executing safe code '$code'\n"; 3357 "while executing safe code '$code'\n",
3248 warn "with arguments " . (join " ", %vars) . "\n"; 3358 "with arguments " . (join " ", %vars) . "\n";
3249 } 3359 }
3250 3360
3251 wantarray ? @res : $res[0] 3361 wantarray ? @res : $res[0]
3252} 3362}
3253 3363
… …
3287 # for this (global event?) 3397 # for this (global event?)
3288 %ext::player_env::MUSIC_FACE_CACHE = (); 3398 %ext::player_env::MUSIC_FACE_CACHE = ();
3289 3399
3290 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3400 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291 3401
3292 warn "loading facedata from $path\n"; 3402 trace "loading facedata from $path\n";
3293 3403
3294 my $facedata;
3295 0 < aio_load $path, $facedata 3404 0 < aio_load $path, my $facedata
3296 or die "$path: $!"; 3405 or die "$path: $!";
3297 3406
3298 $facedata = Coro::Storable::thaw $facedata; 3407 $facedata = Coro::Storable::thaw $facedata;
3299 3408
3300 $facedata->{version} == 2 3409 $facedata->{version} == 2
… …
3317 3426
3318 cf::face::set_visibility $idx, $info->{visibility}; 3427 cf::face::set_visibility $idx, $info->{visibility};
3319 cf::face::set_magicmap $idx, $info->{magicmap}; 3428 cf::face::set_magicmap $idx, $info->{magicmap};
3320 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3429 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3430 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3322 3432
3323 cf::cede_to_tick; 3433 cf::cede_to_tick;
3324 } 3434 }
3325 3435
3326 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
… …
3331 3441
3332 if (my $smooth = cf::face::find $info->{smooth}) { 3442 if (my $smooth = cf::face::find $info->{smooth}) {
3333 cf::face::set_smooth $idx, $smooth; 3443 cf::face::set_smooth $idx, $smooth;
3334 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3444 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335 } else { 3445 } else {
3336 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3446 error "smooth face '$info->{smooth}' not found for face '$face'";
3337 } 3447 }
3338 3448
3339 cf::cede_to_tick; 3449 cf::cede_to_tick;
3340 } 3450 }
3341 } 3451 }
… …
3359 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3469 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360 3470
3361 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3471 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362 cf::face::set_type $idx, $info->{type}; 3472 cf::face::set_type $idx, $info->{type};
3363 } else { 3473 } else {
3364 $RESOURCE{$name} = $info; 3474 $RESOURCE{$name} = $info; # unused
3365 } 3475 }
3366 3476
3367 cf::cede_to_tick; 3477 cf::cede_to_tick;
3368 } 3478 }
3369 } 3479 }
3370 3480
3371 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3481 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372 3482
3373 1 3483 1
3374} 3484}
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 3485
3396register_exticmd fx_want => sub { 3486register_exticmd fx_want => sub {
3397 my ($ns, $want) = @_; 3487 my ($ns, $want) = @_;
3398 3488
3399 while (my ($k, $v) = each %$want) { 3489 while (my ($k, $v) = each %$want) {
… …
3438sub reload_treasures { 3528sub reload_treasures {
3439 load_resource_file "$DATADIR/treasures" 3529 load_resource_file "$DATADIR/treasures"
3440 or die "unable to load treasurelists\n"; 3530 or die "unable to load treasurelists\n";
3441} 3531}
3442 3532
3533sub reload_sound {
3534 trace "loading sound config from $DATADIR/sound\n";
3535
3536 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537 or die "$DATADIR/sound $!";
3538
3539 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3540
3541 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542 my $sound = $soundconf->{compat}[$_]
3543 or next;
3544
3545 my $face = cf::face::find "sound/$sound->[1]";
3546 cf::sound::set $sound->[0] => $face;
3547 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3548 }
3549
3550 while (my ($k, $v) = each %{$soundconf->{event}}) {
3551 my $face = cf::face::find "sound/$v";
3552 cf::sound::set $k => $face;
3553 }
3554}
3555
3443sub reload_resources { 3556sub reload_resources {
3444 warn "reloading resource files...\n"; 3557 trace "reloading resource files...\n";
3445 3558
3559 reload_exp_table;
3560 reload_materials;
3446 reload_facedata; 3561 reload_facedata;
3562 reload_sound;
3447 reload_archetypes; 3563 reload_archetypes;
3448 reload_regions; 3564 reload_regions;
3449 reload_treasures; 3565 reload_treasures;
3450 3566
3451 warn "finished reloading resource files\n"; 3567 trace "finished reloading resource files\n";
3452} 3568}
3453 3569
3454sub reload_config { 3570sub reload_config {
3455 warn "reloading config file...\n"; 3571 trace "reloading config file...\n";
3456 3572
3457 open my $fh, "<:utf8", "$CONFDIR/config" 3573 0 < aio_load "$CONFDIR/config", my $config
3458 or return; 3574 or die "$CONFDIR/config: $!";
3459 3575
3460 local $/; 3576 utf8::decode $config;
3461 *CFG = YAML::XS::Load scalar <$fh>; 3577 *CFG = yaml_load $config;
3462 3578
3463 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3579 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464 3580
3465 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3581 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3582 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467 3583
3468 if (exists $CFG{mlockall}) { 3584 if (exists $CFG{mlockall}) {
… …
3470 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3586 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471 and die "WARNING: m(un)lockall failed: $!\n"; 3587 and die "WARNING: m(un)lockall failed: $!\n";
3472 }; 3588 };
3473 warn $@ if $@; 3589 warn $@ if $@;
3474 } 3590 }
3475
3476 warn "finished reloading resource files\n";
3477} 3591}
3478 3592
3479sub pidfile() { 3593sub pidfile() {
3480 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3594 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481 or die "$PIDFILE: $!"; 3595 or die "$PIDFILE: $!";
… …
3494 seek $fh, 0, 0; 3608 seek $fh, 0, 0;
3495 print $fh $$; 3609 print $fh $$;
3496} 3610}
3497 3611
3498sub main_loop { 3612sub main_loop {
3499 warn "EV::loop starting\n"; 3613 trace "EV::loop starting\n";
3500 if (1) { 3614 if (1) {
3501 EV::loop; 3615 EV::loop;
3502 } 3616 }
3503 warn "EV::loop returned\n"; 3617 trace "EV::loop returned\n";
3504 goto &main_loop unless $REALLY_UNLOOP; 3618 goto &main_loop unless $REALLY_UNLOOP;
3505} 3619}
3506 3620
3507sub main { 3621sub main {
3508 cf::init_globals; # initialise logging 3622 cf::init_globals; # initialise logging
3509 3623
3510 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3624 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3625 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3626 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3627 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 3628
3520 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3629 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521 3630
3522 # we must not ever block the main coroutine 3631 # we must not ever block the main coroutine
3523 local $Coro::idle = sub { 3632 local $Coro::idle = sub {
… …
3529 }; 3638 };
3530 3639
3531 evthread_start IO::AIO::poll_fileno; 3640 evthread_start IO::AIO::poll_fileno;
3532 3641
3533 cf::sync_job { 3642 cf::sync_job {
3643 cf::incloader::init ();
3644
3645 cf::init_anim;
3646 cf::init_attackmess;
3647 cf::init_dynamic;
3648
3534 cf::load_settings; 3649 cf::load_settings;
3535 cf::load_materials;
3536 3650
3537 reload_resources; 3651 reload_resources;
3538 reload_config; 3652 reload_config;
3539 db_init; 3653 db_init;
3540 3654
3541 cf::init_uuid; 3655 cf::init_uuid;
3542 cf::init_signals; 3656 cf::init_signals;
3543 cf::init_commands;
3544 cf::init_skills; 3657 cf::init_skills;
3545 3658
3546 cf::init_beforeplay; 3659 cf::init_beforeplay;
3547 3660
3548 atomic; 3661 atomic;
… …
3553 3666
3554 # no (long-running) fork's whatsoever before this point(!) 3667 # no (long-running) fork's whatsoever before this point(!)
3555 use POSIX (); 3668 use POSIX ();
3556 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3669 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557 3670
3558 (pop @POST_INIT)->(0) while @POST_INIT; 3671 cf::_post_init 0;
3559 }; 3672 };
3560 3673
3674 cf::object::thawer::errors_are_fatal 0;
3675 info "parse errors in files are no longer fatal from this point on.\n";
3676
3677 my $free_main; $free_main = EV::idle sub {
3678 undef $free_main;
3679 undef &main; # free gobs of memory :)
3680 };
3681
3561 main_loop; 3682 goto &main_loop;
3562} 3683}
3563 3684
3564############################################################################# 3685#############################################################################
3565# initialisation and cleanup 3686# initialisation and cleanup
3566 3687
3567# install some emergency cleanup handlers 3688# install some emergency cleanup handlers
3568BEGIN { 3689BEGIN {
3569 our %SIGWATCHER = (); 3690 our %SIGWATCHER = ();
3570 for my $signal (qw(INT HUP TERM)) { 3691 for my $signal (qw(INT HUP TERM)) {
3571 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3692 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3572 cf::cleanup "SIG$signal"; 3693 cf::cleanup "SIG$signal";
3573 }; 3694 };
3574 } 3695 }
3575} 3696}
3576 3697
3577sub write_runtime_sync { 3698sub write_runtime_sync {
3578 my $t0 = EV::time; 3699 my $t0 = AE::time;
3579 3700
3580 # first touch the runtime file to show we are still running: 3701 # first touch the runtime file to show we are still running:
3581 # the fsync below can take a very very long time. 3702 # the fsync below can take a very very long time.
3582 3703
3583 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3704 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3605 or return; 3726 or return;
3606 3727
3607 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3728 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3608 and return; 3729 and return;
3609 3730
3610 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3731 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3611 3732
3612 1 3733 1
3613} 3734}
3614 3735
3615our $uuid_lock; 3736our $uuid_lock;
… …
3627 or return; 3748 or return;
3628 3749
3629 my $value = uuid_seq uuid_cur; 3750 my $value = uuid_seq uuid_cur;
3630 3751
3631 unless ($value) { 3752 unless ($value) {
3632 warn "cowardly refusing to write zero uuid value!\n"; 3753 info "cowardly refusing to write zero uuid value!\n";
3633 return; 3754 return;
3634 } 3755 }
3635 3756
3636 my $value = uuid_str $value + $uuid_skip; 3757 my $value = uuid_str $value + $uuid_skip;
3637 $uuid_skip = 0; 3758 $uuid_skip = 0;
… …
3647 or return; 3768 or return;
3648 3769
3649 aio_rename "$uuid~", $uuid 3770 aio_rename "$uuid~", $uuid
3650 and return; 3771 and return;
3651 3772
3652 warn "uuid file written ($value).\n"; 3773 trace "uuid file written ($value).\n";
3653 3774
3654 1 3775 1
3655 3776
3656} 3777}
3657 3778
… …
3663} 3784}
3664 3785
3665sub emergency_save() { 3786sub emergency_save() {
3666 my $freeze_guard = cf::freeze_mainloop; 3787 my $freeze_guard = cf::freeze_mainloop;
3667 3788
3668 warn "emergency_perl_save: enter\n"; 3789 info "emergency_perl_save: enter\n";
3790
3791 # this is a trade-off: we want to be very quick here, so
3792 # save all maps without fsync, and later call a global sync
3793 # (which in turn might be very very slow)
3794 local $USE_FSYNC = 0;
3669 3795
3670 cf::sync_job { 3796 cf::sync_job {
3671 # this is a trade-off: we want to be very quick here, so 3797 cf::write_runtime_sync; # external watchdog should not bark
3672 # save all maps without fsync, and later call a global sync
3673 # (which in turn might be very very slow)
3674 local $USE_FSYNC = 0;
3675 3798
3676 # use a peculiar iteration method to avoid tripping on perl 3799 # use a peculiar iteration method to avoid tripping on perl
3677 # refcount bugs in for. also avoids problems with players 3800 # refcount bugs in for. also avoids problems with players
3678 # and maps saved/destroyed asynchronously. 3801 # and maps saved/destroyed asynchronously.
3679 warn "emergency_perl_save: begin player save\n"; 3802 info "emergency_perl_save: begin player save\n";
3680 for my $login (keys %cf::PLAYER) { 3803 for my $login (keys %cf::PLAYER) {
3681 my $pl = $cf::PLAYER{$login} or next; 3804 my $pl = $cf::PLAYER{$login} or next;
3682 $pl->valid or next; 3805 $pl->valid or next;
3683 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3806 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3684 $pl->save; 3807 $pl->save;
3685 } 3808 }
3686 warn "emergency_perl_save: end player save\n"; 3809 info "emergency_perl_save: end player save\n";
3687 3810
3811 cf::write_runtime_sync; # external watchdog should not bark
3812
3688 warn "emergency_perl_save: begin map save\n"; 3813 info "emergency_perl_save: begin map save\n";
3689 for my $path (keys %cf::MAP) { 3814 for my $path (keys %cf::MAP) {
3690 my $map = $cf::MAP{$path} or next; 3815 my $map = $cf::MAP{$path} or next;
3691 $map->valid or next; 3816 $map->valid or next;
3692 $map->save; 3817 $map->save;
3693 } 3818 }
3694 warn "emergency_perl_save: end map save\n"; 3819 info "emergency_perl_save: end map save\n";
3695 3820
3821 cf::write_runtime_sync; # external watchdog should not bark
3822
3696 warn "emergency_perl_save: begin database checkpoint\n"; 3823 info "emergency_perl_save: begin database checkpoint\n";
3697 BDB::db_env_txn_checkpoint $DB_ENV; 3824 BDB::db_env_txn_checkpoint $DB_ENV;
3698 warn "emergency_perl_save: end database checkpoint\n"; 3825 info "emergency_perl_save: end database checkpoint\n";
3699 3826
3700 warn "emergency_perl_save: begin write uuid\n"; 3827 info "emergency_perl_save: begin write uuid\n";
3701 write_uuid_sync 1; 3828 write_uuid_sync 1;
3702 warn "emergency_perl_save: end write uuid\n"; 3829 info "emergency_perl_save: end write uuid\n";
3830
3831 cf::write_runtime_sync; # external watchdog should not bark
3832
3833 trace "emergency_perl_save: syncing database to disk";
3834 BDB::db_env_txn_checkpoint $DB_ENV;
3835
3836 info "emergency_perl_save: starting sync\n";
3837 IO::AIO::aio_sync sub {
3838 info "emergency_perl_save: finished sync\n";
3839 };
3840
3841 cf::write_runtime_sync; # external watchdog should not bark
3842
3843 trace "emergency_perl_save: flushing outstanding aio requests";
3844 while (IO::AIO::nreqs || BDB::nreqs) {
3845 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3846 }
3847
3848 cf::write_runtime_sync; # external watchdog should not bark
3703 }; 3849 };
3704 3850
3705 warn "emergency_perl_save: starting sync()\n";
3706 IO::AIO::aio_sync sub {
3707 warn "emergency_perl_save: finished sync()\n";
3708 };
3709
3710 warn "emergency_perl_save: leave\n"; 3851 info "emergency_perl_save: leave\n";
3711} 3852}
3712 3853
3713sub post_cleanup { 3854sub post_cleanup {
3714 my ($make_core) = @_; 3855 my ($make_core) = @_;
3715 3856
3857 IO::AIO::flush;
3858
3716 warn Carp::longmess "post_cleanup backtrace" 3859 error Carp::longmess "post_cleanup backtrace"
3717 if $make_core; 3860 if $make_core;
3718 3861
3719 my $fh = pidfile; 3862 my $fh = pidfile;
3720 unlink $PIDFILE if <$fh> == $$; 3863 unlink $PIDFILE if <$fh> == $$;
3721} 3864}
… …
3741 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3884 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3742 for my $name (keys %$leaf_symtab) { 3885 for my $name (keys %$leaf_symtab) {
3743 _gv_clear *{"$pkg$name"}; 3886 _gv_clear *{"$pkg$name"};
3744# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3887# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3745 } 3888 }
3746 warn "cleared package $pkg\n";#d#
3747} 3889}
3748 3890
3749sub do_reload_perl() { 3891sub do_reload_perl() {
3750 # can/must only be called in main 3892 # can/must only be called in main
3751 if ($Coro::current != $Coro::main) { 3893 unless (in_main) {
3752 warn "can only reload from main coroutine"; 3894 error "can only reload from main coroutine";
3753 return; 3895 return;
3754 } 3896 }
3755 3897
3756 return if $RELOAD++; 3898 return if $RELOAD++;
3757 3899
3758 my $t1 = EV::time; 3900 my $t1 = AE::time;
3759 3901
3760 while ($RELOAD) { 3902 while ($RELOAD) {
3761 warn "reloading..."; 3903 cf::get_slot 0.1, -1, "reload_perl";
3904 info "perl_reload: reloading...";
3762 3905
3763 warn "entering sync_job"; 3906 trace "perl_reload: entering sync_job";
3764 3907
3765 cf::sync_job { 3908 cf::sync_job {
3766 cf::write_runtime_sync; # external watchdog should not bark
3767 cf::emergency_save; 3909 #cf::emergency_save;
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 3910
3770 warn "syncing database to disk";
3771 BDB::db_env_txn_checkpoint $DB_ENV;
3772
3773 # if anything goes wrong in here, we should simply crash as we already saved
3774
3775 warn "flushing outstanding aio requests";
3776 while (IO::AIO::nreqs || BDB::nreqs) {
3777 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3778 }
3779
3780 warn "cancelling all extension coros"; 3911 trace "perl_reload: cancelling all extension coros";
3781 $_->cancel for values %EXT_CORO; 3912 $_->cancel for values %EXT_CORO;
3782 %EXT_CORO = (); 3913 %EXT_CORO = ();
3783 3914
3784 warn "removing commands"; 3915 trace "perl_reload: removing commands";
3785 %COMMAND = (); 3916 %COMMAND = ();
3786 3917
3787 warn "removing ext/exti commands"; 3918 trace "perl_reload: removing ext/exti commands";
3788 %EXTCMD = (); 3919 %EXTCMD = ();
3789 %EXTICMD = (); 3920 %EXTICMD = ();
3790 3921
3791 warn "unloading/nuking all extensions"; 3922 trace "perl_reload: unloading/nuking all extensions";
3792 for my $pkg (@EXTS) { 3923 for my $pkg (@EXTS) {
3793 warn "... unloading $pkg"; 3924 trace "... unloading $pkg";
3794 3925
3795 if (my $cb = $pkg->can ("unload")) { 3926 if (my $cb = $pkg->can ("unload")) {
3796 eval { 3927 eval {
3797 $cb->($pkg); 3928 $cb->($pkg);
3798 1 3929 1
3799 } or warn "$pkg unloaded, but with errors: $@"; 3930 } or error "$pkg unloaded, but with errors: $@";
3800 } 3931 }
3801 3932
3802 warn "... clearing $pkg"; 3933 trace "... clearing $pkg";
3803 clear_package $pkg; 3934 clear_package $pkg;
3804 } 3935 }
3805 3936
3806 warn "unloading all perl modules loaded from $LIBDIR"; 3937 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3807 while (my ($k, $v) = each %INC) { 3938 while (my ($k, $v) = each %INC) {
3808 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3939 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3809 3940
3810 warn "... unloading $k"; 3941 trace "... unloading $k";
3811 delete $INC{$k}; 3942 delete $INC{$k};
3812 3943
3813 $k =~ s/\.pm$//; 3944 $k =~ s/\.pm$//;
3814 $k =~ s/\//::/g; 3945 $k =~ s/\//::/g;
3815 3946
… …
3818 } 3949 }
3819 3950
3820 clear_package $k; 3951 clear_package $k;
3821 } 3952 }
3822 3953
3823 warn "getting rid of safe::, as good as possible"; 3954 trace "perl_reload: getting rid of safe::, as good as possible";
3824 clear_package "safe::$_" 3955 clear_package "safe::$_"
3825 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3956 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3826 3957
3827 warn "unloading cf.pm \"a bit\""; 3958 trace "perl_reload: unloading cf.pm \"a bit\"";
3828 delete $INC{"cf.pm"}; 3959 delete $INC{"cf.pm"};
3829 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3960 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3830 3961
3831 # don't, removes xs symbols, too, 3962 # don't, removes xs symbols, too,
3832 # and global variables created in xs 3963 # and global variables created in xs
3833 #clear_package __PACKAGE__; 3964 #clear_package __PACKAGE__;
3834 3965
3835 warn "unload completed, starting to reload now"; 3966 info "perl_reload: unload completed, starting to reload now";
3836 3967
3837 warn "reloading cf.pm"; 3968 trace "perl_reload: reloading cf.pm";
3838 require cf; 3969 require cf;
3839 cf::_connect_to_perl_1; 3970 cf::_connect_to_perl_1;
3840 3971
3841 warn "loading config and database again"; 3972 trace "perl_reload: loading config and database again";
3842 cf::reload_config; 3973 cf::reload_config;
3843 3974
3844 warn "loading extensions"; 3975 trace "perl_reload: loading extensions";
3845 cf::load_extensions; 3976 cf::load_extensions;
3846 3977
3847 if ($REATTACH_ON_RELOAD) { 3978 if ($REATTACH_ON_RELOAD) {
3848 warn "reattaching attachments to objects/players"; 3979 trace "perl_reload: reattaching attachments to objects/players";
3849 _global_reattach; # objects, sockets 3980 _global_reattach; # objects, sockets
3850 warn "reattaching attachments to maps"; 3981 trace "perl_reload: reattaching attachments to maps";
3851 reattach $_ for values %MAP; 3982 reattach $_ for values %MAP;
3852 warn "reattaching attachments to players"; 3983 trace "perl_reload: reattaching attachments to players";
3853 reattach $_ for values %PLAYER; 3984 reattach $_ for values %PLAYER;
3854 } 3985 }
3855 3986
3856 warn "running post_init jobs"; 3987 cf::_post_init 1;
3857 (pop @POST_INIT)->(1) while @POST_INIT;
3858 3988
3859 warn "leaving sync_job"; 3989 trace "perl_reload: leaving sync_job";
3860 3990
3861 1 3991 1
3862 } or do { 3992 } or do {
3863 warn $@; 3993 error $@;
3864 cf::cleanup "error while reloading, exiting."; 3994 cf::cleanup "perl_reload: error, exiting.";
3865 }; 3995 };
3866 3996
3867 warn "reloaded";
3868 --$RELOAD; 3997 --$RELOAD;
3869 } 3998 }
3870 3999
3871 $t1 = EV::time - $t1; 4000 $t1 = AE::time - $t1;
3872 warn "reload completed in ${t1}s\n"; 4001 info "perl_reload: completed in ${t1}s\n";
3873}; 4002};
3874 4003
3875our $RELOAD_WATCHER; # used only during reload 4004our $RELOAD_WATCHER; # used only during reload
3876 4005
3877sub reload_perl() { 4006sub reload_perl() {
… …
3879 # coro crashes during coro_state_free->destroy here. 4008 # coro crashes during coro_state_free->destroy here.
3880 4009
3881 $RELOAD_WATCHER ||= cf::async { 4010 $RELOAD_WATCHER ||= cf::async {
3882 Coro::AIO::aio_wait cache_extensions; 4011 Coro::AIO::aio_wait cache_extensions;
3883 4012
3884 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4013 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3885 do_reload_perl; 4014 do_reload_perl;
3886 undef $RELOAD_WATCHER; 4015 undef $RELOAD_WATCHER;
3887 }; 4016 };
3888 }; 4017 };
3889} 4018}
… …
3898 reload_perl; 4027 reload_perl;
3899 }; 4028 };
3900 } 4029 }
3901}; 4030};
3902 4031
3903unshift @INC, $LIBDIR; 4032#############################################################################
3904 4033
3905my $bug_warning = 0; 4034my $bug_warning = 0;
3906 4035
3907our @WAIT_FOR_TICK; 4036our @WAIT_FOR_TICK;
3908our @WAIT_FOR_TICK_BEGIN; 4037our @WAIT_FOR_TICK_BEGIN;
3909 4038
3910sub wait_for_tick { 4039sub wait_for_tick() {
3911 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4040 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3912 4041
3913 my $signal = new Coro::Signal; 4042 my $signal = new Coro::Signal;
3914 push @WAIT_FOR_TICK, $signal; 4043 push @WAIT_FOR_TICK, $signal;
3915 $signal->wait; 4044 $signal->wait;
3916} 4045}
3917 4046
3918sub wait_for_tick_begin { 4047sub wait_for_tick_begin() {
3919 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4048 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3920 4049
3921 my $signal = new Coro::Signal; 4050 my $signal = new Coro::Signal;
3922 push @WAIT_FOR_TICK_BEGIN, $signal; 4051 push @WAIT_FOR_TICK_BEGIN, $signal;
3923 $signal->wait; 4052 $signal->wait;
… …
3930 return; 4059 return;
3931 } 4060 }
3932 4061
3933 cf::server_tick; # one server iteration 4062 cf::server_tick; # one server iteration
3934 4063
3935 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4064 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3936 4065
3937 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4066 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3938 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4067 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3939 Coro::async_pool { 4068 Coro::async_pool {
3940 $Coro::current->{desc} = "runtime saver"; 4069 $Coro::current->{desc} = "runtime saver";
3941 write_runtime_sync 4070 write_runtime_sync
3942 or warn "ERROR: unable to write runtime file: $!"; 4071 or error "ERROR: unable to write runtime file: $!";
3943 }; 4072 };
3944 } 4073 }
3945 4074
3946 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4075 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3947 $sig->send; 4076 $sig->send;
… …
3955 4084
3956 if (0) { 4085 if (0) {
3957 if ($NEXT_TICK) { 4086 if ($NEXT_TICK) {
3958 my $jitter = $TICK_START - $NEXT_TICK; 4087 my $jitter = $TICK_START - $NEXT_TICK;
3959 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4088 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3960 warn "jitter $JITTER\n";#d# 4089 debug "jitter $JITTER\n";#d#
3961 } 4090 }
3962 } 4091 }
3963} 4092}
3964 4093
3965{ 4094{
… …
4010 IO::AIO::min_parallel 8; 4139 IO::AIO::min_parallel 8;
4011 IO::AIO::max_poll_time $TICK * 0.1; 4140 IO::AIO::max_poll_time $TICK * 0.1;
4012 undef $AnyEvent::AIO::WATCHER; 4141 undef $AnyEvent::AIO::WATCHER;
4013} 4142}
4014 4143
4015my $_log_backtrace; 4144our $_log_backtrace;
4145our $_log_backtrace_last;
4016 4146
4017sub _log_backtrace { 4147sub _log_backtrace {
4018 my ($msg, @addr) = @_; 4148 my ($msg, @addr) = @_;
4019 4149
4020 $msg =~ s/\n//; 4150 $msg =~ s/\n$//;
4021 4151
4152 if ($_log_backtrace_last eq $msg) {
4153 LOG llevInfo, "[ABT] $msg\n";
4154 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4022 # limit the # of concurrent backtraces 4155 # limit the # of concurrent backtraces
4023 if ($_log_backtrace < 2) { 4156 } elsif ($_log_backtrace < 2) {
4157 $_log_backtrace_last = $msg;
4024 ++$_log_backtrace; 4158 ++$_log_backtrace;
4025 my $perl_bt = Carp::longmess $msg; 4159 my $perl_bt = Carp::longmess $msg;
4026 async { 4160 async {
4027 $Coro::current->{desc} = "abt $msg"; 4161 $Coro::current->{desc} = "abt $msg";
4028 4162
… …
4048 LOG llevInfo, "[ABT] $_\n" for @bt; 4182 LOG llevInfo, "[ABT] $_\n" for @bt;
4049 --$_log_backtrace; 4183 --$_log_backtrace;
4050 }; 4184 };
4051 } else { 4185 } else {
4052 LOG llevInfo, "[ABT] $msg\n"; 4186 LOG llevInfo, "[ABT] $msg\n";
4053 LOG llevInfo, "[ABT] [suppressed]\n"; 4187 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4054 } 4188 }
4055} 4189}
4056 4190
4057# load additional modules 4191# load additional modules
4058require "cf/$_.pm" for @EXTRA_MODULES; 4192require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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