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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.606 by root, Sun Nov 18 08:34:23 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,2009,2010 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
… …
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 4000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 100000; 121our $OUTPUT_RATE_MAX = 1000000;
122
123our $MAX_LINKS = 32; # how many chained exits to follow
124our $VERBOSE_IO = 1;
115 125
116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 126our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 127our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118our $NEXT_TICK; 128our $NEXT_TICK;
119our $USE_FSYNC = 1; # use fsync to write maps - default on 129our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
121our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
123our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
124our $DB_ENV; 134our $DB_ENV;
125 135
126our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
127 137
128our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129 140
130our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
131our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
132our $NOW; 144our $NOW;
133 145
134our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
135our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
136our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
… …
145 157
146our @POST_INIT; 158our @POST_INIT;
147 159
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
150 165
151binmode STDOUT; 166binmode STDOUT;
152binmode STDERR; 167binmode STDERR;
153 168
154# read virtual server time, if available 169# read virtual server time, if available
… …
188 203
189=over 4 204=over 4
190 205
191=item $cf::UPTIME 206=item $cf::UPTIME
192 207
193The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
194 224
195=item $cf::RUNTIME 225=item $cf::RUNTIME
196 226
197The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
198every server tick. 228every server tick.
199 229
200=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203 233
204Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
205directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
207database environment. 237database environment.
208 238
209=item $cf::NOW
210
211The time of the last (current) server tick.
212
213=item $cf::TICK
214
215The interval between server ticks, in seconds.
216
217=item $cf::LOADAVG 239=item $cf::LOADAVG
218 240
219The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
220(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
221objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
… …
229Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
230from wherever your confdir points to. 252from wherever your confdir points to.
231 253
232=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
233 255
234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
235returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
236per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
237 277
238=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
239 279
240This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
249 289
250=back 290=back
251 291
252=cut 292=cut
253 293
294sub error(@) { LOG llevError, join "", @_ }
295sub warn (@) { LOG llevWarn , join "", @_ }
296sub info (@) { LOG llevInfo , join "", @_ }
297sub debug(@) { LOG llevDebug, join "", @_ }
298sub trace(@) { LOG llevTrace, join "", @_ }
299
254$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
255 my $msg = join "", @_; 301 my $msg = join "", @_;
256 302
257 $msg .= "\n" 303 $msg .= "\n"
258 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
259 305
260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 306 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
261 307
262 LOG llevError, $msg; 308 LOG llevWarn, $msg;
263}; 309};
264 310
265$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
267 313
268 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
269 315
270 if (in_main) {#d# 316 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d# 318 return;#d#
273 }#d# 319 }#d#
274 320
275 # kill coroutine otherwise 321 # kill coroutine otherwise
276 Coro::terminate 322 Coro::terminate
… …
296)) { 342)) {
297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298} 344}
299 345
300$EV::DIED = sub { 346$EV::DIED = sub {
301 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
302}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
303 354
304############################################################################# 355#############################################################################
305 356
306=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
307 358
… …
328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
329 $d 380 $d
330 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
331} 382}
332 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
333=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
334 437
335Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
336 439
337=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
… …
343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
344 447
345sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
346sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
347 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
348=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
349 483
350Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
352 486
353The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
354is a reload or not. 488is a reload or not.
355 489
356=cut 490=cut
357 491
358sub post_init(&) { 492sub post_init(&) {
359 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
360} 511}
361 512
362=item cf::lock_wait $string 513=item cf::lock_wait $string
363 514
364Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
… …
417 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
418} 569}
419 570
420=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
421 572
422Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
423This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
424of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
425 580
426The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
427used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
428 583
429Useful for short background jobs. 584Useful for short background jobs.
… …
458 } 613 }
459 } 614 }
460 615
461 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
462 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
463 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
464 $signal->wait;
465 } else { 619 } else {
466 $busy = 0; 620 $busy = 0;
467 Coro::schedule; 621 Coro::schedule;
468 } 622 }
469 } 623 }
… …
509=cut 663=cut
510 664
511sub sync_job(&) { 665sub sync_job(&) {
512 my ($job) = @_; 666 my ($job) = @_;
513 667
514 if ($Coro::current == $Coro::main) { 668 if (in_main) {
515 my $time = AE::time; 669 my $time = AE::time;
516 670
517 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
518 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
519 673
520 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
521 675
522 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
523 677
524 my $busy = 1; 678 my $busy = 1;
525 my @res; 679 my @res;
526 680
527 (async { 681 (async {
528 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
529 @res = eval { $job->() }; 683 @res = eval { $job->() };
530 warn $@ if $@; 684 error $@ if $@;
531 undef $busy; 685 undef $busy;
532 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
533 687
534 while ($busy) { 688 while ($busy) {
535 if (Coro::nready) { 689 if (Coro::nready) {
… …
569 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
570 724
571 $coro 725 $coro
572} 726}
573 727
574=item fork_call { }, $args 728=item fork_call { }, @args
575 729
576Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
577process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
578Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
579never block itself or use any form of event handling. 733never block itself or use any form of event handling.
580 734
581=cut 735=cut
582 736
737sub post_fork {
738 reset_signals;
739}
740
583sub fork_call(&@) { 741sub fork_call(&@) {
584 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
585 743
586 # we seemingly have to make a local copy of the whole thing,
587 # otherwise perl prematurely frees the stuff :/
588 # TODO: investigate and fix (likely this will be rather laborious)
589
590 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
591 reset_signals; 745 cf::post_fork;
592 &$cb 746 &$cb
593 }, @args; 747 } @args;
594 748
595 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
596} 750}
597 751
598sub objinfo { 752sub objinfo {
… …
648within each server. 802within each server.
649 803
650=cut 804=cut
651 805
652sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
653 my ($name) = @_; 810 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
655 812
656 eval { 813 eval {
657 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
… …
667} 824}
668 825
669our $DB; 826our $DB;
670 827
671sub db_init { 828sub db_init {
672 cf::sync_job {
673 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
674 };
675} 830}
676 831
677sub db_get($$) { 832sub db_get($$) {
678 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
679 834
680 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
681 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
682 839
683 $! ? () 840 $! ? ()
684 : $data 841 : $data
685 }
686} 842}
687 843
688sub db_put($$$) { 844sub db_put($$$) {
689 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
690 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
718 874
719 my @data; 875 my @data;
720 my $md5; 876 my $md5;
721 877
722 for (0 .. $#$src) { 878 for (0 .. $#$src) {
723 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
724 or Carp::croak "$src->[$_]: $!";
725 } 880 }
726 881
727 # if processing is expensive, check 882 # if processing is expensive, check
728 # checksum first 883 # checksum first
729 if (1) { 884 if (1) {
… …
742 897
743 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
744 } 899 }
745 } 900 }
746 901
747 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
748 my $data = $process->(\@data); 903 my $data = $process->(\@data);
749 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
750 905
751 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752 907
753 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
754 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
755 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
756 911
… …
766 921
767=cut 922=cut
768 923
769sub datalog($@) { 924sub datalog($@) {
770 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
771 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772} 927}
773 928
774=back 929=back
775 930
776=cut 931=cut
… …
971 1126
972 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
973 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974 1129
975 } elsif (ref $type) { 1130 } elsif (ref $type) {
976 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
977 1132
978 } else { 1133 } else {
979 shift @arg; 1134 shift @arg;
980 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
981 } 1136 }
982 } 1137 }
983} 1138}
984 1139
985sub _object_attach { 1140sub _object_attach {
… …
995 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
996 } 1151 }
997 1152
998 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
999 } else { 1154 } else {
1000 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
1001 } 1156 }
1002 1157
1003 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
1004} 1159}
1005 1160
… …
1064 1219
1065 for (@$callbacks) { 1220 for (@$callbacks) {
1066 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1067 1222
1068 if ($@) { 1223 if ($@) {
1069 warn "$@";
1070 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071 override; 1225 override;
1072 } 1226 }
1073 1227
1074 return 1 if $override; 1228 return 1 if $override;
1075 } 1229 }
… …
1154 for (@$attach) { 1308 for (@$attach) {
1155 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1156 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1157 } 1311 }
1158 } else { 1312 } else {
1159 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1160 } 1314 }
1161 } 1315 }
1162} 1316}
1163 1317
1164cf::attachable->attach ( 1318cf::attachable->attach (
… …
1191 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1192 1346
1193 sync_job { 1347 sync_job {
1194 if (length $$rdata) { 1348 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1196 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1197 $decname, length $$rdata, scalar @$objs; 1351 $decname, length $$rdata, scalar @$objs
1352 if $VERBOSE_IO;
1198 1353
1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202 if ($cf::USE_FSYNC) { 1357 if ($cf::USE_FSYNC) {
… …
1224 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1225 1380
1226 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1228 } else { 1383 } else {
1229 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1230 } 1385 }
1231 } else { 1386 } else {
1232 aio_unlink $filename; 1387 aio_unlink $filename;
1233 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1234 } 1389 }
… …
1258 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs}; 1414 $av = $st->{objs};
1260 } 1415 }
1261 1416
1262 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1263 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1264 $decname, length $data, scalar @{$av || []}; 1419 $decname, length $data, scalar @{$av || []}
1420 if $VERBOSE_IO;
1265 1421
1266 ($data, $av) 1422 ($data, $av)
1267} 1423}
1268 1424
1269=head2 COMMAND CALLBACKS 1425=head2 COMMAND CALLBACKS
… …
1273=cut 1429=cut
1274 1430
1275############################################################################# 1431#############################################################################
1276# command handling &c 1432# command handling &c
1277 1433
1278=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1279 1435
1280Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1281$name. 1437$name.
1282 1438
1283=cut 1439=cut
… …
1289 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1290 1446
1291 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1292} 1448}
1293 1449
1294=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1295 1451
1296Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1297extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1298received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1299the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1300has logged in successfully. 1456has logged in successfully.
1301 1457
1302If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1303called.
1304 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1305=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1306 1466
1307Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1308exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1309are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1310is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1311log-in. 1471log-in.
1312 1472
1313If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1314called.
1315 1474
1316=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1317 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1318sub register_extcmd { 1482sub register_extcmd($$) {
1319 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1320 1484
1321 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1322} 1486}
1323 1487
1324sub register_exticmd { 1488sub register_async_extcmd($$) {
1325 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1326 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1327 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1328} 1504}
1329 1505
1330use File::Glob (); 1506use File::Glob ();
1331 1507
1332cf::player->attach ( 1508cf::player->attach (
… …
1346 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1347 1523
1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349 1525
1350 if (ref $msg) { 1526 if (ref $msg) {
1351 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355 1528
1356 my @reply;
1357
1358 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1359 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1360 } 1547 }
1361 1548
1362 $pl->ext_reply ($reply, @reply)
1363 if $reply;
1364
1365 } else { 1549 } else {
1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367 } 1551 }
1368 1552
1369 cf::override; 1553 cf::override;
1370 }, 1554 },
1371); 1555);
… …
1381 }; 1565 };
1382 1566
1383 $grp 1567 $grp
1384} 1568}
1385 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1386sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1387 cf::sync_job { 1586 cf::sync_job {
1388 my %todo; 1587 my %todo;
1389 1588
1390 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1391 next unless -r $path; 1590 next unless -r $path;
… …
1409 1608
1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412 1611
1413 $ext{source} = 1612 $ext{source} =
1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1415 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1416 . $source 1615 . $source
1417 . "\n};\n1"; 1616 . "\n};\n1";
1418 1617
1419 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
… …
1431 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1432 next ext 1631 next ext
1433 unless exists $done{$_}; 1632 unless exists $done{$_};
1434 } 1633 }
1435 1634
1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1438 my $active = eval $v->{source}; 1646 my $active = eval $source;
1439 1647
1440 if (length $@) { 1648 if (length $@) {
1441 warn "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1442 1650
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444 if exists $v->{meta}{mandatory}; 1652 if exists $v->{meta}{mandatory};
1445 1653
1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
… …
1448 } else { 1656 } else {
1449 $done{$k} = delete $todo{$k}; 1657 $done{$k} = delete $todo{$k};
1450 push @EXTS, $v->{pkg}; 1658 push @EXTS, $v->{pkg};
1451 $progress = 1; 1659 $progress = 1;
1452 1660
1453 warn "$v->{base}: extension inactive.\n" 1661 info "$v->{base}: extension inactive.\n"
1454 unless $active; 1662 unless $active;
1455 } 1663 }
1456 } 1664 }
1457 1665
1458 unless ($progress) { 1666 unless ($progress) {
… …
1460 1668
1461 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1464 } 1672 }
1673
1674 last;
1465 } 1675 }
1466 } 1676 }
1467 }; 1677 };
1468} 1678}
1469 1679
… …
1627 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1628 1838
1629 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1631 1841
1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633 $pl->deactivate; 1843 $pl->deactivate;
1844
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1636 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1637 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1638 1850
1639 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1640 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1641 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
… …
1727 1939
1728=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1729 1941
1730Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1731 1943
1732=item $player->ext_reply ($msgid, @msg)
1733
1734Sends an ext reply to the player.
1735
1736=cut
1737
1738sub ext_reply($$@) {
1739 my ($self, $id, @msg) = @_;
1740
1741 $self->ns->ext_reply ($id, @msg)
1742}
1743
1744=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1745 1945
1746Sends an ext event to the client. 1946Sends an ext event to the client.
1747 1947
1748=cut 1948=cut
… …
1807sub generate_random_map { 2007sub generate_random_map {
1808 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1809 2009
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811 2011
1812 # mit "rum" bekleckern, nicht
1813 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817 $rmp->{exit_on_final_map},
1818 $rmp->{xsize}, $rmp->{ysize},
1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824 (cf::region::find $rmp->{region}), $rmp->{custom}
1825 )
1826} 2013}
1827 2014
1828=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1829 2016
1830Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
… …
1835 2022
1836sub register { 2023sub register {
1837 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1838 my $pkg = caller; 2025 my $pkg = caller;
1839 2026
1840 no strict;
1841 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1842 2028
1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844} 2030}
1845 2031
1846# also paths starting with '/' 2032# also paths starting with '/'
1847$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2033$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848 2034
1849sub thawer_merge { 2035sub thawer_merge {
1850 my ($self, $merge) = @_; 2036 my ($self, $merge) = @_;
1851 2037
1852 # we have to keep some variables in memory intact 2038 # we have to keep some variables in memory intact
… …
1857} 2043}
1858 2044
1859sub normalise { 2045sub normalise {
1860 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1861 2047
1862 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1863 2049
1864 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1865 2051
1866 # map plan: 2052 # map plan:
1867 # 2053 #
… …
1882 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1883 $path = "$base/$path"; 2069 $path = "$base/$path";
1884 } 2070 }
1885 2071
1886 for ($path) { 2072 for ($path) {
1887 redo if s{//}{/};
1888 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1889 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1890 } 2075 }
1891 2076
1892 $path 2077 $path
… …
1906 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1907 return $self; 2092 return $self;
1908 } 2093 }
1909 } 2094 }
1910 2095
1911 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1912 () 2097 ()
1913} 2098}
1914 2099
2100# may re-bless or do other evil things
1915sub init { 2101sub init {
1916 my ($self) = @_; 2102 my ($self) = @_;
1917 2103
1918 $self 2104 $self
1919} 2105}
… …
1984 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1985 2171
1986 1 2172 1
1987} 2173}
1988 2174
2175# used to laod the header of an original map
1989sub load_header_orig { 2176sub load_header_orig {
1990 my ($self) = @_; 2177 my ($self) = @_;
1991 2178
1992 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1993} 2180}
1994 2181
2182# used to laod the header of an instantiated map
1995sub load_header_temp { 2183sub load_header_temp {
1996 my ($self) = @_; 2184 my ($self) = @_;
1997 2185
1998 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
1999} 2187}
2000 2188
2189# called after loading the header from an instantiated map
2001sub prepare_temp { 2190sub prepare_temp {
2002 my ($self) = @_; 2191 my ($self) = @_;
2003 2192
2004 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2005 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2006 # safety 2195 # safety
2007 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2008 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2009} 2198}
2010 2199
2200# called after loading the header from an original map
2011sub prepare_orig { 2201sub prepare_orig {
2012 my ($self) = @_; 2202 my ($self) = @_;
2013 2203
2014 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2015 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
… …
2039 2229
2040sub find; 2230sub find;
2041sub find { 2231sub find {
2042 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2043 2233
2234 cf::cede_to_tick;
2235
2044 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2045 2237
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2048 2240
2049 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
… …
2080 2272
2081 { 2273 {
2082 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2083 2275
2084 return unless $self->valid; 2276 return unless $self->valid;
2085 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2086
2087 $self->in_memory (cf::MAP_LOADING);
2088 2278
2089 $self->alloc; 2279 $self->alloc;
2090 2280
2091 $self->pre_load; 2281 $self->pre_load;
2092 cf::cede_to_tick; 2282 cf::cede_to_tick;
2093 2283
2284 if (exists $self->{load_path}) {
2094 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block; 2286 $f->skip_block;
2096 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2097 or return; 2288 or return;
2098 2289
2099 $self->post_load_original 2290 $self->post_load_original
2100 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2101 2292
2102 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2103 utf8::encode $uniq; 2294 utf8::encode $uniq;
2104 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2106 $self->clear_unique_items; 2297 $self->clear_unique_items;
2107 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2109 } 2301 }
2110 } 2302 }
2111 }
2112 2303
2113 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2114 2311
2115 cf::cede_to_tick; 2312 cf::cede_to_tick;
2116 # now do the right thing for maps 2313 # now do the right thing for maps
2117 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2118 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
… …
2122 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2123 $self->decay_objects; 2320 $self->decay_objects;
2124 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2125 $self->update_buttons; 2322 $self->update_buttons;
2126 cf::cede_to_tick; 2323 cf::cede_to_tick;
2127 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2128 } 2325 }
2129 2326
2130 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2132
2133 $self->in_memory (cf::MAP_ACTIVE);
2134 } 2329 }
2135 2330
2136 $self->post_load; 2331 $self->post_load;
2332
2333 1
2137} 2334}
2138 2335
2139# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
… …
2149# if $self->per_party; 2346# if $self->per_party;
2150 2347
2151 $self 2348 $self
2152} 2349}
2153 2350
2154# find and load all maps in the 3x3 area around a map
2155sub load_neighbours {
2156 my ($map) = @_;
2157
2158 my @neigh; # diagonal neighbours
2159
2160 for (0 .. 3) {
2161 my $neigh = $map->tile_path ($_)
2162 or next;
2163 $neigh = find $neigh, $map
2164 or next;
2165 $neigh->load;
2166
2167 push @neigh,
2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2170 }
2171
2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
2174 my $neigh = find $path, $origin
2175 or next;
2176 $neigh->load;
2177 }
2178}
2179
2180sub find_sync { 2351sub find_sync {
2181 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2182 2353
2183 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2184} 2359}
2185 2360
2186sub do_load_sync { 2361sub do_load_sync {
2187 my ($map) = @_; 2362 my ($map) = @_;
2188 2363
2364 # it's a bug to call this from the main context
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2191 2367
2192 cf::sync_job { $map->load }; 2368 $map->load;
2193} 2369}
2194 2370
2195our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2196our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2197 2373
2198sub find_async { 2374sub find_async {
2199 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2200 2376
2201 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2202 2378
2203 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2205 } 2381 }
2206 2382
2207 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2208 2384
2209 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
… …
2268sub swap_out { 2444sub swap_out {
2269 my ($self) = @_; 2445 my ($self) = @_;
2270 2446
2271 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2272 2448
2273 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2274 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2275 return if $self->players; 2451 return if $self->players;
2276 2452
2277 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate; 2454 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2281 2457
2282 # then atomically save 2458 # then atomically save
2283 $self->_save; 2459 $self->_save;
2284 2460
2285 # then free the map 2461 # then free the map
… …
2309 2485
2310 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2311 2487
2312 return if $self->players; 2488 return if $self->players;
2313 2489
2314 warn "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2315 2491
2316 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2317 2493
2318 # need to save uniques path 2494 # need to save uniques path
2319 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2320 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2321 2497
… …
2343 2519
2344 delete $cf::MAP{$self->path}; 2520 delete $cf::MAP{$self->path};
2345 2521
2346 $self->unlink_save; 2522 $self->unlink_save;
2347 2523
2348 bless $self, "cf::map"; 2524 bless $self, "cf::map::wrap";
2349 delete $self->{deny_reset}; 2525 delete $self->{deny_reset};
2350 $self->{deny_save} = 1; 2526 $self->{deny_save} = 1;
2351 $self->reset_timeout (1); 2527 $self->reset_timeout (1);
2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2528 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353 2529
… …
2474 2650
2475Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2476 2652
2477=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2478 2654
2479returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2480even if the object actually exists. May block. 2656even if the object actually exists. May block.
2481 2657
2482=cut 2658=cut
2483 2659
2484sub deref { 2660sub deref {
… …
2583 2759
2584Freezes the player and moves him/her to a special map (C<{link}>). 2760Freezes the player and moves him/her to a special map (C<{link}>).
2585 2761
2586The player should be reasonably safe there for short amounts of time (e.g. 2762The player should be reasonably safe there for short amounts of time (e.g.
2587for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2763for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link 2764though, as the player cannot control the character while it is on the link
2589map. 2765map.
2590 2766
2591Will never block. 2767Will never block.
2592 2768
2593=item $player_object->leave_link ($map, $x, $y) 2769=item $player_object->leave_link ($map, $x, $y)
… …
2614sub cf::object::player::enter_link { 2790sub cf::object::player::enter_link {
2615 my ($self) = @_; 2791 my ($self) = @_;
2616 2792
2617 $self->deactivate_recursive; 2793 $self->deactivate_recursive;
2618 2794
2795 ++$self->{_link_recursion};
2796
2619 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2797 return if UNIVERSAL::isa $self->map, "ext::map_link";
2620 2798
2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2799 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622 if $self->map && $self->map->{path} ne "{link}"; 2800 if $self->map && $self->map->{path} ne "{link}";
2623 2801
… …
2649 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2650 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2651 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2652 2830
2653 $map->load; 2831 $map->load;
2654 $map->load_neighbours;
2655 2832
2656 return unless $self->contr->active; 2833 return unless $self->contr->active;
2657 2834
2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659 $self->enter_map ($map, $x, $y); 2836 if ($self->enter_map ($map, $x, $y)) {
2660 2837 # entering was successful
2838 delete $self->{_link_recursion};
2661 # only activate afterwards, to support waiting in hooks 2839 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive; 2840 $self->activate_recursive;
2663} 2841 }
2664 2842
2843}
2844
2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2845=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666 2846
2667Moves the player to the given map-path and coordinates by first freezing 2847Moves the player to the given map-path and coordinates by first freezing
2668her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2669that has to return the map if sucecssful, and then unfreezes the player on 2849that has to return the map if sucecssful, and then unfreezes the player on
2670the new (success) or old (failed) map position. In either case, $done will 2850the new (success) or old (failed) map position. In either case, $done will
… …
2677 2857
2678our $GOTOGEN; 2858our $GOTOGEN;
2679 2859
2680sub cf::object::player::goto { 2860sub cf::object::player::goto {
2681 my ($self, $path, $x, $y, $check, $done) = @_; 2861 my ($self, $path, $x, $y, $check, $done) = @_;
2862
2863 if ($self->{_link_recursion} >= $MAX_LINKS) {
2864 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2865 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2866 ($path, $x, $y) = @$EMERGENCY_POSITION;
2867 }
2682 2868
2683 # do generation counting so two concurrent goto's will be executed in-order 2869 # do generation counting so two concurrent goto's will be executed in-order
2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685 2871
2686 $self->enter_link; 2872 $self->enter_link;
… …
2706 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2707 } 2893 }
2708 } 2894 }
2709 2895
2710 my $map = eval { 2896 my $map = eval {
2711 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712 2898
2713 if ($map) { 2899 if ($map) {
2714 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2715 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2716 } else { 2902 } else {
2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2903 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718 } 2904 }
2719 2905
2720 $map 2906 $map
… …
2728 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2729 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2730 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2731 } 2917 }
2732 2918
2733 $done->() if $done; 2919 $done->($self) if $done;
2734 })->prio (1); 2920 })->prio (1);
2735} 2921}
2736 2922
2737=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2738 2924
… …
2806 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2807 2993
2808 unless (eval { 2994 unless (eval {
2809 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2810 2996
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2820 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2822 3023
2823 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2824 3025
2825 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
… …
2831 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2832 . "I'll try to bring you back to the map you were before. " 3033 . "I'll try to bring you back to the map you were before. "
2833 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2834 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2835 3036
2836 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2837 $self->leave_link; 3038 $self->leave_link;
2838 } 3039 }
2839 })->prio (1); 3040 })->prio (1);
2840} 3041}
2841 3042
… …
2852 3053
2853sub cf::client::send_drawinfo { 3054sub cf::client::send_drawinfo {
2854 my ($self, $text, $flags) = @_; 3055 my ($self, $text, $flags) = @_;
2855 3056
2856 utf8::encode $text; 3057 utf8::encode $text;
2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3058 $self->send_packet (sprintf "msg %d 0 %s", $flags || cf::NDI_BLACK, $text);
2858} 3059}
2859 3060
2860=item $client->send_big_packet ($pkt) 3061=item $client->send_big_packet ($pkt)
2861 3062
2862Like C<send_packet>, but tries to compress large packets, and fragments 3063Like C<send_packet>, but tries to compress large packets, and fragments
… …
2882 $self->send_packet ($pkt); 3083 $self->send_packet ($pkt);
2883} 3084}
2884 3085
2885=item $client->send_msg ($channel, $msg, $color, [extra...]) 3086=item $client->send_msg ($channel, $msg, $color, [extra...])
2886 3087
2887Send a drawinfo or msg packet to the client, formatting the msg for the 3088Send a msg packet to the client, formatting the msg for the client if
2888client if neccessary. C<$type> should be a string identifying the type of 3089necessary. C<$type> should be a string identifying the type of the
2889the message, with C<log> being the default. If C<$color> is negative, suppress 3090message, with C<log> being the default. If C<$color> is negative, suppress
2890the message unless the client supports the msg packet. 3091the message unless the client supports the msg packet.
2891 3092
2892=cut 3093=cut
2893 3094
2894# non-persistent channels (usually the info channel) 3095# non-persistent channels (usually the info channel)
… …
2999 id => "death", 3200 id => "death",
3000 title => "Death", 3201 title => "Death",
3001 reply => undef, 3202 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death", 3203 tooltip => "Reason for and more info about your most recent death",
3003 }, 3204 },
3205 "c/fatal" => {
3206 id => "fatal",
3207 title => "Fatal Error",
3208 reply => undef,
3209 tooltip => "Reason for the server disconnect",
3210 },
3004 "c/say" => $SAY_CHANNEL, 3211 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL, 3212 "c/chat" => $CHAT_CHANNEL,
3006); 3213);
3007 3214
3008sub cf::client::send_msg { 3215sub cf::client::send_msg {
… …
3051=cut 3258=cut
3052 3259
3053sub cf::client::ext_msg($$@) { 3260sub cf::client::ext_msg($$@) {
3054 my ($self, $type, @msg) = @_; 3261 my ($self, $type, @msg) = @_;
3055 3262
3056 if ($self->extcmd == 2) {
3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3263 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3058 } elsif ($self->extcmd == 1) { # TODO: remove
3059 push @msg, msgtype => "event_$type";
3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3061 }
3062}
3063
3064=item $client->ext_reply ($msgid, @msg)
3065
3066Sends an ext reply to the client.
3067
3068=cut
3069
3070sub cf::client::ext_reply($$@) {
3071 my ($self, $id, @msg) = @_;
3072
3073 if ($self->extcmd == 2) {
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075 } elsif ($self->extcmd == 1) {
3076 #TODO: version 1, remove
3077 unshift @msg, msgtype => "reply", msgid => $id;
3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079 }
3080} 3264}
3081 3265
3082=item $success = $client->query ($flags, "text", \&cb) 3266=item $success = $client->query ($flags, "text", \&cb)
3083 3267
3084Queues a query to the client, calling the given callback with 3268Queues a query to the client, calling the given callback with
… …
3139 my ($ns, $buf) = @_; 3323 my ($ns, $buf) = @_;
3140 3324
3141 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3325 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142 3326
3143 if (ref $msg) { 3327 if (ref $msg) {
3144 my ($type, $reply, @payload) = 3328 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145 "ARRAY" eq ref $msg
3146 ? @$msg
3147 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148 3329
3149 my @reply;
3150
3151 if (my $cb = $EXTICMD{$type}) { 3330 if (my $cb = $EXTIACMD{$type}) {
3331 $cb->(
3332 $ns,
3333 sub {
3334 $ns->ext_msg ("reply-$reply", @_)
3335 if $reply;
3336 },
3337 @payload
3338 );
3339 } else {
3340 my @reply;
3341
3342 if (my $cb = $EXTICMD{$type}) {
3152 @reply = $cb->($ns, @payload); 3343 @reply = $cb->($ns, @payload);
3344 }
3345
3346 $ns->ext_msg ("reply-$reply", @reply)
3347 if $reply;
3153 } 3348 }
3154
3155 $ns->ext_reply ($reply, @reply)
3156 if $reply;
3157
3158 } else { 3349 } else {
3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3350 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160 } 3351 }
3161 3352
3162 cf::override; 3353 cf::override;
3163 }, 3354 },
3164); 3355);
… …
3245 decrease split destroy change_exp value msg lore send_msg)], 3436 decrease split destroy change_exp value msg lore send_msg)],
3246 ["cf::object::player" => qw(player)], 3437 ["cf::object::player" => qw(player)],
3247 ["cf::player" => qw(peaceful send_msg)], 3438 ["cf::player" => qw(peaceful send_msg)],
3248 ["cf::map" => qw(trigger)], 3439 ["cf::map" => qw(trigger)],
3249) { 3440) {
3250 no strict 'refs';
3251 my ($pkg, @funs) = @$_; 3441 my ($pkg, @funs) = @$_;
3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3442 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253 for @funs; 3443 for @funs;
3254} 3444}
3255 3445
… …
3294 local @cf::_safe_eval_args = values %vars; 3484 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval; 3485 @res = wantarray ? eval eval : scalar eval $eval;
3296 } 3486 }
3297 3487
3298 if ($@) { 3488 if ($@) {
3299 warn "$@"; 3489 warn "$@",
3300 warn "while executing safe code '$code'\n"; 3490 "while executing safe code '$code'\n",
3301 warn "with arguments " . (join " ", %vars) . "\n"; 3491 "with arguments " . (join " ", %vars) . "\n";
3302 } 3492 }
3303 3493
3304 wantarray ? @res : $res[0] 3494 wantarray ? @res : $res[0]
3305} 3495}
3306 3496
… …
3331=cut 3521=cut
3332 3522
3333############################################################################# 3523#############################################################################
3334# the server's init and main functions 3524# the server's init and main functions
3335 3525
3526{
3527 package cf::face;
3528
3529 our %HASH; # hash => idx
3530 our @DATA; # dynamically-created facedata, only faceste 0 used
3531 our @FOFS; # file offset, if > 0
3532 our @SIZE; # size of face, in octets
3533 our @META; # meta hash of face, if any
3534 our $DATAFH; # facedata filehandle
3535
3536 # internal api, not finalised
3537 sub set {
3538 my ($name, $type, $data) = @_;
3539
3540 my $idx = cf::face::find $name;
3541
3542 if ($idx) {
3543 delete $HASH{cf::face::get_csum $idx};
3544 } else {
3545 $idx = cf::face::alloc $name;
3546 }
3547
3548 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3549
3550 cf::face::set_type $idx, $type;
3551 cf::face::set_csum $idx, 0, $hash;
3552
3553 # we need to destroy the SV itself, not just modify it, as a running ix
3554 # might hold a reference to it: "delete" achieves that.
3555 delete $FOFS[0][$idx];
3556 delete $DATA[0][$idx];
3557 $DATA[0][$idx] = $data;
3558 $SIZE[0][$idx] = length $data;
3559 delete $META[$idx];
3560 $HASH{$hash} = $idx;#d#
3561
3562 $idx
3563 }
3564
3565 sub _get_data($$$) {
3566 my ($idx, $set, $cb) = @_;
3567
3568 if (defined $DATA[$set][$idx]) {
3569 $cb->($DATA[$set][$idx]);
3570 } elsif (my $fofs = $FOFS[$set][$idx]) {
3571 my $size = $SIZE[$set][$idx];
3572 my $buf;
3573 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3574 if ($_[0] == $size) {
3575 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3576 $cb->($buf);
3577 } else {
3578 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3579 }
3580 };
3581 } else {
3582 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3583 }
3584 }
3585
3586 # rather ineffient
3587 sub cf::face::get_data($;$) {
3588 my ($idx, $set) = @_;
3589
3590 _get_data $idx, $set, Coro::rouse_cb;
3591 Coro::rouse_wait
3592 }
3593
3594 sub cf::face::ix {
3595 my ($ns, $set, $idx, $pri) = @_;
3596
3597 _get_data $idx, $set, sub {
3598 $ns->ix_send ($idx, $pri, $_[0]);
3599 };
3600 }
3601}
3602
3336sub load_facedata($) { 3603sub load_facedata($) {
3337 my ($path) = @_; 3604 my ($path) = @_;
3338 3605
3339 # HACK to clear player env face cache, we need some signal framework
3340 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = ();
3342
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3606 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344 3607
3345 warn "loading facedata from $path\n"; 3608 trace "loading facedata from $path\n";
3346 3609
3347 my $facedata; 3610 my $facedata = decode_storable load_file "$path/faceinfo";
3348 0 < aio_load $path, $facedata
3349 or die "$path: $!";
3350
3351 $facedata = Coro::Storable::thaw $facedata;
3352 3611
3353 $facedata->{version} == 2 3612 $facedata->{version} == 2
3354 or cf::cleanup "$path: version mismatch, cannot proceed."; 3613 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3355 3614
3356 # patch in the exptable 3615 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3616 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3358 $facedata->{resource}{"res/exp_table"} = { 3617
3359 type => FT_RSRC, 3618 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3360 data => $exp_table, 3619
3361 hash => (Digest::MD5::md5 $exp_table), 3620 # BEGIN ATOMIC
3362 }; 3621 # from here on, everything must be atomic - no thread switch allowed
3363 cf::cede_to_tick; 3622 my $t1 = EV::time;
3364 3623
3365 { 3624 {
3366 my $faces = $facedata->{faceinfo}; 3625 my $faces = $facedata->{faceinfo};
3367 3626
3368 while (my ($face, $info) = each %$faces) { 3627 for my $face (sort keys %$faces) {
3628 my $info = $faces->{$face};
3369 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3629 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370 3630
3371 cf::face::set_visibility $idx, $info->{visibility}; 3631 cf::face::set_visibility $idx, $info->{visibility};
3372 cf::face::set_magicmap $idx, $info->{magicmap}; 3632 cf::face::set_magicmap $idx, $info->{magicmap};
3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3633 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3634 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3375 3635 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3376 cf::cede_to_tick; 3636 $cf::face::HASH{$info->{hash64}} = $idx;
3637 delete $cf::face::META[$idx];
3377 } 3638 }
3378 3639
3379 while (my ($face, $info) = each %$faces) { 3640 while (my ($face, $info) = each %$faces) {
3380 next unless $info->{smooth}; 3641 next unless $info->{smooth};
3381 3642
… …
3384 3645
3385 if (my $smooth = cf::face::find $info->{smooth}) { 3646 if (my $smooth = cf::face::find $info->{smooth}) {
3386 cf::face::set_smooth $idx, $smooth; 3647 cf::face::set_smooth $idx, $smooth;
3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3648 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388 } else { 3649 } else {
3389 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3650 error "smooth face '$info->{smooth}' not found for face '$face'";
3390 } 3651 }
3391
3392 cf::cede_to_tick;
3393 } 3652 }
3394 } 3653 }
3395 3654
3396 { 3655 {
3397 my $anims = $facedata->{animinfo}; 3656 my $anims = $facedata->{animinfo};
3398 3657
3399 while (my ($anim, $info) = each %$anims) { 3658 while (my ($anim, $info) = each %$anims) {
3400 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3659 cf::anim::set $anim, $info->{frames}, $info->{facings};
3401 cf::cede_to_tick;
3402 } 3660 }
3403 3661
3404 cf::anim::invalidate_all; # d'oh 3662 cf::anim::invalidate_all; # d'oh
3405 } 3663 }
3406 3664
3407 { 3665 {
3408 my $res = $facedata->{resource}; 3666 my $res = $facedata->{resource};
3409 3667
3410 while (my ($name, $info) = each %$res) { 3668 while (my ($name, $info) = each %$res) {
3411 if (defined $info->{type}) { 3669 if (defined (my $type = $info->{type})) {
3670 # TODO: different hash - must free and use new index, or cache ixface data queue
3412 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3671 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413 3672
3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415 cf::face::set_type $idx, $info->{type}; 3673 cf::face::set_type $idx, $type;
3674 cf::face::set_csum $idx, 0, $info->{hash};
3675 $cf::face::SIZE[0][$idx] = $info->{size};
3676 $cf::face::FOFS[0][$idx] = $info->{fofs};
3677 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3678 $cf::face::HASH{$info->{hash}} = $idx;
3416 } else { 3679 } else {
3417 $RESOURCE{$name} = $info; 3680# $RESOURCE{$name} = $info; # unused
3418 } 3681 }
3419
3420 cf::cede_to_tick;
3421 } 3682 }
3422 } 3683 }
3684
3685 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3686
3687 # HACK to clear player env face cache, we need some signal framework
3688 # for this (global event?)
3689 %ext::player_env::MUSIC_FACE_CACHE = ();
3690
3691 # END ATOMIC
3692
3693 cf::debug "facedata atomic update time ", EV::time - $t1;
3423 3694
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3695 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425 3696
3697 aio_close $fh if $fh; # close old facedata
3698
3426 1 3699 1
3427} 3700}
3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448 3701
3449register_exticmd fx_want => sub { 3702register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_; 3703 my ($ns, $want) = @_;
3451 3704
3452 while (my ($k, $v) = each %$want) { 3705 while (my ($k, $v) = each %$want) {
… …
3460 my $status = load_resource_file_ $_[0]; 3713 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100; 3714 get_slot 0.1, 100;
3462 cf::arch::commit_load; 3715 cf::arch::commit_load;
3463 3716
3464 $status 3717 $status
3718}
3719
3720sub reload_exp_table {
3721 _reload_exp_table;
3722
3723 cf::face::set
3724 "res/exp_table" => FT_RSRC,
3725 JSON::XS->new->utf8->canonical->encode (
3726 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3727 );
3728}
3729
3730sub reload_materials {
3731 _reload_materials;
3465} 3732}
3466 3733
3467sub reload_regions { 3734sub reload_regions {
3468 # HACK to clear player env face cache, we need some signal framework 3735 # HACK to clear player env face cache, we need some signal framework
3469 # for this (global event?) 3736 # for this (global event?)
… …
3477 if exists $_->{match}; 3744 if exists $_->{match};
3478 } 3745 }
3479} 3746}
3480 3747
3481sub reload_facedata { 3748sub reload_facedata {
3482 load_facedata "$DATADIR/facedata" 3749 load_facedata $DATADIR
3483 or die "unable to load facedata\n"; 3750 or die "unable to load facedata\n";
3484} 3751}
3485 3752
3486sub reload_archetypes { 3753sub reload_archetypes {
3487 load_resource_file "$DATADIR/archetypes" 3754 load_resource_file "$DATADIR/archetypes"
3488 or die "unable to load archetypes\n"; 3755 or die "unable to load archetypes\n";
3756
3757 cf::face::set
3758 "res/skill_info" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3761 );
3762
3763 cf::face::set
3764 "res/spell_paths" => FT_RSRC,
3765 JSON::XS->new->utf8->canonical->encode (
3766 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3767 );
3489} 3768}
3490 3769
3491sub reload_treasures { 3770sub reload_treasures {
3492 load_resource_file "$DATADIR/treasures" 3771 load_resource_file "$DATADIR/treasures"
3493 or die "unable to load treasurelists\n"; 3772 or die "unable to load treasurelists\n";
3494} 3773}
3495 3774
3775sub reload_sound {
3776 trace "loading sound config from $DATADIR/sound\n";
3777
3778 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3779
3780 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3781 my $sound = $soundconf->{compat}[$_]
3782 or next;
3783
3784 my $face = cf::face::find "sound/$sound->[1]";
3785 cf::sound::set $sound->[0] => $face;
3786 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3787 }
3788
3789 while (my ($k, $v) = each %{$soundconf->{event}}) {
3790 my $face = cf::face::find "sound/$v";
3791 cf::sound::set $k => $face;
3792 }
3793}
3794
3496sub reload_resources { 3795sub reload_resources {
3497 warn "reloading resource files...\n"; 3796 trace "reloading resource files...\n";
3498 3797
3798 reload_materials;
3499 reload_facedata; 3799 reload_facedata;
3800 reload_exp_table;
3801 reload_sound;
3500 reload_archetypes; 3802 reload_archetypes;
3501 reload_regions; 3803 reload_regions;
3502 reload_treasures; 3804 reload_treasures;
3503 3805
3504 warn "finished reloading resource files\n"; 3806 trace "finished reloading resource files\n";
3505} 3807}
3506 3808
3507sub reload_config { 3809sub reload_config {
3508 warn "reloading config file...\n"; 3810 trace "reloading config file...\n";
3509 3811
3510 open my $fh, "<:utf8", "$CONFDIR/config" 3812 my $config = load_file "$CONFDIR/config";
3511 or return; 3813 utf8::decode $config;
3814 *CFG = decode_yaml $config;
3512 3815
3513 local $/;
3514 *CFG = YAML::XS::Load scalar <$fh>;
3515
3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3816 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517 3817
3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3818 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3819 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520 3820
3521 if (exists $CFG{mlockall}) { 3821 if (exists $CFG{mlockall}) {
… …
3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3823 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524 and die "WARNING: m(un)lockall failed: $!\n"; 3824 and die "WARNING: m(un)lockall failed: $!\n";
3525 }; 3825 };
3526 warn $@ if $@; 3826 warn $@ if $@;
3527 } 3827 }
3528
3529 warn "finished reloading resource files\n";
3530} 3828}
3531 3829
3532sub pidfile() { 3830sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3831 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!"; 3832 or die "$PIDFILE: $!";
… …
3547 seek $fh, 0, 0; 3845 seek $fh, 0, 0;
3548 print $fh $$; 3846 print $fh $$;
3549} 3847}
3550 3848
3551sub main_loop { 3849sub main_loop {
3552 warn "EV::loop starting\n"; 3850 trace "EV::loop starting\n";
3553 if (1) { 3851 if (1) {
3554 EV::loop; 3852 EV::loop;
3555 } 3853 }
3556 warn "EV::loop returned\n"; 3854 trace "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP; 3855 goto &main_loop unless $REALLY_UNLOOP;
3558} 3856}
3559 3857
3560sub main { 3858sub main {
3561 cf::init_globals; # initialise logging 3859 cf::init_globals; # initialise logging
3562 3860
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3861 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3862 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3863 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3864 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567 3865
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3866 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569 3867
3570 # we must not ever block the main coroutine 3868 # we must not ever block the main coroutine
3571 local $Coro::idle = sub { 3869 $Coro::idle = sub {
3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3870 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3573 (async { 3871 (async {
3574 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3872 $Coro::current->{desc} = "IDLE BUG HANDLER";
3575 EV::loop EV::LOOP_ONESHOT; 3873 EV::loop EV::LOOP_ONESHOT;
3576 })->prio (Coro::PRIO_MAX); 3874 })->prio (Coro::PRIO_MAX);
3577 }; 3875 };
3578 3876
3579 evthread_start IO::AIO::poll_fileno; 3877 evthread_start IO::AIO::poll_fileno;
3580 3878
3581 cf::sync_job { 3879 cf::sync_job {
3582 cf::init_experience; 3880 cf::incloader::init ();
3881
3882 db_init;
3883
3583 cf::init_anim; 3884 cf::init_anim;
3584 cf::init_attackmess; 3885 cf::init_attackmess;
3585 cf::init_dynamic; 3886 cf::init_dynamic;
3586 3887
3587 cf::load_settings; 3888 cf::load_settings;
3588 cf::load_materials;
3589 3889
3590 reload_resources; 3890 reload_resources;
3591 reload_config; 3891 reload_config;
3592 db_init;
3593 3892
3594 cf::init_uuid; 3893 cf::init_uuid;
3595 cf::init_signals; 3894 cf::init_signals;
3596 cf::init_skills; 3895 cf::init_skills;
3597 3896
… …
3605 3904
3606 # no (long-running) fork's whatsoever before this point(!) 3905 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX (); 3906 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3907 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609 3908
3610 (pop @POST_INIT)->(0) while @POST_INIT; 3909 cf::_post_init 0;
3611 }; 3910 };
3612 3911
3613 cf::object::thawer::errors_are_fatal 0; 3912 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n"; 3913 info "parse errors in files are no longer fatal from this point on.\n";
3615 3914
3915 AE::postpone {
3916 undef &main; # free gobs of memory :)
3917 };
3918
3616 main_loop; 3919 goto &main_loop;
3617} 3920}
3618 3921
3619############################################################################# 3922#############################################################################
3620# initialisation and cleanup 3923# initialisation and cleanup
3621 3924
… …
3660 or return; 3963 or return;
3661 3964
3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3965 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663 and return; 3966 and return;
3664 3967
3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3968 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666 3969
3667 1 3970 1
3668} 3971}
3669 3972
3670our $uuid_lock; 3973our $uuid_lock;
… …
3682 or return; 3985 or return;
3683 3986
3684 my $value = uuid_seq uuid_cur; 3987 my $value = uuid_seq uuid_cur;
3685 3988
3686 unless ($value) { 3989 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n"; 3990 info "cowardly refusing to write zero uuid value!\n";
3688 return; 3991 return;
3689 } 3992 }
3690 3993
3691 my $value = uuid_str $value + $uuid_skip; 3994 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0; 3995 $uuid_skip = 0;
… …
3702 or return; 4005 or return;
3703 4006
3704 aio_rename "$uuid~", $uuid 4007 aio_rename "$uuid~", $uuid
3705 and return; 4008 and return;
3706 4009
3707 warn "uuid file written ($value).\n"; 4010 trace "uuid file written ($value).\n";
3708 4011
3709 1 4012 1
3710 4013
3711} 4014}
3712 4015
… …
3718} 4021}
3719 4022
3720sub emergency_save() { 4023sub emergency_save() {
3721 my $freeze_guard = cf::freeze_mainloop; 4024 my $freeze_guard = cf::freeze_mainloop;
3722 4025
3723 warn "emergency_perl_save: enter\n"; 4026 info "emergency_perl_save: enter\n";
4027
4028 # this is a trade-off: we want to be very quick here, so
4029 # save all maps without fsync, and later call a global sync
4030 # (which in turn might be very very slow)
4031 local $USE_FSYNC = 0;
3724 4032
3725 cf::sync_job { 4033 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so 4034 cf::write_runtime_sync; # external watchdog should not bark
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730 4035
3731 # use a peculiar iteration method to avoid tripping on perl 4036 # use a peculiar iteration method to avoid tripping on perl
3732 # refcount bugs in for. also avoids problems with players 4037 # refcount bugs in for. also avoids problems with players
3733 # and maps saved/destroyed asynchronously. 4038 # and maps saved/destroyed asynchronously.
3734 warn "emergency_perl_save: begin player save\n"; 4039 info "emergency_perl_save: begin player save\n";
3735 for my $login (keys %cf::PLAYER) { 4040 for my $login (keys %cf::PLAYER) {
3736 my $pl = $cf::PLAYER{$login} or next; 4041 my $pl = $cf::PLAYER{$login} or next;
3737 $pl->valid or next; 4042 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4043 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739 $pl->save; 4044 $pl->save;
3740 } 4045 }
3741 warn "emergency_perl_save: end player save\n"; 4046 info "emergency_perl_save: end player save\n";
3742 4047
4048 cf::write_runtime_sync; # external watchdog should not bark
4049
3743 warn "emergency_perl_save: begin map save\n"; 4050 info "emergency_perl_save: begin map save\n";
3744 for my $path (keys %cf::MAP) { 4051 for my $path (keys %cf::MAP) {
3745 my $map = $cf::MAP{$path} or next; 4052 my $map = $cf::MAP{$path} or next;
3746 $map->valid or next; 4053 $map->valid or next;
3747 $map->save; 4054 $map->save;
3748 } 4055 }
3749 warn "emergency_perl_save: end map save\n"; 4056 info "emergency_perl_save: end map save\n";
3750 4057
4058 cf::write_runtime_sync; # external watchdog should not bark
4059
3751 warn "emergency_perl_save: begin database checkpoint\n"; 4060 info "emergency_perl_save: begin database checkpoint\n";
3752 BDB::db_env_txn_checkpoint $DB_ENV; 4061 BDB::db_env_txn_checkpoint $DB_ENV;
3753 warn "emergency_perl_save: end database checkpoint\n"; 4062 info "emergency_perl_save: end database checkpoint\n";
3754 4063
3755 warn "emergency_perl_save: begin write uuid\n"; 4064 info "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1; 4065 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n"; 4066 info "emergency_perl_save: end write uuid\n";
4067
4068 cf::write_runtime_sync; # external watchdog should not bark
4069
4070 trace "emergency_perl_save: syncing database to disk";
4071 BDB::db_env_txn_checkpoint $DB_ENV;
4072
4073 info "emergency_perl_save: starting sync\n";
4074 IO::AIO::aio_sync sub {
4075 info "emergency_perl_save: finished sync\n";
4076 };
4077
4078 cf::write_runtime_sync; # external watchdog should not bark
4079
4080 trace "emergency_perl_save: flushing outstanding aio requests";
4081 while (IO::AIO::nreqs || BDB::nreqs) {
4082 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4083 }
4084
4085 cf::write_runtime_sync; # external watchdog should not bark
3758 }; 4086 };
3759 4087
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3765 warn "emergency_perl_save: leave\n"; 4088 info "emergency_perl_save: leave\n";
3766} 4089}
3767 4090
3768sub post_cleanup { 4091sub post_cleanup {
3769 my ($make_core) = @_; 4092 my ($make_core) = @_;
3770 4093
4094 IO::AIO::flush;
4095
3771 warn Carp::longmess "post_cleanup backtrace" 4096 error Carp::longmess "post_cleanup backtrace"
3772 if $make_core; 4097 if $make_core;
3773 4098
3774 my $fh = pidfile; 4099 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$; 4100 unlink $PIDFILE if <$fh> == $$;
3776} 4101}
… …
3800 } 4125 }
3801} 4126}
3802 4127
3803sub do_reload_perl() { 4128sub do_reload_perl() {
3804 # can/must only be called in main 4129 # can/must only be called in main
3805 if (in_main) { 4130 unless (in_main) {
3806 warn "can only reload from main coroutine"; 4131 error "can only reload from main coroutine";
3807 return; 4132 return;
3808 } 4133 }
3809 4134
3810 return if $RELOAD++; 4135 return if $RELOAD++;
3811 4136
3812 my $t1 = AE::time; 4137 my $t1 = AE::time;
3813 4138
3814 while ($RELOAD) { 4139 while ($RELOAD) {
3815 warn "reloading..."; 4140 cf::get_slot 0.1, -1, "reload_perl";
4141 info "perl_reload: reloading...";
3816 4142
3817 warn "entering sync_job"; 4143 trace "perl_reload: entering sync_job";
3818 4144
3819 cf::sync_job { 4145 cf::sync_job {
3820 cf::write_runtime_sync; # external watchdog should not bark
3821 cf::emergency_save; 4146 #cf::emergency_save;
3822 cf::write_runtime_sync; # external watchdog should not bark
3823 4147
3824 warn "syncing database to disk";
3825 BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827 # if anything goes wrong in here, we should simply crash as we already saved
3828
3829 warn "flushing outstanding aio requests";
3830 while (IO::AIO::nreqs || BDB::nreqs) {
3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832 }
3833
3834 warn "cancelling all extension coros"; 4148 trace "perl_reload: cancelling all extension coros";
3835 $_->cancel for values %EXT_CORO; 4149 $_->cancel for values %EXT_CORO;
3836 %EXT_CORO = (); 4150 %EXT_CORO = ();
3837 4151
3838 warn "removing commands"; 4152 trace "perl_reload: removing commands";
3839 %COMMAND = (); 4153 %COMMAND = ();
3840 4154
3841 warn "removing ext/exti commands"; 4155 trace "perl_reload: removing ext/exti commands";
3842 %EXTCMD = (); 4156 %EXTCMD = ();
3843 %EXTICMD = (); 4157 %EXTICMD = ();
3844 4158
3845 warn "unloading/nuking all extensions"; 4159 trace "perl_reload: unloading/nuking all extensions";
3846 for my $pkg (@EXTS) { 4160 for my $pkg (@EXTS) {
3847 warn "... unloading $pkg"; 4161 trace "... unloading $pkg";
3848 4162
3849 if (my $cb = $pkg->can ("unload")) { 4163 if (my $cb = $pkg->can ("unload")) {
3850 eval { 4164 eval {
3851 $cb->($pkg); 4165 $cb->($pkg);
3852 1 4166 1
3853 } or warn "$pkg unloaded, but with errors: $@"; 4167 } or error "$pkg unloaded, but with errors: $@";
3854 } 4168 }
3855 4169
3856 warn "... clearing $pkg"; 4170 trace "... clearing $pkg";
3857 clear_package $pkg; 4171 clear_package $pkg;
3858 } 4172 }
3859 4173
3860 warn "unloading all perl modules loaded from $LIBDIR"; 4174 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) { 4175 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4176 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863 4177
3864 warn "... unloading $k"; 4178 trace "... unloading $k";
3865 delete $INC{$k}; 4179 delete $INC{$k};
3866 4180
3867 $k =~ s/\.pm$//; 4181 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g; 4182 $k =~ s/\//::/g;
3869 4183
… …
3872 } 4186 }
3873 4187
3874 clear_package $k; 4188 clear_package $k;
3875 } 4189 }
3876 4190
3877 warn "getting rid of safe::, as good as possible"; 4191 trace "perl_reload: getting rid of safe::, as good as possible";
3878 clear_package "safe::$_" 4192 clear_package "safe::$_"
3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4193 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880 4194
3881 warn "unloading cf.pm \"a bit\""; 4195 trace "perl_reload: unloading cf.pm \"a bit\"";
3882 delete $INC{"cf.pm"}; 4196 delete $INC{"cf.pm"};
3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4197 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884 4198
3885 # don't, removes xs symbols, too, 4199 # don't, removes xs symbols, too,
3886 # and global variables created in xs 4200 # and global variables created in xs
3887 #clear_package __PACKAGE__; 4201 #clear_package __PACKAGE__;
3888 4202
3889 warn "unload completed, starting to reload now"; 4203 info "perl_reload: unload completed, starting to reload now";
3890 4204
3891 warn "reloading cf.pm"; 4205 trace "perl_reload: reloading cf.pm";
3892 require cf; 4206 require cf;
3893 cf::_connect_to_perl_1; 4207 cf::_connect_to_perl_1;
3894 4208
3895 warn "loading config and database again"; 4209 trace "perl_reload: loading config and database again";
3896 cf::reload_config; 4210 cf::reload_config;
3897 4211
3898 warn "loading extensions"; 4212 trace "perl_reload: loading extensions";
3899 cf::load_extensions; 4213 cf::load_extensions;
3900 4214
3901 if ($REATTACH_ON_RELOAD) { 4215 if ($REATTACH_ON_RELOAD) {
3902 warn "reattaching attachments to objects/players"; 4216 trace "perl_reload: reattaching attachments to objects/players";
3903 _global_reattach; # objects, sockets 4217 _global_reattach; # objects, sockets
3904 warn "reattaching attachments to maps"; 4218 trace "perl_reload: reattaching attachments to maps";
3905 reattach $_ for values %MAP; 4219 reattach $_ for values %MAP;
3906 warn "reattaching attachments to players"; 4220 trace "perl_reload: reattaching attachments to players";
3907 reattach $_ for values %PLAYER; 4221 reattach $_ for values %PLAYER;
3908 } 4222 }
3909 4223
3910 warn "running post_init jobs"; 4224 cf::_post_init 1;
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912 4225
3913 warn "leaving sync_job"; 4226 trace "perl_reload: leaving sync_job";
3914 4227
3915 1 4228 1
3916 } or do { 4229 } or do {
3917 warn $@; 4230 error $@;
3918 cf::cleanup "error while reloading, exiting."; 4231 cf::cleanup "perl_reload: error, exiting.";
3919 }; 4232 };
3920 4233
3921 warn "reloaded";
3922 --$RELOAD; 4234 --$RELOAD;
3923 } 4235 }
3924 4236
3925 $t1 = AE::time - $t1; 4237 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n"; 4238 info "perl_reload: completed in ${t1}s\n";
3927}; 4239};
3928 4240
3929our $RELOAD_WATCHER; # used only during reload 4241our $RELOAD_WATCHER; # used only during reload
3930 4242
3931sub reload_perl() { 4243sub reload_perl() {
… …
3952 reload_perl; 4264 reload_perl;
3953 }; 4265 };
3954 } 4266 }
3955}; 4267};
3956 4268
3957unshift @INC, $LIBDIR; 4269#############################################################################
3958 4270
3959my $bug_warning = 0; 4271my $bug_warning = 0;
3960 4272
3961our @WAIT_FOR_TICK;
3962our @WAIT_FOR_TICK_BEGIN;
3963
3964sub wait_for_tick { 4273sub wait_for_tick() {
3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966 4275
3967 my $signal = new Coro::Signal; 4276 $WAIT_FOR_TICK->wait;
3968 push @WAIT_FOR_TICK, $signal;
3969 $signal->wait;
3970} 4277}
3971 4278
3972sub wait_for_tick_begin { 4279sub wait_for_tick_begin() {
3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4280 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974 4281
3975 my $signal = new Coro::Signal; 4282 my $signal = new Coro::Signal;
3976 push @WAIT_FOR_TICK_BEGIN, $signal; 4283 push @WAIT_FOR_TICK_BEGIN, $signal;
3977 $signal->wait; 4284 $signal->wait;
3978} 4285}
… …
3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4289 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983 unless ++$bug_warning > 10; 4290 unless ++$bug_warning > 10;
3984 return; 4291 return;
3985 } 4292 }
3986 4293
3987 cf::server_tick; # one server iteration 4294 cf::one_tick; # one server iteration
3988 4295
3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4296 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990 4297
3991 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4298 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4299 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993 Coro::async_pool { 4300 Coro::async_pool {
3994 $Coro::current->{desc} = "runtime saver"; 4301 $Coro::current->{desc} = "runtime saver";
3995 write_runtime_sync 4302 write_runtime_sync
3996 or warn "ERROR: unable to write runtime file: $!"; 4303 or error "ERROR: unable to write runtime file: $!";
3997 }; 4304 };
3998 } 4305 }
3999 4306
4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4307 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001 $sig->send; 4308 $sig->send;
4002 } 4309 }
4003 while (my $sig = shift @WAIT_FOR_TICK) { 4310 $WAIT_FOR_TICK->broadcast;
4004 $sig->send;
4005 }
4006 4311
4007 $LOAD = ($NOW - $TICK_START) / $TICK; 4312 $LOAD = ($NOW - $TICK_START) / $TICK;
4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4313 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009 4314
4010 if (0) { 4315 if (0) {
4011 if ($NEXT_TICK) { 4316 if ($NEXT_TICK) {
4012 my $jitter = $TICK_START - $NEXT_TICK; 4317 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4318 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d# 4319 debug "jitter $JITTER\n";#d#
4015 } 4320 }
4016 } 4321 }
4017} 4322}
4018 4323
4019{ 4324{
4020 # configure BDB 4325 # configure BDB
4326 info "initialising database";
4021 4327
4022 BDB::min_parallel 16; 4328 BDB::min_parallel 16;
4023 BDB::max_poll_reqs $TICK * 0.1; 4329 BDB::max_poll_reqs $TICK * 0.1;
4024 $AnyEvent::BDB::WATCHER->priority (1); 4330 #$AnyEvent::BDB::WATCHER->priority (1);
4025 4331
4026 unless ($DB_ENV) { 4332 unless ($DB_ENV) {
4027 $DB_ENV = BDB::db_env_create; 4333 $DB_ENV = BDB::db_env_create;
4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4334 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4335 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4054 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4360 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4055 }; 4361 };
4056 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4362 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4057 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4363 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4058 }; 4364 };
4365
4366 info "database initialised";
4059} 4367}
4060 4368
4061{ 4369{
4062 # configure IO::AIO 4370 # configure IO::AIO
4063 4371
4372 info "initialising aio";
4064 IO::AIO::min_parallel 8; 4373 IO::AIO::min_parallel 8;
4065 IO::AIO::max_poll_time $TICK * 0.1; 4374 IO::AIO::max_poll_time $TICK * 0.1;
4066 undef $AnyEvent::AIO::WATCHER; 4375 undef $AnyEvent::AIO::WATCHER;
4376 info "aio initialised";
4067} 4377}
4068 4378
4069my $_log_backtrace; 4379our $_log_backtrace;
4380our $_log_backtrace_last;
4070 4381
4071sub _log_backtrace { 4382sub _log_backtrace {
4072 my ($msg, @addr) = @_; 4383 my ($msg, @addr) = @_;
4073 4384
4074 $msg =~ s/\n//; 4385 $msg =~ s/\n$//;
4075 4386
4387 if ($_log_backtrace_last eq $msg) {
4388 LOG llevInfo, "[ABT] $msg\n";
4389 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076 # limit the # of concurrent backtraces 4390 # limit the # of concurrent backtraces
4077 if ($_log_backtrace < 2) { 4391 } elsif ($_log_backtrace < 2) {
4392 $_log_backtrace_last = $msg;
4078 ++$_log_backtrace; 4393 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg; 4394 my $perl_bt = Carp::longmess $msg;
4080 async { 4395 async {
4081 $Coro::current->{desc} = "abt $msg"; 4396 $Coro::current->{desc} = "abt $msg";
4082 4397
… …
4102 LOG llevInfo, "[ABT] $_\n" for @bt; 4417 LOG llevInfo, "[ABT] $_\n" for @bt;
4103 --$_log_backtrace; 4418 --$_log_backtrace;
4104 }; 4419 };
4105 } else { 4420 } else {
4106 LOG llevInfo, "[ABT] $msg\n"; 4421 LOG llevInfo, "[ABT] $msg\n";
4107 LOG llevInfo, "[ABT] [suppressed]\n"; 4422 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108 } 4423 }
4109} 4424}
4110 4425
4111# load additional modules 4426# load additional modules
4112require "cf/$_.pm" for @EXTRA_MODULES; 4427require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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