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.530 by root, Wed Apr 28 21:05:33 2010 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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; # unused 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
115 122
116our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
124our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 134our $DB_ENV;
128 135
129our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 137
131our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 140
133our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
135our $NOW; 144our $NOW;
136 145
137our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
148 157
149our @POST_INIT; 158our @POST_INIT;
150 159
151our $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)
152our $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;
153 165
154binmode STDOUT; 166binmode STDOUT;
155binmode STDERR; 167binmode STDERR;
156 168
157# read virtual server time, if available 169# read virtual server time, if available
191 203
192=over 4 204=over 4
193 205
194=item $cf::UPTIME 206=item $cf::UPTIME
195 207
196The 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.
197 224
198=item $cf::RUNTIME 225=item $cf::RUNTIME
199 226
200The 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
201every server tick. 228every server tick.
202 229
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 233
207Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
210database environment. 237database environment.
211 238
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 239=item $cf::LOADAVG
221 240
222The 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
223(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
224objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 252from wherever your confdir points to.
234 253
235=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
236 255
237These 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.
238returns 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
239per 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();
240 277
241=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
242 279
243This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
244C<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
252 289
253=back 290=back
254 291
255=cut 292=cut
256 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
257$Coro::State::WARNHOOK = sub { 300$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 301 my $msg = join "", @_;
259 302
260 $msg .= "\n" 303 $msg .= "\n"
261 unless $msg =~ /\n$/; 304 unless $msg =~ /\n$/;
262 305
263 $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;
264 307
265 LOG llevError, $msg; 308 LOG llevWarn, $msg;
266}; 309};
267 310
268$Coro::State::DIEHOOK = sub { 311$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 312 return unless $^S eq 0; # "eq", not "=="
270 313
271 warn Carp::longmess $_[0]; 314 error Carp::longmess $_[0];
272 315
273 if (in_main) {#d# 316 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 317 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 318 return;#d#
276 }#d# 319 }#d#
277 320
278 # kill coroutine otherwise 321 # kill coroutine otherwise
279 Coro::terminate 322 Coro::terminate
299)) { 342)) {
300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301} 344}
302 345
303$EV::DIED = sub { 346$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
305}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
306 354
307############################################################################# 355#############################################################################
308 356
309=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
310 358
331 $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;
332 $d 380 $d
333 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
334} 382}
335 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
336=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
337 437
338Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
339 439
340=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
346our $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
347 447
348sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
350 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
351=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
352 483
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
355 486
356The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 488is a reload or not.
358 489
359=cut 490=cut
360 491
361sub post_init(&) { 492sub post_init(&) {
362 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 }
363} 511}
364 512
365=item cf::lock_wait $string 513=item cf::lock_wait $string
366 514
367Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
420 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
421} 569}
422 570
423=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
424 572
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
426This 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
427of 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.
428 580
429The 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
430used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
431 583
432Useful for short background jobs. 584Useful for short background jobs.
444 my $signal = new Coro::Signal; 596 my $signal = new Coro::Signal;
445 my $busy; 597 my $busy;
446 598
447 while () { 599 while () {
448 next_job: 600 next_job:
601
602 Coro::cede;
449 603
450 my $avail = cf::till_tick; 604 my $avail = cf::till_tick;
451 605
452 for (0 .. $#SLOT_QUEUE) { 606 for (0 .. $#SLOT_QUEUE) {
453 if ($SLOT_QUEUE[$_][0] <= $avail) { 607 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0; 608 $busy = 0;
455 my $job = splice @SLOT_QUEUE, $_, 1, (); 609 my $job = splice @SLOT_QUEUE, $_, 1, ();
456 $job->[2]->send; 610 $job->[2]->send;
457 Coro::cede;
458 goto next_job; 611 goto next_job;
459 } else { 612 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 613 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
461 } 614 }
462 } 615 }
463 616
464 if (@SLOT_QUEUE) { 617 if (@SLOT_QUEUE) {
465 # we do not use wait_for_tick() as it returns immediately when tick is inactive 618 wait_for_tick;
466 push @cf::WAIT_FOR_TICK, $signal;
467 $signal->wait;
468 } else { 619 } else {
469 $busy = 0; 620 $busy = 0;
470 Coro::schedule; 621 Coro::schedule;
471 } 622 }
472 } 623 }
512=cut 663=cut
513 664
514sub sync_job(&) { 665sub sync_job(&) {
515 my ($job) = @_; 666 my ($job) = @_;
516 667
517 if ($Coro::current == $Coro::main) { 668 if (in_main) {
518 my $time = AE::time; 669 my $time = AE::time;
519 670
520 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
522 673
523 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
524 675
525 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
526 677
527 my $busy = 1; 678 my $busy = 1;
528 my @res; 679 my @res;
529 680
530 (async { 681 (async {
531 $Coro::current->desc ("sync job coro"); 682 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 683 @res = eval { $job->() };
533 warn $@ if $@; 684 error $@ if $@;
534 undef $busy; 685 undef $busy;
535 })->prio (Coro::PRIO_MAX); 686 })->prio (Coro::PRIO_MAX);
536 687
537 while ($busy) { 688 while ($busy) {
538 if (Coro::nready) { 689 if (Coro::nready) {
539 Coro::cede_notself; 690 Coro::cede_notself;
540 } else { 691 } else {
541 EV::loop EV::LOOP_ONESHOT; 692 EV::run EV::RUN_ONCE;
542 } 693 }
543 } 694 }
544 695
545 my $time = AE::time - $time; 696 my $time = AE::time - $time;
546 697
572 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
573 724
574 $coro 725 $coro
575} 726}
576 727
577=item fork_call { }, $args 728=item fork_call { }, @args
578 729
579Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 733never block itself or use any form of event handling.
583 734
584=cut 735=cut
585 736
737sub post_fork {
738 reset_signals;
739}
740
586sub fork_call(&@) { 741sub fork_call(&@) {
587 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
588 743
589 # we seemingly have to make a local copy of the whole thing,
590 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious)
592
593 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
594 reset_signals; 745 cf::post_fork;
595 &$cb 746 &$cb
596 }, @args; 747 } @args;
597 748
598 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
599} 750}
600 751
601sub objinfo { 752sub objinfo {
651within each server. 802within each server.
652 803
653=cut 804=cut
654 805
655sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
656 my ($name) = @_; 810 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
658 812
659 eval { 813 eval {
660 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
670} 824}
671 825
672our $DB; 826our $DB;
673 827
674sub db_init { 828sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
677 };
678} 830}
679 831
680sub db_get($$) { 832sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
682 834
683 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
684 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
685 839
686 $! ? () 840 $! ? ()
687 : $data 841 : $data
688 }
689} 842}
690 843
691sub db_put($$$) { 844sub db_put($$$) {
692 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 874
722 my @data; 875 my @data;
723 my $md5; 876 my $md5;
724 877
725 for (0 .. $#$src) { 878 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 880 }
729 881
730 # if processing is expensive, check 882 # if processing is expensive, check
731 # checksum first 883 # checksum first
732 if (1) { 884 if (1) {
745 897
746 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
747 } 899 }
748 } 900 }
749 901
750 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
751 my $data = $process->(\@data); 903 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
753 905
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 907
756 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 910 db_put cache => "$id/meta", $meta;
759 911
769 921
770=cut 922=cut
771 923
772sub datalog($@) { 924sub datalog($@) {
773 my ($type, %kv) = @_; 925 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 926 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 927}
776 928
777=back 929=back
778 930
779=cut 931=cut
974 1126
975 } elsif (exists $cb_id{$type}) { 1127 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1128 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1129
978 } elsif (ref $type) { 1130 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1131 error "attaching objects not supported, ignoring.\n";
980 1132
981 } else { 1133 } else {
982 shift @arg; 1134 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1135 error "attach argument '$type' not supported, ignoring.\n";
984 } 1136 }
985 } 1137 }
986} 1138}
987 1139
988sub _object_attach { 1140sub _object_attach {
998 _attach $registry, $klass, @attach; 1150 _attach $registry, $klass, @attach;
999 } 1151 }
1000 1152
1001 $obj->{$name} = \%arg; 1153 $obj->{$name} = \%arg;
1002 } else { 1154 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1155 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1156 }
1005 1157
1006 $obj->{_attachment}{$name} = undef; 1158 $obj->{_attachment}{$name} = undef;
1007} 1159}
1008 1160
1067 1219
1068 for (@$callbacks) { 1220 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1221 eval { &{$_->[1]} };
1070 1222
1071 if ($@) { 1223 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1224 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1225 override;
1075 } 1226 }
1076 1227
1077 return 1 if $override; 1228 return 1 if $override;
1078 } 1229 }
1157 for (@$attach) { 1308 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1309 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1310 _attach $registry, $klass, @attach;
1160 } 1311 }
1161 } else { 1312 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1313 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1314 }
1164 } 1315 }
1165} 1316}
1166 1317
1167cf::attachable->attach ( 1318cf::attachable->attach (
1194 my ($filename, $rdata, $objs) = @_; 1345 my ($filename, $rdata, $objs) = @_;
1195 1346
1196 sync_job { 1347 sync_job {
1197 if (length $$rdata) { 1348 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1349 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1350 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1351 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1352 if $VERBOSE_IO;
1202 1353
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1354 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1355 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1356 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1228 aio_rename "$filename~", $filename; 1379 aio_rename "$filename~", $filename;
1229 1380
1230 $filename =~ s%/[^/]+$%%; 1381 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1382 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1383 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1384 error "unable to save objects: $filename~: $!\n";
1234 } 1385 }
1235 } else { 1386 } else {
1236 aio_unlink $filename; 1387 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1388 aio_unlink "$filename.pst";
1238 } 1389 }
1262 my $st = eval { Coro::Storable::thaw $av }; 1413 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1414 $av = $st->{objs};
1264 } 1415 }
1265 1416
1266 utf8::decode (my $decname = $filename); 1417 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1418 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1419 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1420 if $VERBOSE_IO;
1270 1421
1271 ($data, $av) 1422 ($data, $av)
1272} 1423}
1273 1424
1278=cut 1429=cut
1279 1430
1280############################################################################# 1431#############################################################################
1281# command handling &c 1432# command handling &c
1282 1433
1283=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1284 1435
1285Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1286$name. 1437$name.
1287 1438
1288=cut 1439=cut
1294 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1295 1446
1296 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1297} 1448}
1298 1449
1299=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1300 1451
1301Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1302extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1303received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1304the 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
1305has logged in successfully. 1456has logged in successfully.
1306 1457
1307If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1308called.
1309 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
1310=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1311 1466
1312Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1313exticmd 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
1314are 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
1315is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1316log-in. 1471log-in.
1317 1472
1318If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1319called.
1320 1474
1321=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322 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
1323sub register_extcmd { 1482sub register_extcmd($$) {
1324 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1325 1484
1326 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1327} 1486}
1328 1487
1329sub register_exticmd { 1488sub register_async_extcmd($$) {
1330 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1331 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1332 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1333} 1504}
1334 1505
1335use File::Glob (); 1506use File::Glob ();
1336 1507
1337cf::player->attach ( 1508cf::player->attach (
1351 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1352 1523
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1525
1355 if (ref $msg) { 1526 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1528
1361 my @reply;
1362
1363 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}) {
1364 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1365 } 1547 }
1366 1548
1367 $pl->ext_reply ($reply, @reply)
1368 if $reply;
1369
1370 } else { 1549 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1551 }
1373 1552
1374 cf::override; 1553 cf::override;
1375 }, 1554 },
1376); 1555);
1386 }; 1565 };
1387 1566
1388 $grp 1567 $grp
1389} 1568}
1390 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
1391sub load_extensions { 1581sub load_extensions {
1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1585
1392 cf::sync_job { 1586 cf::sync_job {
1393 my %todo; 1587 my %todo;
1394 1588
1395 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1590 next unless -r $path;
1414 1608
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1611
1418 $ext{source} = 1612 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1421 . $source 1615 . $source
1422 . "\n};\n1"; 1616 . "\n};\n1";
1423 1617
1424 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1436 for (split /,\s*/, $v->{meta}{depends}) { 1630 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1631 next ext
1438 unless exists $done{$_}; 1632 unless exists $done{$_};
1439 } 1633 }
1440 1634
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 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
1443 my $active = eval $v->{source}; 1646 my $active = eval $source;
1444 1647
1445 if (length $@) { 1648 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1447 1650
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1652 if exists $v->{meta}{mandatory};
1450 1653
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1654 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1453 } else { 1656 } else {
1454 $done{$k} = delete $todo{$k}; 1657 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1658 push @EXTS, $v->{pkg};
1456 $progress = 1; 1659 $progress = 1;
1457 1660
1458 warn "$v->{base}: extension inactive.\n" 1661 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1662 unless $active;
1460 } 1663 }
1461 } 1664 }
1462 1665
1463 unless ($progress) { 1666 unless ($progress) {
1465 1668
1466 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1469 } 1672 }
1673
1674 last;
1470 } 1675 }
1471 } 1676 }
1472 }; 1677 };
1473} 1678}
1474 1679
1632 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1633 1838
1634 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1635 $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
1636 1841
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1843 $pl->deactivate;
1844
1639 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;
1640 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1641 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1642 1850
1643 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1644 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1645 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1731 1939
1732=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1733 1941
1734Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1735 1943
1736=item $player->ext_reply ($msgid, @msg)
1737
1738Sends an ext reply to the player.
1739
1740=cut
1741
1742sub ext_reply($$@) {
1743 my ($self, $id, @msg) = @_;
1744
1745 $self->ns->ext_reply ($id, @msg)
1746}
1747
1748=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1749 1945
1750Sends an ext event to the client. 1946Sends an ext event to the client.
1751 1947
1752=cut 1948=cut
1811sub generate_random_map { 2007sub generate_random_map {
1812 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1813 2009
1814 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
1815 2011
1816 # mit "rum" bekleckern, nicht
1817 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1818 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821 $rmp->{exit_on_final_map},
1822 $rmp->{xsize}, $rmp->{ysize},
1823 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828 (cf::region::find $rmp->{region}), $rmp->{custom}
1829 )
1830} 2013}
1831 2014
1832=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1833 2016
1834Register 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
1839 2022
1840sub register { 2023sub register {
1841 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1842 my $pkg = caller; 2025 my $pkg = caller;
1843 2026
1844 no strict;
1845 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1846 2028
1847 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848} 2030}
1849 2031
1861} 2043}
1862 2044
1863sub normalise { 2045sub normalise {
1864 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1865 2047
1866 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1867 2049
1868 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1869 2051
1870 # map plan: 2052 # map plan:
1871 # 2053 #
1886 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1887 $path = "$base/$path"; 2069 $path = "$base/$path";
1888 } 2070 }
1889 2071
1890 for ($path) { 2072 for ($path) {
1891 redo if s{//}{/};
1892 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1893 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1894 } 2075 }
1895 2076
1896 $path 2077 $path
1910 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1911 return $self; 2092 return $self;
1912 } 2093 }
1913 } 2094 }
1914 2095
1915 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1916 () 2097 ()
1917} 2098}
1918 2099
2100# may re-bless or do other evil things
1919sub init { 2101sub init {
1920 my ($self) = @_; 2102 my ($self) = @_;
1921 2103
1922 $self 2104 $self
1923} 2105}
1988 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1989 2171
1990 1 2172 1
1991} 2173}
1992 2174
2175# used to laod the header of an original map
1993sub load_header_orig { 2176sub load_header_orig {
1994 my ($self) = @_; 2177 my ($self) = @_;
1995 2178
1996 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
1997} 2180}
1998 2181
2182# used to laod the header of an instantiated map
1999sub load_header_temp { 2183sub load_header_temp {
2000 my ($self) = @_; 2184 my ($self) = @_;
2001 2185
2002 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2003} 2187}
2004 2188
2189# called after loading the header from an instantiated map
2005sub prepare_temp { 2190sub prepare_temp {
2006 my ($self) = @_; 2191 my ($self) = @_;
2007 2192
2008 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2009 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2010 # safety 2195 # safety
2011 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2012 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2013} 2198}
2014 2199
2200# called after loading the header from an original map
2015sub prepare_orig { 2201sub prepare_orig {
2016 my ($self) = @_; 2202 my ($self) = @_;
2017 2203
2018 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2019 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2043 2229
2044sub find; 2230sub find;
2045sub find { 2231sub find {
2046 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2047 2233
2234 cf::cede_to_tick;
2235
2048 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2049 2237
2050 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2052 2240
2053 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2084 2272
2085 { 2273 {
2086 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2087 2275
2088 return unless $self->valid; 2276 return unless $self->valid;
2089 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2090
2091 $self->in_memory (cf::MAP_LOADING);
2092 2278
2093 $self->alloc; 2279 $self->alloc;
2094 2280
2095 $self->pre_load; 2281 $self->pre_load;
2096 cf::cede_to_tick; 2282 cf::cede_to_tick;
2097 2283
2284 if (exists $self->{load_path}) {
2098 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2099 $f->skip_block; 2286 $f->skip_block;
2100 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2101 or return; 2288 or return;
2102 2289
2103 $self->post_load_original 2290 $self->post_load_original
2104 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2105 2292
2106 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2107 utf8::encode $uniq; 2294 utf8::encode $uniq;
2108 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2109 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2110 $self->clear_unique_items; 2297 $self->clear_unique_items;
2111 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2112 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2113 } 2301 }
2114 } 2302 }
2115 }
2116 2303
2117 $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);
2118 2311
2119 cf::cede_to_tick; 2312 cf::cede_to_tick;
2120 # now do the right thing for maps 2313 # now do the right thing for maps
2121 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2122 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2126 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2127 $self->decay_objects; 2320 $self->decay_objects;
2128 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2129 $self->update_buttons; 2322 $self->update_buttons;
2130 cf::cede_to_tick; 2323 cf::cede_to_tick;
2131 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2132 } 2325 }
2133 2326
2134 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2135 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2136
2137 $self->in_memory (cf::MAP_ACTIVE);
2138 } 2329 }
2139 2330
2140 $self->post_load; 2331 $self->post_load;
2332
2333 1
2141} 2334}
2142 2335
2143# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2144# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2145# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2153# if $self->per_party; 2346# if $self->per_party;
2154 2347
2155 $self 2348 $self
2156} 2349}
2157 2350
2158# find and load all maps in the 3x3 area around a map
2159sub load_neighbours {
2160 my ($map) = @_;
2161
2162 my @neigh; # diagonal neighbours
2163
2164 for (0 .. 3) {
2165 my $neigh = $map->tile_path ($_)
2166 or next;
2167 $neigh = find $neigh, $map
2168 or next;
2169 $neigh->load;
2170
2171 # now find the diagonal neighbours
2172 push @neigh,
2173 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2174 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2175 }
2176
2177 for (grep defined $_->[0], @neigh) {
2178 my ($path, $origin) = @$_;
2179 my $neigh = find $path, $origin
2180 or next;
2181 $neigh->load;
2182 }
2183}
2184
2185sub find_sync { 2351sub find_sync {
2186 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2187 2353
2188 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
2189} 2359}
2190 2360
2191sub do_load_sync { 2361sub do_load_sync {
2192 my ($map) = @_; 2362 my ($map) = @_;
2193 2363
2364 # it's a bug to call this from the main context
2194 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2196 2367
2197 cf::sync_job { $map->load }; 2368 $map->load;
2198} 2369}
2199 2370
2200our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2201our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2202 2373
2203sub find_async { 2374sub find_async {
2204 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2205 2376
2206 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2207 2378
2208 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2209 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2210 } 2381 }
2211 2382
2212 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2213 2384
2214 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2215 $Coro::current->{desc} = "map prefetcher"; 2386 $Coro::current->{desc} = "map prefetcher";
2216 2387
2217 while (%MAP_PREFETCH) { 2388 while (%MAP_PREFETCH) {
2218 while (my ($k, $v) = each %MAP_PREFETCH) { 2389 for my $k (keys %MAP_PREFETCH) {
2219 if (my $map = find $k) { 2390 if (my $map = find $k) {
2220 $map->load if $v; 2391 $map->load if $v;
2221 } 2392 }
2222 2393
2223 delete $MAP_PREFETCH{$k}; 2394 delete $MAP_PREFETCH{$k};
2273sub swap_out { 2444sub swap_out {
2274 my ($self) = @_; 2445 my ($self) = @_;
2275 2446
2276 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277 2448
2278 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2279 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2280 return if $self->players; 2451 return if $self->players;
2281 2452
2282 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2283 $self->deactivate; 2454 $self->deactivate;
2284 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2285 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2286 2457
2287 # then atomically save 2458 # then atomically save
2288 $self->_save; 2459 $self->_save;
2289 2460
2290 # then free the map 2461 # then free the map
2314 2485
2315 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2486 my $lock = cf::lock_acquire "map_data:$self->{path}";
2316 2487
2317 return if $self->players; 2488 return if $self->players;
2318 2489
2319 warn "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2320 2491
2321 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2322 2493
2323 # need to save uniques path 2494 # need to save uniques path
2324 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2325 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2326 2497
2479 2650
2480Creates 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.
2481 2652
2482=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2483 2654
2484returns 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,
2485even if the object actually exists. May block. 2656even if the object actually exists. May block.
2486 2657
2487=cut 2658=cut
2488 2659
2489sub deref { 2660sub deref {
2571=item $player_object->may ("access") 2742=item $player_object->may ("access")
2572 2743
2573Returns wether the given player is authorized to access resource "access" 2744Returns wether the given player is authorized to access resource "access"
2574(e.g. "command_wizcast"). 2745(e.g. "command_wizcast").
2575 2746
2747This is implemented by checking a config setting of C<may_access> where
2748C<access> is replaced by the access string. The following alternatives are
2749possible (and are tested in order):
2750
2751=over 4
2752
2753=item * Player is DM
2754
2755The request will succeed.
2756
2757=item * may_access is an array reference
2758
2759If either the player nickname or UUID is in the array, the request will
2760succeed, otherwise it will fail.
2761
2762=item * may_access is a true value
2763
2764The request will succeed.
2765
2766=item * may_access is missing or false
2767
2768The request will fail.
2769
2770=back
2771
2576=cut 2772=cut
2577 2773
2578sub cf::object::player::may { 2774sub cf::object::player::may {
2579 my ($self, $access) = @_; 2775 my ($self, $access) = @_;
2580 2776
2581 $self->flag (cf::FLAG_WIZ) || 2777 $self->flag (cf::FLAG_WIZ) ||
2582 (ref $cf::CFG{"may_$access"} 2778 (ref $cf::CFG{"may_$access"}
2583 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2779 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2584 : $cf::CFG{"may_$access"}) 2780 : $cf::CFG{"may_$access"})
2585} 2781}
2586 2782
2587=item $player_object->enter_link 2783=item $player_object->enter_link
2588 2784
2591The player should be reasonably safe there for short amounts of time (e.g. 2787The player should be reasonably safe there for short amounts of time (e.g.
2592for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2788for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2593though, as the player cannot control the character while it is on the link 2789though, as the player cannot control the character while it is on the link
2594map. 2790map.
2595 2791
2596Will never block. 2792This method will never block, which is the whole reaosn for it's
2793existance: you can I<always> put a player onto the link map, which is the
2794only place to put objects that is guaranteed to exist.
2795
2796A typical usage pattern is to call C<enter_link> synchronously from the
2797server, then start a new thread, do your blocking stuff there and then
2798call C<leave_link> from that thread.
2597 2799
2598=item $player_object->leave_link ($map, $x, $y) 2800=item $player_object->leave_link ($map, $x, $y)
2599 2801
2600Moves the player out of the special C<{link}> map onto the specified 2802Moves the player out of the special C<{link}> map onto the specified
2601map. If the map is not valid (or omitted), the player will be moved back 2803map. If the map is not valid (or omitted), the player will be moved back
2656 # use -1 or undef as default coordinates, not 0, 0 2858 # use -1 or undef as default coordinates, not 0, 0
2657 ($x, $y) = ($map->enter_x, $map->enter_y) 2859 ($x, $y) = ($map->enter_x, $map->enter_y)
2658 if $x <= 0 && $y <= 0; 2860 if $x <= 0 && $y <= 0;
2659 2861
2660 $map->load; 2862 $map->load;
2661 $map->load_neighbours;
2662 2863
2663 return unless $self->contr->active; 2864 return unless $self->contr->active;
2664 2865
2665 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2866 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666 if ($self->enter_map ($map, $x, $y)) { 2867 if ($self->enter_map ($map, $x, $y)) {
2689 2890
2690sub cf::object::player::goto { 2891sub cf::object::player::goto {
2691 my ($self, $path, $x, $y, $check, $done) = @_; 2892 my ($self, $path, $x, $y, $check, $done) = @_;
2692 2893
2693 if ($self->{_link_recursion} >= $MAX_LINKS) { 2894 if ($self->{_link_recursion} >= $MAX_LINKS) {
2694 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2895 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2896 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696 ($path, $x, $y) = @$EMERGENCY_POSITION; 2897 ($path, $x, $y) = @$EMERGENCY_POSITION;
2697 } 2898 }
2698 2899
2699 # do generation counting so two concurrent goto's will be executed in-order 2900 # do generation counting so two concurrent goto's will be executed in-order
2722 ($path, $x, $y) = (undef, undef, undef); 2923 ($path, $x, $y) = (undef, undef, undef);
2723 } 2924 }
2724 } 2925 }
2725 2926
2726 my $map = eval { 2927 my $map = eval {
2727 my $map = defined $path ? cf::map::find $path : undef; 2928 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728 2929
2729 if ($map) { 2930 if ($map) {
2730 $map = $map->customise_for ($self); 2931 $map = $map->customise_for ($self);
2731 $map = $check->($map, $x, $y, $self) if $check && $map; 2932 $map = $check->($map, $x, $y, $self) if $check && $map;
2732 } else { 2933 } else {
2822 $Coro::current->{desc} = "enter_exit"; 3023 $Coro::current->{desc} = "enter_exit";
2823 3024
2824 unless (eval { 3025 unless (eval {
2825 $self->deactivate_recursive; # just to be sure 3026 $self->deactivate_recursive; # just to be sure
2826 3027
2827 # random map handling
2828 {
2829 my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831 prepare_random_map $exit
2832 if $exit->slaying eq "/!";
2833 }
2834
2835 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3028 my $map = cf::map::normalise $exit->slaying, $exit->map;
2836 my $x = $exit->stats->hp; 3029 my $x = $exit->stats->hp;
2837 my $y = $exit->stats->sp; 3030 my $y = $exit->stats->sp;
3031
3032 # special map handling
3033 my $slaying = $exit->slaying;
3034
3035 # special map handling
3036 if ($slaying eq "/!") {
3037 my $guard = cf::lock_acquire "exit_prepare:$exit";
3038
3039 prepare_random_map $exit
3040 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3041
3042 $map = $exit->slaying;
3043
3044 } elsif ($slaying eq '!up') {
3045 $map = $exit->map->tile_path (cf::TILE_UP);
3046 $x = $exit->x;
3047 $y = $exit->y;
3048
3049 } elsif ($slaying eq '!down') {
3050 $map = $exit->map->tile_path (cf::TILE_DOWN);
3051 $x = $exit->x;
3052 $y = $exit->y;
3053 }
2838 3054
2839 $self->goto ($map, $x, $y); 3055 $self->goto ($map, $x, $y);
2840 3056
2841 # if exit is damned, update players death & WoR home-position 3057 # if exit is damned, update players death & WoR home-position
2842 $self->contr->savebed ($map, $x, $y) 3058 $self->contr->savebed ($map, $x, $y)
2847 $self->message ("Something went wrong deep within the deliantra server. " 3063 $self->message ("Something went wrong deep within the deliantra server. "
2848 . "I'll try to bring you back to the map you were before. " 3064 . "I'll try to bring you back to the map you were before. "
2849 . "Please report this to the dungeon master!", 3065 . "Please report this to the dungeon master!",
2850 cf::NDI_UNIQUE | cf::NDI_RED); 3066 cf::NDI_UNIQUE | cf::NDI_RED);
2851 3067
2852 warn "ERROR in enter_exit: $@"; 3068 error "ERROR in enter_exit: $@";
2853 $self->leave_link; 3069 $self->leave_link;
2854 } 3070 }
2855 })->prio (1); 3071 })->prio (1);
2856} 3072}
2857 3073
2858=head3 cf::client 3074=head3 cf::client
2859 3075
2860=over 4 3076=over 4
2861
2862=item $client->send_drawinfo ($text, $flags)
2863
2864Sends a drawinfo packet to the client. Circumvents output buffering so
2865should not be used under normal circumstances.
2866
2867=cut
2868
2869sub cf::client::send_drawinfo {
2870 my ($self, $text, $flags) = @_;
2871
2872 utf8::encode $text;
2873 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874}
2875 3077
2876=item $client->send_big_packet ($pkt) 3078=item $client->send_big_packet ($pkt)
2877 3079
2878Like C<send_packet>, but tries to compress large packets, and fragments 3080Like C<send_packet>, but tries to compress large packets, and fragments
2879them as required. 3081them as required.
2898 $self->send_packet ($pkt); 3100 $self->send_packet ($pkt);
2899} 3101}
2900 3102
2901=item $client->send_msg ($channel, $msg, $color, [extra...]) 3103=item $client->send_msg ($channel, $msg, $color, [extra...])
2902 3104
2903Send a drawinfo or msg packet to the client, formatting the msg for the 3105Send a msg packet to the client, formatting the msg for the client if
2904client if neccessary. C<$type> should be a string identifying the type of 3106necessary. C<$type> should be a string identifying the type of the
2905the message, with C<log> being the default. If C<$color> is negative, suppress 3107message, with C<log> being the default. If C<$color> is negative, suppress
2906the message unless the client supports the msg packet. 3108the message unless the client supports the msg packet.
2907 3109
2908=cut 3110=cut
2909 3111
2910# non-persistent channels (usually the info channel) 3112# non-persistent channels (usually the info channel)
3015 id => "death", 3217 id => "death",
3016 title => "Death", 3218 title => "Death",
3017 reply => undef, 3219 reply => undef,
3018 tooltip => "Reason for and more info about your most recent death", 3220 tooltip => "Reason for and more info about your most recent death",
3019 }, 3221 },
3222 "c/fatal" => {
3223 id => "fatal",
3224 title => "Fatal Error",
3225 reply => undef,
3226 tooltip => "Reason for the server disconnect",
3227 },
3020 "c/say" => $SAY_CHANNEL, 3228 "c/say" => $SAY_CHANNEL,
3021 "c/chat" => $CHAT_CHANNEL, 3229 "c/chat" => $CHAT_CHANNEL,
3022); 3230);
3023 3231
3024sub cf::client::send_msg { 3232sub cf::client::send_msg {
3067=cut 3275=cut
3068 3276
3069sub cf::client::ext_msg($$@) { 3277sub cf::client::ext_msg($$@) {
3070 my ($self, $type, @msg) = @_; 3278 my ($self, $type, @msg) = @_;
3071 3279
3072 if ($self->extcmd == 2) {
3073 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3280 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3074 } elsif ($self->extcmd == 1) { # TODO: remove
3075 push @msg, msgtype => "event_$type";
3076 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3077 }
3078}
3079
3080=item $client->ext_reply ($msgid, @msg)
3081
3082Sends an ext reply to the client.
3083
3084=cut
3085
3086sub cf::client::ext_reply($$@) {
3087 my ($self, $id, @msg) = @_;
3088
3089 if ($self->extcmd == 2) {
3090 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091 } elsif ($self->extcmd == 1) {
3092 #TODO: version 1, remove
3093 unshift @msg, msgtype => "reply", msgid => $id;
3094 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095 }
3096} 3281}
3097 3282
3098=item $success = $client->query ($flags, "text", \&cb) 3283=item $success = $client->query ($flags, "text", \&cb)
3099 3284
3100Queues a query to the client, calling the given callback with 3285Queues a query to the client, calling the given callback with
3120 3305
3121 $self->send_packet ($self->{query_queue}[0][0]) 3306 $self->send_packet ($self->{query_queue}[0][0])
3122 if @{ $self->{query_queue} } == 1; 3307 if @{ $self->{query_queue} } == 1;
3123 3308
3124 1 3309 1
3310}
3311
3312=item $client->update_command_faces
3313
3314=cut
3315
3316our %COMMAND_FACE;
3317
3318sub cf::client::update_command_faces {
3319 my ($self) = @_;
3320
3321 my @faces = grep $_,
3322 $COMMAND_FACE{preferred},
3323 $COMMAND_FACE{standard},
3324 $COMMAND_FACE{skill},
3325 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3326 $COMMAND_FACE{emote},
3327 ;
3328
3329 $self->send_face ($_)
3330 for @faces;
3331 $self->flush_fx;
3332
3333 $self->ext_msg (command_list => @faces);
3334}
3335
3336=item cf::client::set_command_face $type, $commands
3337
3338=cut
3339
3340sub cf::client::set_command_face {
3341 my ($type, $list) = @_;
3342
3343 my $idx = &cf::face::set ( #d# ugly forward reference
3344 "command_list/$type" => cf::FT_RSRC,
3345 JSON::XS->new->utf8->encode ([ sort @$list ])
3346 );
3347
3348 $COMMAND_FACE{$type} = $idx;
3125} 3349}
3126 3350
3127cf::client->attach ( 3351cf::client->attach (
3128 on_connect => sub { 3352 on_connect => sub {
3129 my ($ns) = @_; 3353 my ($ns) = @_;
3155 my ($ns, $buf) = @_; 3379 my ($ns, $buf) = @_;
3156 3380
3157 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3381 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158 3382
3159 if (ref $msg) { 3383 if (ref $msg) {
3160 my ($type, $reply, @payload) = 3384 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161 "ARRAY" eq ref $msg
3162 ? @$msg
3163 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164 3385
3165 my @reply;
3166
3167 if (my $cb = $EXTICMD{$type}) { 3386 if (my $cb = $EXTIACMD{$type}) {
3387 $cb->(
3388 $ns,
3389 sub {
3390 $ns->ext_msg ("reply-$reply", @_)
3391 if $reply;
3392 },
3393 @payload
3394 );
3395 } else {
3396 my @reply;
3397
3398 if (my $cb = $EXTICMD{$type}) {
3168 @reply = $cb->($ns, @payload); 3399 @reply = $cb->($ns, @payload);
3400 }
3401
3402 $ns->ext_msg ("reply-$reply", @reply)
3403 if $reply;
3169 } 3404 }
3170
3171 $ns->ext_reply ($reply, @reply)
3172 if $reply;
3173
3174 } else { 3405 } else {
3175 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3406 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176 } 3407 }
3177 3408
3178 cf::override; 3409 cf::override;
3179 }, 3410 },
3180); 3411);
3261 decrease split destroy change_exp value msg lore send_msg)], 3492 decrease split destroy change_exp value msg lore send_msg)],
3262 ["cf::object::player" => qw(player)], 3493 ["cf::object::player" => qw(player)],
3263 ["cf::player" => qw(peaceful send_msg)], 3494 ["cf::player" => qw(peaceful send_msg)],
3264 ["cf::map" => qw(trigger)], 3495 ["cf::map" => qw(trigger)],
3265) { 3496) {
3266 no strict 'refs';
3267 my ($pkg, @funs) = @$_; 3497 my ($pkg, @funs) = @$_;
3268 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3498 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269 for @funs; 3499 for @funs;
3270} 3500}
3271 3501
3310 local @cf::_safe_eval_args = values %vars; 3540 local @cf::_safe_eval_args = values %vars;
3311 @res = wantarray ? eval eval : scalar eval $eval; 3541 @res = wantarray ? eval eval : scalar eval $eval;
3312 } 3542 }
3313 3543
3314 if ($@) { 3544 if ($@) {
3315 warn "$@"; 3545 warn "$@",
3316 warn "while executing safe code '$code'\n"; 3546 "while executing safe code '$code'\n",
3317 warn "with arguments " . (join " ", %vars) . "\n"; 3547 "with arguments " . (join " ", %vars) . "\n";
3318 } 3548 }
3319 3549
3320 wantarray ? @res : $res[0] 3550 wantarray ? @res : $res[0]
3321} 3551}
3322 3552
3347=cut 3577=cut
3348 3578
3349############################################################################# 3579#############################################################################
3350# the server's init and main functions 3580# the server's init and main functions
3351 3581
3582{
3583 package cf::face;
3584
3585 our %HASH; # hash => idx
3586 our @DATA; # dynamically-created facedata, only faceste 0 used
3587 our @FOFS; # file offset, if > 0
3588 our @SIZE; # size of face, in octets
3589 our @META; # meta hash of face, if any
3590 our $DATAFH; # facedata filehandle
3591
3592 # internal api, not finalised
3593 sub set {
3594 my ($name, $type, $data) = @_;
3595
3596 my $idx = cf::face::find $name;
3597
3598 if ($idx) {
3599 delete $HASH{cf::face::get_csum $idx};
3600 } else {
3601 $idx = cf::face::alloc $name;
3602 }
3603
3604 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3605
3606 cf::face::set_type $idx, $type;
3607 cf::face::set_csum $idx, 0, $hash;
3608
3609 # we need to destroy the SV itself, not just modify it, as a running ix
3610 # might hold a reference to it: "delete" achieves that.
3611 delete $FOFS[0][$idx];
3612 delete $DATA[0][$idx];
3613 $DATA[0][$idx] = $data;
3614 $SIZE[0][$idx] = length $data;
3615 delete $META[$idx];
3616 $HASH{$hash} = $idx;#d#
3617
3618 $idx
3619 }
3620
3621 sub _get_data($$$) {
3622 my ($idx, $set, $cb) = @_;
3623
3624 if (defined $DATA[$set][$idx]) {
3625 $cb->($DATA[$set][$idx]);
3626 } elsif (my $fofs = $FOFS[$set][$idx]) {
3627 my $size = $SIZE[$set][$idx];
3628 my $buf;
3629 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3630 if ($_[0] == $size) {
3631 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3632 $cb->($buf);
3633 } else {
3634 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3635 }
3636 };
3637 } else {
3638 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3639 }
3640 }
3641
3642 # rather ineffient
3643 sub cf::face::get_data($;$) {
3644 my ($idx, $set) = @_;
3645
3646 _get_data $idx, $set, Coro::rouse_cb;
3647 Coro::rouse_wait
3648 }
3649
3650 sub cf::face::ix {
3651 my ($ns, $set, $idx, $pri) = @_;
3652
3653 _get_data $idx, $set, sub {
3654 $ns->ix_send ($idx, $pri, $_[0]);
3655 };
3656 }
3657}
3658
3352sub load_facedata($) { 3659sub load_facedata($) {
3353 my ($path) = @_; 3660 my ($path) = @_;
3354 3661
3355 # HACK to clear player env face cache, we need some signal framework
3356 # for this (global event?)
3357 %ext::player_env::MUSIC_FACE_CACHE = ();
3358
3359 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3662 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360 3663
3361 warn "loading facedata from $path\n"; 3664 trace "loading facedata from $path\n";
3362 3665
3363 my $facedata; 3666 my $facedata = decode_storable load_file "$path/faceinfo";
3364 0 < aio_load $path, $facedata
3365 or die "$path: $!";
3366
3367 $facedata = Coro::Storable::thaw $facedata;
3368 3667
3369 $facedata->{version} == 2 3668 $facedata->{version} == 2
3370 or cf::cleanup "$path: version mismatch, cannot proceed."; 3669 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3371 3670
3372 # patch in the exptable 3671 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3373 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3672 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3374 $facedata->{resource}{"res/exp_table"} = { 3673
3375 type => FT_RSRC, 3674 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3376 data => $exp_table, 3675
3377 hash => (Digest::MD5::md5 $exp_table), 3676 # BEGIN ATOMIC
3378 }; 3677 # from here on, everything must be atomic - no thread switch allowed
3379 cf::cede_to_tick; 3678 my $t1 = EV::time;
3380 3679
3381 { 3680 {
3382 my $faces = $facedata->{faceinfo}; 3681 my $faces = $facedata->{faceinfo};
3383 3682
3384 while (my ($face, $info) = each %$faces) { 3683 for my $face (sort keys %$faces) {
3684 my $info = $faces->{$face};
3385 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3685 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386 3686
3387 cf::face::set_visibility $idx, $info->{visibility}; 3687 cf::face::set_visibility $idx, $info->{visibility};
3388 cf::face::set_magicmap $idx, $info->{magicmap}; 3688 cf::face::set_magicmap $idx, $info->{magicmap};
3389 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3689 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3390 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3690 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3391 3691 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3392 cf::cede_to_tick; 3692 $cf::face::HASH{$info->{hash64}} = $idx;
3693 delete $cf::face::META[$idx];
3393 } 3694 }
3394 3695
3395 while (my ($face, $info) = each %$faces) { 3696 while (my ($face, $info) = each %$faces) {
3396 next unless $info->{smooth}; 3697 next unless $info->{smooth};
3397 3698
3400 3701
3401 if (my $smooth = cf::face::find $info->{smooth}) { 3702 if (my $smooth = cf::face::find $info->{smooth}) {
3402 cf::face::set_smooth $idx, $smooth; 3703 cf::face::set_smooth $idx, $smooth;
3403 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3704 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404 } else { 3705 } else {
3405 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3706 error "smooth face '$info->{smooth}' not found for face '$face'";
3406 } 3707 }
3407
3408 cf::cede_to_tick;
3409 } 3708 }
3410 } 3709 }
3411 3710
3412 { 3711 {
3413 my $anims = $facedata->{animinfo}; 3712 my $anims = $facedata->{animinfo};
3414 3713
3415 while (my ($anim, $info) = each %$anims) { 3714 while (my ($anim, $info) = each %$anims) {
3416 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3715 cf::anim::set $anim, $info->{frames}, $info->{facings};
3417 cf::cede_to_tick;
3418 } 3716 }
3419 3717
3420 cf::anim::invalidate_all; # d'oh 3718 cf::anim::invalidate_all; # d'oh
3421 } 3719 }
3422 3720
3423 { 3721 {
3424 my $res = $facedata->{resource}; 3722 my $res = $facedata->{resource};
3425 3723
3426 while (my ($name, $info) = each %$res) { 3724 while (my ($name, $info) = each %$res) {
3427 if (defined $info->{type}) { 3725 if (defined (my $type = $info->{type})) {
3726 # TODO: different hash - must free and use new index, or cache ixface data queue
3428 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3727 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429 3728
3430 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431 cf::face::set_type $idx, $info->{type}; 3729 cf::face::set_type $idx, $type;
3730 cf::face::set_csum $idx, 0, $info->{hash};
3731 $cf::face::SIZE[0][$idx] = $info->{size};
3732 $cf::face::FOFS[0][$idx] = $info->{fofs};
3733 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3734 $cf::face::HASH{$info->{hash}} = $idx;
3432 } else { 3735 } else {
3433 $RESOURCE{$name} = $info; # unused 3736# $RESOURCE{$name} = $info; # unused
3434 } 3737 }
3435
3436 cf::cede_to_tick;
3437 } 3738 }
3438 } 3739 }
3740
3741 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3742
3743 # HACK to clear player env face cache, we need some signal framework
3744 # for this (global event?)
3745 %ext::player_env::MUSIC_FACE_CACHE = ();
3746
3747 # END ATOMIC
3748
3749 cf::debug "facedata atomic update time ", EV::time - $t1;
3439 3750
3440 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3751 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3752
3753 aio_close $fh if $fh; # close old facedata
3441 3754
3442 1 3755 1
3443} 3756}
3444 3757
3445register_exticmd fx_want => sub { 3758register_exticmd fx_want => sub {
3456 my $status = load_resource_file_ $_[0]; 3769 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100; 3770 get_slot 0.1, 100;
3458 cf::arch::commit_load; 3771 cf::arch::commit_load;
3459 3772
3460 $status 3773 $status
3774}
3775
3776sub reload_exp_table {
3777 _reload_exp_table;
3778
3779 cf::face::set
3780 "res/exp_table" => FT_RSRC,
3781 JSON::XS->new->utf8->canonical->encode (
3782 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3783 );
3784}
3785
3786sub reload_materials {
3787 _reload_materials;
3461} 3788}
3462 3789
3463sub reload_regions { 3790sub reload_regions {
3464 # HACK to clear player env face cache, we need some signal framework 3791 # HACK to clear player env face cache, we need some signal framework
3465 # for this (global event?) 3792 # for this (global event?)
3473 if exists $_->{match}; 3800 if exists $_->{match};
3474 } 3801 }
3475} 3802}
3476 3803
3477sub reload_facedata { 3804sub reload_facedata {
3478 load_facedata "$DATADIR/facedata" 3805 load_facedata $DATADIR
3479 or die "unable to load facedata\n"; 3806 or die "unable to load facedata\n";
3480} 3807}
3481 3808
3482sub reload_archetypes { 3809sub reload_archetypes {
3483 load_resource_file "$DATADIR/archetypes" 3810 load_resource_file "$DATADIR/archetypes"
3484 or die "unable to load archetypes\n"; 3811 or die "unable to load archetypes\n";
3812
3813 cf::face::set
3814 "res/skill_info" => FT_RSRC,
3815 JSON::XS->new->utf8->canonical->encode (
3816 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3817 );
3818
3819 cf::face::set
3820 "res/spell_paths" => FT_RSRC,
3821 JSON::XS->new->utf8->canonical->encode (
3822 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3823 );
3824
3825 # command completion
3826 my @commands;
3827
3828 for (0..cf::arch::skillvec_size - 1) {
3829 my $skill = cf::arch::skillvec $_;
3830 my $name = $skill->name;
3831 my $flags = cf::skill_flags $skill->subtype;
3832
3833 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3834 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3835 }
3836
3837 cf::client::set_command_face skill => \@commands;
3485} 3838}
3486 3839
3487sub reload_treasures { 3840sub reload_treasures {
3488 load_resource_file "$DATADIR/treasures" 3841 load_resource_file "$DATADIR/treasures"
3489 or die "unable to load treasurelists\n"; 3842 or die "unable to load treasurelists\n";
3490} 3843}
3491 3844
3492sub reload_sound { 3845sub reload_sound {
3493 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data 3846 trace "loading sound config from $DATADIR/sound\n";
3494 or die "$DATADIR/sound $!";
3495 3847
3496 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3848 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3497 3849
3498 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3850 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499 my $sound = $soundconf->{compat}[$_] 3851 my $sound = $soundconf->{compat}[$_]
3500 or next; 3852 or next;
3501 3853
3509 cf::sound::set $k => $face; 3861 cf::sound::set $k => $face;
3510 } 3862 }
3511} 3863}
3512 3864
3513sub reload_resources { 3865sub reload_resources {
3514 warn "reloading resource files...\n"; 3866 trace "reloading resource files...\n";
3515 3867
3868 reload_materials;
3516 reload_facedata; 3869 reload_facedata;
3870 reload_exp_table;
3517 reload_sound; 3871 reload_sound;
3518 reload_archetypes; 3872 reload_archetypes;
3519 reload_regions; 3873 reload_regions;
3520 reload_treasures; 3874 reload_treasures;
3521 3875
3522 warn "finished reloading resource files\n"; 3876 trace "finished reloading resource files\n";
3523} 3877}
3524 3878
3525sub reload_config { 3879sub reload_config {
3526 warn "reloading config file...\n"; 3880 trace "reloading config file...\n";
3527 3881
3528 open my $fh, "<:utf8", "$CONFDIR/config" 3882 my $config = load_file "$CONFDIR/config";
3529 or return; 3883 utf8::decode $config;
3530 3884 *CFG = decode_yaml $config;
3531 local $/;
3532 *CFG = YAML::XS::Load scalar <$fh>;
3533 3885
3534 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3886 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3535 3887
3536 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3888 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3537 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3889 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3541 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3893 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3542 and die "WARNING: m(un)lockall failed: $!\n"; 3894 and die "WARNING: m(un)lockall failed: $!\n";
3543 }; 3895 };
3544 warn $@ if $@; 3896 warn $@ if $@;
3545 } 3897 }
3546
3547 warn "finished reloading resource files\n";
3548} 3898}
3549 3899
3550sub pidfile() { 3900sub pidfile() {
3551 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3901 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3552 or die "$PIDFILE: $!"; 3902 or die "$PIDFILE: $!";
3565 seek $fh, 0, 0; 3915 seek $fh, 0, 0;
3566 print $fh $$; 3916 print $fh $$;
3567} 3917}
3568 3918
3569sub main_loop { 3919sub main_loop {
3570 warn "EV::loop starting\n"; 3920 trace "EV::run starting\n";
3571 if (1) { 3921 if (1) {
3572 EV::loop; 3922 EV::run;
3573 } 3923 }
3574 warn "EV::loop returned\n"; 3924 trace "EV::run returned\n";
3575 goto &main_loop unless $REALLY_UNLOOP; 3925 goto &main_loop unless $REALLY_UNLOOP;
3576} 3926}
3577 3927
3578sub main { 3928sub main {
3579 cf::init_globals; # initialise logging 3929 cf::init_globals; # initialise logging
3580 3930
3581 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3931 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3582 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3932 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3583 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3933 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3584 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3934 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3585 3935
3586 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3936 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3587 3937
3588 # we must not ever block the main coroutine 3938 # we must not ever block the main coroutine
3589 local $Coro::idle = sub { 3939 $Coro::idle = sub {
3590 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3940 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3591 (async { 3941 (async {
3592 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3942 $Coro::current->{desc} = "IDLE BUG HANDLER";
3593 EV::loop EV::LOOP_ONESHOT; 3943 EV::run EV::RUN_ONCE;
3594 })->prio (Coro::PRIO_MAX); 3944 })->prio (Coro::PRIO_MAX);
3595 }; 3945 };
3596 3946
3597 evthread_start IO::AIO::poll_fileno; 3947 evthread_start IO::AIO::poll_fileno;
3598 3948
3599 cf::sync_job { 3949 cf::sync_job {
3600 cf::init_experience; 3950 cf::incloader::init ();
3951
3952 db_init;
3953
3601 cf::init_anim; 3954 cf::init_anim;
3602 cf::init_attackmess; 3955 cf::init_attackmess;
3603 cf::init_dynamic; 3956 cf::init_dynamic;
3604 3957
3605 cf::load_settings; 3958 cf::load_settings;
3606 cf::load_materials;
3607 3959
3608 reload_resources; 3960 reload_resources;
3609 reload_config; 3961 reload_config;
3610 db_init;
3611 3962
3612 cf::init_uuid; 3963 cf::init_uuid;
3613 cf::init_signals; 3964 cf::init_signals;
3614 cf::init_skills; 3965 cf::init_skills;
3615 3966
3623 3974
3624 # no (long-running) fork's whatsoever before this point(!) 3975 # no (long-running) fork's whatsoever before this point(!)
3625 use POSIX (); 3976 use POSIX ();
3626 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3977 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3627 3978
3628 (pop @POST_INIT)->(0) while @POST_INIT; 3979 cf::_post_init 0;
3629 }; 3980 };
3630 3981
3631 cf::object::thawer::errors_are_fatal 0; 3982 cf::object::thawer::errors_are_fatal 0;
3632 warn "parse errors in files are no longer fatal from this point on.\n"; 3983 info "parse errors in files are no longer fatal from this point on.\n";
3633 3984
3985 AE::postpone {
3986 undef &main; # free gobs of memory :)
3987 };
3988
3634 main_loop; 3989 goto &main_loop;
3635} 3990}
3636 3991
3637############################################################################# 3992#############################################################################
3638# initialisation and cleanup 3993# initialisation and cleanup
3639 3994
3678 or return; 4033 or return;
3679 4034
3680 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4035 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3681 and return; 4036 and return;
3682 4037
3683 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 4038 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3684 4039
3685 1 4040 1
3686} 4041}
3687 4042
3688our $uuid_lock; 4043our $uuid_lock;
3700 or return; 4055 or return;
3701 4056
3702 my $value = uuid_seq uuid_cur; 4057 my $value = uuid_seq uuid_cur;
3703 4058
3704 unless ($value) { 4059 unless ($value) {
3705 warn "cowardly refusing to write zero uuid value!\n"; 4060 info "cowardly refusing to write zero uuid value!\n";
3706 return; 4061 return;
3707 } 4062 }
3708 4063
3709 my $value = uuid_str $value + $uuid_skip; 4064 my $value = uuid_str $value + $uuid_skip;
3710 $uuid_skip = 0; 4065 $uuid_skip = 0;
3720 or return; 4075 or return;
3721 4076
3722 aio_rename "$uuid~", $uuid 4077 aio_rename "$uuid~", $uuid
3723 and return; 4078 and return;
3724 4079
3725 warn "uuid file written ($value).\n"; 4080 trace "uuid file written ($value).\n";
3726 4081
3727 1 4082 1
3728 4083
3729} 4084}
3730 4085
3736} 4091}
3737 4092
3738sub emergency_save() { 4093sub emergency_save() {
3739 my $freeze_guard = cf::freeze_mainloop; 4094 my $freeze_guard = cf::freeze_mainloop;
3740 4095
3741 warn "emergency_perl_save: enter\n"; 4096 info "emergency_perl_save: enter\n";
4097
4098 # this is a trade-off: we want to be very quick here, so
4099 # save all maps without fsync, and later call a global sync
4100 # (which in turn might be very very slow)
4101 local $USE_FSYNC = 0;
3742 4102
3743 cf::sync_job { 4103 cf::sync_job {
3744 # this is a trade-off: we want to be very quick here, so 4104 cf::write_runtime_sync; # external watchdog should not bark
3745 # save all maps without fsync, and later call a global sync
3746 # (which in turn might be very very slow)
3747 local $USE_FSYNC = 0;
3748 4105
3749 # use a peculiar iteration method to avoid tripping on perl 4106 # use a peculiar iteration method to avoid tripping on perl
3750 # refcount bugs in for. also avoids problems with players 4107 # refcount bugs in for. also avoids problems with players
3751 # and maps saved/destroyed asynchronously. 4108 # and maps saved/destroyed asynchronously.
3752 warn "emergency_perl_save: begin player save\n"; 4109 info "emergency_perl_save: begin player save\n";
3753 for my $login (keys %cf::PLAYER) { 4110 for my $login (keys %cf::PLAYER) {
3754 my $pl = $cf::PLAYER{$login} or next; 4111 my $pl = $cf::PLAYER{$login} or next;
3755 $pl->valid or next; 4112 $pl->valid or next;
3756 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4113 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3757 $pl->save; 4114 $pl->save;
3758 } 4115 }
3759 warn "emergency_perl_save: end player save\n"; 4116 info "emergency_perl_save: end player save\n";
3760 4117
4118 cf::write_runtime_sync; # external watchdog should not bark
4119
3761 warn "emergency_perl_save: begin map save\n"; 4120 info "emergency_perl_save: begin map save\n";
3762 for my $path (keys %cf::MAP) { 4121 for my $path (keys %cf::MAP) {
3763 my $map = $cf::MAP{$path} or next; 4122 my $map = $cf::MAP{$path} or next;
3764 $map->valid or next; 4123 $map->valid or next;
3765 $map->save; 4124 $map->save;
3766 } 4125 }
3767 warn "emergency_perl_save: end map save\n"; 4126 info "emergency_perl_save: end map save\n";
3768 4127
4128 cf::write_runtime_sync; # external watchdog should not bark
4129
3769 warn "emergency_perl_save: begin database checkpoint\n"; 4130 info "emergency_perl_save: begin database checkpoint\n";
3770 BDB::db_env_txn_checkpoint $DB_ENV; 4131 BDB::db_env_txn_checkpoint $DB_ENV;
3771 warn "emergency_perl_save: end database checkpoint\n"; 4132 info "emergency_perl_save: end database checkpoint\n";
3772 4133
3773 warn "emergency_perl_save: begin write uuid\n"; 4134 info "emergency_perl_save: begin write uuid\n";
3774 write_uuid_sync 1; 4135 write_uuid_sync 1;
3775 warn "emergency_perl_save: end write uuid\n"; 4136 info "emergency_perl_save: end write uuid\n";
4137
4138 cf::write_runtime_sync; # external watchdog should not bark
4139
4140 trace "emergency_perl_save: syncing database to disk";
4141 BDB::db_env_txn_checkpoint $DB_ENV;
4142
4143 info "emergency_perl_save: starting sync\n";
4144 IO::AIO::aio_sync sub {
4145 info "emergency_perl_save: finished sync\n";
4146 };
4147
4148 cf::write_runtime_sync; # external watchdog should not bark
4149
4150 trace "emergency_perl_save: flushing outstanding aio requests";
4151 while (IO::AIO::nreqs || BDB::nreqs) {
4152 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4153 }
4154
4155 cf::write_runtime_sync; # external watchdog should not bark
3776 }; 4156 };
3777 4157
3778 warn "emergency_perl_save: starting sync()\n";
3779 IO::AIO::aio_sync sub {
3780 warn "emergency_perl_save: finished sync()\n";
3781 };
3782
3783 warn "emergency_perl_save: leave\n"; 4158 info "emergency_perl_save: leave\n";
3784} 4159}
3785 4160
3786sub post_cleanup { 4161sub post_cleanup {
3787 my ($make_core) = @_; 4162 my ($make_core) = @_;
3788 4163
4164 IO::AIO::flush;
4165
3789 warn Carp::longmess "post_cleanup backtrace" 4166 error Carp::longmess "post_cleanup backtrace"
3790 if $make_core; 4167 if $make_core;
3791 4168
3792 my $fh = pidfile; 4169 my $fh = pidfile;
3793 unlink $PIDFILE if <$fh> == $$; 4170 unlink $PIDFILE if <$fh> == $$;
3794} 4171}
3818 } 4195 }
3819} 4196}
3820 4197
3821sub do_reload_perl() { 4198sub do_reload_perl() {
3822 # can/must only be called in main 4199 # can/must only be called in main
3823 if (in_main) { 4200 unless (in_main) {
3824 warn "can only reload from main coroutine"; 4201 error "can only reload from main coroutine";
3825 return; 4202 return;
3826 } 4203 }
3827 4204
3828 return if $RELOAD++; 4205 return if $RELOAD++;
3829 4206
3830 my $t1 = AE::time; 4207 my $t1 = AE::time;
3831 4208
3832 while ($RELOAD) { 4209 while ($RELOAD) {
3833 warn "reloading..."; 4210 cf::get_slot 0.1, -1, "reload_perl";
4211 info "perl_reload: reloading...";
3834 4212
3835 warn "entering sync_job"; 4213 trace "perl_reload: entering sync_job";
3836 4214
3837 cf::sync_job { 4215 cf::sync_job {
3838 cf::write_runtime_sync; # external watchdog should not bark
3839 cf::emergency_save; 4216 #cf::emergency_save;
3840 cf::write_runtime_sync; # external watchdog should not bark
3841 4217
3842 warn "syncing database to disk";
3843 BDB::db_env_txn_checkpoint $DB_ENV;
3844
3845 # if anything goes wrong in here, we should simply crash as we already saved
3846
3847 warn "flushing outstanding aio requests";
3848 while (IO::AIO::nreqs || BDB::nreqs) {
3849 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3850 }
3851
3852 warn "cancelling all extension coros"; 4218 trace "perl_reload: cancelling all extension coros";
3853 $_->cancel for values %EXT_CORO; 4219 $_->cancel for values %EXT_CORO;
3854 %EXT_CORO = (); 4220 %EXT_CORO = ();
3855 4221
3856 warn "removing commands"; 4222 trace "perl_reload: removing commands";
3857 %COMMAND = (); 4223 %COMMAND = ();
3858 4224
3859 warn "removing ext/exti commands"; 4225 trace "perl_reload: removing ext/exti commands";
3860 %EXTCMD = (); 4226 %EXTCMD = ();
3861 %EXTICMD = (); 4227 %EXTICMD = ();
3862 4228
3863 warn "unloading/nuking all extensions"; 4229 trace "perl_reload: unloading/nuking all extensions";
3864 for my $pkg (@EXTS) { 4230 for my $pkg (@EXTS) {
3865 warn "... unloading $pkg"; 4231 trace "... unloading $pkg";
3866 4232
3867 if (my $cb = $pkg->can ("unload")) { 4233 if (my $cb = $pkg->can ("unload")) {
3868 eval { 4234 eval {
3869 $cb->($pkg); 4235 $cb->($pkg);
3870 1 4236 1
3871 } or warn "$pkg unloaded, but with errors: $@"; 4237 } or error "$pkg unloaded, but with errors: $@";
3872 } 4238 }
3873 4239
3874 warn "... clearing $pkg"; 4240 trace "... clearing $pkg";
3875 clear_package $pkg; 4241 clear_package $pkg;
3876 } 4242 }
3877 4243
3878 warn "unloading all perl modules loaded from $LIBDIR"; 4244 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3879 while (my ($k, $v) = each %INC) { 4245 while (my ($k, $v) = each %INC) {
3880 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4246 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3881 4247
3882 warn "... unloading $k"; 4248 trace "... unloading $k";
3883 delete $INC{$k}; 4249 delete $INC{$k};
3884 4250
3885 $k =~ s/\.pm$//; 4251 $k =~ s/\.pm$//;
3886 $k =~ s/\//::/g; 4252 $k =~ s/\//::/g;
3887 4253
3890 } 4256 }
3891 4257
3892 clear_package $k; 4258 clear_package $k;
3893 } 4259 }
3894 4260
3895 warn "getting rid of safe::, as good as possible"; 4261 trace "perl_reload: getting rid of safe::, as good as possible";
3896 clear_package "safe::$_" 4262 clear_package "safe::$_"
3897 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4263 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3898 4264
3899 warn "unloading cf.pm \"a bit\""; 4265 trace "perl_reload: unloading cf.pm \"a bit\"";
3900 delete $INC{"cf.pm"}; 4266 delete $INC{"cf.pm"};
3901 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4267 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3902 4268
3903 # don't, removes xs symbols, too, 4269 # don't, removes xs symbols, too,
3904 # and global variables created in xs 4270 # and global variables created in xs
3905 #clear_package __PACKAGE__; 4271 #clear_package __PACKAGE__;
3906 4272
3907 warn "unload completed, starting to reload now"; 4273 info "perl_reload: unload completed, starting to reload now";
3908 4274
3909 warn "reloading cf.pm"; 4275 trace "perl_reload: reloading cf.pm";
3910 require cf; 4276 require cf;
3911 cf::_connect_to_perl_1; 4277 cf::_connect_to_perl_1;
3912 4278
3913 warn "loading config and database again"; 4279 trace "perl_reload: loading config and database again";
3914 cf::reload_config; 4280 cf::reload_config;
3915 4281
3916 warn "loading extensions"; 4282 trace "perl_reload: loading extensions";
3917 cf::load_extensions; 4283 cf::load_extensions;
3918 4284
3919 if ($REATTACH_ON_RELOAD) { 4285 if ($REATTACH_ON_RELOAD) {
3920 warn "reattaching attachments to objects/players"; 4286 trace "perl_reload: reattaching attachments to objects/players";
3921 _global_reattach; # objects, sockets 4287 _global_reattach; # objects, sockets
3922 warn "reattaching attachments to maps"; 4288 trace "perl_reload: reattaching attachments to maps";
3923 reattach $_ for values %MAP; 4289 reattach $_ for values %MAP;
3924 warn "reattaching attachments to players"; 4290 trace "perl_reload: reattaching attachments to players";
3925 reattach $_ for values %PLAYER; 4291 reattach $_ for values %PLAYER;
3926 } 4292 }
3927 4293
3928 warn "running post_init jobs"; 4294 cf::_post_init 1;
3929 (pop @POST_INIT)->(1) while @POST_INIT;
3930 4295
3931 warn "leaving sync_job"; 4296 trace "perl_reload: leaving sync_job";
3932 4297
3933 1 4298 1
3934 } or do { 4299 } or do {
3935 warn $@; 4300 error $@;
3936 cf::cleanup "error while reloading, exiting."; 4301 cf::cleanup "perl_reload: error, exiting.";
3937 }; 4302 };
3938 4303
3939 warn "reloaded";
3940 --$RELOAD; 4304 --$RELOAD;
3941 } 4305 }
3942 4306
3943 $t1 = AE::time - $t1; 4307 $t1 = AE::time - $t1;
3944 warn "reload completed in ${t1}s\n"; 4308 info "perl_reload: completed in ${t1}s\n";
3945}; 4309};
3946 4310
3947our $RELOAD_WATCHER; # used only during reload 4311our $RELOAD_WATCHER; # used only during reload
3948 4312
3949sub reload_perl() { 4313sub reload_perl() {
3970 reload_perl; 4334 reload_perl;
3971 }; 4335 };
3972 } 4336 }
3973}; 4337};
3974 4338
3975unshift @INC, $LIBDIR; 4339#############################################################################
3976 4340
3977my $bug_warning = 0; 4341my $bug_warning = 0;
3978 4342
3979our @WAIT_FOR_TICK;
3980our @WAIT_FOR_TICK_BEGIN;
3981
3982sub wait_for_tick { 4343sub wait_for_tick() {
3983 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4344 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3984 4345
3985 my $signal = new Coro::Signal; 4346 $WAIT_FOR_TICK->wait;
3986 push @WAIT_FOR_TICK, $signal;
3987 $signal->wait;
3988} 4347}
3989 4348
3990sub wait_for_tick_begin { 4349sub wait_for_tick_begin() {
3991 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4350 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3992 4351
3993 my $signal = new Coro::Signal; 4352 my $signal = new Coro::Signal;
3994 push @WAIT_FOR_TICK_BEGIN, $signal; 4353 push @WAIT_FOR_TICK_BEGIN, $signal;
3995 $signal->wait; 4354 $signal->wait;
3996} 4355}
4000 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4359 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4001 unless ++$bug_warning > 10; 4360 unless ++$bug_warning > 10;
4002 return; 4361 return;
4003 } 4362 }
4004 4363
4005 cf::server_tick; # one server iteration 4364 cf::one_tick; # one server iteration
4006 4365
4007 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4366 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4008 4367
4009 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4368 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4010 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4369 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4011 Coro::async_pool { 4370 Coro::async_pool {
4012 $Coro::current->{desc} = "runtime saver"; 4371 $Coro::current->{desc} = "runtime saver";
4013 write_runtime_sync 4372 write_runtime_sync
4014 or warn "ERROR: unable to write runtime file: $!"; 4373 or error "ERROR: unable to write runtime file: $!";
4015 }; 4374 };
4016 } 4375 }
4017 4376
4018 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4377 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4019 $sig->send; 4378 $sig->send;
4020 } 4379 }
4021 while (my $sig = shift @WAIT_FOR_TICK) { 4380 $WAIT_FOR_TICK->broadcast;
4022 $sig->send;
4023 }
4024 4381
4025 $LOAD = ($NOW - $TICK_START) / $TICK; 4382 $LOAD = ($NOW - $TICK_START) / $TICK;
4026 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4027 4384
4028 if (0) { 4385 if (0) {
4029 if ($NEXT_TICK) { 4386 if ($NEXT_TICK) {
4030 my $jitter = $TICK_START - $NEXT_TICK; 4387 my $jitter = $TICK_START - $NEXT_TICK;
4031 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4388 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4032 warn "jitter $JITTER\n";#d# 4389 debug "jitter $JITTER\n";#d#
4033 } 4390 }
4034 } 4391 }
4035} 4392}
4036 4393
4037{ 4394{
4038 # configure BDB 4395 # configure BDB
4396 info "initialising database";
4039 4397
4040 BDB::min_parallel 16; 4398 BDB::min_parallel 16;
4041 BDB::max_poll_reqs $TICK * 0.1; 4399 BDB::max_poll_reqs $TICK * 0.1;
4042 $AnyEvent::BDB::WATCHER->priority (1); 4400 #$AnyEvent::BDB::WATCHER->priority (1);
4043 4401
4044 unless ($DB_ENV) { 4402 unless ($DB_ENV) {
4045 $DB_ENV = BDB::db_env_create; 4403 $DB_ENV = BDB::db_env_create;
4046 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4404 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4047 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4405 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4072 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4430 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4073 }; 4431 };
4074 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4432 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4075 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4433 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4076 }; 4434 };
4435
4436 info "database initialised";
4077} 4437}
4078 4438
4079{ 4439{
4080 # configure IO::AIO 4440 # configure IO::AIO
4081 4441
4442 info "initialising aio";
4082 IO::AIO::min_parallel 8; 4443 IO::AIO::min_parallel 8;
4083 IO::AIO::max_poll_time $TICK * 0.1; 4444 IO::AIO::max_poll_time $TICK * 0.1;
4084 undef $AnyEvent::AIO::WATCHER; 4445 undef $AnyEvent::AIO::WATCHER;
4446 info "aio initialised";
4085} 4447}
4086 4448
4087my $_log_backtrace; 4449our $_log_backtrace;
4450our $_log_backtrace_last;
4088 4451
4089sub _log_backtrace { 4452sub _log_backtrace {
4090 my ($msg, @addr) = @_; 4453 my ($msg, @addr) = @_;
4091 4454
4092 $msg =~ s/\n//; 4455 $msg =~ s/\n$//;
4093 4456
4457 if ($_log_backtrace_last eq $msg) {
4458 LOG llevInfo, "[ABT] $msg\n";
4459 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4094 # limit the # of concurrent backtraces 4460 # limit the # of concurrent backtraces
4095 if ($_log_backtrace < 2) { 4461 } elsif ($_log_backtrace < 2) {
4462 $_log_backtrace_last = $msg;
4096 ++$_log_backtrace; 4463 ++$_log_backtrace;
4097 my $perl_bt = Carp::longmess $msg; 4464 my $perl_bt = Carp::longmess $msg;
4098 async { 4465 async {
4099 $Coro::current->{desc} = "abt $msg"; 4466 $Coro::current->{desc} = "abt $msg";
4100 4467
4120 LOG llevInfo, "[ABT] $_\n" for @bt; 4487 LOG llevInfo, "[ABT] $_\n" for @bt;
4121 --$_log_backtrace; 4488 --$_log_backtrace;
4122 }; 4489 };
4123 } else { 4490 } else {
4124 LOG llevInfo, "[ABT] $msg\n"; 4491 LOG llevInfo, "[ABT] $msg\n";
4125 LOG llevInfo, "[ABT] [suppressed]\n"; 4492 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4126 } 4493 }
4127} 4494}
4128 4495
4129# load additional modules 4496# load additional modules
4130require "cf/$_.pm" for @EXTRA_MODULES; 4497require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines