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.467 by root, Thu Jan 8 04:35:04 2009 UTC vs.
Revision 1.532 by root, Thu Apr 29 07:32:34 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 5.10.0;
25use utf8; 26use utf8;
31use EV; 32use EV;
32use Opcode; 33use Opcode;
33use Safe; 34use Safe;
34use Safe::Hole; 35use Safe::Hole;
35use Storable (); 36use Storable ();
37use Carp ();
36 38
37use Guard (); 39use Guard ();
38use Coro (); 40use Coro ();
39use Coro::State; 41use Coro::State;
40use Coro::Handle; 42use Coro::Handle;
51use Coro::Util (); 53use Coro::Util ();
52 54
53use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
54use BDB (); 56use BDB ();
55use Data::Dumper; 57use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 58use Fcntl;
58use YAML (); 59use YAML::XS ();
59use IO::AIO (); 60use IO::AIO ();
60use Time::HiRes; 61use Time::HiRes;
61use Compress::LZF; 62use Compress::LZF;
62use Digest::MD5 (); 63use Digest::MD5 ();
63 64
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72 73
73# make sure c-lzf reinitialises itself 74# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
77
78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
76 80
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %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;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
117our @EXTRA_MODULES = qw(pod mapscript); 129our @EXTRA_MODULES = qw(pod match mapscript);
118 130
119our %CFG; 131our %CFG;
120 132
121our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 134our $RUNTIME;
134our $JITTER; # average jitter 146our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
136 148
137our @POST_INIT; 149our @POST_INIT;
138 150
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
140 153
141binmode STDOUT; 154binmode STDOUT;
142binmode STDERR; 155binmode STDERR;
143 156
144# read virtual server time, if available 157# read virtual server time, if available
155 168
156our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
157 170
158sub cf::map::normalise; 171sub cf::map::normalise;
159 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
160############################################################################# 188#############################################################################
161 189
162=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
163 191
164=over 4 192=over 4
210returns 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
211per 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.
212 240
213=item @cf::INVOKE_RESULTS 241=item @cf::INVOKE_RESULTS
214 242
215This array contains the results of the last C<invoke ()> call. When 243This array contains the results of the last C<invoke ()> call. When
216C<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
217that call. 245that call.
218 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
219=back 253=back
220 254
221=cut 255=cut
222 256
223BEGIN { 257sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 258sub warn (@) { LOG llevWarn , join "", @_ }
259sub info (@) { LOG llevInfo , join "", @_ }
260sub debug(@) { LOG llevDebug, join "", @_ }
261sub trace(@) { LOG llevTrace, join "", @_ }
262
263$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 264 my $msg = join "", @_;
226 265
227 $msg .= "\n" 266 $msg .= "\n"
228 unless $msg =~ /\n$/; 267 unless $msg =~ /\n$/;
229 268
230 $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;
231 270
232 LOG llevError, $msg; 271 LOG llevWarn, $msg;
233 }; 272};
234}
235 273
236$Coro::State::DIEHOOK = sub { 274$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 275 return unless $^S eq 0; # "eq", not "=="
238 276
239 if ($Coro::current == $Coro::main) {#d# 277 error Carp::longmess $_[0];
278
279 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 280 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 281 return;#d#
242 }#d# 282 }#d#
243 283
244 # kill coroutine otherwise 284 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 285 Coro::terminate
247}; 286};
248
249$SIG{__DIE__} = sub { }; #d#?
250 287
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 288@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 289@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 290@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 291@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 305)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 307}
271 308
272$EV::DIED = sub { 309$EV::DIED = sub {
273 warn "error in event callback: @_"; 310 Carp::cluck "error in event callback: @_";
274}; 311};
275 312
276############################################################################# 313#############################################################################
277 314
278=head2 UTILITY FUNCTIONS 315=head2 UTILITY FUNCTIONS
375} 412}
376 413
377=item cf::periodic $interval, $cb 414=item cf::periodic $interval, $cb
378 415
379Like 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
380get spread over timer. 417get spread over time.
381 418
382=cut 419=cut
383 420
384sub periodic($$) { 421sub periodic($$) {
385 my ($interval, $cb) = @_; 422 my ($interval, $cb) = @_;
402 439
403=cut 440=cut
404 441
405our @SLOT_QUEUE; 442our @SLOT_QUEUE;
406our $SLOT_QUEUE; 443our $SLOT_QUEUE;
444our $SLOT_DECAY = 0.9;
407 445
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 446$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 447$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 448 $Coro::current->desc ("timeslot manager");
411 449
412 my $signal = new Coro::Signal; 450 my $signal = new Coro::Signal;
451 my $busy;
413 452
414 while () { 453 while () {
415 next_job: 454 next_job:
455
416 my $avail = cf::till_tick; 456 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 457
418 for (0 .. $#SLOT_QUEUE) { 458 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 459 if ($SLOT_QUEUE[$_][0] <= $avail) {
460 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 461 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 462 $job->[2]->send;
422 Coro::cede; 463 Coro::cede;
423 goto next_job; 464 goto next_job;
424 } 465 } else {
466 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 467 }
426 } 468 }
427 469
428 if (@SLOT_QUEUE) { 470 if (@SLOT_QUEUE) {
429 # 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
430 push @cf::WAIT_FOR_TICK, $signal; 472 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 473 $signal->wait;
432 } else { 474 } else {
475 $busy = 0;
433 Coro::schedule; 476 Coro::schedule;
434 } 477 }
435 } 478 }
436}; 479};
437 480
438sub get_slot($;$$) { 481sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 482 return if tick_inhibit || $Coro::current == $Coro::main;
440 483
441 my ($time, $pri, $name) = @_; 484 my ($time, $pri, $name) = @_;
442 485
443 $time = $TICK * .6 if $time > $TICK * .6; 486 $time = clamp $time, 0.01, $TICK * .6;
487
444 my $sig = new Coro::Signal; 488 my $sig = new Coro::Signal;
445 489
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 490 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 491 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 492 $SLOT_QUEUE->ready;
475 519
476sub sync_job(&) { 520sub sync_job(&) {
477 my ($job) = @_; 521 my ($job) = @_;
478 522
479 if ($Coro::current == $Coro::main) { 523 if ($Coro::current == $Coro::main) {
480 my $time = EV::time; 524 my $time = AE::time;
481 525
482 # this is the main coro, too bad, we have to block 526 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 527 # till the operation succeeds, freezing the server :/
484 528
485 LOG llevError, Carp::longmess "sync job";#d# 529 LOG llevError, Carp::longmess "sync job";#d#
490 my @res; 534 my @res;
491 535
492 (async { 536 (async {
493 $Coro::current->desc ("sync job coro"); 537 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 538 @res = eval { $job->() };
495 warn $@ if $@; 539 error $@ if $@;
496 undef $busy; 540 undef $busy;
497 })->prio (Coro::PRIO_MAX); 541 })->prio (Coro::PRIO_MAX);
498 542
499 while ($busy) { 543 while ($busy) {
500 if (Coro::nready) { 544 if (Coro::nready) {
502 } else { 546 } else {
503 EV::loop EV::LOOP_ONESHOT; 547 EV::loop EV::LOOP_ONESHOT;
504 } 548 }
505 } 549 }
506 550
507 my $time = EV::time - $time; 551 my $time = AE::time - $time;
508 552
509 $TICK_START += $time; # do not account sync jobs to server load 553 $TICK_START += $time; # do not account sync jobs to server load
510 554
511 wantarray ? @res : $res[0] 555 wantarray ? @res : $res[0]
512 } else { 556 } else {
556 reset_signals; 600 reset_signals;
557 &$cb 601 &$cb
558 }, @args; 602 }, @args;
559 603
560 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 )
561} 616}
562 617
563=item $coin = coin_from_name $name 618=item $coin = coin_from_name $name
564 619
565=cut 620=cut
700 755
701 my $t1 = Time::HiRes::time; 756 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 757 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 758 my $t2 = Time::HiRes::time;
704 759
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 760 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 761
707 db_put cache => "$id/data", $data; 762 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 763 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 764 db_put cache => "$id/meta", $meta;
710 765
720 775
721=cut 776=cut
722 777
723sub datalog($@) { 778sub datalog($@) {
724 my ($type, %kv) = @_; 779 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 780 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 781}
727 782
728=back 783=back
729 784
730=cut 785=cut
925 980
926 } elsif (exists $cb_id{$type}) { 981 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 982 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 983
929 } elsif (ref $type) { 984 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 985 error "attaching objects not supported, ignoring.\n";
931 986
932 } else { 987 } else {
933 shift @arg; 988 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 989 error "attach argument '$type' not supported, ignoring.\n";
935 } 990 }
936 } 991 }
937} 992}
938 993
939sub _object_attach { 994sub _object_attach {
949 _attach $registry, $klass, @attach; 1004 _attach $registry, $klass, @attach;
950 } 1005 }
951 1006
952 $obj->{$name} = \%arg; 1007 $obj->{$name} = \%arg;
953 } else { 1008 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1009 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1010 }
956 1011
957 $obj->{_attachment}{$name} = undef; 1012 $obj->{_attachment}{$name} = undef;
958} 1013}
959 1014
1018 1073
1019 for (@$callbacks) { 1074 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1075 eval { &{$_->[1]} };
1021 1076
1022 if ($@) { 1077 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1078 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1079 override;
1026 } 1080 }
1027 1081
1028 return 1 if $override; 1082 return 1 if $override;
1029 } 1083 }
1108 for (@$attach) { 1162 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1163 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1164 _attach $registry, $klass, @attach;
1111 } 1165 }
1112 } else { 1166 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1167 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1168 }
1115 } 1169 }
1116} 1170}
1117 1171
1118cf::attachable->attach ( 1172cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1199 my ($filename, $rdata, $objs) = @_;
1146 1200
1147 sync_job { 1201 sync_job {
1148 if (length $$rdata) { 1202 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1203 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1204 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1205 $decname, length $$rdata, scalar @$objs
1206 if $VERBOSE_IO;
1152 1207
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1208 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1209 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1210 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1211 if ($cf::USE_FSYNC) {
1212 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1213 aio_fsync $fh;
1214 }
1157 aio_close $fh; 1215 aio_close $fh;
1158 1216
1159 if (@$objs) { 1217 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1218 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1219 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1220 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1221 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1224 aio_fsync $fh;
1225 }
1165 aio_close $fh; 1226 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1227 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1228 }
1168 } else { 1229 } else {
1169 aio_unlink "$filename.pst"; 1230 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1233 aio_rename "$filename~", $filename;
1173 1234
1174 $filename =~ s%/[^/]+$%%; 1235 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1236 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1237 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1238 error "unable to save objects: $filename~: $!\n";
1178 } 1239 }
1179 } else { 1240 } else {
1180 aio_unlink $filename; 1241 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1242 aio_unlink "$filename.pst";
1182 } 1243 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1267 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1268 $av = $st->{objs};
1208 } 1269 }
1209 1270
1210 utf8::decode (my $decname = $filename); 1271 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1272 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1273 $decname, length $data, scalar @{$av || []}
1274 if $VERBOSE_IO;
1213 1275
1214 ($data, $av) 1276 ($data, $av)
1215} 1277}
1216 1278
1217=head2 COMMAND CALLBACKS 1279=head2 COMMAND CALLBACKS
1276} 1338}
1277 1339
1278use File::Glob (); 1340use File::Glob ();
1279 1341
1280cf::player->attach ( 1342cf::player->attach (
1281 on_command => sub { 1343 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1344 my ($pl, $name, $params) = @_;
1283 1345
1284 my $cb = $COMMAND{$name} 1346 my $cb = $COMMAND{$name}
1285 or return; 1347 or return;
1286 1348
1309 1371
1310 $pl->ext_reply ($reply, @reply) 1372 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1373 if $reply;
1312 1374
1313 } else { 1375 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1377 }
1316 1378
1317 cf::override; 1379 cf::override;
1318 }, 1380 },
1319); 1381);
1320 1382
1321# "readahead" all extensions 1383# "readahead" all extensions
1322sub cache_extensions { 1384sub cache_extensions {
1323 my $grp = IO::AIO::aio_group; 1385 my $grp = IO::AIO::aio_group;
1324 1386
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1387 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) { 1388 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1389 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 } 1390 }
1329 }; 1391 };
1330 1392
1331 $grp 1393 $grp
1332} 1394}
1333 1395
1334sub load_extensions { 1396sub load_extensions {
1397 info "loading extensions...";
1398
1335 cf::sync_job { 1399 cf::sync_job {
1336 my %todo; 1400 my %todo;
1337 1401
1338 for my $path (<$LIBDIR/*.ext>) { 1402 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1403 next unless -r $path;
1365 . "\n};\n1"; 1429 . "\n};\n1";
1366 1430
1367 $todo{$base} = \%ext; 1431 $todo{$base} = \%ext;
1368 } 1432 }
1369 1433
1434 my $pass = 0;
1370 my %done; 1435 my %done;
1371 while (%todo) { 1436 while (%todo) {
1372 my $progress; 1437 my $progress;
1373 1438
1439 ++$pass;
1440
1441 ext:
1374 while (my ($k, $v) = each %todo) { 1442 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1443 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1444 next ext
1377 unless exists $done{$_}; 1445 unless exists $done{$_};
1378 } 1446 }
1379 1447
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1449
1382 unless (eval $v->{source}) { 1450 my $active = eval $v->{source};
1451
1452 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1453 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1454
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1455 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1456 if exists $v->{meta}{mandatory};
1390 1457
1391 warn $msg; 1458 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1459 delete $todo{$k};
1460 } else {
1461 $done{$k} = delete $todo{$k};
1462 push @EXTS, $v->{pkg};
1463 $progress = 1;
1464
1465 info "$v->{base}: extension inactive.\n"
1466 unless $active;
1392 } 1467 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1468 }
1398 1469
1399 skip: 1470 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1471 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1472
1473 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory};
1476 }
1477 }
1402 } 1478 }
1403 }; 1479 };
1404} 1480}
1405 1481
1406############################################################################# 1482#############################################################################
1490 $cf::PLAYER{$login} = $pl 1566 $cf::PLAYER{$login} = $pl
1491 } 1567 }
1492 } 1568 }
1493} 1569}
1494 1570
1571cf::player->attach (
1572 on_load => sub {
1573 my ($pl, $path) = @_;
1574
1575 # restore slots saved in save, below
1576 my $slots = delete $pl->{_slots};
1577
1578 $pl->ob->current_weapon ($slots->[0]);
1579 $pl->combat_ob ($slots->[1]);
1580 $pl->ranged_ob ($slots->[2]);
1581 },
1582);
1583
1495sub save($) { 1584sub save($) {
1496 my ($pl) = @_; 1585 my ($pl) = @_;
1497 1586
1498 return if $pl->{deny_save}; 1587 return if $pl->{deny_save};
1499 1588
1504 1593
1505 aio_mkdir playerdir $pl, 0770; 1594 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1595 $pl->{last_save} = $cf::RUNTIME;
1507 1596
1508 cf::get_slot 0.01; 1597 cf::get_slot 0.01;
1598
1599 # save slots, to be restored later
1600 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1601
1510 $pl->save_pl ($path); 1602 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1603 cf::cede_to_tick;
1512} 1604}
1513 1605
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1643
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1553 $pl->deactivate; 1645 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1647 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1557 $pl->ns->destroy if $pl->ns; 1648 $pl->ns->destroy if $pl->ns;
1558 1649
1559 my $path = playerdir $pl; 1650 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1651 my $temp = "$path~$cf::RUNTIME~deleting~";
1615 \@logins 1706 \@logins
1616} 1707}
1617 1708
1618=item $player->maps 1709=item $player->maps
1619 1710
1711=item cf::player::maps $login
1712
1620Returns an arrayref of map paths that are private for this 1713Returns an arrayref of map paths that are private for this
1621player. May block. 1714player. May block.
1622 1715
1623=cut 1716=cut
1624 1717
1686=cut 1779=cut
1687 1780
1688sub find_by_path($) { 1781sub find_by_path($) {
1689 my ($path) = @_; 1782 my ($path) = @_;
1690 1783
1784 $path =~ s/^~[^\/]*//; # skip ~login
1785
1691 my ($match, $specificity); 1786 my ($match, $specificity);
1692 1787
1693 for my $region (list) { 1788 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1789 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1790 ($match, $specificity) = ($region, $region->specificity)
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1822
1728 # mit "rum" bekleckern, nicht 1823 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1824 $self->_create_random_map (
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map}, 1828 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize}, 1829 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 1853
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1855}
1761 1856
1762# also paths starting with '/' 1857# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1858$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1859
1765sub thawer_merge { 1860sub thawer_merge {
1766 my ($self, $merge) = @_; 1861 my ($self, $merge) = @_;
1767 1862
1768 # we have to keep some variables in memory intact 1863 # we have to keep some variables in memory intact
1982 2077
1983 $cf::MAP{$path} = $map 2078 $cf::MAP{$path} = $map
1984 } 2079 }
1985} 2080}
1986 2081
1987sub pre_load { } 2082sub pre_load { }
1988sub post_load { } 2083#sub post_load { } # XS
1989 2084
1990sub load { 2085sub load {
1991 my ($self) = @_; 2086 my ($self) = @_;
1992 2087
1993 local $self->{deny_reset} = 1; # loading can take a long time 2088 local $self->{deny_reset} = 1; # loading can take a long time
2050 } 2145 }
2051 2146
2052 $self->post_load; 2147 $self->post_load;
2053} 2148}
2054 2149
2150# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath
2055sub customise_for { 2153sub customise_for {
2056 my ($self, $ob) = @_; 2154 my ($self, $ob) = @_;
2057 2155
2058 return find "~" . $ob->name . "/" . $self->{path} 2156 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2157 if $self->per_player;
2075 or next; 2173 or next;
2076 $neigh = find $neigh, $map 2174 $neigh = find $neigh, $map
2077 or next; 2175 or next;
2078 $neigh->load; 2176 $neigh->load;
2079 2177
2178 # now find the diagonal neighbours
2080 push @neigh, 2179 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2182 }
2084 2183
2136 $MAP_PREFETCHER->prio (6); 2235 $MAP_PREFETCHER->prio (6);
2137 2236
2138 () 2237 ()
2139} 2238}
2140 2239
2240# common code, used by both ->save and ->swapout
2141sub save { 2241sub _save {
2142 my ($self) = @_; 2242 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2243
2146 $self->{last_save} = $cf::RUNTIME; 2244 $self->{last_save} = $cf::RUNTIME;
2147 2245
2148 return unless $self->dirty; 2246 return unless $self->dirty;
2149 2247
2169 } else { 2267 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2268 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2269 }
2172} 2270}
2173 2271
2272sub save {
2273 my ($self) = @_;
2274
2275 my $lock = cf::lock_acquire "map_data:$self->{path}";
2276
2277 $self->_save;
2278}
2279
2174sub swap_out { 2280sub swap_out {
2175 my ($self) = @_; 2281 my ($self) = @_;
2176 2282
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2283 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2284
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2285 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2286 return if $self->{deny_save};
2287 return if $self->players;
2185 2288
2289 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2292 $self->in_memory (cf::MAP_SWAPPED);
2293
2294 # then atomically save
2295 $self->_save;
2296
2297 # then free the map
2298 $self->clear;
2299}
2300
2301sub reset_at {
2302 my ($self) = @_;
2303
2304 # TODO: safety, remove and allow resettable per-player maps
2305 return 1e99 if $self->{deny_reset};
2306
2307 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2308 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2309
2310 $time + $to
2311}
2312
2313sub should_reset {
2314 my ($self) = @_;
2315
2316 $self->reset_at <= $cf::RUNTIME
2317}
2318
2319sub reset {
2320 my ($self) = @_;
2321
2322 my $lock = cf::lock_acquire "map_data:$self->{path}";
2323
2324 return if $self->players;
2325
2326 cf::trace "resetting map ", $self->path, "\n";
2327
2328 $self->in_memory (cf::MAP_SWAPPED);
2329
2330 # need to save uniques path
2331 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333
2334 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2335 if $uniq;
2336 }
2337
2338 delete $cf::MAP{$self->path};
2187 2339
2188 $self->deactivate; 2340 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2341 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2342 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2343
2236 $self->unlink_save; 2344 $self->unlink_save;
2237 $self->destroy; 2345 $self->destroy;
2238} 2346}
2239 2347
2247 2355
2248 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
2249 2357
2250 $self->unlink_save; 2358 $self->unlink_save;
2251 2359
2252 bless $self, "cf::map"; 2360 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2361 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2362 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2363 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2364 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2365
2314 : normalise $_ 2422 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2423 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2424 ]
2317} 2425}
2318 2426
2427=item cf::map::static_maps
2428
2429Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2430file in the shared directory excluding F</styles> and F</editor>). May
2431block.
2432
2433=cut
2434
2435sub static_maps() {
2436 my @dirs = "";
2437 my @maps;
2438
2439 while (@dirs) {
2440 my $dir = shift @dirs;
2441
2442 next if $dir eq "/styles" || $dir eq "/editor";
2443
2444 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2445 or return;
2446
2447 for (@$files) {
2448 s/\.map$// or next;
2449 utf8::decode $_;
2450 push @maps, "$dir/$_";
2451 }
2452
2453 push @dirs, map "$dir/$_", @$dirs;
2454 }
2455
2456 \@maps
2457}
2458
2319=back 2459=back
2320 2460
2321=head3 cf::object 2461=head3 cf::object
2322 2462
2323=cut 2463=cut
2388 2528
2389our $SAY_CHANNEL = { 2529our $SAY_CHANNEL = {
2390 id => "say", 2530 id => "say",
2391 title => "Map", 2531 title => "Map",
2392 reply => "say ", 2532 reply => "say ",
2393 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2533 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394}; 2534};
2395 2535
2396our $CHAT_CHANNEL = { 2536our $CHAT_CHANNEL = {
2397 id => "chat", 2537 id => "chat",
2398 title => "Chat", 2538 title => "Chat",
2455 2595
2456Freezes the player and moves him/her to a special map (C<{link}>). 2596Freezes the player and moves him/her to a special map (C<{link}>).
2457 2597
2458The player should be reasonably safe there for short amounts of time (e.g. 2598The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2599for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2600though, as the player cannot control the character while it is on the link
2461map. 2601map.
2462 2602
2463Will never block. 2603Will never block.
2464 2604
2465=item $player_object->leave_link ($map, $x, $y) 2605=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2626sub cf::object::player::enter_link {
2487 my ($self) = @_; 2627 my ($self) = @_;
2488 2628
2489 $self->deactivate_recursive; 2629 $self->deactivate_recursive;
2490 2630
2631 ++$self->{_link_recursion};
2632
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2633 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2634
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2635 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2636 if $self->map && $self->map->{path} ne "{link}";
2495 2637
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2638 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2639}
2498 2640
2499sub cf::object::player::leave_link { 2641sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2642 my ($self, $map, $x, $y) = @_;
2501 2643
2518 ($x, $y) = (-1, -1) 2660 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2661 unless (defined $x) && (defined $y);
2520 2662
2521 # use -1 or undef as default coordinates, not 0, 0 2663 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2664 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2665 if $x <= 0 && $y <= 0;
2524 2666
2525 $map->load; 2667 $map->load;
2526 $map->load_neighbours; 2668 $map->load_neighbours;
2527 2669
2528 return unless $self->contr->active; 2670 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2671
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2673 if ($self->enter_map ($map, $x, $y)) {
2534} 2674 # entering was successful
2675 delete $self->{_link_recursion};
2676 # only activate afterwards, to support waiting in hooks
2677 $self->activate_recursive;
2678 }
2535 2679
2680}
2681
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2682=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2683
2538Moves the player to the given map-path and coordinates by first freezing 2684Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2685her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2686that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2687the new (success) or old (failed) map position. In either case, $done will
2548 2694
2549our $GOTOGEN; 2695our $GOTOGEN;
2550 2696
2551sub cf::object::player::goto { 2697sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2698 my ($self, $path, $x, $y, $check, $done) = @_;
2699
2700 if ($self->{_link_recursion} >= $MAX_LINKS) {
2701 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2702 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2703 ($path, $x, $y) = @$EMERGENCY_POSITION;
2704 }
2553 2705
2554 # do generation counting so two concurrent goto's will be executed in-order 2706 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2707 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2708
2557 $self->enter_link; 2709 $self->enter_link;
2581 my $map = eval { 2733 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2734 my $map = defined $path ? cf::map::find $path : undef;
2583 2735
2584 if ($map) { 2736 if ($map) {
2585 $map = $map->customise_for ($self); 2737 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2738 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2739 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2740 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2741 }
2590 2742
2591 $map 2743 $map
2599 if ($gen == $self->{_goto_generation}) { 2751 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2752 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2753 $self->leave_link ($map, $x, $y);
2602 } 2754 }
2603 2755
2604 $done->() if $done; 2756 $done->($self) if $done;
2605 })->prio (1); 2757 })->prio (1);
2606} 2758}
2607 2759
2608=item $player_object->enter_exit ($exit_object) 2760=item $player_object->enter_exit ($exit_object)
2609 2761
2702 $self->message ("Something went wrong deep within the deliantra server. " 2854 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2855 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2856 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2857 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2858
2707 warn "ERROR in enter_exit: $@"; 2859 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2860 $self->leave_link;
2709 } 2861 }
2710 })->prio (1); 2862 })->prio (1);
2711} 2863}
2712 2864
2724sub cf::client::send_drawinfo { 2876sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2877 my ($self, $text, $flags) = @_;
2726 2878
2727 utf8::encode $text; 2879 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2880 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2881}
2882
2883=item $client->send_big_packet ($pkt)
2884
2885Like C<send_packet>, but tries to compress large packets, and fragments
2886them as required.
2887
2888=cut
2889
2890our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2891
2892sub cf::client::send_big_packet {
2893 my ($self, $pkt) = @_;
2894
2895 # try lzf for large packets
2896 $pkt = "lzf " . Compress::LZF::compress $pkt
2897 if 1024 <= length $pkt and $self->{can_lzf};
2898
2899 # split very large packets
2900 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2901 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2902 $pkt = "frag";
2903 }
2904
2905 $self->send_packet ($pkt);
2729} 2906}
2730 2907
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 2908=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 2909
2733Send a drawinfo or msg packet to the client, formatting the msg for the 2910Send a drawinfo or msg packet to the client, formatting the msg for the
2737 2914
2738=cut 2915=cut
2739 2916
2740# non-persistent channels (usually the info channel) 2917# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 2918our %CHANNEL = (
2919 "c/motd" => {
2920 id => "infobox",
2921 title => "MOTD",
2922 reply => undef,
2923 tooltip => "The message of the day",
2924 },
2742 "c/identify" => { 2925 "c/identify" => {
2743 id => "infobox", 2926 id => "infobox",
2744 title => "Identify", 2927 title => "Identify",
2745 reply => undef, 2928 reply => undef,
2746 tooltip => "Items recently identified", 2929 tooltip => "Items recently identified",
2748 "c/examine" => { 2931 "c/examine" => {
2749 id => "infobox", 2932 id => "infobox",
2750 title => "Examine", 2933 title => "Examine",
2751 reply => undef, 2934 reply => undef,
2752 tooltip => "Signs and other items you examined", 2935 tooltip => "Signs and other items you examined",
2936 },
2937 "c/shopinfo" => {
2938 id => "infobox",
2939 title => "Shop Info",
2940 reply => undef,
2941 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 2942 },
2754 "c/book" => { 2943 "c/book" => {
2755 id => "infobox", 2944 id => "infobox",
2756 title => "Book", 2945 title => "Book",
2757 reply => undef, 2946 reply => undef,
2785 id => "infobox", 2974 id => "infobox",
2786 title => "Skills", 2975 title => "Skills",
2787 reply => undef, 2976 reply => undef,
2788 tooltip => "Shows your experience per skill and item power", 2977 tooltip => "Shows your experience per skill and item power",
2789 }, 2978 },
2979 "c/shopitems" => {
2980 id => "infobox",
2981 title => "Shop Items",
2982 reply => undef,
2983 tooltip => "Shows the items currently for sale in this shop",
2984 },
2790 "c/resistances" => { 2985 "c/resistances" => {
2791 id => "infobox", 2986 id => "infobox",
2792 title => "Resistances", 2987 title => "Resistances",
2793 reply => undef, 2988 reply => undef,
2794 tooltip => "Shows your resistances", 2989 tooltip => "Shows your resistances",
2796 "c/pets" => { 2991 "c/pets" => {
2797 id => "infobox", 2992 id => "infobox",
2798 title => "Pets", 2993 title => "Pets",
2799 reply => undef, 2994 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet", 2995 tooltip => "Shows information abotu your pets/a specific pet",
2996 },
2997 "c/perceiveself" => {
2998 id => "infobox",
2999 title => "Perceive Self",
3000 reply => undef,
3001 tooltip => "You gained detailed knowledge about yourself",
2801 }, 3002 },
2802 "c/uptime" => { 3003 "c/uptime" => {
2803 id => "infobox", 3004 id => "infobox",
2804 title => "Uptime", 3005 title => "Uptime",
2805 reply => undef, 3006 reply => undef,
2861 my $pkt = "msg " 3062 my $pkt = "msg "
2862 . $self->{json_coder}->encode ( 3063 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3064 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 ); 3065 );
2865 3066
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt); 3067 $self->send_big_packet ($pkt);
2877} 3068}
2878 3069
2879=item $client->ext_msg ($type, @msg) 3070=item $client->ext_msg ($type, @msg)
2880 3071
2881Sends an ext event to the client. 3072Sends an ext event to the client.
2884 3075
2885sub cf::client::ext_msg($$@) { 3076sub cf::client::ext_msg($$@) {
2886 my ($self, $type, @msg) = @_; 3077 my ($self, $type, @msg) = @_;
2887 3078
2888 if ($self->extcmd == 2) { 3079 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove 3081 } elsif ($self->extcmd == 1) { # TODO: remove
2891 push @msg, msgtype => "event_$type"; 3082 push @msg, msgtype => "event_$type";
2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 } 3084 }
2894} 3085}
2895 3086
2896=item $client->ext_reply ($msgid, @msg) 3087=item $client->ext_reply ($msgid, @msg)
2897 3088
2901 3092
2902sub cf::client::ext_reply($$@) { 3093sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_; 3094 my ($self, $id, @msg) = @_;
2904 3095
2905 if ($self->extcmd == 2) { 3096 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) { 3098 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove 3099 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id; 3100 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3102 }
2912} 3103}
2913 3104
2914=item $success = $client->query ($flags, "text", \&cb) 3105=item $success = $client->query ($flags, "text", \&cb)
2915 3106
2986 3177
2987 $ns->ext_reply ($reply, @reply) 3178 $ns->ext_reply ($reply, @reply)
2988 if $reply; 3179 if $reply;
2989 3180
2990 } else { 3181 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 } 3183 }
2993 3184
2994 cf::override; 3185 cf::override;
2995 }, 3186 },
2996); 3187);
3016 3207
3017 $coro 3208 $coro
3018} 3209}
3019 3210
3020cf::client->attach ( 3211cf::client->attach (
3021 on_destroy => sub { 3212 on_client_destroy => sub {
3022 my ($ns) = @_; 3213 my ($ns) = @_;
3023 3214
3024 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3215 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3025 }, 3216 },
3026); 3217);
3042our $safe_hole = new Safe::Hole; 3233our $safe_hole = new Safe::Hole;
3043 3234
3044$SIG{FPE} = 'IGNORE'; 3235$SIG{FPE} = 'IGNORE';
3045 3236
3046$safe->permit_only (Opcode::opset qw( 3237$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math 3238 :base_core :base_mem :base_orig :base_math :base_loop
3048 grepstart grepwhile mapstart mapwhile 3239 grepstart grepwhile mapstart mapwhile
3049 sort time 3240 sort time
3050)); 3241));
3051 3242
3052# here we export the classes and methods available to script code 3243# here we export the classes and methods available to script code
3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3295 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3105 $qcode =~ s/\n/\\n/g; 3296 $qcode =~ s/\n/\\n/g;
3106 3297
3107 %vars = (_dummy => 0) unless %vars; 3298 %vars = (_dummy => 0) unless %vars;
3108 3299
3300 my @res;
3109 local $_; 3301 local $_;
3110 local @safe::cf::_safe_eval_args = values %vars;
3111 3302
3112 my $eval = 3303 my $eval =
3113 "do {\n" 3304 "do {\n"
3114 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3305 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3115 . "#line 0 \"{$qcode}\"\n" 3306 . "#line 0 \"{$qcode}\"\n"
3116 . $code 3307 . $code
3117 . "\n}" 3308 . "\n}"
3118 ; 3309 ;
3119 3310
3311 if ($CFG{safe_eval}) {
3120 sub_generation_inc; 3312 sub_generation_inc;
3313 local @safe::cf::_safe_eval_args = values %vars;
3121 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3314 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3122 sub_generation_inc; 3315 sub_generation_inc;
3316 } else {
3317 local @cf::_safe_eval_args = values %vars;
3318 @res = wantarray ? eval eval : scalar eval $eval;
3319 }
3123 3320
3124 if ($@) { 3321 if ($@) {
3125 warn "$@"; 3322 warn "$@",
3126 warn "while executing safe code '$code'\n"; 3323 "while executing safe code '$code'\n",
3127 warn "with arguments " . (join " ", %vars) . "\n"; 3324 "with arguments " . (join " ", %vars) . "\n";
3128 } 3325 }
3129 3326
3130 wantarray ? @res : $res[0] 3327 wantarray ? @res : $res[0]
3131} 3328}
3132 3329
3146=cut 3343=cut
3147 3344
3148sub register_script_function { 3345sub register_script_function {
3149 my ($fun, $cb) = @_; 3346 my ($fun, $cb) = @_;
3150 3347
3151 no strict 'refs'; 3348 $fun = "safe::$fun" if $CFG{safe_eval};
3152 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3349 *$fun = $safe_hole->wrap ($cb);
3153} 3350}
3154 3351
3155=back 3352=back
3156 3353
3157=cut 3354=cut
3166 # for this (global event?) 3363 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = (); 3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3168 3365
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3366 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170 3367
3171 warn "loading facedata from $path\n"; 3368 trace "loading facedata from $path\n";
3172 3369
3173 my $facedata; 3370 my $facedata;
3174 0 < aio_load $path, $facedata 3371 0 < aio_load $path, $facedata
3175 or die "$path: $!"; 3372 or die "$path: $!";
3176 3373
3178 3375
3179 $facedata->{version} == 2 3376 $facedata->{version} == 2
3180 or cf::cleanup "$path: version mismatch, cannot proceed."; 3377 or cf::cleanup "$path: version mismatch, cannot proceed.";
3181 3378
3182 # patch in the exptable 3379 # patch in the exptable
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3183 $facedata->{resource}{"res/exp_table"} = { 3381 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC, 3382 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3383 data => $exp_table,
3384 hash => (Digest::MD5::md5 $exp_table),
3186 }; 3385 };
3187 cf::cede_to_tick; 3386 cf::cede_to_tick;
3188 3387
3189 { 3388 {
3190 my $faces = $facedata->{faceinfo}; 3389 my $faces = $facedata->{faceinfo};
3192 while (my ($face, $info) = each %$faces) { 3391 while (my ($face, $info) = each %$faces) {
3193 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3392 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194 3393
3195 cf::face::set_visibility $idx, $info->{visibility}; 3394 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap}; 3395 cf::face::set_magicmap $idx, $info->{magicmap};
3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3199 3398
3200 cf::cede_to_tick; 3399 cf::cede_to_tick;
3201 } 3400 }
3202 3401
3203 while (my ($face, $info) = each %$faces) { 3402 while (my ($face, $info) = each %$faces) {
3208 3407
3209 if (my $smooth = cf::face::find $info->{smooth}) { 3408 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth; 3409 cf::face::set_smooth $idx, $smooth;
3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3212 } else { 3411 } else {
3213 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3412 error "smooth face '$info->{smooth}' not found for face '$face'";
3214 } 3413 }
3215 3414
3216 cf::cede_to_tick; 3415 cf::cede_to_tick;
3217 } 3416 }
3218 } 3417 }
3227 3426
3228 cf::anim::invalidate_all; # d'oh 3427 cf::anim::invalidate_all; # d'oh
3229 } 3428 }
3230 3429
3231 { 3430 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource}; 3431 my $res = $facedata->{resource};
3235 3432
3236 while (my ($name, $info) = each %$res) { 3433 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) { 3434 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3435 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240 3436
3241 if ($info->{type} & 1) { 3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type}; 3438 cf::face::set_type $idx, $info->{type};
3256 } else { 3439 } else {
3257 $RESOURCE{$name} = $info; 3440 $RESOURCE{$name} = $info; # unused
3258 } 3441 }
3259 3442
3260 cf::cede_to_tick; 3443 cf::cede_to_tick;
3261 } 3444 }
3262 } 3445 }
3263 3446
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265 3448
3266 1 3449 1
3267} 3450}
3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288 3451
3289register_exticmd fx_want => sub { 3452register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_; 3453 my ($ns, $want) = @_;
3291 3454
3292 while (my ($k, $v) = each %$want) { 3455 while (my ($k, $v) = each %$want) {
3331sub reload_treasures { 3494sub reload_treasures {
3332 load_resource_file "$DATADIR/treasures" 3495 load_resource_file "$DATADIR/treasures"
3333 or die "unable to load treasurelists\n"; 3496 or die "unable to load treasurelists\n";
3334} 3497}
3335 3498
3499sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n";
3501
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3506
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_]
3509 or next;
3510
3511 my $face = cf::face::find "sound/$sound->[1]";
3512 cf::sound::set $sound->[0] => $face;
3513 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3514 }
3515
3516 while (my ($k, $v) = each %{$soundconf->{event}}) {
3517 my $face = cf::face::find "sound/$v";
3518 cf::sound::set $k => $face;
3519 }
3520}
3521
3336sub reload_resources { 3522sub reload_resources {
3337 warn "reloading resource files...\n"; 3523 trace "reloading resource files...\n";
3338 3524
3339 reload_facedata; 3525 reload_facedata;
3526 reload_sound;
3340 reload_archetypes; 3527 reload_archetypes;
3341 reload_regions; 3528 reload_regions;
3342 reload_treasures; 3529 reload_treasures;
3343 3530
3344 warn "finished reloading resource files\n"; 3531 trace "finished reloading resource files\n";
3345} 3532}
3346 3533
3347sub reload_config { 3534sub reload_config {
3535 trace "reloading config file...\n";
3536
3348 open my $fh, "<:utf8", "$CONFDIR/config" 3537 open my $fh, "<:utf8", "$CONFDIR/config"
3349 or return; 3538 or return;
3350 3539
3351 local $/; 3540 local $/;
3352 *CFG = YAML::Load <$fh>; 3541 *CFG = YAML::XS::Load scalar <$fh>;
3353 3542
3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3355 3544
3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3358 3547
3359 if (exists $CFG{mlockall}) { 3548 if (exists $CFG{mlockall}) {
3361 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3362 and die "WARNING: m(un)lockall failed: $!\n"; 3551 and die "WARNING: m(un)lockall failed: $!\n";
3363 }; 3552 };
3364 warn $@ if $@; 3553 warn $@ if $@;
3365 } 3554 }
3555
3556 trace "finished reloading resource files\n";
3366} 3557}
3367 3558
3368sub pidfile() { 3559sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!"; 3561 or die "$PIDFILE: $!";
3382 3573
3383 seek $fh, 0, 0; 3574 seek $fh, 0, 0;
3384 print $fh $$; 3575 print $fh $$;
3385} 3576}
3386 3577
3578sub main_loop {
3579 trace "EV::loop starting\n";
3580 if (1) {
3581 EV::loop;
3582 }
3583 trace "EV::loop returned\n";
3584 goto &main_loop unless $REALLY_UNLOOP;
3585}
3586
3387sub main { 3587sub main {
3388 cf::init_globals; # initialise logging 3588 cf::init_globals; # initialise logging
3389 3589
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399 3594
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401 3596
3402 # we must not ever block the main coroutine 3597 # we must not ever block the main coroutine
3403 local $Coro::idle = sub { 3598 local $Coro::idle = sub {
3409 }; 3604 };
3410 3605
3411 evthread_start IO::AIO::poll_fileno; 3606 evthread_start IO::AIO::poll_fileno;
3412 3607
3413 cf::sync_job { 3608 cf::sync_job {
3609 cf::init_experience;
3610 cf::init_anim;
3611 cf::init_attackmess;
3612 cf::init_dynamic;
3613
3614 cf::load_settings;
3615 cf::load_materials;
3616
3414 reload_resources; 3617 reload_resources;
3415 reload_config; 3618 reload_config;
3416 db_init; 3619 db_init;
3417 3620
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid; 3621 cf::init_uuid;
3421 cf::init_signals; 3622 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills; 3623 cf::init_skills;
3424 3624
3425 cf::init_beforeplay; 3625 cf::init_beforeplay;
3426 3626
3427 atomic; 3627 atomic;
3429 load_extensions; 3629 load_extensions;
3430 3630
3431 utime time, time, $RUNTIMEFILE; 3631 utime time, time, $RUNTIMEFILE;
3432 3632
3433 # no (long-running) fork's whatsoever before this point(!) 3633 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX ();
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435 3636
3436 (pop @POST_INIT)->(0) while @POST_INIT; 3637 (pop @POST_INIT)->(0) while @POST_INIT;
3437 }; 3638 };
3438 3639
3439 EV::loop; 3640 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n";
3642
3643 main_loop;
3440} 3644}
3441 3645
3442############################################################################# 3646#############################################################################
3443# initialisation and cleanup 3647# initialisation and cleanup
3444 3648
3445# install some emergency cleanup handlers 3649# install some emergency cleanup handlers
3446BEGIN { 3650BEGIN {
3447 our %SIGWATCHER = (); 3651 our %SIGWATCHER = ();
3448 for my $signal (qw(INT HUP TERM)) { 3652 for my $signal (qw(INT HUP TERM)) {
3449 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3653 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3450 cf::cleanup "SIG$signal"; 3654 cf::cleanup "SIG$signal";
3451 }; 3655 };
3452 } 3656 }
3453} 3657}
3454 3658
3455sub write_runtime_sync { 3659sub write_runtime_sync {
3660 my $t0 = AE::time;
3661
3456 # first touch the runtime file to show we are still running: 3662 # first touch the runtime file to show we are still running:
3457 # the fsync below can take a very very long time. 3663 # the fsync below can take a very very long time.
3458 3664
3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3665 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3460 3666
3461 my $guard = cf::lock_acquire "write_runtime"; 3667 my $guard = cf::lock_acquire "write_runtime";
3462 3668
3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3669 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3464 or return; 3670 or return;
3465 3671
3466 my $value = $cf::RUNTIME + 90 + 10; 3672 my $value = $cf::RUNTIME + 90 + 10;
3467 # 10 is the runtime save interval, for a monotonic clock 3673 # 10 is the runtime save interval, for a monotonic clock
3468 # 60 allows for the watchdog to kill the server. 3674 # 60 allows for the watchdog to kill the server.
3481 or return; 3687 or return;
3482 3688
3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3689 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3484 and return; 3690 and return;
3485 3691
3486 warn "runtime file written.\n"; 3692 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3487 3693
3488 1 3694 1
3489} 3695}
3490 3696
3491our $uuid_lock; 3697our $uuid_lock;
3503 or return; 3709 or return;
3504 3710
3505 my $value = uuid_seq uuid_cur; 3711 my $value = uuid_seq uuid_cur;
3506 3712
3507 unless ($value) { 3713 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n"; 3714 info "cowardly refusing to write zero uuid value!\n";
3509 return; 3715 return;
3510 } 3716 }
3511 3717
3512 my $value = uuid_str $value + $uuid_skip; 3718 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0; 3719 $uuid_skip = 0;
3523 or return; 3729 or return;
3524 3730
3525 aio_rename "$uuid~", $uuid 3731 aio_rename "$uuid~", $uuid
3526 and return; 3732 and return;
3527 3733
3528 warn "uuid file written ($value).\n"; 3734 trace "uuid file written ($value).\n";
3529 3735
3530 1 3736 1
3531 3737
3532} 3738}
3533 3739
3539} 3745}
3540 3746
3541sub emergency_save() { 3747sub emergency_save() {
3542 my $freeze_guard = cf::freeze_mainloop; 3748 my $freeze_guard = cf::freeze_mainloop;
3543 3749
3544 warn "emergency_perl_save: enter\n"; 3750 info "emergency_perl_save: enter\n";
3545 3751
3546 cf::sync_job { 3752 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so 3753 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync 3754 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow) 3755 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0; 3756 local $USE_FSYNC = 0;
3551 3757
3552 # use a peculiar iteration method to avoid tripping on perl 3758 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 3759 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 3760 # and maps saved/destroyed asynchronously.
3555 warn "emergency_perl_save: begin player save\n"; 3761 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 3762 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 3763 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 3764 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 3766 $pl->save;
3561 } 3767 }
3562 warn "emergency_perl_save: end player save\n"; 3768 info "emergency_perl_save: end player save\n";
3563 3769
3564 warn "emergency_perl_save: begin map save\n"; 3770 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 3771 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 3772 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 3773 $map->valid or next;
3568 $map->save; 3774 $map->save;
3569 } 3775 }
3570 warn "emergency_perl_save: end map save\n"; 3776 info "emergency_perl_save: end map save\n";
3571 3777
3572 warn "emergency_perl_save: begin database checkpoint\n"; 3778 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 3779 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "emergency_perl_save: end database checkpoint\n"; 3780 info "emergency_perl_save: end database checkpoint\n";
3575 3781
3576 warn "emergency_perl_save: begin write uuid\n"; 3782 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 3783 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n"; 3784 info "emergency_perl_save: end write uuid\n";
3579 }; 3785 };
3580 3786
3581 warn "emergency_perl_save: starting sync()\n"; 3787 info "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub { 3788 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n"; 3789 info "emergency_perl_save: finished sync()\n";
3584 }; 3790 };
3585 3791
3586 warn "emergency_perl_save: leave\n"; 3792 info "emergency_perl_save: leave\n";
3587} 3793}
3588 3794
3589sub post_cleanup { 3795sub post_cleanup {
3590 my ($make_core) = @_; 3796 my ($make_core) = @_;
3591 3797
3592 warn Carp::longmess "post_cleanup backtrace" 3798 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3799 if $make_core;
3594 3800
3595 my $fh = pidfile; 3801 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$; 3802 unlink $PIDFILE if <$fh> == $$;
3597} 3803}
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3823 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) { 3824 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"}; 3825 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3826# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 } 3827 }
3622 warn "cleared package $pkg\n";#d#
3623} 3828}
3624 3829
3625sub do_reload_perl() { 3830sub do_reload_perl() {
3626 # can/must only be called in main 3831 # can/must only be called in main
3627 if ($Coro::current != $Coro::main) { 3832 if (in_main) {
3628 warn "can only reload from main coroutine"; 3833 error "can only reload from main coroutine";
3629 return; 3834 return;
3630 } 3835 }
3631 3836
3632 return if $RELOAD++; 3837 return if $RELOAD++;
3633 3838
3634 my $t1 = EV::time; 3839 my $t1 = AE::time;
3635 3840
3636 while ($RELOAD) { 3841 while ($RELOAD) {
3637 warn "reloading..."; 3842 info "reloading...";
3638 3843
3639 warn "entering sync_job"; 3844 trace "entering sync_job";
3640 3845
3641 cf::sync_job { 3846 cf::sync_job {
3642 cf::write_runtime_sync; # external watchdog should not bark 3847 cf::write_runtime_sync; # external watchdog should not bark
3643 cf::emergency_save; 3848 cf::emergency_save;
3644 cf::write_runtime_sync; # external watchdog should not bark 3849 cf::write_runtime_sync; # external watchdog should not bark
3645 3850
3646 warn "syncing database to disk"; 3851 trace "syncing database to disk";
3647 BDB::db_env_txn_checkpoint $DB_ENV; 3852 BDB::db_env_txn_checkpoint $DB_ENV;
3648 3853
3649 # if anything goes wrong in here, we should simply crash as we already saved 3854 # if anything goes wrong in here, we should simply crash as we already saved
3650 3855
3651 warn "flushing outstanding aio requests"; 3856 trace "flushing outstanding aio requests";
3652 while (IO::AIO::nreqs || BDB::nreqs) { 3857 while (IO::AIO::nreqs || BDB::nreqs) {
3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3654 } 3859 }
3655 3860
3656 warn "cancelling all extension coros"; 3861 trace "cancelling all extension coros";
3657 $_->cancel for values %EXT_CORO; 3862 $_->cancel for values %EXT_CORO;
3658 %EXT_CORO = (); 3863 %EXT_CORO = ();
3659 3864
3660 warn "removing commands"; 3865 trace "removing commands";
3661 %COMMAND = (); 3866 %COMMAND = ();
3662 3867
3663 warn "removing ext/exti commands"; 3868 trace "removing ext/exti commands";
3664 %EXTCMD = (); 3869 %EXTCMD = ();
3665 %EXTICMD = (); 3870 %EXTICMD = ();
3666 3871
3667 warn "unloading/nuking all extensions"; 3872 trace "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) { 3873 for my $pkg (@EXTS) {
3669 warn "... unloading $pkg"; 3874 trace "... unloading $pkg";
3670 3875
3671 if (my $cb = $pkg->can ("unload")) { 3876 if (my $cb = $pkg->can ("unload")) {
3672 eval { 3877 eval {
3673 $cb->($pkg); 3878 $cb->($pkg);
3674 1 3879 1
3675 } or warn "$pkg unloaded, but with errors: $@"; 3880 } or error "$pkg unloaded, but with errors: $@";
3676 } 3881 }
3677 3882
3678 warn "... clearing $pkg"; 3883 trace "... clearing $pkg";
3679 clear_package $pkg; 3884 clear_package $pkg;
3680 } 3885 }
3681 3886
3682 warn "unloading all perl modules loaded from $LIBDIR"; 3887 trace "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) { 3888 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685 3890
3686 warn "... unloading $k"; 3891 trace "... unloading $k";
3687 delete $INC{$k}; 3892 delete $INC{$k};
3688 3893
3689 $k =~ s/\.pm$//; 3894 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g; 3895 $k =~ s/\//::/g;
3691 3896
3694 } 3899 }
3695 3900
3696 clear_package $k; 3901 clear_package $k;
3697 } 3902 }
3698 3903
3699 warn "getting rid of safe::, as good as possible"; 3904 trace "getting rid of safe::, as good as possible";
3700 clear_package "safe::$_" 3905 clear_package "safe::$_"
3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3702 3907
3703 warn "unloading cf.pm \"a bit\""; 3908 trace "unloading cf.pm \"a bit\"";
3704 delete $INC{"cf.pm"}; 3909 delete $INC{"cf.pm"};
3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3706 3911
3707 # don't, removes xs symbols, too, 3912 # don't, removes xs symbols, too,
3708 # and global variables created in xs 3913 # and global variables created in xs
3709 #clear_package __PACKAGE__; 3914 #clear_package __PACKAGE__;
3710 3915
3711 warn "unload completed, starting to reload now"; 3916 info "unload completed, starting to reload now";
3712 3917
3713 warn "reloading cf.pm"; 3918 trace "reloading cf.pm";
3714 require cf; 3919 require cf;
3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3920 cf::_connect_to_perl_1;
3716 3921
3717 warn "loading config and database again"; 3922 trace "loading config and database again";
3718 cf::reload_config; 3923 cf::reload_config;
3719 3924
3720 warn "loading extensions"; 3925 trace "loading extensions";
3721 cf::load_extensions; 3926 cf::load_extensions;
3722 3927
3723 if ($REATTACH_ON_RELOAD) { 3928 if ($REATTACH_ON_RELOAD) {
3724 warn "reattaching attachments to objects/players"; 3929 trace "reattaching attachments to objects/players";
3725 _global_reattach; # objects, sockets 3930 _global_reattach; # objects, sockets
3726 warn "reattaching attachments to maps"; 3931 trace "reattaching attachments to maps";
3727 reattach $_ for values %MAP; 3932 reattach $_ for values %MAP;
3728 warn "reattaching attachments to players"; 3933 trace "reattaching attachments to players";
3729 reattach $_ for values %PLAYER; 3934 reattach $_ for values %PLAYER;
3730 } 3935 }
3731 3936
3732 warn "running post_init jobs"; 3937 trace "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT; 3938 (pop @POST_INIT)->(1) while @POST_INIT;
3734 3939
3735 warn "leaving sync_job"; 3940 trace "leaving sync_job";
3736 3941
3737 1 3942 1
3738 } or do { 3943 } or do {
3739 warn $@; 3944 error $@;
3740 cf::cleanup "error while reloading, exiting."; 3945 cf::cleanup "error while reloading, exiting.";
3741 }; 3946 };
3742 3947
3743 warn "reloaded"; 3948 info "reloaded";
3744 --$RELOAD; 3949 --$RELOAD;
3745 } 3950 }
3746 3951
3747 $t1 = EV::time - $t1; 3952 $t1 = AE::time - $t1;
3748 warn "reload completed in ${t1}s\n"; 3953 info "reload completed in ${t1}s\n";
3749}; 3954};
3750 3955
3751our $RELOAD_WATCHER; # used only during reload 3956our $RELOAD_WATCHER; # used only during reload
3752 3957
3753sub reload_perl() { 3958sub reload_perl() {
3755 # coro crashes during coro_state_free->destroy here. 3960 # coro crashes during coro_state_free->destroy here.
3756 3961
3757 $RELOAD_WATCHER ||= cf::async { 3962 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions; 3963 Coro::AIO::aio_wait cache_extensions;
3759 3964
3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 3965 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3761 do_reload_perl; 3966 do_reload_perl;
3762 undef $RELOAD_WATCHER; 3967 undef $RELOAD_WATCHER;
3763 }; 3968 };
3764 }; 3969 };
3765} 3970}
3782 3987
3783our @WAIT_FOR_TICK; 3988our @WAIT_FOR_TICK;
3784our @WAIT_FOR_TICK_BEGIN; 3989our @WAIT_FOR_TICK_BEGIN;
3785 3990
3786sub wait_for_tick { 3991sub wait_for_tick {
3787 return if tick_inhibit || $Coro::current == $Coro::main; 3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3788 3993
3789 my $signal = new Coro::Signal; 3994 my $signal = new Coro::Signal;
3790 push @WAIT_FOR_TICK, $signal; 3995 push @WAIT_FOR_TICK, $signal;
3791 $signal->wait; 3996 $signal->wait;
3792} 3997}
3793 3998
3794sub wait_for_tick_begin { 3999sub wait_for_tick_begin {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4001
3797 my $signal = new Coro::Signal; 4002 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK_BEGIN, $signal; 4003 push @WAIT_FOR_TICK_BEGIN, $signal;
3799 $signal->wait; 4004 $signal->wait;
3800} 4005}
3806 return; 4011 return;
3807 } 4012 }
3808 4013
3809 cf::server_tick; # one server iteration 4014 cf::server_tick; # one server iteration
3810 4015
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017
3811 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4018 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3813 Coro::async_pool { 4020 Coro::async_pool {
3814 $Coro::current->{desc} = "runtime saver"; 4021 $Coro::current->{desc} = "runtime saver";
3815 write_runtime_sync 4022 write_runtime_sync
3816 or warn "ERROR: unable to write runtime file: $!"; 4023 or error "ERROR: unable to write runtime file: $!";
3817 }; 4024 };
3818 } 4025 }
3819 4026
3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3821 $sig->send; 4028 $sig->send;
3829 4036
3830 if (0) { 4037 if (0) {
3831 if ($NEXT_TICK) { 4038 if ($NEXT_TICK) {
3832 my $jitter = $TICK_START - $NEXT_TICK; 4039 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4040 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d# 4041 debug "jitter $JITTER\n";#d#
3835 } 4042 }
3836 } 4043 }
3837} 4044}
3838 4045
3839{ 4046{
3840 # configure BDB 4047 # configure BDB
3841 4048
3842 BDB::min_parallel 8; 4049 BDB::min_parallel 16;
3843 BDB::max_poll_reqs $TICK * 0.1; 4050 BDB::max_poll_reqs $TICK * 0.1;
3844 $AnyEvent::BDB::WATCHER->priority (1); 4051 $AnyEvent::BDB::WATCHER->priority (1);
3845 4052
3846 unless ($DB_ENV) { 4053 unless ($DB_ENV) {
3847 $DB_ENV = BDB::db_env_create; 4054 $DB_ENV = BDB::db_env_create;
3928 } 4135 }
3929} 4136}
3930 4137
3931# load additional modules 4138# load additional modules
3932require "cf/$_.pm" for @EXTRA_MODULES; 4139require "cf/$_.pm" for @EXTRA_MODULES;
4140cf::_connect_to_perl_2;
3933 4141
3934END { cf::emergency_save } 4142END { cf::emergency_save }
3935 4143
39361 41441
3937 4145

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines