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.510 by root, Tue Apr 6 22:59:28 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
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
… …
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
… …
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
… …
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
… …
93our @EVENT; 97our @EVENT;
94our @REFLECT; # set by XS 98our @REFLECT; # set by XS
95our %REFLECT; # set by us 99our %REFLECT; # set by us
96 100
97our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
98our $DATADIR = datadir; 103our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
102our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 116
111our %RESOURCE; 117#our %RESOURCE; # unused
118
119our $OUTPUT_RATE_MIN = 3000;
120our $OUTPUT_RATE_MAX = 1000000;
121
122our $MAX_LINKS = 32; # how many chained exits to follow
123our $VERBOSE_IO = 1;
112 124
113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115our $NEXT_TICK; 127our $NEXT_TICK;
116our $USE_FSYNC = 1; # use fsync to write maps - default on 128our $USE_FSYNC = 1; # use fsync to write maps - default on
… …
118our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
120our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
121our $DB_ENV; 133our $DB_ENV;
122 134
123our @EXTRA_MODULES = qw(pod match mapscript); 135our @EXTRA_MODULES = qw(pod match mapscript incloader);
124 136
125our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126 139
127our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
128our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
129our $NOW; 143our $NOW;
130 144
131our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
132our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
133our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
… …
142 156
143our @POST_INIT; 157our @POST_INIT;
144 158
145our $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)
146our $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;
147 164
148binmode STDOUT; 165binmode STDOUT;
149binmode STDERR; 166binmode STDERR;
150 167
151# read virtual server time, if available 168# read virtual server time, if available
… …
162 179
163our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
164 181
165sub cf::map::normalise; 182sub cf::map::normalise;
166 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
167############################################################################# 188#############################################################################
168 189
169%REFLECT = (); 190%REFLECT = ();
170for (@REFLECT) { 191for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_; 192 my $reflect = JSON::XS::decode_json $_;
… …
181 202
182=over 4 203=over 4
183 204
184=item $cf::UPTIME 205=item $cf::UPTIME
185 206
186The 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.
187 223
188=item $cf::RUNTIME 224=item $cf::RUNTIME
189 225
190The 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
191every server tick. 227every server tick.
192 228
193=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196 232
197Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
198directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
200database environment. 236database environment.
201 237
202=item $cf::NOW
203
204The time of the last (current) server tick.
205
206=item $cf::TICK
207
208The interval between server ticks, in seconds.
209
210=item $cf::LOADAVG 238=item $cf::LOADAVG
211 239
212The 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
213(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
214objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
… …
223from wherever your confdir points to. 251from wherever your confdir points to.
224 252
225=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
226 254
227These 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
228returns directly I<after> the tick processing (and consequently, can only wake one process 256returns directly I<after> the tick processing (and consequently, can only wake one thread
229per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 257per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
258
259Note that cf::Wait_for_tick will immediately return when the server is not
260ticking, making it suitable for small pauses in threads that need to run
261when the server is paused. If that is not applicable (i.e. you I<really>
262want to wait, use C<$cf::WAIT_FOR_TICK>).
263
264=item $cf::WAIT_FOR_TICK
265
266Note that C<cf::wait_for_tick> is probably the correct thing to use. This
267variable contains a L<Coro::Signal> that is broadcats after every server
268tick. Calling C<< ->wait >> on it will suspend the caller until after the
269next server tick.
270
271=cut
272
273sub wait_for_tick();
274sub wait_for_tick_begin();
230 275
231=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
232 277
233This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 279C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
… …
242 287
243=back 288=back
244 289
245=cut 290=cut
246 291
292sub error(@) { LOG llevError, join "", @_ }
293sub warn (@) { LOG llevWarn , join "", @_ }
294sub info (@) { LOG llevInfo , join "", @_ }
295sub debug(@) { LOG llevDebug, join "", @_ }
296sub trace(@) { LOG llevTrace, join "", @_ }
297
247$Coro::State::WARNHOOK = sub { 298$Coro::State::WARNHOOK = sub {
248 my $msg = join "", @_; 299 my $msg = join "", @_;
249 300
250 $msg .= "\n" 301 $msg .= "\n"
251 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
252 303
253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 304 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254 305
255 LOG llevError, $msg; 306 LOG llevWarn, $msg;
256}; 307};
257 308
258$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
260 311
261 warn Carp::longmess $_[0]; 312 error Carp::longmess $_[0];
262 313
263 if ($Coro::current == $Coro::main) {#d# 314 if (in_main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d# 316 return;#d#
266 }#d# 317 }#d#
267 318
268 # kill coroutine otherwise 319 # kill coroutine otherwise
269 Coro::terminate 320 Coro::terminate
… …
289)) { 340)) {
290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291} 342}
292 343
293$EV::DIED = sub { 344$EV::DIED = sub {
294 Carp::cluck "error in event callback: @_"; 345 warn "error in event callback: $@";
295}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
296 352
297############################################################################# 353#############################################################################
298 354
299=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
300 356
… …
321 $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;
322 $d 378 $d
323 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
324} 380}
325 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
326=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
327 435
328Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
329 437
330=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
… …
336our $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
337 445
338sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
339sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
340 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
341=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
342 481
343Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
345 484
346The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
347is a reload or not. 486is a reload or not.
348 487
349=cut 488=cut
350 489
351sub post_init(&) { 490sub post_init(&) {
352 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 }
353} 509}
354 510
355=item cf::lock_wait $string 511=item cf::lock_wait $string
356 512
357Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
… …
396} 552}
397 553
398=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
399 555
400Like EV::periodic, but randomly selects a starting point so that the actions 556Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 557get spread over time.
402 558
403=cut 559=cut
404 560
405sub periodic($$) { 561sub periodic($$) {
406 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
… …
410 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
411} 567}
412 568
413=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
414 570
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 578
419The 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
420used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
421 581
422Useful for short background jobs. 582Useful for short background jobs.
… …
451 } 611 }
452 } 612 }
453 613
454 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
455 # 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
456 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
457 $signal->wait;
458 } else { 617 } else {
459 $busy = 0; 618 $busy = 0;
460 Coro::schedule; 619 Coro::schedule;
461 } 620 }
462 } 621 }
… …
502=cut 661=cut
503 662
504sub sync_job(&) { 663sub sync_job(&) {
505 my ($job) = @_; 664 my ($job) = @_;
506 665
507 if ($Coro::current == $Coro::main) { 666 if (in_main) {
508 my $time = EV::time; 667 my $time = AE::time;
509 668
510 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
511 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
512 671
513 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
514 673
515 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
516 675
517 my $busy = 1; 676 my $busy = 1;
518 my @res; 677 my @res;
519 678
520 (async { 679 (async {
521 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
522 @res = eval { $job->() }; 681 @res = eval { $job->() };
523 warn $@ if $@; 682 error $@ if $@;
524 undef $busy; 683 undef $busy;
525 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
526 685
527 while ($busy) { 686 while ($busy) {
528 if (Coro::nready) { 687 if (Coro::nready) {
… …
530 } else { 689 } else {
531 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
532 } 691 }
533 } 692 }
534 693
535 my $time = EV::time - $time; 694 my $time = AE::time - $time;
536 695
537 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
538 697
539 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
540 } else { 699 } else {
… …
562 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
563 722
564 $coro 723 $coro
565} 724}
566 725
567=item fork_call { }, $args 726=item fork_call { }, @args
568 727
569Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
570process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
571Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
572never block itself or use any form of event handling. 731never block itself or use any form of event handling.
573 732
574=cut 733=cut
575 734
735sub post_fork {
736 reset_signals;
737}
738
576sub fork_call(&@) { 739sub fork_call(&@) {
577 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
578 741
579 # we seemingly have to make a local copy of the whole thing, 742 # we seemingly have to make a local copy of the whole thing,
580 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
581 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
582 745
583 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
584 reset_signals; 747 cf::post_fork;
585 &$cb 748 &$cb
586 }, @args; 749 } @args;
587 750
588 wantarray ? @res : $res[-1] 751 wantarray ? @res : $res[-1]
752}
753
754sub objinfo {
755 (
756 "counter value" => cf::object::object_count,
757 "objects created" => cf::object::create_count,
758 "objects destroyed" => cf::object::destroy_count,
759 "freelist size" => cf::object::free_count,
760 "allocated objects" => cf::object::objects_size,
761 "active objects" => cf::object::actives_size,
762 )
589} 763}
590 764
591=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
592 766
593=cut 767=cut
… …
630within each server. 804within each server.
631 805
632=cut 806=cut
633 807
634sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
635 my ($name) = @_; 812 my ($name) = @_;
636 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
637 814
638 eval { 815 eval {
639 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
… …
649} 826}
650 827
651our $DB; 828our $DB;
652 829
653sub db_init { 830sub db_init {
654 cf::sync_job {
655 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
656 };
657} 832}
658 833
659sub db_get($$) { 834sub db_get($$) {
660 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
661 836
662 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
663 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
664 841
665 $! ? () 842 $! ? ()
666 : $data 843 : $data
667 }
668} 844}
669 845
670sub db_put($$$) { 846sub db_put($$$) {
671 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
672 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
… …
700 876
701 my @data; 877 my @data;
702 my $md5; 878 my $md5;
703 879
704 for (0 .. $#$src) { 880 for (0 .. $#$src) {
705 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
706 or Carp::croak "$src->[$_]: $!";
707 } 882 }
708 883
709 # if processing is expensive, check 884 # if processing is expensive, check
710 # checksum first 885 # checksum first
711 if (1) { 886 if (1) {
… …
728 903
729 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
730 my $data = $process->(\@data); 905 my $data = $process->(\@data);
731 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
732 907
733 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734 909
735 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
736 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
737 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
738 913
… …
748 923
749=cut 924=cut
750 925
751sub datalog($@) { 926sub datalog($@) {
752 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
753 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754} 929}
755 930
756=back 931=back
757 932
758=cut 933=cut
… …
953 1128
954 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
955 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956 1131
957 } elsif (ref $type) { 1132 } elsif (ref $type) {
958 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
959 1134
960 } else { 1135 } else {
961 shift @arg; 1136 shift @arg;
962 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
963 } 1138 }
964 } 1139 }
965} 1140}
966 1141
967sub _object_attach { 1142sub _object_attach {
… …
977 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
978 } 1153 }
979 1154
980 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
981 } else { 1156 } else {
982 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
983 } 1158 }
984 1159
985 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
986} 1161}
987 1162
… …
1046 1221
1047 for (@$callbacks) { 1222 for (@$callbacks) {
1048 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1049 1224
1050 if ($@) { 1225 if ($@) {
1051 warn "$@";
1052 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053 override; 1227 override;
1054 } 1228 }
1055 1229
1056 return 1 if $override; 1230 return 1 if $override;
1057 } 1231 }
… …
1136 for (@$attach) { 1310 for (@$attach) {
1137 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1138 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1139 } 1313 }
1140 } else { 1314 } else {
1141 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1142 } 1316 }
1143 } 1317 }
1144} 1318}
1145 1319
1146cf::attachable->attach ( 1320cf::attachable->attach (
… …
1173 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1174 1348
1175 sync_job { 1349 sync_job {
1176 if (length $$rdata) { 1350 if (length $$rdata) {
1177 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1178 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1179 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1180 1355
1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184 if ($cf::USE_FSYNC) { 1359 if ($cf::USE_FSYNC) {
… …
1206 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1207 1382
1208 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1210 } else { 1385 } else {
1211 warn "unable to save objects: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1212 } 1387 }
1213 } else { 1388 } else {
1214 aio_unlink $filename; 1389 aio_unlink $filename;
1215 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1216 } 1391 }
… …
1240 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1241 $av = $st->{objs}; 1416 $av = $st->{objs};
1242 } 1417 }
1243 1418
1244 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1245 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1246 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1247 1423
1248 ($data, $av) 1424 ($data, $av)
1249} 1425}
1250 1426
1251=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
… …
1328 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1329 1505
1330 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331 1507
1332 if (ref $msg) { 1508 if (ref $msg) {
1333 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334 "ARRAY" eq ref $msg
1335 ? @$msg
1336 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337 1510
1338 my @reply; 1511 my @reply;
1339 1512
1340 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1341 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
… …
1343 1516
1344 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1345 if $reply; 1518 if $reply;
1346 1519
1347 } else { 1520 } else {
1348 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349 } 1522 }
1350 1523
1351 cf::override; 1524 cf::override;
1352 }, 1525 },
1353); 1526);
… …
1363 }; 1536 };
1364 1537
1365 $grp 1538 $grp
1366} 1539}
1367 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
1368sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1369 cf::sync_job { 1557 cf::sync_job {
1370 my %todo; 1558 my %todo;
1371 1559
1372 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1373 next unless -r $path; 1561 next unless -r $path;
… …
1391 1579
1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394 1582
1395 $ext{source} = 1583 $ext{source} =
1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1397 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1398 . $source 1586 . $source
1399 . "\n};\n1"; 1587 . "\n};\n1";
1400 1588
1401 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
… …
1413 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1414 next ext 1602 next ext
1415 unless exists $done{$_}; 1603 unless exists $done{$_};
1416 } 1604 }
1417 1605
1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419 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
1420 my $active = eval $v->{source}; 1617 my $active = eval $source;
1421 1618
1422 if (length $@) { 1619 if (length $@) {
1423 warn "$v->{path}: $@\n"; 1620 error "$v->{path}: $@\n";
1424 1621
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426 if exists $v->{meta}{mandatory}; 1623 if exists $v->{meta}{mandatory};
1624
1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1626 delete $todo{$k};
1427 } else { 1627 } else {
1428 $done{$k} = delete $todo{$k}; 1628 $done{$k} = delete $todo{$k};
1429 push @EXTS, $v->{pkg}; 1629 push @EXTS, $v->{pkg};
1430 $progress = 1; 1630 $progress = 1;
1431 1631
1432 warn "$v->{base}: extension inactive.\n" 1632 info "$v->{base}: extension inactive.\n"
1433 unless $active; 1633 unless $active;
1434 } 1634 }
1435 } 1635 }
1436 1636
1437 unless ($progress) { 1637 unless ($progress) {
… …
1439 1639
1440 while (my ($k, $v) = each %todo) { 1640 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1641 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory}; 1642 if exists $v->{meta}{mandatory};
1443 } 1643 }
1644
1645 last;
1444 } 1646 }
1445 } 1647 }
1446 }; 1648 };
1447} 1649}
1448 1650
… …
1533 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1534 } 1736 }
1535 } 1737 }
1536} 1738}
1537 1739
1740cf::player->attach (
1741 on_load => sub {
1742 my ($pl, $path) = @_;
1743
1744 # restore slots saved in save, below
1745 my $slots = delete $pl->{_slots};
1746
1747 $pl->ob->current_weapon ($slots->[0]);
1748 $pl->combat_ob ($slots->[1]);
1749 $pl->ranged_ob ($slots->[2]);
1750 },
1751);
1752
1538sub save($) { 1753sub save($) {
1539 my ($pl) = @_; 1754 my ($pl) = @_;
1540 1755
1541 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1542 1757
… …
1547 1762
1548 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1549 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1550 1765
1551 cf::get_slot 0.01; 1766 cf::get_slot 0.01;
1767
1768 # save slots, to be restored later
1769 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552 1770
1553 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1554 cf::cede_to_tick; 1772 cf::cede_to_tick;
1555} 1773}
1556 1774
… …
1590 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1591 1809
1592 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1593 $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
1594 1812
1595 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596 $pl->deactivate; 1814 $pl->deactivate;
1815
1597 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;
1598 $pl->ob->check_score;
1599 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1600 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1601 1821
1602 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1603 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1604 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1658 \@logins 1878 \@logins
1659} 1879}
1660 1880
1661=item $player->maps 1881=item $player->maps
1662 1882
1883=item cf::player::maps $login
1884
1663Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1664player. May block. 1886player. May block.
1665 1887
1666=cut 1888=cut
1667 1889
… …
1729=cut 1951=cut
1730 1952
1731sub find_by_path($) { 1953sub find_by_path($) {
1732 my ($path) = @_; 1954 my ($path) = @_;
1733 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1734 my ($match, $specificity); 1958 my ($match, $specificity);
1735 1959
1736 for my $region (list) { 1960 for my $region (list) {
1737 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1738 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
… …
1766sub generate_random_map { 1990sub generate_random_map {
1767 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1768 1992
1769 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
1770 1994
1771 # mit "rum" bekleckern, nicht
1772 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1773 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1775 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776 $rmp->{exit_on_final_map},
1777 $rmp->{xsize}, $rmp->{ysize},
1778 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783 (cf::region::find $rmp->{region}), $rmp->{custom}
1784 )
1785} 1996}
1786 1997
1787=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1788 1999
1789Register 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
… …
1794 2005
1795sub register { 2006sub register {
1796 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1797 my $pkg = caller; 2008 my $pkg = caller;
1798 2009
1799 no strict;
1800 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1801 2011
1802 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803} 2013}
1804 2014
1805# also paths starting with '/' 2015# also paths starting with '/'
1806$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807 2017
1808sub thawer_merge { 2018sub thawer_merge {
1809 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1810 2020
1811 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
… …
1816} 2026}
1817 2027
1818sub normalise { 2028sub normalise {
1819 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1820 2030
1821 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1822 2032
1823 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1824 2034
1825 # map plan: 2035 # map plan:
1826 # 2036 #
… …
1841 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1842 $path = "$base/$path"; 2052 $path = "$base/$path";
1843 } 2053 }
1844 2054
1845 for ($path) { 2055 for ($path) {
1846 redo if s{//}{/};
1847 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1848 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1849 } 2058 }
1850 2059
1851 $path 2060 $path
… …
1865 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1866 return $self; 2075 return $self;
1867 } 2076 }
1868 } 2077 }
1869 2078
1870 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1871 () 2080 ()
1872} 2081}
1873 2082
2083# may re-bless or do other evil things
1874sub init { 2084sub init {
1875 my ($self) = @_; 2085 my ($self) = @_;
1876 2086
1877 $self 2087 $self
1878} 2088}
… …
1943 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1944 2154
1945 1 2155 1
1946} 2156}
1947 2157
2158# used to laod the header of an original map
1948sub load_header_orig { 2159sub load_header_orig {
1949 my ($self) = @_; 2160 my ($self) = @_;
1950 2161
1951 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1952} 2163}
1953 2164
2165# used to laod the header of an instantiated map
1954sub load_header_temp { 2166sub load_header_temp {
1955 my ($self) = @_; 2167 my ($self) = @_;
1956 2168
1957 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1958} 2170}
1959 2171
2172# called after loading the header from an instantiated map
1960sub prepare_temp { 2173sub prepare_temp {
1961 my ($self) = @_; 2174 my ($self) = @_;
1962 2175
1963 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1964 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1965 # safety 2178 # safety
1966 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1967 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1968} 2181}
1969 2182
2183# called after loading the header from an original map
1970sub prepare_orig { 2184sub prepare_orig {
1971 my ($self) = @_; 2185 my ($self) = @_;
1972 2186
1973 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1974 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
… …
1998 2212
1999sub find; 2213sub find;
2000sub find { 2214sub find {
2001 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
2002 2216
2217 cf::cede_to_tick;
2218
2003 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
2004 2220
2005 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006 my $guard2 = cf::lock_acquire "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
2007 2223
2008 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
… …
2039 2255
2040 { 2256 {
2041 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2042 2258
2043 return unless $self->valid; 2259 return unless $self->valid;
2044 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2045
2046 $self->in_memory (cf::MAP_LOADING);
2047 2261
2048 $self->alloc; 2262 $self->alloc;
2049 2263
2050 $self->pre_load; 2264 $self->pre_load;
2051 cf::cede_to_tick; 2265 cf::cede_to_tick;
2052 2266
2267 if (exists $self->{load_path}) {
2053 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2054 $f->skip_block; 2269 $f->skip_block;
2055 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2056 or return; 2271 or return;
2057 2272
2058 $self->post_load_original 2273 $self->post_load_original
2059 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2060 2275
2061 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2062 utf8::encode $uniq; 2277 utf8::encode $uniq;
2063 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2064 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2065 $self->clear_unique_items; 2280 $self->clear_unique_items;
2066 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2067 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2068 } 2284 }
2069 } 2285 }
2070 }
2071 2286
2072 $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);
2073 2294
2074 cf::cede_to_tick; 2295 cf::cede_to_tick;
2075 # now do the right thing for maps 2296 # now do the right thing for maps
2076 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2077 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
… …
2081 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2082 $self->decay_objects; 2303 $self->decay_objects;
2083 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2084 $self->update_buttons; 2305 $self->update_buttons;
2085 cf::cede_to_tick; 2306 cf::cede_to_tick;
2086 $self->activate; 2307 #$self->activate; # no longer activate maps automatically
2087 } 2308 }
2088 2309
2089 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2090 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2091
2092 $self->in_memory (cf::MAP_ACTIVE);
2093 } 2312 }
2094 2313
2095 $self->post_load; 2314 $self->post_load;
2315
2316 1
2096} 2317}
2097 2318
2098# customize the map for a given player, i.e. 2319# customize the map for a given player, i.e.
2099# return the _real_ map. used by e.g. per-player 2320# return the _real_ map. used by e.g. per-player
2100# maps to change the path to ~playername/mappath 2321# maps to change the path to ~playername/mappath
… …
2108# if $self->per_party; 2329# if $self->per_party;
2109 2330
2110 $self 2331 $self
2111} 2332}
2112 2333
2113# find and load all maps in the 3x3 area around a map
2114sub load_neighbours {
2115 my ($map) = @_;
2116
2117 my @neigh; # diagonal neighbours
2118
2119 for (0 .. 3) {
2120 my $neigh = $map->tile_path ($_)
2121 or next;
2122 $neigh = find $neigh, $map
2123 or next;
2124 $neigh->load;
2125
2126 push @neigh,
2127 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2128 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2129 }
2130
2131 for (grep defined $_->[0], @neigh) {
2132 my ($path, $origin) = @$_;
2133 my $neigh = find $path, $origin
2134 or next;
2135 $neigh->load;
2136 }
2137}
2138
2139sub find_sync { 2334sub find_sync {
2140 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2141 2336
2142 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2143} 2342}
2144 2343
2145sub do_load_sync { 2344sub do_load_sync {
2146 my ($map) = @_; 2345 my ($map) = @_;
2147 2346
2347 # it's a bug to call this from the main context
2148 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2149 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2150 2350
2151 cf::sync_job { $map->load }; 2351 $map->load;
2152} 2352}
2153 2353
2154our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2155our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2156 2356
2157sub find_async { 2357sub find_async {
2158 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2159 2359
2160 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2161 2361
2162 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2163 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2164 } 2364 }
2165 2365
2166 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2167 2367
2168 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
… …
2182 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2183 2383
2184 () 2384 ()
2185} 2385}
2186 2386
2387# common code, used by both ->save and ->swapout
2187sub save { 2388sub _save {
2188 my ($self) = @_; 2389 my ($self) = @_;
2189
2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2191 2390
2192 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2193 2392
2194 return unless $self->dirty; 2393 return unless $self->dirty;
2195 2394
… …
2215 } else { 2414 } else {
2216 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2217 } 2416 }
2218} 2417}
2219 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2220sub swap_out { 2427sub swap_out {
2221 my ($self) = @_; 2428 my ($self) = @_;
2222 2429
2223 # save first because save cedes
2224 $self->save;
2225
2226 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2227 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2228 return if $self->players; 2434 return if $self->players;
2229 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2230 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2231 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2232 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2233 2486
2234 $self->deactivate; 2487 $self->deactivate;
2235 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2236 $self->clear; 2489 $self->clear;
2237}
2238
2239sub reset_at {
2240 my ($self) = @_;
2241
2242 # TODO: safety, remove and allow resettable per-player maps
2243 return 1e99 if $self->{deny_reset};
2244
2245 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2246 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2247
2248 $time + $to
2249}
2250
2251sub should_reset {
2252 my ($self) = @_;
2253
2254 $self->reset_at <= $cf::RUNTIME
2255}
2256
2257sub reset {
2258 my ($self) = @_;
2259
2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
2261
2262 return if $self->players;
2263
2264 warn "resetting map ", $self->path, "\n";
2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 # need to save uniques path
2269 unless ($self->{deny_save}) {
2270 my $uniq = $self->uniq_path; utf8::encode $uniq;
2271
2272 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2273 if $uniq;
2274 }
2275
2276 delete $cf::MAP{$self->path};
2277
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->clear;
2281 2490
2282 $self->unlink_save; 2491 $self->unlink_save;
2283 $self->destroy; 2492 $self->destroy;
2284} 2493}
2285 2494
… …
2293 2502
2294 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2295 2504
2296 $self->unlink_save; 2505 $self->unlink_save;
2297 2506
2298 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2299 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2300 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2301 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2302 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2303 2512
… …
2533 2742
2534Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2535 2744
2536The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2537for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2538though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2539map. 2748map.
2540 2749
2541Will never block. 2750Will never block.
2542 2751
2543=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
… …
2564sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2565 my ($self) = @_; 2774 my ($self) = @_;
2566 2775
2567 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2568 2777
2778 ++$self->{_link_recursion};
2779
2569 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2570 2781
2571 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2572 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2573 2784
2574 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2575} 2786}
2576 2787
2577sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2578 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2579 2790
… …
2599 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2600 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2601 if $x <= 0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2602 2813
2603 $map->load; 2814 $map->load;
2604 $map->load_neighbours;
2605 2815
2606 return unless $self->contr->active; 2816 return unless $self->contr->active;
2607 2817
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2610 2820 # entering was successful
2821 delete $self->{_link_recursion};
2611 # only activate afterwards, to support waiting in hooks 2822 # only activate afterwards, to support waiting in hooks
2612 $self->activate_recursive; 2823 $self->activate_recursive;
2613} 2824 }
2614 2825
2826}
2827
2615=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2616 2829
2617Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2618her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2619that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2620the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
… …
2627 2840
2628our $GOTOGEN; 2841our $GOTOGEN;
2629 2842
2630sub cf::object::player::goto { 2843sub cf::object::player::goto {
2631 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2632 2851
2633 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2634 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2635 2854
2636 $self->enter_link; 2855 $self->enter_link;
… …
2656 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2657 } 2876 }
2658 } 2877 }
2659 2878
2660 my $map = eval { 2879 my $map = eval {
2661 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2662 2881
2663 if ($map) { 2882 if ($map) {
2664 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2665 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2666 } else { 2885 } else {
2667 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2668 } 2887 }
2669 2888
2670 $map 2889 $map
… …
2678 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2679 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2680 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2681 } 2900 }
2682 2901
2683 $done->() if $done; 2902 $done->($self) if $done;
2684 })->prio (1); 2903 })->prio (1);
2685} 2904}
2686 2905
2687=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2688 2907
… …
2756 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2757 2976
2758 unless (eval { 2977 unless (eval {
2759 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2760 2979
2761 # random map handling
2762 {
2763 my $guard = cf::lock_acquire "exit_prepare:$exit";
2764
2765 prepare_random_map $exit
2766 if $exit->slaying eq "/!";
2767 }
2768
2769 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2770 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2771 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 }
2772 3006
2773 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2774 3008
2775 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2776 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
… …
2781 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2782 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2783 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2784 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2785 3019
2786 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2787 $self->leave_link; 3021 $self->leave_link;
2788 } 3022 }
2789 })->prio (1); 3023 })->prio (1);
2790} 3024}
2791 3025
… …
3001=cut 3235=cut
3002 3236
3003sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
3004 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
3005 3239
3006 if ($self->extcmd == 2) {
3007 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3008 } elsif ($self->extcmd == 1) { # TODO: remove
3009 push @msg, msgtype => "event_$type";
3010 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3011 }
3012} 3241}
3013 3242
3014=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
3015 3244
3016Sends an ext reply to the client. 3245Sends an ext reply to the client.
… …
3018=cut 3247=cut
3019 3248
3020sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
3021 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
3022 3251
3023 if ($self->extcmd == 2) {
3024 $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]));
3025 } elsif ($self->extcmd == 1) {
3026 #TODO: version 1, remove
3027 unshift @msg, msgtype => "reply", msgid => $id;
3028 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3029 }
3030} 3253}
3031 3254
3032=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
3033 3256
3034Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
… …
3089 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3090 3313
3091 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3092 3315
3093 if (ref $msg) { 3316 if (ref $msg) {
3094 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3095 "ARRAY" eq ref $msg
3096 ? @$msg
3097 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3098 3318
3099 my @reply; 3319 my @reply;
3100 3320
3101 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3102 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
… …
3104 3324
3105 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3106 if $reply; 3326 if $reply;
3107 3327
3108 } else { 3328 } else {
3109 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3110 } 3330 }
3111 3331
3112 cf::override; 3332 cf::override;
3113 }, 3333 },
3114); 3334);
… …
3195 decrease split destroy change_exp value msg lore send_msg)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3196 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3197 ["cf::player" => qw(peaceful send_msg)], 3417 ["cf::player" => qw(peaceful send_msg)],
3198 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3199) { 3419) {
3200 no strict 'refs';
3201 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3202 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3203 for @funs; 3422 for @funs;
3204} 3423}
3205 3424
… …
3244 local @cf::_safe_eval_args = values %vars; 3463 local @cf::_safe_eval_args = values %vars;
3245 @res = wantarray ? eval eval : scalar eval $eval; 3464 @res = wantarray ? eval eval : scalar eval $eval;
3246 } 3465 }
3247 3466
3248 if ($@) { 3467 if ($@) {
3249 warn "$@"; 3468 warn "$@",
3250 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3251 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3252 } 3471 }
3253 3472
3254 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3255} 3474}
3256 3475
… …
3281=cut 3500=cut
3282 3501
3283############################################################################# 3502#############################################################################
3284# the server's init and main functions 3503# the server's init and main functions
3285 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
3286sub load_facedata($) { 3529sub load_facedata($) {
3287 my ($path) = @_; 3530 my ($path) = @_;
3288 3531
3289 # 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
3290 # for this (global event?) 3533 # for this (global event?)
3291 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3292 3535
3293 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3294 3537
3295 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3296 3539
3297 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3298 0 < aio_load $path, $facedata
3299 or die "$path: $!";
3300
3301 $facedata = Coro::Storable::thaw $facedata;
3302 3541
3303 $facedata->{version} == 2 3542 $facedata->{version} == 2
3304 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3305 3544
3306 # patch in the exptable
3307 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3308 $facedata->{resource}{"res/exp_table"} = {
3309 type => FT_RSRC,
3310 data => $exp_table,
3311 hash => (Digest::MD5::md5 $exp_table),
3312 };
3313 cf::cede_to_tick; 3545 cf::cede_to_tick;
3314 3546
3315 { 3547 {
3316 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3317 3549
3318 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3319 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3320 3553
3321 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3322 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3323 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3324 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#
3325 3560
3326 cf::cede_to_tick; 3561 cf::cede_to_tick;
3327 } 3562 }
3328 3563
3329 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
… …
3334 3569
3335 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3336 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3337 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3338 } else { 3573 } else {
3339 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3340 } 3575 }
3341 3576
3342 cf::cede_to_tick; 3577 cf::cede_to_tick;
3343 } 3578 }
3344 } 3579 }
… …
3356 3591
3357 { 3592 {
3358 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3359 3594
3360 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3361 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
3362 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3363 3599
3600 cf::face::set_type $idx, $type;
3364 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3365 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#
3366 } else { 3604 } else {
3367 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3368 } 3606 }
3369 3607
3370 cf::cede_to_tick; 3608 cf::cede_to_tick;
3371 } 3609 }
3372 } 3610 }
3373 3611
3374 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3375 3613
3376 1 3614 1
3377} 3615}
3378
3379cf::global->attach (on_resource_update => sub {
3380 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3381 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3382
3383 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3384 my $sound = $soundconf->{compat}[$_]
3385 or next;
3386
3387 my $face = cf::face::find "sound/$sound->[1]";
3388 cf::sound::set $sound->[0] => $face;
3389 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3390 }
3391
3392 while (my ($k, $v) = each %{$soundconf->{event}}) {
3393 my $face = cf::face::find "sound/$v";
3394 cf::sound::set $k => $face;
3395 }
3396 }
3397});
3398 3616
3399register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3400 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3401 3619
3402 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
… …
3410 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3411 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3412 cf::arch::commit_load; 3630 cf::arch::commit_load;
3413 3631
3414 $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;
3415} 3646}
3416 3647
3417sub reload_regions { 3648sub reload_regions {
3418 # 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
3419 # for this (global event?) 3650 # for this (global event?)
… …
3434} 3665}
3435 3666
3436sub reload_archetypes { 3667sub reload_archetypes {
3437 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3438 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 );
3439} 3679}
3440 3680
3441sub reload_treasures { 3681sub reload_treasures {
3442 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3443 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3444} 3684}
3445 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
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
3446sub reload_resources { 3768sub reload_resources {
3447 warn "reloading resource files...\n"; 3769 trace "reloading resource files...\n";
3448 3770
3771 reload_materials;
3449 reload_facedata; 3772 reload_facedata;
3773 reload_exp_table;
3774 reload_sound;
3450 reload_archetypes; 3775 reload_archetypes;
3451 reload_regions; 3776 reload_regions;
3452 reload_treasures; 3777 reload_treasures;
3778 reload_pod;
3453 3779
3454 warn "finished reloading resource files\n"; 3780 trace "finished reloading resource files\n";
3455} 3781}
3456 3782
3457sub reload_config { 3783sub reload_config {
3458 warn "reloading config file...\n"; 3784 trace "reloading config file...\n";
3459 3785
3460 open my $fh, "<:utf8", "$CONFDIR/config" 3786 my $config = load_file "$CONFDIR/config";
3461 or return; 3787 utf8::decode $config;
3788 *CFG = decode_yaml $config;
3462 3789
3463 local $/;
3464 *CFG = YAML::XS::Load scalar <$fh>;
3465
3466 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3790 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3467 3791
3468 $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};
3469 $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};
3470 3794
3471 if (exists $CFG{mlockall}) { 3795 if (exists $CFG{mlockall}) {
… …
3473 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3797 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3474 and die "WARNING: m(un)lockall failed: $!\n"; 3798 and die "WARNING: m(un)lockall failed: $!\n";
3475 }; 3799 };
3476 warn $@ if $@; 3800 warn $@ if $@;
3477 } 3801 }
3478
3479 warn "finished reloading resource files\n";
3480} 3802}
3481 3803
3482sub pidfile() { 3804sub pidfile() {
3483 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3805 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3484 or die "$PIDFILE: $!"; 3806 or die "$PIDFILE: $!";
… …
3497 seek $fh, 0, 0; 3819 seek $fh, 0, 0;
3498 print $fh $$; 3820 print $fh $$;
3499} 3821}
3500 3822
3501sub main_loop { 3823sub main_loop {
3502 warn "EV::loop starting\n"; 3824 trace "EV::loop starting\n";
3503 if (1) { 3825 if (1) {
3504 EV::loop; 3826 EV::loop;
3505 } 3827 }
3506 warn "EV::loop returned\n"; 3828 trace "EV::loop returned\n";
3507 goto &main_loop unless $REALLY_UNLOOP; 3829 goto &main_loop unless $REALLY_UNLOOP;
3508} 3830}
3509 3831
3510sub main { 3832sub main {
3511 cf::init_globals; # initialise logging 3833 cf::init_globals; # initialise logging
3512 3834
3513 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3835 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3514 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3836 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3515 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3837 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3516 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3838 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3517 3839
3518 cf::init_experience;
3519 cf::init_anim;
3520 cf::init_attackmess;
3521 cf::init_dynamic;
3522
3523 $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
3524 3841
3525 # we must not ever block the main coroutine 3842 # we must not ever block the main coroutine
3526 local $Coro::idle = sub { 3843 $Coro::idle = sub {
3527 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#
3528 (async { 3845 (async {
3529 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3846 $Coro::current->{desc} = "IDLE BUG HANDLER";
3530 EV::loop EV::LOOP_ONESHOT; 3847 EV::loop EV::LOOP_ONESHOT;
3531 })->prio (Coro::PRIO_MAX); 3848 })->prio (Coro::PRIO_MAX);
3532 }; 3849 };
3533 3850
3534 evthread_start IO::AIO::poll_fileno; 3851 evthread_start IO::AIO::poll_fileno;
3535 3852
3536 cf::sync_job { 3853 cf::sync_job {
3854 cf::incloader::init ();
3855
3856 db_init;
3857
3858 cf::init_anim;
3859 cf::init_attackmess;
3860 cf::init_dynamic;
3861
3537 cf::load_settings; 3862 cf::load_settings;
3538 cf::load_materials;
3539 3863
3540 reload_resources; 3864 reload_resources;
3541 reload_config; 3865 reload_config;
3542 db_init;
3543 3866
3544 cf::init_uuid; 3867 cf::init_uuid;
3545 cf::init_signals; 3868 cf::init_signals;
3546 cf::init_skills; 3869 cf::init_skills;
3547 3870
… …
3555 3878
3556 # no (long-running) fork's whatsoever before this point(!) 3879 # no (long-running) fork's whatsoever before this point(!)
3557 use POSIX (); 3880 use POSIX ();
3558 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};
3559 3882
3560 (pop @POST_INIT)->(0) while @POST_INIT; 3883 cf::_post_init 0;
3561 }; 3884 };
3562 3885
3886 cf::object::thawer::errors_are_fatal 0;
3887 info "parse errors in files are no longer fatal from this point on.\n";
3888
3889 AE::postpone {
3890 undef &main; # free gobs of memory :)
3891 };
3892
3563 main_loop; 3893 goto &main_loop;
3564} 3894}
3565 3895
3566############################################################################# 3896#############################################################################
3567# initialisation and cleanup 3897# initialisation and cleanup
3568 3898
3569# install some emergency cleanup handlers 3899# install some emergency cleanup handlers
3570BEGIN { 3900BEGIN {
3571 our %SIGWATCHER = (); 3901 our %SIGWATCHER = ();
3572 for my $signal (qw(INT HUP TERM)) { 3902 for my $signal (qw(INT HUP TERM)) {
3573 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3903 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3574 cf::cleanup "SIG$signal"; 3904 cf::cleanup "SIG$signal";
3575 }; 3905 };
3576 } 3906 }
3577} 3907}
3578 3908
3579sub write_runtime_sync { 3909sub write_runtime_sync {
3580 my $t0 = EV::time; 3910 my $t0 = AE::time;
3581 3911
3582 # first touch the runtime file to show we are still running: 3912 # first touch the runtime file to show we are still running:
3583 # the fsync below can take a very very long time. 3913 # the fsync below can take a very very long time.
3584 3914
3585 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3915 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3607 or return; 3937 or return;
3608 3938
3609 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3939 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3610 and return; 3940 and return;
3611 3941
3612 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3942 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3613 3943
3614 1 3944 1
3615} 3945}
3616 3946
3617our $uuid_lock; 3947our $uuid_lock;
… …
3629 or return; 3959 or return;
3630 3960
3631 my $value = uuid_seq uuid_cur; 3961 my $value = uuid_seq uuid_cur;
3632 3962
3633 unless ($value) { 3963 unless ($value) {
3634 warn "cowardly refusing to write zero uuid value!\n"; 3964 info "cowardly refusing to write zero uuid value!\n";
3635 return; 3965 return;
3636 } 3966 }
3637 3967
3638 my $value = uuid_str $value + $uuid_skip; 3968 my $value = uuid_str $value + $uuid_skip;
3639 $uuid_skip = 0; 3969 $uuid_skip = 0;
… …
3649 or return; 3979 or return;
3650 3980
3651 aio_rename "$uuid~", $uuid 3981 aio_rename "$uuid~", $uuid
3652 and return; 3982 and return;
3653 3983
3654 warn "uuid file written ($value).\n"; 3984 trace "uuid file written ($value).\n";
3655 3985
3656 1 3986 1
3657 3987
3658} 3988}
3659 3989
… …
3665} 3995}
3666 3996
3667sub emergency_save() { 3997sub emergency_save() {
3668 my $freeze_guard = cf::freeze_mainloop; 3998 my $freeze_guard = cf::freeze_mainloop;
3669 3999
3670 warn "emergency_perl_save: enter\n"; 4000 info "emergency_perl_save: enter\n";
4001
4002 # this is a trade-off: we want to be very quick here, so
4003 # save all maps without fsync, and later call a global sync
4004 # (which in turn might be very very slow)
4005 local $USE_FSYNC = 0;
3671 4006
3672 cf::sync_job { 4007 cf::sync_job {
3673 # this is a trade-off: we want to be very quick here, so 4008 cf::write_runtime_sync; # external watchdog should not bark
3674 # save all maps without fsync, and later call a global sync
3675 # (which in turn might be very very slow)
3676 local $USE_FSYNC = 0;
3677 4009
3678 # use a peculiar iteration method to avoid tripping on perl 4010 # use a peculiar iteration method to avoid tripping on perl
3679 # refcount bugs in for. also avoids problems with players 4011 # refcount bugs in for. also avoids problems with players
3680 # and maps saved/destroyed asynchronously. 4012 # and maps saved/destroyed asynchronously.
3681 warn "emergency_perl_save: begin player save\n"; 4013 info "emergency_perl_save: begin player save\n";
3682 for my $login (keys %cf::PLAYER) { 4014 for my $login (keys %cf::PLAYER) {
3683 my $pl = $cf::PLAYER{$login} or next; 4015 my $pl = $cf::PLAYER{$login} or next;
3684 $pl->valid or next; 4016 $pl->valid or next;
3685 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4017 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3686 $pl->save; 4018 $pl->save;
3687 } 4019 }
3688 warn "emergency_perl_save: end player save\n"; 4020 info "emergency_perl_save: end player save\n";
3689 4021
4022 cf::write_runtime_sync; # external watchdog should not bark
4023
3690 warn "emergency_perl_save: begin map save\n"; 4024 info "emergency_perl_save: begin map save\n";
3691 for my $path (keys %cf::MAP) { 4025 for my $path (keys %cf::MAP) {
3692 my $map = $cf::MAP{$path} or next; 4026 my $map = $cf::MAP{$path} or next;
3693 $map->valid or next; 4027 $map->valid or next;
3694 $map->save; 4028 $map->save;
3695 } 4029 }
3696 warn "emergency_perl_save: end map save\n"; 4030 info "emergency_perl_save: end map save\n";
3697 4031
4032 cf::write_runtime_sync; # external watchdog should not bark
4033
3698 warn "emergency_perl_save: begin database checkpoint\n"; 4034 info "emergency_perl_save: begin database checkpoint\n";
3699 BDB::db_env_txn_checkpoint $DB_ENV; 4035 BDB::db_env_txn_checkpoint $DB_ENV;
3700 warn "emergency_perl_save: end database checkpoint\n"; 4036 info "emergency_perl_save: end database checkpoint\n";
3701 4037
3702 warn "emergency_perl_save: begin write uuid\n"; 4038 info "emergency_perl_save: begin write uuid\n";
3703 write_uuid_sync 1; 4039 write_uuid_sync 1;
3704 warn "emergency_perl_save: end write uuid\n"; 4040 info "emergency_perl_save: end write uuid\n";
4041
4042 cf::write_runtime_sync; # external watchdog should not bark
4043
4044 trace "emergency_perl_save: syncing database to disk";
4045 BDB::db_env_txn_checkpoint $DB_ENV;
4046
4047 info "emergency_perl_save: starting sync\n";
4048 IO::AIO::aio_sync sub {
4049 info "emergency_perl_save: finished sync\n";
4050 };
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
4053
4054 trace "emergency_perl_save: flushing outstanding aio requests";
4055 while (IO::AIO::nreqs || BDB::nreqs) {
4056 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4057 }
4058
4059 cf::write_runtime_sync; # external watchdog should not bark
3705 }; 4060 };
3706 4061
3707 warn "emergency_perl_save: starting sync()\n";
3708 IO::AIO::aio_sync sub {
3709 warn "emergency_perl_save: finished sync()\n";
3710 };
3711
3712 warn "emergency_perl_save: leave\n"; 4062 info "emergency_perl_save: leave\n";
3713} 4063}
3714 4064
3715sub post_cleanup { 4065sub post_cleanup {
3716 my ($make_core) = @_; 4066 my ($make_core) = @_;
3717 4067
4068 IO::AIO::flush;
4069
3718 warn Carp::longmess "post_cleanup backtrace" 4070 error Carp::longmess "post_cleanup backtrace"
3719 if $make_core; 4071 if $make_core;
3720 4072
3721 my $fh = pidfile; 4073 my $fh = pidfile;
3722 unlink $PIDFILE if <$fh> == $$; 4074 unlink $PIDFILE if <$fh> == $$;
3723} 4075}
… …
3743 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4095 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3744 for my $name (keys %$leaf_symtab) { 4096 for my $name (keys %$leaf_symtab) {
3745 _gv_clear *{"$pkg$name"}; 4097 _gv_clear *{"$pkg$name"};
3746# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4098# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3747 } 4099 }
3748 warn "cleared package $pkg\n";#d#
3749} 4100}
3750 4101
3751sub do_reload_perl() { 4102sub do_reload_perl() {
3752 # can/must only be called in main 4103 # can/must only be called in main
3753 if ($Coro::current != $Coro::main) { 4104 unless (in_main) {
3754 warn "can only reload from main coroutine"; 4105 error "can only reload from main coroutine";
3755 return; 4106 return;
3756 } 4107 }
3757 4108
3758 return if $RELOAD++; 4109 return if $RELOAD++;
3759 4110
3760 my $t1 = EV::time; 4111 my $t1 = AE::time;
3761 4112
3762 while ($RELOAD) { 4113 while ($RELOAD) {
3763 warn "reloading..."; 4114 cf::get_slot 0.1, -1, "reload_perl";
4115 info "perl_reload: reloading...";
3764 4116
3765 warn "entering sync_job"; 4117 trace "perl_reload: entering sync_job";
3766 4118
3767 cf::sync_job { 4119 cf::sync_job {
3768 cf::write_runtime_sync; # external watchdog should not bark
3769 cf::emergency_save; 4120 #cf::emergency_save;
3770 cf::write_runtime_sync; # external watchdog should not bark
3771 4121
3772 warn "syncing database to disk";
3773 BDB::db_env_txn_checkpoint $DB_ENV;
3774
3775 # if anything goes wrong in here, we should simply crash as we already saved
3776
3777 warn "flushing outstanding aio requests";
3778 while (IO::AIO::nreqs || BDB::nreqs) {
3779 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3780 }
3781
3782 warn "cancelling all extension coros"; 4122 trace "perl_reload: cancelling all extension coros";
3783 $_->cancel for values %EXT_CORO; 4123 $_->cancel for values %EXT_CORO;
3784 %EXT_CORO = (); 4124 %EXT_CORO = ();
3785 4125
3786 warn "removing commands"; 4126 trace "perl_reload: removing commands";
3787 %COMMAND = (); 4127 %COMMAND = ();
3788 4128
3789 warn "removing ext/exti commands"; 4129 trace "perl_reload: removing ext/exti commands";
3790 %EXTCMD = (); 4130 %EXTCMD = ();
3791 %EXTICMD = (); 4131 %EXTICMD = ();
3792 4132
3793 warn "unloading/nuking all extensions"; 4133 trace "perl_reload: unloading/nuking all extensions";
3794 for my $pkg (@EXTS) { 4134 for my $pkg (@EXTS) {
3795 warn "... unloading $pkg"; 4135 trace "... unloading $pkg";
3796 4136
3797 if (my $cb = $pkg->can ("unload")) { 4137 if (my $cb = $pkg->can ("unload")) {
3798 eval { 4138 eval {
3799 $cb->($pkg); 4139 $cb->($pkg);
3800 1 4140 1
3801 } or warn "$pkg unloaded, but with errors: $@"; 4141 } or error "$pkg unloaded, but with errors: $@";
3802 } 4142 }
3803 4143
3804 warn "... clearing $pkg"; 4144 trace "... clearing $pkg";
3805 clear_package $pkg; 4145 clear_package $pkg;
3806 } 4146 }
3807 4147
3808 warn "unloading all perl modules loaded from $LIBDIR"; 4148 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3809 while (my ($k, $v) = each %INC) { 4149 while (my ($k, $v) = each %INC) {
3810 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4150 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3811 4151
3812 warn "... unloading $k"; 4152 trace "... unloading $k";
3813 delete $INC{$k}; 4153 delete $INC{$k};
3814 4154
3815 $k =~ s/\.pm$//; 4155 $k =~ s/\.pm$//;
3816 $k =~ s/\//::/g; 4156 $k =~ s/\//::/g;
3817 4157
… …
3820 } 4160 }
3821 4161
3822 clear_package $k; 4162 clear_package $k;
3823 } 4163 }
3824 4164
3825 warn "getting rid of safe::, as good as possible"; 4165 trace "perl_reload: getting rid of safe::, as good as possible";
3826 clear_package "safe::$_" 4166 clear_package "safe::$_"
3827 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);
3828 4168
3829 warn "unloading cf.pm \"a bit\""; 4169 trace "perl_reload: unloading cf.pm \"a bit\"";
3830 delete $INC{"cf.pm"}; 4170 delete $INC{"cf.pm"};
3831 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4171 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3832 4172
3833 # don't, removes xs symbols, too, 4173 # don't, removes xs symbols, too,
3834 # and global variables created in xs 4174 # and global variables created in xs
3835 #clear_package __PACKAGE__; 4175 #clear_package __PACKAGE__;
3836 4176
3837 warn "unload completed, starting to reload now"; 4177 info "perl_reload: unload completed, starting to reload now";
3838 4178
3839 warn "reloading cf.pm"; 4179 trace "perl_reload: reloading cf.pm";
3840 require cf; 4180 require cf;
3841 cf::_connect_to_perl_1; 4181 cf::_connect_to_perl_1;
3842 4182
3843 warn "loading config and database again"; 4183 trace "perl_reload: loading config and database again";
3844 cf::reload_config; 4184 cf::reload_config;
3845 4185
3846 warn "loading extensions"; 4186 trace "perl_reload: loading extensions";
3847 cf::load_extensions; 4187 cf::load_extensions;
3848 4188
3849 if ($REATTACH_ON_RELOAD) { 4189 if ($REATTACH_ON_RELOAD) {
3850 warn "reattaching attachments to objects/players"; 4190 trace "perl_reload: reattaching attachments to objects/players";
3851 _global_reattach; # objects, sockets 4191 _global_reattach; # objects, sockets
3852 warn "reattaching attachments to maps"; 4192 trace "perl_reload: reattaching attachments to maps";
3853 reattach $_ for values %MAP; 4193 reattach $_ for values %MAP;
3854 warn "reattaching attachments to players"; 4194 trace "perl_reload: reattaching attachments to players";
3855 reattach $_ for values %PLAYER; 4195 reattach $_ for values %PLAYER;
3856 } 4196 }
3857 4197
3858 warn "running post_init jobs"; 4198 cf::_post_init 1;
3859 (pop @POST_INIT)->(1) while @POST_INIT;
3860 4199
3861 warn "leaving sync_job"; 4200 trace "perl_reload: leaving sync_job";
3862 4201
3863 1 4202 1
3864 } or do { 4203 } or do {
3865 warn $@; 4204 error $@;
3866 cf::cleanup "error while reloading, exiting."; 4205 cf::cleanup "perl_reload: error, exiting.";
3867 }; 4206 };
3868 4207
3869 warn "reloaded";
3870 --$RELOAD; 4208 --$RELOAD;
3871 } 4209 }
3872 4210
3873 $t1 = EV::time - $t1; 4211 $t1 = AE::time - $t1;
3874 warn "reload completed in ${t1}s\n"; 4212 info "perl_reload: completed in ${t1}s\n";
3875}; 4213};
3876 4214
3877our $RELOAD_WATCHER; # used only during reload 4215our $RELOAD_WATCHER; # used only during reload
3878 4216
3879sub reload_perl() { 4217sub reload_perl() {
… …
3881 # coro crashes during coro_state_free->destroy here. 4219 # coro crashes during coro_state_free->destroy here.
3882 4220
3883 $RELOAD_WATCHER ||= cf::async { 4221 $RELOAD_WATCHER ||= cf::async {
3884 Coro::AIO::aio_wait cache_extensions; 4222 Coro::AIO::aio_wait cache_extensions;
3885 4223
3886 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4224 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3887 do_reload_perl; 4225 do_reload_perl;
3888 undef $RELOAD_WATCHER; 4226 undef $RELOAD_WATCHER;
3889 }; 4227 };
3890 }; 4228 };
3891} 4229}
… …
3900 reload_perl; 4238 reload_perl;
3901 }; 4239 };
3902 } 4240 }
3903}; 4241};
3904 4242
3905unshift @INC, $LIBDIR; 4243#############################################################################
3906 4244
3907my $bug_warning = 0; 4245my $bug_warning = 0;
3908 4246
3909our @WAIT_FOR_TICK;
3910our @WAIT_FOR_TICK_BEGIN;
3911
3912sub wait_for_tick { 4247sub wait_for_tick() {
3913 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4248 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3914 4249
3915 my $signal = new Coro::Signal; 4250 $WAIT_FOR_TICK->wait;
3916 push @WAIT_FOR_TICK, $signal;
3917 $signal->wait;
3918} 4251}
3919 4252
3920sub wait_for_tick_begin { 4253sub wait_for_tick_begin() {
3921 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4254 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3922 4255
3923 my $signal = new Coro::Signal; 4256 my $signal = new Coro::Signal;
3924 push @WAIT_FOR_TICK_BEGIN, $signal; 4257 push @WAIT_FOR_TICK_BEGIN, $signal;
3925 $signal->wait; 4258 $signal->wait;
3926} 4259}
… …
3930 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"
3931 unless ++$bug_warning > 10; 4264 unless ++$bug_warning > 10;
3932 return; 4265 return;
3933 } 4266 }
3934 4267
3935 cf::server_tick; # one server iteration 4268 cf::one_tick; # one server iteration
3936 4269
3937 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4270 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3938 4271
3939 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4272 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3940 $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.;
3941 Coro::async_pool { 4274 Coro::async_pool {
3942 $Coro::current->{desc} = "runtime saver"; 4275 $Coro::current->{desc} = "runtime saver";
3943 write_runtime_sync 4276 write_runtime_sync
3944 or warn "ERROR: unable to write runtime file: $!"; 4277 or error "ERROR: unable to write runtime file: $!";
3945 }; 4278 };
3946 } 4279 }
3947 4280
3948 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4281 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3949 $sig->send; 4282 $sig->send;
3950 } 4283 }
3951 while (my $sig = shift @WAIT_FOR_TICK) { 4284 $WAIT_FOR_TICK->broadcast;
3952 $sig->send;
3953 }
3954 4285
3955 $LOAD = ($NOW - $TICK_START) / $TICK; 4286 $LOAD = ($NOW - $TICK_START) / $TICK;
3956 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4287 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3957 4288
3958 if (0) { 4289 if (0) {
3959 if ($NEXT_TICK) { 4290 if ($NEXT_TICK) {
3960 my $jitter = $TICK_START - $NEXT_TICK; 4291 my $jitter = $TICK_START - $NEXT_TICK;
3961 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4292 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3962 warn "jitter $JITTER\n";#d# 4293 debug "jitter $JITTER\n";#d#
3963 } 4294 }
3964 } 4295 }
3965} 4296}
3966 4297
3967{ 4298{
3968 # configure BDB 4299 # configure BDB
4300 info "initialising database";
3969 4301
3970 BDB::min_parallel 16; 4302 BDB::min_parallel 16;
3971 BDB::max_poll_reqs $TICK * 0.1; 4303 BDB::max_poll_reqs $TICK * 0.1;
3972 $AnyEvent::BDB::WATCHER->priority (1); 4304 #$AnyEvent::BDB::WATCHER->priority (1);
3973 4305
3974 unless ($DB_ENV) { 4306 unless ($DB_ENV) {
3975 $DB_ENV = BDB::db_env_create; 4307 $DB_ENV = BDB::db_env_create;
3976 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4308 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3977 $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;
… …
4002 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4334 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4003 }; 4335 };
4004 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4336 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4005 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4337 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4006 }; 4338 };
4339
4340 info "database initialised";
4007} 4341}
4008 4342
4009{ 4343{
4010 # configure IO::AIO 4344 # configure IO::AIO
4011 4345
4346 info "initialising aio";
4012 IO::AIO::min_parallel 8; 4347 IO::AIO::min_parallel 8;
4013 IO::AIO::max_poll_time $TICK * 0.1; 4348 IO::AIO::max_poll_time $TICK * 0.1;
4014 undef $AnyEvent::AIO::WATCHER; 4349 undef $AnyEvent::AIO::WATCHER;
4350 info "aio initialised";
4015} 4351}
4016 4352
4017my $_log_backtrace; 4353our $_log_backtrace;
4354our $_log_backtrace_last;
4018 4355
4019sub _log_backtrace { 4356sub _log_backtrace {
4020 my ($msg, @addr) = @_; 4357 my ($msg, @addr) = @_;
4021 4358
4022 $msg =~ s/\n//; 4359 $msg =~ s/\n$//;
4023 4360
4361 if ($_log_backtrace_last eq $msg) {
4362 LOG llevInfo, "[ABT] $msg\n";
4363 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4024 # limit the # of concurrent backtraces 4364 # limit the # of concurrent backtraces
4025 if ($_log_backtrace < 2) { 4365 } elsif ($_log_backtrace < 2) {
4366 $_log_backtrace_last = $msg;
4026 ++$_log_backtrace; 4367 ++$_log_backtrace;
4027 my $perl_bt = Carp::longmess $msg; 4368 my $perl_bt = Carp::longmess $msg;
4028 async { 4369 async {
4029 $Coro::current->{desc} = "abt $msg"; 4370 $Coro::current->{desc} = "abt $msg";
4030 4371
… …
4050 LOG llevInfo, "[ABT] $_\n" for @bt; 4391 LOG llevInfo, "[ABT] $_\n" for @bt;
4051 --$_log_backtrace; 4392 --$_log_backtrace;
4052 }; 4393 };
4053 } else { 4394 } else {
4054 LOG llevInfo, "[ABT] $msg\n"; 4395 LOG llevInfo, "[ABT] $msg\n";
4055 LOG llevInfo, "[ABT] [suppressed]\n"; 4396 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4056 } 4397 }
4057} 4398}
4058 4399
4059# load additional modules 4400# load additional modules
4060require "cf/$_.pm" for @EXTRA_MODULES; 4401require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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