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.478 by root, Thu Sep 17 01:57:31 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
88our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
89our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
90 91
91our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
92our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
93 96
94our $CONFDIR = confdir; 97our $CONFDIR = confdir;
95our $DATADIR = datadir; 98our $DATADIR = datadir;
96our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
97our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
103our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
104our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
107 110
108our %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;
109 118
110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
112our $NEXT_TICK; 121our $NEXT_TICK;
113our $USE_FSYNC = 1; # use fsync to write maps - default on 122our $USE_FSYNC = 1; # use fsync to write maps - default on
115our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
117our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
118our $DB_ENV; 127our $DB_ENV;
119 128
120our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
121 130
122our %CFG; 131our %CFG;
123 132
124our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
125our $RUNTIME; 134our $RUNTIME;
159 168
160our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
161 170
162sub cf::map::normalise; 171sub cf::map::normalise;
163 172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
187
164############################################################################# 188#############################################################################
165 189
166=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
167 191
168=over 4 192=over 4
214returns 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
215per 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.
216 240
217=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
218 242
219This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
220C<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
221that call. 245that call.
222 246
247=item %cf::REFLECT
248
249Contains, for each (C++) class name, a hash reference with information
250about object members (methods, scalars, arrays and flags) and other
251metadata, which is useful for introspection.
252
223=back 253=back
224 254
225=cut 255=cut
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 "", @_ }
226 262
227$Coro::State::WARNHOOK = sub { 263$Coro::State::WARNHOOK = sub {
228 my $msg = join "", @_; 264 my $msg = join "", @_;
229 265
230 $msg .= "\n" 266 $msg .= "\n"
231 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
232 268
233 $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;
234 270
235 LOG llevError, $msg; 271 LOG llevWarn, $msg;
236}; 272};
237 273
238$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
240 276
241 warn Carp::longmess $_[0]; 277 error Carp::longmess $_[0];
242 278
243 if ($Coro::current == $Coro::main) {#d# 279 if (in_main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d# 281 return;#d#
246 }#d# 282 }#d#
247 283
248 # kill coroutine otherwise 284 # kill coroutine otherwise
249 Coro::terminate 285 Coro::terminate
269)) { 305)) {
270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
271} 307}
272 308
273$EV::DIED = sub { 309$EV::DIED = sub {
274 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
275}; 311};
276 312
277############################################################################# 313#############################################################################
278 314
279=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
376} 412}
377 413
378=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
379 415
380Like 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
381get spread over timer. 417get spread over time.
382 418
383=cut 419=cut
384 420
385sub periodic($$) { 421sub periodic($$) {
386 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
403 439
404=cut 440=cut
405 441
406our @SLOT_QUEUE; 442our @SLOT_QUEUE;
407our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
408 445
409$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
410$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
412 449
413 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
414 452
415 while () { 453 while () {
416 next_job: 454 next_job:
455
417 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
418 if ($avail > 0.01) { 457
419 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
420 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
421 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
422 $job->[2]->send; 462 $job->[2]->send;
423 Coro::cede; 463 Coro::cede;
424 goto next_job; 464 goto next_job;
425 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
426 } 467 }
427 } 468 }
428 469
429 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
430 # 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
431 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
432 $signal->wait; 473 $signal->wait;
433 } else { 474 } else {
475 $busy = 0;
434 Coro::schedule; 476 Coro::schedule;
435 } 477 }
436 } 478 }
437}; 479};
438 480
439sub get_slot($;$$) { 481sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
441 483
442 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
443 485
444 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
445 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
446 489
447 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
448 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
449 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
475=cut 518=cut
476 519
477sub sync_job(&) { 520sub sync_job(&) {
478 my ($job) = @_; 521 my ($job) = @_;
479 522
480 if ($Coro::current == $Coro::main) { 523 if (in_main) {
481 my $time = EV::time; 524 my $time = AE::time;
482 525
483 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
484 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
485 528
486 LOG llevError, Carp::longmess "sync job";#d# 529 #LOG llevError, Carp::longmess "sync job";#d#
487 530
488 my $freeze_guard = freeze_mainloop; 531 my $freeze_guard = freeze_mainloop;
489 532
490 my $busy = 1; 533 my $busy = 1;
491 my @res; 534 my @res;
492 535
493 (async { 536 (async {
494 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
495 @res = eval { $job->() }; 538 @res = eval { $job->() };
496 warn $@ if $@; 539 error $@ if $@;
497 undef $busy; 540 undef $busy;
498 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
499 542
500 while ($busy) { 543 while ($busy) {
501 if (Coro::nready) { 544 if (Coro::nready) {
503 } else { 546 } else {
504 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
505 } 548 }
506 } 549 }
507 550
508 my $time = EV::time - $time; 551 my $time = AE::time - $time;
509 552
510 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
511 554
512 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
513 } else { 556 } else {
557 reset_signals; 600 reset_signals;
558 &$cb 601 &$cb
559 }, @args; 602 }, @args;
560 603
561 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 )
562} 616}
563 617
564=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
565 619
566=cut 620=cut
603within each server. 657within each server.
604 658
605=cut 659=cut
606 660
607sub db_table($) { 661sub db_table($) {
662 cf::error "db_get called from main context"
663 if $Coro::current == $Coro::main;
664
608 my ($name) = @_; 665 my ($name) = @_;
609 my $db = BDB::db_create $DB_ENV; 666 my $db = BDB::db_create $DB_ENV;
610 667
611 eval { 668 eval {
612 $db->set_flags (BDB::CHKSUM); 669 $db->set_flags (BDB::CHKSUM);
622} 679}
623 680
624our $DB; 681our $DB;
625 682
626sub db_init { 683sub db_init {
627 cf::sync_job {
628 $DB ||= db_table "db"; 684 $DB ||= db_table "db";
629 };
630} 685}
631 686
632sub db_get($$) { 687sub db_get($$) {
633 my $key = "$_[0]/$_[1]"; 688 my $key = "$_[0]/$_[1]";
634 689
635 cf::sync_job { 690 cf::error "db_get called from main context"
691 if $Coro::current == $Coro::main;
692
636 BDB::db_get $DB, undef, $key, my $data; 693 BDB::db_get $DB, undef, $key, my $data;
637 694
638 $! ? () 695 $! ? ()
639 : $data 696 : $data
640 }
641} 697}
642 698
643sub db_put($$$) { 699sub db_put($$$) {
644 BDB::dbreq_pri 4; 700 BDB::dbreq_pri 4;
645 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 701 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
701 757
702 my $t1 = Time::HiRes::time; 758 my $t1 = Time::HiRes::time;
703 my $data = $process->(\@data); 759 my $data = $process->(\@data);
704 my $t2 = Time::HiRes::time; 760 my $t2 = Time::HiRes::time;
705 761
706 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 762 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
707 763
708 db_put cache => "$id/data", $data; 764 db_put cache => "$id/data", $data;
709 db_put cache => "$id/md5" , $md5; 765 db_put cache => "$id/md5" , $md5;
710 db_put cache => "$id/meta", $meta; 766 db_put cache => "$id/meta", $meta;
711 767
721 777
722=cut 778=cut
723 779
724sub datalog($@) { 780sub datalog($@) {
725 my ($type, %kv) = @_; 781 my ($type, %kv) = @_;
726 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 782 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
727} 783}
728 784
729=back 785=back
730 786
731=cut 787=cut
926 982
927 } elsif (exists $cb_id{$type}) { 983 } elsif (exists $cb_id{$type}) {
928 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 984 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
929 985
930 } elsif (ref $type) { 986 } elsif (ref $type) {
931 warn "attaching objects not supported, ignoring.\n"; 987 error "attaching objects not supported, ignoring.\n";
932 988
933 } else { 989 } else {
934 shift @arg; 990 shift @arg;
935 warn "attach argument '$type' not supported, ignoring.\n"; 991 error "attach argument '$type' not supported, ignoring.\n";
936 } 992 }
937 } 993 }
938} 994}
939 995
940sub _object_attach { 996sub _object_attach {
950 _attach $registry, $klass, @attach; 1006 _attach $registry, $klass, @attach;
951 } 1007 }
952 1008
953 $obj->{$name} = \%arg; 1009 $obj->{$name} = \%arg;
954 } else { 1010 } else {
955 warn "object uses attachment '$name' which is not available, postponing.\n"; 1011 info "object uses attachment '$name' which is not available, postponing.\n";
956 } 1012 }
957 1013
958 $obj->{_attachment}{$name} = undef; 1014 $obj->{_attachment}{$name} = undef;
959} 1015}
960 1016
1019 1075
1020 for (@$callbacks) { 1076 for (@$callbacks) {
1021 eval { &{$_->[1]} }; 1077 eval { &{$_->[1]} };
1022 1078
1023 if ($@) { 1079 if ($@) {
1024 warn "$@";
1025 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1080 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1026 override; 1081 override;
1027 } 1082 }
1028 1083
1029 return 1 if $override; 1084 return 1 if $override;
1030 } 1085 }
1109 for (@$attach) { 1164 for (@$attach) {
1110 my ($klass, @attach) = @$_; 1165 my ($klass, @attach) = @$_;
1111 _attach $registry, $klass, @attach; 1166 _attach $registry, $klass, @attach;
1112 } 1167 }
1113 } else { 1168 } else {
1114 warn "object uses attachment '$name' that is not available, postponing.\n"; 1169 info "object uses attachment '$name' that is not available, postponing.\n";
1115 } 1170 }
1116 } 1171 }
1117} 1172}
1118 1173
1119cf::attachable->attach ( 1174cf::attachable->attach (
1146 my ($filename, $rdata, $objs) = @_; 1201 my ($filename, $rdata, $objs) = @_;
1147 1202
1148 sync_job { 1203 sync_job {
1149 if (length $$rdata) { 1204 if (length $$rdata) {
1150 utf8::decode (my $decname = $filename); 1205 utf8::decode (my $decname = $filename);
1151 warn sprintf "saving %s (%d,%d)\n", 1206 trace sprintf "saving %s (%d,%d)\n",
1152 $decname, length $$rdata, scalar @$objs; 1207 $decname, length $$rdata, scalar @$objs
1208 if $VERBOSE_IO;
1153 1209
1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1210 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1155 aio_chmod $fh, SAVE_MODE; 1211 aio_chmod $fh, SAVE_MODE;
1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1212 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1157 if ($cf::USE_FSYNC) { 1213 if ($cf::USE_FSYNC) {
1179 aio_rename "$filename~", $filename; 1235 aio_rename "$filename~", $filename;
1180 1236
1181 $filename =~ s%/[^/]+$%%; 1237 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC; 1238 aio_pathsync $filename if $cf::USE_FSYNC;
1183 } else { 1239 } else {
1184 warn "unable to save objects: $filename~: $!\n"; 1240 error "unable to save objects: $filename~: $!\n";
1185 } 1241 }
1186 } else { 1242 } else {
1187 aio_unlink $filename; 1243 aio_unlink $filename;
1188 aio_unlink "$filename.pst"; 1244 aio_unlink "$filename.pst";
1189 } 1245 }
1213 my $st = eval { Coro::Storable::thaw $av }; 1269 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs}; 1270 $av = $st->{objs};
1215 } 1271 }
1216 1272
1217 utf8::decode (my $decname = $filename); 1273 utf8::decode (my $decname = $filename);
1218 warn sprintf "loading %s (%d,%d)\n", 1274 trace sprintf "loading %s (%d,%d)\n",
1219 $decname, length $data, scalar @{$av || []}; 1275 $decname, length $data, scalar @{$av || []}
1276 if $VERBOSE_IO;
1220 1277
1221 ($data, $av) 1278 ($data, $av)
1222} 1279}
1223 1280
1224=head2 COMMAND CALLBACKS 1281=head2 COMMAND CALLBACKS
1283} 1340}
1284 1341
1285use File::Glob (); 1342use File::Glob ();
1286 1343
1287cf::player->attach ( 1344cf::player->attach (
1288 on_command => sub { 1345 on_unknown_command => sub {
1289 my ($pl, $name, $params) = @_; 1346 my ($pl, $name, $params) = @_;
1290 1347
1291 my $cb = $COMMAND{$name} 1348 my $cb = $COMMAND{$name}
1292 or return; 1349 or return;
1293 1350
1316 1373
1317 $pl->ext_reply ($reply, @reply) 1374 $pl->ext_reply ($reply, @reply)
1318 if $reply; 1375 if $reply;
1319 1376
1320 } else { 1377 } else {
1321 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1378 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1322 } 1379 }
1323 1380
1324 cf::override; 1381 cf::override;
1325 }, 1382 },
1326); 1383);
1337 1394
1338 $grp 1395 $grp
1339} 1396}
1340 1397
1341sub load_extensions { 1398sub load_extensions {
1399 info "loading extensions...";
1400
1342 cf::sync_job { 1401 cf::sync_job {
1343 my %todo; 1402 my %todo;
1344 1403
1345 for my $path (<$LIBDIR/*.ext>) { 1404 for my $path (<$LIBDIR/*.ext>) {
1346 next unless -r $path; 1405 next unless -r $path;
1364 1423
1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1367 1426
1368 $ext{source} = 1427 $ext{source} =
1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1428 "package $pkg; use common::sense;\n"
1370 . "#line 1 \"$path\"\n{\n" 1429 . "#line 1 \"$path\"\n{\n"
1371 . $source 1430 . $source
1372 . "\n};\n1"; 1431 . "\n};\n1";
1373 1432
1374 $todo{$base} = \%ext; 1433 $todo{$base} = \%ext;
1375 } 1434 }
1376 1435
1436 my $pass = 0;
1377 my %done; 1437 my %done;
1378 while (%todo) { 1438 while (%todo) {
1379 my $progress; 1439 my $progress;
1380 1440
1441 ++$pass;
1442
1443 ext:
1381 while (my ($k, $v) = each %todo) { 1444 while (my ($k, $v) = each %todo) {
1382 for (split /,\s*/, $v->{meta}{depends}) { 1445 for (split /,\s*/, $v->{meta}{depends}) {
1383 goto skip 1446 next ext
1384 unless exists $done{$_}; 1447 unless exists $done{$_};
1385 } 1448 }
1386 1449
1387 warn "... loading '$k' into '$v->{pkg}'\n"; 1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1388 1451
1389 unless (eval $v->{source}) { 1452 my $active = eval $v->{source};
1453
1454 if (length $@) {
1390 my $msg = $@ ? "$v->{path}: $@\n" 1455 error "$v->{path}: $@\n";
1391 : "$v->{base}: extension inactive.\n";
1392 1456
1393 if (exists $v->{meta}{mandatory}) {
1394 warn $msg;
1395 cf::cleanup "mandatory extension failed to load, exiting."; 1457 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1396 } 1458 if exists $v->{meta}{mandatory};
1397 1459
1398 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;
1399 } 1469 }
1400
1401 $done{$k} = delete $todo{$k};
1402 push @EXTS, $v->{pkg};
1403 $progress = 1;
1404 } 1470 }
1405 1471
1406 skip: 1472 unless ($progress) {
1407 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1473 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1408 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 }
1409 } 1480 }
1410 }; 1481 };
1411} 1482}
1412 1483
1413############################################################################# 1484#############################################################################
1497 $cf::PLAYER{$login} = $pl 1568 $cf::PLAYER{$login} = $pl
1498 } 1569 }
1499 } 1570 }
1500} 1571}
1501 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
1502sub save($) { 1586sub save($) {
1503 my ($pl) = @_; 1587 my ($pl) = @_;
1504 1588
1505 return if $pl->{deny_save}; 1589 return if $pl->{deny_save};
1506 1590
1511 1595
1512 aio_mkdir playerdir $pl, 0770; 1596 aio_mkdir playerdir $pl, 0770;
1513 $pl->{last_save} = $cf::RUNTIME; 1597 $pl->{last_save} = $cf::RUNTIME;
1514 1598
1515 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];
1516 1603
1517 $pl->save_pl ($path); 1604 $pl->save_pl ($path);
1518 cf::cede_to_tick; 1605 cf::cede_to_tick;
1519} 1606}
1520 1607
1557 $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
1558 1645
1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1560 $pl->deactivate; 1647 $pl->deactivate;
1561 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;
1562 $pl->ob->check_score;
1563 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1649 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1564 $pl->ns->destroy if $pl->ns; 1650 $pl->ns->destroy if $pl->ns;
1565 1651
1566 my $path = playerdir $pl; 1652 my $path = playerdir $pl;
1567 my $temp = "$path~$cf::RUNTIME~deleting~"; 1653 my $temp = "$path~$cf::RUNTIME~deleting~";
1622 \@logins 1708 \@logins
1623} 1709}
1624 1710
1625=item $player->maps 1711=item $player->maps
1626 1712
1713=item cf::player::maps $login
1714
1627Returns an arrayref of map paths that are private for this 1715Returns an arrayref of map paths that are private for this
1628player. May block. 1716player. May block.
1629 1717
1630=cut 1718=cut
1631 1719
1693=cut 1781=cut
1694 1782
1695sub find_by_path($) { 1783sub find_by_path($) {
1696 my ($path) = @_; 1784 my ($path) = @_;
1697 1785
1786 $path =~ s/^~[^\/]*//; # skip ~login
1787
1698 my ($match, $specificity); 1788 my ($match, $specificity);
1699 1789
1700 for my $region (list) { 1790 for my $region (list) {
1701 if ($region->{match} && $path =~ $region->{match}) { 1791 if ($region->{match} && $path =~ $region->{match}) {
1702 ($match, $specificity) = ($region, $region->specificity) 1792 ($match, $specificity) = ($region, $region->specificity)
1733 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
1734 1824
1735 # mit "rum" bekleckern, nicht 1825 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1826 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1740 $rmp->{exit_on_final_map}, 1830 $rmp->{exit_on_final_map},
1741 $rmp->{xsize}, $rmp->{ysize}, 1831 $rmp->{xsize}, $rmp->{ysize},
1742 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1743 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1848
1759sub register { 1849sub register {
1760 my (undef, $regex, $prio) = @_; 1850 my (undef, $regex, $prio) = @_;
1761 my $pkg = caller; 1851 my $pkg = caller;
1762 1852
1763 no strict;
1764 push @{"$pkg\::ISA"}, __PACKAGE__; 1853 push @{"$pkg\::ISA"}, __PACKAGE__;
1765 1854
1766 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1855 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1767} 1856}
1768 1857
1769# also paths starting with '/' 1858# also paths starting with '/'
1770$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1859$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1771 1860
1772sub thawer_merge { 1861sub thawer_merge {
1773 my ($self, $merge) = @_; 1862 my ($self, $merge) = @_;
1774 1863
1775 # we have to keep some variables in memory intact 1864 # we have to keep some variables in memory intact
1989 2078
1990 $cf::MAP{$path} = $map 2079 $cf::MAP{$path} = $map
1991 } 2080 }
1992} 2081}
1993 2082
1994sub pre_load { } 2083sub pre_load { }
1995sub post_load { } 2084#sub post_load { } # XS
1996 2085
1997sub load { 2086sub load {
1998 my ($self) = @_; 2087 my ($self) = @_;
1999 2088
2000 local $self->{deny_reset} = 1; # loading can take a long time 2089 local $self->{deny_reset} = 1; # loading can take a long time
2057 } 2146 }
2058 2147
2059 $self->post_load; 2148 $self->post_load;
2060} 2149}
2061 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
2062sub customise_for { 2154sub customise_for {
2063 my ($self, $ob) = @_; 2155 my ($self, $ob) = @_;
2064 2156
2065 return find "~" . $ob->name . "/" . $self->{path} 2157 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2158 if $self->per_player;
2082 or next; 2174 or next;
2083 $neigh = find $neigh, $map 2175 $neigh = find $neigh, $map
2084 or next; 2176 or next;
2085 $neigh->load; 2177 $neigh->load;
2086 2178
2179 # now find the diagonal neighbours
2087 push @neigh, 2180 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2181 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2182 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2183 }
2091 2184
2098} 2191}
2099 2192
2100sub find_sync { 2193sub find_sync {
2101 my ($path, $origin) = @_; 2194 my ($path, $origin) = @_;
2102 2195
2103 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
2104} 2200}
2105 2201
2106sub do_load_sync { 2202sub do_load_sync {
2107 my ($map) = @_; 2203 my ($map) = @_;
2108 2204
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2205 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2206 if $Coro::current == $Coro::main;
2111 2207
2112 cf::sync_job { $map->load }; 2208 $map->load;
2113} 2209}
2114 2210
2115our %MAP_PREFETCH; 2211our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2212our $MAP_PREFETCHER = undef;
2117 2213
2143 $MAP_PREFETCHER->prio (6); 2239 $MAP_PREFETCHER->prio (6);
2144 2240
2145 () 2241 ()
2146} 2242}
2147 2243
2244# common code, used by both ->save and ->swapout
2148sub save { 2245sub _save {
2149 my ($self) = @_; 2246 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2247
2153 $self->{last_save} = $cf::RUNTIME; 2248 $self->{last_save} = $cf::RUNTIME;
2154 2249
2155 return unless $self->dirty; 2250 return unless $self->dirty;
2156 2251
2176 } else { 2271 } else {
2177 $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);
2178 } 2273 }
2179} 2274}
2180 2275
2276sub save {
2277 my ($self) = @_;
2278
2279 my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281 $self->_save;
2282}
2283
2181sub swap_out { 2284sub swap_out {
2182 my ($self) = @_; 2285 my ($self) = @_;
2183 2286
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2287 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2288
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2289 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2290 return if $self->{deny_save};
2291 return if $self->players;
2192 2292
2293 # first deactivate the map and "unlink" it from the core
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2193 $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};
2194 2343
2195 $self->deactivate; 2344 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2345 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2346 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path, "\n";
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2347
2243 $self->unlink_save; 2348 $self->unlink_save;
2244 $self->destroy; 2349 $self->destroy;
2245} 2350}
2246 2351
2254 2359
2255 delete $cf::MAP{$self->path}; 2360 delete $cf::MAP{$self->path};
2256 2361
2257 $self->unlink_save; 2362 $self->unlink_save;
2258 2363
2259 bless $self, "cf::map"; 2364 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2365 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2366 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2367 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2368 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2369
2321 : normalise $_ 2426 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2427 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2428 ]
2324} 2429}
2325 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
2326=back 2463=back
2327 2464
2328=head3 cf::object 2465=head3 cf::object
2329 2466
2330=cut 2467=cut
2462 2599
2463Freezes 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}>).
2464 2601
2465The 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.
2466for 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,
2467though, 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
2468map. 2605map.
2469 2606
2470Will never block. 2607Will never block.
2471 2608
2472=item $player_object->leave_link ($map, $x, $y) 2609=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2630sub cf::object::player::enter_link {
2494 my ($self) = @_; 2631 my ($self) = @_;
2495 2632
2496 $self->deactivate_recursive; 2633 $self->deactivate_recursive;
2497 2634
2635 ++$self->{_link_recursion};
2636
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2637 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2638
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2639 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2640 if $self->map && $self->map->{path} ne "{link}";
2502 2641
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2642 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2643}
2505 2644
2506sub cf::object::player::leave_link { 2645sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2646 my ($self, $map, $x, $y) = @_;
2508 2647
2525 ($x, $y) = (-1, -1) 2664 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2665 unless (defined $x) && (defined $y);
2527 2666
2528 # use -1 or undef as default coordinates, not 0, 0 2667 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2668 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2669 if $x <= 0 && $y <= 0;
2531 2670
2532 $map->load; 2671 $map->load;
2533 $map->load_neighbours; 2672 $map->load_neighbours;
2534 2673
2535 return unless $self->contr->active; 2674 return unless $self->contr->active;
2536 2675
2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2676 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2538 $self->enter_map ($map, $x, $y); 2677 if ($self->enter_map ($map, $x, $y)) {
2539 2678 # entering was successful
2679 delete $self->{_link_recursion};
2540 # only activate afterwards, to support waiting in hooks 2680 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive; 2681 $self->activate_recursive;
2542} 2682 }
2543 2683
2684}
2685
2544=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)]])
2545 2687
2546Moves 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
2547her, loading and preparing them map, calling the provided $check callback 2689her, loading and preparing them map, calling the provided $check callback
2548that 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
2549the 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
2556 2698
2557our $GOTOGEN; 2699our $GOTOGEN;
2558 2700
2559sub cf::object::player::goto { 2701sub cf::object::player::goto {
2560 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 }
2561 2709
2562 # 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
2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2711 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2564 2712
2565 $self->enter_link; 2713 $self->enter_link;
2589 my $map = eval { 2737 my $map = eval {
2590 my $map = defined $path ? cf::map::find $path : undef; 2738 my $map = defined $path ? cf::map::find $path : undef;
2591 2739
2592 if ($map) { 2740 if ($map) {
2593 $map = $map->customise_for ($self); 2741 $map = $map->customise_for ($self);
2594 $map = $check->($map) if $check && $map; 2742 $map = $check->($map, $x, $y, $self) if $check && $map;
2595 } else { 2743 } else {
2596 $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);
2597 } 2745 }
2598 2746
2599 $map 2747 $map
2607 if ($gen == $self->{_goto_generation}) { 2755 if ($gen == $self->{_goto_generation}) {
2608 delete $self->{_goto_generation}; 2756 delete $self->{_goto_generation};
2609 $self->leave_link ($map, $x, $y); 2757 $self->leave_link ($map, $x, $y);
2610 } 2758 }
2611 2759
2612 $done->() if $done; 2760 $done->($self) if $done;
2613 })->prio (1); 2761 })->prio (1);
2614} 2762}
2615 2763
2616=item $player_object->enter_exit ($exit_object) 2764=item $player_object->enter_exit ($exit_object)
2617 2765
2710 $self->message ("Something went wrong deep within the deliantra server. " 2858 $self->message ("Something went wrong deep within the deliantra server. "
2711 . "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. "
2712 . "Please report this to the dungeon master!", 2860 . "Please report this to the dungeon master!",
2713 cf::NDI_UNIQUE | cf::NDI_RED); 2861 cf::NDI_UNIQUE | cf::NDI_RED);
2714 2862
2715 warn "ERROR in enter_exit: $@"; 2863 error "ERROR in enter_exit: $@";
2716 $self->leave_link; 2864 $self->leave_link;
2717 } 2865 }
2718 })->prio (1); 2866 })->prio (1);
2719} 2867}
2720 2868
2732sub cf::client::send_drawinfo { 2880sub cf::client::send_drawinfo {
2733 my ($self, $text, $flags) = @_; 2881 my ($self, $text, $flags) = @_;
2734 2882
2735 utf8::encode $text; 2883 utf8::encode $text;
2736 $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);
2737} 2910}
2738 2911
2739=item $client->send_msg ($channel, $msg, $color, [extra...]) 2912=item $client->send_msg ($channel, $msg, $color, [extra...])
2740 2913
2741Send 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
2745 2918
2746=cut 2919=cut
2747 2920
2748# non-persistent channels (usually the info channel) 2921# non-persistent channels (usually the info channel)
2749our %CHANNEL = ( 2922our %CHANNEL = (
2923 "c/motd" => {
2924 id => "infobox",
2925 title => "MOTD",
2926 reply => undef,
2927 tooltip => "The message of the day",
2928 },
2750 "c/identify" => { 2929 "c/identify" => {
2751 id => "infobox", 2930 id => "infobox",
2752 title => "Identify", 2931 title => "Identify",
2753 reply => undef, 2932 reply => undef,
2754 tooltip => "Items recently identified", 2933 tooltip => "Items recently identified",
2756 "c/examine" => { 2935 "c/examine" => {
2757 id => "infobox", 2936 id => "infobox",
2758 title => "Examine", 2937 title => "Examine",
2759 reply => undef, 2938 reply => undef,
2760 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",
2761 }, 2946 },
2762 "c/book" => { 2947 "c/book" => {
2763 id => "infobox", 2948 id => "infobox",
2764 title => "Book", 2949 title => "Book",
2765 reply => undef, 2950 reply => undef,
2881 my $pkt = "msg " 3066 my $pkt = "msg "
2882 . $self->{json_coder}->encode ( 3067 . $self->{json_coder}->encode (
2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3068 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2884 ); 3069 );
2885 3070
2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2889
2890 # split very large packets
2891 if (8192 < length $pkt and $self->{can_lzf}) {
2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2893 $pkt = "frag";
2894 }
2895
2896 $self->send_packet ($pkt); 3071 $self->send_big_packet ($pkt);
2897} 3072}
2898 3073
2899=item $client->ext_msg ($type, @msg) 3074=item $client->ext_msg ($type, @msg)
2900 3075
2901Sends an ext event to the client. 3076Sends an ext event to the client.
2904 3079
2905sub cf::client::ext_msg($$@) { 3080sub cf::client::ext_msg($$@) {
2906 my ($self, $type, @msg) = @_; 3081 my ($self, $type, @msg) = @_;
2907 3082
2908 if ($self->extcmd == 2) { 3083 if ($self->extcmd == 2) {
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3084 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2910 } elsif ($self->extcmd == 1) { # TODO: remove 3085 } elsif ($self->extcmd == 1) { # TODO: remove
2911 push @msg, msgtype => "event_$type"; 3086 push @msg, msgtype => "event_$type";
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3087 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 } 3088 }
2914} 3089}
2915 3090
2916=item $client->ext_reply ($msgid, @msg) 3091=item $client->ext_reply ($msgid, @msg)
2917 3092
2921 3096
2922sub cf::client::ext_reply($$@) { 3097sub cf::client::ext_reply($$@) {
2923 my ($self, $id, @msg) = @_; 3098 my ($self, $id, @msg) = @_;
2924 3099
2925 if ($self->extcmd == 2) { 3100 if ($self->extcmd == 2) {
2926 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2927 } elsif ($self->extcmd == 1) { 3102 } elsif ($self->extcmd == 1) {
2928 #TODO: version 1, remove 3103 #TODO: version 1, remove
2929 unshift @msg, msgtype => "reply", msgid => $id; 3104 unshift @msg, msgtype => "reply", msgid => $id;
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3105 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3106 }
2932} 3107}
2933 3108
2934=item $success = $client->query ($flags, "text", \&cb) 3109=item $success = $client->query ($flags, "text", \&cb)
2935 3110
3006 3181
3007 $ns->ext_reply ($reply, @reply) 3182 $ns->ext_reply ($reply, @reply)
3008 if $reply; 3183 if $reply;
3009 3184
3010 } else { 3185 } else {
3011 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";
3012 } 3187 }
3013 3188
3014 cf::override; 3189 cf::override;
3015 }, 3190 },
3016); 3191);
3036 3211
3037 $coro 3212 $coro
3038} 3213}
3039 3214
3040cf::client->attach ( 3215cf::client->attach (
3041 on_destroy => sub { 3216 on_client_destroy => sub {
3042 my ($ns) = @_; 3217 my ($ns) = @_;
3043 3218
3044 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3219 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3045 }, 3220 },
3046); 3221);
3062our $safe_hole = new Safe::Hole; 3237our $safe_hole = new Safe::Hole;
3063 3238
3064$SIG{FPE} = 'IGNORE'; 3239$SIG{FPE} = 'IGNORE';
3065 3240
3066$safe->permit_only (Opcode::opset qw( 3241$safe->permit_only (Opcode::opset qw(
3067 :base_core :base_mem :base_orig :base_math 3242 :base_core :base_mem :base_orig :base_math :base_loop
3068 grepstart grepwhile mapstart mapwhile 3243 grepstart grepwhile mapstart mapwhile
3069 sort time 3244 sort time
3070)); 3245));
3071 3246
3072# here we export the classes and methods available to script code 3247# here we export the classes and methods available to script code
3097 decrease split destroy change_exp value msg lore send_msg)], 3272 decrease split destroy change_exp value msg lore send_msg)],
3098 ["cf::object::player" => qw(player)], 3273 ["cf::object::player" => qw(player)],
3099 ["cf::player" => qw(peaceful send_msg)], 3274 ["cf::player" => qw(peaceful send_msg)],
3100 ["cf::map" => qw(trigger)], 3275 ["cf::map" => qw(trigger)],
3101) { 3276) {
3102 no strict 'refs';
3103 my ($pkg, @funs) = @$_; 3277 my ($pkg, @funs) = @$_;
3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3278 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3105 for @funs; 3279 for @funs;
3106} 3280}
3107 3281
3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3298 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3125 $qcode =~ s/\n/\\n/g; 3299 $qcode =~ s/\n/\\n/g;
3126 3300
3127 %vars = (_dummy => 0) unless %vars; 3301 %vars = (_dummy => 0) unless %vars;
3128 3302
3303 my @res;
3129 local $_; 3304 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3305
3132 my $eval = 3306 my $eval =
3133 "do {\n" 3307 "do {\n"
3134 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3308 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3135 . "#line 0 \"{$qcode}\"\n" 3309 . "#line 0 \"{$qcode}\"\n"
3136 . $code 3310 . $code
3137 . "\n}" 3311 . "\n}"
3138 ; 3312 ;
3139 3313
3314 if ($CFG{safe_eval}) {
3140 sub_generation_inc; 3315 sub_generation_inc;
3316 local @safe::cf::_safe_eval_args = values %vars;
3141 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3317 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3142 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 }
3143 3323
3144 if ($@) { 3324 if ($@) {
3145 warn "$@"; 3325 warn "$@",
3146 warn "while executing safe code '$code'\n"; 3326 "while executing safe code '$code'\n",
3147 warn "with arguments " . (join " ", %vars) . "\n"; 3327 "with arguments " . (join " ", %vars) . "\n";
3148 } 3328 }
3149 3329
3150 wantarray ? @res : $res[0] 3330 wantarray ? @res : $res[0]
3151} 3331}
3152 3332
3166=cut 3346=cut
3167 3347
3168sub register_script_function { 3348sub register_script_function {
3169 my ($fun, $cb) = @_; 3349 my ($fun, $cb) = @_;
3170 3350
3171 no strict 'refs'; 3351 $fun = "safe::$fun" if $CFG{safe_eval};
3172 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3352 *$fun = $safe_hole->wrap ($cb);
3173} 3353}
3174 3354
3175=back 3355=back
3176 3356
3177=cut 3357=cut
3178 3358
3179############################################################################# 3359#############################################################################
3180# 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}
3181 3403
3182sub load_facedata($) { 3404sub load_facedata($) {
3183 my ($path) = @_; 3405 my ($path) = @_;
3184 3406
3185 # 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
3186 # for this (global event?) 3408 # for this (global event?)
3187 %ext::player_env::MUSIC_FACE_CACHE = (); 3409 %ext::player_env::MUSIC_FACE_CACHE = ();
3188 3410
3189 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3411 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3190 3412
3191 warn "loading facedata from $path\n"; 3413 trace "loading facedata from $path\n";
3192 3414
3193 my $facedata; 3415 my $facedata;
3194 0 < aio_load $path, $facedata 3416 0 < aio_load $path, $facedata
3195 or die "$path: $!"; 3417 or die "$path: $!";
3196 3418
3198 3420
3199 $facedata->{version} == 2 3421 $facedata->{version} == 2
3200 or cf::cleanup "$path: version mismatch, cannot proceed."; 3422 or cf::cleanup "$path: version mismatch, cannot proceed.";
3201 3423
3202 # 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]);
3203 $facedata->{resource}{"res/exp_table"} = { 3426 $facedata->{resource}{"res/exp_table"} = {
3204 type => FT_RSRC, 3427 type => FT_RSRC,
3205 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),
3206 }; 3430 };
3207 cf::cede_to_tick; 3431 cf::cede_to_tick;
3208 3432
3209 { 3433 {
3210 my $faces = $facedata->{faceinfo}; 3434 my $faces = $facedata->{faceinfo};
3212 while (my ($face, $info) = each %$faces) { 3436 while (my ($face, $info) = each %$faces) {
3213 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3437 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214 3438
3215 cf::face::set_visibility $idx, $info->{visibility}; 3439 cf::face::set_visibility $idx, $info->{visibility};
3216 cf::face::set_magicmap $idx, $info->{magicmap}; 3440 cf::face::set_magicmap $idx, $info->{magicmap};
3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3441 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3442 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3219 3443
3220 cf::cede_to_tick; 3444 cf::cede_to_tick;
3221 } 3445 }
3222 3446
3223 while (my ($face, $info) = each %$faces) { 3447 while (my ($face, $info) = each %$faces) {
3228 3452
3229 if (my $smooth = cf::face::find $info->{smooth}) { 3453 if (my $smooth = cf::face::find $info->{smooth}) {
3230 cf::face::set_smooth $idx, $smooth; 3454 cf::face::set_smooth $idx, $smooth;
3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3455 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3232 } else { 3456 } else {
3233 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3457 error "smooth face '$info->{smooth}' not found for face '$face'";
3234 } 3458 }
3235 3459
3236 cf::cede_to_tick; 3460 cf::cede_to_tick;
3237 } 3461 }
3238 } 3462 }
3247 3471
3248 cf::anim::invalidate_all; # d'oh 3472 cf::anim::invalidate_all; # d'oh
3249 } 3473 }
3250 3474
3251 { 3475 {
3252 # TODO: for gcfclient pleasure, we should give resources
3253 # that gcfclient doesn't grok a >10000 face index.
3254 my $res = $facedata->{resource}; 3476 my $res = $facedata->{resource};
3255 3477
3256 while (my ($name, $info) = each %$res) { 3478 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) { 3479 if (defined $info->{type}) {
3258 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3480 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3259 my $data;
3260 3481
3261 if ($info->{type} & 1) { 3482 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3262 # prepend meta info
3263
3264 my $meta = $enc->encode ({
3265 name => $name,
3266 %{ $info->{meta} || {} },
3267 });
3268
3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type}; 3483 cf::face::set_type $idx, $info->{type};
3276 } else { 3484 } else {
3277 $RESOURCE{$name} = $info; 3485 $RESOURCE{$name} = $info; # unused
3278 } 3486 }
3279 3487
3280 cf::cede_to_tick; 3488 cf::cede_to_tick;
3281 } 3489 }
3282 } 3490 }
3283 3491
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3492 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3285 3493
3286 1 3494 1
3287} 3495}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3308 3496
3309register_exticmd fx_want => sub { 3497register_exticmd fx_want => sub {
3310 my ($ns, $want) = @_; 3498 my ($ns, $want) = @_;
3311 3499
3312 while (my ($k, $v) = each %$want) { 3500 while (my ($k, $v) = each %$want) {
3351sub reload_treasures { 3539sub reload_treasures {
3352 load_resource_file "$DATADIR/treasures" 3540 load_resource_file "$DATADIR/treasures"
3353 or die "unable to load treasurelists\n"; 3541 or die "unable to load treasurelists\n";
3354} 3542}
3355 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
3356sub reload_resources { 3567sub reload_resources {
3357 warn "reloading resource files...\n"; 3568 trace "reloading resource files...\n";
3358 3569
3359 reload_facedata; 3570 reload_facedata;
3571 reload_sound;
3360 reload_archetypes; 3572 reload_archetypes;
3361 reload_regions; 3573 reload_regions;
3362 reload_treasures; 3574 reload_treasures;
3363 3575
3364 warn "finished reloading resource files\n"; 3576 trace "finished reloading resource files\n";
3365} 3577}
3366 3578
3367sub reload_config { 3579sub reload_config {
3580 trace "reloading config file...\n";
3581
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3582 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3583 or return;
3370 3584
3371 local $/; 3585 local $/;
3372 *CFG = YAML::Load <$fh>; 3586 *CFG = YAML::XS::Load scalar <$fh>;
3373 3587
3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3588 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3375 3589
3376 $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};
3377 $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};
3378 3592
3379 if (exists $CFG{mlockall}) { 3593 if (exists $CFG{mlockall}) {
3381 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3595 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3382 and die "WARNING: m(un)lockall failed: $!\n"; 3596 and die "WARNING: m(un)lockall failed: $!\n";
3383 }; 3597 };
3384 warn $@ if $@; 3598 warn $@ if $@;
3385 } 3599 }
3600
3601 trace "finished reloading resource files\n";
3386} 3602}
3387 3603
3388sub pidfile() { 3604sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3605 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!"; 3606 or die "$PIDFILE: $!";
3403 seek $fh, 0, 0; 3619 seek $fh, 0, 0;
3404 print $fh $$; 3620 print $fh $$;
3405} 3621}
3406 3622
3407sub main_loop { 3623sub main_loop {
3408 warn "EV::loop starting\n"; 3624 trace "EV::loop starting\n";
3409 if (1) { 3625 if (1) {
3410 EV::loop; 3626 EV::loop;
3411 } 3627 }
3412 warn "EV::loop returned\n"; 3628 trace "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP; 3629 goto &main_loop unless $REALLY_UNLOOP;
3414} 3630}
3415 3631
3416sub main { 3632sub main {
3417 cf::init_globals; # initialise logging 3633 cf::init_globals; # initialise logging
3418 3634
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3635 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 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.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3637 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3638 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428 3639
3429 $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
3430 3641
3431 # we must not ever block the main coroutine 3642 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3643 local $Coro::idle = sub {
3438 }; 3649 };
3439 3650
3440 evthread_start IO::AIO::poll_fileno; 3651 evthread_start IO::AIO::poll_fileno;
3441 3652
3442 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
3443 reload_resources; 3664 reload_resources;
3444 reload_config; 3665 reload_config;
3445 db_init; 3666 db_init;
3446 3667
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid; 3668 cf::init_uuid;
3450 cf::init_signals; 3669 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills; 3670 cf::init_skills;
3453 3671
3454 cf::init_beforeplay; 3672 cf::init_beforeplay;
3455 3673
3456 atomic; 3674 atomic;
3464 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};
3465 3683
3466 (pop @POST_INIT)->(0) while @POST_INIT; 3684 (pop @POST_INIT)->(0) while @POST_INIT;
3467 }; 3685 };
3468 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
3469 main_loop; 3695 goto &main_loop;
3470} 3696}
3471 3697
3472############################################################################# 3698#############################################################################
3473# initialisation and cleanup 3699# initialisation and cleanup
3474 3700
3475# install some emergency cleanup handlers 3701# install some emergency cleanup handlers
3476BEGIN { 3702BEGIN {
3477 our %SIGWATCHER = (); 3703 our %SIGWATCHER = ();
3478 for my $signal (qw(INT HUP TERM)) { 3704 for my $signal (qw(INT HUP TERM)) {
3479 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3705 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3480 cf::cleanup "SIG$signal"; 3706 cf::cleanup "SIG$signal";
3481 }; 3707 };
3482 } 3708 }
3483} 3709}
3484 3710
3485sub write_runtime_sync { 3711sub write_runtime_sync {
3712 my $t0 = AE::time;
3713
3486 # first touch the runtime file to show we are still running: 3714 # first touch the runtime file to show we are still running:
3487 # the fsync below can take a very very long time. 3715 # the fsync below can take a very very long time.
3488 3716
3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3717 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3490 3718
3491 my $guard = cf::lock_acquire "write_runtime"; 3719 my $guard = cf::lock_acquire "write_runtime";
3492 3720
3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3721 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3494 or return; 3722 or return;
3495 3723
3496 my $value = $cf::RUNTIME + 90 + 10; 3724 my $value = $cf::RUNTIME + 90 + 10;
3497 # 10 is the runtime save interval, for a monotonic clock 3725 # 10 is the runtime save interval, for a monotonic clock
3498 # 60 allows for the watchdog to kill the server. 3726 # 60 allows for the watchdog to kill the server.
3511 or return; 3739 or return;
3512 3740
3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3741 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3514 and return; 3742 and return;
3515 3743
3516 warn "runtime file written.\n"; 3744 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3517 3745
3518 1 3746 1
3519} 3747}
3520 3748
3521our $uuid_lock; 3749our $uuid_lock;
3533 or return; 3761 or return;
3534 3762
3535 my $value = uuid_seq uuid_cur; 3763 my $value = uuid_seq uuid_cur;
3536 3764
3537 unless ($value) { 3765 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n"; 3766 info "cowardly refusing to write zero uuid value!\n";
3539 return; 3767 return;
3540 } 3768 }
3541 3769
3542 my $value = uuid_str $value + $uuid_skip; 3770 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0; 3771 $uuid_skip = 0;
3553 or return; 3781 or return;
3554 3782
3555 aio_rename "$uuid~", $uuid 3783 aio_rename "$uuid~", $uuid
3556 and return; 3784 and return;
3557 3785
3558 warn "uuid file written ($value).\n"; 3786 trace "uuid file written ($value).\n";
3559 3787
3560 1 3788 1
3561 3789
3562} 3790}
3563 3791
3569} 3797}
3570 3798
3571sub emergency_save() { 3799sub emergency_save() {
3572 my $freeze_guard = cf::freeze_mainloop; 3800 my $freeze_guard = cf::freeze_mainloop;
3573 3801
3574 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;
3575 3808
3576 cf::sync_job { 3809 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so 3810 cf::write_runtime_sync; # external watchdog should not bark
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581 3811
3582 # use a peculiar iteration method to avoid tripping on perl 3812 # use a peculiar iteration method to avoid tripping on perl
3583 # refcount bugs in for. also avoids problems with players 3813 # refcount bugs in for. also avoids problems with players
3584 # and maps saved/destroyed asynchronously. 3814 # and maps saved/destroyed asynchronously.
3585 warn "emergency_perl_save: begin player save\n"; 3815 info "emergency_perl_save: begin player save\n";
3586 for my $login (keys %cf::PLAYER) { 3816 for my $login (keys %cf::PLAYER) {
3587 my $pl = $cf::PLAYER{$login} or next; 3817 my $pl = $cf::PLAYER{$login} or next;
3588 $pl->valid or next; 3818 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3819 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3590 $pl->save; 3820 $pl->save;
3591 } 3821 }
3592 warn "emergency_perl_save: end player save\n"; 3822 info "emergency_perl_save: end player save\n";
3593 3823
3824 cf::write_runtime_sync; # external watchdog should not bark
3825
3594 warn "emergency_perl_save: begin map save\n"; 3826 info "emergency_perl_save: begin map save\n";
3595 for my $path (keys %cf::MAP) { 3827 for my $path (keys %cf::MAP) {
3596 my $map = $cf::MAP{$path} or next; 3828 my $map = $cf::MAP{$path} or next;
3597 $map->valid or next; 3829 $map->valid or next;
3598 $map->save; 3830 $map->save;
3599 } 3831 }
3600 warn "emergency_perl_save: end map save\n"; 3832 info "emergency_perl_save: end map save\n";
3601 3833
3834 cf::write_runtime_sync; # external watchdog should not bark
3835
3602 warn "emergency_perl_save: begin database checkpoint\n"; 3836 info "emergency_perl_save: begin database checkpoint\n";
3603 BDB::db_env_txn_checkpoint $DB_ENV; 3837 BDB::db_env_txn_checkpoint $DB_ENV;
3604 warn "emergency_perl_save: end database checkpoint\n"; 3838 info "emergency_perl_save: end database checkpoint\n";
3605 3839
3606 warn "emergency_perl_save: begin write uuid\n"; 3840 info "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1; 3841 write_uuid_sync 1;
3608 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
3609 }; 3862 };
3610 3863
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3616 warn "emergency_perl_save: leave\n"; 3864 info "emergency_perl_save: leave\n";
3617} 3865}
3618 3866
3619sub post_cleanup { 3867sub post_cleanup {
3620 my ($make_core) = @_; 3868 my ($make_core) = @_;
3621 3869
3870 IO::AIO::flush;
3871
3622 warn Carp::longmess "post_cleanup backtrace" 3872 error Carp::longmess "post_cleanup backtrace"
3623 if $make_core; 3873 if $make_core;
3624 3874
3625 my $fh = pidfile; 3875 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$; 3876 unlink $PIDFILE if <$fh> == $$;
3627} 3877}
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3897 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) { 3898 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"}; 3899 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3900# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 } 3901 }
3652 warn "cleared package $pkg\n";#d#
3653} 3902}
3654 3903
3655sub do_reload_perl() { 3904sub do_reload_perl() {
3656 # can/must only be called in main 3905 # can/must only be called in main
3657 if ($Coro::current != $Coro::main) { 3906 if (in_main) {
3658 warn "can only reload from main coroutine"; 3907 error "can only reload from main coroutine";
3659 return; 3908 return;
3660 } 3909 }
3661 3910
3662 return if $RELOAD++; 3911 return if $RELOAD++;
3663 3912
3664 my $t1 = EV::time; 3913 my $t1 = AE::time;
3665 3914
3666 while ($RELOAD) { 3915 while ($RELOAD) {
3667 warn "reloading..."; 3916 info "reloading...";
3668 3917
3669 warn "entering sync_job"; 3918 trace "entering sync_job";
3670 3919
3671 cf::sync_job { 3920 cf::sync_job {
3672 cf::write_runtime_sync; # external watchdog should not bark
3673 cf::emergency_save; 3921 cf::emergency_save;
3674 cf::write_runtime_sync; # external watchdog should not bark
3675 3922
3676 warn "syncing database to disk";
3677 BDB::db_env_txn_checkpoint $DB_ENV;
3678
3679 # if anything goes wrong in here, we should simply crash as we already saved
3680
3681 warn "flushing outstanding aio requests";
3682 while (IO::AIO::nreqs || BDB::nreqs) {
3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3684 }
3685
3686 warn "cancelling all extension coros"; 3923 trace "cancelling all extension coros";
3687 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3688 %EXT_CORO = (); 3925 %EXT_CORO = ();
3689 3926
3690 warn "removing commands"; 3927 trace "removing commands";
3691 %COMMAND = (); 3928 %COMMAND = ();
3692 3929
3693 warn "removing ext/exti commands"; 3930 trace "removing ext/exti commands";
3694 %EXTCMD = (); 3931 %EXTCMD = ();
3695 %EXTICMD = (); 3932 %EXTICMD = ();
3696 3933
3697 warn "unloading/nuking all extensions"; 3934 trace "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3699 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3700 3937
3701 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3702 eval { 3939 eval {
3703 $cb->($pkg); 3940 $cb->($pkg);
3704 1 3941 1
3705 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3706 } 3943 }
3707 3944
3708 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3709 clear_package $pkg; 3946 clear_package $pkg;
3710 } 3947 }
3711 3948
3712 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715 3952
3716 warn "... unloading $k"; 3953 trace "... unloading $k";
3717 delete $INC{$k}; 3954 delete $INC{$k};
3718 3955
3719 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3721 3958
3724 } 3961 }
3725 3962
3726 clear_package $k; 3963 clear_package $k;
3727 } 3964 }
3728 3965
3729 warn "getting rid of safe::, as good as possible"; 3966 trace "getting rid of safe::, as good as possible";
3730 clear_package "safe::$_" 3967 clear_package "safe::$_"
3731 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);
3732 3969
3733 warn "unloading cf.pm \"a bit\""; 3970 trace "unloading cf.pm \"a bit\"";
3734 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3736 3973
3737 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3738 # and global variables created in xs 3975 # and global variables created in xs
3739 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3740 3977
3741 warn "unload completed, starting to reload now"; 3978 info "unload completed, starting to reload now";
3742 3979
3743 warn "reloading cf.pm"; 3980 trace "reloading cf.pm";
3744 require cf; 3981 require cf;
3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3746 3983
3747 warn "loading config and database again"; 3984 trace "loading config and database again";
3748 cf::reload_config; 3985 cf::reload_config;
3749 3986
3750 warn "loading extensions"; 3987 trace "loading extensions";
3751 cf::load_extensions; 3988 cf::load_extensions;
3752 3989
3753 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3754 warn "reattaching attachments to objects/players"; 3991 trace "reattaching attachments to objects/players";
3755 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3756 warn "reattaching attachments to maps"; 3993 trace "reattaching attachments to maps";
3757 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3758 warn "reattaching attachments to players"; 3995 trace "reattaching attachments to players";
3759 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3760 } 3997 }
3761 3998
3762 warn "running post_init jobs"; 3999 trace "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT; 4000 (pop @POST_INIT)->(1) while @POST_INIT;
3764 4001
3765 warn "leaving sync_job"; 4002 trace "leaving sync_job";
3766 4003
3767 1 4004 1
3768 } or do { 4005 } or do {
3769 warn $@; 4006 error $@;
3770 cf::cleanup "error while reloading, exiting."; 4007 cf::cleanup "error while reloading, exiting.";
3771 }; 4008 };
3772 4009
3773 warn "reloaded"; 4010 info "reloaded";
3774 --$RELOAD; 4011 --$RELOAD;
3775 } 4012 }
3776 4013
3777 $t1 = EV::time - $t1; 4014 $t1 = AE::time - $t1;
3778 warn "reload completed in ${t1}s\n"; 4015 info "reload completed in ${t1}s\n";
3779}; 4016};
3780 4017
3781our $RELOAD_WATCHER; # used only during reload 4018our $RELOAD_WATCHER; # used only during reload
3782 4019
3783sub reload_perl() { 4020sub reload_perl() {
3785 # coro crashes during coro_state_free->destroy here. 4022 # coro crashes during coro_state_free->destroy here.
3786 4023
3787 $RELOAD_WATCHER ||= cf::async { 4024 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions; 4025 Coro::AIO::aio_wait cache_extensions;
3789 4026
3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4027 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3791 do_reload_perl; 4028 do_reload_perl;
3792 undef $RELOAD_WATCHER; 4029 undef $RELOAD_WATCHER;
3793 }; 4030 };
3794 }; 4031 };
3795} 4032}
3804 reload_perl; 4041 reload_perl;
3805 }; 4042 };
3806 } 4043 }
3807}; 4044};
3808 4045
3809unshift @INC, $LIBDIR; 4046#############################################################################
3810 4047
3811my $bug_warning = 0; 4048my $bug_warning = 0;
3812 4049
3813our @WAIT_FOR_TICK; 4050our @WAIT_FOR_TICK;
3814our @WAIT_FOR_TICK_BEGIN; 4051our @WAIT_FOR_TICK_BEGIN;
3815 4052
3816sub wait_for_tick { 4053sub wait_for_tick {
3817 return if tick_inhibit || $Coro::current == $Coro::main; 4054 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3818 4055
3819 my $signal = new Coro::Signal; 4056 my $signal = new Coro::Signal;
3820 push @WAIT_FOR_TICK, $signal; 4057 push @WAIT_FOR_TICK, $signal;
3821 $signal->wait; 4058 $signal->wait;
3822} 4059}
3823 4060
3824sub wait_for_tick_begin { 4061sub wait_for_tick_begin {
3825 return if tick_inhibit || $Coro::current == $Coro::main; 4062 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3826 4063
3827 my $signal = new Coro::Signal; 4064 my $signal = new Coro::Signal;
3828 push @WAIT_FOR_TICK_BEGIN, $signal; 4065 push @WAIT_FOR_TICK_BEGIN, $signal;
3829 $signal->wait; 4066 $signal->wait;
3830} 4067}
3836 return; 4073 return;
3837 } 4074 }
3838 4075
3839 cf::server_tick; # one server iteration 4076 cf::server_tick; # one server iteration
3840 4077
4078 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079
3841 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4080 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3842 $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.;
3843 Coro::async_pool { 4082 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver"; 4083 $Coro::current->{desc} = "runtime saver";
3845 write_runtime_sync 4084 write_runtime_sync
3846 or warn "ERROR: unable to write runtime file: $!"; 4085 or error "ERROR: unable to write runtime file: $!";
3847 }; 4086 };
3848 } 4087 }
3849 4088
3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4089 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3851 $sig->send; 4090 $sig->send;
3859 4098
3860 if (0) { 4099 if (0) {
3861 if ($NEXT_TICK) { 4100 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK; 4101 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4102 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d# 4103 debug "jitter $JITTER\n";#d#
3865 } 4104 }
3866 } 4105 }
3867} 4106}
3868 4107
3869{ 4108{
3870 # configure BDB 4109 # configure BDB
3871 4110
3872 BDB::min_parallel 8; 4111 BDB::min_parallel 16;
3873 BDB::max_poll_reqs $TICK * 0.1; 4112 BDB::max_poll_reqs $TICK * 0.1;
3874 $AnyEvent::BDB::WATCHER->priority (1); 4113 $AnyEvent::BDB::WATCHER->priority (1);
3875 4114
3876 unless ($DB_ENV) { 4115 unless ($DB_ENV) {
3877 $DB_ENV = BDB::db_env_create; 4116 $DB_ENV = BDB::db_env_create;
3958 } 4197 }
3959} 4198}
3960 4199
3961# load additional modules 4200# load additional modules
3962require "cf/$_.pm" for @EXTRA_MODULES; 4201require "cf/$_.pm" for @EXTRA_MODULES;
4202cf::_connect_to_perl_2;
3963 4203
3964END { cf::emergency_save } 4204END { cf::emergency_save }
3965 4205
39661 42061
3967 4207

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines