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.472 by root, Sat Jun 6 21:43:13 2009 UTC vs.
Revision 1.566 by root, Sun May 1 16:58:16 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your 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 GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# 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>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict qw(vars subs);
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard (); 37use Guard ();
38use Coro (); 38use Coro ();
39use Coro::State; 39use Coro::State;
40use Coro::Handle; 40use Coro::Handle;
51use Coro::Util (); 51use Coro::Util ();
52 52
53use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
54use BDB (); 54use BDB ();
55use Data::Dumper; 55use Data::Dumper;
56use Digest::MD5;
57use Fcntl; 56use Fcntl;
58use YAML (); 57use YAML::XS ();
59use IO::AIO (); 58use IO::AIO ();
60use Time::HiRes; 59use Time::HiRes;
61use Compress::LZF; 60use Compress::LZF;
62use Digest::MD5 (); 61use Digest::MD5 ();
63 62
72 71
73# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
76 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
78 82
79our %COMMAND = (); 83our %COMMAND = ();
80our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
81 85
82our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
85our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
86our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
87 91
88our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
89our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
90 96
91our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default on 124our $USE_FSYNC = 1; # use fsync to write maps - default on
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
117our @EXTRA_MODULES = qw(pod mapscript); 131our @EXTRA_MODULES = qw(pod match mapscript incloader);
118 132
119our %CFG; 133our %CFG;
120 134
121our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
122our $RUNTIME; 136our $RUNTIME;
134our $JITTER; # average jitter 148our $JITTER; # average jitter
135our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
136 150
137our @POST_INIT; 151our @POST_INIT;
138 152
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
140 155
141binmode STDOUT; 156binmode STDOUT;
142binmode STDERR; 157binmode STDERR;
143 158
144# read virtual server time, if available 159# read virtual server time, if available
155 170
156our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
157 172
158sub cf::map::normalise; 173sub cf::map::normalise;
159 174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
189
160############################################################################# 190#############################################################################
161 191
162=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
163 193
164=over 4 194=over 4
205from wherever your confdir points to. 235from wherever your confdir points to.
206 236
207=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
208 238
209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
210returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
211per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
212 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
213=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
214 249
215This array contains the results of the last C<invoke ()> call. When 250This array contains the results of the last C<invoke ()> call. When
216C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
217that call. 252that call.
218 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
219=back 260=back
220 261
221=cut 262=cut
222 263
223BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
224 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
225 my $msg = join "", @_; 271 my $msg = join "", @_;
226 272
227 $msg .= "\n" 273 $msg .= "\n"
228 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
229 275
230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
231 277
232 LOG llevError, $msg; 278 LOG llevWarn, $msg;
233 }; 279};
234}
235 280
236$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
238 283
239 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d# 288 return;#d#
242 }#d# 289 }#d#
243 290
244 # kill coroutine otherwise 291 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate 292 Coro::terminate
247}; 293};
248
249$SIG{__DIE__} = sub { }; #d#?
250 294
251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
268)) { 312)) {
269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
270} 314}
271 315
272$EV::DIED = sub { 316$EV::DIED = sub {
273 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
274}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
275 324
276############################################################################# 325#############################################################################
277 326
278=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
279 328
300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
301 $d 350 $d
302 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
303} 352}
304 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
305=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
306 369
307Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
308 371
309=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
316 379
317sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
318sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
319 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
320=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
321 415
322Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
324 418
325The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
326is a reload or not. 420is a reload or not.
327 421
328=cut 422=cut
329 423
330sub post_init(&) { 424sub post_init(&) {
331 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
332} 443}
333 444
334=item cf::lock_wait $string 445=item cf::lock_wait $string
335 446
336Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
375} 486}
376 487
377=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
378 489
379Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer. 491get spread over time.
381 492
382=cut 493=cut
383 494
384sub periodic($$) { 495sub periodic($$) {
385 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
389 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
390} 501}
391 502
392=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
393 504
394Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
395This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
396of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
397 512
398The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
399used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
400 515
401Useful for short background jobs. 516Useful for short background jobs.
402 517
403=cut 518=cut
404 519
405our @SLOT_QUEUE; 520our @SLOT_QUEUE;
406our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
407 523
408$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
409$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
411 527
412 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
413 530
414 while () { 531 while () {
415 next_job: 532 next_job:
533
416 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
417 if ($avail > 0.01) { 535
418 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
419 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
420 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
421 $job->[2]->send; 540 $job->[2]->send;
422 Coro::cede; 541 Coro::cede;
423 goto next_job; 542 goto next_job;
424 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
425 } 545 }
426 } 546 }
427 547
428 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
429 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
430 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
431 $signal->wait; 551 $signal->wait;
432 } else { 552 } else {
553 $busy = 0;
433 Coro::schedule; 554 Coro::schedule;
434 } 555 }
435 } 556 }
436}; 557};
437 558
438sub get_slot($;$$) { 559sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
440 561
441 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
442 563
443 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
444 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
445 567
446 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
447 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
448 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
474=cut 596=cut
475 597
476sub sync_job(&) { 598sub sync_job(&) {
477 my ($job) = @_; 599 my ($job) = @_;
478 600
479 if ($Coro::current == $Coro::main) { 601 if (in_main) {
480 my $time = EV::time; 602 my $time = AE::time;
481 603
482 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
483 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
484 606
485 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
486 608
487 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
488 610
489 my $busy = 1; 611 my $busy = 1;
490 my @res; 612 my @res;
491 613
492 (async { 614 (async {
493 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
494 @res = eval { $job->() }; 616 @res = eval { $job->() };
495 warn $@ if $@; 617 error $@ if $@;
496 undef $busy; 618 undef $busy;
497 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
498 620
499 while ($busy) { 621 while ($busy) {
500 if (Coro::nready) { 622 if (Coro::nready) {
502 } else { 624 } else {
503 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
504 } 626 }
505 } 627 }
506 628
507 my $time = EV::time - $time; 629 my $time = AE::time - $time;
508 630
509 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
510 632
511 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
512 } else { 634 } else {
534 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
535 657
536 $coro 658 $coro
537} 659}
538 660
539=item fork_call { }, $args 661=item fork_call { }, @args
540 662
541Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
542process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
543Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
544never block itself or use any form of event handling. 666never block itself or use any form of event handling.
545 667
546=cut 668=cut
547 669
670sub post_fork {
671 reset_signals;
672}
673
548sub fork_call(&@) { 674sub fork_call(&@) {
549 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
550 676
551 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
552 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
553 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
554 680
555 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
556 reset_signals; 682 cf::post_fork;
557 &$cb 683 &$cb
558 }, @args; 684 } @args;
559 685
560 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
561} 698}
562 699
563=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
564 701
565=cut 702=cut
602within each server. 739within each server.
603 740
604=cut 741=cut
605 742
606sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
607 my ($name) = @_; 747 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
609 749
610 eval { 750 eval {
611 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
621} 761}
622 762
623our $DB; 763our $DB;
624 764
625sub db_init { 765sub db_init {
626 cf::sync_job {
627 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
628 };
629} 767}
630 768
631sub db_get($$) { 769sub db_get($$) {
632 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
633 771
634 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
635 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
636 776
637 $! ? () 777 $! ? ()
638 : $data 778 : $data
639 }
640} 779}
641 780
642sub db_put($$$) { 781sub db_put($$$) {
643 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
644 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
672 811
673 my @data; 812 my @data;
674 my $md5; 813 my $md5;
675 814
676 for (0 .. $#$src) { 815 for (0 .. $#$src) {
677 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
678 or Carp::croak "$src->[$_]: $!";
679 } 817 }
680 818
681 # if processing is expensive, check 819 # if processing is expensive, check
682 # checksum first 820 # checksum first
683 if (1) { 821 if (1) {
700 838
701 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
702 my $data = $process->(\@data); 840 my $data = $process->(\@data);
703 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
704 842
705 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
706 844
707 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
708 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
709 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
710 848
720 858
721=cut 859=cut
722 860
723sub datalog($@) { 861sub datalog($@) {
724 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
725 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
726} 864}
727 865
728=back 866=back
729 867
730=cut 868=cut
925 1063
926 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
927 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
928 1066
929 } elsif (ref $type) { 1067 } elsif (ref $type) {
930 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
931 1069
932 } else { 1070 } else {
933 shift @arg; 1071 shift @arg;
934 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
935 } 1073 }
936 } 1074 }
937} 1075}
938 1076
939sub _object_attach { 1077sub _object_attach {
949 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
950 } 1088 }
951 1089
952 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
953 } else { 1091 } else {
954 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
955 } 1093 }
956 1094
957 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
958} 1096}
959 1097
1018 1156
1019 for (@$callbacks) { 1157 for (@$callbacks) {
1020 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1021 1159
1022 if ($@) { 1160 if ($@) {
1023 warn "$@";
1024 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1025 override; 1162 override;
1026 } 1163 }
1027 1164
1028 return 1 if $override; 1165 return 1 if $override;
1029 } 1166 }
1108 for (@$attach) { 1245 for (@$attach) {
1109 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1110 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1111 } 1248 }
1112 } else { 1249 } else {
1113 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1114 } 1251 }
1115 } 1252 }
1116} 1253}
1117 1254
1118cf::attachable->attach ( 1255cf::attachable->attach (
1145 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1146 1283
1147 sync_job { 1284 sync_job {
1148 if (length $$rdata) { 1285 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1150 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1151 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1152 1290
1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
1157 aio_close $fh; 1298 aio_close $fh;
1158 1299
1159 if (@$objs) { 1300 if (@$objs) {
1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1161 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1163 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1164 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
1165 aio_close $fh; 1309 aio_close $fh;
1166 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1167 } 1311 }
1168 } else { 1312 } else {
1169 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1172 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1173 1317
1174 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1320 } else {
1177 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1178 } 1322 }
1179 } else { 1323 } else {
1180 aio_unlink $filename; 1324 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1182 } 1326 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1351 $av = $st->{objs};
1208 } 1352 }
1209 1353
1210 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1213 1358
1214 ($data, $av) 1359 ($data, $av)
1215} 1360}
1216 1361
1217=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1276} 1421}
1277 1422
1278use File::Glob (); 1423use File::Glob ();
1279 1424
1280cf::player->attach ( 1425cf::player->attach (
1281 on_command => sub { 1426 on_unknown_command => sub {
1282 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1283 1428
1284 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1285 or return; 1430 or return;
1286 1431
1309 1454
1310 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1311 if $reply; 1456 if $reply;
1312 1457
1313 } else { 1458 } else {
1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1315 } 1460 }
1316 1461
1317 cf::override; 1462 cf::override;
1318 }, 1463 },
1319); 1464);
1330 1475
1331 $grp 1476 $grp
1332} 1477}
1333 1478
1334sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1335 cf::sync_job { 1482 cf::sync_job {
1336 my %todo; 1483 my %todo;
1337 1484
1338 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1339 next unless -r $path; 1486 next unless -r $path;
1357 1504
1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1360 1507
1361 $ext{source} = 1508 $ext{source} =
1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1363 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1364 . $source 1511 . $source
1365 . "\n};\n1"; 1512 . "\n};\n1";
1366 1513
1367 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1368 } 1515 }
1369 1516
1517 my $pass = 0;
1370 my %done; 1518 my %done;
1371 while (%todo) { 1519 while (%todo) {
1372 my $progress; 1520 my $progress;
1373 1521
1522 ++$pass;
1523
1524 ext:
1374 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1375 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1376 goto skip 1527 next ext
1377 unless exists $done{$_}; 1528 unless exists $done{$_};
1378 } 1529 }
1379 1530
1380 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1381 1532
1382 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1383 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1384 : "$v->{base}: extension inactive.\n";
1385 1537
1386 if (exists $v->{meta}{mandatory}) {
1387 warn $msg;
1388 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1389 } 1539 if exists $v->{meta}{mandatory};
1390 1540
1391 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1392 } 1550 }
1393
1394 $done{$k} = delete $todo{$k};
1395 push @EXTS, $v->{pkg};
1396 $progress = 1;
1397 } 1551 }
1398 1552
1399 skip: 1553 unless ($progress) {
1400 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1401 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1402 } 1563 }
1403 }; 1564 };
1404} 1565}
1405 1566
1406############################################################################# 1567#############################################################################
1490 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1491 } 1652 }
1492 } 1653 }
1493} 1654}
1494 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1495sub save($) { 1669sub save($) {
1496 my ($pl) = @_; 1670 my ($pl) = @_;
1497 1671
1498 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1499 1673
1504 1678
1505 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1506 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1507 1681
1508 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1509 1686
1510 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1511 cf::cede_to_tick; 1688 cf::cede_to_tick;
1512} 1689}
1513 1690
1547 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1548 1725
1549 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1551 1728
1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1553 $pl->deactivate; 1730 $pl->deactivate;
1731
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1556 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1557 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1558 1737
1559 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1560 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1561 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1615 \@logins 1794 \@logins
1616} 1795}
1617 1796
1618=item $player->maps 1797=item $player->maps
1619 1798
1799=item cf::player::maps $login
1800
1620Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1621player. May block. 1802player. May block.
1622 1803
1623=cut 1804=cut
1624 1805
1686=cut 1867=cut
1687 1868
1688sub find_by_path($) { 1869sub find_by_path($) {
1689 my ($path) = @_; 1870 my ($path) = @_;
1690 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1691 my ($match, $specificity); 1874 my ($match, $specificity);
1692 1875
1693 for my $region (list) { 1876 for my $region (list) {
1694 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1695 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1723sub generate_random_map { 1906sub generate_random_map {
1724 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1725 1908
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727 1910
1728 # mit "rum" bekleckern, nicht
1729 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1733 $rmp->{exit_on_final_map},
1734 $rmp->{xsize}, $rmp->{ysize},
1735 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1736 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1737 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1738 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1739 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1740 (cf::region::find $rmp->{region}), $rmp->{custom}
1741 )
1742} 1912}
1743 1913
1744=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1745 1915
1746Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1751 1921
1752sub register { 1922sub register {
1753 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1754 my $pkg = caller; 1924 my $pkg = caller;
1755 1925
1756 no strict;
1757 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1758 1927
1759 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1760} 1929}
1761 1930
1762# also paths starting with '/' 1931# also paths starting with '/'
1763$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1764 1933
1765sub thawer_merge { 1934sub thawer_merge {
1766 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1767 1936
1768 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1773} 1942}
1774 1943
1775sub normalise { 1944sub normalise {
1776 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1777 1946
1778 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1779 1948
1780 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1781 1950
1782 # map plan: 1951 # map plan:
1783 # 1952 #
1785 # {... are special paths that are not being touched 1954 # {... are special paths that are not being touched
1786 # ?xxx/... are special absolute paths 1955 # ?xxx/... are special absolute paths
1787 # ?random/... random maps 1956 # ?random/... random maps
1788 # /... normal maps 1957 # /... normal maps
1789 # ~user/... per-player map of a specific user 1958 # ~user/... per-player map of a specific user
1959 # !up !down for quad maps, or other maps with up/down layers
1790 1960
1791 $path =~ s/$PATH_SEP/\//go; 1961 $path =~ s/$PATH_SEP/\//go;
1792 1962
1793 # treat it as relative path if it starts with 1963 # treat it as relative path if it starts with
1794 # something that looks reasonable 1964 # something that looks reasonable
1795 if ($path =~ m{^(?:\./|\.\./|\w)}) { 1965 if ($path =~ m{^(?:\./|\.\./|\w)}) {
1796 $base or Carp::carp "normalise called with relative path and no base: '$path'"; 1966 $base or Carp::carp "normalise called with relative path and no base: '$path'";
1797 1967
1798 $base =~ s{[^/]+/?$}{}; 1968 $base =~ s{[^/]+/?$}{};
1799 $path = "$base/$path"; 1969 $path = "$base/$path";
1970
1971 } elsif ($path eq '!up') {
1972 $base && ref $base
1973 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975 my $uppth = $base->tile_path (cf::TILE_UP);
1976 $path = $uppth if $uppth;
1977
1978 } elsif ($path eq '!down') {
1979 $base && ref $base
1980 or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982 my $dpth = $base->tile_path (cf::TILE_DOWN);
1983 $path = $dpth if $dpth;
1800 } 1984 }
1801 1985
1802 for ($path) { 1986 for ($path) {
1803 redo if s{//}{/};
1804 redo if s{/\.?/}{/}; 1987 redo if s{/\.?/}{/};
1805 redo if s{/[^/]+/\.\./}{/}; 1988 redo if s{/[^/]+/\.\./}{/};
1806 } 1989 }
1807 1990
1808 $path 1991 $path
1822 $self->init; # pass $1 etc. 2005 $self->init; # pass $1 etc.
1823 return $self; 2006 return $self;
1824 } 2007 }
1825 } 2008 }
1826 2009
1827 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2010 Carp::cluck "unable to resolve path '$path' (base '$base')";
1828 () 2011 ()
1829} 2012}
1830 2013
2014# may re-bless or do other evil things
1831sub init { 2015sub init {
1832 my ($self) = @_; 2016 my ($self) = @_;
1833 2017
1834 $self 2018 $self
1835} 2019}
1900 $self->{load_path} = $path; 2084 $self->{load_path} = $path;
1901 2085
1902 1 2086 1
1903} 2087}
1904 2088
2089# used to laod the header of an original map
1905sub load_header_orig { 2090sub load_header_orig {
1906 my ($self) = @_; 2091 my ($self) = @_;
1907 2092
1908 $self->load_header_from ($self->load_path) 2093 $self->load_header_from ($self->load_path)
1909} 2094}
1910 2095
2096# used to laod the header of an instantiated map
1911sub load_header_temp { 2097sub load_header_temp {
1912 my ($self) = @_; 2098 my ($self) = @_;
1913 2099
1914 $self->load_header_from ($self->save_path) 2100 $self->load_header_from ($self->save_path)
1915} 2101}
1916 2102
2103# called after loading the header from an instantiated map
1917sub prepare_temp { 2104sub prepare_temp {
1918 my ($self) = @_; 2105 my ($self) = @_;
1919 2106
1920 $self->last_access ((delete $self->{last_access}) 2107 $self->last_access ((delete $self->{last_access})
1921 || $cf::RUNTIME); #d# 2108 || $cf::RUNTIME); #d#
1922 # safety 2109 # safety
1923 $self->{instantiate_time} = $cf::RUNTIME 2110 $self->{instantiate_time} = $cf::RUNTIME
1924 if $self->{instantiate_time} > $cf::RUNTIME; 2111 if $self->{instantiate_time} > $cf::RUNTIME;
1925} 2112}
1926 2113
2114# called after loading the header from an original map
1927sub prepare_orig { 2115sub prepare_orig {
1928 my ($self) = @_; 2116 my ($self) = @_;
1929 2117
1930 $self->{load_original} = 1; 2118 $self->{load_original} = 1;
1931 $self->{instantiate_time} = $cf::RUNTIME; 2119 $self->{instantiate_time} = $cf::RUNTIME;
1955 2143
1956sub find; 2144sub find;
1957sub find { 2145sub find {
1958 my ($path, $origin) = @_; 2146 my ($path, $origin) = @_;
1959 2147
2148 cf::cede_to_tick;
2149
1960 $path = normalise $path, $origin && $origin->path; 2150 $path = normalise $path, $origin;
1961 2151
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2152 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1963 my $guard2 = cf::lock_acquire "map_find:$path"; 2153 my $guard2 = cf::lock_acquire "map_find:$path";
1964 2154
1965 $cf::MAP{$path} || do { 2155 $cf::MAP{$path} || do {
1982 2172
1983 $cf::MAP{$path} = $map 2173 $cf::MAP{$path} = $map
1984 } 2174 }
1985} 2175}
1986 2176
1987sub pre_load { } 2177sub pre_load { }
1988sub post_load { } 2178#sub post_load { } # XS
1989 2179
1990sub load { 2180sub load {
1991 my ($self) = @_; 2181 my ($self) = @_;
1992 2182
1993 local $self->{deny_reset} = 1; # loading can take a long time 2183 local $self->{deny_reset} = 1; # loading can take a long time
2005 $self->alloc; 2195 $self->alloc;
2006 2196
2007 $self->pre_load; 2197 $self->pre_load;
2008 cf::cede_to_tick; 2198 cf::cede_to_tick;
2009 2199
2200 if (exists $self->{load_path}) {
2010 my $f = new_from_file cf::object::thawer $self->{load_path}; 2201 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block; 2202 $f->skip_block;
2012 $self->_load_objects ($f) 2203 $self->_load_objects ($f)
2013 or return; 2204 or return;
2014 2205
2015 $self->post_load_original 2206 $self->post_load_original
2016 if delete $self->{load_original}; 2207 if delete $self->{load_original};
2017 2208
2018 if (my $uniq = $self->uniq_path) { 2209 if (my $uniq = $self->uniq_path) {
2019 utf8::encode $uniq; 2210 utf8::encode $uniq;
2020 unless (aio_stat $uniq) { 2211 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) { 2212 if (my $f = new_from_file cf::object::thawer $uniq) {
2022 $self->clear_unique_items; 2213 $self->clear_unique_items;
2023 $self->_load_objects ($f); 2214 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs; 2215 $f->resolve_delayed_derefs;
2216 }
2025 } 2217 }
2026 } 2218 }
2027 }
2028 2219
2029 $f->resolve_delayed_derefs; 2220 $f->resolve_delayed_derefs;
2221 } else {
2222 $self->post_load_original
2223 if delete $self->{load_original};
2224 }
2030 2225
2031 cf::cede_to_tick; 2226 cf::cede_to_tick;
2032 # now do the right thing for maps 2227 # now do the right thing for maps
2033 $self->link_multipart_objects; 2228 $self->link_multipart_objects;
2034 $self->difficulty ($self->estimate_difficulty) 2229 $self->difficulty ($self->estimate_difficulty)
2048 2243
2049 $self->in_memory (cf::MAP_ACTIVE); 2244 $self->in_memory (cf::MAP_ACTIVE);
2050 } 2245 }
2051 2246
2052 $self->post_load; 2247 $self->post_load;
2053}
2054 2248
2249 1
2250}
2251
2252# customize the map for a given player, i.e.
2253# return the _real_ map. used by e.g. per-player
2254# maps to change the path to ~playername/mappath
2055sub customise_for { 2255sub customise_for {
2056 my ($self, $ob) = @_; 2256 my ($self, $ob) = @_;
2057 2257
2058 return find "~" . $ob->name . "/" . $self->{path} 2258 return find "~" . $ob->name . "/" . $self->{path}
2059 if $self->per_player; 2259 if $self->per_player;
2075 or next; 2275 or next;
2076 $neigh = find $neigh, $map 2276 $neigh = find $neigh, $map
2077 or next; 2277 or next;
2078 $neigh->load; 2278 $neigh->load;
2079 2279
2280 # now find the diagonal neighbours
2080 push @neigh, 2281 push @neigh,
2081 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2282 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2082 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2283 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2083 } 2284 }
2084 2285
2091} 2292}
2092 2293
2093sub find_sync { 2294sub find_sync {
2094 my ($path, $origin) = @_; 2295 my ($path, $origin) = @_;
2095 2296
2096 cf::sync_job { find $path, $origin } 2297 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2298 if $Coro::current == $Coro::main;
2299
2300 find $path, $origin
2097} 2301}
2098 2302
2099sub do_load_sync { 2303sub do_load_sync {
2100 my ($map) = @_; 2304 my ($map) = @_;
2101 2305
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2306 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main; 2307 if $Coro::current == $Coro::main;
2104 2308
2105 cf::sync_job { $map->load }; 2309 $map->load;
2106} 2310}
2107 2311
2108our %MAP_PREFETCH; 2312our %MAP_PREFETCH;
2109our $MAP_PREFETCHER = undef; 2313our $MAP_PREFETCHER = undef;
2110 2314
2111sub find_async { 2315sub find_async {
2112 my ($path, $origin, $load) = @_; 2316 my ($path, $origin, $load) = @_;
2113 2317
2114 $path = normalise $path, $origin && $origin->{path}; 2318 $path = normalise $path, $origin;
2115 2319
2116 if (my $map = $cf::MAP{$path}) { 2320 if (my $map = $cf::MAP{$path}) {
2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2321 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2118 } 2322 }
2119 2323
2136 $MAP_PREFETCHER->prio (6); 2340 $MAP_PREFETCHER->prio (6);
2137 2341
2138 () 2342 ()
2139} 2343}
2140 2344
2345# common code, used by both ->save and ->swapout
2141sub save { 2346sub _save {
2142 my ($self) = @_; 2347 my ($self) = @_;
2143
2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
2145 2348
2146 $self->{last_save} = $cf::RUNTIME; 2349 $self->{last_save} = $cf::RUNTIME;
2147 2350
2148 return unless $self->dirty; 2351 return unless $self->dirty;
2149 2352
2169 } else { 2372 } else {
2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2373 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2171 } 2374 }
2172} 2375}
2173 2376
2377sub save {
2378 my ($self) = @_;
2379
2380 my $lock = cf::lock_acquire "map_data:$self->{path}";
2381
2382 $self->_save;
2383}
2384
2174sub swap_out { 2385sub swap_out {
2175 my ($self) = @_; 2386 my ($self) = @_;
2176 2387
2177 # save first because save cedes
2178 $self->save;
2179
2180 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2388 my $lock = cf::lock_acquire "map_data:$self->{path}";
2181 2389
2182 return if $self->players;
2183 return if $self->in_memory != cf::MAP_ACTIVE; 2390 return if $self->in_memory != cf::MAP_ACTIVE;
2184 return if $self->{deny_save}; 2391 return if $self->{deny_save};
2392 return if $self->players;
2185 2393
2394 # first deactivate the map and "unlink" it from the core
2395 $self->deactivate;
2396 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->in_memory (cf::MAP_SWAPPED); 2397 $self->in_memory (cf::MAP_SWAPPED);
2398
2399 # then atomically save
2400 $self->_save;
2401
2402 # then free the map
2403 $self->clear;
2404}
2405
2406sub reset_at {
2407 my ($self) = @_;
2408
2409 # TODO: safety, remove and allow resettable per-player maps
2410 return 1e99 if $self->{deny_reset};
2411
2412 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2413 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2414
2415 $time + $to
2416}
2417
2418sub should_reset {
2419 my ($self) = @_;
2420
2421 $self->reset_at <= $cf::RUNTIME
2422}
2423
2424sub reset {
2425 my ($self) = @_;
2426
2427 my $lock = cf::lock_acquire "map_data:$self->{path}";
2428
2429 return if $self->players;
2430
2431 cf::trace "resetting map ", $self->path, "\n";
2432
2433 $self->in_memory (cf::MAP_SWAPPED);
2434
2435 # need to save uniques path
2436 unless ($self->{deny_save}) {
2437 my $uniq = $self->uniq_path; utf8::encode $uniq;
2438
2439 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2440 if $uniq;
2441 }
2442
2443 delete $cf::MAP{$self->path};
2187 2444
2188 $self->deactivate; 2445 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP; 2446 $_->clear_links_to ($self) for values %cf::MAP;
2190 $self->clear; 2447 $self->clear;
2191}
2192
2193sub reset_at {
2194 my ($self) = @_;
2195
2196 # TODO: safety, remove and allow resettable per-player maps
2197 return 1e99 if $self->{deny_reset};
2198
2199 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2200 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2201
2202 $time + $to
2203}
2204
2205sub should_reset {
2206 my ($self) = @_;
2207
2208 $self->reset_at <= $cf::RUNTIME
2209}
2210
2211sub reset {
2212 my ($self) = @_;
2213
2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2215
2216 return if $self->players;
2217
2218 warn "resetting map ", $self->path;
2219
2220 $self->in_memory (cf::MAP_SWAPPED);
2221
2222 # need to save uniques path
2223 unless ($self->{deny_save}) {
2224 my $uniq = $self->uniq_path; utf8::encode $uniq;
2225
2226 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2227 if $uniq;
2228 }
2229
2230 delete $cf::MAP{$self->path};
2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
2234 $self->clear;
2235 2448
2236 $self->unlink_save; 2449 $self->unlink_save;
2237 $self->destroy; 2450 $self->destroy;
2238} 2451}
2239 2452
2247 2460
2248 delete $cf::MAP{$self->path}; 2461 delete $cf::MAP{$self->path};
2249 2462
2250 $self->unlink_save; 2463 $self->unlink_save;
2251 2464
2252 bless $self, "cf::map"; 2465 bless $self, "cf::map::wrap";
2253 delete $self->{deny_reset}; 2466 delete $self->{deny_reset};
2254 $self->{deny_save} = 1; 2467 $self->{deny_save} = 1;
2255 $self->reset_timeout (1); 2468 $self->reset_timeout (1);
2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2469 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2257 2470
2314 : normalise $_ 2527 : normalise $_
2315 } @{ aio_readdir $UNIQUEDIR or [] } 2528 } @{ aio_readdir $UNIQUEDIR or [] }
2316 ] 2529 ]
2317} 2530}
2318 2531
2532=item cf::map::static_maps
2533
2534Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2535file in the shared directory excluding F</styles> and F</editor>). May
2536block.
2537
2538=cut
2539
2540sub static_maps() {
2541 my @dirs = "";
2542 my @maps;
2543
2544 while (@dirs) {
2545 my $dir = shift @dirs;
2546
2547 next if $dir eq "/styles" || $dir eq "/editor";
2548
2549 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2550 or return;
2551
2552 for (@$files) {
2553 s/\.map$// or next;
2554 utf8::decode $_;
2555 push @maps, "$dir/$_";
2556 }
2557
2558 push @dirs, map "$dir/$_", @$dirs;
2559 }
2560
2561 \@maps
2562}
2563
2319=back 2564=back
2320 2565
2321=head3 cf::object 2566=head3 cf::object
2322 2567
2323=cut 2568=cut
2455 2700
2456Freezes the player and moves him/her to a special map (C<{link}>). 2701Freezes the player and moves him/her to a special map (C<{link}>).
2457 2702
2458The player should be reasonably safe there for short amounts of time (e.g. 2703The player should be reasonably safe there for short amounts of time (e.g.
2459for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2704for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link 2705though, as the player cannot control the character while it is on the link
2461map. 2706map.
2462 2707
2463Will never block. 2708Will never block.
2464 2709
2465=item $player_object->leave_link ($map, $x, $y) 2710=item $player_object->leave_link ($map, $x, $y)
2486sub cf::object::player::enter_link { 2731sub cf::object::player::enter_link {
2487 my ($self) = @_; 2732 my ($self) = @_;
2488 2733
2489 $self->deactivate_recursive; 2734 $self->deactivate_recursive;
2490 2735
2736 ++$self->{_link_recursion};
2737
2491 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2738 return if UNIVERSAL::isa $self->map, "ext::map_link";
2492 2739
2493 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2740 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2494 if $self->map && $self->map->{path} ne "{link}"; 2741 if $self->map && $self->map->{path} ne "{link}";
2495 2742
2496 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2743 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2497} 2744}
2498 2745
2499sub cf::object::player::leave_link { 2746sub cf::object::player::leave_link {
2500 my ($self, $map, $x, $y) = @_; 2747 my ($self, $map, $x, $y) = @_;
2501 2748
2518 ($x, $y) = (-1, -1) 2765 ($x, $y) = (-1, -1)
2519 unless (defined $x) && (defined $y); 2766 unless (defined $x) && (defined $y);
2520 2767
2521 # use -1 or undef as default coordinates, not 0, 0 2768 # use -1 or undef as default coordinates, not 0, 0
2522 ($x, $y) = ($map->enter_x, $map->enter_y) 2769 ($x, $y) = ($map->enter_x, $map->enter_y)
2523 if $x <=0 && $y <= 0; 2770 if $x <= 0 && $y <= 0;
2524 2771
2525 $map->load; 2772 $map->load;
2526 $map->load_neighbours; 2773 $map->load_neighbours;
2527 2774
2528 return unless $self->contr->active; 2775 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2530 $self->activate_recursive;
2531 2776
2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2777 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2533 $self->enter_map ($map, $x, $y); 2778 if ($self->enter_map ($map, $x, $y)) {
2534} 2779 # entering was successful
2780 delete $self->{_link_recursion};
2781 # only activate afterwards, to support waiting in hooks
2782 $self->activate_recursive;
2783 }
2535 2784
2785}
2786
2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2787=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2537 2788
2538Moves the player to the given map-path and coordinates by first freezing 2789Moves the player to the given map-path and coordinates by first freezing
2539her, loading and preparing them map, calling the provided $check callback 2790her, loading and preparing them map, calling the provided $check callback
2540that has to return the map if sucecssful, and then unfreezes the player on 2791that has to return the map if sucecssful, and then unfreezes the player on
2541the new (success) or old (failed) map position. In either case, $done will 2792the new (success) or old (failed) map position. In either case, $done will
2548 2799
2549our $GOTOGEN; 2800our $GOTOGEN;
2550 2801
2551sub cf::object::player::goto { 2802sub cf::object::player::goto {
2552 my ($self, $path, $x, $y, $check, $done) = @_; 2803 my ($self, $path, $x, $y, $check, $done) = @_;
2804
2805 if ($self->{_link_recursion} >= $MAX_LINKS) {
2806 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2807 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2808 ($path, $x, $y) = @$EMERGENCY_POSITION;
2809 }
2553 2810
2554 # do generation counting so two concurrent goto's will be executed in-order 2811 # do generation counting so two concurrent goto's will be executed in-order
2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2812 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2556 2813
2557 $self->enter_link; 2814 $self->enter_link;
2577 ($path, $x, $y) = (undef, undef, undef); 2834 ($path, $x, $y) = (undef, undef, undef);
2578 } 2835 }
2579 } 2836 }
2580 2837
2581 my $map = eval { 2838 my $map = eval {
2582 my $map = defined $path ? cf::map::find $path : undef; 2839 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2583 2840
2584 if ($map) { 2841 if ($map) {
2585 $map = $map->customise_for ($self); 2842 $map = $map->customise_for ($self);
2586 $map = $check->($map) if $check && $map; 2843 $map = $check->($map, $x, $y, $self) if $check && $map;
2587 } else { 2844 } else {
2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2845 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2589 } 2846 }
2590 2847
2591 $map 2848 $map
2599 if ($gen == $self->{_goto_generation}) { 2856 if ($gen == $self->{_goto_generation}) {
2600 delete $self->{_goto_generation}; 2857 delete $self->{_goto_generation};
2601 $self->leave_link ($map, $x, $y); 2858 $self->leave_link ($map, $x, $y);
2602 } 2859 }
2603 2860
2604 $done->() if $done; 2861 $done->($self) if $done;
2605 })->prio (1); 2862 })->prio (1);
2606} 2863}
2607 2864
2608=item $player_object->enter_exit ($exit_object) 2865=item $player_object->enter_exit ($exit_object)
2609 2866
2685 2942
2686 prepare_random_map $exit 2943 prepare_random_map $exit
2687 if $exit->slaying eq "/!"; 2944 if $exit->slaying eq "/!";
2688 } 2945 }
2689 2946
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2947 my $map = cf::map::normalise $exit->slaying, $exit->map;
2691 my $x = $exit->stats->hp; 2948 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp; 2949 my $y = $exit->stats->sp;
2693 2950
2694 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2695 2952
2702 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "I'll try to bring you back to the map you were before. " 2960 . "I'll try to bring you back to the map you were before. "
2704 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2706 2963
2707 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 2965 $self->leave_link;
2709 } 2966 }
2710 })->prio (1); 2967 })->prio (1);
2711} 2968}
2712 2969
2724sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2726 2983
2727 utf8::encode $text; 2984 utf8::encode $text;
2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2985 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2986}
2987
2988=item $client->send_big_packet ($pkt)
2989
2990Like C<send_packet>, but tries to compress large packets, and fragments
2991them as required.
2992
2993=cut
2994
2995our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2996
2997sub cf::client::send_big_packet {
2998 my ($self, $pkt) = @_;
2999
3000 # try lzf for large packets
3001 $pkt = "lzf " . Compress::LZF::compress $pkt
3002 if 1024 <= length $pkt and $self->{can_lzf};
3003
3004 # split very large packets
3005 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3006 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3007 $pkt = "frag";
3008 }
3009
3010 $self->send_packet ($pkt);
2729} 3011}
2730 3012
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3014
2733Send a drawinfo or msg packet to the client, formatting the msg for the 3015Send a drawinfo or msg packet to the client, formatting the msg for the
2737 3019
2738=cut 3020=cut
2739 3021
2740# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2742 "c/identify" => { 3030 "c/identify" => {
2743 id => "infobox", 3031 id => "infobox",
2744 title => "Identify", 3032 title => "Identify",
2745 reply => undef, 3033 reply => undef,
2746 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2748 "c/examine" => { 3036 "c/examine" => {
2749 id => "infobox", 3037 id => "infobox",
2750 title => "Examine", 3038 title => "Examine",
2751 reply => undef, 3039 reply => undef,
2752 tooltip => "Signs and other items you examined", 3040 tooltip => "Signs and other items you examined",
3041 },
3042 "c/shopinfo" => {
3043 id => "infobox",
3044 title => "Shop Info",
3045 reply => undef,
3046 tooltip => "What your bargaining skill tells you about the shop",
2753 }, 3047 },
2754 "c/book" => { 3048 "c/book" => {
2755 id => "infobox", 3049 id => "infobox",
2756 title => "Book", 3050 title => "Book",
2757 reply => undef, 3051 reply => undef,
2873 my $pkt = "msg " 3167 my $pkt = "msg "
2874 . $self->{json_coder}->encode ( 3168 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 ); 3170 );
2877 3171
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt); 3172 $self->send_big_packet ($pkt);
2889} 3173}
2890 3174
2891=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2892 3176
2893Sends an ext event to the client. 3177Sends an ext event to the client.
2896 3180
2897sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2898 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2899 3183
2900 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2903 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 } 3189 }
2906} 3190}
2907 3191
2908=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2909 3193
2913 3197
2914sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2916 3200
2917 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove 3204 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 } 3207 }
2924} 3208}
2925 3209
2926=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2927 3211
2998 3282
2999 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3000 if $reply; 3284 if $reply;
3001 3285
3002 } else { 3286 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3287 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 } 3288 }
3005 3289
3006 cf::override; 3290 cf::override;
3007 }, 3291 },
3008); 3292);
3028 3312
3029 $coro 3313 $coro
3030} 3314}
3031 3315
3032cf::client->attach ( 3316cf::client->attach (
3033 on_destroy => sub { 3317 on_client_destroy => sub {
3034 my ($ns) = @_; 3318 my ($ns) = @_;
3035 3319
3036 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3037 }, 3321 },
3038); 3322);
3054our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3055 3339
3056$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3057 3341
3058$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3060 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3061 sort time 3345 sort time
3062)); 3346));
3063 3347
3064# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3089 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3090 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3091 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3092 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3093) { 3377) {
3094 no strict 'refs';
3095 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3097 for @funs; 3380 for @funs;
3098} 3381}
3099 3382
3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3117 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3118 3401
3119 %vars = (_dummy => 0) unless %vars; 3402 %vars = (_dummy => 0) unless %vars;
3120 3403
3404 my @res;
3121 local $_; 3405 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars;
3123 3406
3124 my $eval = 3407 my $eval =
3125 "do {\n" 3408 "do {\n"
3126 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3127 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3128 . $code 3411 . $code
3129 . "\n}" 3412 . "\n}"
3130 ; 3413 ;
3131 3414
3415 if ($CFG{safe_eval}) {
3132 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3133 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3134 sub_generation_inc; 3419 sub_generation_inc;
3420 } else {
3421 local @cf::_safe_eval_args = values %vars;
3422 @res = wantarray ? eval eval : scalar eval $eval;
3423 }
3135 3424
3136 if ($@) { 3425 if ($@) {
3137 warn "$@"; 3426 warn "$@",
3138 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3139 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3140 } 3429 }
3141 3430
3142 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3143} 3432}
3144 3433
3158=cut 3447=cut
3159 3448
3160sub register_script_function { 3449sub register_script_function {
3161 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3162 3451
3163 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3164 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3165} 3454}
3166 3455
3167=back 3456=back
3168 3457
3169=cut 3458=cut
3178 # for this (global event?) 3467 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3180 3469
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182 3471
3183 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3184 3473
3185 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3186 0 < aio_load $path, $facedata
3187 or die "$path: $!";
3188
3189 $facedata = Coro::Storable::thaw $facedata;
3190 3475
3191 $facedata->{version} == 2 3476 $facedata->{version} == 2
3192 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3193 3478
3194 # patch in the exptable 3479 # patch in the exptable
3480 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3195 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC, 3482 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3483 data => $exp_table,
3484 hash => (Digest::MD5::md5 $exp_table),
3198 }; 3485 };
3199 cf::cede_to_tick; 3486 cf::cede_to_tick;
3200 3487
3201 { 3488 {
3202 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3204 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3205 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206 3493
3207 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3497 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3211 3499
3212 cf::cede_to_tick; 3500 cf::cede_to_tick;
3213 } 3501 }
3214 3502
3215 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3220 3508
3221 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3224 } else { 3512 } else {
3225 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3226 } 3514 }
3227 3515
3228 cf::cede_to_tick; 3516 cf::cede_to_tick;
3229 } 3517 }
3230 } 3518 }
3239 3527
3240 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3241 } 3529 }
3242 3530
3243 { 3531 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3247 3533
3248 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252 3537
3253 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3268 } else { 3540 } else {
3269 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3270 } 3542 }
3271 3543
3272 cf::cede_to_tick; 3544 cf::cede_to_tick;
3273 } 3545 }
3274 } 3546 }
3275 3547
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277 3549
3278 1 3550 1
3279} 3551}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300 3552
3301register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3303 3555
3304 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3343sub reload_treasures { 3595sub reload_treasures {
3344 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3345 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3346} 3598}
3347 3599
3600sub reload_sound {
3601 trace "loading sound config from $DATADIR/sound\n";
3602
3603 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3604
3605 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3606 my $sound = $soundconf->{compat}[$_]
3607 or next;
3608
3609 my $face = cf::face::find "sound/$sound->[1]";
3610 cf::sound::set $sound->[0] => $face;
3611 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3612 }
3613
3614 while (my ($k, $v) = each %{$soundconf->{event}}) {
3615 my $face = cf::face::find "sound/$v";
3616 cf::sound::set $k => $face;
3617 }
3618}
3619
3348sub reload_resources { 3620sub reload_resources {
3349 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3350 3622
3623 reload_exp_table;
3624 reload_materials;
3351 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3352 reload_archetypes; 3627 reload_archetypes;
3353 reload_regions; 3628 reload_regions;
3354 reload_treasures; 3629 reload_treasures;
3355 3630
3356 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3357} 3632}
3358 3633
3359sub reload_config { 3634sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3361 or return;
3362 3636
3363 local $/; 3637 my $config = load_file "$CONFDIR/config";
3364 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3365 3640
3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3367 3642
3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3643 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3644 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3370 3645
3371 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3394 3669
3395 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3396 print $fh $$; 3671 print $fh $$;
3397} 3672}
3398 3673
3674sub main_loop {
3675 trace "EV::loop starting\n";
3676 if (1) {
3677 EV::loop;
3678 }
3679 trace "EV::loop returned\n";
3680 goto &main_loop unless $REALLY_UNLOOP;
3681}
3682
3399sub main { 3683sub main {
3400 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3401 3685
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3687 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411 3690
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3691 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 3692
3414 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3415 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3421 }; 3700 };
3422 3701
3423 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3424 3703
3425 cf::sync_job { 3704 cf::sync_job {
3705 cf::incloader::init ();
3706
3707 cf::init_anim;
3708 cf::init_attackmess;
3709 cf::init_dynamic;
3710
3711 cf::load_settings;
3712
3426 reload_resources; 3713 reload_resources;
3427 reload_config; 3714 reload_config;
3428 db_init; 3715 db_init;
3429 3716
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid; 3717 cf::init_uuid;
3433 cf::init_signals; 3718 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills; 3719 cf::init_skills;
3436 3720
3437 cf::init_beforeplay; 3721 cf::init_beforeplay;
3438 3722
3439 atomic; 3723 atomic;
3441 load_extensions; 3725 load_extensions;
3442 3726
3443 utime time, time, $RUNTIMEFILE; 3727 utime time, time, $RUNTIMEFILE;
3444 3728
3445 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3731 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447 3732
3448 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3449 }; 3734 };
3450 3735
3451 EV::loop; 3736 cf::object::thawer::errors_are_fatal 0;
3737 info "parse errors in files are no longer fatal from this point on.\n";
3738
3739 my $free_main; $free_main = EV::idle sub {
3740 undef $free_main;
3741 undef &main; # free gobs of memory :)
3742 };
3743
3744 goto &main_loop;
3452} 3745}
3453 3746
3454############################################################################# 3747#############################################################################
3455# initialisation and cleanup 3748# initialisation and cleanup
3456 3749
3457# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3458BEGIN { 3751BEGIN {
3459 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3460 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3461 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3462 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3463 }; 3756 };
3464 } 3757 }
3465} 3758}
3466 3759
3467sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3468 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3470 3765
3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 3767
3473 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3474 3769
3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 3771 or return;
3477 3772
3478 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3493 or return; 3788 or return;
3494 3789
3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 3791 and return;
3497 3792
3498 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 3794
3500 1 3795 1
3501} 3796}
3502 3797
3503our $uuid_lock; 3798our $uuid_lock;
3515 or return; 3810 or return;
3516 3811
3517 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3518 3813
3519 unless ($value) { 3814 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3521 return; 3816 return;
3522 } 3817 }
3523 3818
3524 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0; 3820 $uuid_skip = 0;
3535 or return; 3830 or return;
3536 3831
3537 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3538 and return; 3833 and return;
3539 3834
3540 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3541 3836
3542 1 3837 1
3543 3838
3544} 3839}
3545 3840
3551} 3846}
3552 3847
3553sub emergency_save() { 3848sub emergency_save() {
3554 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3555 3850
3556 warn "emergency_perl_save: enter\n"; 3851 info "emergency_perl_save: enter\n";
3852
3853 # this is a trade-off: we want to be very quick here, so
3854 # save all maps without fsync, and later call a global sync
3855 # (which in turn might be very very slow)
3856 local $USE_FSYNC = 0;
3557 3857
3558 cf::sync_job { 3858 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563 3860
3564 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3565 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3566 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3567 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3568 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3569 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3570 $pl->valid or next; 3867 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3572 $pl->save; 3869 $pl->save;
3573 } 3870 }
3574 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3575 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3576 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3577 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3578 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3579 $map->valid or next; 3878 $map->valid or next;
3580 $map->save; 3879 $map->save;
3581 } 3880 }
3582 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3583 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3584 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3585 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3586 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3587 3888
3588 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1; 3890 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n"; 3891 info "emergency_perl_save: end write uuid\n";
3892
3893 cf::write_runtime_sync; # external watchdog should not bark
3894
3895 trace "emergency_perl_save: syncing database to disk";
3896 BDB::db_env_txn_checkpoint $DB_ENV;
3897
3898 info "emergency_perl_save: starting sync\n";
3899 IO::AIO::aio_sync sub {
3900 info "emergency_perl_save: finished sync\n";
3901 };
3902
3903 cf::write_runtime_sync; # external watchdog should not bark
3904
3905 trace "emergency_perl_save: flushing outstanding aio requests";
3906 while (IO::AIO::nreqs || BDB::nreqs) {
3907 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3908 }
3909
3910 cf::write_runtime_sync; # external watchdog should not bark
3591 }; 3911 };
3592 3912
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3598 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3599} 3914}
3600 3915
3601sub post_cleanup { 3916sub post_cleanup {
3602 my ($make_core) = @_; 3917 my ($make_core) = @_;
3603 3918
3919 IO::AIO::flush;
3920
3604 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3605 if $make_core; 3922 if $make_core;
3606 3923
3607 my $fh = pidfile; 3924 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3609} 3926}
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 } 3950 }
3634 warn "cleared package $pkg\n";#d#
3635} 3951}
3636 3952
3637sub do_reload_perl() { 3953sub do_reload_perl() {
3638 # can/must only be called in main 3954 # can/must only be called in main
3639 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3640 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3641 return; 3957 return;
3642 } 3958 }
3643 3959
3644 return if $RELOAD++; 3960 return if $RELOAD++;
3645 3961
3646 my $t1 = EV::time; 3962 my $t1 = AE::time;
3647 3963
3648 while ($RELOAD) { 3964 while ($RELOAD) {
3649 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3650 3967
3651 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3652 3969
3653 cf::sync_job { 3970 cf::sync_job {
3654 cf::write_runtime_sync; # external watchdog should not bark
3655 cf::emergency_save; 3971 #cf::emergency_save;
3656 cf::write_runtime_sync; # external watchdog should not bark
3657 3972
3658 warn "syncing database to disk";
3659 BDB::db_env_txn_checkpoint $DB_ENV;
3660
3661 # if anything goes wrong in here, we should simply crash as we already saved
3662
3663 warn "flushing outstanding aio requests";
3664 while (IO::AIO::nreqs || BDB::nreqs) {
3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3666 }
3667
3668 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3669 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3670 %EXT_CORO = (); 3975 %EXT_CORO = ();
3671 3976
3672 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3673 %COMMAND = (); 3978 %COMMAND = ();
3674 3979
3675 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3676 %EXTCMD = (); 3981 %EXTCMD = ();
3677 %EXTICMD = (); 3982 %EXTICMD = ();
3678 3983
3679 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3680 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3681 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3682 3987
3683 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3684 eval { 3989 eval {
3685 $cb->($pkg); 3990 $cb->($pkg);
3686 1 3991 1
3687 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3688 } 3993 }
3689 3994
3690 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3691 clear_package $pkg; 3996 clear_package $pkg;
3692 } 3997 }
3693 3998
3694 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697 4002
3698 warn "... unloading $k"; 4003 trace "... unloading $k";
3699 delete $INC{$k}; 4004 delete $INC{$k};
3700 4005
3701 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3703 4008
3706 } 4011 }
3707 4012
3708 clear_package $k; 4013 clear_package $k;
3709 } 4014 }
3710 4015
3711 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3712 clear_package "safe::$_" 4017 clear_package "safe::$_"
3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4018 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3714 4019
3715 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3716 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3718 4023
3719 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3720 # and global variables created in xs 4025 # and global variables created in xs
3721 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3722 4027
3723 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3724 4029
3725 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3726 require cf; 4031 require cf;
3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3728 4033
3729 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3730 cf::reload_config; 4035 cf::reload_config;
3731 4036
3732 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3733 cf::load_extensions; 4038 cf::load_extensions;
3734 4039
3735 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3736 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3737 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3738 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3739 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3740 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3741 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3742 } 4047 }
3743 4048
3744 warn "running post_init jobs"; 4049 cf::_post_init 1;
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746 4050
3747 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3748 4052
3749 1 4053 1
3750 } or do { 4054 } or do {
3751 warn $@; 4055 error $@;
3752 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3753 }; 4057 };
3754 4058
3755 warn "reloaded";
3756 --$RELOAD; 4059 --$RELOAD;
3757 } 4060 }
3758 4061
3759 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3760 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3761}; 4064};
3762 4065
3763our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3764 4067
3765sub reload_perl() { 4068sub reload_perl() {
3767 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3768 4071
3769 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3771 4074
3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3773 do_reload_perl; 4076 do_reload_perl;
3774 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3775 }; 4078 };
3776 }; 4079 };
3777} 4080}
3786 reload_perl; 4089 reload_perl;
3787 }; 4090 };
3788 } 4091 }
3789}; 4092};
3790 4093
3791unshift @INC, $LIBDIR; 4094#############################################################################
3792 4095
3793my $bug_warning = 0; 4096my $bug_warning = 0;
3794 4097
3795our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3796our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3797 4100
3798sub wait_for_tick { 4101sub wait_for_tick() {
3799 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3800 4103
3801 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3802 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3803 $signal->wait; 4106 $signal->wait;
3804} 4107}
3805 4108
3806sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3807 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3808 4111
3809 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3810 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3811 $signal->wait; 4114 $signal->wait;
3812} 4115}
3818 return; 4121 return;
3819 } 4122 }
3820 4123
3821 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3822 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3823 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4129 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3825 Coro::async_pool { 4130 Coro::async_pool {
3826 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3827 write_runtime_sync 4132 write_runtime_sync
3828 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3829 }; 4134 };
3830 } 4135 }
3831 4136
3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3833 $sig->send; 4138 $sig->send;
3841 4146
3842 if (0) { 4147 if (0) {
3843 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3844 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3847 } 4152 }
3848 } 4153 }
3849} 4154}
3850 4155
3851{ 4156{
3852 # configure BDB 4157 # configure BDB
3853 4158
3854 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3855 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3856 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3857 4162
3858 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3859 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3896 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3897 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3898 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3899} 4204}
3900 4205
3901my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3902 4208
3903sub _log_backtrace { 4209sub _log_backtrace {
3904 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3905 4211
3906 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3907 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3908 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3909 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3910 ++$_log_backtrace; 4220 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
3912 async { 4222 async {
3913 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3914 4224
3934 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3935 --$_log_backtrace; 4245 --$_log_backtrace;
3936 }; 4246 };
3937 } else { 4247 } else {
3938 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3939 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3940 } 4250 }
3941} 4251}
3942 4252
3943# load additional modules 4253# load additional modules
3944require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3945 4256
3946END { cf::emergency_save } 4257END { cf::emergency_save }
3947 4258
39481 42591
3949 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines