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.537 by root, Sun May 2 19:16:16 2010 UTC vs.
Revision 1.588 by root, Thu Nov 1 13:02:52 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; # unused 117#our %RESOURCE; # unused
112 118
113our $OUTPUT_RATE_MIN = 3000; 119our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 120our $OUTPUT_RATE_MAX = 1000000;
115 121
116our $MAX_LINKS = 32; # how many chained exits to follow 122our $MAX_LINKS = 32; # how many chained exits to follow
… …
124our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 136
131our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 139
133our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
135our $NOW; 143our $NOW;
136 144
137our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
148 156
149our @POST_INIT; 157our @POST_INIT;
150 158
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 159our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 160our $REALLY_UNLOOP; # never set to true, please :)
161
162our $WAIT_FOR_TICK = new Coro::Signal;
163our @WAIT_FOR_TICK_BEGIN;
153 164
154binmode STDOUT; 165binmode STDOUT;
155binmode STDERR; 166binmode STDERR;
156 167
157# read virtual server time, if available 168# read virtual server time, if available
… …
191 202
192=over 4 203=over 4
193 204
194=item $cf::UPTIME 205=item $cf::UPTIME
195 206
196The timestamp of the server start (so not actually an uptime). 207The timestamp of the server start (so not actually an "uptime").
208
209=item $cf::SERVER_TICK
210
211An unsigned integer that starts at zero when the server is started and is
212incremented on every tick.
213
214=item $cf::NOW
215
216The (real) time of the last (current) server tick - updated before and
217after tick processing, so this is useful only as a rough "what time is it
218now" estimate.
219
220=item $cf::TICK
221
222The interval between each server tick, in seconds.
197 223
198=item $cf::RUNTIME 224=item $cf::RUNTIME
199 225
200The time this server has run, starts at 0 and is increased by $cf::TICK on 226The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 227every server tick.
… …
207Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
210database environment. 236database environment.
211 237
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 238=item $cf::LOADAVG
221 239
222The current CPU load on the server (alpha-smoothed), as a value between 0 240The 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 241(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
233from wherever your confdir points to. 251from wherever your confdir points to.
234 252
235=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
236 254
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 255These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
240 275
241=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
242 277
243This array contains the results of the last C<invoke ()> call. When 278This 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 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
305)) { 340)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 342}
308 343
309$EV::DIED = sub { 344$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
311}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
312 352
313############################################################################# 353#############################################################################
314 354
315=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
316 356
… …
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 377 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 378 $d
339 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
340} 380}
341 381
382=item $scalar = cf::load_file $path
383
384Loads the given file from path and returns its contents. Croaks on error
385and can block.
386
387=cut
388
389sub load_file($) {
390 0 <= aio_load $_[0], my $data
391 or Carp::croak "$_[0]: $!";
392
393 $data
394}
395
396=item $success = cf::replace_file $path, $data, $sync
397
398Atomically replaces the file at the given $path with new $data, and
399optionally $sync the data to disk before replacing the file.
400
401=cut
402
403sub replace_file($$;$) {
404 my ($path, $data, $sync) = @_;
405
406 my $lock = cf::lock_acquire ("replace_file:$path");
407
408 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
409 or return;
410
411 $data = $data->() if ref $data;
412
413 length $data == aio_write $fh, 0, (length $data), $data, 0
414 or return;
415
416 !$sync
417 or !aio_fsync $fh
418 or return;
419
420 aio_close $fh
421 and return;
422
423 aio_rename "$path~", $path
424 and return;
425
426 if ($sync) {
427 $path =~ s%/[^/]*$%%;
428 aio_pathsync $path;
429 }
430
431 1
432}
433
342=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
343 435
344Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
345 437
346=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 444our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 445
354sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
356 448
449=item $ref = cf::decode_storable $scalar
450
451Same as Coro::Storable::thaw, so blocks.
452
453=cut
454
455BEGIN { *decode_storable = \&Coro::Storable::thaw }
456
457=item $ref = cf::decode_yaml $scalar
458
459Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
460
461=cut
462
463sub decode_yaml($) {
464 fork_call { YAML::XS::Load $_[0] } @_
465}
466
467=item $scalar = cf::unlzf $scalar
468
469Same as Compress::LZF::compress, but takes server ticks into account, so
470blocks.
471
472=cut
473
474sub unlzf($) {
475 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
476 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
477 Compress::LZF::decompress $_[0]
478}
479
357=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
358 481
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
361 484
362The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 486is a reload or not.
364 487
365=cut 488=cut
366 489
367sub post_init(&) { 490sub post_init(&) {
368 push @POST_INIT, shift; 491 push @POST_INIT, shift;
492}
493
494sub _post_init {
495 trace "running post_init jobs";
496
497 # run them in parallel...
498
499 my @join;
500
501 while () {
502 push @join, map &Coro::async ($_, 0), @POST_INIT;
503 @POST_INIT = ();
504
505 @join or last;
506
507 (pop @join)->join;
508 }
369} 509}
370 510
371=item cf::lock_wait $string 511=item cf::lock_wait $string
372 512
373Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
426 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
427} 567}
428 568
429=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
430 570
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 572(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 573C<$time> seconds of cpu time till the next tick. The slot is only valid
574till the next cede.
575
576Background jobs should use a priority les than zero, interactive jobs
577should use 100 or more.
434 578
435The optional C<$name> can be used to identify the job to run. It might be 579The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
437 581
438Useful for short background jobs. 582Useful for short background jobs.
… …
467 } 611 }
468 } 612 }
469 613
470 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 615 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 617 } else {
475 $busy = 0; 618 $busy = 0;
476 Coro::schedule; 619 Coro::schedule;
477 } 620 }
478 } 621 }
… …
578 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
579 722
580 $coro 723 $coro
581} 724}
582 725
583=item fork_call { }, $args 726=item fork_call { }, @args
584 727
585Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 731never block itself or use any form of event handling.
589 732
590=cut 733=cut
591 734
735sub post_fork {
736 reset_signals;
737}
738
592sub fork_call(&@) { 739sub fork_call(&@) {
593 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
594 741
595 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
598 745
599 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
600 reset_signals; 747 cf::post_fork;
601 &$cb 748 &$cb
602 }, @args; 749 } @args;
603 750
604 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
605} 752}
606 753
607sub objinfo { 754sub objinfo {
… …
729 876
730 my @data; 877 my @data;
731 my $md5; 878 my $md5;
732 879
733 for (0 .. $#$src) { 880 for (0 .. $#$src) {
734 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
735 or Carp::croak "$src->[$_]: $!";
736 } 882 }
737 883
738 # if processing is expensive, check 884 # if processing is expensive, check
739 # checksum first 885 # checksum first
740 if (1) { 886 if (1) {
… …
1358 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1359 1505
1360 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361 1507
1362 if (ref $msg) { 1508 if (ref $msg) {
1363 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364 "ARRAY" eq ref $msg
1365 ? @$msg
1366 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367 1510
1368 my @reply; 1511 my @reply;
1369 1512
1370 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1371 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1393 }; 1536 };
1394 1537
1395 $grp 1538 $grp
1396} 1539}
1397 1540
1541sub _ext_cfg_reg($$$$) {
1542 my ($rvar, $varname, $cfgname, $default) = @_;
1543
1544 $cfgname = lc $varname
1545 unless length $cfgname;
1546
1547 $EXT_CFG{$cfgname} = [$rvar, $default];
1548
1549 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1550}
1551
1398sub load_extensions { 1552sub load_extensions {
1399 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1400 1556
1401 cf::sync_job { 1557 cf::sync_job {
1402 my %todo; 1558 my %todo;
1403 1559
1404 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1423 1579
1424 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1425 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1426 1582
1427 $ext{source} = 1583 $ext{source} =
1428 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1429 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1430 . $source 1586 . $source
1431 . "\n};\n1"; 1587 . "\n};\n1";
1432 1588
1433 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1447 unless exists $done{$_}; 1603 unless exists $done{$_};
1448 } 1604 }
1449 1605
1450 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451 1607
1608 my $source = $v->{source};
1609
1610 # support "CONF varname :confname = default" pseudo-statements
1611 $source =~ s{
1612 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1613 }{
1614 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1615 }gmxe;
1616
1452 my $active = eval $v->{source}; 1617 my $active = eval $source;
1453 1618
1454 if (length $@) { 1619 if (length $@) {
1455 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1456 1621
1457 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1474 1639
1475 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1476 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1478 } 1643 }
1644
1645 last;
1479 } 1646 }
1480 } 1647 }
1481 }; 1648 };
1482} 1649}
1483 1650
… …
1641 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1642 1809
1643 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1644 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1645 1812
1646 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647 $pl->deactivate; 1814 $pl->deactivate;
1815
1648 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1650 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1651 1821
1652 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1653 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1654 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1820sub generate_random_map { 1990sub generate_random_map {
1821 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1822 1992
1823 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824 1994
1825 # mit "rum" bekleckern, nicht
1826 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1827 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830 $rmp->{exit_on_final_map},
1831 $rmp->{xsize}, $rmp->{ysize},
1832 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837 (cf::region::find $rmp->{region}), $rmp->{custom}
1838 )
1839} 1996}
1840 1997
1841=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1842 1999
1843Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
… …
1848 2005
1849sub register { 2006sub register {
1850 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1851 my $pkg = caller; 2008 my $pkg = caller;
1852 2009
1853 no strict;
1854 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1855 2011
1856 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1857} 2013}
1858 2014
… …
1870} 2026}
1871 2027
1872sub normalise { 2028sub normalise {
1873 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1874 2030
1875 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1876 2032
1877 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1878 2034
1879 # map plan: 2035 # map plan:
1880 # 2036 #
… …
1895 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1896 $path = "$base/$path"; 2052 $path = "$base/$path";
1897 } 2053 }
1898 2054
1899 for ($path) { 2055 for ($path) {
1900 redo if s{//}{/};
1901 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1902 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1903 } 2058 }
1904 2059
1905 $path 2060 $path
… …
1919 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1920 return $self; 2075 return $self;
1921 } 2076 }
1922 } 2077 }
1923 2078
1924 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1925 () 2080 ()
1926} 2081}
1927 2082
2083# may re-bless or do other evil things
1928sub init { 2084sub init {
1929 my ($self) = @_; 2085 my ($self) = @_;
1930 2086
1931 $self 2087 $self
1932} 2088}
… …
1997 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1998 2154
1999 1 2155 1
2000} 2156}
2001 2157
2158# used to laod the header of an original map
2002sub load_header_orig { 2159sub load_header_orig {
2003 my ($self) = @_; 2160 my ($self) = @_;
2004 2161
2005 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2006} 2163}
2007 2164
2165# used to laod the header of an instantiated map
2008sub load_header_temp { 2166sub load_header_temp {
2009 my ($self) = @_; 2167 my ($self) = @_;
2010 2168
2011 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2012} 2170}
2013 2171
2172# called after loading the header from an instantiated map
2014sub prepare_temp { 2173sub prepare_temp {
2015 my ($self) = @_; 2174 my ($self) = @_;
2016 2175
2017 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2018 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2019 # safety 2178 # safety
2020 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2021 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2022} 2181}
2023 2182
2183# called after loading the header from an original map
2024sub prepare_orig { 2184sub prepare_orig {
2025 my ($self) = @_; 2185 my ($self) = @_;
2026 2186
2027 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2028 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2052 2212
2053sub find; 2213sub find;
2054sub find { 2214sub find {
2055 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2056 2216
2217 cf::cede_to_tick;
2218
2057 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2058 2220
2059 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2061 2223
2062 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2093 2255
2094 { 2256 {
2095 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2096 2258
2097 return unless $self->valid; 2259 return unless $self->valid;
2098 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2099
2100 $self->in_memory (cf::MAP_LOADING);
2101 2261
2102 $self->alloc; 2262 $self->alloc;
2103 2263
2104 $self->pre_load; 2264 $self->pre_load;
2105 cf::cede_to_tick; 2265 cf::cede_to_tick;
2106 2266
2267 if (exists $self->{load_path}) {
2107 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2108 $f->skip_block; 2269 $f->skip_block;
2109 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2110 or return; 2271 or return;
2111 2272
2112 $self->post_load_original 2273 $self->post_load_original
2113 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2114 2275
2115 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2116 utf8::encode $uniq; 2277 utf8::encode $uniq;
2117 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2118 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2119 $self->clear_unique_items; 2280 $self->clear_unique_items;
2120 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2121 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2122 } 2284 }
2123 } 2285 }
2124 }
2125 2286
2126 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2127 2294
2128 cf::cede_to_tick; 2295 cf::cede_to_tick;
2129 # now do the right thing for maps 2296 # now do the right thing for maps
2130 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2131 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2135 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2136 $self->decay_objects; 2303 $self->decay_objects;
2137 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2138 $self->update_buttons; 2305 $self->update_buttons;
2139 cf::cede_to_tick; 2306 cf::cede_to_tick;
2140 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2141 } 2308 }
2142 2309
2143 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2144 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2145
2146 $self->in_memory (cf::MAP_ACTIVE);
2147 } 2312 }
2148 2313
2149 $self->post_load; 2314 $self->post_load;
2315
2316 1
2150} 2317}
2151 2318
2152# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2153# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2154# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2162# if $self->per_party; 2329# if $self->per_party;
2163 2330
2164 $self 2331 $self
2165} 2332}
2166 2333
2167# find and load all maps in the 3x3 area around a map
2168sub load_neighbours {
2169 my ($map) = @_;
2170
2171 my @neigh; # diagonal neighbours
2172
2173 for (0 .. 3) {
2174 my $neigh = $map->tile_path ($_)
2175 or next;
2176 $neigh = find $neigh, $map
2177 or next;
2178 $neigh->load;
2179
2180 # now find the diagonal neighbours
2181 push @neigh,
2182 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2183 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2184 }
2185
2186 for (grep defined $_->[0], @neigh) {
2187 my ($path, $origin) = @$_;
2188 my $neigh = find $path, $origin
2189 or next;
2190 $neigh->load;
2191 }
2192}
2193
2194sub find_sync { 2334sub find_sync {
2195 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2196 2336
2337 # it's a bug to call this from the main context
2197 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2199 2340
2200 find $path, $origin 2341 find $path, $origin
2201} 2342}
2202 2343
2203sub do_load_sync { 2344sub do_load_sync {
2204 my ($map) = @_; 2345 my ($map) = @_;
2205 2346
2347 # it's a bug to call this from the main context
2206 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2208 2350
2209 $map->load; 2351 $map->load;
2210} 2352}
… …
2213our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2214 2356
2215sub find_async { 2357sub find_async {
2216 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2217 2359
2218 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2219 2361
2220 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2221 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2222 } 2364 }
2223 2365
2224 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2225 2367
2226 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2285sub swap_out { 2427sub swap_out {
2286 my ($self) = @_; 2428 my ($self) = @_;
2287 2429
2288 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2289 2431
2290 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2291 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2292 return if $self->players; 2434 return if $self->players;
2293 2435
2294 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2295 $self->deactivate; 2437 $self->deactivate;
2296 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2297 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2298 2440
2299 # then atomically save 2441 # then atomically save
2300 $self->_save; 2442 $self->_save;
2301 2443
2302 # then free the map 2444 # then free the map
… …
2328 2470
2329 return if $self->players; 2471 return if $self->players;
2330 2472
2331 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2332 2474
2333 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2334 2476
2335 # need to save uniques path 2477 # need to save uniques path
2336 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2337 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2338 2480
… …
2668 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2669 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2670 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2671 2813
2672 $map->load; 2814 $map->load;
2673 $map->load_neighbours;
2674 2815
2675 return unless $self->contr->active; 2816 return unless $self->contr->active;
2676 2817
2677 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2734 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2735 } 2876 }
2736 } 2877 }
2737 2878
2738 my $map = eval { 2879 my $map = eval {
2739 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740 2881
2741 if ($map) { 2882 if ($map) {
2742 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2743 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2744 } else { 2885 } else {
… …
2834 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2835 2976
2836 unless (eval { 2977 unless (eval {
2837 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2838 2979
2839 # random map handling
2840 {
2841 my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843 prepare_random_map $exit
2844 if $exit->slaying eq "/!";
2845 }
2846
2847 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2848 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2849 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2850 3006
2851 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2852 3008
2853 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2854 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3096=cut 3252=cut
3097 3253
3098sub cf::client::ext_reply($$@) { 3254sub cf::client::ext_reply($$@) {
3099 my ($self, $id, @msg) = @_; 3255 my ($self, $id, @msg) = @_;
3100 3256
3101 if ($self->extcmd == 2) { 3257 return unless $self->extcmd == 2;
3258
3102 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3259 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103 } elsif ($self->extcmd == 1) {
3104 #TODO: version 1, remove
3105 unshift @msg, msgtype => "reply", msgid => $id;
3106 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107 }
3108} 3260}
3109 3261
3110=item $success = $client->query ($flags, "text", \&cb) 3262=item $success = $client->query ($flags, "text", \&cb)
3111 3263
3112Queues a query to the client, calling the given callback with 3264Queues a query to the client, calling the given callback with
… …
3167 my ($ns, $buf) = @_; 3319 my ($ns, $buf) = @_;
3168 3320
3169 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3321 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170 3322
3171 if (ref $msg) { 3323 if (ref $msg) {
3172 my ($type, $reply, @payload) = 3324 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173 "ARRAY" eq ref $msg
3174 ? @$msg
3175 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176 3325
3177 my @reply; 3326 my @reply;
3178 3327
3179 if (my $cb = $EXTICMD{$type}) { 3328 if (my $cb = $EXTICMD{$type}) {
3180 @reply = $cb->($ns, @payload); 3329 @reply = $cb->($ns, @payload);
… …
3273 decrease split destroy change_exp value msg lore send_msg)], 3422 decrease split destroy change_exp value msg lore send_msg)],
3274 ["cf::object::player" => qw(player)], 3423 ["cf::object::player" => qw(player)],
3275 ["cf::player" => qw(peaceful send_msg)], 3424 ["cf::player" => qw(peaceful send_msg)],
3276 ["cf::map" => qw(trigger)], 3425 ["cf::map" => qw(trigger)],
3277) { 3426) {
3278 no strict 'refs';
3279 my ($pkg, @funs) = @$_; 3427 my ($pkg, @funs) = @$_;
3280 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3428 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3281 for @funs; 3429 for @funs;
3282} 3430}
3283 3431
… …
3359=cut 3507=cut
3360 3508
3361############################################################################# 3509#############################################################################
3362# the server's init and main functions 3510# the server's init and main functions
3363 3511
3512our %FACEHASH; # hash => idx, #d# HACK for http server
3513
3364sub load_facedata($) { 3514sub load_facedata($) {
3365 my ($path) = @_; 3515 my ($path) = @_;
3366 3516
3367 # HACK to clear player env face cache, we need some signal framework 3517 # HACK to clear player env face cache, we need some signal framework
3368 # for this (global event?) 3518 # for this (global event?)
… …
3370 3520
3371 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3521 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372 3522
3373 trace "loading facedata from $path\n"; 3523 trace "loading facedata from $path\n";
3374 3524
3375 my $facedata; 3525 my $facedata = decode_storable load_file $path;
3376 0 < aio_load $path, $facedata
3377 or die "$path: $!";
3378
3379 $facedata = Coro::Storable::thaw $facedata;
3380 3526
3381 $facedata->{version} == 2 3527 $facedata->{version} == 2
3382 or cf::cleanup "$path: version mismatch, cannot proceed."; 3528 or cf::cleanup "$path: version mismatch, cannot proceed.";
3383 3529
3384 # patch in the exptable 3530 # patch in the exptable
3385 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3531 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3386 $facedata->{resource}{"res/exp_table"} = { 3532 $facedata->{resource}{"res/exp_table"} = {
3387 type => FT_RSRC, 3533 type => FT_RSRC,
3388 data => $exp_table, 3534 data => $exp_table,
3389 hash => (Digest::MD5::md5 $exp_table), 3535 hash => (cf::face::mangle_chksum Digest::MD5::md5 $exp_table),
3390 }; 3536 };
3391 cf::cede_to_tick; 3537 cf::cede_to_tick;
3392 3538
3393 { 3539 {
3394 my $faces = $facedata->{faceinfo}; 3540 my $faces = $facedata->{faceinfo};
3395 3541
3396 while (my ($face, $info) = each %$faces) { 3542 for my $face (sort keys %$faces) {
3543 my $info = $faces->{$face};
3397 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3544 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398 3545
3399 cf::face::set_visibility $idx, $info->{visibility}; 3546 cf::face::set_visibility $idx, $info->{visibility};
3400 cf::face::set_magicmap $idx, $info->{magicmap}; 3547 cf::face::set_magicmap $idx, $info->{magicmap};
3401 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3548 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3549 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3550 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3551 $FACEHASH{$info->{hash64}} = $idx;#d#
3403 3552
3404 cf::cede_to_tick; 3553 cf::cede_to_tick;
3405 } 3554 }
3406 3555
3407 while (my ($face, $info) = each %$faces) { 3556 while (my ($face, $info) = each %$faces) {
… …
3434 3583
3435 { 3584 {
3436 my $res = $facedata->{resource}; 3585 my $res = $facedata->{resource};
3437 3586
3438 while (my ($name, $info) = each %$res) { 3587 while (my ($name, $info) = each %$res) {
3439 if (defined $info->{type}) { 3588 if (defined (my $type = $info->{type})) {
3589 # TODO: different hash - must free and use new index, or cache ixface data queue
3440 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3590 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441 3591
3442 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3592 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443 cf::face::set_type $idx, $info->{type}; 3593 cf::face::set_type $idx, $type;
3594 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3595 $FACEHASH{$info->{hash}} = $idx;#d#
3444 } else { 3596 } else {
3445 $RESOURCE{$name} = $info; # unused 3597# $RESOURCE{$name} = $info; # unused
3446 } 3598 }
3447 3599
3448 cf::cede_to_tick; 3600 cf::cede_to_tick;
3449 } 3601 }
3450 } 3602 }
… …
3502} 3654}
3503 3655
3504sub reload_sound { 3656sub reload_sound {
3505 trace "loading sound config from $DATADIR/sound\n"; 3657 trace "loading sound config from $DATADIR/sound\n";
3506 3658
3507 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508 or die "$DATADIR/sound $!";
3509
3510 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3659 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511 3660
3512 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3661 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513 my $sound = $soundconf->{compat}[$_] 3662 my $sound = $soundconf->{compat}[$_]
3514 or next; 3663 or next;
3515 3664
… …
3525} 3674}
3526 3675
3527sub reload_resources { 3676sub reload_resources {
3528 trace "reloading resource files...\n"; 3677 trace "reloading resource files...\n";
3529 3678
3679 reload_exp_table;
3680 reload_materials;
3530 reload_facedata; 3681 reload_facedata;
3531 reload_sound; 3682 reload_sound;
3532 reload_archetypes; 3683 reload_archetypes;
3533 reload_regions; 3684 reload_regions;
3534 reload_treasures; 3685 reload_treasures;
… …
3537} 3688}
3538 3689
3539sub reload_config { 3690sub reload_config {
3540 trace "reloading config file...\n"; 3691 trace "reloading config file...\n";
3541 3692
3542 open my $fh, "<:utf8", "$CONFDIR/config" 3693 my $config = load_file "$CONFDIR/config";
3543 or return; 3694 utf8::decode $config;
3544 3695 *CFG = decode_yaml $config;
3545 local $/;
3546 *CFG = YAML::XS::Load scalar <$fh>;
3547 3696
3548 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3697 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549 3698
3550 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3699 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3700 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3555 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3704 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556 and die "WARNING: m(un)lockall failed: $!\n"; 3705 and die "WARNING: m(un)lockall failed: $!\n";
3557 }; 3706 };
3558 warn $@ if $@; 3707 warn $@ if $@;
3559 } 3708 }
3560
3561 trace "finished reloading resource files\n";
3562} 3709}
3563 3710
3564sub pidfile() { 3711sub pidfile() {
3565 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3712 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566 or die "$PIDFILE: $!"; 3713 or die "$PIDFILE: $!";
… …
3591 3738
3592sub main { 3739sub main {
3593 cf::init_globals; # initialise logging 3740 cf::init_globals; # initialise logging
3594 3741
3595 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3742 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3743 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3744 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3745 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599 3746
3600 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3747 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601 3748
3602 # we must not ever block the main coroutine 3749 # we must not ever block the main coroutine
3603 local $Coro::idle = sub { 3750 $Coro::idle = sub {
3604 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3751 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605 (async { 3752 (async {
3606 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3753 $Coro::current->{desc} = "IDLE BUG HANDLER";
3607 EV::loop EV::LOOP_ONESHOT; 3754 EV::loop EV::LOOP_ONESHOT;
3608 })->prio (Coro::PRIO_MAX); 3755 })->prio (Coro::PRIO_MAX);
3609 }; 3756 };
3610 3757
3611 evthread_start IO::AIO::poll_fileno; 3758 evthread_start IO::AIO::poll_fileno;
3612 3759
3613 cf::sync_job { 3760 cf::sync_job {
3614 cf::init_experience; 3761 cf::incloader::init ();
3762
3615 cf::init_anim; 3763 cf::init_anim;
3616 cf::init_attackmess; 3764 cf::init_attackmess;
3617 cf::init_dynamic; 3765 cf::init_dynamic;
3618 3766
3619 cf::load_settings; 3767 cf::load_settings;
3620 cf::load_materials;
3621 3768
3622 reload_resources; 3769 reload_resources;
3623 reload_config; 3770 reload_config;
3624 db_init; 3771 db_init;
3625 3772
… …
3637 3784
3638 # no (long-running) fork's whatsoever before this point(!) 3785 # no (long-running) fork's whatsoever before this point(!)
3639 use POSIX (); 3786 use POSIX ();
3640 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3787 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3641 3788
3642 (pop @POST_INIT)->(0) while @POST_INIT; 3789 cf::_post_init 0;
3643 }; 3790 };
3644 3791
3645 cf::object::thawer::errors_are_fatal 0; 3792 cf::object::thawer::errors_are_fatal 0;
3646 info "parse errors in files are no longer fatal from this point on.\n"; 3793 info "parse errors in files are no longer fatal from this point on.\n";
3647 3794
3795 AE::postpone {
3796 undef &main; # free gobs of memory :)
3797 };
3798
3648 main_loop; 3799 goto &main_loop;
3649} 3800}
3650 3801
3651############################################################################# 3802#############################################################################
3652# initialisation and cleanup 3803# initialisation and cleanup
3653 3804
… …
3806 3957
3807 cf::write_runtime_sync; # external watchdog should not bark 3958 cf::write_runtime_sync; # external watchdog should not bark
3808 3959
3809 trace "emergency_perl_save: flushing outstanding aio requests"; 3960 trace "emergency_perl_save: flushing outstanding aio requests";
3810 while (IO::AIO::nreqs || BDB::nreqs) { 3961 while (IO::AIO::nreqs || BDB::nreqs) {
3811 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 3962 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3812 } 3963 }
3813 3964
3814 cf::write_runtime_sync; # external watchdog should not bark 3965 cf::write_runtime_sync; # external watchdog should not bark
3815 }; 3966 };
3816 3967
… …
3854 } 4005 }
3855} 4006}
3856 4007
3857sub do_reload_perl() { 4008sub do_reload_perl() {
3858 # can/must only be called in main 4009 # can/must only be called in main
3859 if (in_main) { 4010 unless (in_main) {
3860 error "can only reload from main coroutine"; 4011 error "can only reload from main coroutine";
3861 return; 4012 return;
3862 } 4013 }
3863 4014
3864 return if $RELOAD++; 4015 return if $RELOAD++;
3865 4016
3866 my $t1 = AE::time; 4017 my $t1 = AE::time;
3867 4018
3868 while ($RELOAD) { 4019 while ($RELOAD) {
4020 cf::get_slot 0.1, -1, "reload_perl";
3869 info "reloading..."; 4021 info "perl_reload: reloading...";
3870 4022
3871 trace "entering sync_job"; 4023 trace "perl_reload: entering sync_job";
3872 4024
3873 cf::sync_job { 4025 cf::sync_job {
3874 cf::emergency_save; 4026 #cf::emergency_save;
3875 4027
3876 trace "cancelling all extension coros"; 4028 trace "perl_reload: cancelling all extension coros";
3877 $_->cancel for values %EXT_CORO; 4029 $_->cancel for values %EXT_CORO;
3878 %EXT_CORO = (); 4030 %EXT_CORO = ();
3879 4031
3880 trace "removing commands"; 4032 trace "perl_reload: removing commands";
3881 %COMMAND = (); 4033 %COMMAND = ();
3882 4034
3883 trace "removing ext/exti commands"; 4035 trace "perl_reload: removing ext/exti commands";
3884 %EXTCMD = (); 4036 %EXTCMD = ();
3885 %EXTICMD = (); 4037 %EXTICMD = ();
3886 4038
3887 trace "unloading/nuking all extensions"; 4039 trace "perl_reload: unloading/nuking all extensions";
3888 for my $pkg (@EXTS) { 4040 for my $pkg (@EXTS) {
3889 trace "... unloading $pkg"; 4041 trace "... unloading $pkg";
3890 4042
3891 if (my $cb = $pkg->can ("unload")) { 4043 if (my $cb = $pkg->can ("unload")) {
3892 eval { 4044 eval {
… …
3897 4049
3898 trace "... clearing $pkg"; 4050 trace "... clearing $pkg";
3899 clear_package $pkg; 4051 clear_package $pkg;
3900 } 4052 }
3901 4053
3902 trace "unloading all perl modules loaded from $LIBDIR"; 4054 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3903 while (my ($k, $v) = each %INC) { 4055 while (my ($k, $v) = each %INC) {
3904 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4056 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3905 4057
3906 trace "... unloading $k"; 4058 trace "... unloading $k";
3907 delete $INC{$k}; 4059 delete $INC{$k};
… …
3914 } 4066 }
3915 4067
3916 clear_package $k; 4068 clear_package $k;
3917 } 4069 }
3918 4070
3919 trace "getting rid of safe::, as good as possible"; 4071 trace "perl_reload: getting rid of safe::, as good as possible";
3920 clear_package "safe::$_" 4072 clear_package "safe::$_"
3921 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4073 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3922 4074
3923 trace "unloading cf.pm \"a bit\""; 4075 trace "perl_reload: unloading cf.pm \"a bit\"";
3924 delete $INC{"cf.pm"}; 4076 delete $INC{"cf.pm"};
3925 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4077 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3926 4078
3927 # don't, removes xs symbols, too, 4079 # don't, removes xs symbols, too,
3928 # and global variables created in xs 4080 # and global variables created in xs
3929 #clear_package __PACKAGE__; 4081 #clear_package __PACKAGE__;
3930 4082
3931 info "unload completed, starting to reload now"; 4083 info "perl_reload: unload completed, starting to reload now";
3932 4084
3933 trace "reloading cf.pm"; 4085 trace "perl_reload: reloading cf.pm";
3934 require cf; 4086 require cf;
3935 cf::_connect_to_perl_1; 4087 cf::_connect_to_perl_1;
3936 4088
3937 trace "loading config and database again"; 4089 trace "perl_reload: loading config and database again";
3938 cf::reload_config; 4090 cf::reload_config;
3939 4091
3940 trace "loading extensions"; 4092 trace "perl_reload: loading extensions";
3941 cf::load_extensions; 4093 cf::load_extensions;
3942 4094
3943 if ($REATTACH_ON_RELOAD) { 4095 if ($REATTACH_ON_RELOAD) {
3944 trace "reattaching attachments to objects/players"; 4096 trace "perl_reload: reattaching attachments to objects/players";
3945 _global_reattach; # objects, sockets 4097 _global_reattach; # objects, sockets
3946 trace "reattaching attachments to maps"; 4098 trace "perl_reload: reattaching attachments to maps";
3947 reattach $_ for values %MAP; 4099 reattach $_ for values %MAP;
3948 trace "reattaching attachments to players"; 4100 trace "perl_reload: reattaching attachments to players";
3949 reattach $_ for values %PLAYER; 4101 reattach $_ for values %PLAYER;
3950 } 4102 }
3951 4103
3952 trace "running post_init jobs"; 4104 cf::_post_init 1;
3953 (pop @POST_INIT)->(1) while @POST_INIT;
3954 4105
3955 trace "leaving sync_job"; 4106 trace "perl_reload: leaving sync_job";
3956 4107
3957 1 4108 1
3958 } or do { 4109 } or do {
3959 error $@; 4110 error $@;
3960 cf::cleanup "error while reloading, exiting."; 4111 cf::cleanup "perl_reload: error, exiting.";
3961 }; 4112 };
3962 4113
3963 info "reloaded";
3964 --$RELOAD; 4114 --$RELOAD;
3965 } 4115 }
3966 4116
3967 $t1 = AE::time - $t1; 4117 $t1 = AE::time - $t1;
3968 info "reload completed in ${t1}s\n"; 4118 info "perl_reload: completed in ${t1}s\n";
3969}; 4119};
3970 4120
3971our $RELOAD_WATCHER; # used only during reload 4121our $RELOAD_WATCHER; # used only during reload
3972 4122
3973sub reload_perl() { 4123sub reload_perl() {
… …
3994 reload_perl; 4144 reload_perl;
3995 }; 4145 };
3996 } 4146 }
3997}; 4147};
3998 4148
3999unshift @INC, $LIBDIR; 4149#############################################################################
4000 4150
4001my $bug_warning = 0; 4151my $bug_warning = 0;
4002 4152
4003our @WAIT_FOR_TICK;
4004our @WAIT_FOR_TICK_BEGIN;
4005
4006sub wait_for_tick { 4153sub wait_for_tick() {
4007 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4154 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4008 4155
4009 my $signal = new Coro::Signal; 4156 $WAIT_FOR_TICK->wait;
4010 push @WAIT_FOR_TICK, $signal;
4011 $signal->wait;
4012} 4157}
4013 4158
4014sub wait_for_tick_begin { 4159sub wait_for_tick_begin() {
4015 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4160 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4016 4161
4017 my $signal = new Coro::Signal; 4162 my $signal = new Coro::Signal;
4018 push @WAIT_FOR_TICK_BEGIN, $signal; 4163 push @WAIT_FOR_TICK_BEGIN, $signal;
4019 $signal->wait; 4164 $signal->wait;
4020} 4165}
… …
4024 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4169 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4025 unless ++$bug_warning > 10; 4170 unless ++$bug_warning > 10;
4026 return; 4171 return;
4027 } 4172 }
4028 4173
4029 cf::server_tick; # one server iteration 4174 cf::one_tick; # one server iteration
4030 4175
4031 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4176 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4032 4177
4033 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4178 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4034 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4179 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4040 } 4185 }
4041 4186
4042 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4187 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4043 $sig->send; 4188 $sig->send;
4044 } 4189 }
4045 while (my $sig = shift @WAIT_FOR_TICK) { 4190 $WAIT_FOR_TICK->broadcast;
4046 $sig->send;
4047 }
4048 4191
4049 $LOAD = ($NOW - $TICK_START) / $TICK; 4192 $LOAD = ($NOW - $TICK_START) / $TICK;
4050 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4193 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4051 4194
4052 if (0) { 4195 if (0) {
… …
4061{ 4204{
4062 # configure BDB 4205 # configure BDB
4063 4206
4064 BDB::min_parallel 16; 4207 BDB::min_parallel 16;
4065 BDB::max_poll_reqs $TICK * 0.1; 4208 BDB::max_poll_reqs $TICK * 0.1;
4066 $AnyEvent::BDB::WATCHER->priority (1); 4209 #$AnyEvent::BDB::WATCHER->priority (1);
4067 4210
4068 unless ($DB_ENV) { 4211 unless ($DB_ENV) {
4069 $DB_ENV = BDB::db_env_create; 4212 $DB_ENV = BDB::db_env_create;
4070 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4213 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4071 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4214 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4106 IO::AIO::min_parallel 8; 4249 IO::AIO::min_parallel 8;
4107 IO::AIO::max_poll_time $TICK * 0.1; 4250 IO::AIO::max_poll_time $TICK * 0.1;
4108 undef $AnyEvent::AIO::WATCHER; 4251 undef $AnyEvent::AIO::WATCHER;
4109} 4252}
4110 4253
4111my $_log_backtrace; 4254our $_log_backtrace;
4255our $_log_backtrace_last;
4112 4256
4113sub _log_backtrace { 4257sub _log_backtrace {
4114 my ($msg, @addr) = @_; 4258 my ($msg, @addr) = @_;
4115 4259
4116 $msg =~ s/\n//; 4260 $msg =~ s/\n$//;
4117 4261
4262 if ($_log_backtrace_last eq $msg) {
4263 LOG llevInfo, "[ABT] $msg\n";
4264 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4118 # limit the # of concurrent backtraces 4265 # limit the # of concurrent backtraces
4119 if ($_log_backtrace < 2) { 4266 } elsif ($_log_backtrace < 2) {
4267 $_log_backtrace_last = $msg;
4120 ++$_log_backtrace; 4268 ++$_log_backtrace;
4121 my $perl_bt = Carp::longmess $msg; 4269 my $perl_bt = Carp::longmess $msg;
4122 async { 4270 async {
4123 $Coro::current->{desc} = "abt $msg"; 4271 $Coro::current->{desc} = "abt $msg";
4124 4272
… …
4144 LOG llevInfo, "[ABT] $_\n" for @bt; 4292 LOG llevInfo, "[ABT] $_\n" for @bt;
4145 --$_log_backtrace; 4293 --$_log_backtrace;
4146 }; 4294 };
4147 } else { 4295 } else {
4148 LOG llevInfo, "[ABT] $msg\n"; 4296 LOG llevInfo, "[ABT] $msg\n";
4149 LOG llevInfo, "[ABT] [suppressed]\n"; 4297 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4150 } 4298 }
4151} 4299}
4152 4300
4153# load additional modules 4301# load additional modules
4154require "cf/$_.pm" for @EXTRA_MODULES; 4302require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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