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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.542 by root, Wed May 5 09:05:03 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
… …
117our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 127our $DB_ENV;
121 128
122our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
123 130
124our %CFG; 131our %CFG;
125 132
126our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 134our $RUNTIME;
… …
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 $_;
171 $REFLECT{$reflect->{class}} = $reflect; 182 $REFLECT{$reflect->{class}} = $reflect;
172} 183}
173 184
174# this is decidedly evil 185# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 187
177############################################################################# 188#############################################################################
178 189
179=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
180 191
… …
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";
1411 1456
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1458 if exists $v->{meta}{mandatory};
1416 1459
1417 warn $msg; 1460 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1461 delete $todo{$k};
1462 } else {
1463 $done{$k} = delete $todo{$k};
1464 push @EXTS, $v->{pkg};
1465 $progress = 1;
1466
1467 info "$v->{base}: extension inactive.\n"
1468 unless $active;
1418 } 1469 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1470 }
1424 1471
1425 skip: 1472 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1474
1475 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory};
1478 }
1479 }
1428 } 1480 }
1429 }; 1481 };
1430} 1482}
1431 1483
1432############################################################################# 1484#############################################################################
… …
1516 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1517 } 1569 }
1518 } 1570 }
1519} 1571}
1520 1572
1573cf::player->attach (
1574 on_load => sub {
1575 my ($pl, $path) = @_;
1576
1577 # restore slots saved in save, below
1578 my $slots = delete $pl->{_slots};
1579
1580 $pl->ob->current_weapon ($slots->[0]);
1581 $pl->combat_ob ($slots->[1]);
1582 $pl->ranged_ob ($slots->[2]);
1583 },
1584);
1585
1521sub save($) { 1586sub save($) {
1522 my ($pl) = @_; 1587 my ($pl) = @_;
1523 1588
1524 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1525 1590
… …
1530 1595
1531 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1533 1598
1534 cf::get_slot 0.01; 1599 cf::get_slot 0.01;
1600
1601 # save slots, to be restored later
1602 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1603
1536 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1605 cf::cede_to_tick;
1538} 1606}
1539 1607
… …
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1645
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1579 $pl->deactivate; 1647 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1583 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1584 1651
1585 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1641 \@logins 1708 \@logins
1642} 1709}
1643 1710
1644=item $player->maps 1711=item $player->maps
1645 1712
1713=item cf::player::maps $login
1714
1646Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1647player. May block. 1716player. May block.
1648 1717
1649=cut 1718=cut
1650 1719
… …
1712=cut 1781=cut
1713 1782
1714sub find_by_path($) { 1783sub find_by_path($) {
1715 my ($path) = @_; 1784 my ($path) = @_;
1716 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1717 my ($match, $specificity); 1788 my ($match, $specificity);
1718 1789
1719 for my $region (list) { 1790 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
… …
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1824
1754 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1826 $self->_create_random_map (
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1777 1848
1778sub register { 1849sub register {
1779 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1851 my $pkg = caller;
1781 1852
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1854
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1856}
1787 1857
1788# also paths starting with '/' 1858# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1860
1791sub thawer_merge { 1861sub thawer_merge {
1792 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1793 1863
1794 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
… …
2008 2078
2009 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
2010 } 2080 }
2011} 2081}
2012 2082
2013sub pre_load { } 2083sub pre_load { }
2014sub post_load { } 2084#sub post_load { } # XS
2015 2085
2016sub load { 2086sub load {
2017 my ($self) = @_; 2087 my ($self) = @_;
2018 2088
2019 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
… …
2076 } 2146 }
2077 2147
2078 $self->post_load; 2148 $self->post_load;
2079} 2149}
2080 2150
2151# customize the map for a given player, i.e.
2152# return the _real_ map. used by e.g. per-player
2153# maps to change the path to ~playername/mappath
2081sub customise_for { 2154sub customise_for {
2082 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2083 2156
2084 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2158 if $self->per_player;
… …
2101 or next; 2174 or next;
2102 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2103 or next; 2176 or next;
2104 $neigh->load; 2177 $neigh->load;
2105 2178
2179 # now find the diagonal neighbours
2106 push @neigh, 2180 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 } 2183 }
2110 2184
… …
2117} 2191}
2118 2192
2119sub find_sync { 2193sub find_sync {
2120 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2121 2195
2122 cf::sync_job { find $path, $origin } 2196 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197 if $Coro::current == $Coro::main;
2198
2199 find $path, $origin
2123} 2200}
2124 2201
2125sub do_load_sync { 2202sub do_load_sync {
2126 my ($map) = @_; 2203 my ($map) = @_;
2127 2204
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2130 2207
2131 cf::sync_job { $map->load }; 2208 $map->load;
2132} 2209}
2133 2210
2134our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2136 2213
… …
2162 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2163 2240
2164 () 2241 ()
2165} 2242}
2166 2243
2244# common code, used by both ->save and ->swapout
2167sub save { 2245sub _save {
2168 my ($self) = @_; 2246 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2247
2172 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2173 2249
2174 return unless $self->dirty; 2250 return unless $self->dirty;
2175 2251
… …
2195 } else { 2271 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2272 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2273 }
2198} 2274}
2199 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2200sub swap_out { 2284sub swap_out {
2201 my ($self) = @_; 2285 my ($self) = @_;
2202 2286
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2288
2208 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2210 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2211 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2212 $self->in_memory (cf::MAP_SWAPPED); 2296 $self->in_memory (cf::MAP_SWAPPED);
2297
2298 # then atomically save
2299 $self->_save;
2300
2301 # then free the map
2302 $self->clear;
2303}
2304
2305sub reset_at {
2306 my ($self) = @_;
2307
2308 # TODO: safety, remove and allow resettable per-player maps
2309 return 1e99 if $self->{deny_reset};
2310
2311 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2312 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2313
2314 $time + $to
2315}
2316
2317sub should_reset {
2318 my ($self) = @_;
2319
2320 $self->reset_at <= $cf::RUNTIME
2321}
2322
2323sub reset {
2324 my ($self) = @_;
2325
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2328 return if $self->players;
2329
2330 cf::trace "resetting map ", $self->path, "\n";
2331
2332 $self->in_memory (cf::MAP_SWAPPED);
2333
2334 # need to save uniques path
2335 unless ($self->{deny_save}) {
2336 my $uniq = $self->uniq_path; utf8::encode $uniq;
2337
2338 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2339 if $uniq;
2340 }
2341
2342 delete $cf::MAP{$self->path};
2213 2343
2214 $self->deactivate; 2344 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2346 $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 2347
2262 $self->unlink_save; 2348 $self->unlink_save;
2263 $self->destroy; 2349 $self->destroy;
2264} 2350}
2265 2351
… …
2273 2359
2274 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2275 2361
2276 $self->unlink_save; 2362 $self->unlink_save;
2277 2363
2278 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2369
… …
2340 : normalise $_ 2426 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2428 ]
2343} 2429}
2344 2430
2431=item cf::map::static_maps
2432
2433Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2434file in the shared directory excluding F</styles> and F</editor>). May
2435block.
2436
2437=cut
2438
2439sub static_maps() {
2440 my @dirs = "";
2441 my @maps;
2442
2443 while (@dirs) {
2444 my $dir = shift @dirs;
2445
2446 next if $dir eq "/styles" || $dir eq "/editor";
2447
2448 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2449 or return;
2450
2451 for (@$files) {
2452 s/\.map$// or next;
2453 utf8::decode $_;
2454 push @maps, "$dir/$_";
2455 }
2456
2457 push @dirs, map "$dir/$_", @$dirs;
2458 }
2459
2460 \@maps
2461}
2462
2345=back 2463=back
2346 2464
2347=head3 cf::object 2465=head3 cf::object
2348 2466
2349=cut 2467=cut
… …
2481 2599
2482Freezes the player and moves him/her to a special map (C<{link}>). 2600Freezes the player and moves him/her to a special map (C<{link}>).
2483 2601
2484The player should be reasonably safe there for short amounts of time (e.g. 2602The 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, 2603for 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 2604though, as the player cannot control the character while it is on the link
2487map. 2605map.
2488 2606
2489Will never block. 2607Will never block.
2490 2608
2491=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
… …
2512sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2513 my ($self) = @_; 2631 my ($self) = @_;
2514 2632
2515 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2516 2634
2635 ++$self->{_link_recursion};
2636
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2638
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2521 2641
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2643}
2524 2644
2525sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2527 2647
… …
2544 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2546 2666
2547 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2550 2670
2551 $map->load; 2671 $map->load;
2552 $map->load_neighbours; 2672 $map->load_neighbours;
2553 2673
2554 return unless $self->contr->active; 2674 return unless $self->contr->active;
2555 2675
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2558 2678 # entering was successful
2679 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2680 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2681 $self->activate_recursive;
2561} 2682 }
2562 2683
2684}
2685
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2686=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2687
2565Moves the player to the given map-path and coordinates by first freezing 2688Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2690that 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 2691the new (success) or old (failed) map position. In either case, $done will
… …
2575 2698
2576our $GOTOGEN; 2699our $GOTOGEN;
2577 2700
2578sub cf::object::player::goto { 2701sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2702 my ($self, $path, $x, $y, $check, $done) = @_;
2703
2704 if ($self->{_link_recursion} >= $MAX_LINKS) {
2705 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2706 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2707 ($path, $x, $y) = @$EMERGENCY_POSITION;
2708 }
2580 2709
2581 # do generation counting so two concurrent goto's will be executed in-order 2710 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2712
2584 $self->enter_link; 2713 $self->enter_link;
… …
2608 my $map = eval { 2737 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2610 2739
2611 if ($map) { 2740 if ($map) {
2612 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2743 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2744 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2745 }
2617 2746
2618 $map 2747 $map
… …
2626 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2629 } 2758 }
2630 2759
2631 $done->() if $done; 2760 $done->($self) if $done;
2632 })->prio (1); 2761 })->prio (1);
2633} 2762}
2634 2763
2635=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2636 2765
… …
2729 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2859 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2862
2734 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2864 $self->leave_link;
2736 } 2865 }
2737 })->prio (1); 2866 })->prio (1);
2738} 2867}
2739 2868
… …
2751sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2753 2882
2754 utf8::encode $text; 2883 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2884 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885}
2886
2887=item $client->send_big_packet ($pkt)
2888
2889Like C<send_packet>, but tries to compress large packets, and fragments
2890them as required.
2891
2892=cut
2893
2894our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2895
2896sub cf::client::send_big_packet {
2897 my ($self, $pkt) = @_;
2898
2899 # try lzf for large packets
2900 $pkt = "lzf " . Compress::LZF::compress $pkt
2901 if 1024 <= length $pkt and $self->{can_lzf};
2902
2903 # split very large packets
2904 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2905 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2906 $pkt = "frag";
2907 }
2908
2909 $self->send_packet ($pkt);
2756} 2910}
2757 2911
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 2913
2760Send a drawinfo or msg packet to the client, formatting the msg for the 2914Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2764 2918
2765=cut 2919=cut
2766 2920
2767# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2769 "c/identify" => { 2929 "c/identify" => {
2770 id => "infobox", 2930 id => "infobox",
2771 title => "Identify", 2931 title => "Identify",
2772 reply => undef, 2932 reply => undef,
2773 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
… …
2775 "c/examine" => { 2935 "c/examine" => {
2776 id => "infobox", 2936 id => "infobox",
2777 title => "Examine", 2937 title => "Examine",
2778 reply => undef, 2938 reply => undef,
2779 tooltip => "Signs and other items you examined", 2939 tooltip => "Signs and other items you examined",
2940 },
2941 "c/shopinfo" => {
2942 id => "infobox",
2943 title => "Shop Info",
2944 reply => undef,
2945 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 2946 },
2781 "c/book" => { 2947 "c/book" => {
2782 id => "infobox", 2948 id => "infobox",
2783 title => "Book", 2949 title => "Book",
2784 reply => undef, 2950 reply => undef,
… …
2900 my $pkt = "msg " 3066 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3067 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3069 );
2904 3070
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); 3071 $self->send_big_packet ($pkt);
2916} 3072}
2917 3073
2918=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2919 3075
2920Sends an ext event to the client. 3076Sends an ext event to the client.
… …
2923 3079
2924sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2926 3082
2927 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3088 }
2933} 3089}
2934 3090
2935=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2936 3092
… …
2940 3096
2941sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2943 3099
2944 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove 3103 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 } 3106 }
2951} 3107}
2952 3108
2953=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2954 3110
… …
3025 3181
3026 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3183 if $reply;
3028 3184
3029 } else { 3185 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3186 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3187 }
3032 3188
3033 cf::override; 3189 cf::override;
3034 }, 3190 },
3035); 3191);
… …
3055 3211
3056 $coro 3212 $coro
3057} 3213}
3058 3214
3059cf::client->attach ( 3215cf::client->attach (
3060 on_destroy => sub { 3216 on_client_destroy => sub {
3061 my ($ns) = @_; 3217 my ($ns) = @_;
3062 3218
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3220 },
3065); 3221);
… …
3081our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3082 3238
3083$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3084 3240
3085$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3088 sort time 3244 sort time
3089)); 3245));
3090 3246
3091# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
… …
3116 decrease split destroy change_exp value msg lore send_msg)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3274 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3120) { 3276) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3279 for @funs;
3125} 3280}
3126 3281
… …
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3145 3300
3146 %vars = (_dummy => 0) unless %vars; 3301 %vars = (_dummy => 0) unless %vars;
3147 3302
3303 my @res;
3148 local $_; 3304 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3305
3151 my $eval = 3306 my $eval =
3152 "do {\n" 3307 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3310 . $code
3156 . "\n}" 3311 . "\n}"
3157 ; 3312 ;
3158 3313
3314 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3318 sub_generation_inc;
3319 } else {
3320 local @cf::_safe_eval_args = values %vars;
3321 @res = wantarray ? eval eval : scalar eval $eval;
3322 }
3162 3323
3163 if ($@) { 3324 if ($@) {
3164 warn "$@"; 3325 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3167 } 3328 }
3168 3329
3169 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3170} 3331}
3171 3332
… …
3185=cut 3346=cut
3186 3347
3187sub register_script_function { 3348sub register_script_function {
3188 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3189 3350
3190 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3192} 3353}
3193 3354
3194=back 3355=back
3195 3356
3196=cut 3357=cut
3197 3358
3198############################################################################# 3359#############################################################################
3199# the server's init and main functions 3360# the server's init and main functions
3361
3362# async inc loader. yay.
3363sub inc_loader {
3364 my $mod = $_[1];
3365
3366 if (in_main && !tick_inhibit) {
3367 Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";
3368 } else {
3369 debug "loading perl module $mod\n";
3370 }
3371
3372 # 1. find real file
3373 for my $dir (@ORIG_INC) {
3374 ref $dir and next;
3375 0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376 or next;
3377
3378 $data = "#line 1 $dir/$mod\n$data";
3379
3380 open my $fh, "<", \$data or die;
3381
3382 return $fh;
3383 }
3384
3385 ()
3386}
3387
3388sub init_inc {
3389 # save original @INC
3390 @ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392 # make sure we can do scalar-opens
3393 open my $dummy, "<", \my $dummy2;
3394
3395 # execute some stuff so perl load's some of the core modules
3396 /Ü/ =~ /ü/i;
3397 eval { &Storable::nstore_fd };
3398
3399 @INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401 debug "module loading will be asynchronous from this point on.";
3402}
3200 3403
3201sub load_facedata($) { 3404sub load_facedata($) {
3202 my ($path) = @_; 3405 my ($path) = @_;
3203 3406
3204 # HACK to clear player env face cache, we need some signal framework 3407 # HACK to clear player env face cache, we need some signal framework
3205 # for this (global event?) 3408 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3410
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3412
3210 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3211 3414
3212 my $facedata; 3415 my $facedata;
3213 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3214 or die "$path: $!"; 3417 or die "$path: $!";
3215 3418
… …
3217 3420
3218 $facedata->{version} == 2 3421 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3423
3221 # patch in the exptable 3424 # patch in the exptable
3425 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3427 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3428 data => $exp_table,
3429 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3430 };
3226 cf::cede_to_tick; 3431 cf::cede_to_tick;
3227 3432
3228 { 3433 {
3229 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
… …
3231 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3438
3234 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3238 3443
3239 cf::cede_to_tick; 3444 cf::cede_to_tick;
3240 } 3445 }
3241 3446
3242 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
… …
3247 3452
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3456 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3458 }
3254 3459
3255 cf::cede_to_tick; 3460 cf::cede_to_tick;
3256 } 3461 }
3257 } 3462 }
… …
3266 3471
3267 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3268 } 3473 }
3269 3474
3270 { 3475 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3274 3477
3275 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3481
3280 if ($info->{type} & 1) { 3482 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}; 3483 cf::face::set_type $idx, $info->{type};
3295 } else { 3484 } else {
3296 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3297 } 3486 }
3298 3487
3299 cf::cede_to_tick; 3488 cf::cede_to_tick;
3300 } 3489 }
3301 } 3490 }
3302 3491
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3493
3305 1 3494 1
3306} 3495}
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 3496
3328register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3330 3499
3331 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
… …
3370sub reload_treasures { 3539sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3373} 3542}
3374 3543
3544sub reload_sound {
3545 trace "loading sound config from $DATADIR/sound\n";
3546
3547 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548 or die "$DATADIR/sound $!";
3549
3550 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3551
3552 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553 my $sound = $soundconf->{compat}[$_]
3554 or next;
3555
3556 my $face = cf::face::find "sound/$sound->[1]";
3557 cf::sound::set $sound->[0] => $face;
3558 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3559 }
3560
3561 while (my ($k, $v) = each %{$soundconf->{event}}) {
3562 my $face = cf::face::find "sound/$v";
3563 cf::sound::set $k => $face;
3564 }
3565}
3566
3375sub reload_resources { 3567sub reload_resources {
3376 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3377 3569
3378 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3379 reload_archetypes; 3572 reload_archetypes;
3380 reload_regions; 3573 reload_regions;
3381 reload_treasures; 3574 reload_treasures;
3382 3575
3383 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3384} 3577}
3385 3578
3386sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3388 or return; 3583 or return;
3389 3584
3390 local $/; 3585 local $/;
3391 *CFG = YAML::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3392 3587
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3589
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3590 $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}; 3591 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3592
3398 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
… …
3400 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3401 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3402 }; 3597 };
3403 warn $@ if $@; 3598 warn $@ if $@;
3404 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3405} 3602}
3406 3603
3407sub pidfile() { 3604sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
… …
3422 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3423 print $fh $$; 3620 print $fh $$;
3424} 3621}
3425 3622
3426sub main_loop { 3623sub main_loop {
3427 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3428 if (1) { 3625 if (1) {
3429 EV::loop; 3626 EV::loop;
3430 } 3627 }
3431 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3433} 3630}
3434 3631
3435sub main { 3632sub main {
3436 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3437 3634
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3636 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 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 3639
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3640 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3641
3450 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
… …
3457 }; 3649 };
3458 3650
3459 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3460 3652
3461 cf::sync_job { 3653 cf::sync_job {
3654 init_inc;
3655
3656 cf::init_experience;
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662 cf::load_materials;
3663
3462 reload_resources; 3664 reload_resources;
3463 reload_config; 3665 reload_config;
3464 db_init; 3666 db_init;
3465 3667
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3668 cf::init_uuid;
3469 cf::init_signals; 3669 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3670 cf::init_skills;
3472 3671
3473 cf::init_beforeplay; 3672 cf::init_beforeplay;
3474 3673
3475 atomic; 3674 atomic;
… …
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3682 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3683
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3486 }; 3685 };
3487 3686
3687 cf::object::thawer::errors_are_fatal 0;
3688 info "parse errors in files are no longer fatal from this point on.\n";
3689
3690 my $free_main; $free_main = EV::idle sub {
3691 undef $free_main;
3692 undef &main; # free gobs of memory :)
3693 };
3694
3488 main_loop; 3695 goto &main_loop;
3489} 3696}
3490 3697
3491############################################################################# 3698#############################################################################
3492# initialisation and cleanup 3699# initialisation and cleanup
3493 3700
3494# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3495BEGIN { 3702BEGIN {
3496 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3500 }; 3707 };
3501 } 3708 }
3502} 3709}
3503 3710
3504sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3505 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3507 3716
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3718
3510 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3511 3720
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3722 or return;
3514 3723
3515 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
… …
3530 or return; 3739 or return;
3531 3740
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3742 and return;
3534 3743
3535 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3745
3537 1 3746 1
3538} 3747}
3539 3748
3540our $uuid_lock; 3749our $uuid_lock;
… …
3552 or return; 3761 or return;
3553 3762
3554 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3555 3764
3556 unless ($value) { 3765 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3767 return;
3559 } 3768 }
3560 3769
3561 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3771 $uuid_skip = 0;
… …
3572 or return; 3781 or return;
3573 3782
3574 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3575 and return; 3784 and return;
3576 3785
3577 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3578 3787
3579 1 3788 1
3580 3789
3581} 3790}
3582 3791
… …
3588} 3797}
3589 3798
3590sub emergency_save() { 3799sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3592 3801
3593 warn "emergency_perl_save: enter\n"; 3802 info "emergency_perl_save: enter\n";
3803
3804 # this is a trade-off: we want to be very quick here, so
3805 # save all maps without fsync, and later call a global sync
3806 # (which in turn might be very very slow)
3807 local $USE_FSYNC = 0;
3594 3808
3595 cf::sync_job { 3809 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3810 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 3811
3601 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3818 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3820 $pl->save;
3610 } 3821 }
3611 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3612 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3613 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3829 $map->valid or next;
3617 $map->save; 3830 $map->save;
3618 } 3831 }
3619 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3620 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3624 3839
3625 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3841 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3842 info "emergency_perl_save: end write uuid\n";
3843
3844 cf::write_runtime_sync; # external watchdog should not bark
3845
3846 trace "emergency_perl_save: syncing database to disk";
3847 BDB::db_env_txn_checkpoint $DB_ENV;
3848
3849 info "emergency_perl_save: starting sync\n";
3850 IO::AIO::aio_sync sub {
3851 info "emergency_perl_save: finished sync\n";
3852 };
3853
3854 cf::write_runtime_sync; # external watchdog should not bark
3855
3856 trace "emergency_perl_save: flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3862 };
3629 3863
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"; 3864 info "emergency_perl_save: leave\n";
3636} 3865}
3637 3866
3638sub post_cleanup { 3867sub post_cleanup {
3639 my ($make_core) = @_; 3868 my ($make_core) = @_;
3640 3869
3870 IO::AIO::flush;
3871
3641 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3873 if $make_core;
3643 3874
3644 my $fh = pidfile; 3875 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3646} 3877}
… …
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3901 }
3671 warn "cleared package $pkg\n";#d#
3672} 3902}
3673 3903
3674sub do_reload_perl() { 3904sub do_reload_perl() {
3675 # can/must only be called in main 3905 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3677 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3678 return; 3908 return;
3679 } 3909 }
3680 3910
3681 return if $RELOAD++; 3911 return if $RELOAD++;
3682 3912
3683 my $t1 = EV::time; 3913 my $t1 = AE::time;
3684 3914
3685 while ($RELOAD) { 3915 while ($RELOAD) {
3686 warn "reloading..."; 3916 info "reloading...";
3687 3917
3688 warn "entering sync_job"; 3918 trace "entering sync_job";
3689 3919
3690 cf::sync_job { 3920 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3921 cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3922
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"; 3923 trace "cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3925 %EXT_CORO = ();
3708 3926
3709 warn "removing commands"; 3927 trace "removing commands";
3710 %COMMAND = (); 3928 %COMMAND = ();
3711 3929
3712 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3713 %EXTCMD = (); 3931 %EXTCMD = ();
3714 %EXTICMD = (); 3932 %EXTICMD = ();
3715 3933
3716 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3719 3937
3720 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3721 eval { 3939 eval {
3722 $cb->($pkg); 3940 $cb->($pkg);
3723 1 3941 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3725 } 3943 }
3726 3944
3727 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3728 clear_package $pkg; 3946 clear_package $pkg;
3729 } 3947 }
3730 3948
3731 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 3952
3735 warn "... unloading $k"; 3953 trace "... unloading $k";
3736 delete $INC{$k}; 3954 delete $INC{$k};
3737 3955
3738 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3740 3958
… …
3743 } 3961 }
3744 3962
3745 clear_package $k; 3963 clear_package $k;
3746 } 3964 }
3747 3965
3748 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 3967 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 3969
3752 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 3973
3756 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3757 # and global variables created in xs 3975 # and global variables created in xs
3758 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3759 3977
3760 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3761 3979
3762 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3763 require cf; 3981 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3765 3983
3766 warn "loading config and database again"; 3984 trace "loading config and database again";
3767 cf::reload_config; 3985 cf::reload_config;
3768 3986
3769 warn "loading extensions"; 3987 trace "loading extensions";
3770 cf::load_extensions; 3988 cf::load_extensions;
3771 3989
3772 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3776 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3779 } 3997 }
3780 3998
3781 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4001
3784 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3785 4003
3786 1 4004 1
3787 } or do { 4005 } or do {
3788 warn $@; 4006 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3790 }; 4008 };
3791 4009
3792 warn "reloaded"; 4010 info "reloaded";
3793 --$RELOAD; 4011 --$RELOAD;
3794 } 4012 }
3795 4013
3796 $t1 = EV::time - $t1; 4014 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3798}; 4016};
3799 4017
3800our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3801 4019
3802sub reload_perl() { 4020sub reload_perl() {
… …
3804 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3805 4023
3806 $RELOAD_WATCHER ||= cf::async { 4024 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4025 Coro::AIO::aio_wait cache_extensions;
3808 4026
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4028 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3812 }; 4030 };
3813 }; 4031 };
3814} 4032}
… …
3823 reload_perl; 4041 reload_perl;
3824 }; 4042 };
3825 } 4043 }
3826}; 4044};
3827 4045
3828unshift @INC, $LIBDIR; 4046#############################################################################
3829 4047
3830my $bug_warning = 0; 4048my $bug_warning = 0;
3831 4049
3832our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3834 4052
3835sub wait_for_tick { 4053sub wait_for_tick {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3837 4055
3838 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3839 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait; 4058 $signal->wait;
3841} 4059}
3842 4060
3843sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3845 4063
3846 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4066 $signal->wait;
3849} 4067}
… …
3855 return; 4073 return;
3856 } 4074 }
3857 4075
3858 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3859 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4081 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4082 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4084 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3866 }; 4086 };
3867 } 4087 }
3868 4088
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4090 $sig->send;
… …
3878 4098
3879 if (0) { 4099 if (0) {
3880 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3884 } 4104 }
3885 } 4105 }
3886} 4106}
3887 4107
3888{ 4108{
3889 # configure BDB 4109 # configure BDB
3890 4110
3891 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3894 4114
3895 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
… …
3977 } 4197 }
3978} 4198}
3979 4199
3980# load additional modules 4200# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3982 4203
3983END { cf::emergency_save } 4204END { cf::emergency_save }
3984 4205
39851 42061
3986 4207

Diff Legend

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