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.532 by root, Thu Apr 29 07:32:34 2010 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
60use IO::AIO (); 62use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 63use Compress::LZF;
63use Digest::MD5 (); 64use Digest::MD5 ();
64 65
65AnyEvent::detect; 66AnyEvent::detect;
66 67
78# strictly for debugging 79# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 81
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 83
84our @ORIG_INC;
85
83our %COMMAND = (); 86our %COMMAND = ();
84our %COMMAND_TIME = (); 87our %COMMAND_TIME = ();
85 88
86our @EXTS = (); # list of extension package names 89our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 90our %EXTCMD = ();
91our %EXTACMD = ();
88our %EXTICMD = (); 92our %EXTICMD = ();
93our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 94our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 95our %EXT_MAP = (); # pluggable maps
91 96
92our $RELOAD; # number of reloads so far, non-zero while in reload 97our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 98our @EVENT;
94our @REFLECT; # set by XS 99our @REFLECT; # set by XS
95our %REFLECT; # set by us 100our %REFLECT; # set by us
96 101
97our $CONFDIR = confdir; 102our $CONFDIR = confdir;
103
98our $DATADIR = datadir; 104our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 105our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 106our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 107our $MAPDIR = "$DATADIR/" . mapdir;
108
102our $LOCALDIR = localdir; 109our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 110our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 111our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 112our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 113our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 114our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 115our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 116our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 117
111our %RESOURCE; # unused 118#our %RESOURCE; # unused
112 119
113our $OUTPUT_RATE_MIN = 3000; 120our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 121our $OUTPUT_RATE_MAX = 1000000;
115 122
116our $MAX_LINKS = 32; # how many chained exits to follow 123our $MAX_LINKS = 32; # how many chained exits to follow
124our $BDB_DEADLOCK_WATCHER; 131our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 132our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 133our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 134our $DB_ENV;
128 135
129our @EXTRA_MODULES = qw(pod match mapscript); 136our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 137
131our %CFG; 138our %CFG;
139our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 140
133our $UPTIME; $UPTIME ||= time; 141our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 142our $RUNTIME = 0;
143our $SERVER_TICK = 0;
135our $NOW; 144our $NOW;
136 145
137our (%PLAYER, %PLAYER_LOADING); # all users 146our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 147our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 148our $LINK_MAP; # the special {link} map, which is always available
148 157
149our @POST_INIT; 158our @POST_INIT;
150 159
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 160our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 161our $REALLY_UNLOOP; # never set to true, please :)
162
163our $WAIT_FOR_TICK = new Coro::Signal;
164our @WAIT_FOR_TICK_BEGIN;
153 165
154binmode STDOUT; 166binmode STDOUT;
155binmode STDERR; 167binmode STDERR;
156 168
157# read virtual server time, if available 169# read virtual server time, if available
191 203
192=over 4 204=over 4
193 205
194=item $cf::UPTIME 206=item $cf::UPTIME
195 207
196The timestamp of the server start (so not actually an uptime). 208The timestamp of the server start (so not actually an "uptime").
209
210=item $cf::SERVER_TICK
211
212An unsigned integer that starts at zero when the server is started and is
213incremented on every tick.
214
215=item $cf::NOW
216
217The (real) time of the last (current) server tick - updated before and
218after tick processing, so this is useful only as a rough "what time is it
219now" estimate.
220
221=item $cf::TICK
222
223The interval between each server tick, in seconds.
197 224
198=item $cf::RUNTIME 225=item $cf::RUNTIME
199 226
200The time this server has run, starts at 0 and is increased by $cf::TICK on 227The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 228every server tick.
202 229
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 230=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 231$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 232$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 233
207Various directories - "/etc", read-only install directory, perl-library 234Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 235directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 236unique-items directory, player file directory, random maps directory and
210database environment. 237database environment.
211 238
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 239=item $cf::LOADAVG
221 240
222The current CPU load on the server (alpha-smoothed), as a value between 0 241The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 242(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 243objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 251Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 252from wherever your confdir points to.
234 253
235=item cf::wait_for_tick, cf::wait_for_tick_begin 254=item cf::wait_for_tick, cf::wait_for_tick_begin
236 255
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 256These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one process 257cf::wait_for_tick_begin only returns directly I<after> the tick
258processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 259cf::wait_for_tick wakes up all waiters after tick processing.
260
261Note that cf::wait_for_tick will immediately return when the server is not
262ticking, making it suitable for small pauses in threads that need to run
263when the server is paused. If that is not applicable (i.e. you I<really>
264want to wait, use C<$cf::WAIT_FOR_TICK>).
265
266=item $cf::WAIT_FOR_TICK
267
268Note that C<cf::wait_for_tick> is probably the correct thing to use. This
269variable contains a L<Coro::Signal> that is broadcats after every server
270tick. Calling C<< ->wait >> on it will suspend the caller until after the
271next server tick.
272
273=cut
274
275sub wait_for_tick();
276sub wait_for_tick_begin();
240 277
241=item @cf::INVOKE_RESULTS 278=item @cf::INVOKE_RESULTS
242 279
243This array contains the results of the last C<invoke ()> call. When 280This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 281C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
305)) { 342)) {
306 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 343 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307} 344}
308 345
309$EV::DIED = sub { 346$EV::DIED = sub {
310 Carp::cluck "error in event callback: @_"; 347 warn "error in event callback: $@";
311}; 348};
349
350#############################################################################
351
352sub fork_call(&@);
353sub get_slot($;$$);
312 354
313############################################################################# 355#############################################################################
314 356
315=head2 UTILITY FUNCTIONS 357=head2 UTILITY FUNCTIONS
316 358
337 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 379 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338 $d 380 $d
339 } || "[unable to dump $_[0]: '$@']"; 381 } || "[unable to dump $_[0]: '$@']";
340} 382}
341 383
384=item $scalar = cf::load_file $path
385
386Loads the given file from path and returns its contents. Croaks on error
387and can block.
388
389=cut
390
391sub load_file($) {
392 0 <= aio_load $_[0], my $data
393 or Carp::croak "$_[0]: $!";
394
395 $data
396}
397
398=item $success = cf::replace_file $path, $data, $sync
399
400Atomically replaces the file at the given $path with new $data, and
401optionally $sync the data to disk before replacing the file.
402
403=cut
404
405sub replace_file($$;$) {
406 my ($path, $data, $sync) = @_;
407
408 my $lock = cf::lock_acquire ("replace_file:$path");
409
410 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
411 or return;
412
413 $data = $data->() if ref $data;
414
415 length $data == aio_write $fh, 0, (length $data), $data, 0
416 or return;
417
418 !$sync
419 or !aio_fsync $fh
420 or return;
421
422 aio_close $fh
423 and return;
424
425 aio_rename "$path~", $path
426 and return;
427
428 if ($sync) {
429 $path =~ s%/[^/]*$%%;
430 aio_pathsync $path;
431 }
432
433 1
434}
435
342=item $ref = cf::decode_json $json 436=item $ref = cf::decode_json $json
343 437
344Converts a JSON string into the corresponding perl data structure. 438Converts a JSON string into the corresponding perl data structure.
345 439
346=item $json = cf::encode_json $ref 440=item $json = cf::encode_json $ref
352our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 446our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353 447
354sub encode_json($) { $json_coder->encode ($_[0]) } 448sub encode_json($) { $json_coder->encode ($_[0]) }
355sub decode_json($) { $json_coder->decode ($_[0]) } 449sub decode_json($) { $json_coder->decode ($_[0]) }
356 450
451=item $ref = cf::decode_storable $scalar
452
453Same as Coro::Storable::thaw, so blocks.
454
455=cut
456
457BEGIN { *decode_storable = \&Coro::Storable::thaw }
458
459=item $ref = cf::decode_yaml $scalar
460
461Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
462
463=cut
464
465sub decode_yaml($) {
466 fork_call { YAML::XS::Load $_[0] } @_
467}
468
469=item $scalar = cf::unlzf $scalar
470
471Same as Compress::LZF::compress, but takes server ticks into account, so
472blocks.
473
474=cut
475
476sub unlzf($) {
477 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
478 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
479 Compress::LZF::decompress $_[0]
480}
481
357=item cf::post_init { BLOCK } 482=item cf::post_init { BLOCK }
358 483
359Execute the given codeblock, I<after> all extensions have been (re-)loaded, 484Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360but I<before> the server starts ticking again. 485but I<before> the server starts ticking again.
361 486
362The cdoeblock will have a single boolean argument to indicate whether this 487The codeblock will have a single boolean argument to indicate whether this
363is a reload or not. 488is a reload or not.
364 489
365=cut 490=cut
366 491
367sub post_init(&) { 492sub post_init(&) {
368 push @POST_INIT, shift; 493 push @POST_INIT, shift;
494}
495
496sub _post_init {
497 trace "running post_init jobs";
498
499 # run them in parallel...
500
501 my @join;
502
503 while () {
504 push @join, map &Coro::async ($_, 0), @POST_INIT;
505 @POST_INIT = ();
506
507 @join or last;
508
509 (pop @join)->join;
510 }
369} 511}
370 512
371=item cf::lock_wait $string 513=item cf::lock_wait $string
372 514
373Wait until the given lock is available. See cf::lock_acquire. 515Wait until the given lock is available. See cf::lock_acquire.
426 EV::periodic $start, $interval, 0, $cb 568 EV::periodic $start, $interval, 0, $cb
427} 569}
428 570
429=item cf::get_slot $time[, $priority[, $name]] 571=item cf::get_slot $time[, $priority[, $name]]
430 572
431Allocate $time seconds of blocking CPU time at priority C<$priority>: 573Allocate $time seconds of blocking CPU time at priority C<$priority>
432This call blocks and returns only when you have at least C<$time> seconds 574(default: 0): This call blocks and returns only when you have at least
433of cpu time till the next tick. The slot is only valid till the next cede. 575C<$time> seconds of cpu time till the next tick. The slot is only valid
576till the next cede.
577
578Background jobs should use a priority less than zero, interactive jobs
579should use 100 or more.
434 580
435The optional C<$name> can be used to identify the job to run. It might be 581The optional C<$name> can be used to identify the job to run. It might be
436used for statistical purposes and should identify the same time-class. 582used for statistical purposes and should identify the same time-class.
437 583
438Useful for short background jobs. 584Useful for short background jobs.
467 } 613 }
468 } 614 }
469 615
470 if (@SLOT_QUEUE) { 616 if (@SLOT_QUEUE) {
471 # we do not use wait_for_tick() as it returns immediately when tick is inactive 617 # we do not use wait_for_tick() as it returns immediately when tick is inactive
472 push @cf::WAIT_FOR_TICK, $signal; 618 $WAIT_FOR_TICK->wait;
473 $signal->wait;
474 } else { 619 } else {
475 $busy = 0; 620 $busy = 0;
476 Coro::schedule; 621 Coro::schedule;
477 } 622 }
478 } 623 }
518=cut 663=cut
519 664
520sub sync_job(&) { 665sub sync_job(&) {
521 my ($job) = @_; 666 my ($job) = @_;
522 667
523 if ($Coro::current == $Coro::main) { 668 if (in_main) {
524 my $time = AE::time; 669 my $time = AE::time;
525 670
526 # this is the main coro, too bad, we have to block 671 # this is the main coro, too bad, we have to block
527 # till the operation succeeds, freezing the server :/ 672 # till the operation succeeds, freezing the server :/
528 673
529 LOG llevError, Carp::longmess "sync job";#d# 674 #LOG llevError, Carp::longmess "sync job";#d#
530 675
531 my $freeze_guard = freeze_mainloop; 676 my $freeze_guard = freeze_mainloop;
532 677
533 my $busy = 1; 678 my $busy = 1;
534 my @res; 679 my @res;
578 $EXT_CORO{$coro+0} = $coro; 723 $EXT_CORO{$coro+0} = $coro;
579 724
580 $coro 725 $coro
581} 726}
582 727
583=item fork_call { }, $args 728=item fork_call { }, @args
584 729
585Executes the given code block with the given arguments in a seperate 730Executes the given code block with the given arguments in a seperate
586process, returning the results. Everything must be serialisable with 731process, returning the results. Everything must be serialisable with
587Coro::Storable. May, of course, block. Note that the executed sub may 732Coro::Storable. May, of course, block. Note that the executed sub may
588never block itself or use any form of event handling. 733never block itself or use any form of event handling.
589 734
590=cut 735=cut
591 736
737sub post_fork {
738 reset_signals;
739}
740
592sub fork_call(&@) { 741sub fork_call(&@) {
593 my ($cb, @args) = @_; 742 my ($cb, @args) = @_;
594 743
595 # we seemingly have to make a local copy of the whole thing,
596 # otherwise perl prematurely frees the stuff :/
597 # TODO: investigate and fix (likely this will be rather laborious)
598
599 my @res = Coro::Util::fork_eval { 744 my @res = Coro::Util::fork_eval {
600 reset_signals; 745 cf::post_fork;
601 &$cb 746 &$cb
602 }, @args; 747 } @args;
603 748
604 wantarray ? @res : $res[-1] 749 wantarray ? @res : $res[-1]
605} 750}
606 751
607sub objinfo { 752sub objinfo {
657within each server. 802within each server.
658 803
659=cut 804=cut
660 805
661sub db_table($) { 806sub db_table($) {
807 cf::error "db_get called from main context"
808 if $Coro::current == $Coro::main;
809
662 my ($name) = @_; 810 my ($name) = @_;
663 my $db = BDB::db_create $DB_ENV; 811 my $db = BDB::db_create $DB_ENV;
664 812
665 eval { 813 eval {
666 $db->set_flags (BDB::CHKSUM); 814 $db->set_flags (BDB::CHKSUM);
676} 824}
677 825
678our $DB; 826our $DB;
679 827
680sub db_init { 828sub db_init {
681 cf::sync_job {
682 $DB ||= db_table "db"; 829 $DB ||= db_table "db";
683 };
684} 830}
685 831
686sub db_get($$) { 832sub db_get($$) {
687 my $key = "$_[0]/$_[1]"; 833 my $key = "$_[0]/$_[1]";
688 834
689 cf::sync_job { 835 cf::error "db_get called from main context"
836 if $Coro::current == $Coro::main;
837
690 BDB::db_get $DB, undef, $key, my $data; 838 BDB::db_get $DB, undef, $key, my $data;
691 839
692 $! ? () 840 $! ? ()
693 : $data 841 : $data
694 }
695} 842}
696 843
697sub db_put($$$) { 844sub db_put($$$) {
698 BDB::dbreq_pri 4; 845 BDB::dbreq_pri 4;
699 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 846 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
727 874
728 my @data; 875 my @data;
729 my $md5; 876 my $md5;
730 877
731 for (0 .. $#$src) { 878 for (0 .. $#$src) {
732 0 <= aio_load $src->[$_], $data[$_] 879 $data[$_] = load_file $src->[$_];
733 or Carp::croak "$src->[$_]: $!";
734 } 880 }
735 881
736 # if processing is expensive, check 882 # if processing is expensive, check
737 # checksum first 883 # checksum first
738 if (1) { 884 if (1) {
751 897
752 return db_get cache => "$id/data"; 898 return db_get cache => "$id/data";
753 } 899 }
754 } 900 }
755 901
756 my $t1 = Time::HiRes::time; 902 my $t1 = EV::time;
757 my $data = $process->(\@data); 903 my $data = $process->(\@data);
758 my $t2 = Time::HiRes::time; 904 my $t2 = EV::time;
759 905
760 info "cache: '$id' processed in ", $t2 - $t1, "s\n"; 906 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
761 907
762 db_put cache => "$id/data", $data; 908 db_put cache => "$id/data", $data;
763 db_put cache => "$id/md5" , $md5; 909 db_put cache => "$id/md5" , $md5;
1283=cut 1429=cut
1284 1430
1285############################################################################# 1431#############################################################################
1286# command handling &c 1432# command handling &c
1287 1433
1288=item cf::register_command $name => \&callback($ob,$args); 1434=item cf::register_command $name => \&callback($ob,$args)
1289 1435
1290Register a callback for execution when the client sends the user command 1436Register a callback for execution when the client sends the user command
1291$name. 1437$name.
1292 1438
1293=cut 1439=cut
1299 #warn "registering command '$name/$time' to '$caller'"; 1445 #warn "registering command '$name/$time' to '$caller'";
1300 1446
1301 push @{ $COMMAND{$name} }, [$caller, $cb]; 1447 push @{ $COMMAND{$name} }, [$caller, $cb];
1302} 1448}
1303 1449
1304=item cf::register_extcmd $name => \&callback($pl,$packet); 1450=item cf::register_extcmd $name => \&callback($pl,@args)
1305 1451
1306Register a callback for execution when the client sends an (synchronous) 1452Register a callback for execution when the client sends an (synchronous)
1307extcmd packet. Ext commands will be processed in the order they are 1453extcmd packet. Ext commands will be processed in the order they are
1308received by the server, like other user commands. The first argument is 1454received by the server, like other user commands. The first argument is
1309the logged-in player. Ext commands can only be processed after a player 1455the logged-in player. Ext commands can only be processed after a player
1310has logged in successfully. 1456has logged in successfully.
1311 1457
1312If the callback returns something, it is sent back as if reply was being 1458The values will be sent back to the client.
1313called.
1314 1459
1460=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1461
1462Same as C<cf::register_extcmd>, but instead of returning values, the
1463callback needs to clal the C<$reply> function.
1464
1315=item cf::register_exticmd $name => \&callback($ns,$packet); 1465=item cf::register_exticmd $name => \&callback($ns,@args)
1316 1466
1317Register a callback for execution when the client sends an (asynchronous) 1467Register a callback for execution when the client sends an (asynchronous)
1318exticmd packet. Exti commands are processed by the server as soon as they 1468exticmd packet. Exti commands are processed by the server as soon as they
1319are received, i.e. out of order w.r.t. other commands. The first argument 1469are received, i.e. out of order w.r.t. other commands. The first argument
1320is a client socket. Exti commands can be received anytime, even before 1470is a client socket. Exti commands can be received anytime, even before
1321log-in. 1471log-in.
1322 1472
1323If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1324called.
1325 1474
1326=cut 1475=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1327 1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1480=cut
1481
1328sub register_extcmd { 1482sub register_extcmd($$) {
1329 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1330 1484
1331 $EXTCMD{$name} = $cb; 1485 $EXTCMD{$name} = $cb;
1332} 1486}
1333 1487
1334sub register_exticmd { 1488sub register_async_extcmd($$) {
1335 my ($name, $cb) = @_; 1489 my ($name, $cb) = @_;
1336 1490
1491 $EXTACMD{$name} = $cb;
1492}
1493
1494sub register_exticmd($$) {
1495 my ($name, $cb) = @_;
1496
1337 $EXTICMD{$name} = $cb; 1497 $EXTICMD{$name} = $cb;
1498}
1499
1500sub register_async_exticmd($$) {
1501 my ($name, $cb) = @_;
1502
1503 $EXTIACMD{$name} = $cb;
1338} 1504}
1339 1505
1340use File::Glob (); 1506use File::Glob ();
1341 1507
1342cf::player->attach ( 1508cf::player->attach (
1356 my ($pl, $buf) = @_; 1522 my ($pl, $buf) = @_;
1357 1523
1358 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1524 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359 1525
1360 if (ref $msg) { 1526 if (ref $msg) {
1361 my ($type, $reply, @payload) = 1527 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362 "ARRAY" eq ref $msg
1363 ? @$msg
1364 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365 1528
1366 my @reply;
1367
1368 if (my $cb = $EXTCMD{$type}) { 1529 if (my $cb = $EXTACMD{$type}) {
1530 $cb->(
1531 $pl,
1532 sub {
1533 $pl->ext_msg ("reply-$reply", @_)
1534 if $reply;
1535 },
1536 @payload
1537 );
1538 } else {
1539 my @reply;
1540
1541 if (my $cb = $EXTCMD{$type}) {
1369 @reply = $cb->($pl, @payload); 1542 @reply = $cb->($pl, @payload);
1543 }
1544
1545 $pl->ext_msg ("reply-$reply", @reply)
1546 if $reply;
1370 } 1547 }
1371
1372 $pl->ext_reply ($reply, @reply)
1373 if $reply;
1374 1548
1375 } else { 1549 } else {
1376 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1550 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1377 } 1551 }
1378 1552
1391 }; 1565 };
1392 1566
1393 $grp 1567 $grp
1394} 1568}
1395 1569
1570sub _ext_cfg_reg($$$$) {
1571 my ($rvar, $varname, $cfgname, $default) = @_;
1572
1573 $cfgname = lc $varname
1574 unless length $cfgname;
1575
1576 $EXT_CFG{$cfgname} = [$rvar, $default];
1577
1578 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1579}
1580
1396sub load_extensions { 1581sub load_extensions {
1397 info "loading extensions..."; 1582 info "loading extensions...";
1583
1584 %EXT_CFG = ();
1398 1585
1399 cf::sync_job { 1586 cf::sync_job {
1400 my %todo; 1587 my %todo;
1401 1588
1402 for my $path (<$LIBDIR/*.ext>) { 1589 for my $path (<$LIBDIR/*.ext>) {
1421 1608
1422 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1609 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1610 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424 1611
1425 $ext{source} = 1612 $ext{source} =
1426 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1613 "package $pkg; use common::sense;\n"
1427 . "#line 1 \"$path\"\n{\n" 1614 . "#line 1 \"$path\"\n{\n"
1428 . $source 1615 . $source
1429 . "\n};\n1"; 1616 . "\n};\n1";
1430 1617
1431 $todo{$base} = \%ext; 1618 $todo{$base} = \%ext;
1445 unless exists $done{$_}; 1632 unless exists $done{$_};
1446 } 1633 }
1447 1634
1448 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1635 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449 1636
1637 my $source = $v->{source};
1638
1639 # support "CONF varname :confname = default" pseudo-statements
1640 $source =~ s{
1641 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1642 }{
1643 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1644 }gmxe;
1645
1450 my $active = eval $v->{source}; 1646 my $active = eval $source;
1451 1647
1452 if (length $@) { 1648 if (length $@) {
1453 error "$v->{path}: $@\n"; 1649 error "$v->{path}: $@\n";
1454 1650
1455 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1651 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1472 1668
1473 while (my ($k, $v) = each %todo) { 1669 while (my ($k, $v) = each %todo) {
1474 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1670 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475 if exists $v->{meta}{mandatory}; 1671 if exists $v->{meta}{mandatory};
1476 } 1672 }
1673
1674 last;
1477 } 1675 }
1478 } 1676 }
1479 }; 1677 };
1480} 1678}
1481 1679
1639 my $name = $pl->ob->name; 1837 my $name = $pl->ob->name;
1640 1838
1641 $pl->{deny_save} = 1; 1839 $pl->{deny_save} = 1;
1642 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1840 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1643 1841
1644 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1842 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645 $pl->deactivate; 1843 $pl->deactivate;
1844
1646 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1845 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1846 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1847 ext::highscore::check ($pl->ob);
1848
1648 $pl->ns->destroy if $pl->ns; 1849 $pl->ns->destroy if $pl->ns;
1649 1850
1650 my $path = playerdir $pl; 1851 my $path = playerdir $pl;
1651 my $temp = "$path~$cf::RUNTIME~deleting~"; 1852 my $temp = "$path~$cf::RUNTIME~deleting~";
1652 aio_rename $path, $temp; 1853 aio_rename $path, $temp;
1738 1939
1739=item $protocol_xml = $player->expand_cfpod ($cfpod) 1940=item $protocol_xml = $player->expand_cfpod ($cfpod)
1740 1941
1741Expand deliantra pod fragments into protocol xml. 1942Expand deliantra pod fragments into protocol xml.
1742 1943
1743=item $player->ext_reply ($msgid, @msg)
1744
1745Sends an ext reply to the player.
1746
1747=cut
1748
1749sub ext_reply($$@) {
1750 my ($self, $id, @msg) = @_;
1751
1752 $self->ns->ext_reply ($id, @msg)
1753}
1754
1755=item $player->ext_msg ($type, @msg) 1944=item $player->ext_msg ($type, @msg)
1756 1945
1757Sends an ext event to the client. 1946Sends an ext event to the client.
1758 1947
1759=cut 1948=cut
1818sub generate_random_map { 2007sub generate_random_map {
1819 my ($self, $rmp) = @_; 2008 my ($self, $rmp) = @_;
1820 2009
1821 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2010 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822 2011
1823 # mit "rum" bekleckern, nicht
1824 $self->_create_random_map ( 2012 $self->_create_random_map ($rmp);
1825 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828 $rmp->{exit_on_final_map},
1829 $rmp->{xsize}, $rmp->{ysize},
1830 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835 (cf::region::find $rmp->{region}), $rmp->{custom}
1836 )
1837} 2013}
1838 2014
1839=item cf::map->register ($regex, $prio) 2015=item cf::map->register ($regex, $prio)
1840 2016
1841Register a handler for the map path matching the given regex at the 2017Register a handler for the map path matching the given regex at the
1846 2022
1847sub register { 2023sub register {
1848 my (undef, $regex, $prio) = @_; 2024 my (undef, $regex, $prio) = @_;
1849 my $pkg = caller; 2025 my $pkg = caller;
1850 2026
1851 no strict;
1852 push @{"$pkg\::ISA"}, __PACKAGE__; 2027 push @{"$pkg\::ISA"}, __PACKAGE__;
1853 2028
1854 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2029 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855} 2030}
1856 2031
1868} 2043}
1869 2044
1870sub normalise { 2045sub normalise {
1871 my ($path, $base) = @_; 2046 my ($path, $base) = @_;
1872 2047
1873 $path = "$path"; # make sure its a string 2048 $path = "$path"; # make sure it's a string
1874 2049
1875 $path =~ s/\.map$//; 2050 $path =~ s/\.map$//;
1876 2051
1877 # map plan: 2052 # map plan:
1878 # 2053 #
1893 $base =~ s{[^/]+/?$}{}; 2068 $base =~ s{[^/]+/?$}{};
1894 $path = "$base/$path"; 2069 $path = "$base/$path";
1895 } 2070 }
1896 2071
1897 for ($path) { 2072 for ($path) {
1898 redo if s{//}{/};
1899 redo if s{/\.?/}{/}; 2073 redo if s{/\.?/}{/};
1900 redo if s{/[^/]+/\.\./}{/}; 2074 redo if s{/[^/]+/\.\./}{/};
1901 } 2075 }
1902 2076
1903 $path 2077 $path
1917 $self->init; # pass $1 etc. 2091 $self->init; # pass $1 etc.
1918 return $self; 2092 return $self;
1919 } 2093 }
1920 } 2094 }
1921 2095
1922 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2096 Carp::cluck "unable to resolve path '$path' (base '$base')";
1923 () 2097 ()
1924} 2098}
1925 2099
2100# may re-bless or do other evil things
1926sub init { 2101sub init {
1927 my ($self) = @_; 2102 my ($self) = @_;
1928 2103
1929 $self 2104 $self
1930} 2105}
1995 $self->{load_path} = $path; 2170 $self->{load_path} = $path;
1996 2171
1997 1 2172 1
1998} 2173}
1999 2174
2175# used to laod the header of an original map
2000sub load_header_orig { 2176sub load_header_orig {
2001 my ($self) = @_; 2177 my ($self) = @_;
2002 2178
2003 $self->load_header_from ($self->load_path) 2179 $self->load_header_from ($self->load_path)
2004} 2180}
2005 2181
2182# used to laod the header of an instantiated map
2006sub load_header_temp { 2183sub load_header_temp {
2007 my ($self) = @_; 2184 my ($self) = @_;
2008 2185
2009 $self->load_header_from ($self->save_path) 2186 $self->load_header_from ($self->save_path)
2010} 2187}
2011 2188
2189# called after loading the header from an instantiated map
2012sub prepare_temp { 2190sub prepare_temp {
2013 my ($self) = @_; 2191 my ($self) = @_;
2014 2192
2015 $self->last_access ((delete $self->{last_access}) 2193 $self->last_access ((delete $self->{last_access})
2016 || $cf::RUNTIME); #d# 2194 || $cf::RUNTIME); #d#
2017 # safety 2195 # safety
2018 $self->{instantiate_time} = $cf::RUNTIME 2196 $self->{instantiate_time} = $cf::RUNTIME
2019 if $self->{instantiate_time} > $cf::RUNTIME; 2197 if $self->{instantiate_time} > $cf::RUNTIME;
2020} 2198}
2021 2199
2200# called after loading the header from an original map
2022sub prepare_orig { 2201sub prepare_orig {
2023 my ($self) = @_; 2202 my ($self) = @_;
2024 2203
2025 $self->{load_original} = 1; 2204 $self->{load_original} = 1;
2026 $self->{instantiate_time} = $cf::RUNTIME; 2205 $self->{instantiate_time} = $cf::RUNTIME;
2050 2229
2051sub find; 2230sub find;
2052sub find { 2231sub find {
2053 my ($path, $origin) = @_; 2232 my ($path, $origin) = @_;
2054 2233
2234 cf::cede_to_tick;
2235
2055 $path = normalise $path, $origin && $origin->path; 2236 $path = normalise $path, $origin;
2056 2237
2057 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2238 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058 my $guard2 = cf::lock_acquire "map_find:$path"; 2239 my $guard2 = cf::lock_acquire "map_find:$path";
2059 2240
2060 $cf::MAP{$path} || do { 2241 $cf::MAP{$path} || do {
2091 2272
2092 { 2273 {
2093 my $guard = cf::lock_acquire "map_data:$path"; 2274 my $guard = cf::lock_acquire "map_data:$path";
2094 2275
2095 return unless $self->valid; 2276 return unless $self->valid;
2096 return unless $self->in_memory == cf::MAP_SWAPPED; 2277 return unless $self->state == cf::MAP_SWAPPED;
2097
2098 $self->in_memory (cf::MAP_LOADING);
2099 2278
2100 $self->alloc; 2279 $self->alloc;
2101 2280
2102 $self->pre_load; 2281 $self->pre_load;
2103 cf::cede_to_tick; 2282 cf::cede_to_tick;
2104 2283
2284 if (exists $self->{load_path}) {
2105 my $f = new_from_file cf::object::thawer $self->{load_path}; 2285 my $f = new_from_file cf::object::thawer $self->{load_path};
2106 $f->skip_block; 2286 $f->skip_block;
2107 $self->_load_objects ($f) 2287 $self->_load_objects ($f)
2108 or return; 2288 or return;
2109 2289
2110 $self->post_load_original 2290 $self->post_load_original
2111 if delete $self->{load_original}; 2291 if delete $self->{load_original};
2112 2292
2113 if (my $uniq = $self->uniq_path) { 2293 if (my $uniq = $self->uniq_path) {
2114 utf8::encode $uniq; 2294 utf8::encode $uniq;
2115 unless (aio_stat $uniq) { 2295 unless (aio_stat $uniq) {
2116 if (my $f = new_from_file cf::object::thawer $uniq) { 2296 if (my $f = new_from_file cf::object::thawer $uniq) {
2117 $self->clear_unique_items; 2297 $self->clear_unique_items;
2118 $self->_load_objects ($f); 2298 $self->_load_objects ($f);
2119 $f->resolve_delayed_derefs; 2299 $f->resolve_delayed_derefs;
2300 }
2120 } 2301 }
2121 } 2302 }
2122 }
2123 2303
2124 $f->resolve_delayed_derefs; 2304 $f->resolve_delayed_derefs;
2305 } else {
2306 $self->post_load_original
2307 if delete $self->{load_original};
2308 }
2309
2310 $self->state (cf::MAP_INACTIVE);
2125 2311
2126 cf::cede_to_tick; 2312 cf::cede_to_tick;
2127 # now do the right thing for maps 2313 # now do the right thing for maps
2128 $self->link_multipart_objects; 2314 $self->link_multipart_objects;
2129 $self->difficulty ($self->estimate_difficulty) 2315 $self->difficulty ($self->estimate_difficulty)
2133 unless ($self->{deny_activate}) { 2319 unless ($self->{deny_activate}) {
2134 $self->decay_objects; 2320 $self->decay_objects;
2135 $self->fix_auto_apply; 2321 $self->fix_auto_apply;
2136 $self->update_buttons; 2322 $self->update_buttons;
2137 cf::cede_to_tick; 2323 cf::cede_to_tick;
2138 $self->activate; 2324 #$self->activate; # no longer activate maps automatically
2139 } 2325 }
2140 2326
2141 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2142 $self->last_access ($cf::RUNTIME); 2328 $self->last_access ($cf::RUNTIME);
2143
2144 $self->in_memory (cf::MAP_ACTIVE);
2145 } 2329 }
2146 2330
2147 $self->post_load; 2331 $self->post_load;
2332
2333 1
2148} 2334}
2149 2335
2150# customize the map for a given player, i.e. 2336# customize the map for a given player, i.e.
2151# return the _real_ map. used by e.g. per-player 2337# return the _real_ map. used by e.g. per-player
2152# maps to change the path to ~playername/mappath 2338# maps to change the path to ~playername/mappath
2160# if $self->per_party; 2346# if $self->per_party;
2161 2347
2162 $self 2348 $self
2163} 2349}
2164 2350
2165# find and load all maps in the 3x3 area around a map
2166sub load_neighbours {
2167 my ($map) = @_;
2168
2169 my @neigh; # diagonal neighbours
2170
2171 for (0 .. 3) {
2172 my $neigh = $map->tile_path ($_)
2173 or next;
2174 $neigh = find $neigh, $map
2175 or next;
2176 $neigh->load;
2177
2178 # now find the diagonal neighbours
2179 push @neigh,
2180 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2181 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2182 }
2183
2184 for (grep defined $_->[0], @neigh) {
2185 my ($path, $origin) = @$_;
2186 my $neigh = find $path, $origin
2187 or next;
2188 $neigh->load;
2189 }
2190}
2191
2192sub find_sync { 2351sub find_sync {
2193 my ($path, $origin) = @_; 2352 my ($path, $origin) = @_;
2194 2353
2195 cf::sync_job { find $path, $origin } 2354 # it's a bug to call this from the main context
2355 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2356 if $Coro::current == $Coro::main;
2357
2358 find $path, $origin
2196} 2359}
2197 2360
2198sub do_load_sync { 2361sub do_load_sync {
2199 my ($map) = @_; 2362 my ($map) = @_;
2200 2363
2364 # it's a bug to call this from the main context
2201 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2365 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202 if $Coro::current == $Coro::main; 2366 if $Coro::current == $Coro::main;
2203 2367
2204 cf::sync_job { $map->load }; 2368 $map->load;
2205} 2369}
2206 2370
2207our %MAP_PREFETCH; 2371our %MAP_PREFETCH;
2208our $MAP_PREFETCHER = undef; 2372our $MAP_PREFETCHER = undef;
2209 2373
2210sub find_async { 2374sub find_async {
2211 my ($path, $origin, $load) = @_; 2375 my ($path, $origin, $load) = @_;
2212 2376
2213 $path = normalise $path, $origin && $origin->{path}; 2377 $path = normalise $path, $origin;
2214 2378
2215 if (my $map = $cf::MAP{$path}) { 2379 if (my $map = $cf::MAP{$path}) {
2216 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2380 return $map if !$load || $map->linkable;
2217 } 2381 }
2218 2382
2219 $MAP_PREFETCH{$path} |= $load; 2383 $MAP_PREFETCH{$path} |= $load;
2220 2384
2221 $MAP_PREFETCHER ||= cf::async { 2385 $MAP_PREFETCHER ||= cf::async {
2280sub swap_out { 2444sub swap_out {
2281 my ($self) = @_; 2445 my ($self) = @_;
2282 2446
2283 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2447 my $lock = cf::lock_acquire "map_data:$self->{path}";
2284 2448
2285 return if $self->in_memory != cf::MAP_ACTIVE; 2449 return if !$self->linkable;
2286 return if $self->{deny_save}; 2450 return if $self->{deny_save};
2287 return if $self->players; 2451 return if $self->players;
2288 2452
2289 # first deactivate the map and "unlink" it from the core 2453 # first deactivate the map and "unlink" it from the core
2290 $self->deactivate; 2454 $self->deactivate;
2291 $_->clear_links_to ($self) for values %cf::MAP; 2455 $_->clear_links_to ($self) for values %cf::MAP;
2292 $self->in_memory (cf::MAP_SWAPPED); 2456 $self->state (cf::MAP_SWAPPED);
2293 2457
2294 # then atomically save 2458 # then atomically save
2295 $self->_save; 2459 $self->_save;
2296 2460
2297 # then free the map 2461 # then free the map
2323 2487
2324 return if $self->players; 2488 return if $self->players;
2325 2489
2326 cf::trace "resetting map ", $self->path, "\n"; 2490 cf::trace "resetting map ", $self->path, "\n";
2327 2491
2328 $self->in_memory (cf::MAP_SWAPPED); 2492 $self->state (cf::MAP_SWAPPED);
2329 2493
2330 # need to save uniques path 2494 # need to save uniques path
2331 unless ($self->{deny_save}) { 2495 unless ($self->{deny_save}) {
2332 my $uniq = $self->uniq_path; utf8::encode $uniq; 2496 my $uniq = $self->uniq_path; utf8::encode $uniq;
2333 2497
2486 2650
2487Creates and returns a persistent reference to an object that can be stored as a string. 2651Creates and returns a persistent reference to an object that can be stored as a string.
2488 2652
2489=item $ob = cf::object::deref ($refstring) 2653=item $ob = cf::object::deref ($refstring)
2490 2654
2491returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2655returns the objetc referenced by refstring. may return undef when it cannot find the object,
2492even if the object actually exists. May block. 2656even if the object actually exists. May block.
2493 2657
2494=cut 2658=cut
2495 2659
2496sub deref { 2660sub deref {
2663 # use -1 or undef as default coordinates, not 0, 0 2827 # use -1 or undef as default coordinates, not 0, 0
2664 ($x, $y) = ($map->enter_x, $map->enter_y) 2828 ($x, $y) = ($map->enter_x, $map->enter_y)
2665 if $x <= 0 && $y <= 0; 2829 if $x <= 0 && $y <= 0;
2666 2830
2667 $map->load; 2831 $map->load;
2668 $map->load_neighbours;
2669 2832
2670 return unless $self->contr->active; 2833 return unless $self->contr->active;
2671 2834
2672 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2835 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2673 if ($self->enter_map ($map, $x, $y)) { 2836 if ($self->enter_map ($map, $x, $y)) {
2729 ($path, $x, $y) = (undef, undef, undef); 2892 ($path, $x, $y) = (undef, undef, undef);
2730 } 2893 }
2731 } 2894 }
2732 2895
2733 my $map = eval { 2896 my $map = eval {
2734 my $map = defined $path ? cf::map::find $path : undef; 2897 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735 2898
2736 if ($map) { 2899 if ($map) {
2737 $map = $map->customise_for ($self); 2900 $map = $map->customise_for ($self);
2738 $map = $check->($map, $x, $y, $self) if $check && $map; 2901 $map = $check->($map, $x, $y, $self) if $check && $map;
2739 } else { 2902 } else {
2829 $Coro::current->{desc} = "enter_exit"; 2992 $Coro::current->{desc} = "enter_exit";
2830 2993
2831 unless (eval { 2994 unless (eval {
2832 $self->deactivate_recursive; # just to be sure 2995 $self->deactivate_recursive; # just to be sure
2833 2996
2834 # random map handling
2835 {
2836 my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838 prepare_random_map $exit
2839 if $exit->slaying eq "/!";
2840 }
2841
2842 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2997 my $map = cf::map::normalise $exit->slaying, $exit->map;
2843 my $x = $exit->stats->hp; 2998 my $x = $exit->stats->hp;
2844 my $y = $exit->stats->sp; 2999 my $y = $exit->stats->sp;
3000
3001 # special map handling
3002 my $slaying = $exit->slaying;
3003
3004 # special map handling
3005 if ($slaying eq "/!") {
3006 my $guard = cf::lock_acquire "exit_prepare:$exit";
3007
3008 prepare_random_map $exit
3009 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3010
3011 $map = $exit->slaying;
3012
3013 } elsif ($slaying eq '!up') {
3014 $map = $exit->map->tile_path (cf::TILE_UP);
3015 $x = $exit->x;
3016 $y = $exit->y;
3017
3018 } elsif ($slaying eq '!down') {
3019 $map = $exit->map->tile_path (cf::TILE_DOWN);
3020 $x = $exit->x;
3021 $y = $exit->y;
3022 }
2845 3023
2846 $self->goto ($map, $x, $y); 3024 $self->goto ($map, $x, $y);
2847 3025
2848 # if exit is damned, update players death & WoR home-position 3026 # if exit is damned, update players death & WoR home-position
2849 $self->contr->savebed ($map, $x, $y) 3027 $self->contr->savebed ($map, $x, $y)
3074=cut 3252=cut
3075 3253
3076sub cf::client::ext_msg($$@) { 3254sub cf::client::ext_msg($$@) {
3077 my ($self, $type, @msg) = @_; 3255 my ($self, $type, @msg) = @_;
3078 3256
3079 if ($self->extcmd == 2) {
3080 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3257 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3081 } elsif ($self->extcmd == 1) { # TODO: remove
3082 push @msg, msgtype => "event_$type";
3083 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3084 }
3085}
3086
3087=item $client->ext_reply ($msgid, @msg)
3088
3089Sends an ext reply to the client.
3090
3091=cut
3092
3093sub cf::client::ext_reply($$@) {
3094 my ($self, $id, @msg) = @_;
3095
3096 if ($self->extcmd == 2) {
3097 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3098 } elsif ($self->extcmd == 1) {
3099 #TODO: version 1, remove
3100 unshift @msg, msgtype => "reply", msgid => $id;
3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102 }
3103} 3258}
3104 3259
3105=item $success = $client->query ($flags, "text", \&cb) 3260=item $success = $client->query ($flags, "text", \&cb)
3106 3261
3107Queues a query to the client, calling the given callback with 3262Queues a query to the client, calling the given callback with
3162 my ($ns, $buf) = @_; 3317 my ($ns, $buf) = @_;
3163 3318
3164 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3319 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3165 3320
3166 if (ref $msg) { 3321 if (ref $msg) {
3167 my ($type, $reply, @payload) = 3322 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3168 "ARRAY" eq ref $msg
3169 ? @$msg
3170 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3171 3323
3172 my @reply;
3173
3174 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTIACMD{$type}) {
3325 $cb->(
3326 $ns,
3327 sub {
3328 $ns->ext_msg ("reply-$reply", @_)
3329 if $reply;
3330 },
3331 @payload
3332 );
3333 } else {
3334 my @reply;
3335
3336 if (my $cb = $EXTICMD{$type}) {
3175 @reply = $cb->($ns, @payload); 3337 @reply = $cb->($ns, @payload);
3338 }
3339
3340 $ns->ext_msg ("reply-$reply", @reply)
3341 if $reply;
3176 } 3342 }
3177
3178 $ns->ext_reply ($reply, @reply)
3179 if $reply;
3180
3181 } else { 3343 } else {
3182 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3344 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3183 } 3345 }
3184 3346
3185 cf::override; 3347 cf::override;
3268 decrease split destroy change_exp value msg lore send_msg)], 3430 decrease split destroy change_exp value msg lore send_msg)],
3269 ["cf::object::player" => qw(player)], 3431 ["cf::object::player" => qw(player)],
3270 ["cf::player" => qw(peaceful send_msg)], 3432 ["cf::player" => qw(peaceful send_msg)],
3271 ["cf::map" => qw(trigger)], 3433 ["cf::map" => qw(trigger)],
3272) { 3434) {
3273 no strict 'refs';
3274 my ($pkg, @funs) = @$_; 3435 my ($pkg, @funs) = @$_;
3275 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3436 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276 for @funs; 3437 for @funs;
3277} 3438}
3278 3439
3354=cut 3515=cut
3355 3516
3356############################################################################# 3517#############################################################################
3357# the server's init and main functions 3518# the server's init and main functions
3358 3519
3520{
3521 package cf::face;
3522
3523 our %HASH; # hash => idx
3524 our @DATA; # dynamically-created facedata, only faceste 0 used
3525 our @FOFS; # file offset, if > 0
3526 our @SIZE; # size of face, in octets
3527 our @META; # meta hash of face, if any
3528 our $DATAFH; # facedata filehandle
3529
3530 # internal api, not finalised
3531 sub set {
3532 my ($name, $type, $data) = @_;
3533
3534 my $idx = cf::face::find $name;
3535
3536 if ($idx) {
3537 delete $HASH{cf::face::get_chksum $idx};
3538 } else {
3539 $idx = cf::face::alloc $name;
3540 }
3541
3542 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3543
3544 cf::face::set_type $idx, $type;
3545 cf::face::set_csum $idx, 0, $hash;
3546
3547 # we need to destroy the SV itself, not just modify it, as a running ix
3548 # might hold a reference to it: "delete" achieves that.
3549 delete $FOFS[0][$idx];
3550 delete $DATA[0][$idx];
3551 $DATA[0][$idx] = $data;
3552 $SIZE[0][$idx] = length $data;
3553 delete $META[$idx];
3554 $HASH{$hash} = $idx;#d#
3555
3556 $idx
3557 }
3558
3559 sub _get_data($$$) {
3560 my ($idx, $set, $cb) = @_;
3561
3562 if (defined $DATA[$set][$idx]) {
3563 $cb->($DATA[$set][$idx]);
3564 } elsif (my $fofs = $FOFS[$set][$idx]) {
3565 my $size = $SIZE[$set][$idx];
3566 my $buf;
3567 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3568 if ($_[0] == $size) {
3569 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3570 $cb->($buf);
3571 } else {
3572 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3573 }
3574 };
3575 } else {
3576 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3577 }
3578 }
3579
3580 # rather ineffient
3581 sub cf::face::get_data($;$) {
3582 my ($idx, $set) = @_;
3583
3584 _get_data $idx, $set, Coro::rouse_cb;
3585 Coro::rouse_wait
3586 }
3587
3588 sub cf::face::ix {
3589 my ($ns, $set, $idx, $pri) = @_;
3590
3591 _get_data $idx, $set, sub {
3592 $ns->ix_send ($idx, $pri, $_[0]);
3593 };
3594 }
3595}
3596
3359sub load_facedata($) { 3597sub load_facedata($) {
3360 my ($path) = @_; 3598 my ($path) = @_;
3361 3599
3362 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?)
3364 %ext::player_env::MUSIC_FACE_CACHE = ();
3365
3366 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3600 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367 3601
3368 trace "loading facedata from $path\n"; 3602 trace "loading facedata from $path\n";
3369 3603
3370 my $facedata; 3604 my $facedata = decode_storable load_file "$path/faceinfo";
3371 0 < aio_load $path, $facedata
3372 or die "$path: $!";
3373
3374 $facedata = Coro::Storable::thaw $facedata;
3375 3605
3376 $facedata->{version} == 2 3606 $facedata->{version} == 2
3377 or cf::cleanup "$path: version mismatch, cannot proceed."; 3607 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3378 3608
3379 # patch in the exptable 3609 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3380 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3610 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3381 $facedata->{resource}{"res/exp_table"} = { 3611
3382 type => FT_RSRC, 3612 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3383 data => $exp_table, 3613
3384 hash => (Digest::MD5::md5 $exp_table), 3614 # BEGIN ATOMIC
3385 }; 3615 # from here on, everything must be atomic - no thread switch allowed
3386 cf::cede_to_tick; 3616 my $t1 = EV::time;
3387 3617
3388 { 3618 {
3389 my $faces = $facedata->{faceinfo}; 3619 my $faces = $facedata->{faceinfo};
3390 3620
3391 while (my ($face, $info) = each %$faces) { 3621 for my $face (sort keys %$faces) {
3622 my $info = $faces->{$face};
3392 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3623 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393 3624
3394 cf::face::set_visibility $idx, $info->{visibility}; 3625 cf::face::set_visibility $idx, $info->{visibility};
3395 cf::face::set_magicmap $idx, $info->{magicmap}; 3626 cf::face::set_magicmap $idx, $info->{magicmap};
3396 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3627 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3397 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3628 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3398 3629 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3399 cf::cede_to_tick; 3630 $cf::face::HASH{$info->{hash64}} = $idx;
3631 delete $cf::face::META[$idx];
3400 } 3632 }
3401 3633
3402 while (my ($face, $info) = each %$faces) { 3634 while (my ($face, $info) = each %$faces) {
3403 next unless $info->{smooth}; 3635 next unless $info->{smooth};
3404 3636
3409 cf::face::set_smooth $idx, $smooth; 3641 cf::face::set_smooth $idx, $smooth;
3410 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3642 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3411 } else { 3643 } else {
3412 error "smooth face '$info->{smooth}' not found for face '$face'"; 3644 error "smooth face '$info->{smooth}' not found for face '$face'";
3413 } 3645 }
3414
3415 cf::cede_to_tick;
3416 } 3646 }
3417 } 3647 }
3418 3648
3419 { 3649 {
3420 my $anims = $facedata->{animinfo}; 3650 my $anims = $facedata->{animinfo};
3421 3651
3422 while (my ($anim, $info) = each %$anims) { 3652 while (my ($anim, $info) = each %$anims) {
3423 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3653 cf::anim::set $anim, $info->{frames}, $info->{facings};
3424 cf::cede_to_tick;
3425 } 3654 }
3426 3655
3427 cf::anim::invalidate_all; # d'oh 3656 cf::anim::invalidate_all; # d'oh
3428 } 3657 }
3429 3658
3430 { 3659 {
3431 my $res = $facedata->{resource}; 3660 my $res = $facedata->{resource};
3432 3661
3433 while (my ($name, $info) = each %$res) { 3662 while (my ($name, $info) = each %$res) {
3434 if (defined $info->{type}) { 3663 if (defined (my $type = $info->{type})) {
3664 # TODO: different hash - must free and use new index, or cache ixface data queue
3435 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3665 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3436 3666
3437 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3438 cf::face::set_type $idx, $info->{type}; 3667 cf::face::set_type $idx, $type;
3668 cf::face::set_csum $idx, 0, $info->{hash};
3669 $cf::face::SIZE[0][$idx] = $info->{size};
3670 $cf::face::FOFS[0][$idx] = $info->{fofs};
3671 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3672 $cf::face::HASH{$info->{hash}} = $idx;
3439 } else { 3673 } else {
3440 $RESOURCE{$name} = $info; # unused 3674# $RESOURCE{$name} = $info; # unused
3441 } 3675 }
3442
3443 cf::cede_to_tick;
3444 } 3676 }
3445 } 3677 }
3678
3679 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3680
3681 # HACK to clear player env face cache, we need some signal framework
3682 # for this (global event?)
3683 %ext::player_env::MUSIC_FACE_CACHE = ();
3684
3685 # END ATOMIC
3686
3687 cf::debug "facedata atomic update time ", EV::time - $t1;
3446 3688
3447 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3689 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3690
3691 aio_close $fh if $fh; # close old facedata
3448 3692
3449 1 3693 1
3450} 3694}
3451 3695
3452register_exticmd fx_want => sub { 3696register_exticmd fx_want => sub {
3463 my $status = load_resource_file_ $_[0]; 3707 my $status = load_resource_file_ $_[0];
3464 get_slot 0.1, 100; 3708 get_slot 0.1, 100;
3465 cf::arch::commit_load; 3709 cf::arch::commit_load;
3466 3710
3467 $status 3711 $status
3712}
3713
3714sub reload_exp_table {
3715 _reload_exp_table;
3716
3717 cf::face::set
3718 "res/exp_table" => FT_RSRC,
3719 JSON::XS->new->utf8->canonical->encode (
3720 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3721 );
3722}
3723
3724sub reload_materials {
3725 _reload_materials;
3468} 3726}
3469 3727
3470sub reload_regions { 3728sub reload_regions {
3471 # HACK to clear player env face cache, we need some signal framework 3729 # HACK to clear player env face cache, we need some signal framework
3472 # for this (global event?) 3730 # for this (global event?)
3480 if exists $_->{match}; 3738 if exists $_->{match};
3481 } 3739 }
3482} 3740}
3483 3741
3484sub reload_facedata { 3742sub reload_facedata {
3485 load_facedata "$DATADIR/facedata" 3743 load_facedata $DATADIR
3486 or die "unable to load facedata\n"; 3744 or die "unable to load facedata\n";
3487} 3745}
3488 3746
3489sub reload_archetypes { 3747sub reload_archetypes {
3490 load_resource_file "$DATADIR/archetypes" 3748 load_resource_file "$DATADIR/archetypes"
3491 or die "unable to load archetypes\n"; 3749 or die "unable to load archetypes\n";
3750
3751 cf::face::set
3752 "res/skill_info" => FT_RSRC,
3753 JSON::XS->new->utf8->canonical->encode (
3754 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3755 );
3756
3757 cf::face::set
3758 "res/spell_paths" => FT_RSRC,
3759 JSON::XS->new->utf8->canonical->encode (
3760 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3761 );
3492} 3762}
3493 3763
3494sub reload_treasures { 3764sub reload_treasures {
3495 load_resource_file "$DATADIR/treasures" 3765 load_resource_file "$DATADIR/treasures"
3496 or die "unable to load treasurelists\n"; 3766 or die "unable to load treasurelists\n";
3497} 3767}
3498 3768
3499sub reload_sound { 3769sub reload_sound {
3500 trace "loading sound config from $DATADIR/sound\n"; 3770 trace "loading sound config from $DATADIR/sound\n";
3501 3771
3502 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503 or die "$DATADIR/sound $!";
3504
3505 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data); 3772 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506 3773
3507 for (0 .. SOUND_CAST_SPELL_0 - 1) { 3774 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508 my $sound = $soundconf->{compat}[$_] 3775 my $sound = $soundconf->{compat}[$_]
3509 or next; 3776 or next;
3510 3777
3520} 3787}
3521 3788
3522sub reload_resources { 3789sub reload_resources {
3523 trace "reloading resource files...\n"; 3790 trace "reloading resource files...\n";
3524 3791
3792 reload_materials;
3525 reload_facedata; 3793 reload_facedata;
3794 reload_exp_table;
3526 reload_sound; 3795 reload_sound;
3527 reload_archetypes; 3796 reload_archetypes;
3528 reload_regions; 3797 reload_regions;
3529 reload_treasures; 3798 reload_treasures;
3530 3799
3532} 3801}
3533 3802
3534sub reload_config { 3803sub reload_config {
3535 trace "reloading config file...\n"; 3804 trace "reloading config file...\n";
3536 3805
3537 open my $fh, "<:utf8", "$CONFDIR/config" 3806 my $config = load_file "$CONFDIR/config";
3538 or return; 3807 utf8::decode $config;
3539 3808 *CFG = decode_yaml $config;
3540 local $/;
3541 *CFG = YAML::XS::Load scalar <$fh>;
3542 3809
3543 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3810 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544 3811
3545 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3812 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3813 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3550 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3817 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551 and die "WARNING: m(un)lockall failed: $!\n"; 3818 and die "WARNING: m(un)lockall failed: $!\n";
3552 }; 3819 };
3553 warn $@ if $@; 3820 warn $@ if $@;
3554 } 3821 }
3555
3556 trace "finished reloading resource files\n";
3557} 3822}
3558 3823
3559sub pidfile() { 3824sub pidfile() {
3560 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3825 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561 or die "$PIDFILE: $!"; 3826 or die "$PIDFILE: $!";
3586 3851
3587sub main { 3852sub main {
3588 cf::init_globals; # initialise logging 3853 cf::init_globals; # initialise logging
3589 3854
3590 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3855 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3856 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3857 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3858 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594 3859
3595 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3860 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596 3861
3597 # we must not ever block the main coroutine 3862 # we must not ever block the main coroutine
3598 local $Coro::idle = sub { 3863 $Coro::idle = sub {
3599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3864 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3600 (async { 3865 (async {
3601 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3866 $Coro::current->{desc} = "IDLE BUG HANDLER";
3602 EV::loop EV::LOOP_ONESHOT; 3867 EV::loop EV::LOOP_ONESHOT;
3603 })->prio (Coro::PRIO_MAX); 3868 })->prio (Coro::PRIO_MAX);
3604 }; 3869 };
3605 3870
3606 evthread_start IO::AIO::poll_fileno; 3871 evthread_start IO::AIO::poll_fileno;
3607 3872
3608 cf::sync_job { 3873 cf::sync_job {
3609 cf::init_experience; 3874 cf::incloader::init ();
3875
3876 db_init;
3877
3610 cf::init_anim; 3878 cf::init_anim;
3611 cf::init_attackmess; 3879 cf::init_attackmess;
3612 cf::init_dynamic; 3880 cf::init_dynamic;
3613 3881
3614 cf::load_settings; 3882 cf::load_settings;
3615 cf::load_materials;
3616 3883
3617 reload_resources; 3884 reload_resources;
3618 reload_config; 3885 reload_config;
3619 db_init;
3620 3886
3621 cf::init_uuid; 3887 cf::init_uuid;
3622 cf::init_signals; 3888 cf::init_signals;
3623 cf::init_skills; 3889 cf::init_skills;
3624 3890
3632 3898
3633 # no (long-running) fork's whatsoever before this point(!) 3899 # no (long-running) fork's whatsoever before this point(!)
3634 use POSIX (); 3900 use POSIX ();
3635 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3901 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636 3902
3637 (pop @POST_INIT)->(0) while @POST_INIT; 3903 cf::_post_init 0;
3638 }; 3904 };
3639 3905
3640 cf::object::thawer::errors_are_fatal 0; 3906 cf::object::thawer::errors_are_fatal 0;
3641 info "parse errors in files are no longer fatal from this point on.\n"; 3907 info "parse errors in files are no longer fatal from this point on.\n";
3642 3908
3909 AE::postpone {
3910 undef &main; # free gobs of memory :)
3911 };
3912
3643 main_loop; 3913 goto &main_loop;
3644} 3914}
3645 3915
3646############################################################################# 3916#############################################################################
3647# initialisation and cleanup 3917# initialisation and cleanup
3648 3918
3747sub emergency_save() { 4017sub emergency_save() {
3748 my $freeze_guard = cf::freeze_mainloop; 4018 my $freeze_guard = cf::freeze_mainloop;
3749 4019
3750 info "emergency_perl_save: enter\n"; 4020 info "emergency_perl_save: enter\n";
3751 4021
4022 # this is a trade-off: we want to be very quick here, so
4023 # save all maps without fsync, and later call a global sync
4024 # (which in turn might be very very slow)
4025 local $USE_FSYNC = 0;
4026
3752 cf::sync_job { 4027 cf::sync_job {
3753 # this is a trade-off: we want to be very quick here, so 4028 cf::write_runtime_sync; # external watchdog should not bark
3754 # save all maps without fsync, and later call a global sync
3755 # (which in turn might be very very slow)
3756 local $USE_FSYNC = 0;
3757 4029
3758 # use a peculiar iteration method to avoid tripping on perl 4030 # use a peculiar iteration method to avoid tripping on perl
3759 # refcount bugs in for. also avoids problems with players 4031 # refcount bugs in for. also avoids problems with players
3760 # and maps saved/destroyed asynchronously. 4032 # and maps saved/destroyed asynchronously.
3761 info "emergency_perl_save: begin player save\n"; 4033 info "emergency_perl_save: begin player save\n";
3765 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4037 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766 $pl->save; 4038 $pl->save;
3767 } 4039 }
3768 info "emergency_perl_save: end player save\n"; 4040 info "emergency_perl_save: end player save\n";
3769 4041
4042 cf::write_runtime_sync; # external watchdog should not bark
4043
3770 info "emergency_perl_save: begin map save\n"; 4044 info "emergency_perl_save: begin map save\n";
3771 for my $path (keys %cf::MAP) { 4045 for my $path (keys %cf::MAP) {
3772 my $map = $cf::MAP{$path} or next; 4046 my $map = $cf::MAP{$path} or next;
3773 $map->valid or next; 4047 $map->valid or next;
3774 $map->save; 4048 $map->save;
3775 } 4049 }
3776 info "emergency_perl_save: end map save\n"; 4050 info "emergency_perl_save: end map save\n";
3777 4051
4052 cf::write_runtime_sync; # external watchdog should not bark
4053
3778 info "emergency_perl_save: begin database checkpoint\n"; 4054 info "emergency_perl_save: begin database checkpoint\n";
3779 BDB::db_env_txn_checkpoint $DB_ENV; 4055 BDB::db_env_txn_checkpoint $DB_ENV;
3780 info "emergency_perl_save: end database checkpoint\n"; 4056 info "emergency_perl_save: end database checkpoint\n";
3781 4057
3782 info "emergency_perl_save: begin write uuid\n"; 4058 info "emergency_perl_save: begin write uuid\n";
3783 write_uuid_sync 1; 4059 write_uuid_sync 1;
3784 info "emergency_perl_save: end write uuid\n"; 4060 info "emergency_perl_save: end write uuid\n";
3785 };
3786 4061
4062 cf::write_runtime_sync; # external watchdog should not bark
4063
4064 trace "emergency_perl_save: syncing database to disk";
4065 BDB::db_env_txn_checkpoint $DB_ENV;
4066
3787 info "emergency_perl_save: starting sync()\n"; 4067 info "emergency_perl_save: starting sync\n";
3788 IO::AIO::aio_sync sub { 4068 IO::AIO::aio_sync sub {
3789 info "emergency_perl_save: finished sync()\n"; 4069 info "emergency_perl_save: finished sync\n";
4070 };
4071
4072 cf::write_runtime_sync; # external watchdog should not bark
4073
4074 trace "emergency_perl_save: flushing outstanding aio requests";
4075 while (IO::AIO::nreqs || BDB::nreqs) {
4076 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4077 }
4078
4079 cf::write_runtime_sync; # external watchdog should not bark
3790 }; 4080 };
3791 4081
3792 info "emergency_perl_save: leave\n"; 4082 info "emergency_perl_save: leave\n";
3793} 4083}
3794 4084
3795sub post_cleanup { 4085sub post_cleanup {
3796 my ($make_core) = @_; 4086 my ($make_core) = @_;
4087
4088 IO::AIO::flush;
3797 4089
3798 error Carp::longmess "post_cleanup backtrace" 4090 error Carp::longmess "post_cleanup backtrace"
3799 if $make_core; 4091 if $make_core;
3800 4092
3801 my $fh = pidfile; 4093 my $fh = pidfile;
3827 } 4119 }
3828} 4120}
3829 4121
3830sub do_reload_perl() { 4122sub do_reload_perl() {
3831 # can/must only be called in main 4123 # can/must only be called in main
3832 if (in_main) { 4124 unless (in_main) {
3833 error "can only reload from main coroutine"; 4125 error "can only reload from main coroutine";
3834 return; 4126 return;
3835 } 4127 }
3836 4128
3837 return if $RELOAD++; 4129 return if $RELOAD++;
3838 4130
3839 my $t1 = AE::time; 4131 my $t1 = AE::time;
3840 4132
3841 while ($RELOAD) { 4133 while ($RELOAD) {
4134 cf::get_slot 0.1, -1, "reload_perl";
3842 info "reloading..."; 4135 info "perl_reload: reloading...";
3843 4136
3844 trace "entering sync_job"; 4137 trace "perl_reload: entering sync_job";
3845 4138
3846 cf::sync_job { 4139 cf::sync_job {
3847 cf::write_runtime_sync; # external watchdog should not bark
3848 cf::emergency_save; 4140 #cf::emergency_save;
3849 cf::write_runtime_sync; # external watchdog should not bark
3850 4141
3851 trace "syncing database to disk";
3852 BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854 # if anything goes wrong in here, we should simply crash as we already saved
3855
3856 trace "flushing outstanding aio requests";
3857 while (IO::AIO::nreqs || BDB::nreqs) {
3858 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859 }
3860
3861 trace "cancelling all extension coros"; 4142 trace "perl_reload: cancelling all extension coros";
3862 $_->cancel for values %EXT_CORO; 4143 $_->cancel for values %EXT_CORO;
3863 %EXT_CORO = (); 4144 %EXT_CORO = ();
3864 4145
3865 trace "removing commands"; 4146 trace "perl_reload: removing commands";
3866 %COMMAND = (); 4147 %COMMAND = ();
3867 4148
3868 trace "removing ext/exti commands"; 4149 trace "perl_reload: removing ext/exti commands";
3869 %EXTCMD = (); 4150 %EXTCMD = ();
3870 %EXTICMD = (); 4151 %EXTICMD = ();
3871 4152
3872 trace "unloading/nuking all extensions"; 4153 trace "perl_reload: unloading/nuking all extensions";
3873 for my $pkg (@EXTS) { 4154 for my $pkg (@EXTS) {
3874 trace "... unloading $pkg"; 4155 trace "... unloading $pkg";
3875 4156
3876 if (my $cb = $pkg->can ("unload")) { 4157 if (my $cb = $pkg->can ("unload")) {
3877 eval { 4158 eval {
3882 4163
3883 trace "... clearing $pkg"; 4164 trace "... clearing $pkg";
3884 clear_package $pkg; 4165 clear_package $pkg;
3885 } 4166 }
3886 4167
3887 trace "unloading all perl modules loaded from $LIBDIR"; 4168 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888 while (my ($k, $v) = each %INC) { 4169 while (my ($k, $v) = each %INC) {
3889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4170 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890 4171
3891 trace "... unloading $k"; 4172 trace "... unloading $k";
3892 delete $INC{$k}; 4173 delete $INC{$k};
3899 } 4180 }
3900 4181
3901 clear_package $k; 4182 clear_package $k;
3902 } 4183 }
3903 4184
3904 trace "getting rid of safe::, as good as possible"; 4185 trace "perl_reload: getting rid of safe::, as good as possible";
3905 clear_package "safe::$_" 4186 clear_package "safe::$_"
3906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4187 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907 4188
3908 trace "unloading cf.pm \"a bit\""; 4189 trace "perl_reload: unloading cf.pm \"a bit\"";
3909 delete $INC{"cf.pm"}; 4190 delete $INC{"cf.pm"};
3910 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4191 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911 4192
3912 # don't, removes xs symbols, too, 4193 # don't, removes xs symbols, too,
3913 # and global variables created in xs 4194 # and global variables created in xs
3914 #clear_package __PACKAGE__; 4195 #clear_package __PACKAGE__;
3915 4196
3916 info "unload completed, starting to reload now"; 4197 info "perl_reload: unload completed, starting to reload now";
3917 4198
3918 trace "reloading cf.pm"; 4199 trace "perl_reload: reloading cf.pm";
3919 require cf; 4200 require cf;
3920 cf::_connect_to_perl_1; 4201 cf::_connect_to_perl_1;
3921 4202
3922 trace "loading config and database again"; 4203 trace "perl_reload: loading config and database again";
3923 cf::reload_config; 4204 cf::reload_config;
3924 4205
3925 trace "loading extensions"; 4206 trace "perl_reload: loading extensions";
3926 cf::load_extensions; 4207 cf::load_extensions;
3927 4208
3928 if ($REATTACH_ON_RELOAD) { 4209 if ($REATTACH_ON_RELOAD) {
3929 trace "reattaching attachments to objects/players"; 4210 trace "perl_reload: reattaching attachments to objects/players";
3930 _global_reattach; # objects, sockets 4211 _global_reattach; # objects, sockets
3931 trace "reattaching attachments to maps"; 4212 trace "perl_reload: reattaching attachments to maps";
3932 reattach $_ for values %MAP; 4213 reattach $_ for values %MAP;
3933 trace "reattaching attachments to players"; 4214 trace "perl_reload: reattaching attachments to players";
3934 reattach $_ for values %PLAYER; 4215 reattach $_ for values %PLAYER;
3935 } 4216 }
3936 4217
3937 trace "running post_init jobs"; 4218 cf::_post_init 1;
3938 (pop @POST_INIT)->(1) while @POST_INIT;
3939 4219
3940 trace "leaving sync_job"; 4220 trace "perl_reload: leaving sync_job";
3941 4221
3942 1 4222 1
3943 } or do { 4223 } or do {
3944 error $@; 4224 error $@;
3945 cf::cleanup "error while reloading, exiting."; 4225 cf::cleanup "perl_reload: error, exiting.";
3946 }; 4226 };
3947 4227
3948 info "reloaded";
3949 --$RELOAD; 4228 --$RELOAD;
3950 } 4229 }
3951 4230
3952 $t1 = AE::time - $t1; 4231 $t1 = AE::time - $t1;
3953 info "reload completed in ${t1}s\n"; 4232 info "perl_reload: completed in ${t1}s\n";
3954}; 4233};
3955 4234
3956our $RELOAD_WATCHER; # used only during reload 4235our $RELOAD_WATCHER; # used only during reload
3957 4236
3958sub reload_perl() { 4237sub reload_perl() {
3979 reload_perl; 4258 reload_perl;
3980 }; 4259 };
3981 } 4260 }
3982}; 4261};
3983 4262
3984unshift @INC, $LIBDIR; 4263#############################################################################
3985 4264
3986my $bug_warning = 0; 4265my $bug_warning = 0;
3987 4266
3988our @WAIT_FOR_TICK;
3989our @WAIT_FOR_TICK_BEGIN;
3990
3991sub wait_for_tick { 4267sub wait_for_tick() {
3992 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4268 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3993 4269
3994 my $signal = new Coro::Signal; 4270 $WAIT_FOR_TICK->wait;
3995 push @WAIT_FOR_TICK, $signal;
3996 $signal->wait;
3997} 4271}
3998 4272
3999sub wait_for_tick_begin { 4273sub wait_for_tick_begin() {
4000 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4274 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4001 4275
4002 my $signal = new Coro::Signal; 4276 my $signal = new Coro::Signal;
4003 push @WAIT_FOR_TICK_BEGIN, $signal; 4277 push @WAIT_FOR_TICK_BEGIN, $signal;
4004 $signal->wait; 4278 $signal->wait;
4005} 4279}
4009 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4283 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4010 unless ++$bug_warning > 10; 4284 unless ++$bug_warning > 10;
4011 return; 4285 return;
4012 } 4286 }
4013 4287
4014 cf::server_tick; # one server iteration 4288 cf::one_tick; # one server iteration
4015 4289
4016 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4290 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017 4291
4018 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4292 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4019 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4293 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4025 } 4299 }
4026 4300
4027 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4301 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4028 $sig->send; 4302 $sig->send;
4029 } 4303 }
4030 while (my $sig = shift @WAIT_FOR_TICK) { 4304 $WAIT_FOR_TICK->broadcast;
4031 $sig->send;
4032 }
4033 4305
4034 $LOAD = ($NOW - $TICK_START) / $TICK; 4306 $LOAD = ($NOW - $TICK_START) / $TICK;
4035 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4307 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4036 4308
4037 if (0) { 4309 if (0) {
4043 } 4315 }
4044} 4316}
4045 4317
4046{ 4318{
4047 # configure BDB 4319 # configure BDB
4320 info "initialising database";
4048 4321
4049 BDB::min_parallel 16; 4322 BDB::min_parallel 16;
4050 BDB::max_poll_reqs $TICK * 0.1; 4323 BDB::max_poll_reqs $TICK * 0.1;
4051 $AnyEvent::BDB::WATCHER->priority (1); 4324 #$AnyEvent::BDB::WATCHER->priority (1);
4052 4325
4053 unless ($DB_ENV) { 4326 unless ($DB_ENV) {
4054 $DB_ENV = BDB::db_env_create; 4327 $DB_ENV = BDB::db_env_create;
4055 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4328 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4056 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4329 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4081 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4354 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4082 }; 4355 };
4083 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4356 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4084 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4357 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4085 }; 4358 };
4359
4360 info "database initialised";
4086} 4361}
4087 4362
4088{ 4363{
4089 # configure IO::AIO 4364 # configure IO::AIO
4090 4365
4366 info "initialising aio";
4091 IO::AIO::min_parallel 8; 4367 IO::AIO::min_parallel 8;
4092 IO::AIO::max_poll_time $TICK * 0.1; 4368 IO::AIO::max_poll_time $TICK * 0.1;
4093 undef $AnyEvent::AIO::WATCHER; 4369 undef $AnyEvent::AIO::WATCHER;
4370 info "aio initialised";
4094} 4371}
4095 4372
4096my $_log_backtrace; 4373our $_log_backtrace;
4374our $_log_backtrace_last;
4097 4375
4098sub _log_backtrace { 4376sub _log_backtrace {
4099 my ($msg, @addr) = @_; 4377 my ($msg, @addr) = @_;
4100 4378
4101 $msg =~ s/\n//; 4379 $msg =~ s/\n$//;
4102 4380
4381 if ($_log_backtrace_last eq $msg) {
4382 LOG llevInfo, "[ABT] $msg\n";
4383 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4103 # limit the # of concurrent backtraces 4384 # limit the # of concurrent backtraces
4104 if ($_log_backtrace < 2) { 4385 } elsif ($_log_backtrace < 2) {
4386 $_log_backtrace_last = $msg;
4105 ++$_log_backtrace; 4387 ++$_log_backtrace;
4106 my $perl_bt = Carp::longmess $msg; 4388 my $perl_bt = Carp::longmess $msg;
4107 async { 4389 async {
4108 $Coro::current->{desc} = "abt $msg"; 4390 $Coro::current->{desc} = "abt $msg";
4109 4391
4129 LOG llevInfo, "[ABT] $_\n" for @bt; 4411 LOG llevInfo, "[ABT] $_\n" for @bt;
4130 --$_log_backtrace; 4412 --$_log_backtrace;
4131 }; 4413 };
4132 } else { 4414 } else {
4133 LOG llevInfo, "[ABT] $msg\n"; 4415 LOG llevInfo, "[ABT] $msg\n";
4134 LOG llevInfo, "[ABT] [suppressed]\n"; 4416 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4135 } 4417 }
4136} 4418}
4137 4419
4138# load additional modules 4420# load additional modules
4139require "cf/$_.pm" for @EXTRA_MODULES; 4421require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines