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.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 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
… …
1255=cut 1431=cut
1256 1432
1257############################################################################# 1433#############################################################################
1258# command handling &c 1434# command handling &c
1259 1435
1260=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1261 1437
1262Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1263$name. 1439$name.
1264 1440
1265=cut 1441=cut
… …
1271 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1272 1448
1273 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1274} 1450}
1275 1451
1276=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1277 1453
1278Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1279extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1280received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1281the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1282has logged in successfully. 1458has logged in successfully.
1283 1459
1284If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1285called. 1461called.
1286 1462
1287=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1288 1464
1289Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1290exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1291are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1292is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
… …
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);
1342 } 1515 }
1343 1516
1344 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("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
… …
1606 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1607 1809
1608 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1609 $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
1610 1812
1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612 $pl->deactivate; 1814 $pl->deactivate;
1815
1613 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;
1614 $pl->ob->check_score;
1615 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1616 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1617 1821
1618 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1619 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1620 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
… …
1674 \@logins 1878 \@logins
1675} 1879}
1676 1880
1677=item $player->maps 1881=item $player->maps
1678 1882
1883=item cf::player::maps $login
1884
1679Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1680player. May block. 1886player. May block.
1681 1887
1682=cut 1888=cut
1683 1889
… …
1704 1910
1705=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1706 1912
1707Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1708 1914
1709=item $player->ext_reply ($msgid, @msg)
1710
1711Sends an ext reply to the player.
1712
1713=cut
1714
1715sub ext_reply($$@) {
1716 my ($self, $id, @msg) = @_;
1717
1718 $self->ns->ext_reply ($id, @msg)
1719}
1720
1721=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1722 1916
1723Sends an ext event to the client. 1917Sends an ext event to the client.
1724 1918
1725=cut 1919=cut
… …
1744 1938
1745=cut 1939=cut
1746 1940
1747sub find_by_path($) { 1941sub find_by_path($) {
1748 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1749 1945
1750 my ($match, $specificity); 1946 my ($match, $specificity);
1751 1947
1752 for my $region (list) { 1948 for my $region (list) {
1753 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
… …
1782sub generate_random_map { 1978sub generate_random_map {
1783 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1784 1980
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786 1982
1787 # mit "rum" bekleckern, nicht
1788 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792 $rmp->{exit_on_final_map},
1793 $rmp->{xsize}, $rmp->{ysize},
1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799 (cf::region::find $rmp->{region}), $rmp->{custom}
1800 )
1801} 1984}
1802 1985
1803=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1804 1987
1805Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
… …
1810 1993
1811sub register { 1994sub register {
1812 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1813 my $pkg = caller; 1996 my $pkg = caller;
1814 1997
1815 no strict;
1816 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1817 1999
1818 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819} 2001}
1820 2002
1821# also paths starting with '/' 2003# also paths starting with '/'
1822$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823 2005
1824sub thawer_merge { 2006sub thawer_merge {
1825 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1826 2008
1827 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
… …
1832} 2014}
1833 2015
1834sub normalise { 2016sub normalise {
1835 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1836 2018
1837 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1838 2020
1839 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1840 2022
1841 # map plan: 2023 # map plan:
1842 # 2024 #
… …
1857 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1858 $path = "$base/$path"; 2040 $path = "$base/$path";
1859 } 2041 }
1860 2042
1861 for ($path) { 2043 for ($path) {
1862 redo if s{//}{/};
1863 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1864 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1865 } 2046 }
1866 2047
1867 $path 2048 $path
… …
1881 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1882 return $self; 2063 return $self;
1883 } 2064 }
1884 } 2065 }
1885 2066
1886 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1887 () 2068 ()
1888} 2069}
1889 2070
2071# may re-bless or do other evil things
1890sub init { 2072sub init {
1891 my ($self) = @_; 2073 my ($self) = @_;
1892 2074
1893 $self 2075 $self
1894} 2076}
… …
1959 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1960 2142
1961 1 2143 1
1962} 2144}
1963 2145
2146# used to laod the header of an original map
1964sub load_header_orig { 2147sub load_header_orig {
1965 my ($self) = @_; 2148 my ($self) = @_;
1966 2149
1967 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1968} 2151}
1969 2152
2153# used to laod the header of an instantiated map
1970sub load_header_temp { 2154sub load_header_temp {
1971 my ($self) = @_; 2155 my ($self) = @_;
1972 2156
1973 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1974} 2158}
1975 2159
2160# called after loading the header from an instantiated map
1976sub prepare_temp { 2161sub prepare_temp {
1977 my ($self) = @_; 2162 my ($self) = @_;
1978 2163
1979 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1980 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1981 # safety 2166 # safety
1982 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1983 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1984} 2169}
1985 2170
2171# called after loading the header from an original map
1986sub prepare_orig { 2172sub prepare_orig {
1987 my ($self) = @_; 2173 my ($self) = @_;
1988 2174
1989 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
1990 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
… …
2014 2200
2015sub find; 2201sub find;
2016sub find { 2202sub find {
2017 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
2018 2204
2205 cf::cede_to_tick;
2206
2019 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
2020 2208
2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022 my $guard2 = cf::lock_acquire "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
2023 2211
2024 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
… …
2055 2243
2056 { 2244 {
2057 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2058 2246
2059 return unless $self->valid; 2247 return unless $self->valid;
2060 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2061
2062 $self->in_memory (cf::MAP_LOADING);
2063 2249
2064 $self->alloc; 2250 $self->alloc;
2065 2251
2066 $self->pre_load; 2252 $self->pre_load;
2067 cf::cede_to_tick; 2253 cf::cede_to_tick;
2068 2254
2255 if (exists $self->{load_path}) {
2069 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2070 $f->skip_block; 2257 $f->skip_block;
2071 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2072 or return; 2259 or return;
2073 2260
2074 $self->post_load_original 2261 $self->post_load_original
2075 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2076 2263
2077 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2078 utf8::encode $uniq; 2265 utf8::encode $uniq;
2079 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2080 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2081 $self->clear_unique_items; 2268 $self->clear_unique_items;
2082 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2083 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2084 } 2272 }
2085 } 2273 }
2086 }
2087 2274
2088 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2089 2282
2090 cf::cede_to_tick; 2283 cf::cede_to_tick;
2091 # now do the right thing for maps 2284 # now do the right thing for maps
2092 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2093 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
… …
2097 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2098 $self->decay_objects; 2291 $self->decay_objects;
2099 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2100 $self->update_buttons; 2293 $self->update_buttons;
2101 cf::cede_to_tick; 2294 cf::cede_to_tick;
2102 $self->activate; 2295 #$self->activate; # no longer activate maps automatically
2103 } 2296 }
2104 2297
2105 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2106 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2107
2108 $self->in_memory (cf::MAP_ACTIVE);
2109 } 2300 }
2110 2301
2111 $self->post_load; 2302 $self->post_load;
2303
2304 1
2112} 2305}
2113 2306
2114# customize the map for a given player, i.e. 2307# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player 2308# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath 2309# maps to change the path to ~playername/mappath
… …
2124# if $self->per_party; 2317# if $self->per_party;
2125 2318
2126 $self 2319 $self
2127} 2320}
2128 2321
2129# find and load all maps in the 3x3 area around a map
2130sub load_neighbours {
2131 my ($map) = @_;
2132
2133 my @neigh; # diagonal neighbours
2134
2135 for (0 .. 3) {
2136 my $neigh = $map->tile_path ($_)
2137 or next;
2138 $neigh = find $neigh, $map
2139 or next;
2140 $neigh->load;
2141
2142 push @neigh,
2143 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2144 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2145 }
2146
2147 for (grep defined $_->[0], @neigh) {
2148 my ($path, $origin) = @$_;
2149 my $neigh = find $path, $origin
2150 or next;
2151 $neigh->load;
2152 }
2153}
2154
2155sub find_sync { 2322sub find_sync {
2156 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2157 2324
2158 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2159} 2330}
2160 2331
2161sub do_load_sync { 2332sub do_load_sync {
2162 my ($map) = @_; 2333 my ($map) = @_;
2163 2334
2335 # it's a bug to call this from the main context
2164 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2166 2338
2167 cf::sync_job { $map->load }; 2339 $map->load;
2168} 2340}
2169 2341
2170our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2171our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2172 2344
2173sub find_async { 2345sub find_async {
2174 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2175 2347
2176 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2177 2349
2178 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2180 } 2352 }
2181 2353
2182 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2183 2355
2184 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
… …
2198 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2199 2371
2200 () 2372 ()
2201} 2373}
2202 2374
2375# common code, used by both ->save and ->swapout
2203sub save { 2376sub _save {
2204 my ($self) = @_; 2377 my ($self) = @_;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2378
2208 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2209 2380
2210 return unless $self->dirty; 2381 return unless $self->dirty;
2211 2382
… …
2231 } else { 2402 } else {
2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2403 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233 } 2404 }
2234} 2405}
2235 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2236sub swap_out { 2415sub swap_out {
2237 my ($self) = @_; 2416 my ($self) = @_;
2238 2417
2239 # save first because save cedes
2240 $self->save;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2244 return if $self->players; 2422 return if $self->players;
2245 return if $self->in_memory != cf::MAP_ACTIVE; 2423
2424 # first deactivate the map and "unlink" it from the core
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
2427 $self->state (cf::MAP_SWAPPED);
2428
2429 # then atomically save
2430 $self->_save;
2431
2432 # then free the map
2433 $self->clear;
2434}
2435
2436sub reset_at {
2437 my ($self) = @_;
2438
2439 # TODO: safety, remove and allow resettable per-player maps
2246 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2247 2441
2442 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2443 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2444
2445 $time + $to
2446}
2447
2448sub should_reset {
2449 my ($self) = @_;
2450
2451 $self->reset_at <= $cf::RUNTIME
2452}
2453
2454sub reset {
2455 my ($self) = @_;
2456
2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2458
2459 return if $self->players;
2460
2461 cf::trace "resetting map ", $self->path, "\n";
2462
2248 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2464
2465 # need to save uniques path
2466 unless ($self->{deny_save}) {
2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2468
2469 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2470 if $uniq;
2471 }
2472
2473 delete $cf::MAP{$self->path};
2249 2474
2250 $self->deactivate; 2475 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2252 $self->clear; 2477 $self->clear;
2253}
2254
2255sub reset_at {
2256 my ($self) = @_;
2257
2258 # TODO: safety, remove and allow resettable per-player maps
2259 return 1e99 if $self->{deny_reset};
2260
2261 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264 $time + $to
2265}
2266
2267sub should_reset {
2268 my ($self) = @_;
2269
2270 $self->reset_at <= $cf::RUNTIME
2271}
2272
2273sub reset {
2274 my ($self) = @_;
2275
2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278 return if $self->players;
2279
2280 warn "resetting map ", $self->path, "\n";
2281
2282 $self->in_memory (cf::MAP_SWAPPED);
2283
2284 # need to save uniques path
2285 unless ($self->{deny_save}) {
2286 my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2289 if $uniq;
2290 }
2291
2292 delete $cf::MAP{$self->path};
2293
2294 $self->deactivate;
2295 $_->clear_links_to ($self) for values %cf::MAP;
2296 $self->clear;
2297 2478
2298 $self->unlink_save; 2479 $self->unlink_save;
2299 $self->destroy; 2480 $self->destroy;
2300} 2481}
2301 2482
… …
2309 2490
2310 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2311 2492
2312 $self->unlink_save; 2493 $self->unlink_save;
2313 2494
2314 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2315 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2316 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2317 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2318 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319 2500
… …
2549 2730
2550Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2551 2732
2552The player should be reasonably safe there for short amounts of time (e.g. 2733The player should be reasonably safe there for short amounts of time (e.g.
2553for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link 2735though, as the player cannot control the character while it is on the link
2555map. 2736map.
2556 2737
2557Will never block. 2738Will never block.
2558 2739
2559=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
… …
2580sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2581 my ($self) = @_; 2762 my ($self) = @_;
2582 2763
2583 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2584 2765
2766 ++$self->{_link_recursion};
2767
2585 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2586 2769
2587 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2589 2772
2590 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2591} 2774}
2592 2775
2593sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2594 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2595 2778
… …
2615 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2616 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2617 if $x <= 0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2618 2801
2619 $map->load; 2802 $map->load;
2620 $map->load_neighbours;
2621 2803
2622 return unless $self->contr->active; 2804 return unless $self->contr->active;
2623 2805
2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2626 2808 # entering was successful
2809 delete $self->{_link_recursion};
2627 # only activate afterwards, to support waiting in hooks 2810 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive; 2811 $self->activate_recursive;
2629} 2812 }
2630 2813
2814}
2815
2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632 2817
2633Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2634her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2635that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2636the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
… …
2643 2828
2644our $GOTOGEN; 2829our $GOTOGEN;
2645 2830
2646sub cf::object::player::goto { 2831sub cf::object::player::goto {
2647 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2648 2839
2649 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2650 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651 2842
2652 $self->enter_link; 2843 $self->enter_link;
… …
2672 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2673 } 2864 }
2674 } 2865 }
2675 2866
2676 my $map = eval { 2867 my $map = eval {
2677 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678 2869
2679 if ($map) { 2870 if ($map) {
2680 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2681 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2682 } else { 2873 } else {
2683 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684 } 2875 }
2685 2876
2686 $map 2877 $map
… …
2694 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2695 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2696 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2697 } 2888 }
2698 2889
2699 $done->() if $done; 2890 $done->($self) if $done;
2700 })->prio (1); 2891 })->prio (1);
2701} 2892}
2702 2893
2703=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2704 2895
… …
2772 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2773 2964
2774 unless (eval { 2965 unless (eval {
2775 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2776 2967
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2786 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2788 2994
2789 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2790 2996
2791 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
… …
2797 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2798 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2799 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2800 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2801 3007
2802 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2803 $self->leave_link; 3009 $self->leave_link;
2804 } 3010 }
2805 })->prio (1); 3011 })->prio (1);
2806} 3012}
2807 3013
… …
3017=cut 3223=cut
3018 3224
3019sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
3020 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
3021 3227
3022 if ($self->extcmd == 2) {
3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3024 } elsif ($self->extcmd == 1) { # TODO: remove
3025 push @msg, msgtype => "event_$type";
3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3027 }
3028}
3029
3030=item $client->ext_reply ($msgid, @msg)
3031
3032Sends an ext reply to the client.
3033
3034=cut
3035
3036sub cf::client::ext_reply($$@) {
3037 my ($self, $id, @msg) = @_;
3038
3039 if ($self->extcmd == 2) {
3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3041 } elsif ($self->extcmd == 1) {
3042 #TODO: version 1, remove
3043 unshift @msg, msgtype => "reply", msgid => $id;
3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045 }
3046} 3229}
3047 3230
3048=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
3049 3232
3050Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
… …
3105 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
3106 3289
3107 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108 3291
3109 if (ref $msg) { 3292 if (ref $msg) {
3110 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111 "ARRAY" eq ref $msg
3112 ? @$msg
3113 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114 3294
3115 my @reply; 3295 my @reply;
3116 3296
3117 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3118 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3119 } 3299 }
3120 3300
3121 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3122 if $reply; 3302 if $reply;
3123 3303
3124 } else { 3304 } else {
3125 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126 } 3306 }
3127 3307
3128 cf::override; 3308 cf::override;
3129 }, 3309 },
3130); 3310);
… …
3211 decrease split destroy change_exp value msg lore send_msg)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3212 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3213 ["cf::player" => qw(peaceful send_msg)], 3393 ["cf::player" => qw(peaceful send_msg)],
3214 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3215) { 3395) {
3216 no strict 'refs';
3217 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219 for @funs; 3398 for @funs;
3220} 3399}
3221 3400
… …
3260 local @cf::_safe_eval_args = values %vars; 3439 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval; 3440 @res = wantarray ? eval eval : scalar eval $eval;
3262 } 3441 }
3263 3442
3264 if ($@) { 3443 if ($@) {
3265 warn "$@"; 3444 warn "$@",
3266 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3267 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3268 } 3447 }
3269 3448
3270 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3271} 3450}
3272 3451
… …
3297=cut 3476=cut
3298 3477
3299############################################################################# 3478#############################################################################
3300# the server's init and main functions 3479# the server's init and main functions
3301 3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3504
3302sub load_facedata($) { 3505sub load_facedata($) {
3303 my ($path) = @_; 3506 my ($path) = @_;
3304 3507
3305 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3306 # for this (global event?) 3509 # for this (global event?)
3307 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3308 3511
3309 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310 3513
3311 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3312 3515
3313 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3314 0 < aio_load $path, $facedata
3315 or die "$path: $!";
3316
3317 $facedata = Coro::Storable::thaw $facedata;
3318 3517
3319 $facedata->{version} == 2 3518 $facedata->{version} == 2
3320 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3321 3520
3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3324 $facedata->{resource}{"res/exp_table"} = {
3325 type => FT_RSRC,
3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3328 };
3329 cf::cede_to_tick; 3521 cf::cede_to_tick;
3330 3522
3331 { 3523 {
3332 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3333 3525
3334 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3335 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336 3529
3337 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3338 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3341 3536
3342 cf::cede_to_tick; 3537 cf::cede_to_tick;
3343 } 3538 }
3344 3539
3345 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
… …
3350 3545
3351 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3352 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354 } else { 3549 } else {
3355 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3356 } 3551 }
3357 3552
3358 cf::cede_to_tick; 3553 cf::cede_to_tick;
3359 } 3554 }
3360 } 3555 }
… …
3372 3567
3373 { 3568 {
3374 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3375 3570
3376 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3378 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379 3575
3576 cf::face::set_type $idx, $type;
3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; 3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381 cf::face::set_type $idx, $info->{type}; 3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3382 } else { 3580 } else {
3383 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3384 } 3582 }
3385 3583
3386 cf::cede_to_tick; 3584 cf::cede_to_tick;
3387 } 3585 }
3388 } 3586 }
3389 3587
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391 3589
3392 1 3590 1
3393} 3591}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3414 3592
3415register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3416 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3417 3595
3418 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
… …
3426 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3428 cf::arch::commit_load; 3606 cf::arch::commit_load;
3429 3607
3430 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3431} 3622}
3432 3623
3433sub reload_regions { 3624sub reload_regions {
3434 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3435 # for this (global event?) 3626 # for this (global event?)
… …
3450} 3641}
3451 3642
3452sub reload_archetypes { 3643sub reload_archetypes {
3453 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3454 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3455} 3655}
3456 3656
3457sub reload_treasures { 3657sub reload_treasures {
3458 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3459 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3460} 3660}
3461 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3462sub reload_resources { 3744sub reload_resources {
3463 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3464 3746
3747 reload_materials;
3465 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3466 reload_archetypes; 3751 reload_archetypes;
3467 reload_regions; 3752 reload_regions;
3468 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3469 3755
3470 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3471} 3757}
3472 3758
3473sub reload_config { 3759sub reload_config {
3474 warn "reloading config file...\n"; 3760 trace "reloading config file...\n";
3475 3761
3476 open my $fh, "<:utf8", "$CONFDIR/config" 3762 my $config = load_file "$CONFDIR/config";
3477 or return; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3478 3765
3479 local $/;
3480 *CFG = YAML::XS::Load scalar <$fh>;
3481
3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483 3767
3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486 3770
3487 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
… …
3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3773 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490 and die "WARNING: m(un)lockall failed: $!\n"; 3774 and die "WARNING: m(un)lockall failed: $!\n";
3491 }; 3775 };
3492 warn $@ if $@; 3776 warn $@ if $@;
3493 } 3777 }
3494
3495 warn "finished reloading resource files\n";
3496} 3778}
3497 3779
3498sub pidfile() { 3780sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3781 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!"; 3782 or die "$PIDFILE: $!";
… …
3513 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3514 print $fh $$; 3796 print $fh $$;
3515} 3797}
3516 3798
3517sub main_loop { 3799sub main_loop {
3518 warn "EV::loop starting\n"; 3800 trace "EV::loop starting\n";
3519 if (1) { 3801 if (1) {
3520 EV::loop; 3802 EV::loop;
3521 } 3803 }
3522 warn "EV::loop returned\n"; 3804 trace "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP; 3805 goto &main_loop unless $REALLY_UNLOOP;
3524} 3806}
3525 3807
3526sub main { 3808sub main {
3527 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3528 3810
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533 3815
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540 3817
3541 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3542 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3544 (async { 3821 (async {
3545 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3546 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3547 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3548 }; 3825 };
3549 3826
3550 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3551 3828
3552 cf::sync_job { 3829 cf::sync_job {
3830 cf::incloader::init ();
3831
3832 db_init;
3833
3834 cf::init_anim;
3835 cf::init_attackmess;
3836 cf::init_dynamic;
3837
3553 cf::load_settings; 3838 cf::load_settings;
3554 cf::load_materials;
3555 3839
3556 reload_resources; 3840 reload_resources;
3557 reload_config; 3841 reload_config;
3558 db_init;
3559 3842
3560 cf::init_uuid; 3843 cf::init_uuid;
3561 cf::init_signals; 3844 cf::init_signals;
3562 cf::init_skills; 3845 cf::init_skills;
3563 3846
… …
3571 3854
3572 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX (); 3856 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575 3858
3576 (pop @POST_INIT)->(0) while @POST_INIT; 3859 cf::_post_init 0;
3577 }; 3860 };
3578 3861
3862 cf::object::thawer::errors_are_fatal 0;
3863 info "parse errors in files are no longer fatal from this point on.\n";
3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3579 main_loop; 3869 goto &main_loop;
3580} 3870}
3581 3871
3582############################################################################# 3872#############################################################################
3583# initialisation and cleanup 3873# initialisation and cleanup
3584 3874
3585# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3586BEGIN { 3876BEGIN {
3587 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3588 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3589 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3590 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3591 }; 3881 };
3592 } 3882 }
3593} 3883}
3594 3884
3595sub write_runtime_sync { 3885sub write_runtime_sync {
3596 my $t0 = EV::time; 3886 my $t0 = AE::time;
3597 3887
3598 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3599 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3600 3890
3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
… …
3623 or return; 3913 or return;
3624 3914
3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626 and return; 3916 and return;
3627 3917
3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629 3919
3630 1 3920 1
3631} 3921}
3632 3922
3633our $uuid_lock; 3923our $uuid_lock;
… …
3645 or return; 3935 or return;
3646 3936
3647 my $value = uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3648 3938
3649 unless ($value) { 3939 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n"; 3940 info "cowardly refusing to write zero uuid value!\n";
3651 return; 3941 return;
3652 } 3942 }
3653 3943
3654 my $value = uuid_str $value + $uuid_skip; 3944 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0; 3945 $uuid_skip = 0;
… …
3665 or return; 3955 or return;
3666 3956
3667 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3668 and return; 3958 and return;
3669 3959
3670 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3671 3961
3672 1 3962 1
3673 3963
3674} 3964}
3675 3965
… …
3681} 3971}
3682 3972
3683sub emergency_save() { 3973sub emergency_save() {
3684 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3685 3975
3686 warn "emergency_perl_save: enter\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3687 3982
3688 cf::sync_job { 3983 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so 3984 cf::write_runtime_sync; # external watchdog should not bark
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693 3985
3694 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3695 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3696 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3697 warn "emergency_perl_save: begin player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3698 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3699 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3700 $pl->valid or next; 3992 $pl->valid or next;
3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702 $pl->save; 3994 $pl->save;
3703 } 3995 }
3704 warn "emergency_perl_save: end player save\n"; 3996 info "emergency_perl_save: end player save\n";
3705 3997
3998 cf::write_runtime_sync; # external watchdog should not bark
3999
3706 warn "emergency_perl_save: begin map save\n"; 4000 info "emergency_perl_save: begin map save\n";
3707 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3708 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3709 $map->valid or next; 4003 $map->valid or next;
3710 $map->save; 4004 $map->save;
3711 } 4005 }
3712 warn "emergency_perl_save: end map save\n"; 4006 info "emergency_perl_save: end map save\n";
3713 4007
4008 cf::write_runtime_sync; # external watchdog should not bark
4009
3714 warn "emergency_perl_save: begin database checkpoint\n"; 4010 info "emergency_perl_save: begin database checkpoint\n";
3715 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3716 warn "emergency_perl_save: end database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3717 4013
3718 warn "emergency_perl_save: begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1; 4015 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3721 }; 4036 };
3722 4037
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3728 warn "emergency_perl_save: leave\n"; 4038 info "emergency_perl_save: leave\n";
3729} 4039}
3730 4040
3731sub post_cleanup { 4041sub post_cleanup {
3732 my ($make_core) = @_; 4042 my ($make_core) = @_;
3733 4043
4044 IO::AIO::flush;
4045
3734 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3735 if $make_core; 4047 if $make_core;
3736 4048
3737 my $fh = pidfile; 4049 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3739} 4051}
… …
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) { 4072 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"}; 4073 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 } 4075 }
3764 warn "cleared package $pkg\n";#d#
3765} 4076}
3766 4077
3767sub do_reload_perl() { 4078sub do_reload_perl() {
3768 # can/must only be called in main 4079 # can/must only be called in main
3769 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3770 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3771 return; 4082 return;
3772 } 4083 }
3773 4084
3774 return if $RELOAD++; 4085 return if $RELOAD++;
3775 4086
3776 my $t1 = EV::time; 4087 my $t1 = AE::time;
3777 4088
3778 while ($RELOAD) { 4089 while ($RELOAD) {
3779 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3780 4092
3781 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3782 4094
3783 cf::sync_job { 4095 cf::sync_job {
3784 cf::write_runtime_sync; # external watchdog should not bark
3785 cf::emergency_save; 4096 #cf::emergency_save;
3786 cf::write_runtime_sync; # external watchdog should not bark
3787 4097
3788 warn "syncing database to disk";
3789 BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791 # if anything goes wrong in here, we should simply crash as we already saved
3792
3793 warn "flushing outstanding aio requests";
3794 while (IO::AIO::nreqs || BDB::nreqs) {
3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796 }
3797
3798 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3799 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3800 %EXT_CORO = (); 4100 %EXT_CORO = ();
3801 4101
3802 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3803 %COMMAND = (); 4103 %COMMAND = ();
3804 4104
3805 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3806 %EXTCMD = (); 4106 %EXTCMD = ();
3807 %EXTICMD = (); 4107 %EXTICMD = ();
3808 4108
3809 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3810 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3811 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3812 4112
3813 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3814 eval { 4114 eval {
3815 $cb->($pkg); 4115 $cb->($pkg);
3816 1 4116 1
3817 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3818 } 4118 }
3819 4119
3820 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3821 clear_package $pkg; 4121 clear_package $pkg;
3822 } 4122 }
3823 4123
3824 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827 4127
3828 warn "... unloading $k"; 4128 trace "... unloading $k";
3829 delete $INC{$k}; 4129 delete $INC{$k};
3830 4130
3831 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3833 4133
… …
3836 } 4136 }
3837 4137
3838 clear_package $k; 4138 clear_package $k;
3839 } 4139 }
3840 4140
3841 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3842 clear_package "safe::$_" 4142 clear_package "safe::$_"
3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844 4144
3845 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3846 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848 4148
3849 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3850 # and global variables created in xs 4150 # and global variables created in xs
3851 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3852 4152
3853 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3854 4154
3855 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3856 require cf; 4156 require cf;
3857 cf::_connect_to_perl_1; 4157 cf::_connect_to_perl_1;
3858 4158
3859 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3860 cf::reload_config; 4160 cf::reload_config;
3861 4161
3862 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3863 cf::load_extensions; 4163 cf::load_extensions;
3864 4164
3865 if ($REATTACH_ON_RELOAD) { 4165 if ($REATTACH_ON_RELOAD) {
3866 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3867 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3868 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3869 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3870 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3871 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
3872 } 4172 }
3873 4173
3874 warn "running post_init jobs"; 4174 cf::_post_init 1;
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876 4175
3877 warn "leaving sync_job"; 4176 trace "perl_reload: leaving sync_job";
3878 4177
3879 1 4178 1
3880 } or do { 4179 } or do {
3881 warn $@; 4180 error $@;
3882 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3883 }; 4182 };
3884 4183
3885 warn "reloaded";
3886 --$RELOAD; 4184 --$RELOAD;
3887 } 4185 }
3888 4186
3889 $t1 = EV::time - $t1; 4187 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n"; 4188 info "perl_reload: completed in ${t1}s\n";
3891}; 4189};
3892 4190
3893our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3894 4192
3895sub reload_perl() { 4193sub reload_perl() {
… …
3897 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3898 4196
3899 $RELOAD_WATCHER ||= cf::async { 4197 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions; 4198 Coro::AIO::aio_wait cache_extensions;
3901 4199
3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl; 4201 do_reload_perl;
3904 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
3905 }; 4203 };
3906 }; 4204 };
3907} 4205}
… …
3916 reload_perl; 4214 reload_perl;
3917 }; 4215 };
3918 } 4216 }
3919}; 4217};
3920 4218
3921unshift @INC, $LIBDIR; 4219#############################################################################
3922 4220
3923my $bug_warning = 0; 4221my $bug_warning = 0;
3924 4222
3925our @WAIT_FOR_TICK;
3926our @WAIT_FOR_TICK_BEGIN;
3927
3928sub wait_for_tick { 4223sub wait_for_tick() {
3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930 4225
3931 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3932 push @WAIT_FOR_TICK, $signal;
3933 $signal->wait;
3934} 4227}
3935 4228
3936sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938 4231
3939 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3940 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3941 $signal->wait; 4234 $signal->wait;
3942} 4235}
… …
3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3947 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3948 return; 4241 return;
3949 } 4242 }
3950 4243
3951 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
3952 4245
3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d# 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954 4247
3955 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957 Coro::async_pool { 4250 Coro::async_pool {
3958 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3959 write_runtime_sync 4252 write_runtime_sync
3960 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3961 }; 4254 };
3962 } 4255 }
3963 4256
3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965 $sig->send; 4258 $sig->send;
3966 } 4259 }
3967 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3968 $sig->send;
3969 }
3970 4261
3971 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973 4264
3974 if (0) { 4265 if (0) {
3975 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3976 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3979 } 4270 }
3980 } 4271 }
3981} 4272}
3982 4273
3983{ 4274{
3984 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3985 4277
3986 BDB::min_parallel 16; 4278 BDB::min_parallel 16;
3987 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3988 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3989 4281
3990 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3991 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
… …
4018 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4019 }; 4311 };
4020 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4021 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4022 }; 4314 };
4315
4316 info "database initialised";
4023} 4317}
4024 4318
4025{ 4319{
4026 # configure IO::AIO 4320 # configure IO::AIO
4027 4321
4322 info "initialising aio";
4028 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
4029 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
4031} 4327}
4032 4328
4033my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
4034 4331
4035sub _log_backtrace { 4332sub _log_backtrace {
4036 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
4037 4334
4038 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
4039 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
4041 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
4042 ++$_log_backtrace; 4343 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
4044 async { 4345 async {
4045 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
4046 4347
… …
4066 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
4067 --$_log_backtrace; 4368 --$_log_backtrace;
4068 }; 4369 };
4069 } else { 4370 } else {
4070 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
4071 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072 } 4373 }
4073} 4374}
4074 4375
4075# load additional modules 4376# load additional modules
4076require "cf/$_.pm" for @EXTRA_MODULES; 4377require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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