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.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.592 by root, Fri Nov 9 00:11:49 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
… …
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp (); 35use Carp ();
36 36
37use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
38use Coro (); 41use Coro ();
39use Coro::State; 42use Coro::State;
40use Coro::Handle; 43use Coro::Handle;
41use Coro::EV; 44use Coro::EV;
42use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
48use Coro::AIO; 51use Coro::AIO;
49use Coro::BDB 1.6; 52use Coro::BDB 1.6;
50use Coro::Storable; 53use Coro::Storable;
51use Coro::Util (); 54use Coro::Util ();
52 55
56use Guard ();
53use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
54use BDB (); 58use BDB ();
55use Data::Dumper; 59use Data::Dumper;
56use Fcntl; 60use Fcntl;
57use YAML::XS (); 61use YAML::XS ();
… …
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
… …
127our $DB_ENV; 133our $DB_ENV;
128 134
129our @EXTRA_MODULES = qw(pod match mapscript incloader); 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.
202 228
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 232
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.
… …
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 thread 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.
240 270
241=cut 271=cut
242 272
243sub wait_for_tick(); 273sub wait_for_tick();
244sub wait_for_tick_begin(); 274sub wait_for_tick_begin();
… …
310)) { 340)) {
311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312} 342}
313 343
314$EV::DIED = sub { 344$EV::DIED = sub {
315 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
316}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
317 352
318############################################################################# 353#############################################################################
319 354
320=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
321 356
… …
342 $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;
343 $d 378 $d
344 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
345} 380}
346 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
347=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
348 435
349Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
350 437
351=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
357our $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
358 445
359sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
361 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
362=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
363 481
364Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
366 484
367The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
368is a reload or not. 486is a reload or not.
369 487
370=cut 488=cut
371 489
372sub post_init(&) { 490sub post_init(&) {
373 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 }
374} 509}
375 510
376=item cf::lock_wait $string 511=item cf::lock_wait $string
377 512
378Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
431 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
432} 567}
433 568
434=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
435 570
436Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
437This 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
438of 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.
439 578
440The 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
441used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
442 581
443Useful for short background jobs. 582Useful for short background jobs.
… …
472 } 611 }
473 } 612 }
474 613
475 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
476 # 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
477 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
478 $signal->wait;
479 } else { 617 } else {
480 $busy = 0; 618 $busy = 0;
481 Coro::schedule; 619 Coro::schedule;
482 } 620 }
483 } 621 }
… …
583 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
584 722
585 $coro 723 $coro
586} 724}
587 725
588=item fork_call { }, $args 726=item fork_call { }, @args
589 727
590Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
591process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling. 731never block itself or use any form of event handling.
… …
606 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
607 745
608 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
609 cf::post_fork; 747 cf::post_fork;
610 &$cb 748 &$cb
611 }, @args; 749 } @args;
612 750
613 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
614} 752}
615 753
616sub objinfo { 754sub objinfo {
… …
738 876
739 my @data; 877 my @data;
740 my $md5; 878 my $md5;
741 879
742 for (0 .. $#$src) { 880 for (0 .. $#$src) {
743 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
744 or Carp::croak "$src->[$_]: $!";
745 } 882 }
746 883
747 # if processing is expensive, check 884 # if processing is expensive, check
748 # checksum first 885 # checksum first
749 if (1) { 886 if (1) {
… …
1367 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1368 1505
1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370 1507
1371 if (ref $msg) { 1508 if (ref $msg) {
1372 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373 "ARRAY" eq ref $msg
1374 ? @$msg
1375 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376 1510
1377 my @reply; 1511 my @reply;
1378 1512
1379 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1380 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1402 }; 1536 };
1403 1537
1404 $grp 1538 $grp
1405} 1539}
1406 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
1407sub load_extensions { 1552sub load_extensions {
1408 info "loading extensions..."; 1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1409 1556
1410 cf::sync_job { 1557 cf::sync_job {
1411 my %todo; 1558 my %todo;
1412 1559
1413 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
… …
1456 unless exists $done{$_}; 1603 unless exists $done{$_};
1457 } 1604 }
1458 1605
1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460 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
1461 my $active = eval $v->{source}; 1617 my $active = eval $source;
1462 1618
1463 if (length $@) { 1619 if (length $@) {
1464 error "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1465 1621
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
… …
1483 1639
1484 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1487 } 1643 }
1644
1645 last;
1488 } 1646 }
1489 } 1647 }
1490 }; 1648 };
1491} 1649}
1492 1650
… …
1650 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1651 1809
1652 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1653 $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
1654 1812
1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656 $pl->deactivate; 1814 $pl->deactivate;
1657 1815
1658 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;
1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659 ext::highscore::check ($pl->ob); 1818 ext::highscore::check ($pl->ob);
1660 1819
1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1662 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1663 1821
1664 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1665 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1666 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1832sub generate_random_map { 1990sub generate_random_map {
1833 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1834 1992
1835 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
1836 1994
1837 # mit "rum" bekleckern, nicht
1838 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842 $rmp->{exit_on_final_map},
1843 $rmp->{xsize}, $rmp->{ysize},
1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849 (cf::region::find $rmp->{region}), $rmp->{custom}
1850 )
1851} 1996}
1852 1997
1853=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1854 1999
1855Register 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
… …
1906 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1907 $path = "$base/$path"; 2052 $path = "$base/$path";
1908 } 2053 }
1909 2054
1910 for ($path) { 2055 for ($path) {
1911 redo if s{//}{/};
1912 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1913 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1914 } 2058 }
1915 2059
1916 $path 2060 $path
… …
1934 2078
1935 Carp::cluck "unable to resolve path '$path' (base '$base')"; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1936 () 2080 ()
1937} 2081}
1938 2082
2083# may re-bless or do other evil things
1939sub init { 2084sub init {
1940 my ($self) = @_; 2085 my ($self) = @_;
1941 2086
1942 $self 2087 $self
1943} 2088}
… …
2008 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
2009 2154
2010 1 2155 1
2011} 2156}
2012 2157
2158# used to laod the header of an original map
2013sub load_header_orig { 2159sub load_header_orig {
2014 my ($self) = @_; 2160 my ($self) = @_;
2015 2161
2016 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
2017} 2163}
2018 2164
2165# used to laod the header of an instantiated map
2019sub load_header_temp { 2166sub load_header_temp {
2020 my ($self) = @_; 2167 my ($self) = @_;
2021 2168
2022 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
2023} 2170}
2024 2171
2172# called after loading the header from an instantiated map
2025sub prepare_temp { 2173sub prepare_temp {
2026 my ($self) = @_; 2174 my ($self) = @_;
2027 2175
2028 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
2029 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
2030 # safety 2178 # safety
2031 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
2032 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
2033} 2181}
2034 2182
2183# called after loading the header from an original map
2035sub prepare_orig { 2184sub prepare_orig {
2036 my ($self) = @_; 2185 my ($self) = @_;
2037 2186
2038 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
2039 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
2065sub find { 2214sub find {
2066 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2067 2216
2068 cf::cede_to_tick; 2217 cf::cede_to_tick;
2069 2218
2070 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2071 2220
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2074 2223
2075 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2106 2255
2107 { 2256 {
2108 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2109 2258
2110 return unless $self->valid; 2259 return unless $self->valid;
2111 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2112
2113 $self->in_memory (cf::MAP_LOADING);
2114 2261
2115 $self->alloc; 2262 $self->alloc;
2116 2263
2117 $self->pre_load; 2264 $self->pre_load;
2118 cf::cede_to_tick; 2265 cf::cede_to_tick;
2119 2266
2267 if (exists $self->{load_path}) {
2120 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block; 2269 $f->skip_block;
2122 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2123 or return; 2271 or return;
2124 2272
2125 $self->post_load_original 2273 $self->post_load_original
2126 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2127 2275
2128 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2129 utf8::encode $uniq; 2277 utf8::encode $uniq;
2130 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2132 $self->clear_unique_items; 2280 $self->clear_unique_items;
2133 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2135 } 2284 }
2136 } 2285 }
2137 }
2138 2286
2139 $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);
2140 2294
2141 cf::cede_to_tick; 2295 cf::cede_to_tick;
2142 # now do the right thing for maps 2296 # now do the right thing for maps
2143 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2144 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2148 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2149 $self->decay_objects; 2303 $self->decay_objects;
2150 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2151 $self->update_buttons; 2305 $self->update_buttons;
2152 cf::cede_to_tick; 2306 cf::cede_to_tick;
2153 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2154 } 2308 }
2155 2309
2156 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2158
2159 $self->in_memory (cf::MAP_ACTIVE);
2160 } 2312 }
2161 2313
2162 $self->post_load; 2314 $self->post_load;
2315
2316 1
2163} 2317}
2164 2318
2165# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2175# if $self->per_party; 2329# if $self->per_party;
2176 2330
2177 $self 2331 $self
2178} 2332}
2179 2333
2180# find and load all maps in the 3x3 area around a map
2181sub load_neighbours {
2182 my ($map) = @_;
2183
2184 my @neigh; # diagonal neighbours
2185
2186 for (0 .. 3) {
2187 my $neigh = $map->tile_path ($_)
2188 or next;
2189 $neigh = find $neigh, $map
2190 or next;
2191 $neigh->load;
2192
2193 # now find the diagonal neighbours
2194 push @neigh,
2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2197 }
2198
2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
2201 my $neigh = find $path, $origin
2202 or next;
2203 $neigh->load;
2204 }
2205}
2206
2207sub find_sync { 2334sub find_sync {
2208 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2209 2336
2337 # it's a bug to call this from the main context
2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync" 2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main; 2339 if $Coro::current == $Coro::main;
2212 2340
2213 find $path, $origin 2341 find $path, $origin
2214} 2342}
2215 2343
2216sub do_load_sync { 2344sub do_load_sync {
2217 my ($map) = @_; 2345 my ($map) = @_;
2218 2346
2347 # it's a bug to call this from the main context
2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2221 2350
2222 $map->load; 2351 $map->load;
2223} 2352}
… …
2226our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2227 2356
2228sub find_async { 2357sub find_async {
2229 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2230 2359
2231 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2232 2361
2233 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2235 } 2364 }
2236 2365
2237 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2238 2367
2239 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2298sub swap_out { 2427sub swap_out {
2299 my ($self) = @_; 2428 my ($self) = @_;
2300 2429
2301 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2302 2431
2303 return if $self->in_memory != cf::MAP_ACTIVE; 2432 return if !$self->linkable;
2304 return if $self->{deny_save}; 2433 return if $self->{deny_save};
2305 return if $self->players; 2434 return if $self->players;
2306 2435
2307 # first deactivate the map and "unlink" it from the core 2436 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate; 2437 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP; 2438 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED); 2439 $self->state (cf::MAP_SWAPPED);
2311 2440
2312 # then atomically save 2441 # then atomically save
2313 $self->_save; 2442 $self->_save;
2314 2443
2315 # then free the map 2444 # then free the map
… …
2341 2470
2342 return if $self->players; 2471 return if $self->players;
2343 2472
2344 cf::trace "resetting map ", $self->path, "\n"; 2473 cf::trace "resetting map ", $self->path, "\n";
2345 2474
2346 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2347 2476
2348 # need to save uniques path 2477 # need to save uniques path
2349 unless ($self->{deny_save}) { 2478 unless ($self->{deny_save}) {
2350 my $uniq = $self->uniq_path; utf8::encode $uniq; 2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2351 2480
… …
2681 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2682 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2683 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2684 2813
2685 $map->load; 2814 $map->load;
2686 $map->load_neighbours;
2687 2815
2688 return unless $self->contr->active; 2816 return unless $self->contr->active;
2689 2817
2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691 if ($self->enter_map ($map, $x, $y)) { 2819 if ($self->enter_map ($map, $x, $y)) {
… …
2747 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2748 } 2876 }
2749 } 2877 }
2750 2878
2751 my $map = eval { 2879 my $map = eval {
2752 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753 2881
2754 if ($map) { 2882 if ($map) {
2755 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2756 $map = $check->($map, $x, $y, $self) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2757 } else { 2885 } else {
… …
2847 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2848 2976
2849 unless (eval { 2977 unless (eval {
2850 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2851 2979
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2861 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2862 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 }
2863 3006
2864 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2865 3008
2866 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
3092=cut 3235=cut
3093 3236
3094sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3095 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3096 3239
3097 if ($self->extcmd == 2) {
3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099 } elsif ($self->extcmd == 1) { # TODO: remove
3100 push @msg, msgtype => "event_$type";
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102 }
3103} 3241}
3104 3242
3105=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3106 3244
3107Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3109=cut 3247=cut
3110 3248
3111sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3112 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3113 3251
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116 } elsif ($self->extcmd == 1) {
3117 #TODO: version 1, remove
3118 unshift @msg, msgtype => "reply", msgid => $id;
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120 }
3121} 3253}
3122 3254
3123=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3124 3256
3125Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3180 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3181 3313
3182 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183 3315
3184 if (ref $msg) { 3316 if (ref $msg) {
3185 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186 "ARRAY" eq ref $msg
3187 ? @$msg
3188 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189 3318
3190 my @reply; 3319 my @reply;
3191 3320
3192 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3193 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3371=cut 3500=cut
3372 3501
3373############################################################################# 3502#############################################################################
3374# the server's init and main functions 3503# the server's init and main functions
3375 3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3528
3376sub load_facedata($) { 3529sub load_facedata($) {
3377 my ($path) = @_; 3530 my ($path) = @_;
3378 3531
3379 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3380 # for this (global event?) 3533 # for this (global event?)
… …
3382 3535
3383 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384 3537
3385 trace "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3386 3539
3387 0 < aio_load $path, my $facedata 3540 my $facedata = decode_storable load_file $path;
3388 or die "$path: $!";
3389
3390 $facedata = Coro::Storable::thaw $facedata;
3391 3541
3392 $facedata->{version} == 2 3542 $facedata->{version} == 2
3393 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3394 3544
3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3397 $facedata->{resource}{"res/exp_table"} = {
3398 type => FT_RSRC,
3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3401 };
3402 cf::cede_to_tick; 3545 cf::cede_to_tick;
3403 3546
3404 { 3547 {
3405 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3406 3549
3407 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3408 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409 3553
3410 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3414 3560
3415 cf::cede_to_tick; 3561 cf::cede_to_tick;
3416 } 3562 }
3417 3563
3418 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3445 3591
3446 { 3592 {
3447 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3448 3594
3449 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3451 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452 3599
3600 cf::face::set_type $idx, $type;
3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454 cf::face::set_type $idx, $info->{type}; 3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3455 } else { 3604 } else {
3456 $RESOURCE{$name} = $info; # unused 3605# $RESOURCE{$name} = $info; # unused
3457 } 3606 }
3458 3607
3459 cf::cede_to_tick; 3608 cf::cede_to_tick;
3460 } 3609 }
3461 } 3610 }
… …
3479 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3481 cf::arch::commit_load; 3630 cf::arch::commit_load;
3482 3631
3483 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3484} 3646}
3485 3647
3486sub reload_regions { 3648sub reload_regions {
3487 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3488 # for this (global event?) 3650 # for this (global event?)
… …
3503} 3665}
3504 3666
3505sub reload_archetypes { 3667sub reload_archetypes {
3506 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3507 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3508} 3679}
3509 3680
3510sub reload_treasures { 3681sub reload_treasures {
3511 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3512 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3513} 3684}
3514 3685
3515sub reload_sound { 3686sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n"; 3687 trace "loading sound config from $DATADIR/sound\n";
3517 3688
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522 3690
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_] 3692 my $sound = $soundconf->{compat}[$_]
3525 or next; 3693 or next;
3526 3694
… …
3533 my $face = cf::face::find "sound/$v"; 3701 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face; 3702 cf::sound::set $k => $face;
3535 } 3703 }
3536} 3704}
3537 3705
3706#d# move docstuff to help or so
3707our %DOCSTRING;
3708
3709sub reload_pod {
3710 trace "loading pods $PODDIR\n";
3711
3712 %DOCSTRING = ();
3713 my @command_list;
3714
3715 for (
3716 [0, "command_help"],
3717 [1, "emote_help"],
3718 [2, "dmcommand_help"],
3719 ) {
3720 my ($type, $path) = @$_;
3721
3722 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3723 or die "unable to load $path";
3724
3725 my $level = 1e9;
3726 my $rpar;
3727
3728 for my $par (@$paragraphs) {
3729 if ($par->{type} eq "head2") {
3730 # this code taken almost verbatim from DC/Protocol.pm
3731
3732 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3733 my $cmd = $1;
3734 my @args = split /\|/, $2;
3735 @args = (".*") unless @args;
3736
3737 $_ = $_ eq ".*" ? "" : " $_"
3738 for @args;
3739
3740 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3741
3742 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3743
3744 push @command_list, [$type, \@variants];
3745 $level = $par->{level};
3746 } else {
3747 error "$par->{markup}: unparsable command heading";
3748 }
3749 } elsif ($par->{level} > $level) {
3750 $$rpar .= &cf::pod::as_cfpod ([$par]);
3751 }
3752
3753 cf::cede_to_tick;
3754 }
3755 }
3756
3757 @command_list = sort {
3758 $a->[0] <=> $b->[0]
3759 or $a->[1] cmp $b->[1]
3760 } @command_list;
3761
3762 cf::cede_to_tick;
3763
3764 add_face "res/command_list" => FT_RSRC,
3765 JSON::XS->new->utf8->encode (\@command_list);
3766}
3767
3538sub reload_resources { 3768sub reload_resources {
3539 trace "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3540 3770
3541 reload_exp_table;
3542 reload_materials; 3771 reload_materials;
3543 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3544 reload_sound; 3774 reload_sound;
3545 reload_archetypes; 3775 reload_archetypes;
3546 reload_regions; 3776 reload_regions;
3547 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3548 3779
3549 trace "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3550} 3781}
3551 3782
3552sub reload_config { 3783sub reload_config {
3553 trace "reloading config file...\n"; 3784 trace "reloading config file...\n";
3554 3785
3555 0 < aio_load "$CONFDIR/config", my $config 3786 my $config = load_file "$CONFDIR/config";
3556 or die "$CONFDIR/config: $!";
3557
3558 utf8::decode $config; 3787 utf8::decode $config;
3559 3788 *CFG = decode_yaml $config;
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561 *CFG = YAML::XS::Load $config;
3562 3789
3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3790 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564 3791
3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3792 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3793 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3604 3831
3605sub main { 3832sub main {
3606 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3607 3834
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612 3839
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3840 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614 3841
3615 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3616 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3844 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3618 (async { 3845 (async {
3619 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3620 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3621 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
… …
3624 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3625 3852
3626 cf::sync_job { 3853 cf::sync_job {
3627 cf::incloader::init (); 3854 cf::incloader::init ();
3628 3855
3856 db_init;
3857
3629 cf::init_anim; 3858 cf::init_anim;
3630 cf::init_attackmess; 3859 cf::init_attackmess;
3631 cf::init_dynamic; 3860 cf::init_dynamic;
3632 3861
3633 cf::load_settings; 3862 cf::load_settings;
3634 3863
3635 reload_resources; 3864 reload_resources;
3636 reload_config; 3865 reload_config;
3637 db_init;
3638 3866
3639 cf::init_uuid; 3867 cf::init_uuid;
3640 cf::init_signals; 3868 cf::init_signals;
3641 cf::init_skills; 3869 cf::init_skills;
3642 3870
… …
3650 3878
3651 # no (long-running) fork's whatsoever before this point(!) 3879 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX (); 3880 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3881 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654 3882
3655 (pop @POST_INIT)->(0) while @POST_INIT; 3883 cf::_post_init 0;
3656 }; 3884 };
3657 3885
3658 cf::object::thawer::errors_are_fatal 0; 3886 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n"; 3887 info "parse errors in files are no longer fatal from this point on.\n";
3660 3888
3661 my $free_main; $free_main = EV::idle sub { 3889 AE::postpone {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :) 3890 undef &main; # free gobs of memory :)
3664 }; 3891 };
3665 3892
3666 goto &main_loop; 3893 goto &main_loop;
3667} 3894}
… …
3824 4051
3825 cf::write_runtime_sync; # external watchdog should not bark 4052 cf::write_runtime_sync; # external watchdog should not bark
3826 4053
3827 trace "emergency_perl_save: flushing outstanding aio requests"; 4054 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) { 4055 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing 4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3830 } 4057 }
3831 4058
3832 cf::write_runtime_sync; # external watchdog should not bark 4059 cf::write_runtime_sync; # external watchdog should not bark
3833 }; 4060 };
3834 4061
… …
3883 4110
3884 my $t1 = AE::time; 4111 my $t1 = AE::time;
3885 4112
3886 while ($RELOAD) { 4113 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl"; 4114 cf::get_slot 0.1, -1, "reload_perl";
3888 info "reloading..."; 4115 info "perl_reload: reloading...";
3889 4116
3890 trace "entering sync_job"; 4117 trace "perl_reload: entering sync_job";
3891 4118
3892 cf::sync_job { 4119 cf::sync_job {
3893 #cf::emergency_save; 4120 #cf::emergency_save;
3894 4121
3895 trace "cancelling all extension coros"; 4122 trace "perl_reload: cancelling all extension coros";
3896 $_->cancel for values %EXT_CORO; 4123 $_->cancel for values %EXT_CORO;
3897 %EXT_CORO = (); 4124 %EXT_CORO = ();
3898 4125
3899 trace "removing commands"; 4126 trace "perl_reload: removing commands";
3900 %COMMAND = (); 4127 %COMMAND = ();
3901 4128
3902 trace "removing ext/exti commands"; 4129 trace "perl_reload: removing ext/exti commands";
3903 %EXTCMD = (); 4130 %EXTCMD = ();
3904 %EXTICMD = (); 4131 %EXTICMD = ();
3905 4132
3906 trace "unloading/nuking all extensions"; 4133 trace "perl_reload: unloading/nuking all extensions";
3907 for my $pkg (@EXTS) { 4134 for my $pkg (@EXTS) {
3908 trace "... unloading $pkg"; 4135 trace "... unloading $pkg";
3909 4136
3910 if (my $cb = $pkg->can ("unload")) { 4137 if (my $cb = $pkg->can ("unload")) {
3911 eval { 4138 eval {
… …
3916 4143
3917 trace "... clearing $pkg"; 4144 trace "... clearing $pkg";
3918 clear_package $pkg; 4145 clear_package $pkg;
3919 } 4146 }
3920 4147
3921 trace "unloading all perl modules loaded from $LIBDIR"; 4148 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922 while (my ($k, $v) = each %INC) { 4149 while (my ($k, $v) = each %INC) {
3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4150 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924 4151
3925 trace "... unloading $k"; 4152 trace "... unloading $k";
3926 delete $INC{$k}; 4153 delete $INC{$k};
… …
3933 } 4160 }
3934 4161
3935 clear_package $k; 4162 clear_package $k;
3936 } 4163 }
3937 4164
3938 trace "getting rid of safe::, as good as possible"; 4165 trace "perl_reload: getting rid of safe::, as good as possible";
3939 clear_package "safe::$_" 4166 clear_package "safe::$_"
3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4167 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3941 4168
3942 trace "unloading cf.pm \"a bit\""; 4169 trace "perl_reload: unloading cf.pm \"a bit\"";
3943 delete $INC{"cf.pm"}; 4170 delete $INC{"cf.pm"};
3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4171 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945 4172
3946 # don't, removes xs symbols, too, 4173 # don't, removes xs symbols, too,
3947 # and global variables created in xs 4174 # and global variables created in xs
3948 #clear_package __PACKAGE__; 4175 #clear_package __PACKAGE__;
3949 4176
3950 info "unload completed, starting to reload now"; 4177 info "perl_reload: unload completed, starting to reload now";
3951 4178
3952 trace "reloading cf.pm"; 4179 trace "perl_reload: reloading cf.pm";
3953 require cf; 4180 require cf;
3954 cf::_connect_to_perl_1; 4181 cf::_connect_to_perl_1;
3955 4182
3956 trace "loading config and database again"; 4183 trace "perl_reload: loading config and database again";
3957 cf::reload_config; 4184 cf::reload_config;
3958 4185
3959 trace "loading extensions"; 4186 trace "perl_reload: loading extensions";
3960 cf::load_extensions; 4187 cf::load_extensions;
3961 4188
3962 if ($REATTACH_ON_RELOAD) { 4189 if ($REATTACH_ON_RELOAD) {
3963 trace "reattaching attachments to objects/players"; 4190 trace "perl_reload: reattaching attachments to objects/players";
3964 _global_reattach; # objects, sockets 4191 _global_reattach; # objects, sockets
3965 trace "reattaching attachments to maps"; 4192 trace "perl_reload: reattaching attachments to maps";
3966 reattach $_ for values %MAP; 4193 reattach $_ for values %MAP;
3967 trace "reattaching attachments to players"; 4194 trace "perl_reload: reattaching attachments to players";
3968 reattach $_ for values %PLAYER; 4195 reattach $_ for values %PLAYER;
3969 } 4196 }
3970 4197
3971 trace "running post_init jobs"; 4198 cf::_post_init 1;
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973 4199
3974 trace "leaving sync_job"; 4200 trace "perl_reload: leaving sync_job";
3975 4201
3976 1 4202 1
3977 } or do { 4203 } or do {
3978 error $@; 4204 error $@;
3979 cf::cleanup "error while reloading, exiting."; 4205 cf::cleanup "perl_reload: error, exiting.";
3980 }; 4206 };
3981 4207
3982 info "reloaded";
3983 --$RELOAD; 4208 --$RELOAD;
3984 } 4209 }
3985 4210
3986 $t1 = AE::time - $t1; 4211 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n"; 4212 info "perl_reload: completed in ${t1}s\n";
3988}; 4213};
3989 4214
3990our $RELOAD_WATCHER; # used only during reload 4215our $RELOAD_WATCHER; # used only during reload
3991 4216
3992sub reload_perl() { 4217sub reload_perl() {
… …
4017 4242
4018############################################################################# 4243#############################################################################
4019 4244
4020my $bug_warning = 0; 4245my $bug_warning = 0;
4021 4246
4022our @WAIT_FOR_TICK;
4023our @WAIT_FOR_TICK_BEGIN;
4024
4025sub wait_for_tick() { 4247sub wait_for_tick() {
4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027 4249
4028 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
4029 push @WAIT_FOR_TICK, $signal;
4030 $signal->wait;
4031} 4251}
4032 4252
4033sub wait_for_tick_begin() { 4253sub wait_for_tick_begin() {
4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035 4255
4036 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
4037 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
4038 $signal->wait; 4258 $signal->wait;
4039} 4259}
… …
4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4263 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4044 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
4045 return; 4265 return;
4046 } 4266 }
4047 4267
4048 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
4049 4269
4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051 4271
4052 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4273 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
… …
4059 } 4279 }
4060 4280
4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062 $sig->send; 4282 $sig->send;
4063 } 4283 }
4064 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
4065 $sig->send;
4066 }
4067 4285
4068 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070 4288
4071 if (0) { 4289 if (0) {
… …
4077 } 4295 }
4078} 4296}
4079 4297
4080{ 4298{
4081 # configure BDB 4299 # configure BDB
4300 info "initialising database";
4082 4301
4083 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
4084 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
4085 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
4086 4305
4087 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
4088 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4309 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4115 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116 }; 4335 };
4117 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119 }; 4338 };
4339
4340 info "database initialised";
4120} 4341}
4121 4342
4122{ 4343{
4123 # configure IO::AIO 4344 # configure IO::AIO
4124 4345
4346 info "initialising aio";
4125 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4126 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4127 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4128} 4351}
4129 4352
4130my $_log_backtrace; 4353our $_log_backtrace;
4354our $_log_backtrace_last;
4131 4355
4132sub _log_backtrace { 4356sub _log_backtrace {
4133 my ($msg, @addr) = @_; 4357 my ($msg, @addr) = @_;
4134 4358
4135 $msg =~ s/\n//; 4359 $msg =~ s/\n$//;
4136 4360
4361 if ($_log_backtrace_last eq $msg) {
4362 LOG llevInfo, "[ABT] $msg\n";
4363 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137 # limit the # of concurrent backtraces 4364 # limit the # of concurrent backtraces
4138 if ($_log_backtrace < 2) { 4365 } elsif ($_log_backtrace < 2) {
4366 $_log_backtrace_last = $msg;
4139 ++$_log_backtrace; 4367 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg; 4368 my $perl_bt = Carp::longmess $msg;
4141 async { 4369 async {
4142 $Coro::current->{desc} = "abt $msg"; 4370 $Coro::current->{desc} = "abt $msg";
4143 4371
… …
4163 LOG llevInfo, "[ABT] $_\n" for @bt; 4391 LOG llevInfo, "[ABT] $_\n" for @bt;
4164 --$_log_backtrace; 4392 --$_log_backtrace;
4165 }; 4393 };
4166 } else { 4394 } else {
4167 LOG llevInfo, "[ABT] $msg\n"; 4395 LOG llevInfo, "[ABT] $msg\n";
4168 LOG llevInfo, "[ABT] [suppressed]\n"; 4396 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169 } 4397 }
4170} 4398}
4171 4399
4172# load additional modules 4400# load additional modules
4173require "cf/$_.pm" for @EXTRA_MODULES; 4401require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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