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.525 by root, Wed Apr 21 03:34:26 2010 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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
… …
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
… …
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 unless exists $self->{_link_pos}; # maybe we re in-flight again 2841 }
2664}
2665 2842
2843}
2844
2666=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)]])
2667 2846
2668Moves 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
2669her, loading and preparing them map, calling the provided $check callback 2848her, loading and preparing them map, calling the provided $check callback
2670that 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
2671the 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
… …
2678 2857
2679our $GOTOGEN; 2858our $GOTOGEN;
2680 2859
2681sub cf::object::player::goto { 2860sub cf::object::player::goto {
2682 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 }
2683 2868
2684 # 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
2685 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2870 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2686 2871
2687 $self->enter_link; 2872 $self->enter_link;
… …
2707 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2708 } 2893 }
2709 } 2894 }
2710 2895
2711 my $map = eval { 2896 my $map = eval {
2712 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2713 2898
2714 if ($map) { 2899 if ($map) {
2715 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2716 $map = $check->($map) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2717 } else { 2902 } else {
2718 $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);
2719 } 2904 }
2720 2905
2721 $map 2906 $map
… …
2729 if ($gen == $self->{_goto_generation}) { 2914 if ($gen == $self->{_goto_generation}) {
2730 delete $self->{_goto_generation}; 2915 delete $self->{_goto_generation};
2731 $self->leave_link ($map, $x, $y); 2916 $self->leave_link ($map, $x, $y);
2732 } 2917 }
2733 2918
2734 $done->() if $done; 2919 $done->($self) if $done;
2735 })->prio (1); 2920 })->prio (1);
2736} 2921}
2737 2922
2738=item $player_object->enter_exit ($exit_object) 2923=item $player_object->enter_exit ($exit_object)
2739 2924
… …
2807 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2808 2993
2809 unless (eval { 2994 unless (eval {
2810 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2811 2996
2812 # random map handling
2813 {
2814 my $guard = cf::lock_acquire "exit_prepare:$exit";
2815
2816 prepare_random_map $exit
2817 if $exit->slaying eq "/!";
2818 }
2819
2820 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2821 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2822 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 }
2823 3023
2824 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2825 3025
2826 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2827 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
… …
2832 $self->message ("Something went wrong deep within the deliantra server. " 3032 $self->message ("Something went wrong deep within the deliantra server. "
2833 . "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. "
2834 . "Please report this to the dungeon master!", 3034 . "Please report this to the dungeon master!",
2835 cf::NDI_UNIQUE | cf::NDI_RED); 3035 cf::NDI_UNIQUE | cf::NDI_RED);
2836 3036
2837 warn "ERROR in enter_exit: $@"; 3037 error "ERROR in enter_exit: $@";
2838 $self->leave_link; 3038 $self->leave_link;
2839 } 3039 }
2840 })->prio (1); 3040 })->prio (1);
2841} 3041}
2842 3042
2843=head3 cf::client 3043=head3 cf::client
2844 3044
2845=over 4 3045=over 4
2846
2847=item $client->send_drawinfo ($text, $flags)
2848
2849Sends a drawinfo packet to the client. Circumvents output buffering so
2850should not be used under normal circumstances.
2851
2852=cut
2853
2854sub cf::client::send_drawinfo {
2855 my ($self, $text, $flags) = @_;
2856
2857 utf8::encode $text;
2858 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2859}
2860 3046
2861=item $client->send_big_packet ($pkt) 3047=item $client->send_big_packet ($pkt)
2862 3048
2863Like C<send_packet>, but tries to compress large packets, and fragments 3049Like C<send_packet>, but tries to compress large packets, and fragments
2864them as required. 3050them as required.
… …
2883 $self->send_packet ($pkt); 3069 $self->send_packet ($pkt);
2884} 3070}
2885 3071
2886=item $client->send_msg ($channel, $msg, $color, [extra...]) 3072=item $client->send_msg ($channel, $msg, $color, [extra...])
2887 3073
2888Send a drawinfo or msg packet to the client, formatting the msg for the 3074Send a msg packet to the client, formatting the msg for the client if
2889client if neccessary. C<$type> should be a string identifying the type of 3075necessary. C<$type> should be a string identifying the type of the
2890the message, with C<log> being the default. If C<$color> is negative, suppress 3076message, with C<log> being the default. If C<$color> is negative, suppress
2891the message unless the client supports the msg packet. 3077the message unless the client supports the msg packet.
2892 3078
2893=cut 3079=cut
2894 3080
2895# non-persistent channels (usually the info channel) 3081# non-persistent channels (usually the info channel)
… …
3000 id => "death", 3186 id => "death",
3001 title => "Death", 3187 title => "Death",
3002 reply => undef, 3188 reply => undef,
3003 tooltip => "Reason for and more info about your most recent death", 3189 tooltip => "Reason for and more info about your most recent death",
3004 }, 3190 },
3191 "c/fatal" => {
3192 id => "fatal",
3193 title => "Fatal Error",
3194 reply => undef,
3195 tooltip => "Reason for the server disconnect",
3196 },
3005 "c/say" => $SAY_CHANNEL, 3197 "c/say" => $SAY_CHANNEL,
3006 "c/chat" => $CHAT_CHANNEL, 3198 "c/chat" => $CHAT_CHANNEL,
3007); 3199);
3008 3200
3009sub cf::client::send_msg { 3201sub cf::client::send_msg {
… …
3052=cut 3244=cut
3053 3245
3054sub cf::client::ext_msg($$@) { 3246sub cf::client::ext_msg($$@) {
3055 my ($self, $type, @msg) = @_; 3247 my ($self, $type, @msg) = @_;
3056 3248
3057 if ($self->extcmd == 2) {
3058 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3249 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3059 } elsif ($self->extcmd == 1) { # TODO: remove
3060 push @msg, msgtype => "event_$type";
3061 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3062 }
3063}
3064
3065=item $client->ext_reply ($msgid, @msg)
3066
3067Sends an ext reply to the client.
3068
3069=cut
3070
3071sub cf::client::ext_reply($$@) {
3072 my ($self, $id, @msg) = @_;
3073
3074 if ($self->extcmd == 2) {
3075 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3076 } elsif ($self->extcmd == 1) {
3077 #TODO: version 1, remove
3078 unshift @msg, msgtype => "reply", msgid => $id;
3079 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3080 }
3081} 3250}
3082 3251
3083=item $success = $client->query ($flags, "text", \&cb) 3252=item $success = $client->query ($flags, "text", \&cb)
3084 3253
3085Queues a query to the client, calling the given callback with 3254Queues a query to the client, calling the given callback with
… …
3105 3274
3106 $self->send_packet ($self->{query_queue}[0][0]) 3275 $self->send_packet ($self->{query_queue}[0][0])
3107 if @{ $self->{query_queue} } == 1; 3276 if @{ $self->{query_queue} } == 1;
3108 3277
3109 1 3278 1
3279}
3280
3281=item $client->update_command_faces
3282
3283=cut
3284
3285our @COMMAND_FACES; # [normal commands, emotes, dm commands]
3286
3287sub cf::client::update_command_faces {
3288 my ($self) = @_;
3289
3290 my @faces = (
3291 $COMMAND_FACES[0],
3292 $COMMAND_FACES[1],
3293 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
3294 );
3295
3296 $self->send_face ($_)
3297 for @faces;
3298 $self->flush_fx;
3299
3300 $self->ext_msg (command_list => @faces);
3301}
3302
3303=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
3304
3305=cut
3306
3307sub cf::client::set_command_faces {
3308 @COMMAND_FACES = @_;
3110} 3309}
3111 3310
3112cf::client->attach ( 3311cf::client->attach (
3113 on_connect => sub { 3312 on_connect => sub {
3114 my ($ns) = @_; 3313 my ($ns) = @_;
… …
3140 my ($ns, $buf) = @_; 3339 my ($ns, $buf) = @_;
3141 3340
3142 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3341 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3143 3342
3144 if (ref $msg) { 3343 if (ref $msg) {
3145 my ($type, $reply, @payload) = 3344 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3146 "ARRAY" eq ref $msg
3147 ? @$msg
3148 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3149 3345
3150 my @reply;
3151
3152 if (my $cb = $EXTICMD{$type}) { 3346 if (my $cb = $EXTIACMD{$type}) {
3347 $cb->(
3348 $ns,
3349 sub {
3350 $ns->ext_msg ("reply-$reply", @_)
3351 if $reply;
3352 },
3353 @payload
3354 );
3355 } else {
3356 my @reply;
3357
3358 if (my $cb = $EXTICMD{$type}) {
3153 @reply = $cb->($ns, @payload); 3359 @reply = $cb->($ns, @payload);
3360 }
3361
3362 $ns->ext_msg ("reply-$reply", @reply)
3363 if $reply;
3154 } 3364 }
3155
3156 $ns->ext_reply ($reply, @reply)
3157 if $reply;
3158
3159 } else { 3365 } else {
3160 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3366 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3161 } 3367 }
3162 3368
3163 cf::override; 3369 cf::override;
3164 }, 3370 },
3165); 3371);
… …
3246 decrease split destroy change_exp value msg lore send_msg)], 3452 decrease split destroy change_exp value msg lore send_msg)],
3247 ["cf::object::player" => qw(player)], 3453 ["cf::object::player" => qw(player)],
3248 ["cf::player" => qw(peaceful send_msg)], 3454 ["cf::player" => qw(peaceful send_msg)],
3249 ["cf::map" => qw(trigger)], 3455 ["cf::map" => qw(trigger)],
3250) { 3456) {
3251 no strict 'refs';
3252 my ($pkg, @funs) = @$_; 3457 my ($pkg, @funs) = @$_;
3253 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3458 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3254 for @funs; 3459 for @funs;
3255} 3460}
3256 3461
… …
3295 local @cf::_safe_eval_args = values %vars; 3500 local @cf::_safe_eval_args = values %vars;
3296 @res = wantarray ? eval eval : scalar eval $eval; 3501 @res = wantarray ? eval eval : scalar eval $eval;
3297 } 3502 }
3298 3503
3299 if ($@) { 3504 if ($@) {
3300 warn "$@"; 3505 warn "$@",
3301 warn "while executing safe code '$code'\n"; 3506 "while executing safe code '$code'\n",
3302 warn "with arguments " . (join " ", %vars) . "\n"; 3507 "with arguments " . (join " ", %vars) . "\n";
3303 } 3508 }
3304 3509
3305 wantarray ? @res : $res[0] 3510 wantarray ? @res : $res[0]
3306} 3511}
3307 3512
… …
3332=cut 3537=cut
3333 3538
3334############################################################################# 3539#############################################################################
3335# the server's init and main functions 3540# the server's init and main functions
3336 3541
3542{
3543 package cf::face;
3544
3545 our %HASH; # hash => idx
3546 our @DATA; # dynamically-created facedata, only faceste 0 used
3547 our @FOFS; # file offset, if > 0
3548 our @SIZE; # size of face, in octets
3549 our @META; # meta hash of face, if any
3550 our $DATAFH; # facedata filehandle
3551
3552 # internal api, not finalised
3553 sub set {
3554 my ($name, $type, $data) = @_;
3555
3556 my $idx = cf::face::find $name;
3557
3558 if ($idx) {
3559 delete $HASH{cf::face::get_csum $idx};
3560 } else {
3561 $idx = cf::face::alloc $name;
3562 }
3563
3564 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3565
3566 cf::face::set_type $idx, $type;
3567 cf::face::set_csum $idx, 0, $hash;
3568
3569 # we need to destroy the SV itself, not just modify it, as a running ix
3570 # might hold a reference to it: "delete" achieves that.
3571 delete $FOFS[0][$idx];
3572 delete $DATA[0][$idx];
3573 $DATA[0][$idx] = $data;
3574 $SIZE[0][$idx] = length $data;
3575 delete $META[$idx];
3576 $HASH{$hash} = $idx;#d#
3577
3578 $idx
3579 }
3580
3581 sub _get_data($$$) {
3582 my ($idx, $set, $cb) = @_;
3583
3584 if (defined $DATA[$set][$idx]) {
3585 $cb->($DATA[$set][$idx]);
3586 } elsif (my $fofs = $FOFS[$set][$idx]) {
3587 my $size = $SIZE[$set][$idx];
3588 my $buf;
3589 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3590 if ($_[0] == $size) {
3591 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3592 $cb->($buf);
3593 } else {
3594 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3595 }
3596 };
3597 } else {
3598 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3599 }
3600 }
3601
3602 # rather ineffient
3603 sub cf::face::get_data($;$) {
3604 my ($idx, $set) = @_;
3605
3606 _get_data $idx, $set, Coro::rouse_cb;
3607 Coro::rouse_wait
3608 }
3609
3610 sub cf::face::ix {
3611 my ($ns, $set, $idx, $pri) = @_;
3612
3613 _get_data $idx, $set, sub {
3614 $ns->ix_send ($idx, $pri, $_[0]);
3615 };
3616 }
3617}
3618
3337sub load_facedata($) { 3619sub load_facedata($) {
3338 my ($path) = @_; 3620 my ($path) = @_;
3339 3621
3340 # HACK to clear player env face cache, we need some signal framework
3341 # for this (global event?)
3342 %ext::player_env::MUSIC_FACE_CACHE = ();
3343
3344 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3622 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3345 3623
3346 warn "loading facedata from $path\n"; 3624 trace "loading facedata from $path\n";
3347 3625
3348 my $facedata; 3626 my $facedata = decode_storable load_file "$path/faceinfo";
3349 0 < aio_load $path, $facedata
3350 or die "$path: $!";
3351
3352 $facedata = Coro::Storable::thaw $facedata;
3353 3627
3354 $facedata->{version} == 2 3628 $facedata->{version} == 2
3355 or cf::cleanup "$path: version mismatch, cannot proceed."; 3629 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3356 3630
3357 # patch in the exptable 3631 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3358 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3632 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3359 $facedata->{resource}{"res/exp_table"} = { 3633
3360 type => FT_RSRC, 3634 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3361 data => $exp_table, 3635
3362 hash => (Digest::MD5::md5 $exp_table), 3636 # BEGIN ATOMIC
3363 }; 3637 # from here on, everything must be atomic - no thread switch allowed
3364 cf::cede_to_tick; 3638 my $t1 = EV::time;
3365 3639
3366 { 3640 {
3367 my $faces = $facedata->{faceinfo}; 3641 my $faces = $facedata->{faceinfo};
3368 3642
3369 while (my ($face, $info) = each %$faces) { 3643 for my $face (sort keys %$faces) {
3644 my $info = $faces->{$face};
3370 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3645 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3371 3646
3372 cf::face::set_visibility $idx, $info->{visibility}; 3647 cf::face::set_visibility $idx, $info->{visibility};
3373 cf::face::set_magicmap $idx, $info->{magicmap}; 3648 cf::face::set_magicmap $idx, $info->{magicmap};
3374 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3649 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3375 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3650 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3376 3651 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3377 cf::cede_to_tick; 3652 $cf::face::HASH{$info->{hash64}} = $idx;
3653 delete $cf::face::META[$idx];
3378 } 3654 }
3379 3655
3380 while (my ($face, $info) = each %$faces) { 3656 while (my ($face, $info) = each %$faces) {
3381 next unless $info->{smooth}; 3657 next unless $info->{smooth};
3382 3658
… …
3385 3661
3386 if (my $smooth = cf::face::find $info->{smooth}) { 3662 if (my $smooth = cf::face::find $info->{smooth}) {
3387 cf::face::set_smooth $idx, $smooth; 3663 cf::face::set_smooth $idx, $smooth;
3388 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3664 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3389 } else { 3665 } else {
3390 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3666 error "smooth face '$info->{smooth}' not found for face '$face'";
3391 } 3667 }
3392
3393 cf::cede_to_tick;
3394 } 3668 }
3395 } 3669 }
3396 3670
3397 { 3671 {
3398 my $anims = $facedata->{animinfo}; 3672 my $anims = $facedata->{animinfo};
3399 3673
3400 while (my ($anim, $info) = each %$anims) { 3674 while (my ($anim, $info) = each %$anims) {
3401 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3675 cf::anim::set $anim, $info->{frames}, $info->{facings};
3402 cf::cede_to_tick;
3403 } 3676 }
3404 3677
3405 cf::anim::invalidate_all; # d'oh 3678 cf::anim::invalidate_all; # d'oh
3406 } 3679 }
3407 3680
3408 { 3681 {
3409 my $res = $facedata->{resource}; 3682 my $res = $facedata->{resource};
3410 3683
3411 while (my ($name, $info) = each %$res) { 3684 while (my ($name, $info) = each %$res) {
3412 if (defined $info->{type}) { 3685 if (defined (my $type = $info->{type})) {
3686 # TODO: different hash - must free and use new index, or cache ixface data queue
3413 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3687 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3414 3688
3415 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3416 cf::face::set_type $idx, $info->{type}; 3689 cf::face::set_type $idx, $type;
3690 cf::face::set_csum $idx, 0, $info->{hash};
3691 $cf::face::SIZE[0][$idx] = $info->{size};
3692 $cf::face::FOFS[0][$idx] = $info->{fofs};
3693 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3694 $cf::face::HASH{$info->{hash}} = $idx;
3417 } else { 3695 } else {
3418 $RESOURCE{$name} = $info; 3696# $RESOURCE{$name} = $info; # unused
3419 } 3697 }
3420
3421 cf::cede_to_tick;
3422 } 3698 }
3423 } 3699 }
3700
3701 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3702
3703 # HACK to clear player env face cache, we need some signal framework
3704 # for this (global event?)
3705 %ext::player_env::MUSIC_FACE_CACHE = ();
3706
3707 # END ATOMIC
3708
3709 cf::debug "facedata atomic update time ", EV::time - $t1;
3424 3710
3425 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3711 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3426 3712
3713 aio_close $fh if $fh; # close old facedata
3714
3427 1 3715 1
3428} 3716}
3429
3430cf::global->attach (on_resource_update => sub {
3431 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3432 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3433
3434 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3435 my $sound = $soundconf->{compat}[$_]
3436 or next;
3437
3438 my $face = cf::face::find "sound/$sound->[1]";
3439 cf::sound::set $sound->[0] => $face;
3440 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3441 }
3442
3443 while (my ($k, $v) = each %{$soundconf->{event}}) {
3444 my $face = cf::face::find "sound/$v";
3445 cf::sound::set $k => $face;
3446 }
3447 }
3448});
3449 3717
3450register_exticmd fx_want => sub { 3718register_exticmd fx_want => sub {
3451 my ($ns, $want) = @_; 3719 my ($ns, $want) = @_;
3452 3720
3453 while (my ($k, $v) = each %$want) { 3721 while (my ($k, $v) = each %$want) {
… …
3461 my $status = load_resource_file_ $_[0]; 3729 my $status = load_resource_file_ $_[0];
3462 get_slot 0.1, 100; 3730 get_slot 0.1, 100;
3463 cf::arch::commit_load; 3731 cf::arch::commit_load;
3464 3732
3465 $status 3733 $status
3734}
3735
3736sub reload_exp_table {
3737 _reload_exp_table;
3738
3739 cf::face::set
3740 "res/exp_table" => FT_RSRC,
3741 JSON::XS->new->utf8->canonical->encode (
3742 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3743 );
3744}
3745
3746sub reload_materials {
3747 _reload_materials;
3466} 3748}
3467 3749
3468sub reload_regions { 3750sub reload_regions {
3469 # HACK to clear player env face cache, we need some signal framework 3751 # HACK to clear player env face cache, we need some signal framework
3470 # for this (global event?) 3752 # for this (global event?)
… …
3478 if exists $_->{match}; 3760 if exists $_->{match};
3479 } 3761 }
3480} 3762}
3481 3763
3482sub reload_facedata { 3764sub reload_facedata {
3483 load_facedata "$DATADIR/facedata" 3765 load_facedata $DATADIR
3484 or die "unable to load facedata\n"; 3766 or die "unable to load facedata\n";
3485} 3767}
3486 3768
3487sub reload_archetypes { 3769sub reload_archetypes {
3488 load_resource_file "$DATADIR/archetypes" 3770 load_resource_file "$DATADIR/archetypes"
3489 or die "unable to load archetypes\n"; 3771 or die "unable to load archetypes\n";
3772
3773 cf::face::set
3774 "res/skill_info" => FT_RSRC,
3775 JSON::XS->new->utf8->canonical->encode (
3776 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3777 );
3778
3779 cf::face::set
3780 "res/spell_paths" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3783 );
3490} 3784}
3491 3785
3492sub reload_treasures { 3786sub reload_treasures {
3493 load_resource_file "$DATADIR/treasures" 3787 load_resource_file "$DATADIR/treasures"
3494 or die "unable to load treasurelists\n"; 3788 or die "unable to load treasurelists\n";
3495} 3789}
3496 3790
3791sub reload_sound {
3792 trace "loading sound config from $DATADIR/sound\n";
3793
3794 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3795
3796 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3797 my $sound = $soundconf->{compat}[$_]
3798 or next;
3799
3800 my $face = cf::face::find "sound/$sound->[1]";
3801 cf::sound::set $sound->[0] => $face;
3802 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3803 }
3804
3805 while (my ($k, $v) = each %{$soundconf->{event}}) {
3806 my $face = cf::face::find "sound/$v";
3807 cf::sound::set $k => $face;
3808 }
3809}
3810
3497sub reload_resources { 3811sub reload_resources {
3498 warn "reloading resource files...\n"; 3812 trace "reloading resource files...\n";
3499 3813
3814 reload_materials;
3500 reload_facedata; 3815 reload_facedata;
3816 reload_exp_table;
3817 reload_sound;
3501 reload_archetypes; 3818 reload_archetypes;
3502 reload_regions; 3819 reload_regions;
3503 reload_treasures; 3820 reload_treasures;
3504 3821
3505 warn "finished reloading resource files\n"; 3822 trace "finished reloading resource files\n";
3506} 3823}
3507 3824
3508sub reload_config { 3825sub reload_config {
3509 warn "reloading config file...\n"; 3826 trace "reloading config file...\n";
3510 3827
3511 open my $fh, "<:utf8", "$CONFDIR/config" 3828 my $config = load_file "$CONFDIR/config";
3512 or return; 3829 utf8::decode $config;
3830 *CFG = decode_yaml $config;
3513 3831
3514 local $/;
3515 *CFG = YAML::XS::Load scalar <$fh>;
3516
3517 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3832 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3518 3833
3519 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3834 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3520 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3835 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3521 3836
3522 if (exists $CFG{mlockall}) { 3837 if (exists $CFG{mlockall}) {
… …
3524 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3839 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3525 and die "WARNING: m(un)lockall failed: $!\n"; 3840 and die "WARNING: m(un)lockall failed: $!\n";
3526 }; 3841 };
3527 warn $@ if $@; 3842 warn $@ if $@;
3528 } 3843 }
3529
3530 warn "finished reloading resource files\n";
3531} 3844}
3532 3845
3533sub pidfile() { 3846sub pidfile() {
3534 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3847 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3535 or die "$PIDFILE: $!"; 3848 or die "$PIDFILE: $!";
… …
3548 seek $fh, 0, 0; 3861 seek $fh, 0, 0;
3549 print $fh $$; 3862 print $fh $$;
3550} 3863}
3551 3864
3552sub main_loop { 3865sub main_loop {
3553 warn "EV::loop starting\n"; 3866 trace "EV::loop starting\n";
3554 if (1) { 3867 if (1) {
3555 EV::loop; 3868 EV::loop;
3556 } 3869 }
3557 warn "EV::loop returned\n"; 3870 trace "EV::loop returned\n";
3558 goto &main_loop unless $REALLY_UNLOOP; 3871 goto &main_loop unless $REALLY_UNLOOP;
3559} 3872}
3560 3873
3561sub main { 3874sub main {
3562 cf::init_globals; # initialise logging 3875 cf::init_globals; # initialise logging
3563 3876
3564 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3877 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3565 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3878 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3566 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3879 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3567 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3880 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3568 3881
3569 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3882 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3570 3883
3571 # we must not ever block the main coroutine 3884 # we must not ever block the main coroutine
3572 local $Coro::idle = sub { 3885 $Coro::idle = sub {
3573 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3886 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3574 (async { 3887 (async {
3575 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3888 $Coro::current->{desc} = "IDLE BUG HANDLER";
3576 EV::loop EV::LOOP_ONESHOT; 3889 EV::loop EV::LOOP_ONESHOT;
3577 })->prio (Coro::PRIO_MAX); 3890 })->prio (Coro::PRIO_MAX);
3578 }; 3891 };
3579 3892
3580 evthread_start IO::AIO::poll_fileno; 3893 evthread_start IO::AIO::poll_fileno;
3581 3894
3582 cf::sync_job { 3895 cf::sync_job {
3583 cf::init_experience; 3896 cf::incloader::init ();
3897
3898 db_init;
3899
3584 cf::init_anim; 3900 cf::init_anim;
3585 cf::init_attackmess; 3901 cf::init_attackmess;
3586 cf::init_dynamic; 3902 cf::init_dynamic;
3587 3903
3588 cf::load_settings; 3904 cf::load_settings;
3589 cf::load_materials;
3590 3905
3591 reload_resources; 3906 reload_resources;
3592 reload_config; 3907 reload_config;
3593 db_init;
3594 3908
3595 cf::init_uuid; 3909 cf::init_uuid;
3596 cf::init_signals; 3910 cf::init_signals;
3597 cf::init_skills; 3911 cf::init_skills;
3598 3912
… …
3606 3920
3607 # no (long-running) fork's whatsoever before this point(!) 3921 # no (long-running) fork's whatsoever before this point(!)
3608 use POSIX (); 3922 use POSIX ();
3609 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3923 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3610 3924
3611 (pop @POST_INIT)->(0) while @POST_INIT; 3925 cf::_post_init 0;
3612 }; 3926 };
3613 3927
3614 cf::object::thawer::errors_are_fatal 0; 3928 cf::object::thawer::errors_are_fatal 0;
3615 warn "parse errors in files are no longer fatal from this point on.\n"; 3929 info "parse errors in files are no longer fatal from this point on.\n";
3616 3930
3931 AE::postpone {
3932 undef &main; # free gobs of memory :)
3933 };
3934
3617 main_loop; 3935 goto &main_loop;
3618} 3936}
3619 3937
3620############################################################################# 3938#############################################################################
3621# initialisation and cleanup 3939# initialisation and cleanup
3622 3940
… …
3661 or return; 3979 or return;
3662 3980
3663 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3981 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3664 and return; 3982 and return;
3665 3983
3666 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 3984 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3667 3985
3668 1 3986 1
3669} 3987}
3670 3988
3671our $uuid_lock; 3989our $uuid_lock;
… …
3683 or return; 4001 or return;
3684 4002
3685 my $value = uuid_seq uuid_cur; 4003 my $value = uuid_seq uuid_cur;
3686 4004
3687 unless ($value) { 4005 unless ($value) {
3688 warn "cowardly refusing to write zero uuid value!\n"; 4006 info "cowardly refusing to write zero uuid value!\n";
3689 return; 4007 return;
3690 } 4008 }
3691 4009
3692 my $value = uuid_str $value + $uuid_skip; 4010 my $value = uuid_str $value + $uuid_skip;
3693 $uuid_skip = 0; 4011 $uuid_skip = 0;
… …
3703 or return; 4021 or return;
3704 4022
3705 aio_rename "$uuid~", $uuid 4023 aio_rename "$uuid~", $uuid
3706 and return; 4024 and return;
3707 4025
3708 warn "uuid file written ($value).\n"; 4026 trace "uuid file written ($value).\n";
3709 4027
3710 1 4028 1
3711 4029
3712} 4030}
3713 4031
… …
3719} 4037}
3720 4038
3721sub emergency_save() { 4039sub emergency_save() {
3722 my $freeze_guard = cf::freeze_mainloop; 4040 my $freeze_guard = cf::freeze_mainloop;
3723 4041
3724 warn "emergency_perl_save: enter\n"; 4042 info "emergency_perl_save: enter\n";
4043
4044 # this is a trade-off: we want to be very quick here, so
4045 # save all maps without fsync, and later call a global sync
4046 # (which in turn might be very very slow)
4047 local $USE_FSYNC = 0;
3725 4048
3726 cf::sync_job { 4049 cf::sync_job {
3727 # this is a trade-off: we want to be very quick here, so 4050 cf::write_runtime_sync; # external watchdog should not bark
3728 # save all maps without fsync, and later call a global sync
3729 # (which in turn might be very very slow)
3730 local $USE_FSYNC = 0;
3731 4051
3732 # use a peculiar iteration method to avoid tripping on perl 4052 # use a peculiar iteration method to avoid tripping on perl
3733 # refcount bugs in for. also avoids problems with players 4053 # refcount bugs in for. also avoids problems with players
3734 # and maps saved/destroyed asynchronously. 4054 # and maps saved/destroyed asynchronously.
3735 warn "emergency_perl_save: begin player save\n"; 4055 info "emergency_perl_save: begin player save\n";
3736 for my $login (keys %cf::PLAYER) { 4056 for my $login (keys %cf::PLAYER) {
3737 my $pl = $cf::PLAYER{$login} or next; 4057 my $pl = $cf::PLAYER{$login} or next;
3738 $pl->valid or next; 4058 $pl->valid or next;
3739 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4059 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3740 $pl->save; 4060 $pl->save;
3741 } 4061 }
3742 warn "emergency_perl_save: end player save\n"; 4062 info "emergency_perl_save: end player save\n";
3743 4063
4064 cf::write_runtime_sync; # external watchdog should not bark
4065
3744 warn "emergency_perl_save: begin map save\n"; 4066 info "emergency_perl_save: begin map save\n";
3745 for my $path (keys %cf::MAP) { 4067 for my $path (keys %cf::MAP) {
3746 my $map = $cf::MAP{$path} or next; 4068 my $map = $cf::MAP{$path} or next;
3747 $map->valid or next; 4069 $map->valid or next;
3748 $map->save; 4070 $map->save;
3749 } 4071 }
3750 warn "emergency_perl_save: end map save\n"; 4072 info "emergency_perl_save: end map save\n";
3751 4073
4074 cf::write_runtime_sync; # external watchdog should not bark
4075
3752 warn "emergency_perl_save: begin database checkpoint\n"; 4076 info "emergency_perl_save: begin database checkpoint\n";
3753 BDB::db_env_txn_checkpoint $DB_ENV; 4077 BDB::db_env_txn_checkpoint $DB_ENV;
3754 warn "emergency_perl_save: end database checkpoint\n"; 4078 info "emergency_perl_save: end database checkpoint\n";
3755 4079
3756 warn "emergency_perl_save: begin write uuid\n"; 4080 info "emergency_perl_save: begin write uuid\n";
3757 write_uuid_sync 1; 4081 write_uuid_sync 1;
3758 warn "emergency_perl_save: end write uuid\n"; 4082 info "emergency_perl_save: end write uuid\n";
4083
4084 cf::write_runtime_sync; # external watchdog should not bark
4085
4086 trace "emergency_perl_save: syncing database to disk";
4087 BDB::db_env_txn_checkpoint $DB_ENV;
4088
4089 info "emergency_perl_save: starting sync\n";
4090 IO::AIO::aio_sync sub {
4091 info "emergency_perl_save: finished sync\n";
4092 };
4093
4094 cf::write_runtime_sync; # external watchdog should not bark
4095
4096 trace "emergency_perl_save: flushing outstanding aio requests";
4097 while (IO::AIO::nreqs || BDB::nreqs) {
4098 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4099 }
4100
4101 cf::write_runtime_sync; # external watchdog should not bark
3759 }; 4102 };
3760 4103
3761 warn "emergency_perl_save: starting sync()\n";
3762 IO::AIO::aio_sync sub {
3763 warn "emergency_perl_save: finished sync()\n";
3764 };
3765
3766 warn "emergency_perl_save: leave\n"; 4104 info "emergency_perl_save: leave\n";
3767} 4105}
3768 4106
3769sub post_cleanup { 4107sub post_cleanup {
3770 my ($make_core) = @_; 4108 my ($make_core) = @_;
3771 4109
4110 IO::AIO::flush;
4111
3772 warn Carp::longmess "post_cleanup backtrace" 4112 error Carp::longmess "post_cleanup backtrace"
3773 if $make_core; 4113 if $make_core;
3774 4114
3775 my $fh = pidfile; 4115 my $fh = pidfile;
3776 unlink $PIDFILE if <$fh> == $$; 4116 unlink $PIDFILE if <$fh> == $$;
3777} 4117}
… …
3801 } 4141 }
3802} 4142}
3803 4143
3804sub do_reload_perl() { 4144sub do_reload_perl() {
3805 # can/must only be called in main 4145 # can/must only be called in main
3806 if (in_main) { 4146 unless (in_main) {
3807 warn "can only reload from main coroutine"; 4147 error "can only reload from main coroutine";
3808 return; 4148 return;
3809 } 4149 }
3810 4150
3811 return if $RELOAD++; 4151 return if $RELOAD++;
3812 4152
3813 my $t1 = AE::time; 4153 my $t1 = AE::time;
3814 4154
3815 while ($RELOAD) { 4155 while ($RELOAD) {
3816 warn "reloading..."; 4156 cf::get_slot 0.1, -1, "reload_perl";
4157 info "perl_reload: reloading...";
3817 4158
3818 warn "entering sync_job"; 4159 trace "perl_reload: entering sync_job";
3819 4160
3820 cf::sync_job { 4161 cf::sync_job {
3821 cf::write_runtime_sync; # external watchdog should not bark
3822 cf::emergency_save; 4162 #cf::emergency_save;
3823 cf::write_runtime_sync; # external watchdog should not bark
3824 4163
3825 warn "syncing database to disk";
3826 BDB::db_env_txn_checkpoint $DB_ENV;
3827
3828 # if anything goes wrong in here, we should simply crash as we already saved
3829
3830 warn "flushing outstanding aio requests";
3831 while (IO::AIO::nreqs || BDB::nreqs) {
3832 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3833 }
3834
3835 warn "cancelling all extension coros"; 4164 trace "perl_reload: cancelling all extension coros";
3836 $_->cancel for values %EXT_CORO; 4165 $_->cancel for values %EXT_CORO;
3837 %EXT_CORO = (); 4166 %EXT_CORO = ();
3838 4167
3839 warn "removing commands"; 4168 trace "perl_reload: removing commands";
3840 %COMMAND = (); 4169 %COMMAND = ();
3841 4170
3842 warn "removing ext/exti commands"; 4171 trace "perl_reload: removing ext/exti commands";
3843 %EXTCMD = (); 4172 %EXTCMD = ();
3844 %EXTICMD = (); 4173 %EXTICMD = ();
3845 4174
3846 warn "unloading/nuking all extensions"; 4175 trace "perl_reload: unloading/nuking all extensions";
3847 for my $pkg (@EXTS) { 4176 for my $pkg (@EXTS) {
3848 warn "... unloading $pkg"; 4177 trace "... unloading $pkg";
3849 4178
3850 if (my $cb = $pkg->can ("unload")) { 4179 if (my $cb = $pkg->can ("unload")) {
3851 eval { 4180 eval {
3852 $cb->($pkg); 4181 $cb->($pkg);
3853 1 4182 1
3854 } or warn "$pkg unloaded, but with errors: $@"; 4183 } or error "$pkg unloaded, but with errors: $@";
3855 } 4184 }
3856 4185
3857 warn "... clearing $pkg"; 4186 trace "... clearing $pkg";
3858 clear_package $pkg; 4187 clear_package $pkg;
3859 } 4188 }
3860 4189
3861 warn "unloading all perl modules loaded from $LIBDIR"; 4190 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3862 while (my ($k, $v) = each %INC) { 4191 while (my ($k, $v) = each %INC) {
3863 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4192 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3864 4193
3865 warn "... unloading $k"; 4194 trace "... unloading $k";
3866 delete $INC{$k}; 4195 delete $INC{$k};
3867 4196
3868 $k =~ s/\.pm$//; 4197 $k =~ s/\.pm$//;
3869 $k =~ s/\//::/g; 4198 $k =~ s/\//::/g;
3870 4199
… …
3873 } 4202 }
3874 4203
3875 clear_package $k; 4204 clear_package $k;
3876 } 4205 }
3877 4206
3878 warn "getting rid of safe::, as good as possible"; 4207 trace "perl_reload: getting rid of safe::, as good as possible";
3879 clear_package "safe::$_" 4208 clear_package "safe::$_"
3880 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4209 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3881 4210
3882 warn "unloading cf.pm \"a bit\""; 4211 trace "perl_reload: unloading cf.pm \"a bit\"";
3883 delete $INC{"cf.pm"}; 4212 delete $INC{"cf.pm"};
3884 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4213 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3885 4214
3886 # don't, removes xs symbols, too, 4215 # don't, removes xs symbols, too,
3887 # and global variables created in xs 4216 # and global variables created in xs
3888 #clear_package __PACKAGE__; 4217 #clear_package __PACKAGE__;
3889 4218
3890 warn "unload completed, starting to reload now"; 4219 info "perl_reload: unload completed, starting to reload now";
3891 4220
3892 warn "reloading cf.pm"; 4221 trace "perl_reload: reloading cf.pm";
3893 require cf; 4222 require cf;
3894 cf::_connect_to_perl_1; 4223 cf::_connect_to_perl_1;
3895 4224
3896 warn "loading config and database again"; 4225 trace "perl_reload: loading config and database again";
3897 cf::reload_config; 4226 cf::reload_config;
3898 4227
3899 warn "loading extensions"; 4228 trace "perl_reload: loading extensions";
3900 cf::load_extensions; 4229 cf::load_extensions;
3901 4230
3902 if ($REATTACH_ON_RELOAD) { 4231 if ($REATTACH_ON_RELOAD) {
3903 warn "reattaching attachments to objects/players"; 4232 trace "perl_reload: reattaching attachments to objects/players";
3904 _global_reattach; # objects, sockets 4233 _global_reattach; # objects, sockets
3905 warn "reattaching attachments to maps"; 4234 trace "perl_reload: reattaching attachments to maps";
3906 reattach $_ for values %MAP; 4235 reattach $_ for values %MAP;
3907 warn "reattaching attachments to players"; 4236 trace "perl_reload: reattaching attachments to players";
3908 reattach $_ for values %PLAYER; 4237 reattach $_ for values %PLAYER;
3909 } 4238 }
3910 4239
3911 warn "running post_init jobs"; 4240 cf::_post_init 1;
3912 (pop @POST_INIT)->(1) while @POST_INIT;
3913 4241
3914 warn "leaving sync_job"; 4242 trace "perl_reload: leaving sync_job";
3915 4243
3916 1 4244 1
3917 } or do { 4245 } or do {
3918 warn $@; 4246 error $@;
3919 cf::cleanup "error while reloading, exiting."; 4247 cf::cleanup "perl_reload: error, exiting.";
3920 }; 4248 };
3921 4249
3922 warn "reloaded";
3923 --$RELOAD; 4250 --$RELOAD;
3924 } 4251 }
3925 4252
3926 $t1 = AE::time - $t1; 4253 $t1 = AE::time - $t1;
3927 warn "reload completed in ${t1}s\n"; 4254 info "perl_reload: completed in ${t1}s\n";
3928}; 4255};
3929 4256
3930our $RELOAD_WATCHER; # used only during reload 4257our $RELOAD_WATCHER; # used only during reload
3931 4258
3932sub reload_perl() { 4259sub reload_perl() {
… …
3953 reload_perl; 4280 reload_perl;
3954 }; 4281 };
3955 } 4282 }
3956}; 4283};
3957 4284
3958unshift @INC, $LIBDIR; 4285#############################################################################
3959 4286
3960my $bug_warning = 0; 4287my $bug_warning = 0;
3961 4288
3962our @WAIT_FOR_TICK;
3963our @WAIT_FOR_TICK_BEGIN;
3964
3965sub wait_for_tick { 4289sub wait_for_tick() {
3966 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4290 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3967 4291
3968 my $signal = new Coro::Signal; 4292 $WAIT_FOR_TICK->wait;
3969 push @WAIT_FOR_TICK, $signal;
3970 $signal->wait;
3971} 4293}
3972 4294
3973sub wait_for_tick_begin { 4295sub wait_for_tick_begin() {
3974 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4296 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3975 4297
3976 my $signal = new Coro::Signal; 4298 my $signal = new Coro::Signal;
3977 push @WAIT_FOR_TICK_BEGIN, $signal; 4299 push @WAIT_FOR_TICK_BEGIN, $signal;
3978 $signal->wait; 4300 $signal->wait;
3979} 4301}
… …
3983 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4305 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3984 unless ++$bug_warning > 10; 4306 unless ++$bug_warning > 10;
3985 return; 4307 return;
3986 } 4308 }
3987 4309
3988 cf::server_tick; # one server iteration 4310 cf::one_tick; # one server iteration
3989 4311
3990 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4312 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3991 4313
3992 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4314 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3993 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4315 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3994 Coro::async_pool { 4316 Coro::async_pool {
3995 $Coro::current->{desc} = "runtime saver"; 4317 $Coro::current->{desc} = "runtime saver";
3996 write_runtime_sync 4318 write_runtime_sync
3997 or warn "ERROR: unable to write runtime file: $!"; 4319 or error "ERROR: unable to write runtime file: $!";
3998 }; 4320 };
3999 } 4321 }
4000 4322
4001 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4323 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4002 $sig->send; 4324 $sig->send;
4003 } 4325 }
4004 while (my $sig = shift @WAIT_FOR_TICK) { 4326 $WAIT_FOR_TICK->broadcast;
4005 $sig->send;
4006 }
4007 4327
4008 $LOAD = ($NOW - $TICK_START) / $TICK; 4328 $LOAD = ($NOW - $TICK_START) / $TICK;
4009 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4329 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4010 4330
4011 if (0) { 4331 if (0) {
4012 if ($NEXT_TICK) { 4332 if ($NEXT_TICK) {
4013 my $jitter = $TICK_START - $NEXT_TICK; 4333 my $jitter = $TICK_START - $NEXT_TICK;
4014 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4334 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4015 warn "jitter $JITTER\n";#d# 4335 debug "jitter $JITTER\n";#d#
4016 } 4336 }
4017 } 4337 }
4018} 4338}
4019 4339
4020{ 4340{
4021 # configure BDB 4341 # configure BDB
4342 info "initialising database";
4022 4343
4023 BDB::min_parallel 16; 4344 BDB::min_parallel 16;
4024 BDB::max_poll_reqs $TICK * 0.1; 4345 BDB::max_poll_reqs $TICK * 0.1;
4025 $AnyEvent::BDB::WATCHER->priority (1); 4346 #$AnyEvent::BDB::WATCHER->priority (1);
4026 4347
4027 unless ($DB_ENV) { 4348 unless ($DB_ENV) {
4028 $DB_ENV = BDB::db_env_create; 4349 $DB_ENV = BDB::db_env_create;
4029 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4350 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4030 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4351 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4055 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4376 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4056 }; 4377 };
4057 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4378 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4058 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4379 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4059 }; 4380 };
4381
4382 info "database initialised";
4060} 4383}
4061 4384
4062{ 4385{
4063 # configure IO::AIO 4386 # configure IO::AIO
4064 4387
4388 info "initialising aio";
4065 IO::AIO::min_parallel 8; 4389 IO::AIO::min_parallel 8;
4066 IO::AIO::max_poll_time $TICK * 0.1; 4390 IO::AIO::max_poll_time $TICK * 0.1;
4067 undef $AnyEvent::AIO::WATCHER; 4391 undef $AnyEvent::AIO::WATCHER;
4392 info "aio initialised";
4068} 4393}
4069 4394
4070my $_log_backtrace; 4395our $_log_backtrace;
4396our $_log_backtrace_last;
4071 4397
4072sub _log_backtrace { 4398sub _log_backtrace {
4073 my ($msg, @addr) = @_; 4399 my ($msg, @addr) = @_;
4074 4400
4075 $msg =~ s/\n//; 4401 $msg =~ s/\n$//;
4076 4402
4403 if ($_log_backtrace_last eq $msg) {
4404 LOG llevInfo, "[ABT] $msg\n";
4405 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4077 # limit the # of concurrent backtraces 4406 # limit the # of concurrent backtraces
4078 if ($_log_backtrace < 2) { 4407 } elsif ($_log_backtrace < 2) {
4408 $_log_backtrace_last = $msg;
4079 ++$_log_backtrace; 4409 ++$_log_backtrace;
4080 my $perl_bt = Carp::longmess $msg; 4410 my $perl_bt = Carp::longmess $msg;
4081 async { 4411 async {
4082 $Coro::current->{desc} = "abt $msg"; 4412 $Coro::current->{desc} = "abt $msg";
4083 4413
… …
4103 LOG llevInfo, "[ABT] $_\n" for @bt; 4433 LOG llevInfo, "[ABT] $_\n" for @bt;
4104 --$_log_backtrace; 4434 --$_log_backtrace;
4105 }; 4435 };
4106 } else { 4436 } else {
4107 LOG llevInfo, "[ABT] $msg\n"; 4437 LOG llevInfo, "[ABT] $msg\n";
4108 LOG llevInfo, "[ABT] [suppressed]\n"; 4438 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4109 } 4439 }
4110} 4440}
4111 4441
4112# load additional modules 4442# load additional modules
4113require "cf/$_.pm" for @EXTRA_MODULES; 4443require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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