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.500 by root, Sat Jan 16 00:08:33 2010 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
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
396} 417}
397 418
398=item cf::periodic $interval, $cb 419=item cf::periodic $interval, $cb
399 420
400Like EV::periodic, but randomly selects a starting point so that the actions 421Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 422get spread over time.
402 423
403=cut 424=cut
404 425
405sub periodic($$) { 426sub periodic($$) {
406 my ($interval, $cb) = @_; 427 my ($interval, $cb) = @_;
423 444
424=cut 445=cut
425 446
426our @SLOT_QUEUE; 447our @SLOT_QUEUE;
427our $SLOT_QUEUE; 448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
428 450
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 452$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 453 $Coro::current->desc ("timeslot manager");
432 454
433 my $signal = new Coro::Signal; 455 my $signal = new Coro::Signal;
456 my $busy;
434 457
435 while () { 458 while () {
436 next_job: 459 next_job:
460
437 my $avail = cf::till_tick; 461 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 462
439 for (0 .. $#SLOT_QUEUE) { 463 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 466 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 467 $job->[2]->send;
443 Coro::cede; 468 Coro::cede;
444 goto next_job; 469 goto next_job;
445 } 470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 472 }
447 } 473 }
448 474
449 if (@SLOT_QUEUE) { 475 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 477 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 478 $signal->wait;
453 } else { 479 } else {
480 $busy = 0;
454 Coro::schedule; 481 Coro::schedule;
455 } 482 }
456 } 483 }
457}; 484};
458 485
459sub get_slot($;$$) { 486sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 487 return if tick_inhibit || $Coro::current == $Coro::main;
461 488
462 my ($time, $pri, $name) = @_; 489 my ($time, $pri, $name) = @_;
463 490
464 $time = $TICK * .6 if $time > $TICK * .6; 491 $time = clamp $time, 0.01, $TICK * .6;
492
465 my $sig = new Coro::Signal; 493 my $sig = new Coro::Signal;
466 494
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 497 $SLOT_QUEUE->ready;
495=cut 523=cut
496 524
497sub sync_job(&) { 525sub sync_job(&) {
498 my ($job) = @_; 526 my ($job) = @_;
499 527
500 if ($Coro::current == $Coro::main) { 528 if (in_main) {
501 my $time = EV::time; 529 my $time = AE::time;
502 530
503 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
505 533
506 LOG llevError, Carp::longmess "sync job";#d# 534 #LOG llevError, Carp::longmess "sync job";#d#
507 535
508 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
509 537
510 my $busy = 1; 538 my $busy = 1;
511 my @res; 539 my @res;
512 540
513 (async { 541 (async {
514 $Coro::current->desc ("sync job coro"); 542 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 543 @res = eval { $job->() };
516 warn $@ if $@; 544 error $@ if $@;
517 undef $busy; 545 undef $busy;
518 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
519 547
520 while ($busy) { 548 while ($busy) {
521 if (Coro::nready) { 549 if (Coro::nready) {
523 } else { 551 } else {
524 EV::loop EV::LOOP_ONESHOT; 552 EV::loop EV::LOOP_ONESHOT;
525 } 553 }
526 } 554 }
527 555
528 my $time = EV::time - $time; 556 my $time = AE::time - $time;
529 557
530 $TICK_START += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
531 559
532 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
533 } else { 561 } else {
564Coro::Storable. May, of course, block. Note that the executed sub may 592Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 593never block itself or use any form of event handling.
566 594
567=cut 595=cut
568 596
597sub post_fork {
598 reset_signals;
599}
600
569sub fork_call(&@) { 601sub fork_call(&@) {
570 my ($cb, @args) = @_; 602 my ($cb, @args) = @_;
571 603
572 # we seemingly have to make a local copy of the whole thing, 604 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 605 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 606 # TODO: investigate and fix (likely this will be rather laborious)
575 607
576 my @res = Coro::Util::fork_eval { 608 my @res = Coro::Util::fork_eval {
577 reset_signals; 609 cf::post_fork;
578 &$cb 610 &$cb
579 }, @args; 611 }, @args;
580 612
581 wantarray ? @res : $res[-1] 613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
582} 625}
583 626
584=item $coin = coin_from_name $name 627=item $coin = coin_from_name $name
585 628
586=cut 629=cut
623within each server. 666within each server.
624 667
625=cut 668=cut
626 669
627sub db_table($) { 670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
628 my ($name) = @_; 674 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 675 my $db = BDB::db_create $DB_ENV;
630 676
631 eval { 677 eval {
632 $db->set_flags (BDB::CHKSUM); 678 $db->set_flags (BDB::CHKSUM);
642} 688}
643 689
644our $DB; 690our $DB;
645 691
646sub db_init { 692sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 693 $DB ||= db_table "db";
649 };
650} 694}
651 695
652sub db_get($$) { 696sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 697 my $key = "$_[0]/$_[1]";
654 698
655 cf::sync_job { 699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
656 BDB::db_get $DB, undef, $key, my $data; 702 BDB::db_get $DB, undef, $key, my $data;
657 703
658 $! ? () 704 $! ? ()
659 : $data 705 : $data
660 }
661} 706}
662 707
663sub db_put($$$) { 708sub db_put($$$) {
664 BDB::dbreq_pri 4; 709 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 766
722 my $t1 = Time::HiRes::time; 767 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 768 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 769 my $t2 = Time::HiRes::time;
725 770
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 772
728 db_put cache => "$id/data", $data; 773 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 774 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 775 db_put cache => "$id/meta", $meta;
731 776
741 786
742=cut 787=cut
743 788
744sub datalog($@) { 789sub datalog($@) {
745 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 792}
748 793
749=back 794=back
750 795
751=cut 796=cut
946 991
947 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 994
950 } elsif (ref $type) { 995 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
952 997
953 } else { 998 } else {
954 shift @arg; 999 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
956 } 1001 }
957 } 1002 }
958} 1003}
959 1004
960sub _object_attach { 1005sub _object_attach {
970 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
971 } 1016 }
972 1017
973 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
974 } else { 1019 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1021 }
977 1022
978 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
979} 1024}
980 1025
1039 1084
1040 for (@$callbacks) { 1085 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
1042 1087
1043 if ($@) { 1088 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1090 override;
1047 } 1091 }
1048 1092
1049 return 1 if $override; 1093 return 1 if $override;
1050 } 1094 }
1129 for (@$attach) { 1173 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
1132 } 1176 }
1133 } else { 1177 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1179 }
1136 } 1180 }
1137} 1181}
1138 1182
1139cf::attachable->attach ( 1183cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
1167 1211
1168 sync_job { 1212 sync_job {
1169 if (length $$rdata) { 1213 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1214 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
1173 1218
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1220 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 if ($cf::USE_FSYNC) { 1222 if ($cf::USE_FSYNC) {
1199 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1200 1245
1201 $filename =~ s%/[^/]+$%%; 1246 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC; 1247 aio_pathsync $filename if $cf::USE_FSYNC;
1203 } else { 1248 } else {
1204 warn "unable to save objects: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
1205 } 1250 }
1206 } else { 1251 } else {
1207 aio_unlink $filename; 1252 aio_unlink $filename;
1208 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1209 } 1254 }
1233 my $st = eval { Coro::Storable::thaw $av }; 1278 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs}; 1279 $av = $st->{objs};
1235 } 1280 }
1236 1281
1237 utf8::decode (my $decname = $filename); 1282 utf8::decode (my $decname = $filename);
1238 warn sprintf "loading %s (%d,%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
1239 $decname, length $data, scalar @{$av || []}; 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1240 1286
1241 ($data, $av) 1287 ($data, $av)
1242} 1288}
1243 1289
1244=head2 COMMAND CALLBACKS 1290=head2 COMMAND CALLBACKS
1303} 1349}
1304 1350
1305use File::Glob (); 1351use File::Glob ();
1306 1352
1307cf::player->attach ( 1353cf::player->attach (
1308 on_command => sub { 1354 on_unknown_command => sub {
1309 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
1310 1356
1311 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
1312 or return; 1358 or return;
1313 1359
1336 1382
1337 $pl->ext_reply ($reply, @reply) 1383 $pl->ext_reply ($reply, @reply)
1338 if $reply; 1384 if $reply;
1339 1385
1340 } else { 1386 } else {
1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342 } 1388 }
1343 1389
1344 cf::override; 1390 cf::override;
1345 }, 1391 },
1346); 1392);
1357 1403
1358 $grp 1404 $grp
1359} 1405}
1360 1406
1361sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1362 cf::sync_job { 1410 cf::sync_job {
1363 my %todo; 1411 my %todo;
1364 1412
1365 for my $path (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
1366 next unless -r $path; 1414 next unless -r $path;
1384 1432
1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387 1435
1388 $ext{source} = 1436 $ext{source} =
1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1437 "package $pkg; use common::sense;\n"
1390 . "#line 1 \"$path\"\n{\n" 1438 . "#line 1 \"$path\"\n{\n"
1391 . $source 1439 . $source
1392 . "\n};\n1"; 1440 . "\n};\n1";
1393 1441
1394 $todo{$base} = \%ext; 1442 $todo{$base} = \%ext;
1395 } 1443 }
1396 1444
1445 my $pass = 0;
1397 my %done; 1446 my %done;
1398 while (%todo) { 1447 while (%todo) {
1399 my $progress; 1448 my $progress;
1400 1449
1450 ++$pass;
1451
1452 ext:
1401 while (my ($k, $v) = each %todo) { 1453 while (my ($k, $v) = each %todo) {
1402 for (split /,\s*/, $v->{meta}{depends}) { 1454 for (split /,\s*/, $v->{meta}{depends}) {
1403 goto skip 1455 next ext
1404 unless exists $done{$_}; 1456 unless exists $done{$_};
1405 } 1457 }
1406 1458
1407 warn "... loading '$k' into '$v->{pkg}'\n"; 1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408 1460
1409 unless (eval $v->{source}) { 1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1410 my $msg = $@ ? "$v->{path}: $@\n" 1464 error "$v->{path}: $@\n";
1411 : "$v->{base}: extension inactive.\n";
1412 1465
1413 if (exists $v->{meta}{mandatory}) {
1414 warn $msg;
1415 cf::cleanup "mandatory extension failed to load, exiting."; 1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416 } 1467 if exists $v->{meta}{mandatory};
1417 1468
1418 warn $msg; 1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1419 } 1478 }
1420
1421 $done{$k} = delete $todo{$k};
1422 push @EXTS, $v->{pkg};
1423 $progress = 1;
1424 } 1479 }
1425 1480
1426 skip: 1481 unless ($progress) {
1427 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428 unless $progress; 1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1429 } 1489 }
1430 }; 1490 };
1431} 1491}
1432 1492
1433############################################################################# 1493#############################################################################
1517 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1518 } 1578 }
1519 } 1579 }
1520} 1580}
1521 1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1594
1522sub save($) { 1595sub save($) {
1523 my ($pl) = @_; 1596 my ($pl) = @_;
1524 1597
1525 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1526 1599
1531 1604
1532 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1533 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1534 1607
1535 cf::get_slot 0.01; 1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536 1612
1537 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1538 cf::cede_to_tick; 1614 cf::cede_to_tick;
1539} 1615}
1540 1616
1576 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1578 1654
1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1580 $pl->deactivate; 1656 $pl->deactivate;
1657
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score; 1659 ext::highscore::check ($pl->ob);
1660
1583 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1584 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1585 1663
1586 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1587 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1642 \@logins 1720 \@logins
1643} 1721}
1644 1722
1645=item $player->maps 1723=item $player->maps
1646 1724
1725=item cf::player::maps $login
1726
1647Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1648player. May block. 1728player. May block.
1649 1729
1650=cut 1730=cut
1651 1731
1713=cut 1793=cut
1714 1794
1715sub find_by_path($) { 1795sub find_by_path($) {
1716 my ($path) = @_; 1796 my ($path) = @_;
1717 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1718 my ($match, $specificity); 1800 my ($match, $specificity);
1719 1801
1720 for my $region (list) { 1802 for my $region (list) {
1721 if ($region->{match} && $path =~ $region->{match}) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1722 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754 1836
1755 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1756 $self->_create_random_map ( 1838 $self->_create_random_map (
1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1761 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1762 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1778 1860
1779sub register { 1861sub register {
1780 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1781 my $pkg = caller; 1863 my $pkg = caller;
1782 1864
1783 no strict;
1784 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1785 1866
1786 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787} 1868}
1788 1869
1789# also paths starting with '/' 1870# also paths starting with '/'
1790$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791 1872
1792sub thawer_merge { 1873sub thawer_merge {
1793 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1794 1875
1795 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1800} 1881}
1801 1882
1802sub normalise { 1883sub normalise {
1803 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1804 1885
1805 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1806 1887
1807 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1808 1889
1809 # map plan: 1890 # map plan:
1810 # 1891 #
1849 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1850 return $self; 1931 return $self;
1851 } 1932 }
1852 } 1933 }
1853 1934
1854 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1855 () 1936 ()
1856} 1937}
1857 1938
1858sub init { 1939sub init {
1859 my ($self) = @_; 1940 my ($self) = @_;
1981} 2062}
1982 2063
1983sub find; 2064sub find;
1984sub find { 2065sub find {
1985 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
2067
2068 cf::cede_to_tick;
1986 2069
1987 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1988 2071
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990 my $guard2 = cf::lock_acquire "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
2077 } 2160 }
2078 2161
2079 $self->post_load; 2162 $self->post_load;
2080} 2163}
2081 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
2082sub customise_for { 2168sub customise_for {
2083 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
2084 2170
2085 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
2086 if $self->per_player; 2172 if $self->per_player;
2102 or next; 2188 or next;
2103 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
2104 or next; 2190 or next;
2105 $neigh->load; 2191 $neigh->load;
2106 2192
2193 # now find the diagonal neighbours
2107 push @neigh, 2194 push @neigh,
2108 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2109 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2110 } 2197 }
2111 2198
2118} 2205}
2119 2206
2120sub find_sync { 2207sub find_sync {
2121 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
2122 2209
2123 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
2124} 2214}
2125 2215
2126sub do_load_sync { 2216sub do_load_sync {
2127 my ($map) = @_; 2217 my ($map) = @_;
2128 2218
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main; 2220 if $Coro::current == $Coro::main;
2131 2221
2132 cf::sync_job { $map->load }; 2222 $map->load;
2133} 2223}
2134 2224
2135our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
2136our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
2137 2227
2163 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
2164 2254
2165 () 2255 ()
2166} 2256}
2167 2257
2258# common code, used by both ->save and ->swapout
2168sub save { 2259sub _save {
2169 my ($self) = @_; 2260 my ($self) = @_;
2170
2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
2172 2261
2173 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
2174 2263
2175 return unless $self->dirty; 2264 return unless $self->dirty;
2176 2265
2196 } else { 2285 } else {
2197 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198 } 2287 }
2199} 2288}
2200 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
2201sub swap_out { 2298sub swap_out {
2202 my ($self) = @_; 2299 my ($self) = @_;
2203 2300
2204 # save first because save cedes
2205 $self->save;
2206
2207 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
2208 2302
2209 return if $self->players;
2210 return if $self->in_memory != cf::MAP_ACTIVE; 2303 return if $self->in_memory != cf::MAP_ACTIVE;
2211 return if $self->{deny_save}; 2304 return if $self->{deny_save};
2305 return if $self->players;
2212 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2213 $self->in_memory (cf::MAP_SWAPPED); 2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
2316 $self->clear;
2317}
2318
2319sub reset_at {
2320 my ($self) = @_;
2321
2322 # TODO: safety, remove and allow resettable per-player maps
2323 return 1e99 if $self->{deny_reset};
2324
2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2327
2328 $time + $to
2329}
2330
2331sub should_reset {
2332 my ($self) = @_;
2333
2334 $self->reset_at <= $cf::RUNTIME
2335}
2336
2337sub reset {
2338 my ($self) = @_;
2339
2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
2341
2342 return if $self->players;
2343
2344 cf::trace "resetting map ", $self->path, "\n";
2345
2346 $self->in_memory (cf::MAP_SWAPPED);
2347
2348 # need to save uniques path
2349 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351
2352 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2353 if $uniq;
2354 }
2355
2356 delete $cf::MAP{$self->path};
2214 2357
2215 $self->deactivate; 2358 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP; 2359 $_->clear_links_to ($self) for values %cf::MAP;
2217 $self->clear; 2360 $self->clear;
2218}
2219
2220sub reset_at {
2221 my ($self) = @_;
2222
2223 # TODO: safety, remove and allow resettable per-player maps
2224 return 1e99 if $self->{deny_reset};
2225
2226 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229 $time + $to
2230}
2231
2232sub should_reset {
2233 my ($self) = @_;
2234
2235 $self->reset_at <= $cf::RUNTIME
2236}
2237
2238sub reset {
2239 my ($self) = @_;
2240
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243 return if $self->players;
2244
2245 warn "resetting map ", $self->path, "\n";
2246
2247 $self->in_memory (cf::MAP_SWAPPED);
2248
2249 # need to save uniques path
2250 unless ($self->{deny_save}) {
2251 my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2254 if $uniq;
2255 }
2256
2257 delete $cf::MAP{$self->path};
2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2261 $self->clear;
2262 2361
2263 $self->unlink_save; 2362 $self->unlink_save;
2264 $self->destroy; 2363 $self->destroy;
2265} 2364}
2266 2365
2274 2373
2275 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
2276 2375
2277 $self->unlink_save; 2376 $self->unlink_save;
2278 2377
2279 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
2280 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
2281 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
2282 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284 2383
2514 2613
2515Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
2516 2615
2517The player should be reasonably safe there for short amounts of time (e.g. 2616The player should be reasonably safe there for short amounts of time (e.g.
2518for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link 2618though, as the player cannot control the character while it is on the link
2520map. 2619map.
2521 2620
2522Will never block. 2621Will never block.
2523 2622
2524=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
2545sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
2546 my ($self) = @_; 2645 my ($self) = @_;
2547 2646
2548 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
2549 2648
2649 ++$self->{_link_recursion};
2650
2550 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
2551 2652
2552 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
2554 2655
2555 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2556} 2657}
2557 2658
2558sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
2559 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
2560 2661
2585 $map->load_neighbours; 2686 $map->load_neighbours;
2586 2687
2587 return unless $self->contr->active; 2688 return unless $self->contr->active;
2588 2689
2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
2591 2692 # entering was successful
2693 delete $self->{_link_recursion};
2592 # only activate afterwards, to support waiting in hooks 2694 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive; 2695 $self->activate_recursive;
2594} 2696 }
2595 2697
2698}
2699
2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597 2701
2598Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
2599her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
2600that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
2601the new (success) or old (failed) map position. In either case, $done will 2705the new (success) or old (failed) map position. In either case, $done will
2608 2712
2609our $GOTOGEN; 2713our $GOTOGEN;
2610 2714
2611sub cf::object::player::goto { 2715sub cf::object::player::goto {
2612 my ($self, $path, $x, $y, $check, $done) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
2613 2723
2614 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616 2726
2617 $self->enter_link; 2727 $self->enter_link;
2641 my $map = eval { 2751 my $map = eval {
2642 my $map = defined $path ? cf::map::find $path : undef; 2752 my $map = defined $path ? cf::map::find $path : undef;
2643 2753
2644 if ($map) { 2754 if ($map) {
2645 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
2646 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
2647 } else { 2757 } else {
2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649 } 2759 }
2650 2760
2651 $map 2761 $map
2659 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
2660 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
2661 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
2662 } 2772 }
2663 2773
2664 $done->() if $done; 2774 $done->($self) if $done;
2665 })->prio (1); 2775 })->prio (1);
2666} 2776}
2667 2777
2668=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
2669 2779
2762 $self->message ("Something went wrong deep within the deliantra server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2763 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2764 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2765 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2766 2876
2767 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2768 $self->leave_link; 2878 $self->leave_link;
2769 } 2879 }
2770 })->prio (1); 2880 })->prio (1);
2771} 2881}
2772 2882
3085 3195
3086 $ns->ext_reply ($reply, @reply) 3196 $ns->ext_reply ($reply, @reply)
3087 if $reply; 3197 if $reply;
3088 3198
3089 } else { 3199 } else {
3090 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091 } 3201 }
3092 3202
3093 cf::override; 3203 cf::override;
3094 }, 3204 },
3095); 3205);
3115 3225
3116 $coro 3226 $coro
3117} 3227}
3118 3228
3119cf::client->attach ( 3229cf::client->attach (
3120 on_destroy => sub { 3230 on_client_destroy => sub {
3121 my ($ns) = @_; 3231 my ($ns) = @_;
3122 3232
3123 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124 }, 3234 },
3125); 3235);
3176 decrease split destroy change_exp value msg lore send_msg)], 3286 decrease split destroy change_exp value msg lore send_msg)],
3177 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
3178 ["cf::player" => qw(peaceful send_msg)], 3288 ["cf::player" => qw(peaceful send_msg)],
3179 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
3180) { 3290) {
3181 no strict 'refs';
3182 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
3183 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184 for @funs; 3293 for @funs;
3185} 3294}
3186 3295
3225 local @cf::_safe_eval_args = values %vars; 3334 local @cf::_safe_eval_args = values %vars;
3226 @res = wantarray ? eval eval : scalar eval $eval; 3335 @res = wantarray ? eval eval : scalar eval $eval;
3227 } 3336 }
3228 3337
3229 if ($@) { 3338 if ($@) {
3230 warn "$@"; 3339 warn "$@",
3231 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
3232 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
3233 } 3342 }
3234 3343
3235 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
3236} 3345}
3237 3346
3251=cut 3360=cut
3252 3361
3253sub register_script_function { 3362sub register_script_function {
3254 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
3255 3364
3256 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
3257 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
3258} 3367}
3259 3368
3260=back 3369=back
3261 3370
3262=cut 3371=cut
3271 # for this (global event?) 3380 # for this (global event?)
3272 %ext::player_env::MUSIC_FACE_CACHE = (); 3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3273 3382
3274 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275 3384
3276 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
3277 3386
3278 my $facedata;
3279 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
3280 or die "$path: $!"; 3388 or die "$path: $!";
3281 3389
3282 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
3283 3391
3284 $facedata->{version} == 2 3392 $facedata->{version} == 2
3315 3423
3316 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3317 cf::face::set_smooth $idx, $smooth; 3425 cf::face::set_smooth $idx, $smooth;
3318 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3319 } else { 3427 } else {
3320 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
3321 } 3429 }
3322 3430
3323 cf::cede_to_tick; 3431 cf::cede_to_tick;
3324 } 3432 }
3325 } 3433 }
3343 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3344 3452
3345 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3346 cf::face::set_type $idx, $info->{type}; 3454 cf::face::set_type $idx, $info->{type};
3347 } else { 3455 } else {
3348 $RESOURCE{$name} = $info; 3456 $RESOURCE{$name} = $info; # unused
3349 } 3457 }
3350 3458
3351 cf::cede_to_tick; 3459 cf::cede_to_tick;
3352 } 3460 }
3353 } 3461 }
3354 3462
3355 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3356 3464
3357 1 3465 1
3358} 3466}
3359
3360cf::global->attach (on_resource_update => sub {
3361 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3362 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3363
3364 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3365 my $sound = $soundconf->{compat}[$_]
3366 or next;
3367
3368 my $face = cf::face::find "sound/$sound->[1]";
3369 cf::sound::set $sound->[0] => $face;
3370 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3371 }
3372
3373 while (my ($k, $v) = each %{$soundconf->{event}}) {
3374 my $face = cf::face::find "sound/$v";
3375 cf::sound::set $k => $face;
3376 }
3377 }
3378});
3379 3467
3380register_exticmd fx_want => sub { 3468register_exticmd fx_want => sub {
3381 my ($ns, $want) = @_; 3469 my ($ns, $want) = @_;
3382 3470
3383 while (my ($k, $v) = each %$want) { 3471 while (my ($k, $v) = each %$want) {
3422sub reload_treasures { 3510sub reload_treasures {
3423 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
3424 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
3425} 3513}
3426 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
3427sub reload_resources { 3538sub reload_resources {
3428 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
3429 3540
3541 reload_exp_table;
3542 reload_materials;
3430 reload_facedata; 3543 reload_facedata;
3544 reload_sound;
3431 reload_archetypes; 3545 reload_archetypes;
3432 reload_regions; 3546 reload_regions;
3433 reload_treasures; 3547 reload_treasures;
3434 3548
3435 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
3436} 3550}
3437 3551
3438sub reload_config { 3552sub reload_config {
3439 warn "reloading config file...\n"; 3553 trace "reloading config file...\n";
3440 3554
3441 open my $fh, "<:utf8", "$CONFDIR/config" 3555 0 < aio_load "$CONFDIR/config", my $config
3442 or return; 3556 or die "$CONFDIR/config: $!";
3443 3557
3444 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3445 *CFG = YAML::XS::Load scalar <$fh>; 3561 *CFG = YAML::XS::Load $config;
3446 3562
3447 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3448 3564
3449 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3450 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3451 3567
3452 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
3454 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3570 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3455 and die "WARNING: m(un)lockall failed: $!\n"; 3571 and die "WARNING: m(un)lockall failed: $!\n";
3456 }; 3572 };
3457 warn $@ if $@; 3573 warn $@ if $@;
3458 } 3574 }
3459
3460 warn "finished reloading resource files\n";
3461} 3575}
3462 3576
3463sub pidfile() { 3577sub pidfile() {
3464 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3465 or die "$PIDFILE: $!"; 3579 or die "$PIDFILE: $!";
3478 seek $fh, 0, 0; 3592 seek $fh, 0, 0;
3479 print $fh $$; 3593 print $fh $$;
3480} 3594}
3481 3595
3482sub main_loop { 3596sub main_loop {
3483 warn "EV::loop starting\n"; 3597 trace "EV::loop starting\n";
3484 if (1) { 3598 if (1) {
3485 EV::loop; 3599 EV::loop;
3486 } 3600 }
3487 warn "EV::loop returned\n"; 3601 trace "EV::loop returned\n";
3488 goto &main_loop unless $REALLY_UNLOOP; 3602 goto &main_loop unless $REALLY_UNLOOP;
3489} 3603}
3490 3604
3491sub main { 3605sub main {
3492 cf::init_globals; # initialise logging 3606 cf::init_globals; # initialise logging
3493 3607
3494 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3495 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3496 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3497 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3498
3499 cf::init_experience;
3500 cf::init_anim;
3501 cf::init_attackmess;
3502 cf::init_dynamic;
3503 3612
3504 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3505 3614
3506 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
3507 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
3513 }; 3622 };
3514 3623
3515 evthread_start IO::AIO::poll_fileno; 3624 evthread_start IO::AIO::poll_fileno;
3516 3625
3517 cf::sync_job { 3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3518 cf::load_settings; 3633 cf::load_settings;
3519 cf::load_materials;
3520 3634
3521 reload_resources; 3635 reload_resources;
3522 reload_config; 3636 reload_config;
3523 db_init; 3637 db_init;
3524 3638
3525 cf::init_uuid; 3639 cf::init_uuid;
3526 cf::init_signals; 3640 cf::init_signals;
3527 cf::init_commands;
3528 cf::init_skills; 3641 cf::init_skills;
3529 3642
3530 cf::init_beforeplay; 3643 cf::init_beforeplay;
3531 3644
3532 atomic; 3645 atomic;
3540 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3541 3654
3542 (pop @POST_INIT)->(0) while @POST_INIT; 3655 (pop @POST_INIT)->(0) while @POST_INIT;
3543 }; 3656 };
3544 3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3545 main_loop; 3666 goto &main_loop;
3546} 3667}
3547 3668
3548############################################################################# 3669#############################################################################
3549# initialisation and cleanup 3670# initialisation and cleanup
3550 3671
3551# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
3552BEGIN { 3673BEGIN {
3553 our %SIGWATCHER = (); 3674 our %SIGWATCHER = ();
3554 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
3555 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3556 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
3557 }; 3678 };
3558 } 3679 }
3559} 3680}
3560 3681
3561sub write_runtime_sync { 3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3562 # first touch the runtime file to show we are still running: 3685 # first touch the runtime file to show we are still running:
3563 # the fsync below can take a very very long time. 3686 # the fsync below can take a very very long time.
3564 3687
3565 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3566 3689
3567 my $guard = cf::lock_acquire "write_runtime"; 3690 my $guard = cf::lock_acquire "write_runtime";
3568 3691
3569 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3570 or return; 3693 or return;
3571 3694
3572 my $value = $cf::RUNTIME + 90 + 10; 3695 my $value = $cf::RUNTIME + 90 + 10;
3573 # 10 is the runtime save interval, for a monotonic clock 3696 # 10 is the runtime save interval, for a monotonic clock
3574 # 60 allows for the watchdog to kill the server. 3697 # 60 allows for the watchdog to kill the server.
3587 or return; 3710 or return;
3588 3711
3589 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3590 and return; 3713 and return;
3591 3714
3592 warn "runtime file written.\n"; 3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3593 3716
3594 1 3717 1
3595} 3718}
3596 3719
3597our $uuid_lock; 3720our $uuid_lock;
3609 or return; 3732 or return;
3610 3733
3611 my $value = uuid_seq uuid_cur; 3734 my $value = uuid_seq uuid_cur;
3612 3735
3613 unless ($value) { 3736 unless ($value) {
3614 warn "cowardly refusing to write zero uuid value!\n"; 3737 info "cowardly refusing to write zero uuid value!\n";
3615 return; 3738 return;
3616 } 3739 }
3617 3740
3618 my $value = uuid_str $value + $uuid_skip; 3741 my $value = uuid_str $value + $uuid_skip;
3619 $uuid_skip = 0; 3742 $uuid_skip = 0;
3629 or return; 3752 or return;
3630 3753
3631 aio_rename "$uuid~", $uuid 3754 aio_rename "$uuid~", $uuid
3632 and return; 3755 and return;
3633 3756
3634 warn "uuid file written ($value).\n"; 3757 trace "uuid file written ($value).\n";
3635 3758
3636 1 3759 1
3637 3760
3638} 3761}
3639 3762
3645} 3768}
3646 3769
3647sub emergency_save() { 3770sub emergency_save() {
3648 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
3649 3772
3650 warn "emergency_perl_save: enter\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
3651 3779
3652 cf::sync_job { 3780 cf::sync_job {
3653 # this is a trade-off: we want to be very quick here, so 3781 cf::write_runtime_sync; # external watchdog should not bark
3654 # save all maps without fsync, and later call a global sync
3655 # (which in turn might be very very slow)
3656 local $USE_FSYNC = 0;
3657 3782
3658 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
3659 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
3660 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
3661 warn "emergency_perl_save: begin player save\n"; 3786 info "emergency_perl_save: begin player save\n";
3662 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
3663 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
3664 $pl->valid or next; 3789 $pl->valid or next;
3665 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3666 $pl->save; 3791 $pl->save;
3667 } 3792 }
3668 warn "emergency_perl_save: end player save\n"; 3793 info "emergency_perl_save: end player save\n";
3669 3794
3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3670 warn "emergency_perl_save: begin map save\n"; 3797 info "emergency_perl_save: begin map save\n";
3671 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
3672 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
3673 $map->valid or next; 3800 $map->valid or next;
3674 $map->save; 3801 $map->save;
3675 } 3802 }
3676 warn "emergency_perl_save: end map save\n"; 3803 info "emergency_perl_save: end map save\n";
3677 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3678 warn "emergency_perl_save: begin database checkpoint\n"; 3807 info "emergency_perl_save: begin database checkpoint\n";
3679 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
3680 warn "emergency_perl_save: end database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3681 3810
3682 warn "emergency_perl_save: begin write uuid\n"; 3811 info "emergency_perl_save: begin write uuid\n";
3683 write_uuid_sync 1; 3812 write_uuid_sync 1;
3684 warn "emergency_perl_save: end write uuid\n"; 3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
3685 }; 3833 };
3686 3834
3687 warn "emergency_perl_save: starting sync()\n";
3688 IO::AIO::aio_sync sub {
3689 warn "emergency_perl_save: finished sync()\n";
3690 };
3691
3692 warn "emergency_perl_save: leave\n"; 3835 info "emergency_perl_save: leave\n";
3693} 3836}
3694 3837
3695sub post_cleanup { 3838sub post_cleanup {
3696 my ($make_core) = @_; 3839 my ($make_core) = @_;
3697 3840
3841 IO::AIO::flush;
3842
3698 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
3699 if $make_core; 3844 if $make_core;
3700 3845
3701 my $fh = pidfile; 3846 my $fh = pidfile;
3702 unlink $PIDFILE if <$fh> == $$; 3847 unlink $PIDFILE if <$fh> == $$;
3703} 3848}
3723 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3724 for my $name (keys %$leaf_symtab) { 3869 for my $name (keys %$leaf_symtab) {
3725 _gv_clear *{"$pkg$name"}; 3870 _gv_clear *{"$pkg$name"};
3726# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3727 } 3872 }
3728 warn "cleared package $pkg\n";#d#
3729} 3873}
3730 3874
3731sub do_reload_perl() { 3875sub do_reload_perl() {
3732 # can/must only be called in main 3876 # can/must only be called in main
3733 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
3734 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
3735 return; 3879 return;
3736 } 3880 }
3737 3881
3738 return if $RELOAD++; 3882 return if $RELOAD++;
3739 3883
3740 my $t1 = EV::time; 3884 my $t1 = AE::time;
3741 3885
3742 while ($RELOAD) { 3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
3743 warn "reloading..."; 3888 info "reloading...";
3744 3889
3745 warn "entering sync_job"; 3890 trace "entering sync_job";
3746 3891
3747 cf::sync_job { 3892 cf::sync_job {
3748 cf::write_runtime_sync; # external watchdog should not bark
3749 cf::emergency_save; 3893 #cf::emergency_save;
3750 cf::write_runtime_sync; # external watchdog should not bark
3751 3894
3752 warn "syncing database to disk";
3753 BDB::db_env_txn_checkpoint $DB_ENV;
3754
3755 # if anything goes wrong in here, we should simply crash as we already saved
3756
3757 warn "flushing outstanding aio requests";
3758 while (IO::AIO::nreqs || BDB::nreqs) {
3759 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3760 }
3761
3762 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
3763 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
3764 %EXT_CORO = (); 3897 %EXT_CORO = ();
3765 3898
3766 warn "removing commands"; 3899 trace "removing commands";
3767 %COMMAND = (); 3900 %COMMAND = ();
3768 3901
3769 warn "removing ext/exti commands"; 3902 trace "removing ext/exti commands";
3770 %EXTCMD = (); 3903 %EXTCMD = ();
3771 %EXTICMD = (); 3904 %EXTICMD = ();
3772 3905
3773 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
3774 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
3775 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
3776 3909
3777 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
3778 eval { 3911 eval {
3779 $cb->($pkg); 3912 $cb->($pkg);
3780 1 3913 1
3781 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3782 } 3915 }
3783 3916
3784 warn "... clearing $pkg"; 3917 trace "... clearing $pkg";
3785 clear_package $pkg; 3918 clear_package $pkg;
3786 } 3919 }
3787 3920
3788 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
3789 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
3790 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3791 3924
3792 warn "... unloading $k"; 3925 trace "... unloading $k";
3793 delete $INC{$k}; 3926 delete $INC{$k};
3794 3927
3795 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
3796 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
3797 3930
3800 } 3933 }
3801 3934
3802 clear_package $k; 3935 clear_package $k;
3803 } 3936 }
3804 3937
3805 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
3806 clear_package "safe::$_" 3939 clear_package "safe::$_"
3807 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3808 3941
3809 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
3810 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
3811 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3812 3945
3813 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
3814 # and global variables created in xs 3947 # and global variables created in xs
3815 #clear_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
3816 3949
3817 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
3818 3951
3819 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
3820 require cf; 3953 require cf;
3821 cf::_connect_to_perl_1; 3954 cf::_connect_to_perl_1;
3822 3955
3823 warn "loading config and database again"; 3956 trace "loading config and database again";
3824 cf::reload_config; 3957 cf::reload_config;
3825 3958
3826 warn "loading extensions"; 3959 trace "loading extensions";
3827 cf::load_extensions; 3960 cf::load_extensions;
3828 3961
3829 if ($REATTACH_ON_RELOAD) { 3962 if ($REATTACH_ON_RELOAD) {
3830 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
3831 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
3832 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
3833 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
3834 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
3835 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3836 } 3969 }
3837 3970
3838 warn "running post_init jobs"; 3971 trace "running post_init jobs";
3839 (pop @POST_INIT)->(1) while @POST_INIT; 3972 (pop @POST_INIT)->(1) while @POST_INIT;
3840 3973
3841 warn "leaving sync_job"; 3974 trace "leaving sync_job";
3842 3975
3843 1 3976 1
3844 } or do { 3977 } or do {
3845 warn $@; 3978 error $@;
3846 cf::cleanup "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
3847 }; 3980 };
3848 3981
3849 warn "reloaded"; 3982 info "reloaded";
3850 --$RELOAD; 3983 --$RELOAD;
3851 } 3984 }
3852 3985
3853 $t1 = EV::time - $t1; 3986 $t1 = AE::time - $t1;
3854 warn "reload completed in ${t1}s\n"; 3987 info "reload completed in ${t1}s\n";
3855}; 3988};
3856 3989
3857our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
3858 3991
3859sub reload_perl() { 3992sub reload_perl() {
3861 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
3862 3995
3863 $RELOAD_WATCHER ||= cf::async { 3996 $RELOAD_WATCHER ||= cf::async {
3864 Coro::AIO::aio_wait cache_extensions; 3997 Coro::AIO::aio_wait cache_extensions;
3865 3998
3866 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3867 do_reload_perl; 4000 do_reload_perl;
3868 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
3869 }; 4002 };
3870 }; 4003 };
3871} 4004}
3880 reload_perl; 4013 reload_perl;
3881 }; 4014 };
3882 } 4015 }
3883}; 4016};
3884 4017
3885unshift @INC, $LIBDIR; 4018#############################################################################
3886 4019
3887my $bug_warning = 0; 4020my $bug_warning = 0;
3888 4021
3889our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
3890our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
3891 4024
3892sub wait_for_tick { 4025sub wait_for_tick() {
3893 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3894 4027
3895 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
3896 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
3897 $signal->wait; 4030 $signal->wait;
3898} 4031}
3899 4032
3900sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
3901 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3902 4035
3903 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
3904 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
3905 $signal->wait; 4038 $signal->wait;
3912 return; 4045 return;
3913 } 4046 }
3914 4047
3915 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
3916 4049
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051
3917 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3918 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3919 Coro::async_pool { 4054 Coro::async_pool {
3920 $Coro::current->{desc} = "runtime saver"; 4055 $Coro::current->{desc} = "runtime saver";
3921 write_runtime_sync 4056 write_runtime_sync
3922 or warn "ERROR: unable to write runtime file: $!"; 4057 or error "ERROR: unable to write runtime file: $!";
3923 }; 4058 };
3924 } 4059 }
3925 4060
3926 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3927 $sig->send; 4062 $sig->send;
3935 4070
3936 if (0) { 4071 if (0) {
3937 if ($NEXT_TICK) { 4072 if ($NEXT_TICK) {
3938 my $jitter = $TICK_START - $NEXT_TICK; 4073 my $jitter = $TICK_START - $NEXT_TICK;
3939 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3940 warn "jitter $JITTER\n";#d# 4075 debug "jitter $JITTER\n";#d#
3941 } 4076 }
3942 } 4077 }
3943} 4078}
3944 4079
3945{ 4080{
3946 # configure BDB 4081 # configure BDB
3947 4082
3948 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
3949 BDB::max_poll_reqs $TICK * 0.1; 4084 BDB::max_poll_reqs $TICK * 0.1;
3950 $AnyEvent::BDB::WATCHER->priority (1); 4085 $AnyEvent::BDB::WATCHER->priority (1);
3951 4086
3952 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
3953 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines