ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 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,2011,2012 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
92our @EVENT; 93our @EVENT;
93our @REFLECT; # set by XS 94our @REFLECT; # set by XS
94our %REFLECT; # set by us 95our %REFLECT; # set by us
95 96
96our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
97our $DATADIR = datadir; 99our $DATADIR = datadir;
98our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
99our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
100our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
101our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
102our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
106our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
109 112
110our %RESOURCE; 113#our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
111 120
112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114our $NEXT_TICK; 123our $NEXT_TICK;
115our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
117our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
118our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
119our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
120our $DB_ENV; 129our $DB_ENV;
121 130
122our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
123 132
124our %CFG; 133our %CFG;
125 134
126our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
127our $RUNTIME; 136our $RUNTIME = 0;
137our $SERVER_TICK = 0;
128our $NOW; 138our $NOW;
129 139
130our (%PLAYER, %PLAYER_LOADING); # all users 140our (%PLAYER, %PLAYER_LOADING); # all users
131our (%MAP, %MAP_LOADING ); # all maps 141our (%MAP, %MAP_LOADING ); # all maps
132our $LINK_MAP; # the special {link} map, which is always available 142our $LINK_MAP; # the special {link} map, which is always available
141 151
142our @POST_INIT; 152our @POST_INIT;
143 153
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 154our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :) 155our $REALLY_UNLOOP; # never set to true, please :)
156
157our $WAIT_FOR_TICK = new Coro::Signal;
158our @WAIT_FOR_TICK_BEGIN;
146 159
147binmode STDOUT; 160binmode STDOUT;
148binmode STDERR; 161binmode STDERR;
149 162
150# read virtual server time, if available 163# read virtual server time, if available
161 174
162our $EMERGENCY_POSITION; 175our $EMERGENCY_POSITION;
163 176
164sub cf::map::normalise; 177sub cf::map::normalise;
165 178
179sub in_main() {
180 $Coro::current == $Coro::main
181}
182
166############################################################################# 183#############################################################################
167 184
168%REFLECT = (); 185%REFLECT = ();
169for (@REFLECT) { 186for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_; 187 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect; 188 $REFLECT{$reflect->{class}} = $reflect;
172} 189}
173 190
174# this is decidedly evil 191# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}]; 192$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176 193
177############################################################################# 194#############################################################################
178 195
179=head2 GLOBAL VARIABLES 196=head2 GLOBAL VARIABLES
180 197
181=over 4 198=over 4
182 199
183=item $cf::UPTIME 200=item $cf::UPTIME
184 201
185The timestamp of the server start (so not actually an uptime). 202The timestamp of the server start (so not actually an "uptime").
203
204=item $cf::SERVER_TICK
205
206An unsigned integer that starts at zero when the server is started and is
207incremented on every tick.
208
209=item $cf::NOW
210
211The (real) time of the last (current) server tick - updated before and
212after tick processing, so this is useful only as a rough "what time is it
213now" estimate.
214
215=item $cf::TICK
216
217The interval between each server tick, in seconds.
186 218
187=item $cf::RUNTIME 219=item $cf::RUNTIME
188 220
189The time this server has run, starts at 0 and is increased by $cf::TICK on 221The time this server has run, starts at 0 and is increased by $cf::TICK on
190every server tick. 222every server tick.
196Various directories - "/etc", read-only install directory, perl-library 228Various directories - "/etc", read-only install directory, perl-library
197directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 229directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198unique-items directory, player file directory, random maps directory and 230unique-items directory, player file directory, random maps directory and
199database environment. 231database environment.
200 232
201=item $cf::NOW
202
203The time of the last (current) server tick.
204
205=item $cf::TICK
206
207The interval between server ticks, in seconds.
208
209=item $cf::LOADAVG 233=item $cf::LOADAVG
210 234
211The current CPU load on the server (alpha-smoothed), as a value between 0 235The current CPU load on the server (alpha-smoothed), as a value between 0
212(none) and 1 (overloaded), indicating how much time is spent on processing 236(none) and 1 (overloaded), indicating how much time is spent on processing
213objects per tick. Healthy values are < 0.5. 237objects per tick. Healthy values are < 0.5.
222from wherever your confdir points to. 246from wherever your confdir points to.
223 247
224=item cf::wait_for_tick, cf::wait_for_tick_begin 248=item cf::wait_for_tick, cf::wait_for_tick_begin
225 249
226These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 250These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
227returns directly I<after> the tick processing (and consequently, can only wake one process 251returns directly I<after> the tick processing (and consequently, can only wake one thread
228per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 252per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229 253
254Note that cf::Wait_for_tick will immediately return when the server is not
255ticking, making it suitable for small pauses in threads that need to run
256when the server is paused. If that is not applicable (i.e. you I<really>
257want to wait, use C<$cf::WAIT_FOR_TICK>).
258
259=item $cf::WAIT_FOR_TICK
260
261Note that C<cf::wait_for_tick> is probably the correct thing to use. This
262variable contains a L<Coro::Signal> that is broadcats after every server
263tick. Calling C<< ->wait >> on it will suspend the caller until after the
264next server tick.
265
266=cut
267
268sub wait_for_tick();
269sub wait_for_tick_begin();
270
230=item @cf::INVOKE_RESULTS 271=item @cf::INVOKE_RESULTS
231 272
232This array contains the results of the last C<invoke ()> call. When 273This array contains the results of the last C<invoke ()> call. When
233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 274C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234that call. 275that call.
235 276
236=item %cf::REFLECT 277=item %cf::REFLECT
237 278
241 282
242=back 283=back
243 284
244=cut 285=cut
245 286
287sub error(@) { LOG llevError, join "", @_ }
288sub warn (@) { LOG llevWarn , join "", @_ }
289sub info (@) { LOG llevInfo , join "", @_ }
290sub debug(@) { LOG llevDebug, join "", @_ }
291sub trace(@) { LOG llevTrace, join "", @_ }
292
246$Coro::State::WARNHOOK = sub { 293$Coro::State::WARNHOOK = sub {
247 my $msg = join "", @_; 294 my $msg = join "", @_;
248 295
249 $msg .= "\n" 296 $msg .= "\n"
250 unless $msg =~ /\n$/; 297 unless $msg =~ /\n$/;
251 298
252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 299 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253 300
254 LOG llevError, $msg; 301 LOG llevWarn, $msg;
255}; 302};
256 303
257$Coro::State::DIEHOOK = sub { 304$Coro::State::DIEHOOK = sub {
258 return unless $^S eq 0; # "eq", not "==" 305 return unless $^S eq 0; # "eq", not "=="
259 306
260 warn Carp::longmess $_[0]; 307 error Carp::longmess $_[0];
261 308
262 if ($Coro::current == $Coro::main) {#d# 309 if (in_main) {#d#
263 warn "DIEHOOK called in main context, Coro bug?\n";#d# 310 error "DIEHOOK called in main context, Coro bug?\n";#d#
264 return;#d# 311 return;#d#
265 }#d# 312 }#d#
266 313
267 # kill coroutine otherwise 314 # kill coroutine otherwise
268 Coro::terminate 315 Coro::terminate
288)) { 335)) {
289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 336 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290} 337}
291 338
292$EV::DIED = sub { 339$EV::DIED = sub {
293 warn "error in event callback: @_"; 340 Carp::cluck "error in event callback: @_";
294}; 341};
342
343#############################################################################
344
345sub fork_call(&@);
346sub get_slot($;$$);
295 347
296############################################################################# 348#############################################################################
297 349
298=head2 UTILITY FUNCTIONS 350=head2 UTILITY FUNCTIONS
299 351
320 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 372 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
321 $d 373 $d
322 } || "[unable to dump $_[0]: '$@']"; 374 } || "[unable to dump $_[0]: '$@']";
323} 375}
324 376
377=item $scalar = cf::load_file $path
378
379Loads the given file from path and returns its contents. Croaks on error
380and can block.
381
382=cut
383
384sub load_file($) {
385 0 <= aio_load $_[0], my $data
386 or Carp::croak "$_[0]: $!";
387
388 $data
389}
390
391=item $success = cf::replace_file $path, $data, $sync
392
393Atomically replaces the file at the given $path with new $data, and
394optionally $sync the data to disk before replacing the file.
395
396=cut
397
398sub replace_file($$;$) {
399 my ($path, $data, $sync) = @_;
400
401 my $lock = cf::lock_acquire ("replace_file:$path");
402
403 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
404 or return;
405
406 $data = $data->() if ref $data;
407
408 length $data == aio_write $fh, 0, (length $data), $data, 0
409 or return;
410
411 !$sync
412 or !aio_fsync $fh
413 or return;
414
415 aio_close $fh
416 and return;
417
418 aio_rename "$path~", $path
419 and return;
420
421 if ($sync) {
422 $path =~ s%/[^/]*$%%;
423 aio_pathsync $path;
424 }
425
426 1
427}
428
325=item $ref = cf::decode_json $json 429=item $ref = cf::decode_json $json
326 430
327Converts a JSON string into the corresponding perl data structure. 431Converts a JSON string into the corresponding perl data structure.
328 432
329=item $json = cf::encode_json $ref 433=item $json = cf::encode_json $ref
335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 439our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336 440
337sub encode_json($) { $json_coder->encode ($_[0]) } 441sub encode_json($) { $json_coder->encode ($_[0]) }
338sub decode_json($) { $json_coder->decode ($_[0]) } 442sub decode_json($) { $json_coder->decode ($_[0]) }
339 443
444=item $ref = cf::decode_storable $scalar
445
446Same as Coro::Storable::thaw, so blocks.
447
448=cut
449
450BEGIN { *decode_storable = \&Coro::Storable::thaw }
451
452=item $ref = cf::decode_yaml $scalar
453
454Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
455
456=cut
457
458sub decode_yaml($) {
459 fork_call { YAML::XS::Load $_[0] } @_
460}
461
462=item $scalar = cf::unlzf $scalar
463
464Same as Compress::LZF::compress, but takes server ticks into account, so
465blocks.
466
467=cut
468
469sub unlzf($) {
470 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
471 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
472 Compress::LZF::decompress $_[0]
473}
474
340=item cf::post_init { BLOCK } 475=item cf::post_init { BLOCK }
341 476
342Execute the given codeblock, I<after> all extensions have been (re-)loaded, 477Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again. 478but I<before> the server starts ticking again.
344 479
345The cdoeblock will have a single boolean argument to indicate whether this 480The codeblock will have a single boolean argument to indicate whether this
346is a reload or not. 481is a reload or not.
347 482
348=cut 483=cut
349 484
350sub post_init(&) { 485sub post_init(&) {
351 push @POST_INIT, shift; 486 push @POST_INIT, shift;
487}
488
489sub _post_init {
490 trace "running post_init jobs";
491
492 # run them in parallel...
493
494 my @join;
495
496 while () {
497 push @join, map &Coro::async ($_, 0), @POST_INIT;
498 @POST_INIT = ();
499
500 @join or last;
501
502 (pop @join)->join;
503 }
352} 504}
353 505
354=item cf::lock_wait $string 506=item cf::lock_wait $string
355 507
356Wait until the given lock is available. See cf::lock_acquire. 508Wait until the given lock is available. See cf::lock_acquire.
395} 547}
396 548
397=item cf::periodic $interval, $cb 549=item cf::periodic $interval, $cb
398 550
399Like EV::periodic, but randomly selects a starting point so that the actions 551Like EV::periodic, but randomly selects a starting point so that the actions
400get spread over timer. 552get spread over time.
401 553
402=cut 554=cut
403 555
404sub periodic($$) { 556sub periodic($$) {
405 my ($interval, $cb) = @_; 557 my ($interval, $cb) = @_;
409 EV::periodic $start, $interval, 0, $cb 561 EV::periodic $start, $interval, 0, $cb
410} 562}
411 563
412=item cf::get_slot $time[, $priority[, $name]] 564=item cf::get_slot $time[, $priority[, $name]]
413 565
414Allocate $time seconds of blocking CPU time at priority C<$priority>: 566Allocate $time seconds of blocking CPU time at priority C<$priority>
415This call blocks and returns only when you have at least C<$time> seconds 567(default: 0): This call blocks and returns only when you have at least
416of cpu time till the next tick. The slot is only valid till the next cede. 568C<$time> seconds of cpu time till the next tick. The slot is only valid
569till the next cede.
570
571Background jobs should use a priority les than zero, interactive jobs
572should use 100 or more.
417 573
418The optional C<$name> can be used to identify the job to run. It might be 574The optional C<$name> can be used to identify the job to run. It might be
419used for statistical purposes and should identify the same time-class. 575used for statistical purposes and should identify the same time-class.
420 576
421Useful for short background jobs. 577Useful for short background jobs.
422 578
423=cut 579=cut
424 580
425our @SLOT_QUEUE; 581our @SLOT_QUEUE;
426our $SLOT_QUEUE; 582our $SLOT_QUEUE;
583our $SLOT_DECAY = 0.9;
427 584
428$SLOT_QUEUE->cancel if $SLOT_QUEUE; 585$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429$SLOT_QUEUE = Coro::async { 586$SLOT_QUEUE = Coro::async {
430 $Coro::current->desc ("timeslot manager"); 587 $Coro::current->desc ("timeslot manager");
431 588
432 my $signal = new Coro::Signal; 589 my $signal = new Coro::Signal;
590 my $busy;
433 591
434 while () { 592 while () {
435 next_job: 593 next_job:
594
436 my $avail = cf::till_tick; 595 my $avail = cf::till_tick;
437 if ($avail > 0.01) { 596
438 for (0 .. $#SLOT_QUEUE) { 597 for (0 .. $#SLOT_QUEUE) {
439 if ($SLOT_QUEUE[$_][0] < $avail) { 598 if ($SLOT_QUEUE[$_][0] <= $avail) {
599 $busy = 0;
440 my $job = splice @SLOT_QUEUE, $_, 1, (); 600 my $job = splice @SLOT_QUEUE, $_, 1, ();
441 $job->[2]->send; 601 $job->[2]->send;
442 Coro::cede; 602 Coro::cede;
443 goto next_job; 603 goto next_job;
444 } 604 } else {
605 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445 } 606 }
446 } 607 }
447 608
448 if (@SLOT_QUEUE) { 609 if (@SLOT_QUEUE) {
449 # we do not use wait_for_tick() as it returns immediately when tick is inactive 610 # we do not use wait_for_tick() as it returns immediately when tick is inactive
450 push @cf::WAIT_FOR_TICK, $signal; 611 $WAIT_FOR_TICK->wait;
451 $signal->wait;
452 } else { 612 } else {
613 $busy = 0;
453 Coro::schedule; 614 Coro::schedule;
454 } 615 }
455 } 616 }
456}; 617};
457 618
458sub get_slot($;$$) { 619sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main; 620 return if tick_inhibit || $Coro::current == $Coro::main;
460 621
461 my ($time, $pri, $name) = @_; 622 my ($time, $pri, $name) = @_;
462 623
463 $time = $TICK * .6 if $time > $TICK * .6; 624 $time = clamp $time, 0.01, $TICK * .6;
625
464 my $sig = new Coro::Signal; 626 my $sig = new Coro::Signal;
465 627
466 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 628 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 629 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468 $SLOT_QUEUE->ready; 630 $SLOT_QUEUE->ready;
494=cut 656=cut
495 657
496sub sync_job(&) { 658sub sync_job(&) {
497 my ($job) = @_; 659 my ($job) = @_;
498 660
499 if ($Coro::current == $Coro::main) { 661 if (in_main) {
500 my $time = EV::time; 662 my $time = AE::time;
501 663
502 # this is the main coro, too bad, we have to block 664 # this is the main coro, too bad, we have to block
503 # till the operation succeeds, freezing the server :/ 665 # till the operation succeeds, freezing the server :/
504 666
505 LOG llevError, Carp::longmess "sync job";#d# 667 #LOG llevError, Carp::longmess "sync job";#d#
506 668
507 my $freeze_guard = freeze_mainloop; 669 my $freeze_guard = freeze_mainloop;
508 670
509 my $busy = 1; 671 my $busy = 1;
510 my @res; 672 my @res;
511 673
512 (async { 674 (async {
513 $Coro::current->desc ("sync job coro"); 675 $Coro::current->desc ("sync job coro");
514 @res = eval { $job->() }; 676 @res = eval { $job->() };
515 warn $@ if $@; 677 error $@ if $@;
516 undef $busy; 678 undef $busy;
517 })->prio (Coro::PRIO_MAX); 679 })->prio (Coro::PRIO_MAX);
518 680
519 while ($busy) { 681 while ($busy) {
520 if (Coro::nready) { 682 if (Coro::nready) {
522 } else { 684 } else {
523 EV::loop EV::LOOP_ONESHOT; 685 EV::loop EV::LOOP_ONESHOT;
524 } 686 }
525 } 687 }
526 688
527 my $time = EV::time - $time; 689 my $time = AE::time - $time;
528 690
529 $TICK_START += $time; # do not account sync jobs to server load 691 $TICK_START += $time; # do not account sync jobs to server load
530 692
531 wantarray ? @res : $res[0] 693 wantarray ? @res : $res[0]
532 } else { 694 } else {
554 $EXT_CORO{$coro+0} = $coro; 716 $EXT_CORO{$coro+0} = $coro;
555 717
556 $coro 718 $coro
557} 719}
558 720
559=item fork_call { }, $args 721=item fork_call { }, @args
560 722
561Executes the given code block with the given arguments in a seperate 723Executes the given code block with the given arguments in a seperate
562process, returning the results. Everything must be serialisable with 724process, returning the results. Everything must be serialisable with
563Coro::Storable. May, of course, block. Note that the executed sub may 725Coro::Storable. May, of course, block. Note that the executed sub may
564never block itself or use any form of event handling. 726never block itself or use any form of event handling.
565 727
566=cut 728=cut
567 729
730sub post_fork {
731 reset_signals;
732}
733
568sub fork_call(&@) { 734sub fork_call(&@) {
569 my ($cb, @args) = @_; 735 my ($cb, @args) = @_;
570 736
571 # we seemingly have to make a local copy of the whole thing, 737 # we seemingly have to make a local copy of the whole thing,
572 # otherwise perl prematurely frees the stuff :/ 738 # otherwise perl prematurely frees the stuff :/
573 # TODO: investigate and fix (likely this will be rather laborious) 739 # TODO: investigate and fix (likely this will be rather laborious)
574 740
575 my @res = Coro::Util::fork_eval { 741 my @res = Coro::Util::fork_eval {
576 reset_signals; 742 cf::post_fork;
577 &$cb 743 &$cb
578 }, @args; 744 } @args;
579 745
580 wantarray ? @res : $res[-1] 746 wantarray ? @res : $res[-1]
747}
748
749sub objinfo {
750 (
751 "counter value" => cf::object::object_count,
752 "objects created" => cf::object::create_count,
753 "objects destroyed" => cf::object::destroy_count,
754 "freelist size" => cf::object::free_count,
755 "allocated objects" => cf::object::objects_size,
756 "active objects" => cf::object::actives_size,
757 )
581} 758}
582 759
583=item $coin = coin_from_name $name 760=item $coin = coin_from_name $name
584 761
585=cut 762=cut
622within each server. 799within each server.
623 800
624=cut 801=cut
625 802
626sub db_table($) { 803sub db_table($) {
804 cf::error "db_get called from main context"
805 if $Coro::current == $Coro::main;
806
627 my ($name) = @_; 807 my ($name) = @_;
628 my $db = BDB::db_create $DB_ENV; 808 my $db = BDB::db_create $DB_ENV;
629 809
630 eval { 810 eval {
631 $db->set_flags (BDB::CHKSUM); 811 $db->set_flags (BDB::CHKSUM);
641} 821}
642 822
643our $DB; 823our $DB;
644 824
645sub db_init { 825sub db_init {
646 cf::sync_job {
647 $DB ||= db_table "db"; 826 $DB ||= db_table "db";
648 };
649} 827}
650 828
651sub db_get($$) { 829sub db_get($$) {
652 my $key = "$_[0]/$_[1]"; 830 my $key = "$_[0]/$_[1]";
653 831
654 cf::sync_job { 832 cf::error "db_get called from main context"
833 if $Coro::current == $Coro::main;
834
655 BDB::db_get $DB, undef, $key, my $data; 835 BDB::db_get $DB, undef, $key, my $data;
656 836
657 $! ? () 837 $! ? ()
658 : $data 838 : $data
659 }
660} 839}
661 840
662sub db_put($$$) { 841sub db_put($$$) {
663 BDB::dbreq_pri 4; 842 BDB::dbreq_pri 4;
664 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 843 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
692 871
693 my @data; 872 my @data;
694 my $md5; 873 my $md5;
695 874
696 for (0 .. $#$src) { 875 for (0 .. $#$src) {
697 0 <= aio_load $src->[$_], $data[$_] 876 $data[$_] = load_file $src->[$_];
698 or Carp::croak "$src->[$_]: $!";
699 } 877 }
700 878
701 # if processing is expensive, check 879 # if processing is expensive, check
702 # checksum first 880 # checksum first
703 if (1) { 881 if (1) {
720 898
721 my $t1 = Time::HiRes::time; 899 my $t1 = Time::HiRes::time;
722 my $data = $process->(\@data); 900 my $data = $process->(\@data);
723 my $t2 = Time::HiRes::time; 901 my $t2 = Time::HiRes::time;
724 902
725 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 903 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726 904
727 db_put cache => "$id/data", $data; 905 db_put cache => "$id/data", $data;
728 db_put cache => "$id/md5" , $md5; 906 db_put cache => "$id/md5" , $md5;
729 db_put cache => "$id/meta", $meta; 907 db_put cache => "$id/meta", $meta;
730 908
740 918
741=cut 919=cut
742 920
743sub datalog($@) { 921sub datalog($@) {
744 my ($type, %kv) = @_; 922 my ($type, %kv) = @_;
745 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 923 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746} 924}
747 925
748=back 926=back
749 927
750=cut 928=cut
945 1123
946 } elsif (exists $cb_id{$type}) { 1124 } elsif (exists $cb_id{$type}) {
947 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1125 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948 1126
949 } elsif (ref $type) { 1127 } elsif (ref $type) {
950 warn "attaching objects not supported, ignoring.\n"; 1128 error "attaching objects not supported, ignoring.\n";
951 1129
952 } else { 1130 } else {
953 shift @arg; 1131 shift @arg;
954 warn "attach argument '$type' not supported, ignoring.\n"; 1132 error "attach argument '$type' not supported, ignoring.\n";
955 } 1133 }
956 } 1134 }
957} 1135}
958 1136
959sub _object_attach { 1137sub _object_attach {
969 _attach $registry, $klass, @attach; 1147 _attach $registry, $klass, @attach;
970 } 1148 }
971 1149
972 $obj->{$name} = \%arg; 1150 $obj->{$name} = \%arg;
973 } else { 1151 } else {
974 warn "object uses attachment '$name' which is not available, postponing.\n"; 1152 info "object uses attachment '$name' which is not available, postponing.\n";
975 } 1153 }
976 1154
977 $obj->{_attachment}{$name} = undef; 1155 $obj->{_attachment}{$name} = undef;
978} 1156}
979 1157
1038 1216
1039 for (@$callbacks) { 1217 for (@$callbacks) {
1040 eval { &{$_->[1]} }; 1218 eval { &{$_->[1]} };
1041 1219
1042 if ($@) { 1220 if ($@) {
1043 warn "$@";
1044 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1221 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045 override; 1222 override;
1046 } 1223 }
1047 1224
1048 return 1 if $override; 1225 return 1 if $override;
1049 } 1226 }
1128 for (@$attach) { 1305 for (@$attach) {
1129 my ($klass, @attach) = @$_; 1306 my ($klass, @attach) = @$_;
1130 _attach $registry, $klass, @attach; 1307 _attach $registry, $klass, @attach;
1131 } 1308 }
1132 } else { 1309 } else {
1133 warn "object uses attachment '$name' that is not available, postponing.\n"; 1310 info "object uses attachment '$name' that is not available, postponing.\n";
1134 } 1311 }
1135 } 1312 }
1136} 1313}
1137 1314
1138cf::attachable->attach ( 1315cf::attachable->attach (
1165 my ($filename, $rdata, $objs) = @_; 1342 my ($filename, $rdata, $objs) = @_;
1166 1343
1167 sync_job { 1344 sync_job {
1168 if (length $$rdata) { 1345 if (length $$rdata) {
1169 utf8::decode (my $decname = $filename); 1346 utf8::decode (my $decname = $filename);
1170 warn sprintf "saving %s (%d,%d)\n", 1347 trace sprintf "saving %s (%d,%d)\n",
1171 $decname, length $$rdata, scalar @$objs; 1348 $decname, length $$rdata, scalar @$objs
1349 if $VERBOSE_IO;
1172 1350
1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1351 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174 aio_chmod $fh, SAVE_MODE; 1352 aio_chmod $fh, SAVE_MODE;
1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1353 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176 if ($cf::USE_FSYNC) { 1354 if ($cf::USE_FSYNC) {
1198 aio_rename "$filename~", $filename; 1376 aio_rename "$filename~", $filename;
1199 1377
1200 $filename =~ s%/[^/]+$%%; 1378 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC; 1379 aio_pathsync $filename if $cf::USE_FSYNC;
1202 } else { 1380 } else {
1203 warn "unable to save objects: $filename~: $!\n"; 1381 error "unable to save objects: $filename~: $!\n";
1204 } 1382 }
1205 } else { 1383 } else {
1206 aio_unlink $filename; 1384 aio_unlink $filename;
1207 aio_unlink "$filename.pst"; 1385 aio_unlink "$filename.pst";
1208 } 1386 }
1232 my $st = eval { Coro::Storable::thaw $av }; 1410 my $st = eval { Coro::Storable::thaw $av };
1233 $av = $st->{objs}; 1411 $av = $st->{objs};
1234 } 1412 }
1235 1413
1236 utf8::decode (my $decname = $filename); 1414 utf8::decode (my $decname = $filename);
1237 warn sprintf "loading %s (%d,%d)\n", 1415 trace sprintf "loading %s (%d,%d)\n",
1238 $decname, length $data, scalar @{$av || []}; 1416 $decname, length $data, scalar @{$av || []}
1417 if $VERBOSE_IO;
1239 1418
1240 ($data, $av) 1419 ($data, $av)
1241} 1420}
1242 1421
1243=head2 COMMAND CALLBACKS 1422=head2 COMMAND CALLBACKS
1302} 1481}
1303 1482
1304use File::Glob (); 1483use File::Glob ();
1305 1484
1306cf::player->attach ( 1485cf::player->attach (
1307 on_command => sub { 1486 on_unknown_command => sub {
1308 my ($pl, $name, $params) = @_; 1487 my ($pl, $name, $params) = @_;
1309 1488
1310 my $cb = $COMMAND{$name} 1489 my $cb = $COMMAND{$name}
1311 or return; 1490 or return;
1312 1491
1320 my ($pl, $buf) = @_; 1499 my ($pl, $buf) = @_;
1321 1500
1322 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1501 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323 1502
1324 if (ref $msg) { 1503 if (ref $msg) {
1325 my ($type, $reply, @payload) = 1504 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326 "ARRAY" eq ref $msg
1327 ? @$msg
1328 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329 1505
1330 my @reply; 1506 my @reply;
1331 1507
1332 if (my $cb = $EXTCMD{$type}) { 1508 if (my $cb = $EXTCMD{$type}) {
1333 @reply = $cb->($pl, @payload); 1509 @reply = $cb->($pl, @payload);
1335 1511
1336 $pl->ext_reply ($reply, @reply) 1512 $pl->ext_reply ($reply, @reply)
1337 if $reply; 1513 if $reply;
1338 1514
1339 } else { 1515 } else {
1340 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1516 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341 } 1517 }
1342 1518
1343 cf::override; 1519 cf::override;
1344 }, 1520 },
1345); 1521);
1356 1532
1357 $grp 1533 $grp
1358} 1534}
1359 1535
1360sub load_extensions { 1536sub load_extensions {
1537 info "loading extensions...";
1538
1361 cf::sync_job { 1539 cf::sync_job {
1362 my %todo; 1540 my %todo;
1363 1541
1364 for my $path (<$LIBDIR/*.ext>) { 1542 for my $path (<$LIBDIR/*.ext>) {
1365 next unless -r $path; 1543 next unless -r $path;
1383 1561
1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1562 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1563 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386 1564
1387 $ext{source} = 1565 $ext{source} =
1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1566 "package $pkg; use common::sense;\n"
1389 . "#line 1 \"$path\"\n{\n" 1567 . "#line 1 \"$path\"\n{\n"
1390 . $source 1568 . $source
1391 . "\n};\n1"; 1569 . "\n};\n1";
1392 1570
1393 $todo{$base} = \%ext; 1571 $todo{$base} = \%ext;
1394 } 1572 }
1395 1573
1574 my $pass = 0;
1396 my %done; 1575 my %done;
1397 while (%todo) { 1576 while (%todo) {
1398 my $progress; 1577 my $progress;
1399 1578
1579 ++$pass;
1580
1581 ext:
1400 while (my ($k, $v) = each %todo) { 1582 while (my ($k, $v) = each %todo) {
1401 for (split /,\s*/, $v->{meta}{depends}) { 1583 for (split /,\s*/, $v->{meta}{depends}) {
1402 goto skip 1584 next ext
1403 unless exists $done{$_}; 1585 unless exists $done{$_};
1404 } 1586 }
1405 1587
1406 warn "... loading '$k' into '$v->{pkg}'\n"; 1588 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407 1589
1408 unless (eval $v->{source}) { 1590 my $active = eval $v->{source};
1591
1592 if (length $@) {
1409 my $msg = $@ ? "$v->{path}: $@\n" 1593 error "$v->{path}: $@\n";
1410 : "$v->{base}: extension inactive.\n";
1411 1594
1412 if (exists $v->{meta}{mandatory}) {
1413 warn $msg;
1414 cf::cleanup "mandatory extension failed to load, exiting."; 1595 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415 } 1596 if exists $v->{meta}{mandatory};
1416 1597
1417 warn $msg; 1598 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1599 delete $todo{$k};
1600 } else {
1601 $done{$k} = delete $todo{$k};
1602 push @EXTS, $v->{pkg};
1603 $progress = 1;
1604
1605 info "$v->{base}: extension inactive.\n"
1606 unless $active;
1418 } 1607 }
1419
1420 $done{$k} = delete $todo{$k};
1421 push @EXTS, $v->{pkg};
1422 $progress = 1;
1423 } 1608 }
1424 1609
1425 skip: 1610 unless ($progress) {
1426 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1611 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427 unless $progress; 1612
1613 while (my ($k, $v) = each %todo) {
1614 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1615 if exists $v->{meta}{mandatory};
1616 }
1617
1618 last;
1619 }
1428 } 1620 }
1429 }; 1621 };
1430} 1622}
1431 1623
1432############################################################################# 1624#############################################################################
1516 $cf::PLAYER{$login} = $pl 1708 $cf::PLAYER{$login} = $pl
1517 } 1709 }
1518 } 1710 }
1519} 1711}
1520 1712
1713cf::player->attach (
1714 on_load => sub {
1715 my ($pl, $path) = @_;
1716
1717 # restore slots saved in save, below
1718 my $slots = delete $pl->{_slots};
1719
1720 $pl->ob->current_weapon ($slots->[0]);
1721 $pl->combat_ob ($slots->[1]);
1722 $pl->ranged_ob ($slots->[2]);
1723 },
1724);
1725
1521sub save($) { 1726sub save($) {
1522 my ($pl) = @_; 1727 my ($pl) = @_;
1523 1728
1524 return if $pl->{deny_save}; 1729 return if $pl->{deny_save};
1525 1730
1530 1735
1531 aio_mkdir playerdir $pl, 0770; 1736 aio_mkdir playerdir $pl, 0770;
1532 $pl->{last_save} = $cf::RUNTIME; 1737 $pl->{last_save} = $cf::RUNTIME;
1533 1738
1534 cf::get_slot 0.01; 1739 cf::get_slot 0.01;
1740
1741 # save slots, to be restored later
1742 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535 1743
1536 $pl->save_pl ($path); 1744 $pl->save_pl ($path);
1537 cf::cede_to_tick; 1745 cf::cede_to_tick;
1538} 1746}
1539 1747
1573 my $name = $pl->ob->name; 1781 my $name = $pl->ob->name;
1574 1782
1575 $pl->{deny_save} = 1; 1783 $pl->{deny_save} = 1;
1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1784 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1577 1785
1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1786 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579 $pl->deactivate; 1787 $pl->deactivate;
1788
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1789 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1582 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1790 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1791 ext::highscore::check ($pl->ob);
1792
1583 $pl->ns->destroy if $pl->ns; 1793 $pl->ns->destroy if $pl->ns;
1584 1794
1585 my $path = playerdir $pl; 1795 my $path = playerdir $pl;
1586 my $temp = "$path~$cf::RUNTIME~deleting~"; 1796 my $temp = "$path~$cf::RUNTIME~deleting~";
1587 aio_rename $path, $temp; 1797 aio_rename $path, $temp;
1641 \@logins 1851 \@logins
1642} 1852}
1643 1853
1644=item $player->maps 1854=item $player->maps
1645 1855
1856=item cf::player::maps $login
1857
1646Returns an arrayref of map paths that are private for this 1858Returns an arrayref of map paths that are private for this
1647player. May block. 1859player. May block.
1648 1860
1649=cut 1861=cut
1650 1862
1712=cut 1924=cut
1713 1925
1714sub find_by_path($) { 1926sub find_by_path($) {
1715 my ($path) = @_; 1927 my ($path) = @_;
1716 1928
1929 $path =~ s/^~[^\/]*//; # skip ~login
1930
1717 my ($match, $specificity); 1931 my ($match, $specificity);
1718 1932
1719 for my $region (list) { 1933 for my $region (list) {
1720 if ($region->{match} && $path =~ $region->{match}) { 1934 if ($region->{match} && $path =~ $region->{match}) {
1721 ($match, $specificity) = ($region, $region->specificity) 1935 ($match, $specificity) = ($region, $region->specificity)
1749sub generate_random_map { 1963sub generate_random_map {
1750 my ($self, $rmp) = @_; 1964 my ($self, $rmp) = @_;
1751 1965
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1966 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753 1967
1754 # mit "rum" bekleckern, nicht
1755 $self->_create_random_map ( 1968 $self->_create_random_map ($rmp);
1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759 $rmp->{exit_on_final_map},
1760 $rmp->{xsize}, $rmp->{ysize},
1761 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766 (cf::region::find $rmp->{region}), $rmp->{custom}
1767 )
1768} 1969}
1769 1970
1770=item cf::map->register ($regex, $prio) 1971=item cf::map->register ($regex, $prio)
1771 1972
1772Register a handler for the map path matching the given regex at the 1973Register a handler for the map path matching the given regex at the
1777 1978
1778sub register { 1979sub register {
1779 my (undef, $regex, $prio) = @_; 1980 my (undef, $regex, $prio) = @_;
1780 my $pkg = caller; 1981 my $pkg = caller;
1781 1982
1782 no strict;
1783 push @{"$pkg\::ISA"}, __PACKAGE__; 1983 push @{"$pkg\::ISA"}, __PACKAGE__;
1784 1984
1785 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1985 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786} 1986}
1787 1987
1788# also paths starting with '/' 1988# also paths starting with '/'
1789$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1989$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790 1990
1791sub thawer_merge { 1991sub thawer_merge {
1792 my ($self, $merge) = @_; 1992 my ($self, $merge) = @_;
1793 1993
1794 # we have to keep some variables in memory intact 1994 # we have to keep some variables in memory intact
1799} 1999}
1800 2000
1801sub normalise { 2001sub normalise {
1802 my ($path, $base) = @_; 2002 my ($path, $base) = @_;
1803 2003
1804 $path = "$path"; # make sure its a string 2004 $path = "$path"; # make sure it's a string
1805 2005
1806 $path =~ s/\.map$//; 2006 $path =~ s/\.map$//;
1807 2007
1808 # map plan: 2008 # map plan:
1809 # 2009 #
1824 $base =~ s{[^/]+/?$}{}; 2024 $base =~ s{[^/]+/?$}{};
1825 $path = "$base/$path"; 2025 $path = "$base/$path";
1826 } 2026 }
1827 2027
1828 for ($path) { 2028 for ($path) {
1829 redo if s{//}{/};
1830 redo if s{/\.?/}{/}; 2029 redo if s{/\.?/}{/};
1831 redo if s{/[^/]+/\.\./}{/}; 2030 redo if s{/[^/]+/\.\./}{/};
1832 } 2031 }
1833 2032
1834 $path 2033 $path
1848 $self->init; # pass $1 etc. 2047 $self->init; # pass $1 etc.
1849 return $self; 2048 return $self;
1850 } 2049 }
1851 } 2050 }
1852 2051
1853 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2052 Carp::cluck "unable to resolve path '$path' (base '$base')";
1854 () 2053 ()
1855} 2054}
1856 2055
2056# may re-bless or do other evil things
1857sub init { 2057sub init {
1858 my ($self) = @_; 2058 my ($self) = @_;
1859 2059
1860 $self 2060 $self
1861} 2061}
1926 $self->{load_path} = $path; 2126 $self->{load_path} = $path;
1927 2127
1928 1 2128 1
1929} 2129}
1930 2130
2131# used to laod the header of an original map
1931sub load_header_orig { 2132sub load_header_orig {
1932 my ($self) = @_; 2133 my ($self) = @_;
1933 2134
1934 $self->load_header_from ($self->load_path) 2135 $self->load_header_from ($self->load_path)
1935} 2136}
1936 2137
2138# used to laod the header of an instantiated map
1937sub load_header_temp { 2139sub load_header_temp {
1938 my ($self) = @_; 2140 my ($self) = @_;
1939 2141
1940 $self->load_header_from ($self->save_path) 2142 $self->load_header_from ($self->save_path)
1941} 2143}
1942 2144
2145# called after loading the header from an instantiated map
1943sub prepare_temp { 2146sub prepare_temp {
1944 my ($self) = @_; 2147 my ($self) = @_;
1945 2148
1946 $self->last_access ((delete $self->{last_access}) 2149 $self->last_access ((delete $self->{last_access})
1947 || $cf::RUNTIME); #d# 2150 || $cf::RUNTIME); #d#
1948 # safety 2151 # safety
1949 $self->{instantiate_time} = $cf::RUNTIME 2152 $self->{instantiate_time} = $cf::RUNTIME
1950 if $self->{instantiate_time} > $cf::RUNTIME; 2153 if $self->{instantiate_time} > $cf::RUNTIME;
1951} 2154}
1952 2155
2156# called after loading the header from an original map
1953sub prepare_orig { 2157sub prepare_orig {
1954 my ($self) = @_; 2158 my ($self) = @_;
1955 2159
1956 $self->{load_original} = 1; 2160 $self->{load_original} = 1;
1957 $self->{instantiate_time} = $cf::RUNTIME; 2161 $self->{instantiate_time} = $cf::RUNTIME;
1981 2185
1982sub find; 2186sub find;
1983sub find { 2187sub find {
1984 my ($path, $origin) = @_; 2188 my ($path, $origin) = @_;
1985 2189
2190 cf::cede_to_tick;
2191
1986 $path = normalise $path, $origin && $origin->path; 2192 $path = normalise $path, $origin;
1987 2193
1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2194 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989 my $guard2 = cf::lock_acquire "map_find:$path"; 2195 my $guard2 = cf::lock_acquire "map_find:$path";
1990 2196
1991 $cf::MAP{$path} || do { 2197 $cf::MAP{$path} || do {
2008 2214
2009 $cf::MAP{$path} = $map 2215 $cf::MAP{$path} = $map
2010 } 2216 }
2011} 2217}
2012 2218
2013sub pre_load { } 2219sub pre_load { }
2014sub post_load { } 2220#sub post_load { } # XS
2015 2221
2016sub load { 2222sub load {
2017 my ($self) = @_; 2223 my ($self) = @_;
2018 2224
2019 local $self->{deny_reset} = 1; # loading can take a long time 2225 local $self->{deny_reset} = 1; # loading can take a long time
2022 2228
2023 { 2229 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2230 my $guard = cf::lock_acquire "map_data:$path";
2025 2231
2026 return unless $self->valid; 2232 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2233 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2234
2031 $self->alloc; 2235 $self->alloc;
2032 2236
2033 $self->pre_load; 2237 $self->pre_load;
2034 cf::cede_to_tick; 2238 cf::cede_to_tick;
2035 2239
2240 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2241 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2242 $f->skip_block;
2038 $self->_load_objects ($f) 2243 $self->_load_objects ($f)
2039 or return; 2244 or return;
2040 2245
2041 $self->post_load_original 2246 $self->post_load_original
2042 if delete $self->{load_original}; 2247 if delete $self->{load_original};
2043 2248
2044 if (my $uniq = $self->uniq_path) { 2249 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2250 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2251 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2252 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2253 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2254 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2255 $f->resolve_delayed_derefs;
2256 }
2051 } 2257 }
2052 } 2258 }
2053 }
2054 2259
2055 $f->resolve_delayed_derefs; 2260 $f->resolve_delayed_derefs;
2261 } else {
2262 $self->post_load_original
2263 if delete $self->{load_original};
2264 }
2265
2266 $self->state (cf::MAP_INACTIVE);
2056 2267
2057 cf::cede_to_tick; 2268 cf::cede_to_tick;
2058 # now do the right thing for maps 2269 # now do the right thing for maps
2059 $self->link_multipart_objects; 2270 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2271 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2275 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2276 $self->decay_objects;
2066 $self->fix_auto_apply; 2277 $self->fix_auto_apply;
2067 $self->update_buttons; 2278 $self->update_buttons;
2068 cf::cede_to_tick; 2279 cf::cede_to_tick;
2069 $self->activate; 2280 #$self->activate; # no longer activate maps automatically
2070 } 2281 }
2071 2282
2072 $self->{last_save} = $cf::RUNTIME; 2283 $self->{last_save} = $cf::RUNTIME;
2073 $self->last_access ($cf::RUNTIME); 2284 $self->last_access ($cf::RUNTIME);
2074
2075 $self->in_memory (cf::MAP_ACTIVE);
2076 } 2285 }
2077 2286
2078 $self->post_load; 2287 $self->post_load;
2079}
2080 2288
2289 1
2290}
2291
2292# customize the map for a given player, i.e.
2293# return the _real_ map. used by e.g. per-player
2294# maps to change the path to ~playername/mappath
2081sub customise_for { 2295sub customise_for {
2082 my ($self, $ob) = @_; 2296 my ($self, $ob) = @_;
2083 2297
2084 return find "~" . $ob->name . "/" . $self->{path} 2298 return find "~" . $ob->name . "/" . $self->{path}
2085 if $self->per_player; 2299 if $self->per_player;
2088# if $self->per_party; 2302# if $self->per_party;
2089 2303
2090 $self 2304 $self
2091} 2305}
2092 2306
2093# find and load all maps in the 3x3 area around a map
2094sub load_neighbours {
2095 my ($map) = @_;
2096
2097 my @neigh; # diagonal neighbours
2098
2099 for (0 .. 3) {
2100 my $neigh = $map->tile_path ($_)
2101 or next;
2102 $neigh = find $neigh, $map
2103 or next;
2104 $neigh->load;
2105
2106 push @neigh,
2107 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2108 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2109 }
2110
2111 for (grep defined $_->[0], @neigh) {
2112 my ($path, $origin) = @$_;
2113 my $neigh = find $path, $origin
2114 or next;
2115 $neigh->load;
2116 }
2117}
2118
2119sub find_sync { 2307sub find_sync {
2120 my ($path, $origin) = @_; 2308 my ($path, $origin) = @_;
2121 2309
2122 cf::sync_job { find $path, $origin } 2310 # it's a bug to call this from the main context
2311 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2312 if $Coro::current == $Coro::main;
2313
2314 find $path, $origin
2123} 2315}
2124 2316
2125sub do_load_sync { 2317sub do_load_sync {
2126 my ($map) = @_; 2318 my ($map) = @_;
2127 2319
2320 # it's a bug to call this from the main context
2128 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2321 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129 if $Coro::current == $Coro::main; 2322 if $Coro::current == $Coro::main;
2130 2323
2131 cf::sync_job { $map->load }; 2324 $map->load;
2132} 2325}
2133 2326
2134our %MAP_PREFETCH; 2327our %MAP_PREFETCH;
2135our $MAP_PREFETCHER = undef; 2328our $MAP_PREFETCHER = undef;
2136 2329
2137sub find_async { 2330sub find_async {
2138 my ($path, $origin, $load) = @_; 2331 my ($path, $origin, $load) = @_;
2139 2332
2140 $path = normalise $path, $origin && $origin->{path}; 2333 $path = normalise $path, $origin;
2141 2334
2142 if (my $map = $cf::MAP{$path}) { 2335 if (my $map = $cf::MAP{$path}) {
2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2336 return $map if !$load || $map->linkable;
2144 } 2337 }
2145 2338
2146 $MAP_PREFETCH{$path} |= $load; 2339 $MAP_PREFETCH{$path} |= $load;
2147 2340
2148 $MAP_PREFETCHER ||= cf::async { 2341 $MAP_PREFETCHER ||= cf::async {
2162 $MAP_PREFETCHER->prio (6); 2355 $MAP_PREFETCHER->prio (6);
2163 2356
2164 () 2357 ()
2165} 2358}
2166 2359
2360# common code, used by both ->save and ->swapout
2167sub save { 2361sub _save {
2168 my ($self) = @_; 2362 my ($self) = @_;
2169
2170 my $lock = cf::lock_acquire "map_data:$self->{path}";
2171 2363
2172 $self->{last_save} = $cf::RUNTIME; 2364 $self->{last_save} = $cf::RUNTIME;
2173 2365
2174 return unless $self->dirty; 2366 return unless $self->dirty;
2175 2367
2195 } else { 2387 } else {
2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2388 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197 } 2389 }
2198} 2390}
2199 2391
2392sub save {
2393 my ($self) = @_;
2394
2395 my $lock = cf::lock_acquire "map_data:$self->{path}";
2396
2397 $self->_save;
2398}
2399
2200sub swap_out { 2400sub swap_out {
2201 my ($self) = @_; 2401 my ($self) = @_;
2202 2402
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2403 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2404
2405 return if !$self->linkable;
2406 return if $self->{deny_save};
2208 return if $self->players; 2407 return if $self->players;
2209 return if $self->in_memory != cf::MAP_ACTIVE; 2408
2409 # first deactivate the map and "unlink" it from the core
2410 $self->deactivate;
2411 $_->clear_links_to ($self) for values %cf::MAP;
2412 $self->state (cf::MAP_SWAPPED);
2413
2414 # then atomically save
2415 $self->_save;
2416
2417 # then free the map
2418 $self->clear;
2419}
2420
2421sub reset_at {
2422 my ($self) = @_;
2423
2424 # TODO: safety, remove and allow resettable per-player maps
2210 return if $self->{deny_save}; 2425 return 1e99 if $self->{deny_reset};
2211 2426
2427 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2428 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2429
2430 $time + $to
2431}
2432
2433sub should_reset {
2434 my ($self) = @_;
2435
2436 $self->reset_at <= $cf::RUNTIME
2437}
2438
2439sub reset {
2440 my ($self) = @_;
2441
2442 my $lock = cf::lock_acquire "map_data:$self->{path}";
2443
2444 return if $self->players;
2445
2446 cf::trace "resetting map ", $self->path, "\n";
2447
2212 $self->in_memory (cf::MAP_SWAPPED); 2448 $self->state (cf::MAP_SWAPPED);
2449
2450 # need to save uniques path
2451 unless ($self->{deny_save}) {
2452 my $uniq = $self->uniq_path; utf8::encode $uniq;
2453
2454 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2455 if $uniq;
2456 }
2457
2458 delete $cf::MAP{$self->path};
2213 2459
2214 $self->deactivate; 2460 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2461 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2462 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path, "\n";
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2463
2262 $self->unlink_save; 2464 $self->unlink_save;
2263 $self->destroy; 2465 $self->destroy;
2264} 2466}
2265 2467
2273 2475
2274 delete $cf::MAP{$self->path}; 2476 delete $cf::MAP{$self->path};
2275 2477
2276 $self->unlink_save; 2478 $self->unlink_save;
2277 2479
2278 bless $self, "cf::map"; 2480 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2481 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2482 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2483 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2484 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2485
2340 : normalise $_ 2542 : normalise $_
2341 } @{ aio_readdir $UNIQUEDIR or [] } 2543 } @{ aio_readdir $UNIQUEDIR or [] }
2342 ] 2544 ]
2343} 2545}
2344 2546
2547=item cf::map::static_maps
2548
2549Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2550file in the shared directory excluding F</styles> and F</editor>). May
2551block.
2552
2553=cut
2554
2555sub static_maps() {
2556 my @dirs = "";
2557 my @maps;
2558
2559 while (@dirs) {
2560 my $dir = shift @dirs;
2561
2562 next if $dir eq "/styles" || $dir eq "/editor";
2563
2564 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2565 or return;
2566
2567 for (@$files) {
2568 s/\.map$// or next;
2569 utf8::decode $_;
2570 push @maps, "$dir/$_";
2571 }
2572
2573 push @dirs, map "$dir/$_", @$dirs;
2574 }
2575
2576 \@maps
2577}
2578
2345=back 2579=back
2346 2580
2347=head3 cf::object 2581=head3 cf::object
2348 2582
2349=cut 2583=cut
2481 2715
2482Freezes the player and moves him/her to a special map (C<{link}>). 2716Freezes the player and moves him/her to a special map (C<{link}>).
2483 2717
2484The player should be reasonably safe there for short amounts of time (e.g. 2718The player should be reasonably safe there for short amounts of time (e.g.
2485for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2719for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link 2720though, as the player cannot control the character while it is on the link
2487map. 2721map.
2488 2722
2489Will never block. 2723Will never block.
2490 2724
2491=item $player_object->leave_link ($map, $x, $y) 2725=item $player_object->leave_link ($map, $x, $y)
2512sub cf::object::player::enter_link { 2746sub cf::object::player::enter_link {
2513 my ($self) = @_; 2747 my ($self) = @_;
2514 2748
2515 $self->deactivate_recursive; 2749 $self->deactivate_recursive;
2516 2750
2751 ++$self->{_link_recursion};
2752
2517 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2753 return if UNIVERSAL::isa $self->map, "ext::map_link";
2518 2754
2519 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2755 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520 if $self->map && $self->map->{path} ne "{link}"; 2756 if $self->map && $self->map->{path} ne "{link}";
2521 2757
2522 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2758 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2523} 2759}
2524 2760
2525sub cf::object::player::leave_link { 2761sub cf::object::player::leave_link {
2526 my ($self, $map, $x, $y) = @_; 2762 my ($self, $map, $x, $y) = @_;
2527 2763
2544 ($x, $y) = (-1, -1) 2780 ($x, $y) = (-1, -1)
2545 unless (defined $x) && (defined $y); 2781 unless (defined $x) && (defined $y);
2546 2782
2547 # use -1 or undef as default coordinates, not 0, 0 2783 # use -1 or undef as default coordinates, not 0, 0
2548 ($x, $y) = ($map->enter_x, $map->enter_y) 2784 ($x, $y) = ($map->enter_x, $map->enter_y)
2549 if $x <=0 && $y <= 0; 2785 if $x <= 0 && $y <= 0;
2550 2786
2551 $map->load; 2787 $map->load;
2552 $map->load_neighbours;
2553 2788
2554 return unless $self->contr->active; 2789 return unless $self->contr->active;
2555 2790
2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2791 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557 $self->enter_map ($map, $x, $y); 2792 if ($self->enter_map ($map, $x, $y)) {
2558 2793 # entering was successful
2794 delete $self->{_link_recursion};
2559 # only activate afterwards, to support waiting in hooks 2795 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive; 2796 $self->activate_recursive;
2561} 2797 }
2562 2798
2799}
2800
2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2801=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564 2802
2565Moves the player to the given map-path and coordinates by first freezing 2803Moves the player to the given map-path and coordinates by first freezing
2566her, loading and preparing them map, calling the provided $check callback 2804her, loading and preparing them map, calling the provided $check callback
2567that has to return the map if sucecssful, and then unfreezes the player on 2805that has to return the map if sucecssful, and then unfreezes the player on
2568the new (success) or old (failed) map position. In either case, $done will 2806the new (success) or old (failed) map position. In either case, $done will
2575 2813
2576our $GOTOGEN; 2814our $GOTOGEN;
2577 2815
2578sub cf::object::player::goto { 2816sub cf::object::player::goto {
2579 my ($self, $path, $x, $y, $check, $done) = @_; 2817 my ($self, $path, $x, $y, $check, $done) = @_;
2818
2819 if ($self->{_link_recursion} >= $MAX_LINKS) {
2820 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2821 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2822 ($path, $x, $y) = @$EMERGENCY_POSITION;
2823 }
2580 2824
2581 # do generation counting so two concurrent goto's will be executed in-order 2825 # do generation counting so two concurrent goto's will be executed in-order
2582 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2826 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583 2827
2584 $self->enter_link; 2828 $self->enter_link;
2604 ($path, $x, $y) = (undef, undef, undef); 2848 ($path, $x, $y) = (undef, undef, undef);
2605 } 2849 }
2606 } 2850 }
2607 2851
2608 my $map = eval { 2852 my $map = eval {
2609 my $map = defined $path ? cf::map::find $path : undef; 2853 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610 2854
2611 if ($map) { 2855 if ($map) {
2612 $map = $map->customise_for ($self); 2856 $map = $map->customise_for ($self);
2613 $map = $check->($map) if $check && $map; 2857 $map = $check->($map, $x, $y, $self) if $check && $map;
2614 } else { 2858 } else {
2615 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2859 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616 } 2860 }
2617 2861
2618 $map 2862 $map
2626 if ($gen == $self->{_goto_generation}) { 2870 if ($gen == $self->{_goto_generation}) {
2627 delete $self->{_goto_generation}; 2871 delete $self->{_goto_generation};
2628 $self->leave_link ($map, $x, $y); 2872 $self->leave_link ($map, $x, $y);
2629 } 2873 }
2630 2874
2631 $done->() if $done; 2875 $done->($self) if $done;
2632 })->prio (1); 2876 })->prio (1);
2633} 2877}
2634 2878
2635=item $player_object->enter_exit ($exit_object) 2879=item $player_object->enter_exit ($exit_object)
2636 2880
2704 $Coro::current->{desc} = "enter_exit"; 2948 $Coro::current->{desc} = "enter_exit";
2705 2949
2706 unless (eval { 2950 unless (eval {
2707 $self->deactivate_recursive; # just to be sure 2951 $self->deactivate_recursive; # just to be sure
2708 2952
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2953 my $map = cf::map::normalise $exit->slaying, $exit->map;
2718 my $x = $exit->stats->hp; 2954 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp; 2955 my $y = $exit->stats->sp;
2956
2957 # special map handling
2958 my $slaying = $exit->slaying;
2959
2960 # special map handling
2961 if ($slaying eq "/!") {
2962 my $guard = cf::lock_acquire "exit_prepare:$exit";
2963
2964 prepare_random_map $exit
2965 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2966
2967 $map = $exit->slaying;
2968
2969 } elsif ($slaying eq '!up') {
2970 $map = $exit->map->tile_path (cf::TILE_UP);
2971 $x = $exit->x;
2972 $y = $exit->y;
2973
2974 } elsif ($slaying eq '!down') {
2975 $map = $exit->map->tile_path (cf::TILE_DOWN);
2976 $x = $exit->x;
2977 $y = $exit->y;
2978 }
2720 2979
2721 $self->goto ($map, $x, $y); 2980 $self->goto ($map, $x, $y);
2722 2981
2723 # if exit is damned, update players death & WoR home-position 2982 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y) 2983 $self->contr->savebed ($map, $x, $y)
2729 $self->message ("Something went wrong deep within the deliantra server. " 2988 $self->message ("Something went wrong deep within the deliantra server. "
2730 . "I'll try to bring you back to the map you were before. " 2989 . "I'll try to bring you back to the map you were before. "
2731 . "Please report this to the dungeon master!", 2990 . "Please report this to the dungeon master!",
2732 cf::NDI_UNIQUE | cf::NDI_RED); 2991 cf::NDI_UNIQUE | cf::NDI_RED);
2733 2992
2734 warn "ERROR in enter_exit: $@"; 2993 error "ERROR in enter_exit: $@";
2735 $self->leave_link; 2994 $self->leave_link;
2736 } 2995 }
2737 })->prio (1); 2996 })->prio (1);
2738} 2997}
2739 2998
2751sub cf::client::send_drawinfo { 3010sub cf::client::send_drawinfo {
2752 my ($self, $text, $flags) = @_; 3011 my ($self, $text, $flags) = @_;
2753 3012
2754 utf8::encode $text; 3013 utf8::encode $text;
2755 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3014 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3015}
3016
3017=item $client->send_big_packet ($pkt)
3018
3019Like C<send_packet>, but tries to compress large packets, and fragments
3020them as required.
3021
3022=cut
3023
3024our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3025
3026sub cf::client::send_big_packet {
3027 my ($self, $pkt) = @_;
3028
3029 # try lzf for large packets
3030 $pkt = "lzf " . Compress::LZF::compress $pkt
3031 if 1024 <= length $pkt and $self->{can_lzf};
3032
3033 # split very large packets
3034 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3035 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3036 $pkt = "frag";
3037 }
3038
3039 $self->send_packet ($pkt);
2756} 3040}
2757 3041
2758=item $client->send_msg ($channel, $msg, $color, [extra...]) 3042=item $client->send_msg ($channel, $msg, $color, [extra...])
2759 3043
2760Send a drawinfo or msg packet to the client, formatting the msg for the 3044Send a drawinfo or msg packet to the client, formatting the msg for the
2764 3048
2765=cut 3049=cut
2766 3050
2767# non-persistent channels (usually the info channel) 3051# non-persistent channels (usually the info channel)
2768our %CHANNEL = ( 3052our %CHANNEL = (
3053 "c/motd" => {
3054 id => "infobox",
3055 title => "MOTD",
3056 reply => undef,
3057 tooltip => "The message of the day",
3058 },
2769 "c/identify" => { 3059 "c/identify" => {
2770 id => "infobox", 3060 id => "infobox",
2771 title => "Identify", 3061 title => "Identify",
2772 reply => undef, 3062 reply => undef,
2773 tooltip => "Items recently identified", 3063 tooltip => "Items recently identified",
2775 "c/examine" => { 3065 "c/examine" => {
2776 id => "infobox", 3066 id => "infobox",
2777 title => "Examine", 3067 title => "Examine",
2778 reply => undef, 3068 reply => undef,
2779 tooltip => "Signs and other items you examined", 3069 tooltip => "Signs and other items you examined",
3070 },
3071 "c/shopinfo" => {
3072 id => "infobox",
3073 title => "Shop Info",
3074 reply => undef,
3075 tooltip => "What your bargaining skill tells you about the shop",
2780 }, 3076 },
2781 "c/book" => { 3077 "c/book" => {
2782 id => "infobox", 3078 id => "infobox",
2783 title => "Book", 3079 title => "Book",
2784 reply => undef, 3080 reply => undef,
2900 my $pkt = "msg " 3196 my $pkt = "msg "
2901 . $self->{json_coder}->encode ( 3197 . $self->{json_coder}->encode (
2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3198 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903 ); 3199 );
2904 3200
2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2908
2909 # split very large packets
2910 if (8192 < length $pkt and $self->{can_lzf}) {
2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912 $pkt = "frag";
2913 }
2914
2915 $self->send_packet ($pkt); 3201 $self->send_big_packet ($pkt);
2916} 3202}
2917 3203
2918=item $client->ext_msg ($type, @msg) 3204=item $client->ext_msg ($type, @msg)
2919 3205
2920Sends an ext event to the client. 3206Sends an ext event to the client.
2923 3209
2924sub cf::client::ext_msg($$@) { 3210sub cf::client::ext_msg($$@) {
2925 my ($self, $type, @msg) = @_; 3211 my ($self, $type, @msg) = @_;
2926 3212
2927 if ($self->extcmd == 2) { 3213 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3214 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929 } elsif ($self->extcmd == 1) { # TODO: remove 3215 } elsif ($self->extcmd == 1) { # TODO: remove
2930 push @msg, msgtype => "event_$type"; 3216 push @msg, msgtype => "event_$type";
2931 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3217 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932 } 3218 }
2933} 3219}
2934 3220
2935=item $client->ext_reply ($msgid, @msg) 3221=item $client->ext_reply ($msgid, @msg)
2936 3222
2939=cut 3225=cut
2940 3226
2941sub cf::client::ext_reply($$@) { 3227sub cf::client::ext_reply($$@) {
2942 my ($self, $id, @msg) = @_; 3228 my ($self, $id, @msg) = @_;
2943 3229
2944 if ($self->extcmd == 2) { 3230 return unless $self->extcmd == 2;
3231
2945 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3232 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946 } elsif ($self->extcmd == 1) {
2947 #TODO: version 1, remove
2948 unshift @msg, msgtype => "reply", msgid => $id;
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951} 3233}
2952 3234
2953=item $success = $client->query ($flags, "text", \&cb) 3235=item $success = $client->query ($flags, "text", \&cb)
2954 3236
2955Queues a query to the client, calling the given callback with 3237Queues a query to the client, calling the given callback with
3010 my ($ns, $buf) = @_; 3292 my ($ns, $buf) = @_;
3011 3293
3012 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3294 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013 3295
3014 if (ref $msg) { 3296 if (ref $msg) {
3015 my ($type, $reply, @payload) = 3297 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016 "ARRAY" eq ref $msg
3017 ? @$msg
3018 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019 3298
3020 my @reply; 3299 my @reply;
3021 3300
3022 if (my $cb = $EXTICMD{$type}) { 3301 if (my $cb = $EXTICMD{$type}) {
3023 @reply = $cb->($ns, @payload); 3302 @reply = $cb->($ns, @payload);
3025 3304
3026 $ns->ext_reply ($reply, @reply) 3305 $ns->ext_reply ($reply, @reply)
3027 if $reply; 3306 if $reply;
3028 3307
3029 } else { 3308 } else {
3030 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3309 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031 } 3310 }
3032 3311
3033 cf::override; 3312 cf::override;
3034 }, 3313 },
3035); 3314);
3055 3334
3056 $coro 3335 $coro
3057} 3336}
3058 3337
3059cf::client->attach ( 3338cf::client->attach (
3060 on_destroy => sub { 3339 on_client_destroy => sub {
3061 my ($ns) = @_; 3340 my ($ns) = @_;
3062 3341
3063 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3342 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064 }, 3343 },
3065); 3344);
3081our $safe_hole = new Safe::Hole; 3360our $safe_hole = new Safe::Hole;
3082 3361
3083$SIG{FPE} = 'IGNORE'; 3362$SIG{FPE} = 'IGNORE';
3084 3363
3085$safe->permit_only (Opcode::opset qw( 3364$safe->permit_only (Opcode::opset qw(
3086 :base_core :base_mem :base_orig :base_math 3365 :base_core :base_mem :base_orig :base_math :base_loop
3087 grepstart grepwhile mapstart mapwhile 3366 grepstart grepwhile mapstart mapwhile
3088 sort time 3367 sort time
3089)); 3368));
3090 3369
3091# here we export the classes and methods available to script code 3370# here we export the classes and methods available to script code
3116 decrease split destroy change_exp value msg lore send_msg)], 3395 decrease split destroy change_exp value msg lore send_msg)],
3117 ["cf::object::player" => qw(player)], 3396 ["cf::object::player" => qw(player)],
3118 ["cf::player" => qw(peaceful send_msg)], 3397 ["cf::player" => qw(peaceful send_msg)],
3119 ["cf::map" => qw(trigger)], 3398 ["cf::map" => qw(trigger)],
3120) { 3399) {
3121 no strict 'refs';
3122 my ($pkg, @funs) = @$_; 3400 my ($pkg, @funs) = @$_;
3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3401 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124 for @funs; 3402 for @funs;
3125} 3403}
3126 3404
3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3421 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3144 $qcode =~ s/\n/\\n/g; 3422 $qcode =~ s/\n/\\n/g;
3145 3423
3146 %vars = (_dummy => 0) unless %vars; 3424 %vars = (_dummy => 0) unless %vars;
3147 3425
3426 my @res;
3148 local $_; 3427 local $_;
3149 local @safe::cf::_safe_eval_args = values %vars;
3150 3428
3151 my $eval = 3429 my $eval =
3152 "do {\n" 3430 "do {\n"
3153 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3431 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154 . "#line 0 \"{$qcode}\"\n" 3432 . "#line 0 \"{$qcode}\"\n"
3155 . $code 3433 . $code
3156 . "\n}" 3434 . "\n}"
3157 ; 3435 ;
3158 3436
3437 if ($CFG{safe_eval}) {
3159 sub_generation_inc; 3438 sub_generation_inc;
3439 local @safe::cf::_safe_eval_args = values %vars;
3160 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3440 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161 sub_generation_inc; 3441 sub_generation_inc;
3442 } else {
3443 local @cf::_safe_eval_args = values %vars;
3444 @res = wantarray ? eval eval : scalar eval $eval;
3445 }
3162 3446
3163 if ($@) { 3447 if ($@) {
3164 warn "$@"; 3448 warn "$@",
3165 warn "while executing safe code '$code'\n"; 3449 "while executing safe code '$code'\n",
3166 warn "with arguments " . (join " ", %vars) . "\n"; 3450 "with arguments " . (join " ", %vars) . "\n";
3167 } 3451 }
3168 3452
3169 wantarray ? @res : $res[0] 3453 wantarray ? @res : $res[0]
3170} 3454}
3171 3455
3185=cut 3469=cut
3186 3470
3187sub register_script_function { 3471sub register_script_function {
3188 my ($fun, $cb) = @_; 3472 my ($fun, $cb) = @_;
3189 3473
3190 no strict 'refs'; 3474 $fun = "safe::$fun" if $CFG{safe_eval};
3191 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3475 *$fun = $safe_hole->wrap ($cb);
3192} 3476}
3193 3477
3194=back 3478=back
3195 3479
3196=cut 3480=cut
3205 # for this (global event?) 3489 # for this (global event?)
3206 %ext::player_env::MUSIC_FACE_CACHE = (); 3490 %ext::player_env::MUSIC_FACE_CACHE = ();
3207 3491
3208 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3492 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209 3493
3210 warn "loading facedata from $path\n"; 3494 trace "loading facedata from $path\n";
3211 3495
3212 my $facedata; 3496 my $facedata = decode_storable load_file $path;
3213 0 < aio_load $path, $facedata
3214 or die "$path: $!";
3215
3216 $facedata = Coro::Storable::thaw $facedata;
3217 3497
3218 $facedata->{version} == 2 3498 $facedata->{version} == 2
3219 or cf::cleanup "$path: version mismatch, cannot proceed."; 3499 or cf::cleanup "$path: version mismatch, cannot proceed.";
3220 3500
3221 # patch in the exptable 3501 # patch in the exptable
3502 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222 $facedata->{resource}{"res/exp_table"} = { 3503 $facedata->{resource}{"res/exp_table"} = {
3223 type => FT_RSRC, 3504 type => FT_RSRC,
3224 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3505 data => $exp_table,
3506 hash => (Digest::MD5::md5 $exp_table),
3225 }; 3507 };
3226 cf::cede_to_tick; 3508 cf::cede_to_tick;
3227 3509
3228 { 3510 {
3229 my $faces = $facedata->{faceinfo}; 3511 my $faces = $facedata->{faceinfo};
3231 while (my ($face, $info) = each %$faces) { 3513 while (my ($face, $info) = each %$faces) {
3232 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3514 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233 3515
3234 cf::face::set_visibility $idx, $info->{visibility}; 3516 cf::face::set_visibility $idx, $info->{visibility};
3235 cf::face::set_magicmap $idx, $info->{magicmap}; 3517 cf::face::set_magicmap $idx, $info->{magicmap};
3236 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3518 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3519 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3520 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238 3521
3239 cf::cede_to_tick; 3522 cf::cede_to_tick;
3240 } 3523 }
3241 3524
3242 while (my ($face, $info) = each %$faces) { 3525 while (my ($face, $info) = each %$faces) {
3247 3530
3248 if (my $smooth = cf::face::find $info->{smooth}) { 3531 if (my $smooth = cf::face::find $info->{smooth}) {
3249 cf::face::set_smooth $idx, $smooth; 3532 cf::face::set_smooth $idx, $smooth;
3250 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3533 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251 } else { 3534 } else {
3252 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3535 error "smooth face '$info->{smooth}' not found for face '$face'";
3253 } 3536 }
3254 3537
3255 cf::cede_to_tick; 3538 cf::cede_to_tick;
3256 } 3539 }
3257 } 3540 }
3266 3549
3267 cf::anim::invalidate_all; # d'oh 3550 cf::anim::invalidate_all; # d'oh
3268 } 3551 }
3269 3552
3270 { 3553 {
3271 # TODO: for gcfclient pleasure, we should give resources
3272 # that gcfclient doesn't grok a >10000 face index.
3273 my $res = $facedata->{resource}; 3554 my $res = $facedata->{resource};
3274 3555
3275 while (my ($name, $info) = each %$res) { 3556 while (my ($name, $info) = each %$res) {
3276 if (defined $info->{type}) { 3557 if (defined (my $type = $info->{type})) {
3558 # TODO: different hash - must free and use new index, or cache ixface data queue
3277 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3559 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278 my $data;
3279 3560
3280 if ($info->{type} & 1) { 3561 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281 # prepend meta info
3282
3283 my $meta = $enc->encode ({
3284 name => $name,
3285 %{ $info->{meta} || {} },
3286 });
3287
3288 $data = pack "(w/a*)*", $meta, $info->{data};
3289 } else {
3290 $data = $info->{data};
3291 }
3292
3293 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294 cf::face::set_type $idx, $info->{type}; 3562 cf::face::set_type $idx, $type;
3563 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3295 } else { 3564 } else {
3296 $RESOURCE{$name} = $info; 3565# $RESOURCE{$name} = $info; # unused
3297 } 3566 }
3298 3567
3299 cf::cede_to_tick; 3568 cf::cede_to_tick;
3300 } 3569 }
3301 } 3570 }
3302 3571
3303 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3572 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304 3573
3305 1 3574 1
3306} 3575}
3307
3308cf::global->attach (on_resource_update => sub {
3309 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313 my $sound = $soundconf->{compat}[$_]
3314 or next;
3315
3316 my $face = cf::face::find "sound/$sound->[1]";
3317 cf::sound::set $sound->[0] => $face;
3318 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319 }
3320
3321 while (my ($k, $v) = each %{$soundconf->{event}}) {
3322 my $face = cf::face::find "sound/$v";
3323 cf::sound::set $k => $face;
3324 }
3325 }
3326});
3327 3576
3328register_exticmd fx_want => sub { 3577register_exticmd fx_want => sub {
3329 my ($ns, $want) = @_; 3578 my ($ns, $want) = @_;
3330 3579
3331 while (my ($k, $v) = each %$want) { 3580 while (my ($k, $v) = each %$want) {
3370sub reload_treasures { 3619sub reload_treasures {
3371 load_resource_file "$DATADIR/treasures" 3620 load_resource_file "$DATADIR/treasures"
3372 or die "unable to load treasurelists\n"; 3621 or die "unable to load treasurelists\n";
3373} 3622}
3374 3623
3624sub reload_sound {
3625 trace "loading sound config from $DATADIR/sound\n";
3626
3627 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3628
3629 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3630 my $sound = $soundconf->{compat}[$_]
3631 or next;
3632
3633 my $face = cf::face::find "sound/$sound->[1]";
3634 cf::sound::set $sound->[0] => $face;
3635 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3636 }
3637
3638 while (my ($k, $v) = each %{$soundconf->{event}}) {
3639 my $face = cf::face::find "sound/$v";
3640 cf::sound::set $k => $face;
3641 }
3642}
3643
3375sub reload_resources { 3644sub reload_resources {
3376 warn "reloading resource files...\n"; 3645 trace "reloading resource files...\n";
3377 3646
3647 reload_exp_table;
3648 reload_materials;
3378 reload_facedata; 3649 reload_facedata;
3650 reload_sound;
3379 reload_archetypes; 3651 reload_archetypes;
3380 reload_regions; 3652 reload_regions;
3381 reload_treasures; 3653 reload_treasures;
3382 3654
3383 warn "finished reloading resource files\n"; 3655 trace "finished reloading resource files\n";
3384} 3656}
3385 3657
3386sub reload_config { 3658sub reload_config {
3387 open my $fh, "<:utf8", "$CONFDIR/config" 3659 trace "reloading config file...\n";
3388 or return;
3389 3660
3390 local $/; 3661 my $config = load_file "$CONFDIR/config";
3391 *CFG = YAML::Load <$fh>; 3662 utf8::decode $config;
3663 *CFG = decode_yaml $config;
3392 3664
3393 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3665 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394 3666
3395 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3667 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3668 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397 3669
3398 if (exists $CFG{mlockall}) { 3670 if (exists $CFG{mlockall}) {
3422 seek $fh, 0, 0; 3694 seek $fh, 0, 0;
3423 print $fh $$; 3695 print $fh $$;
3424} 3696}
3425 3697
3426sub main_loop { 3698sub main_loop {
3427 warn "EV::loop starting\n"; 3699 trace "EV::loop starting\n";
3428 if (1) { 3700 if (1) {
3429 EV::loop; 3701 EV::loop;
3430 } 3702 }
3431 warn "EV::loop returned\n"; 3703 trace "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP; 3704 goto &main_loop unless $REALLY_UNLOOP;
3433} 3705}
3434 3706
3435sub main { 3707sub main {
3436 cf::init_globals; # initialise logging 3708 cf::init_globals; # initialise logging
3437 3709
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3710 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3711 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3712 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3713 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447 3714
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3715 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449 3716
3450 # we must not ever block the main coroutine 3717 # we must not ever block the main coroutine
3451 local $Coro::idle = sub { 3718 local $Coro::idle = sub {
3457 }; 3724 };
3458 3725
3459 evthread_start IO::AIO::poll_fileno; 3726 evthread_start IO::AIO::poll_fileno;
3460 3727
3461 cf::sync_job { 3728 cf::sync_job {
3729 cf::incloader::init ();
3730
3731 cf::init_anim;
3732 cf::init_attackmess;
3733 cf::init_dynamic;
3734
3735 cf::load_settings;
3736
3462 reload_resources; 3737 reload_resources;
3463 reload_config; 3738 reload_config;
3464 db_init; 3739 db_init;
3465 3740
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid; 3741 cf::init_uuid;
3469 cf::init_signals; 3742 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills; 3743 cf::init_skills;
3472 3744
3473 cf::init_beforeplay; 3745 cf::init_beforeplay;
3474 3746
3475 atomic; 3747 atomic;
3480 3752
3481 # no (long-running) fork's whatsoever before this point(!) 3753 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX (); 3754 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3755 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484 3756
3485 (pop @POST_INIT)->(0) while @POST_INIT; 3757 cf::_post_init 0;
3486 }; 3758 };
3487 3759
3760 cf::object::thawer::errors_are_fatal 0;
3761 info "parse errors in files are no longer fatal from this point on.\n";
3762
3763 AE::postpone {
3764 undef &main; # free gobs of memory :)
3765 };
3766
3488 main_loop; 3767 goto &main_loop;
3489} 3768}
3490 3769
3491############################################################################# 3770#############################################################################
3492# initialisation and cleanup 3771# initialisation and cleanup
3493 3772
3494# install some emergency cleanup handlers 3773# install some emergency cleanup handlers
3495BEGIN { 3774BEGIN {
3496 our %SIGWATCHER = (); 3775 our %SIGWATCHER = ();
3497 for my $signal (qw(INT HUP TERM)) { 3776 for my $signal (qw(INT HUP TERM)) {
3498 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3777 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3499 cf::cleanup "SIG$signal"; 3778 cf::cleanup "SIG$signal";
3500 }; 3779 };
3501 } 3780 }
3502} 3781}
3503 3782
3504sub write_runtime_sync { 3783sub write_runtime_sync {
3784 my $t0 = AE::time;
3785
3505 # first touch the runtime file to show we are still running: 3786 # first touch the runtime file to show we are still running:
3506 # the fsync below can take a very very long time. 3787 # the fsync below can take a very very long time.
3507 3788
3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3789 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509 3790
3510 my $guard = cf::lock_acquire "write_runtime"; 3791 my $guard = cf::lock_acquire "write_runtime";
3511 3792
3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3793 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513 or return; 3794 or return;
3514 3795
3515 my $value = $cf::RUNTIME + 90 + 10; 3796 my $value = $cf::RUNTIME + 90 + 10;
3516 # 10 is the runtime save interval, for a monotonic clock 3797 # 10 is the runtime save interval, for a monotonic clock
3517 # 60 allows for the watchdog to kill the server. 3798 # 60 allows for the watchdog to kill the server.
3530 or return; 3811 or return;
3531 3812
3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3813 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533 and return; 3814 and return;
3534 3815
3535 warn "runtime file written.\n"; 3816 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536 3817
3537 1 3818 1
3538} 3819}
3539 3820
3540our $uuid_lock; 3821our $uuid_lock;
3552 or return; 3833 or return;
3553 3834
3554 my $value = uuid_seq uuid_cur; 3835 my $value = uuid_seq uuid_cur;
3555 3836
3556 unless ($value) { 3837 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n"; 3838 info "cowardly refusing to write zero uuid value!\n";
3558 return; 3839 return;
3559 } 3840 }
3560 3841
3561 my $value = uuid_str $value + $uuid_skip; 3842 my $value = uuid_str $value + $uuid_skip;
3562 $uuid_skip = 0; 3843 $uuid_skip = 0;
3572 or return; 3853 or return;
3573 3854
3574 aio_rename "$uuid~", $uuid 3855 aio_rename "$uuid~", $uuid
3575 and return; 3856 and return;
3576 3857
3577 warn "uuid file written ($value).\n"; 3858 trace "uuid file written ($value).\n";
3578 3859
3579 1 3860 1
3580 3861
3581} 3862}
3582 3863
3588} 3869}
3589 3870
3590sub emergency_save() { 3871sub emergency_save() {
3591 my $freeze_guard = cf::freeze_mainloop; 3872 my $freeze_guard = cf::freeze_mainloop;
3592 3873
3593 warn "emergency_perl_save: enter\n"; 3874 info "emergency_perl_save: enter\n";
3875
3876 # this is a trade-off: we want to be very quick here, so
3877 # save all maps without fsync, and later call a global sync
3878 # (which in turn might be very very slow)
3879 local $USE_FSYNC = 0;
3594 3880
3595 cf::sync_job { 3881 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so 3882 cf::write_runtime_sync; # external watchdog should not bark
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600 3883
3601 # use a peculiar iteration method to avoid tripping on perl 3884 # use a peculiar iteration method to avoid tripping on perl
3602 # refcount bugs in for. also avoids problems with players 3885 # refcount bugs in for. also avoids problems with players
3603 # and maps saved/destroyed asynchronously. 3886 # and maps saved/destroyed asynchronously.
3604 warn "emergency_perl_save: begin player save\n"; 3887 info "emergency_perl_save: begin player save\n";
3605 for my $login (keys %cf::PLAYER) { 3888 for my $login (keys %cf::PLAYER) {
3606 my $pl = $cf::PLAYER{$login} or next; 3889 my $pl = $cf::PLAYER{$login} or next;
3607 $pl->valid or next; 3890 $pl->valid or next;
3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3891 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609 $pl->save; 3892 $pl->save;
3610 } 3893 }
3611 warn "emergency_perl_save: end player save\n"; 3894 info "emergency_perl_save: end player save\n";
3612 3895
3896 cf::write_runtime_sync; # external watchdog should not bark
3897
3613 warn "emergency_perl_save: begin map save\n"; 3898 info "emergency_perl_save: begin map save\n";
3614 for my $path (keys %cf::MAP) { 3899 for my $path (keys %cf::MAP) {
3615 my $map = $cf::MAP{$path} or next; 3900 my $map = $cf::MAP{$path} or next;
3616 $map->valid or next; 3901 $map->valid or next;
3617 $map->save; 3902 $map->save;
3618 } 3903 }
3619 warn "emergency_perl_save: end map save\n"; 3904 info "emergency_perl_save: end map save\n";
3620 3905
3906 cf::write_runtime_sync; # external watchdog should not bark
3907
3621 warn "emergency_perl_save: begin database checkpoint\n"; 3908 info "emergency_perl_save: begin database checkpoint\n";
3622 BDB::db_env_txn_checkpoint $DB_ENV; 3909 BDB::db_env_txn_checkpoint $DB_ENV;
3623 warn "emergency_perl_save: end database checkpoint\n"; 3910 info "emergency_perl_save: end database checkpoint\n";
3624 3911
3625 warn "emergency_perl_save: begin write uuid\n"; 3912 info "emergency_perl_save: begin write uuid\n";
3626 write_uuid_sync 1; 3913 write_uuid_sync 1;
3627 warn "emergency_perl_save: end write uuid\n"; 3914 info "emergency_perl_save: end write uuid\n";
3915
3916 cf::write_runtime_sync; # external watchdog should not bark
3917
3918 trace "emergency_perl_save: syncing database to disk";
3919 BDB::db_env_txn_checkpoint $DB_ENV;
3920
3921 info "emergency_perl_save: starting sync\n";
3922 IO::AIO::aio_sync sub {
3923 info "emergency_perl_save: finished sync\n";
3924 };
3925
3926 cf::write_runtime_sync; # external watchdog should not bark
3927
3928 trace "emergency_perl_save: flushing outstanding aio requests";
3929 while (IO::AIO::nreqs || BDB::nreqs) {
3930 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3931 }
3932
3933 cf::write_runtime_sync; # external watchdog should not bark
3628 }; 3934 };
3629 3935
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3635 warn "emergency_perl_save: leave\n"; 3936 info "emergency_perl_save: leave\n";
3636} 3937}
3637 3938
3638sub post_cleanup { 3939sub post_cleanup {
3639 my ($make_core) = @_; 3940 my ($make_core) = @_;
3640 3941
3942 IO::AIO::flush;
3943
3641 warn Carp::longmess "post_cleanup backtrace" 3944 error Carp::longmess "post_cleanup backtrace"
3642 if $make_core; 3945 if $make_core;
3643 3946
3644 my $fh = pidfile; 3947 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$; 3948 unlink $PIDFILE if <$fh> == $$;
3646} 3949}
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3969 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) { 3970 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"}; 3971 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3972# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 } 3973 }
3671 warn "cleared package $pkg\n";#d#
3672} 3974}
3673 3975
3674sub do_reload_perl() { 3976sub do_reload_perl() {
3675 # can/must only be called in main 3977 # can/must only be called in main
3676 if ($Coro::current != $Coro::main) { 3978 unless (in_main) {
3677 warn "can only reload from main coroutine"; 3979 error "can only reload from main coroutine";
3678 return; 3980 return;
3679 } 3981 }
3680 3982
3681 return if $RELOAD++; 3983 return if $RELOAD++;
3682 3984
3683 my $t1 = EV::time; 3985 my $t1 = AE::time;
3684 3986
3685 while ($RELOAD) { 3987 while ($RELOAD) {
3686 warn "reloading..."; 3988 cf::get_slot 0.1, -1, "reload_perl";
3989 info "perl_reload: reloading...";
3687 3990
3688 warn "entering sync_job"; 3991 trace "perl_reload: entering sync_job";
3689 3992
3690 cf::sync_job { 3993 cf::sync_job {
3691 cf::write_runtime_sync; # external watchdog should not bark
3692 cf::emergency_save; 3994 #cf::emergency_save;
3693 cf::write_runtime_sync; # external watchdog should not bark
3694 3995
3695 warn "syncing database to disk";
3696 BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698 # if anything goes wrong in here, we should simply crash as we already saved
3699
3700 warn "flushing outstanding aio requests";
3701 while (IO::AIO::nreqs || BDB::nreqs) {
3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703 }
3704
3705 warn "cancelling all extension coros"; 3996 trace "perl_reload: cancelling all extension coros";
3706 $_->cancel for values %EXT_CORO; 3997 $_->cancel for values %EXT_CORO;
3707 %EXT_CORO = (); 3998 %EXT_CORO = ();
3708 3999
3709 warn "removing commands"; 4000 trace "perl_reload: removing commands";
3710 %COMMAND = (); 4001 %COMMAND = ();
3711 4002
3712 warn "removing ext/exti commands"; 4003 trace "perl_reload: removing ext/exti commands";
3713 %EXTCMD = (); 4004 %EXTCMD = ();
3714 %EXTICMD = (); 4005 %EXTICMD = ();
3715 4006
3716 warn "unloading/nuking all extensions"; 4007 trace "perl_reload: unloading/nuking all extensions";
3717 for my $pkg (@EXTS) { 4008 for my $pkg (@EXTS) {
3718 warn "... unloading $pkg"; 4009 trace "... unloading $pkg";
3719 4010
3720 if (my $cb = $pkg->can ("unload")) { 4011 if (my $cb = $pkg->can ("unload")) {
3721 eval { 4012 eval {
3722 $cb->($pkg); 4013 $cb->($pkg);
3723 1 4014 1
3724 } or warn "$pkg unloaded, but with errors: $@"; 4015 } or error "$pkg unloaded, but with errors: $@";
3725 } 4016 }
3726 4017
3727 warn "... clearing $pkg"; 4018 trace "... clearing $pkg";
3728 clear_package $pkg; 4019 clear_package $pkg;
3729 } 4020 }
3730 4021
3731 warn "unloading all perl modules loaded from $LIBDIR"; 4022 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) { 4023 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4024 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734 4025
3735 warn "... unloading $k"; 4026 trace "... unloading $k";
3736 delete $INC{$k}; 4027 delete $INC{$k};
3737 4028
3738 $k =~ s/\.pm$//; 4029 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g; 4030 $k =~ s/\//::/g;
3740 4031
3743 } 4034 }
3744 4035
3745 clear_package $k; 4036 clear_package $k;
3746 } 4037 }
3747 4038
3748 warn "getting rid of safe::, as good as possible"; 4039 trace "perl_reload: getting rid of safe::, as good as possible";
3749 clear_package "safe::$_" 4040 clear_package "safe::$_"
3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4041 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751 4042
3752 warn "unloading cf.pm \"a bit\""; 4043 trace "perl_reload: unloading cf.pm \"a bit\"";
3753 delete $INC{"cf.pm"}; 4044 delete $INC{"cf.pm"};
3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4045 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755 4046
3756 # don't, removes xs symbols, too, 4047 # don't, removes xs symbols, too,
3757 # and global variables created in xs 4048 # and global variables created in xs
3758 #clear_package __PACKAGE__; 4049 #clear_package __PACKAGE__;
3759 4050
3760 warn "unload completed, starting to reload now"; 4051 info "perl_reload: unload completed, starting to reload now";
3761 4052
3762 warn "reloading cf.pm"; 4053 trace "perl_reload: reloading cf.pm";
3763 require cf; 4054 require cf;
3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4055 cf::_connect_to_perl_1;
3765 4056
3766 warn "loading config and database again"; 4057 trace "perl_reload: loading config and database again";
3767 cf::reload_config; 4058 cf::reload_config;
3768 4059
3769 warn "loading extensions"; 4060 trace "perl_reload: loading extensions";
3770 cf::load_extensions; 4061 cf::load_extensions;
3771 4062
3772 if ($REATTACH_ON_RELOAD) { 4063 if ($REATTACH_ON_RELOAD) {
3773 warn "reattaching attachments to objects/players"; 4064 trace "perl_reload: reattaching attachments to objects/players";
3774 _global_reattach; # objects, sockets 4065 _global_reattach; # objects, sockets
3775 warn "reattaching attachments to maps"; 4066 trace "perl_reload: reattaching attachments to maps";
3776 reattach $_ for values %MAP; 4067 reattach $_ for values %MAP;
3777 warn "reattaching attachments to players"; 4068 trace "perl_reload: reattaching attachments to players";
3778 reattach $_ for values %PLAYER; 4069 reattach $_ for values %PLAYER;
3779 } 4070 }
3780 4071
3781 warn "running post_init jobs"; 4072 cf::_post_init 1;
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783 4073
3784 warn "leaving sync_job"; 4074 trace "perl_reload: leaving sync_job";
3785 4075
3786 1 4076 1
3787 } or do { 4077 } or do {
3788 warn $@; 4078 error $@;
3789 cf::cleanup "error while reloading, exiting."; 4079 cf::cleanup "perl_reload: error, exiting.";
3790 }; 4080 };
3791 4081
3792 warn "reloaded";
3793 --$RELOAD; 4082 --$RELOAD;
3794 } 4083 }
3795 4084
3796 $t1 = EV::time - $t1; 4085 $t1 = AE::time - $t1;
3797 warn "reload completed in ${t1}s\n"; 4086 info "perl_reload: completed in ${t1}s\n";
3798}; 4087};
3799 4088
3800our $RELOAD_WATCHER; # used only during reload 4089our $RELOAD_WATCHER; # used only during reload
3801 4090
3802sub reload_perl() { 4091sub reload_perl() {
3804 # coro crashes during coro_state_free->destroy here. 4093 # coro crashes during coro_state_free->destroy here.
3805 4094
3806 $RELOAD_WATCHER ||= cf::async { 4095 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions; 4096 Coro::AIO::aio_wait cache_extensions;
3808 4097
3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4098 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810 do_reload_perl; 4099 do_reload_perl;
3811 undef $RELOAD_WATCHER; 4100 undef $RELOAD_WATCHER;
3812 }; 4101 };
3813 }; 4102 };
3814} 4103}
3823 reload_perl; 4112 reload_perl;
3824 }; 4113 };
3825 } 4114 }
3826}; 4115};
3827 4116
3828unshift @INC, $LIBDIR; 4117#############################################################################
3829 4118
3830my $bug_warning = 0; 4119my $bug_warning = 0;
3831 4120
3832our @WAIT_FOR_TICK;
3833our @WAIT_FOR_TICK_BEGIN;
3834
3835sub wait_for_tick { 4121sub wait_for_tick() {
3836 return if tick_inhibit || $Coro::current == $Coro::main; 4122 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837 4123
3838 my $signal = new Coro::Signal; 4124 $WAIT_FOR_TICK->wait;
3839 push @WAIT_FOR_TICK, $signal;
3840 $signal->wait;
3841} 4125}
3842 4126
3843sub wait_for_tick_begin { 4127sub wait_for_tick_begin() {
3844 return if tick_inhibit || $Coro::current == $Coro::main; 4128 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845 4129
3846 my $signal = new Coro::Signal; 4130 my $signal = new Coro::Signal;
3847 push @WAIT_FOR_TICK_BEGIN, $signal; 4131 push @WAIT_FOR_TICK_BEGIN, $signal;
3848 $signal->wait; 4132 $signal->wait;
3849} 4133}
3853 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4137 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854 unless ++$bug_warning > 10; 4138 unless ++$bug_warning > 10;
3855 return; 4139 return;
3856 } 4140 }
3857 4141
3858 cf::server_tick; # one server iteration 4142 cf::one_tick; # one server iteration
4143
4144 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859 4145
3860 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4146 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4147 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862 Coro::async_pool { 4148 Coro::async_pool {
3863 $Coro::current->{desc} = "runtime saver"; 4149 $Coro::current->{desc} = "runtime saver";
3864 write_runtime_sync 4150 write_runtime_sync
3865 or warn "ERROR: unable to write runtime file: $!"; 4151 or error "ERROR: unable to write runtime file: $!";
3866 }; 4152 };
3867 } 4153 }
3868 4154
3869 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4155 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870 $sig->send; 4156 $sig->send;
3871 } 4157 }
3872 while (my $sig = shift @WAIT_FOR_TICK) { 4158 $WAIT_FOR_TICK->broadcast;
3873 $sig->send;
3874 }
3875 4159
3876 $LOAD = ($NOW - $TICK_START) / $TICK; 4160 $LOAD = ($NOW - $TICK_START) / $TICK;
3877 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4161 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878 4162
3879 if (0) { 4163 if (0) {
3880 if ($NEXT_TICK) { 4164 if ($NEXT_TICK) {
3881 my $jitter = $TICK_START - $NEXT_TICK; 4165 my $jitter = $TICK_START - $NEXT_TICK;
3882 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4166 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883 warn "jitter $JITTER\n";#d# 4167 debug "jitter $JITTER\n";#d#
3884 } 4168 }
3885 } 4169 }
3886} 4170}
3887 4171
3888{ 4172{
3889 # configure BDB 4173 # configure BDB
3890 4174
3891 BDB::min_parallel 8; 4175 BDB::min_parallel 16;
3892 BDB::max_poll_reqs $TICK * 0.1; 4176 BDB::max_poll_reqs $TICK * 0.1;
3893 $AnyEvent::BDB::WATCHER->priority (1); 4177 #$AnyEvent::BDB::WATCHER->priority (1);
3894 4178
3895 unless ($DB_ENV) { 4179 unless ($DB_ENV) {
3896 $DB_ENV = BDB::db_env_create; 4180 $DB_ENV = BDB::db_env_create;
3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4181 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4182 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3933 IO::AIO::min_parallel 8; 4217 IO::AIO::min_parallel 8;
3934 IO::AIO::max_poll_time $TICK * 0.1; 4218 IO::AIO::max_poll_time $TICK * 0.1;
3935 undef $AnyEvent::AIO::WATCHER; 4219 undef $AnyEvent::AIO::WATCHER;
3936} 4220}
3937 4221
3938my $_log_backtrace; 4222our $_log_backtrace;
4223our $_log_backtrace_last;
3939 4224
3940sub _log_backtrace { 4225sub _log_backtrace {
3941 my ($msg, @addr) = @_; 4226 my ($msg, @addr) = @_;
3942 4227
3943 $msg =~ s/\n//; 4228 $msg =~ s/\n$//;
3944 4229
4230 if ($_log_backtrace_last eq $msg) {
4231 LOG llevInfo, "[ABT] $msg\n";
4232 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945 # limit the # of concurrent backtraces 4233 # limit the # of concurrent backtraces
3946 if ($_log_backtrace < 2) { 4234 } elsif ($_log_backtrace < 2) {
4235 $_log_backtrace_last = $msg;
3947 ++$_log_backtrace; 4236 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg; 4237 my $perl_bt = Carp::longmess $msg;
3949 async { 4238 async {
3950 $Coro::current->{desc} = "abt $msg"; 4239 $Coro::current->{desc} = "abt $msg";
3951 4240
3971 LOG llevInfo, "[ABT] $_\n" for @bt; 4260 LOG llevInfo, "[ABT] $_\n" for @bt;
3972 --$_log_backtrace; 4261 --$_log_backtrace;
3973 }; 4262 };
3974 } else { 4263 } else {
3975 LOG llevInfo, "[ABT] $msg\n"; 4264 LOG llevInfo, "[ABT] $msg\n";
3976 LOG llevInfo, "[ABT] [suppressed]\n"; 4265 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977 } 4266 }
3978} 4267}
3979 4268
3980# load additional modules 4269# load additional modules
3981require "cf/$_.pm" for @EXTRA_MODULES; 4270require "cf/$_.pm" for @EXTRA_MODULES;
4271cf::_connect_to_perl_2;
3982 4272
3983END { cf::emergency_save } 4273END { cf::emergency_save }
3984 4274
39851 42751
3986 4276

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines