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.483 by root, Mon Oct 12 04:02:17 2009 UTC vs.
Revision 1.540 by root, Tue May 4 23:32:29 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 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
… …
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
… …
76 75
77# strictly for debugging 76# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79 78
80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
81 82
82our %COMMAND = (); 83our %COMMAND = ();
83our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
84 85
85our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
… …
105our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 110
110our %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;
111 118
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 121our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
161 168
162our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
163 170
164sub cf::map::normalise; 171sub cf::map::normalise;
165 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
166############################################################################# 177#############################################################################
167 178
168%REFLECT = (); 179%REFLECT = ();
169for (@REFLECT) { 180for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 181 my $reflect = JSON::XS::decode_json $_;
… …
227returns 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 process
228per 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.
229 240
230=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
231 242
232This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 245that call.
235 246
236=item %cf::REFLECT 247=item %cf::REFLECT
237 248
… …
241 252
242=back 253=back
243 254
244=cut 255=cut
245 256
257sub error(@) { LOG llevError, join "", @_ }
258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
246$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 264 my $msg = join "", @_;
248 265
249 $msg .= "\n" 266 $msg .= "\n"
250 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
251 268
252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 269 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253 270
254 LOG llevError, $msg; 271 LOG llevWarn, $msg;
255}; 272};
256 273
257$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
259 276
260 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
261 278
262 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 281 return;#d#
265 }#d# 282 }#d#
266 283
267 # kill coroutine otherwise 284 # kill coroutine otherwise
268 Coro::terminate 285 Coro::terminate
… …
288)) { 305)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 307}
291 308
292$EV::DIED = sub { 309$EV::DIED = sub {
293 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
294}; 311};
295 312
296############################################################################# 313#############################################################################
297 314
298=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
… …
395} 412}
396 413
397=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
398 415
399Like EV::periodic, but randomly selects a starting point so that the actions 416Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 417get spread over time.
401 418
402=cut 419=cut
403 420
404sub periodic($$) { 421sub periodic($$) {
405 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
… …
422 439
423=cut 440=cut
424 441
425our @SLOT_QUEUE; 442our @SLOT_QUEUE;
426our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
427 445
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
431 449
432 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
433 452
434 while () { 453 while () {
435 next_job: 454 next_job:
455
436 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 457
438 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 462 $job->[2]->send;
442 Coro::cede; 463 Coro::cede;
443 goto next_job; 464 goto next_job;
444 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 467 }
446 } 468 }
447 469
448 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 471 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
451 $signal->wait; 473 $signal->wait;
452 } else { 474 } else {
475 $busy = 0;
453 Coro::schedule; 476 Coro::schedule;
454 } 477 }
455 } 478 }
456}; 479};
457 480
458sub get_slot($;$$) { 481sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
460 483
461 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
462 485
463 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
464 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
465 489
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
… …
494=cut 518=cut
495 519
496sub sync_job(&) { 520sub sync_job(&) {
497 my ($job) = @_; 521 my ($job) = @_;
498 522
499 if ($Coro::current == $Coro::main) { 523 if (in_main) {
500 my $time = EV::time; 524 my $time = AE::time;
501 525
502 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
504 528
505 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
506 530
507 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
508 532
509 my $busy = 1; 533 my $busy = 1;
510 my @res; 534 my @res;
511 535
512 (async { 536 (async {
513 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 538 @res = eval { $job->() };
515 warn $@ if $@; 539 error $@ if $@;
516 undef $busy; 540 undef $busy;
517 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
518 542
519 while ($busy) { 543 while ($busy) {
520 if (Coro::nready) { 544 if (Coro::nready) {
… …
522 } else { 546 } else {
523 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
524 } 548 }
525 } 549 }
526 550
527 my $time = EV::time - $time; 551 my $time = AE::time - $time;
528 552
529 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
530 554
531 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
532 } else { 556 } else {
… …
576 reset_signals; 600 reset_signals;
577 &$cb 601 &$cb
578 }, @args; 602 }, @args;
579 603
580 wantarray ? @res : $res[-1] 604 wantarray ? @res : $res[-1]
605}
606
607sub objinfo {
608 (
609 "counter value" => cf::object::object_count,
610 "objects created" => cf::object::create_count,
611 "objects destroyed" => cf::object::destroy_count,
612 "freelist size" => cf::object::free_count,
613 "allocated objects" => cf::object::objects_size,
614 "active objects" => cf::object::actives_size,
615 )
581} 616}
582 617
583=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
584 619
585=cut 620=cut
… …
622within each server. 657within each server.
623 658
624=cut 659=cut
625 660
626sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
627 my ($name) = @_; 665 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
629 667
630 eval { 668 eval {
631 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
… …
641} 679}
642 680
643our $DB; 681our $DB;
644 682
645sub db_init { 683sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
648 };
649} 685}
650 686
651sub db_get($$) { 687sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
653 689
654 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
655 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
656 694
657 $! ? () 695 $! ? ()
658 : $data 696 : $data
659 }
660} 697}
661 698
662sub db_put($$$) { 699sub db_put($$$) {
663 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
720 757
721 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 759 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
724 761
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 763
727 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
730 767
… …
740 777
741=cut 778=cut
742 779
743sub datalog($@) { 780sub datalog($@) {
744 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 783}
747 784
748=back 785=back
749 786
750=cut 787=cut
… …
945 982
946 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 985
949 } elsif (ref $type) { 986 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
951 988
952 } else { 989 } else {
953 shift @arg; 990 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
955 } 992 }
956 } 993 }
957} 994}
958 995
959sub _object_attach { 996sub _object_attach {
… …
969 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
970 } 1007 }
971 1008
972 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
973 } else { 1010 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1012 }
976 1013
977 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
978} 1015}
979 1016
… …
1038 1075
1039 for (@$callbacks) { 1076 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1041 1078
1042 if ($@) { 1079 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1081 override;
1046 } 1082 }
1047 1083
1048 return 1 if $override; 1084 return 1 if $override;
1049 } 1085 }
… …
1128 for (@$attach) { 1164 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1131 } 1167 }
1132 } else { 1168 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1170 }
1135 } 1171 }
1136} 1172}
1137 1173
1138cf::attachable->attach ( 1174cf::attachable->attach (
… …
1165 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1166 1202
1167 sync_job { 1203 sync_job {
1168 if (length $$rdata) { 1204 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1172 1209
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
… …
1198 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1199 1236
1200 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1239 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1204 } 1241 }
1205 } else { 1242 } else {
1206 aio_unlink $filename; 1243 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1208 } 1245 }
… …
1232 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1270 $av = $st->{objs};
1234 } 1271 }
1235 1272
1236 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1239 1277
1240 ($data, $av) 1278 ($data, $av)
1241} 1279}
1242 1280
1243=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
… …
1302} 1340}
1303 1341
1304use File::Glob (); 1342use File::Glob ();
1305 1343
1306cf::player->attach ( 1344cf::player->attach (
1307 on_command => sub { 1345 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1309 1347
1310 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1311 or return; 1349 or return;
1312 1350
… …
1335 1373
1336 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1375 if $reply;
1338 1376
1339 } else { 1377 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1379 }
1342 1380
1343 cf::override; 1381 cf::override;
1344 }, 1382 },
1345); 1383);
… …
1356 1394
1357 $grp 1395 $grp
1358} 1396}
1359 1397
1360sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1361 cf::sync_job { 1401 cf::sync_job {
1362 my %todo; 1402 my %todo;
1363 1403
1364 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1405 next unless -r $path;
… …
1383 1423
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1426
1387 $ext{source} = 1427 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1390 . $source 1430 . $source
1391 . "\n};\n1"; 1431 . "\n};\n1";
1392 1432
1393 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1394 } 1434 }
1395 1435
1436 my $pass = 0;
1396 my %done; 1437 my %done;
1397 while (%todo) { 1438 while (%todo) {
1398 my $progress; 1439 my $progress;
1399 1440
1441 ++$pass;
1442
1443 ext:
1400 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1446 next ext
1403 unless exists $done{$_}; 1447 unless exists $done{$_};
1404 } 1448 }
1405 1449
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1451
1408 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n"; 1456 undef $@; # work around perl 5.10.0 utf-8 caching bug
1411 1457
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1458 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1459 if exists $v->{meta}{mandatory};
1416 1460
1417 warn $msg; 1461 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1462 delete $todo{$k};
1463 } else {
1464 $done{$k} = delete $todo{$k};
1465 push @EXTS, $v->{pkg};
1466 $progress = 1;
1467
1468 info "$v->{base}: extension inactive.\n"
1469 unless $active;
1418 } 1470 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1471 }
1424 1472
1425 skip: 1473 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1474 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1475
1476 while (my ($k, $v) = each %todo) {
1477 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478 if exists $v->{meta}{mandatory};
1479 }
1480 }
1428 } 1481 }
1429 }; 1482 };
1430} 1483}
1431 1484
1432############################################################################# 1485#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1569 $cf::PLAYER{$login} = $pl
1517 } 1570 }
1518 } 1571 }
1519} 1572}
1520 1573
1574cf::player->attach (
1575 on_load => sub {
1576 my ($pl, $path) = @_;
1577
1578 # restore slots saved in save, below
1579 my $slots = delete $pl->{_slots};
1580
1581 $pl->ob->current_weapon ($slots->[0]);
1582 $pl->combat_ob ($slots->[1]);
1583 $pl->ranged_ob ($slots->[2]);
1584 },
1585);
1586
1521sub save($) { 1587sub save($) {
1522 my ($pl) = @_; 1588 my ($pl) = @_;
1523 1589
1524 return if $pl->{deny_save}; 1590 return if $pl->{deny_save};
1525 1591
… …
1530 1596
1531 aio_mkdir playerdir $pl, 0770; 1597 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1598 $pl->{last_save} = $cf::RUNTIME;
1533 1599
1534 cf::get_slot 0.01; 1600 cf::get_slot 0.01;
1601
1602 # save slots, to be restored later
1603 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1604
1536 $pl->save_pl ($path); 1605 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1606 cf::cede_to_tick;
1538} 1607}
1539 1608
… …
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1645 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1646
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1647 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579 $pl->deactivate; 1648 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1649 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1650 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1583 $pl->ns->destroy if $pl->ns; 1651 $pl->ns->destroy if $pl->ns;
1584 1652
1585 my $path = playerdir $pl; 1653 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1654 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1641 \@logins 1709 \@logins
1642} 1710}
1643 1711
1644=item $player->maps 1712=item $player->maps
1645 1713
1714=item cf::player::maps $login
1715
1646Returns an arrayref of map paths that are private for this 1716Returns an arrayref of map paths that are private for this
1647player. May block. 1717player. May block.
1648 1718
1649=cut 1719=cut
1650 1720
… …
1712=cut 1782=cut
1713 1783
1714sub find_by_path($) { 1784sub find_by_path($) {
1715 my ($path) = @_; 1785 my ($path) = @_;
1716 1786
1787 $path =~ s/^~[^\/]*//; # skip ~login
1788
1717 my ($match, $specificity); 1789 my ($match, $specificity);
1718 1790
1719 for my $region (list) { 1791 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1792 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1793 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1824 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1825
1754 # mit "rum" bekleckern, nicht 1826 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1827 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1828 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1829 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1830 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1831 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1832 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1833 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1834 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1777 1849
1778sub register { 1850sub register {
1779 my (undef, $regex, $prio) = @_; 1851 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1852 my $pkg = caller;
1781 1853
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1854 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1855
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1857}
1787 1858
1788# also paths starting with '/' 1859# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1860$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1861
1791sub thawer_merge { 1862sub thawer_merge {
1792 my ($self, $merge) = @_; 1863 my ($self, $merge) = @_;
1793 1864
1794 # we have to keep some variables in memory intact 1865 # we have to keep some variables in memory intact
… …
2008 2079
2009 $cf::MAP{$path} = $map 2080 $cf::MAP{$path} = $map
2010 } 2081 }
2011} 2082}
2012 2083
2013sub pre_load { } 2084sub pre_load { }
2014sub post_load { } 2085#sub post_load { } # XS
2015 2086
2016sub load { 2087sub load {
2017 my ($self) = @_; 2088 my ($self) = @_;
2018 2089
2019 local $self->{deny_reset} = 1; # loading can take a long time 2090 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2147 }
2077 2148
2078 $self->post_load; 2149 $self->post_load;
2079} 2150}
2080 2151
2152# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath
2081sub customise_for { 2155sub customise_for {
2082 my ($self, $ob) = @_; 2156 my ($self, $ob) = @_;
2083 2157
2084 return find "~" . $ob->name . "/" . $self->{path} 2158 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2159 if $self->per_player;
… …
2101 or next; 2175 or next;
2102 $neigh = find $neigh, $map 2176 $neigh = find $neigh, $map
2103 or next; 2177 or next;
2104 $neigh->load; 2178 $neigh->load;
2105 2179
2180 # now find the diagonal neighbours
2106 push @neigh, 2181 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2184 }
2110 2185
… …
2117} 2192}
2118 2193
2119sub find_sync { 2194sub find_sync {
2120 my ($path, $origin) = @_; 2195 my ($path, $origin) = @_;
2121 2196
2122 cf::sync_job { find $path, $origin } 2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main;
2199
2200 find $path, $origin
2123} 2201}
2124 2202
2125sub do_load_sync { 2203sub do_load_sync {
2126 my ($map) = @_; 2204 my ($map) = @_;
2127 2205
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2207 if $Coro::current == $Coro::main;
2130 2208
2131 cf::sync_job { $map->load }; 2209 $map->load;
2132} 2210}
2133 2211
2134our %MAP_PREFETCH; 2212our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2213our $MAP_PREFETCHER = undef;
2136 2214
… …
2162 $MAP_PREFETCHER->prio (6); 2240 $MAP_PREFETCHER->prio (6);
2163 2241
2164 () 2242 ()
2165} 2243}
2166 2244
2245# common code, used by both ->save and ->swapout
2167sub save { 2246sub _save {
2168 my ($self) = @_; 2247 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2248
2172 $self->{last_save} = $cf::RUNTIME; 2249 $self->{last_save} = $cf::RUNTIME;
2173 2250
2174 return unless $self->dirty; 2251 return unless $self->dirty;
2175 2252
… …
2195 } else { 2272 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2273 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2274 }
2198} 2275}
2199 2276
2277sub save {
2278 my ($self) = @_;
2279
2280 my $lock = cf::lock_acquire "map_data:$self->{path}";
2281
2282 $self->_save;
2283}
2284
2200sub swap_out { 2285sub swap_out {
2201 my ($self) = @_; 2286 my ($self) = @_;
2202 2287
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2288 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2289
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2290 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2291 return if $self->{deny_save};
2292 return if $self->players;
2211 2293
2294 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2297 $self->in_memory (cf::MAP_SWAPPED);
2298
2299 # then atomically save
2300 $self->_save;
2301
2302 # then free the map
2303 $self->clear;
2304}
2305
2306sub reset_at {
2307 my ($self) = @_;
2308
2309 # TODO: safety, remove and allow resettable per-player maps
2310 return 1e99 if $self->{deny_reset};
2311
2312 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2313 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2314
2315 $time + $to
2316}
2317
2318sub should_reset {
2319 my ($self) = @_;
2320
2321 $self->reset_at <= $cf::RUNTIME
2322}
2323
2324sub reset {
2325 my ($self) = @_;
2326
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2329 return if $self->players;
2330
2331 cf::trace "resetting map ", $self->path, "\n";
2332
2333 $self->in_memory (cf::MAP_SWAPPED);
2334
2335 # need to save uniques path
2336 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338
2339 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2340 if $uniq;
2341 }
2342
2343 delete $cf::MAP{$self->path};
2213 2344
2214 $self->deactivate; 2345 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2346 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2347 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2348
2262 $self->unlink_save; 2349 $self->unlink_save;
2263 $self->destroy; 2350 $self->destroy;
2264} 2351}
2265 2352
… …
2273 2360
2274 delete $cf::MAP{$self->path}; 2361 delete $cf::MAP{$self->path};
2275 2362
2276 $self->unlink_save; 2363 $self->unlink_save;
2277 2364
2278 bless $self, "cf::map"; 2365 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2366 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2367 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2368 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2369 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2370
… …
2340 : normalise $_ 2427 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2428 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2429 ]
2343} 2430}
2344 2431
2432=item cf::map::static_maps
2433
2434Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2435file in the shared directory excluding F</styles> and F</editor>). May
2436block.
2437
2438=cut
2439
2440sub static_maps() {
2441 my @dirs = "";
2442 my @maps;
2443
2444 while (@dirs) {
2445 my $dir = shift @dirs;
2446
2447 next if $dir eq "/styles" || $dir eq "/editor";
2448
2449 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2450 or return;
2451
2452 for (@$files) {
2453 s/\.map$// or next;
2454 utf8::decode $_;
2455 push @maps, "$dir/$_";
2456 }
2457
2458 push @dirs, map "$dir/$_", @$dirs;
2459 }
2460
2461 \@maps
2462}
2463
2345=back 2464=back
2346 2465
2347=head3 cf::object 2466=head3 cf::object
2348 2467
2349=cut 2468=cut
… …
2481 2600
2482Freezes the player and moves him/her to a special map (C<{link}>). 2601Freezes the player and moves him/her to a special map (C<{link}>).
2483 2602
2484The player should be reasonably safe there for short amounts of time (e.g. 2603The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2604for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2605though, as the player cannot control the character while it is on the link
2487map. 2606map.
2488 2607
2489Will never block. 2608Will never block.
2490 2609
2491=item $player_object->leave_link ($map, $x, $y) 2610=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2631sub cf::object::player::enter_link {
2513 my ($self) = @_; 2632 my ($self) = @_;
2514 2633
2515 $self->deactivate_recursive; 2634 $self->deactivate_recursive;
2516 2635
2636 ++$self->{_link_recursion};
2637
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2638 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2639
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2640 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2641 if $self->map && $self->map->{path} ne "{link}";
2521 2642
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2643 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2644}
2524 2645
2525sub cf::object::player::leave_link { 2646sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2647 my ($self, $map, $x, $y) = @_;
2527 2648
… …
2544 ($x, $y) = (-1, -1) 2665 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2666 unless (defined $x) && (defined $y);
2546 2667
2547 # use -1 or undef as default coordinates, not 0, 0 2668 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2669 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2670 if $x <= 0 && $y <= 0;
2550 2671
2551 $map->load; 2672 $map->load;
2552 $map->load_neighbours; 2673 $map->load_neighbours;
2553 2674
2554 return unless $self->contr->active; 2675 return unless $self->contr->active;
2555 2676
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2678 if ($self->enter_map ($map, $x, $y)) {
2558 2679 # entering was successful
2680 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2681 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2682 $self->activate_recursive;
2561} 2683 }
2562 2684
2685}
2686
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2687=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2688
2565Moves the player to the given map-path and coordinates by first freezing 2689Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2690her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2691that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2692the new (success) or old (failed) map position. In either case, $done will
… …
2575 2699
2576our $GOTOGEN; 2700our $GOTOGEN;
2577 2701
2578sub cf::object::player::goto { 2702sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2703 my ($self, $path, $x, $y, $check, $done) = @_;
2704
2705 if ($self->{_link_recursion} >= $MAX_LINKS) {
2706 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2707 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2708 ($path, $x, $y) = @$EMERGENCY_POSITION;
2709 }
2580 2710
2581 # do generation counting so two concurrent goto's will be executed in-order 2711 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2712 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2713
2584 $self->enter_link; 2714 $self->enter_link;
… …
2608 my $map = eval { 2738 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2739 my $map = defined $path ? cf::map::find $path : undef;
2610 2740
2611 if ($map) { 2741 if ($map) {
2612 $map = $map->customise_for ($self); 2742 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2743 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2744 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2745 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2746 }
2617 2747
2618 $map 2748 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2756 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2757 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2758 $self->leave_link ($map, $x, $y);
2629 } 2759 }
2630 2760
2631 $done->() if $done; 2761 $done->($self) if $done;
2632 })->prio (1); 2762 })->prio (1);
2633} 2763}
2634 2764
2635=item $player_object->enter_exit ($exit_object) 2765=item $player_object->enter_exit ($exit_object)
2636 2766
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2859 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2860 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2861 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2862 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2863
2734 warn "ERROR in enter_exit: $@"; 2864 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2865 $self->leave_link;
2736 } 2866 }
2737 })->prio (1); 2867 })->prio (1);
2738} 2868}
2739 2869
… …
2751sub cf::client::send_drawinfo { 2881sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2882 my ($self, $text, $flags) = @_;
2753 2883
2754 utf8::encode $text; 2884 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2885 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2886}
2887
2888=item $client->send_big_packet ($pkt)
2889
2890Like C<send_packet>, but tries to compress large packets, and fragments
2891them as required.
2892
2893=cut
2894
2895our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2896
2897sub cf::client::send_big_packet {
2898 my ($self, $pkt) = @_;
2899
2900 # try lzf for large packets
2901 $pkt = "lzf " . Compress::LZF::compress $pkt
2902 if 1024 <= length $pkt and $self->{can_lzf};
2903
2904 # split very large packets
2905 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2906 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2907 $pkt = "frag";
2908 }
2909
2910 $self->send_packet ($pkt);
2756} 2911}
2757 2912
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2913=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2914
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2915Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2764 2919
2765=cut 2920=cut
2766 2921
2767# non-persistent channels (usually the info channel) 2922# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2923our %CHANNEL = (
2924 "c/motd" => {
2925 id => "infobox",
2926 title => "MOTD",
2927 reply => undef,
2928 tooltip => "The message of the day",
2929 },
2769 "c/identify" => { 2930 "c/identify" => {
2770 id => "infobox", 2931 id => "infobox",
2771 title => "Identify", 2932 title => "Identify",
2772 reply => undef, 2933 reply => undef,
2773 tooltip => "Items recently identified", 2934 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2936 "c/examine" => {
2776 id => "infobox", 2937 id => "infobox",
2777 title => "Examine", 2938 title => "Examine",
2778 reply => undef, 2939 reply => undef,
2779 tooltip => "Signs and other items you examined", 2940 tooltip => "Signs and other items you examined",
2941 },
2942 "c/shopinfo" => {
2943 id => "infobox",
2944 title => "Shop Info",
2945 reply => undef,
2946 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2947 },
2781 "c/book" => { 2948 "c/book" => {
2782 id => "infobox", 2949 id => "infobox",
2783 title => "Book", 2950 title => "Book",
2784 reply => undef, 2951 reply => undef,
… …
2900 my $pkt = "msg " 3067 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3068 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3069 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3070 );
2904 3071
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3072 $self->send_big_packet ($pkt);
2916} 3073}
2917 3074
2918=item $client->ext_msg ($type, @msg) 3075=item $client->ext_msg ($type, @msg)
2919 3076
2920Sends an ext event to the client. 3077Sends an ext event to the client.
… …
2923 3080
2924sub cf::client::ext_msg($$@) { 3081sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3082 my ($self, $type, @msg) = @_;
2926 3083
2927 if ($self->extcmd == 2) { 3084 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3085 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3086 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3087 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3088 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3089 }
2933} 3090}
2934 3091
2935=item $client->ext_reply ($msgid, @msg) 3092=item $client->ext_reply ($msgid, @msg)
2936 3093
… …
2940 3097
2941sub cf::client::ext_reply($$@) { 3098sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3099 my ($self, $id, @msg) = @_;
2943 3100
2944 if ($self->extcmd == 2) { 3101 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3103 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3104 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3105 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3107 }
2951} 3108}
2952 3109
2953=item $success = $client->query ($flags, "text", \&cb) 3110=item $success = $client->query ($flags, "text", \&cb)
2954 3111
… …
3025 3182
3026 $ns->ext_reply ($reply, @reply) 3183 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3184 if $reply;
3028 3185
3029 } else { 3186 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3187 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3188 }
3032 3189
3033 cf::override; 3190 cf::override;
3034 }, 3191 },
3035); 3192);
… …
3055 3212
3056 $coro 3213 $coro
3057} 3214}
3058 3215
3059cf::client->attach ( 3216cf::client->attach (
3060 on_destroy => sub { 3217 on_client_destroy => sub {
3061 my ($ns) = @_; 3218 my ($ns) = @_;
3062 3219
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3220 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3221 },
3065); 3222);
… …
3081our $safe_hole = new Safe::Hole; 3238our $safe_hole = new Safe::Hole;
3082 3239
3083$SIG{FPE} = 'IGNORE'; 3240$SIG{FPE} = 'IGNORE';
3084 3241
3085$safe->permit_only (Opcode::opset qw( 3242$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3243 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3244 grepstart grepwhile mapstart mapwhile
3088 sort time 3245 sort time
3089)); 3246));
3090 3247
3091# here we export the classes and methods available to script code 3248# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3273 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3274 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3275 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3276 ["cf::map" => qw(trigger)],
3120) { 3277) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3278 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3279 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3280 for @funs;
3125} 3281}
3126 3282
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3299 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3300 $qcode =~ s/\n/\\n/g;
3145 3301
3146 %vars = (_dummy => 0) unless %vars; 3302 %vars = (_dummy => 0) unless %vars;
3147 3303
3304 my @res;
3148 local $_; 3305 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3306
3151 my $eval = 3307 my $eval =
3152 "do {\n" 3308 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3309 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3310 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3311 . $code
3156 . "\n}" 3312 . "\n}"
3157 ; 3313 ;
3158 3314
3315 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3316 sub_generation_inc;
3317 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3318 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3319 sub_generation_inc;
3320 } else {
3321 local @cf::_safe_eval_args = values %vars;
3322 @res = wantarray ? eval eval : scalar eval $eval;
3323 }
3162 3324
3163 if ($@) { 3325 if ($@) {
3164 warn "$@"; 3326 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3327 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3328 "with arguments " . (join " ", %vars) . "\n";
3167 } 3329 }
3168 3330
3169 wantarray ? @res : $res[0] 3331 wantarray ? @res : $res[0]
3170} 3332}
3171 3333
… …
3185=cut 3347=cut
3186 3348
3187sub register_script_function { 3349sub register_script_function {
3188 my ($fun, $cb) = @_; 3350 my ($fun, $cb) = @_;
3189 3351
3190 no strict 'refs'; 3352 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3353 *$fun = $safe_hole->wrap ($cb);
3192} 3354}
3193 3355
3194=back 3356=back
3195 3357
3196=cut 3358=cut
3197 3359
3198############################################################################# 3360#############################################################################
3199# the server's init and main functions 3361# the server's init and main functions
3362
3363# async inc loader. yay.
3364sub inc_loader {
3365 my $mod = $_[1];
3366
3367 if (in_main && !tick_inhibit) {
3368 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3369 } else {
3370 debug "loading perl module $mod\n";
3371 }
3372
3373 # 1. find real file
3374 for my $dir (@ORIG_INC) {
3375 warn "$dir/$mod\n";#d#
3376 ref $dir and next;
3377 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378 or next;
3379
3380 $data = "#line 1 $dir/$mod\n$data";
3381
3382 open my $fh, "<", \$data or die;
3383
3384 return $fh;
3385 }
3386
3387 ()
3388}
3389
3390sub init_inc {
3391 # save original @INC
3392 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394 # make sure we can do scalar-opens
3395 open my $dummy, "<", \my $dummy2;
3396
3397 # execute some stuff so perl load's some of the core modules
3398 /Ü/ =~ /ü/i;
3399 eval { &Storable::nstore_fd };
3400
3401 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403 debug "module loading will be asynchronous from this point on.";
3404}
3200 3405
3201sub load_facedata($) { 3406sub load_facedata($) {
3202 my ($path) = @_; 3407 my ($path) = @_;
3203 3408
3204 # HACK to clear player env face cache, we need some signal framework 3409 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?) 3410 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3412
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3414
3210 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3211 3416
3212 my $facedata; 3417 my $facedata;
3213 0 < aio_load $path, $facedata 3418 0 < aio_load $path, $facedata
3214 or die "$path: $!"; 3419 or die "$path: $!";
3215 3420
… …
3217 3422
3218 $facedata->{version} == 2 3423 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3424 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3425
3221 # patch in the exptable 3426 # patch in the exptable
3427 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3428 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3429 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3430 data => $exp_table,
3431 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3432 };
3226 cf::cede_to_tick; 3433 cf::cede_to_tick;
3227 3434
3228 { 3435 {
3229 my $faces = $facedata->{faceinfo}; 3436 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3438 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3439 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3440
3234 cf::face::set_visibility $idx, $info->{visibility}; 3441 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3442 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3443 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3444 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3445
3239 cf::cede_to_tick; 3446 cf::cede_to_tick;
3240 } 3447 }
3241 3448
3242 while (my ($face, $info) = each %$faces) { 3449 while (my ($face, $info) = each %$faces) {
… …
3247 3454
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3455 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3456 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3457 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3458 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3459 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3460 }
3254 3461
3255 cf::cede_to_tick; 3462 cf::cede_to_tick;
3256 } 3463 }
3257 } 3464 }
… …
3266 3473
3267 cf::anim::invalidate_all; # d'oh 3474 cf::anim::invalidate_all; # d'oh
3268 } 3475 }
3269 3476
3270 { 3477 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3478 my $res = $facedata->{resource};
3274 3479
3275 while (my ($name, $info) = each %$res) { 3480 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3481 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3482 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3483
3280 if ($info->{type} & 1) { 3484 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3485 cf::face::set_type $idx, $info->{type};
3295 } else { 3486 } else {
3296 $RESOURCE{$name} = $info; 3487 $RESOURCE{$name} = $info; # unused
3297 } 3488 }
3298 3489
3299 cf::cede_to_tick; 3490 cf::cede_to_tick;
3300 } 3491 }
3301 } 3492 }
3302 3493
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3494 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3495
3305 1 3496 1
3306} 3497}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3498
3328register_exticmd fx_want => sub { 3499register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3500 my ($ns, $want) = @_;
3330 3501
3331 while (my ($k, $v) = each %$want) { 3502 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3541sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3542 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3543 or die "unable to load treasurelists\n";
3373} 3544}
3374 3545
3546sub reload_sound {
3547 trace "loading sound config from $DATADIR/sound\n";
3548
3549 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550 or die "$DATADIR/sound $!";
3551
3552 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3553
3554 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555 my $sound = $soundconf->{compat}[$_]
3556 or next;
3557
3558 my $face = cf::face::find "sound/$sound->[1]";
3559 cf::sound::set $sound->[0] => $face;
3560 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3561 }
3562
3563 while (my ($k, $v) = each %{$soundconf->{event}}) {
3564 my $face = cf::face::find "sound/$v";
3565 cf::sound::set $k => $face;
3566 }
3567}
3568
3375sub reload_resources { 3569sub reload_resources {
3376 warn "reloading resource files...\n"; 3570 trace "reloading resource files...\n";
3377 3571
3378 reload_facedata; 3572 reload_facedata;
3573 reload_sound;
3379 reload_archetypes; 3574 reload_archetypes;
3380 reload_regions; 3575 reload_regions;
3381 reload_treasures; 3576 reload_treasures;
3382 3577
3383 warn "finished reloading resource files\n"; 3578 trace "finished reloading resource files\n";
3384} 3579}
3385 3580
3386sub reload_config { 3581sub reload_config {
3582 trace "reloading config file...\n";
3583
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3584 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3585 or return;
3389 3586
3390 local $/; 3587 local $/;
3391 *CFG = YAML::Load <$fh>; 3588 *CFG = YAML::XS::Load scalar <$fh>;
3392 3589
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3590 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3591
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3592 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3593 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3594
3398 if (exists $CFG{mlockall}) { 3595 if (exists $CFG{mlockall}) {
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3597 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3598 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3599 };
3403 warn $@ if $@; 3600 warn $@ if $@;
3404 } 3601 }
3602
3603 trace "finished reloading resource files\n";
3405} 3604}
3406 3605
3407sub pidfile() { 3606sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3607 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3608 or die "$PIDFILE: $!";
… …
3422 seek $fh, 0, 0; 3621 seek $fh, 0, 0;
3423 print $fh $$; 3622 print $fh $$;
3424} 3623}
3425 3624
3426sub main_loop { 3625sub main_loop {
3427 warn "EV::loop starting\n"; 3626 trace "EV::loop starting\n";
3428 if (1) { 3627 if (1) {
3429 EV::loop; 3628 EV::loop;
3430 } 3629 }
3431 warn "EV::loop returned\n"; 3630 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3631 goto &main_loop unless $REALLY_UNLOOP;
3433} 3632}
3434 3633
3435sub main { 3634sub main {
3436 cf::init_globals; # initialise logging 3635 cf::init_globals; # initialise logging
3437 3636
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3637 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3638 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3639 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3640 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3641
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3642 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3643
3450 # we must not ever block the main coroutine 3644 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3645 local $Coro::idle = sub {
… …
3457 }; 3651 };
3458 3652
3459 evthread_start IO::AIO::poll_fileno; 3653 evthread_start IO::AIO::poll_fileno;
3460 3654
3461 cf::sync_job { 3655 cf::sync_job {
3656 init_inc;
3657
3658 cf::init_experience;
3659 cf::init_anim;
3660 cf::init_attackmess;
3661 cf::init_dynamic;
3662
3663 cf::load_settings;
3664 cf::load_materials;
3665
3462 reload_resources; 3666 reload_resources;
3463 reload_config; 3667 reload_config;
3464 db_init; 3668 db_init;
3465 3669
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3670 cf::init_uuid;
3469 cf::init_signals; 3671 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3672 cf::init_skills;
3472 3673
3473 cf::init_beforeplay; 3674 cf::init_beforeplay;
3474 3675
3475 atomic; 3676 atomic;
… …
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3684 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3685
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3686 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3687 };
3487 3688
3689 cf::object::thawer::errors_are_fatal 0;
3690 info "parse errors in files are no longer fatal from this point on.\n";
3691
3692 my $free_main; $free_main = EV::idle sub {
3693 undef $free_main;
3694 undef &main; # free gobs of memory :)
3695 };
3696
3488 main_loop; 3697 goto &main_loop;
3489} 3698}
3490 3699
3491############################################################################# 3700#############################################################################
3492# initialisation and cleanup 3701# initialisation and cleanup
3493 3702
3494# install some emergency cleanup handlers 3703# install some emergency cleanup handlers
3495BEGIN { 3704BEGIN {
3496 our %SIGWATCHER = (); 3705 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3706 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3707 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3708 cf::cleanup "SIG$signal";
3500 }; 3709 };
3501 } 3710 }
3502} 3711}
3503 3712
3504sub write_runtime_sync { 3713sub write_runtime_sync {
3714 my $t0 = AE::time;
3715
3505 # first touch the runtime file to show we are still running: 3716 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3717 # the fsync below can take a very very long time.
3507 3718
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3719 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3720
3510 my $guard = cf::lock_acquire "write_runtime"; 3721 my $guard = cf::lock_acquire "write_runtime";
3511 3722
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3723 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3724 or return;
3514 3725
3515 my $value = $cf::RUNTIME + 90 + 10; 3726 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3727 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3728 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3741 or return;
3531 3742
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3743 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3744 and return;
3534 3745
3535 warn "runtime file written.\n"; 3746 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3747
3537 1 3748 1
3538} 3749}
3539 3750
3540our $uuid_lock; 3751our $uuid_lock;
… …
3552 or return; 3763 or return;
3553 3764
3554 my $value = uuid_seq uuid_cur; 3765 my $value = uuid_seq uuid_cur;
3555 3766
3556 unless ($value) { 3767 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3768 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3769 return;
3559 } 3770 }
3560 3771
3561 my $value = uuid_str $value + $uuid_skip; 3772 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3773 $uuid_skip = 0;
… …
3572 or return; 3783 or return;
3573 3784
3574 aio_rename "$uuid~", $uuid 3785 aio_rename "$uuid~", $uuid
3575 and return; 3786 and return;
3576 3787
3577 warn "uuid file written ($value).\n"; 3788 trace "uuid file written ($value).\n";
3578 3789
3579 1 3790 1
3580 3791
3581} 3792}
3582 3793
… …
3588} 3799}
3589 3800
3590sub emergency_save() { 3801sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3802 my $freeze_guard = cf::freeze_mainloop;
3592 3803
3593 warn "emergency_perl_save: enter\n"; 3804 info "emergency_perl_save: enter\n";
3805
3806 # this is a trade-off: we want to be very quick here, so
3807 # save all maps without fsync, and later call a global sync
3808 # (which in turn might be very very slow)
3809 local $USE_FSYNC = 0;
3594 3810
3595 cf::sync_job { 3811 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3812 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3813
3601 # use a peculiar iteration method to avoid tripping on perl 3814 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3815 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3816 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3817 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3818 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3819 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3820 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3821 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3822 $pl->save;
3610 } 3823 }
3611 warn "emergency_perl_save: end player save\n"; 3824 info "emergency_perl_save: end player save\n";
3612 3825
3826 cf::write_runtime_sync; # external watchdog should not bark
3827
3613 warn "emergency_perl_save: begin map save\n"; 3828 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3829 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3830 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3831 $map->valid or next;
3617 $map->save; 3832 $map->save;
3618 } 3833 }
3619 warn "emergency_perl_save: end map save\n"; 3834 info "emergency_perl_save: end map save\n";
3620 3835
3836 cf::write_runtime_sync; # external watchdog should not bark
3837
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3838 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3839 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3840 info "emergency_perl_save: end database checkpoint\n";
3624 3841
3625 warn "emergency_perl_save: begin write uuid\n"; 3842 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3843 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3844 info "emergency_perl_save: end write uuid\n";
3845
3846 cf::write_runtime_sync; # external watchdog should not bark
3847
3848 trace "emergency_perl_save: syncing database to disk";
3849 BDB::db_env_txn_checkpoint $DB_ENV;
3850
3851 info "emergency_perl_save: starting sync\n";
3852 IO::AIO::aio_sync sub {
3853 info "emergency_perl_save: finished sync\n";
3854 };
3855
3856 cf::write_runtime_sync; # external watchdog should not bark
3857
3858 trace "emergency_perl_save: flushing outstanding aio requests";
3859 while (IO::AIO::nreqs || BDB::nreqs) {
3860 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3861 }
3862
3863 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3864 };
3629 3865
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3866 info "emergency_perl_save: leave\n";
3636} 3867}
3637 3868
3638sub post_cleanup { 3869sub post_cleanup {
3639 my ($make_core) = @_; 3870 my ($make_core) = @_;
3640 3871
3872 IO::AIO::flush;
3873
3641 warn Carp::longmess "post_cleanup backtrace" 3874 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3875 if $make_core;
3643 3876
3644 my $fh = pidfile; 3877 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3878 unlink $PIDFILE if <$fh> == $$;
3646} 3879}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3899 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3900 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3901 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3902# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3903 }
3671 warn "cleared package $pkg\n";#d#
3672} 3904}
3673 3905
3674sub do_reload_perl() { 3906sub do_reload_perl() {
3675 # can/must only be called in main 3907 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3908 if (in_main) {
3677 warn "can only reload from main coroutine"; 3909 error "can only reload from main coroutine";
3678 return; 3910 return;
3679 } 3911 }
3680 3912
3681 return if $RELOAD++; 3913 return if $RELOAD++;
3682 3914
3683 my $t1 = EV::time; 3915 my $t1 = AE::time;
3684 3916
3685 while ($RELOAD) { 3917 while ($RELOAD) {
3686 warn "reloading..."; 3918 info "reloading...";
3687 3919
3688 warn "entering sync_job"; 3920 trace "entering sync_job";
3689 3921
3690 cf::sync_job { 3922 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3923 cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3924
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3925 trace "cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3926 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3927 %EXT_CORO = ();
3708 3928
3709 warn "removing commands"; 3929 trace "removing commands";
3710 %COMMAND = (); 3930 %COMMAND = ();
3711 3931
3712 warn "removing ext/exti commands"; 3932 trace "removing ext/exti commands";
3713 %EXTCMD = (); 3933 %EXTCMD = ();
3714 %EXTICMD = (); 3934 %EXTICMD = ();
3715 3935
3716 warn "unloading/nuking all extensions"; 3936 trace "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3937 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3938 trace "... unloading $pkg";
3719 3939
3720 if (my $cb = $pkg->can ("unload")) { 3940 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3941 eval {
3722 $cb->($pkg); 3942 $cb->($pkg);
3723 1 3943 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3944 } or error "$pkg unloaded, but with errors: $@";
3725 } 3945 }
3726 3946
3727 warn "... clearing $pkg"; 3947 trace "... clearing $pkg";
3728 clear_package $pkg; 3948 clear_package $pkg;
3729 } 3949 }
3730 3950
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3951 trace "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3952 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3953 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3954
3735 warn "... unloading $k"; 3955 trace "... unloading $k";
3736 delete $INC{$k}; 3956 delete $INC{$k};
3737 3957
3738 $k =~ s/\.pm$//; 3958 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3959 $k =~ s/\//::/g;
3740 3960
… …
3743 } 3963 }
3744 3964
3745 clear_package $k; 3965 clear_package $k;
3746 } 3966 }
3747 3967
3748 warn "getting rid of safe::, as good as possible"; 3968 trace "getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3969 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3970 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 3971
3752 warn "unloading cf.pm \"a bit\""; 3972 trace "unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3973 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3974 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3975
3756 # don't, removes xs symbols, too, 3976 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3977 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3978 #clear_package __PACKAGE__;
3759 3979
3760 warn "unload completed, starting to reload now"; 3980 info "unload completed, starting to reload now";
3761 3981
3762 warn "reloading cf.pm"; 3982 trace "reloading cf.pm";
3763 require cf; 3983 require cf;
3764 cf::_connect_to_perl_1; 3984 cf::_connect_to_perl_1;
3765 3985
3766 warn "loading config and database again"; 3986 trace "loading config and database again";
3767 cf::reload_config; 3987 cf::reload_config;
3768 3988
3769 warn "loading extensions"; 3989 trace "loading extensions";
3770 cf::load_extensions; 3990 cf::load_extensions;
3771 3991
3772 if ($REATTACH_ON_RELOAD) { 3992 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3993 trace "reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3994 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3995 trace "reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3996 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3997 trace "reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3998 reattach $_ for values %PLAYER;
3779 } 3999 }
3780 4000
3781 warn "running post_init jobs"; 4001 trace "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT; 4002 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4003
3784 warn "leaving sync_job"; 4004 trace "leaving sync_job";
3785 4005
3786 1 4006 1
3787 } or do { 4007 } or do {
3788 warn $@; 4008 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4009 cf::cleanup "error while reloading, exiting.";
3790 }; 4010 };
3791 4011
3792 warn "reloaded"; 4012 info "reloaded";
3793 --$RELOAD; 4013 --$RELOAD;
3794 } 4014 }
3795 4015
3796 $t1 = EV::time - $t1; 4016 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4017 info "reload completed in ${t1}s\n";
3798}; 4018};
3799 4019
3800our $RELOAD_WATCHER; # used only during reload 4020our $RELOAD_WATCHER; # used only during reload
3801 4021
3802sub reload_perl() { 4022sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 4024 # coro crashes during coro_state_free->destroy here.
3805 4025
3806 $RELOAD_WATCHER ||= cf::async { 4026 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4027 Coro::AIO::aio_wait cache_extensions;
3808 4028
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4029 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4030 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4031 undef $RELOAD_WATCHER;
3812 }; 4032 };
3813 }; 4033 };
3814} 4034}
… …
3823 reload_perl; 4043 reload_perl;
3824 }; 4044 };
3825 } 4045 }
3826}; 4046};
3827 4047
3828unshift @INC, $LIBDIR; 4048#############################################################################
3829 4049
3830my $bug_warning = 0; 4050my $bug_warning = 0;
3831 4051
3832our @WAIT_FOR_TICK; 4052our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4053our @WAIT_FOR_TICK_BEGIN;
3834 4054
3835sub wait_for_tick { 4055sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4056 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4057
3838 my $signal = new Coro::Signal; 4058 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4059 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4060 $signal->wait;
3841} 4061}
3842 4062
3843sub wait_for_tick_begin { 4063sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4064 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4065
3846 my $signal = new Coro::Signal; 4066 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4067 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4068 $signal->wait;
3849} 4069}
… …
3855 return; 4075 return;
3856 } 4076 }
3857 4077
3858 cf::server_tick; # one server iteration 4078 cf::server_tick; # one server iteration
3859 4079
4080 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4081
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4082 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4083 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4084 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4085 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4086 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4087 or error "ERROR: unable to write runtime file: $!";
3866 }; 4088 };
3867 } 4089 }
3868 4090
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4091 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4092 $sig->send;
… …
3878 4100
3879 if (0) { 4101 if (0) {
3880 if ($NEXT_TICK) { 4102 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4103 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4104 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4105 debug "jitter $JITTER\n";#d#
3884 } 4106 }
3885 } 4107 }
3886} 4108}
3887 4109
3888{ 4110{
3889 # configure BDB 4111 # configure BDB
3890 4112
3891 BDB::min_parallel 8; 4113 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4114 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4115 $AnyEvent::BDB::WATCHER->priority (1);
3894 4116
3895 unless ($DB_ENV) { 4117 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4118 $DB_ENV = BDB::db_env_create;

Diff Legend

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