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.473 by root, Fri Jun 26 16:32:10 2009 UTC vs.
Revision 1.569 by root, Wed May 4 07:36:40 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 if ($cf::USE_FSYNC) { 1294 if ($cf::USE_FSYNC) {
1178 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1179 1317
1180 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1182 } else { 1320 } else {
1183 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1184 } 1322 }
1185 } else { 1323 } else {
1186 aio_unlink $filename; 1324 aio_unlink $filename;
1187 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1188 } 1326 }
1212 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs}; 1351 $av = $st->{objs};
1214 } 1352 }
1215 1353
1216 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1217 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1218 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1219 1358
1220 ($data, $av) 1359 ($data, $av)
1221} 1360}
1222 1361
1223=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1282} 1421}
1283 1422
1284use File::Glob (); 1423use File::Glob ();
1285 1424
1286cf::player->attach ( 1425cf::player->attach (
1287 on_command => sub { 1426 on_unknown_command => sub {
1288 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1289 1428
1290 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1291 or return; 1430 or return;
1292 1431
1315 1454
1316 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1317 if $reply; 1456 if $reply;
1318 1457
1319 } else { 1458 } else {
1320 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1321 } 1460 }
1322 1461
1323 cf::override; 1462 cf::override;
1324 }, 1463 },
1325); 1464);
1336 1475
1337 $grp 1476 $grp
1338} 1477}
1339 1478
1340sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1341 cf::sync_job { 1482 cf::sync_job {
1342 my %todo; 1483 my %todo;
1343 1484
1344 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1345 next unless -r $path; 1486 next unless -r $path;
1363 1504
1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1366 1507
1367 $ext{source} = 1508 $ext{source} =
1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1369 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1370 . $source 1511 . $source
1371 . "\n};\n1"; 1512 . "\n};\n1";
1372 1513
1373 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1374 } 1515 }
1375 1516
1517 my $pass = 0;
1376 my %done; 1518 my %done;
1377 while (%todo) { 1519 while (%todo) {
1378 my $progress; 1520 my $progress;
1379 1521
1522 ++$pass;
1523
1524 ext:
1380 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1381 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1382 goto skip 1527 next ext
1383 unless exists $done{$_}; 1528 unless exists $done{$_};
1384 } 1529 }
1385 1530
1386 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1387 1532
1388 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1389 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1390 : "$v->{base}: extension inactive.\n";
1391 1537
1392 if (exists $v->{meta}{mandatory}) {
1393 warn $msg;
1394 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1395 } 1539 if exists $v->{meta}{mandatory};
1396 1540
1397 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;
1398 } 1550 }
1399
1400 $done{$k} = delete $todo{$k};
1401 push @EXTS, $v->{pkg};
1402 $progress = 1;
1403 } 1551 }
1404 1552
1405 skip: 1553 unless ($progress) {
1406 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1407 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 }
1408 } 1563 }
1409 }; 1564 };
1410} 1565}
1411 1566
1412############################################################################# 1567#############################################################################
1496 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1497 } 1652 }
1498 } 1653 }
1499} 1654}
1500 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
1501sub save($) { 1669sub save($) {
1502 my ($pl) = @_; 1670 my ($pl) = @_;
1503 1671
1504 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1505 1673
1510 1678
1511 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1512 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1513 1681
1514 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];
1515 1686
1516 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1517 cf::cede_to_tick; 1688 cf::cede_to_tick;
1518} 1689}
1519 1690
1553 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1554 1725
1555 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1556 $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
1557 1728
1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1559 $pl->deactivate; 1730 $pl->deactivate;
1731
1560 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;
1561 $pl->ob->check_score;
1562 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1563 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1564 1737
1565 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1566 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1567 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1621 \@logins 1794 \@logins
1622} 1795}
1623 1796
1624=item $player->maps 1797=item $player->maps
1625 1798
1799=item cf::player::maps $login
1800
1626Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1627player. May block. 1802player. May block.
1628 1803
1629=cut 1804=cut
1630 1805
1692=cut 1867=cut
1693 1868
1694sub find_by_path($) { 1869sub find_by_path($) {
1695 my ($path) = @_; 1870 my ($path) = @_;
1696 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1697 my ($match, $specificity); 1874 my ($match, $specificity);
1698 1875
1699 for my $region (list) { 1876 for my $region (list) {
1700 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1701 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1729sub generate_random_map { 1906sub generate_random_map {
1730 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1731 1908
1732 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
1733 1910
1734 # mit "rum" bekleckern, nicht
1735 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1739 $rmp->{exit_on_final_map},
1740 $rmp->{xsize}, $rmp->{ysize},
1741 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1742 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1743 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1744 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1745 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1746 (cf::region::find $rmp->{region}), $rmp->{custom}
1747 )
1748} 1912}
1749 1913
1750=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1751 1915
1752Register 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
1757 1921
1758sub register { 1922sub register {
1759 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1760 my $pkg = caller; 1924 my $pkg = caller;
1761 1925
1762 no strict;
1763 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1764 1927
1765 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1766} 1929}
1767 1930
1768# also paths starting with '/' 1931# also paths starting with '/'
1769$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1770 1933
1771sub thawer_merge { 1934sub thawer_merge {
1772 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1773 1936
1774 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1779} 1942}
1780 1943
1781sub normalise { 1944sub normalise {
1782 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1783 1946
1784 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1785 1948
1786 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1787 1950
1788 # map plan: 1951 # map plan:
1789 # 1952 #
1804 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1805 $path = "$base/$path"; 1968 $path = "$base/$path";
1806 } 1969 }
1807 1970
1808 for ($path) { 1971 for ($path) {
1809 redo if s{//}{/};
1810 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1811 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1812 } 1974 }
1813 1975
1814 $path 1976 $path
1828 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1829 return $self; 1991 return $self;
1830 } 1992 }
1831 } 1993 }
1832 1994
1833 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1834 () 1996 ()
1835} 1997}
1836 1998
1999# may re-bless or do other evil things
1837sub init { 2000sub init {
1838 my ($self) = @_; 2001 my ($self) = @_;
1839 2002
1840 $self 2003 $self
1841} 2004}
1906 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1907 2070
1908 1 2071 1
1909} 2072}
1910 2073
2074# used to laod the header of an original map
1911sub load_header_orig { 2075sub load_header_orig {
1912 my ($self) = @_; 2076 my ($self) = @_;
1913 2077
1914 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1915} 2079}
1916 2080
2081# used to laod the header of an instantiated map
1917sub load_header_temp { 2082sub load_header_temp {
1918 my ($self) = @_; 2083 my ($self) = @_;
1919 2084
1920 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1921} 2086}
1922 2087
2088# called after loading the header from an instantiated map
1923sub prepare_temp { 2089sub prepare_temp {
1924 my ($self) = @_; 2090 my ($self) = @_;
1925 2091
1926 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1927 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1928 # safety 2094 # safety
1929 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1930 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1931} 2097}
1932 2098
2099# called after loading the header from an original map
1933sub prepare_orig { 2100sub prepare_orig {
1934 my ($self) = @_; 2101 my ($self) = @_;
1935 2102
1936 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1937 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1961 2128
1962sub find; 2129sub find;
1963sub find { 2130sub find {
1964 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1965 2132
2133 cf::cede_to_tick;
2134
1966 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1967 2136
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1969 my $guard2 = cf::lock_acquire "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1970 2139
1971 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1988 2157
1989 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1990 } 2159 }
1991} 2160}
1992 2161
1993sub pre_load { } 2162sub pre_load { }
1994sub post_load { } 2163#sub post_load { } # XS
1995 2164
1996sub load { 2165sub load {
1997 my ($self) = @_; 2166 my ($self) = @_;
1998 2167
1999 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
2004 my $guard = cf::lock_acquire "map_data:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
2005 2174
2006 return unless $self->valid; 2175 return unless $self->valid;
2007 return unless $self->in_memory == cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
2008 2177
2009 $self->in_memory (cf::MAP_LOADING);
2010
2011 $self->alloc; 2178 $self->alloc;
2012 2179
2013 $self->pre_load; 2180 $self->pre_load;
2014 cf::cede_to_tick; 2181 cf::cede_to_tick;
2015 2182
2183 if (exists $self->{load_path}) {
2016 my $f = new_from_file cf::object::thawer $self->{load_path}; 2184 my $f = new_from_file cf::object::thawer $self->{load_path};
2017 $f->skip_block; 2185 $f->skip_block;
2018 $self->_load_objects ($f) 2186 $self->_load_objects ($f)
2019 or return; 2187 or return;
2020 2188
2021 $self->post_load_original 2189 $self->post_load_original
2022 if delete $self->{load_original}; 2190 if delete $self->{load_original};
2023 2191
2024 if (my $uniq = $self->uniq_path) { 2192 if (my $uniq = $self->uniq_path) {
2025 utf8::encode $uniq; 2193 utf8::encode $uniq;
2026 unless (aio_stat $uniq) { 2194 unless (aio_stat $uniq) {
2027 if (my $f = new_from_file cf::object::thawer $uniq) { 2195 if (my $f = new_from_file cf::object::thawer $uniq) {
2028 $self->clear_unique_items; 2196 $self->clear_unique_items;
2029 $self->_load_objects ($f); 2197 $self->_load_objects ($f);
2030 $f->resolve_delayed_derefs; 2198 $f->resolve_delayed_derefs;
2199 }
2031 } 2200 }
2032 } 2201 }
2033 }
2034 2202
2035 $f->resolve_delayed_derefs; 2203 $f->resolve_delayed_derefs;
2204 } else {
2205 $self->post_load_original
2206 if delete $self->{load_original};
2207 }
2208
2209 $self->in_memory (cf::MAP_INACTIVE);
2036 2210
2037 cf::cede_to_tick; 2211 cf::cede_to_tick;
2038 # now do the right thing for maps 2212 # now do the right thing for maps
2039 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
2040 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
2044 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
2045 $self->decay_objects; 2219 $self->decay_objects;
2046 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
2047 $self->update_buttons; 2221 $self->update_buttons;
2048 cf::cede_to_tick; 2222 cf::cede_to_tick;
2049 $self->activate; 2223 #$self->activate; # no longer activate maps automatically
2050 } 2224 }
2051 2225
2052 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
2053 $self->last_access ($cf::RUNTIME); 2227 $self->last_access ($cf::RUNTIME);
2054
2055 $self->in_memory (cf::MAP_ACTIVE);
2056 } 2228 }
2057 2229
2058 $self->post_load; 2230 $self->post_load;
2059}
2060 2231
2232 1
2233}
2234
2235# customize the map for a given player, i.e.
2236# return the _real_ map. used by e.g. per-player
2237# maps to change the path to ~playername/mappath
2061sub customise_for { 2238sub customise_for {
2062 my ($self, $ob) = @_; 2239 my ($self, $ob) = @_;
2063 2240
2064 return find "~" . $ob->name . "/" . $self->{path} 2241 return find "~" . $ob->name . "/" . $self->{path}
2065 if $self->per_player; 2242 if $self->per_player;
2081 or next; 2258 or next;
2082 $neigh = find $neigh, $map 2259 $neigh = find $neigh, $map
2083 or next; 2260 or next;
2084 $neigh->load; 2261 $neigh->load;
2085 2262
2263 # now find the diagonal neighbours
2086 push @neigh, 2264 push @neigh,
2087 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2265 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2088 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2266 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2089 } 2267 }
2090 2268
2097} 2275}
2098 2276
2099sub find_sync { 2277sub find_sync {
2100 my ($path, $origin) = @_; 2278 my ($path, $origin) = @_;
2101 2279
2102 cf::sync_job { find $path, $origin } 2280 # it's a bug to call this from the main context
2281 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2282 if $Coro::current == $Coro::main;
2283
2284 find $path, $origin
2103} 2285}
2104 2286
2105sub do_load_sync { 2287sub do_load_sync {
2106 my ($map) = @_; 2288 my ($map) = @_;
2107 2289
2290 # it's a bug to call this from the main context
2108 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2109 if $Coro::current == $Coro::main; 2292 if $Coro::current == $Coro::main;
2110 2293
2111 cf::sync_job { $map->load }; 2294 $map->load;
2112} 2295}
2113 2296
2114our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
2115our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
2116 2299
2117sub find_async { 2300sub find_async {
2118 my ($path, $origin, $load) = @_; 2301 my ($path, $origin, $load) = @_;
2119 2302
2120 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
2121 2304
2122 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2306 return $map if !$load || $map->linkable;
2124 } 2307 }
2125 2308
2126 $MAP_PREFETCH{$path} |= $load; 2309 $MAP_PREFETCH{$path} |= $load;
2127 2310
2128 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2142 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
2143 2326
2144 () 2327 ()
2145} 2328}
2146 2329
2330# common code, used by both ->save and ->swapout
2147sub save { 2331sub _save {
2148 my ($self) = @_; 2332 my ($self) = @_;
2149
2150 my $lock = cf::lock_acquire "map_data:$self->{path}";
2151 2333
2152 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
2153 2335
2154 return unless $self->dirty; 2336 return unless $self->dirty;
2155 2337
2175 } else { 2357 } else {
2176 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 } 2359 }
2178} 2360}
2179 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
2180sub swap_out { 2370sub swap_out {
2181 my ($self) = @_; 2371 my ($self) = @_;
2182 2372
2183 # save first because save cedes
2184 $self->save;
2185
2186 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
2187 2374
2375 return if !$self->linkable;
2376 return if $self->{deny_save};
2188 return if $self->players; 2377 return if $self->players;
2189 return if $self->in_memory != cf::MAP_ACTIVE;
2190 return if $self->{deny_save};
2191 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2192 $self->in_memory (cf::MAP_SWAPPED); 2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
2388 $self->clear;
2389}
2390
2391sub reset_at {
2392 my ($self) = @_;
2393
2394 # TODO: safety, remove and allow resettable per-player maps
2395 return 1e99 if $self->{deny_reset};
2396
2397 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2398 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2399
2400 $time + $to
2401}
2402
2403sub should_reset {
2404 my ($self) = @_;
2405
2406 $self->reset_at <= $cf::RUNTIME
2407}
2408
2409sub reset {
2410 my ($self) = @_;
2411
2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
2413
2414 return if $self->players;
2415
2416 cf::trace "resetting map ", $self->path, "\n";
2417
2418 $self->in_memory (cf::MAP_SWAPPED);
2419
2420 # need to save uniques path
2421 unless ($self->{deny_save}) {
2422 my $uniq = $self->uniq_path; utf8::encode $uniq;
2423
2424 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2425 if $uniq;
2426 }
2427
2428 delete $cf::MAP{$self->path};
2193 2429
2194 $self->deactivate; 2430 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP; 2431 $_->clear_links_to ($self) for values %cf::MAP;
2196 $self->clear; 2432 $self->clear;
2197}
2198
2199sub reset_at {
2200 my ($self) = @_;
2201
2202 # TODO: safety, remove and allow resettable per-player maps
2203 return 1e99 if $self->{deny_reset};
2204
2205 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2206 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2207
2208 $time + $to
2209}
2210
2211sub should_reset {
2212 my ($self) = @_;
2213
2214 $self->reset_at <= $cf::RUNTIME
2215}
2216
2217sub reset {
2218 my ($self) = @_;
2219
2220 my $lock = cf::lock_acquire "map_data:$self->{path}";
2221
2222 return if $self->players;
2223
2224 warn "resetting map ", $self->path;
2225
2226 $self->in_memory (cf::MAP_SWAPPED);
2227
2228 # need to save uniques path
2229 unless ($self->{deny_save}) {
2230 my $uniq = $self->uniq_path; utf8::encode $uniq;
2231
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2233 if $uniq;
2234 }
2235
2236 delete $cf::MAP{$self->path};
2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2240 $self->clear;
2241 2433
2242 $self->unlink_save; 2434 $self->unlink_save;
2243 $self->destroy; 2435 $self->destroy;
2244} 2436}
2245 2437
2253 2445
2254 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2255 2447
2256 $self->unlink_save; 2448 $self->unlink_save;
2257 2449
2258 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2259 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2260 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2261 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2262 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2263 2455
2320 : normalise $_ 2512 : normalise $_
2321 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2322 ] 2514 ]
2323} 2515}
2324 2516
2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2548
2325=back 2549=back
2326 2550
2327=head3 cf::object 2551=head3 cf::object
2328 2552
2329=cut 2553=cut
2461 2685
2462Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2463 2687
2464The player should be reasonably safe there for short amounts of time (e.g. 2688The player should be reasonably safe there for short amounts of time (e.g.
2465for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link 2690though, as the player cannot control the character while it is on the link
2467map. 2691map.
2468 2692
2469Will never block. 2693Will never block.
2470 2694
2471=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2492sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2493 my ($self) = @_; 2717 my ($self) = @_;
2494 2718
2495 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2496 2720
2721 ++$self->{_link_recursion};
2722
2497 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2498 2724
2499 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2500 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2501 2727
2502 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2503} 2729}
2504 2730
2505sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2506 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2507 2733
2524 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2525 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2526 2752
2527 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2528 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2529 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2530 2756
2531 $map->load; 2757 $map->load;
2532 $map->load_neighbours; 2758 $map->load_neighbours;
2533 2759
2534 return unless $self->contr->active; 2760 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2536 $self->activate_recursive;
2537 2761
2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2539 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2540} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2541 2769
2770}
2771
2542=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2543 2773
2544Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2545her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2546that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2547the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2554 2784
2555our $GOTOGEN; 2785our $GOTOGEN;
2556 2786
2557sub cf::object::player::goto { 2787sub cf::object::player::goto {
2558 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2559 2795
2560 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2798
2563 $self->enter_link; 2799 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2819 ($path, $x, $y) = (undef, undef, undef);
2584 } 2820 }
2585 } 2821 }
2586 2822
2587 my $map = eval { 2823 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2825
2590 if ($map) { 2826 if ($map) {
2591 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2829 } else {
2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2595 } 2831 }
2596 2832
2597 $map 2833 $map
2605 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2608 } 2844 }
2609 2845
2610 $done->() if $done; 2846 $done->($self) if $done;
2611 })->prio (1); 2847 })->prio (1);
2612} 2848}
2613 2849
2614=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2615 2851
2683 $Coro::current->{desc} = "enter_exit"; 2919 $Coro::current->{desc} = "enter_exit";
2684 2920
2685 unless (eval { 2921 unless (eval {
2686 $self->deactivate_recursive; # just to be sure 2922 $self->deactivate_recursive; # just to be sure
2687 2923
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2697 my $x = $exit->stats->hp; 2925 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp; 2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2937
2938 $map = $exit->slaying;
2939
2940 } elsif ($slaying eq '!up') {
2941 $map = $exit->map->tile_path (cf::TILE_UP);
2942 $x = $exit->x;
2943 $y = $exit->y;
2944
2945 } elsif ($slaying eq '!down') {
2946 $map = $exit->map->tile_path (cf::TILE_DOWN);
2947 $x = $exit->x;
2948 $y = $exit->y;
2949 }
2699 2950
2700 $self->goto ($map, $x, $y); 2951 $self->goto ($map, $x, $y);
2701 2952
2702 # if exit is damned, update players death & WoR home-position 2953 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y) 2954 $self->contr->savebed ($map, $x, $y)
2708 $self->message ("Something went wrong deep within the deliantra server. " 2959 $self->message ("Something went wrong deep within the deliantra server. "
2709 . "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. "
2710 . "Please report this to the dungeon master!", 2961 . "Please report this to the dungeon master!",
2711 cf::NDI_UNIQUE | cf::NDI_RED); 2962 cf::NDI_UNIQUE | cf::NDI_RED);
2712 2963
2713 warn "ERROR in enter_exit: $@"; 2964 error "ERROR in enter_exit: $@";
2714 $self->leave_link; 2965 $self->leave_link;
2715 } 2966 }
2716 })->prio (1); 2967 })->prio (1);
2717} 2968}
2718 2969
2730sub cf::client::send_drawinfo { 2981sub cf::client::send_drawinfo {
2731 my ($self, $text, $flags) = @_; 2982 my ($self, $text, $flags) = @_;
2732 2983
2733 utf8::encode $text; 2984 utf8::encode $text;
2734 $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);
2735} 3011}
2736 3012
2737=item $client->send_msg ($channel, $msg, $color, [extra...]) 3013=item $client->send_msg ($channel, $msg, $color, [extra...])
2738 3014
2739Send 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
2743 3019
2744=cut 3020=cut
2745 3021
2746# non-persistent channels (usually the info channel) 3022# non-persistent channels (usually the info channel)
2747our %CHANNEL = ( 3023our %CHANNEL = (
3024 "c/motd" => {
3025 id => "infobox",
3026 title => "MOTD",
3027 reply => undef,
3028 tooltip => "The message of the day",
3029 },
2748 "c/identify" => { 3030 "c/identify" => {
2749 id => "infobox", 3031 id => "infobox",
2750 title => "Identify", 3032 title => "Identify",
2751 reply => undef, 3033 reply => undef,
2752 tooltip => "Items recently identified", 3034 tooltip => "Items recently identified",
2754 "c/examine" => { 3036 "c/examine" => {
2755 id => "infobox", 3037 id => "infobox",
2756 title => "Examine", 3038 title => "Examine",
2757 reply => undef, 3039 reply => undef,
2758 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",
2759 }, 3047 },
2760 "c/book" => { 3048 "c/book" => {
2761 id => "infobox", 3049 id => "infobox",
2762 title => "Book", 3050 title => "Book",
2763 reply => undef, 3051 reply => undef,
2879 my $pkt = "msg " 3167 my $pkt = "msg "
2880 . $self->{json_coder}->encode ( 3168 . $self->{json_coder}->encode (
2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3169 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2882 ); 3170 );
2883 3171
2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2887
2888 # split very large packets
2889 if (8192 < length $pkt and $self->{can_lzf}) {
2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2891 $pkt = "frag";
2892 }
2893
2894 $self->send_packet ($pkt); 3172 $self->send_big_packet ($pkt);
2895} 3173}
2896 3174
2897=item $client->ext_msg ($type, @msg) 3175=item $client->ext_msg ($type, @msg)
2898 3176
2899Sends an ext event to the client. 3177Sends an ext event to the client.
2902 3180
2903sub cf::client::ext_msg($$@) { 3181sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3182 my ($self, $type, @msg) = @_;
2905 3183
2906 if ($self->extcmd == 2) { 3184 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3185 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove 3186 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type"; 3187 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3188 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 } 3189 }
2912} 3190}
2913 3191
2914=item $client->ext_reply ($msgid, @msg) 3192=item $client->ext_reply ($msgid, @msg)
2915 3193
2919 3197
2920sub cf::client::ext_reply($$@) { 3198sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_; 3199 my ($self, $id, @msg) = @_;
2922 3200
2923 if ($self->extcmd == 2) { 3201 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3202 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) { 3203 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove 3204 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id; 3205 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3206 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 } 3207 }
2930} 3208}
2931 3209
2932=item $success = $client->query ($flags, "text", \&cb) 3210=item $success = $client->query ($flags, "text", \&cb)
2933 3211
3004 3282
3005 $ns->ext_reply ($reply, @reply) 3283 $ns->ext_reply ($reply, @reply)
3006 if $reply; 3284 if $reply;
3007 3285
3008 } else { 3286 } else {
3009 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";
3010 } 3288 }
3011 3289
3012 cf::override; 3290 cf::override;
3013 }, 3291 },
3014); 3292);
3034 3312
3035 $coro 3313 $coro
3036} 3314}
3037 3315
3038cf::client->attach ( 3316cf::client->attach (
3039 on_destroy => sub { 3317 on_client_destroy => sub {
3040 my ($ns) = @_; 3318 my ($ns) = @_;
3041 3319
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3320 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3321 },
3044); 3322);
3060our $safe_hole = new Safe::Hole; 3338our $safe_hole = new Safe::Hole;
3061 3339
3062$SIG{FPE} = 'IGNORE'; 3340$SIG{FPE} = 'IGNORE';
3063 3341
3064$safe->permit_only (Opcode::opset qw( 3342$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3343 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3344 grepstart grepwhile mapstart mapwhile
3067 sort time 3345 sort time
3068)); 3346));
3069 3347
3070# here we export the classes and methods available to script code 3348# here we export the classes and methods available to script code
3095 decrease split destroy change_exp value msg lore send_msg)], 3373 decrease split destroy change_exp value msg lore send_msg)],
3096 ["cf::object::player" => qw(player)], 3374 ["cf::object::player" => qw(player)],
3097 ["cf::player" => qw(peaceful send_msg)], 3375 ["cf::player" => qw(peaceful send_msg)],
3098 ["cf::map" => qw(trigger)], 3376 ["cf::map" => qw(trigger)],
3099) { 3377) {
3100 no strict 'refs';
3101 my ($pkg, @funs) = @$_; 3378 my ($pkg, @funs) = @$_;
3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3379 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3103 for @funs; 3380 for @funs;
3104} 3381}
3105 3382
3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3399 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3123 $qcode =~ s/\n/\\n/g; 3400 $qcode =~ s/\n/\\n/g;
3124 3401
3125 %vars = (_dummy => 0) unless %vars; 3402 %vars = (_dummy => 0) unless %vars;
3126 3403
3404 my @res;
3127 local $_; 3405 local $_;
3128 local @safe::cf::_safe_eval_args = values %vars;
3129 3406
3130 my $eval = 3407 my $eval =
3131 "do {\n" 3408 "do {\n"
3132 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3409 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3133 . "#line 0 \"{$qcode}\"\n" 3410 . "#line 0 \"{$qcode}\"\n"
3134 . $code 3411 . $code
3135 . "\n}" 3412 . "\n}"
3136 ; 3413 ;
3137 3414
3415 if ($CFG{safe_eval}) {
3138 sub_generation_inc; 3416 sub_generation_inc;
3417 local @safe::cf::_safe_eval_args = values %vars;
3139 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3418 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3140 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 }
3141 3424
3142 if ($@) { 3425 if ($@) {
3143 warn "$@"; 3426 warn "$@",
3144 warn "while executing safe code '$code'\n"; 3427 "while executing safe code '$code'\n",
3145 warn "with arguments " . (join " ", %vars) . "\n"; 3428 "with arguments " . (join " ", %vars) . "\n";
3146 } 3429 }
3147 3430
3148 wantarray ? @res : $res[0] 3431 wantarray ? @res : $res[0]
3149} 3432}
3150 3433
3164=cut 3447=cut
3165 3448
3166sub register_script_function { 3449sub register_script_function {
3167 my ($fun, $cb) = @_; 3450 my ($fun, $cb) = @_;
3168 3451
3169 no strict 'refs'; 3452 $fun = "safe::$fun" if $CFG{safe_eval};
3170 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3453 *$fun = $safe_hole->wrap ($cb);
3171} 3454}
3172 3455
3173=back 3456=back
3174 3457
3175=cut 3458=cut
3184 # for this (global event?) 3467 # for this (global event?)
3185 %ext::player_env::MUSIC_FACE_CACHE = (); 3468 %ext::player_env::MUSIC_FACE_CACHE = ();
3186 3469
3187 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3470 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3188 3471
3189 warn "loading facedata from $path\n"; 3472 trace "loading facedata from $path\n";
3190 3473
3191 my $facedata; 3474 my $facedata = decode_storable load_file $path;
3192 0 < aio_load $path, $facedata
3193 or die "$path: $!";
3194
3195 $facedata = Coro::Storable::thaw $facedata;
3196 3475
3197 $facedata->{version} == 2 3476 $facedata->{version} == 2
3198 or cf::cleanup "$path: version mismatch, cannot proceed."; 3477 or cf::cleanup "$path: version mismatch, cannot proceed.";
3199 3478
3200 # 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]);
3201 $facedata->{resource}{"res/exp_table"} = { 3481 $facedata->{resource}{"res/exp_table"} = {
3202 type => FT_RSRC, 3482 type => FT_RSRC,
3203 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),
3204 }; 3485 };
3205 cf::cede_to_tick; 3486 cf::cede_to_tick;
3206 3487
3207 { 3488 {
3208 my $faces = $facedata->{faceinfo}; 3489 my $faces = $facedata->{faceinfo};
3210 while (my ($face, $info) = each %$faces) { 3491 while (my ($face, $info) = each %$faces) {
3211 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3492 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212 3493
3213 cf::face::set_visibility $idx, $info->{visibility}; 3494 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap}; 3495 cf::face::set_magicmap $idx, $info->{magicmap};
3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3496 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3216 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} ;
3217 3499
3218 cf::cede_to_tick; 3500 cf::cede_to_tick;
3219 } 3501 }
3220 3502
3221 while (my ($face, $info) = each %$faces) { 3503 while (my ($face, $info) = each %$faces) {
3226 3508
3227 if (my $smooth = cf::face::find $info->{smooth}) { 3509 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth; 3510 cf::face::set_smooth $idx, $smooth;
3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3511 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3230 } else { 3512 } else {
3231 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3513 error "smooth face '$info->{smooth}' not found for face '$face'";
3232 } 3514 }
3233 3515
3234 cf::cede_to_tick; 3516 cf::cede_to_tick;
3235 } 3517 }
3236 } 3518 }
3245 3527
3246 cf::anim::invalidate_all; # d'oh 3528 cf::anim::invalidate_all; # d'oh
3247 } 3529 }
3248 3530
3249 { 3531 {
3250 # TODO: for gcfclient pleasure, we should give resources
3251 # that gcfclient doesn't grok a >10000 face index.
3252 my $res = $facedata->{resource}; 3532 my $res = $facedata->{resource};
3253 3533
3254 while (my ($name, $info) = each %$res) { 3534 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) { 3535 if (defined $info->{type}) {
3256 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3536 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3257 my $data;
3258 3537
3259 if ($info->{type} & 1) { 3538 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3260 # prepend meta info
3261
3262 my $meta = $enc->encode ({
3263 name => $name,
3264 %{ $info->{meta} || {} },
3265 });
3266
3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type}; 3539 cf::face::set_type $idx, $info->{type};
3274 } else { 3540 } else {
3275 $RESOURCE{$name} = $info; 3541 $RESOURCE{$name} = $info; # unused
3276 } 3542 }
3277 3543
3278 cf::cede_to_tick; 3544 cf::cede_to_tick;
3279 } 3545 }
3280 } 3546 }
3281 3547
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3548 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3283 3549
3284 1 3550 1
3285} 3551}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3306 3552
3307register_exticmd fx_want => sub { 3553register_exticmd fx_want => sub {
3308 my ($ns, $want) = @_; 3554 my ($ns, $want) = @_;
3309 3555
3310 while (my ($k, $v) = each %$want) { 3556 while (my ($k, $v) = each %$want) {
3349sub reload_treasures { 3595sub reload_treasures {
3350 load_resource_file "$DATADIR/treasures" 3596 load_resource_file "$DATADIR/treasures"
3351 or die "unable to load treasurelists\n"; 3597 or die "unable to load treasurelists\n";
3352} 3598}
3353 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
3354sub reload_resources { 3620sub reload_resources {
3355 warn "reloading resource files...\n"; 3621 trace "reloading resource files...\n";
3356 3622
3623 reload_exp_table;
3624 reload_materials;
3357 reload_facedata; 3625 reload_facedata;
3626 reload_sound;
3358 reload_archetypes; 3627 reload_archetypes;
3359 reload_regions; 3628 reload_regions;
3360 reload_treasures; 3629 reload_treasures;
3361 3630
3362 warn "finished reloading resource files\n"; 3631 trace "finished reloading resource files\n";
3363} 3632}
3364 3633
3365sub reload_config { 3634sub reload_config {
3366 open my $fh, "<:utf8", "$CONFDIR/config" 3635 trace "reloading config file...\n";
3367 or return;
3368 3636
3369 local $/; 3637 my $config = load_file "$CONFDIR/config";
3370 *CFG = YAML::Load <$fh>; 3638 utf8::decode $config;
3639 *CFG = decode_yaml $config;
3371 3640
3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3641 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3373 3642
3374 $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};
3375 $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};
3376 3645
3377 if (exists $CFG{mlockall}) { 3646 if (exists $CFG{mlockall}) {
3400 3669
3401 seek $fh, 0, 0; 3670 seek $fh, 0, 0;
3402 print $fh $$; 3671 print $fh $$;
3403} 3672}
3404 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
3405sub main { 3683sub main {
3406 cf::init_globals; # initialise logging 3684 cf::init_globals; # initialise logging
3407 3685
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3686 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 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.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3688 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3689 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 3690
3418 $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
3419 3692
3420 # we must not ever block the main coroutine 3693 # we must not ever block the main coroutine
3421 local $Coro::idle = sub { 3694 local $Coro::idle = sub {
3427 }; 3700 };
3428 3701
3429 evthread_start IO::AIO::poll_fileno; 3702 evthread_start IO::AIO::poll_fileno;
3430 3703
3431 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
3432 reload_resources; 3713 reload_resources;
3433 reload_config; 3714 reload_config;
3434 db_init; 3715 db_init;
3435 3716
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid; 3717 cf::init_uuid;
3439 cf::init_signals; 3718 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills; 3719 cf::init_skills;
3442 3720
3443 cf::init_beforeplay; 3721 cf::init_beforeplay;
3444 3722
3445 atomic; 3723 atomic;
3447 load_extensions; 3725 load_extensions;
3448 3726
3449 utime time, time, $RUNTIMEFILE; 3727 utime time, time, $RUNTIMEFILE;
3450 3728
3451 # no (long-running) fork's whatsoever before this point(!) 3729 # no (long-running) fork's whatsoever before this point(!)
3730 use POSIX ();
3452 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};
3453 3732
3454 (pop @POST_INIT)->(0) while @POST_INIT; 3733 cf::_post_init 0;
3455 }; 3734 };
3456 3735
3457 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;
3458} 3745}
3459 3746
3460############################################################################# 3747#############################################################################
3461# initialisation and cleanup 3748# initialisation and cleanup
3462 3749
3463# install some emergency cleanup handlers 3750# install some emergency cleanup handlers
3464BEGIN { 3751BEGIN {
3465 our %SIGWATCHER = (); 3752 our %SIGWATCHER = ();
3466 for my $signal (qw(INT HUP TERM)) { 3753 for my $signal (qw(INT HUP TERM)) {
3467 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3754 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3468 cf::cleanup "SIG$signal"; 3755 cf::cleanup "SIG$signal";
3469 }; 3756 };
3470 } 3757 }
3471} 3758}
3472 3759
3473sub write_runtime_sync { 3760sub write_runtime_sync {
3761 my $t0 = AE::time;
3762
3474 # first touch the runtime file to show we are still running: 3763 # first touch the runtime file to show we are still running:
3475 # the fsync below can take a very very long time. 3764 # the fsync below can take a very very long time.
3476 3765
3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3766 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3478 3767
3479 my $guard = cf::lock_acquire "write_runtime"; 3768 my $guard = cf::lock_acquire "write_runtime";
3480 3769
3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3770 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3482 or return; 3771 or return;
3483 3772
3484 my $value = $cf::RUNTIME + 90 + 10; 3773 my $value = $cf::RUNTIME + 90 + 10;
3485 # 10 is the runtime save interval, for a monotonic clock 3774 # 10 is the runtime save interval, for a monotonic clock
3486 # 60 allows for the watchdog to kill the server. 3775 # 60 allows for the watchdog to kill the server.
3499 or return; 3788 or return;
3500 3789
3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3790 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3502 and return; 3791 and return;
3503 3792
3504 warn "runtime file written.\n"; 3793 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3505 3794
3506 1 3795 1
3507} 3796}
3508 3797
3509our $uuid_lock; 3798our $uuid_lock;
3521 or return; 3810 or return;
3522 3811
3523 my $value = uuid_seq uuid_cur; 3812 my $value = uuid_seq uuid_cur;
3524 3813
3525 unless ($value) { 3814 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n"; 3815 info "cowardly refusing to write zero uuid value!\n";
3527 return; 3816 return;
3528 } 3817 }
3529 3818
3530 my $value = uuid_str $value + $uuid_skip; 3819 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0; 3820 $uuid_skip = 0;
3541 or return; 3830 or return;
3542 3831
3543 aio_rename "$uuid~", $uuid 3832 aio_rename "$uuid~", $uuid
3544 and return; 3833 and return;
3545 3834
3546 warn "uuid file written ($value).\n"; 3835 trace "uuid file written ($value).\n";
3547 3836
3548 1 3837 1
3549 3838
3550} 3839}
3551 3840
3557} 3846}
3558 3847
3559sub emergency_save() { 3848sub emergency_save() {
3560 my $freeze_guard = cf::freeze_mainloop; 3849 my $freeze_guard = cf::freeze_mainloop;
3561 3850
3562 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;
3563 3857
3564 cf::sync_job { 3858 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so 3859 cf::write_runtime_sync; # external watchdog should not bark
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569 3860
3570 # use a peculiar iteration method to avoid tripping on perl 3861 # use a peculiar iteration method to avoid tripping on perl
3571 # refcount bugs in for. also avoids problems with players 3862 # refcount bugs in for. also avoids problems with players
3572 # and maps saved/destroyed asynchronously. 3863 # and maps saved/destroyed asynchronously.
3573 warn "emergency_perl_save: begin player save\n"; 3864 info "emergency_perl_save: begin player save\n";
3574 for my $login (keys %cf::PLAYER) { 3865 for my $login (keys %cf::PLAYER) {
3575 my $pl = $cf::PLAYER{$login} or next; 3866 my $pl = $cf::PLAYER{$login} or next;
3576 $pl->valid or next; 3867 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3868 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3578 $pl->save; 3869 $pl->save;
3579 } 3870 }
3580 warn "emergency_perl_save: end player save\n"; 3871 info "emergency_perl_save: end player save\n";
3581 3872
3873 cf::write_runtime_sync; # external watchdog should not bark
3874
3582 warn "emergency_perl_save: begin map save\n"; 3875 info "emergency_perl_save: begin map save\n";
3583 for my $path (keys %cf::MAP) { 3876 for my $path (keys %cf::MAP) {
3584 my $map = $cf::MAP{$path} or next; 3877 my $map = $cf::MAP{$path} or next;
3585 $map->valid or next; 3878 $map->valid or next;
3586 $map->save; 3879 $map->save;
3587 } 3880 }
3588 warn "emergency_perl_save: end map save\n"; 3881 info "emergency_perl_save: end map save\n";
3589 3882
3883 cf::write_runtime_sync; # external watchdog should not bark
3884
3590 warn "emergency_perl_save: begin database checkpoint\n"; 3885 info "emergency_perl_save: begin database checkpoint\n";
3591 BDB::db_env_txn_checkpoint $DB_ENV; 3886 BDB::db_env_txn_checkpoint $DB_ENV;
3592 warn "emergency_perl_save: end database checkpoint\n"; 3887 info "emergency_perl_save: end database checkpoint\n";
3593 3888
3594 warn "emergency_perl_save: begin write uuid\n"; 3889 info "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1; 3890 write_uuid_sync 1;
3596 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
3597 }; 3911 };
3598 3912
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3604 warn "emergency_perl_save: leave\n"; 3913 info "emergency_perl_save: leave\n";
3605} 3914}
3606 3915
3607sub post_cleanup { 3916sub post_cleanup {
3608 my ($make_core) = @_; 3917 my ($make_core) = @_;
3609 3918
3919 IO::AIO::flush;
3920
3610 warn Carp::longmess "post_cleanup backtrace" 3921 error Carp::longmess "post_cleanup backtrace"
3611 if $make_core; 3922 if $make_core;
3612 3923
3613 my $fh = pidfile; 3924 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$; 3925 unlink $PIDFILE if <$fh> == $$;
3615} 3926}
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3946 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) { 3947 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"}; 3948 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3949# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 } 3950 }
3640 warn "cleared package $pkg\n";#d#
3641} 3951}
3642 3952
3643sub do_reload_perl() { 3953sub do_reload_perl() {
3644 # can/must only be called in main 3954 # can/must only be called in main
3645 if ($Coro::current != $Coro::main) { 3955 unless (in_main) {
3646 warn "can only reload from main coroutine"; 3956 error "can only reload from main coroutine";
3647 return; 3957 return;
3648 } 3958 }
3649 3959
3650 return if $RELOAD++; 3960 return if $RELOAD++;
3651 3961
3652 my $t1 = EV::time; 3962 my $t1 = AE::time;
3653 3963
3654 while ($RELOAD) { 3964 while ($RELOAD) {
3655 warn "reloading..."; 3965 cf::get_slot 0.1, -1, "reload_perl";
3966 info "perl_reload: reloading...";
3656 3967
3657 warn "entering sync_job"; 3968 trace "perl_reload: entering sync_job";
3658 3969
3659 cf::sync_job { 3970 cf::sync_job {
3660 cf::write_runtime_sync; # external watchdog should not bark
3661 cf::emergency_save; 3971 #cf::emergency_save;
3662 cf::write_runtime_sync; # external watchdog should not bark
3663 3972
3664 warn "syncing database to disk";
3665 BDB::db_env_txn_checkpoint $DB_ENV;
3666
3667 # if anything goes wrong in here, we should simply crash as we already saved
3668
3669 warn "flushing outstanding aio requests";
3670 while (IO::AIO::nreqs || BDB::nreqs) {
3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3672 }
3673
3674 warn "cancelling all extension coros"; 3973 trace "perl_reload: cancelling all extension coros";
3675 $_->cancel for values %EXT_CORO; 3974 $_->cancel for values %EXT_CORO;
3676 %EXT_CORO = (); 3975 %EXT_CORO = ();
3677 3976
3678 warn "removing commands"; 3977 trace "perl_reload: removing commands";
3679 %COMMAND = (); 3978 %COMMAND = ();
3680 3979
3681 warn "removing ext/exti commands"; 3980 trace "perl_reload: removing ext/exti commands";
3682 %EXTCMD = (); 3981 %EXTCMD = ();
3683 %EXTICMD = (); 3982 %EXTICMD = ();
3684 3983
3685 warn "unloading/nuking all extensions"; 3984 trace "perl_reload: unloading/nuking all extensions";
3686 for my $pkg (@EXTS) { 3985 for my $pkg (@EXTS) {
3687 warn "... unloading $pkg"; 3986 trace "... unloading $pkg";
3688 3987
3689 if (my $cb = $pkg->can ("unload")) { 3988 if (my $cb = $pkg->can ("unload")) {
3690 eval { 3989 eval {
3691 $cb->($pkg); 3990 $cb->($pkg);
3692 1 3991 1
3693 } or warn "$pkg unloaded, but with errors: $@"; 3992 } or error "$pkg unloaded, but with errors: $@";
3694 } 3993 }
3695 3994
3696 warn "... clearing $pkg"; 3995 trace "... clearing $pkg";
3697 clear_package $pkg; 3996 clear_package $pkg;
3698 } 3997 }
3699 3998
3700 warn "unloading all perl modules loaded from $LIBDIR"; 3999 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) { 4000 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4001 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703 4002
3704 warn "... unloading $k"; 4003 trace "... unloading $k";
3705 delete $INC{$k}; 4004 delete $INC{$k};
3706 4005
3707 $k =~ s/\.pm$//; 4006 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g; 4007 $k =~ s/\//::/g;
3709 4008
3712 } 4011 }
3713 4012
3714 clear_package $k; 4013 clear_package $k;
3715 } 4014 }
3716 4015
3717 warn "getting rid of safe::, as good as possible"; 4016 trace "perl_reload: getting rid of safe::, as good as possible";
3718 clear_package "safe::$_" 4017 clear_package "safe::$_"
3719 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);
3720 4019
3721 warn "unloading cf.pm \"a bit\""; 4020 trace "perl_reload: unloading cf.pm \"a bit\"";
3722 delete $INC{"cf.pm"}; 4021 delete $INC{"cf.pm"};
3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4022 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3724 4023
3725 # don't, removes xs symbols, too, 4024 # don't, removes xs symbols, too,
3726 # and global variables created in xs 4025 # and global variables created in xs
3727 #clear_package __PACKAGE__; 4026 #clear_package __PACKAGE__;
3728 4027
3729 warn "unload completed, starting to reload now"; 4028 info "perl_reload: unload completed, starting to reload now";
3730 4029
3731 warn "reloading cf.pm"; 4030 trace "perl_reload: reloading cf.pm";
3732 require cf; 4031 require cf;
3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4032 cf::_connect_to_perl_1;
3734 4033
3735 warn "loading config and database again"; 4034 trace "perl_reload: loading config and database again";
3736 cf::reload_config; 4035 cf::reload_config;
3737 4036
3738 warn "loading extensions"; 4037 trace "perl_reload: loading extensions";
3739 cf::load_extensions; 4038 cf::load_extensions;
3740 4039
3741 if ($REATTACH_ON_RELOAD) { 4040 if ($REATTACH_ON_RELOAD) {
3742 warn "reattaching attachments to objects/players"; 4041 trace "perl_reload: reattaching attachments to objects/players";
3743 _global_reattach; # objects, sockets 4042 _global_reattach; # objects, sockets
3744 warn "reattaching attachments to maps"; 4043 trace "perl_reload: reattaching attachments to maps";
3745 reattach $_ for values %MAP; 4044 reattach $_ for values %MAP;
3746 warn "reattaching attachments to players"; 4045 trace "perl_reload: reattaching attachments to players";
3747 reattach $_ for values %PLAYER; 4046 reattach $_ for values %PLAYER;
3748 } 4047 }
3749 4048
3750 warn "running post_init jobs"; 4049 cf::_post_init 1;
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752 4050
3753 warn "leaving sync_job"; 4051 trace "perl_reload: leaving sync_job";
3754 4052
3755 1 4053 1
3756 } or do { 4054 } or do {
3757 warn $@; 4055 error $@;
3758 cf::cleanup "error while reloading, exiting."; 4056 cf::cleanup "perl_reload: error, exiting.";
3759 }; 4057 };
3760 4058
3761 warn "reloaded";
3762 --$RELOAD; 4059 --$RELOAD;
3763 } 4060 }
3764 4061
3765 $t1 = EV::time - $t1; 4062 $t1 = AE::time - $t1;
3766 warn "reload completed in ${t1}s\n"; 4063 info "perl_reload: completed in ${t1}s\n";
3767}; 4064};
3768 4065
3769our $RELOAD_WATCHER; # used only during reload 4066our $RELOAD_WATCHER; # used only during reload
3770 4067
3771sub reload_perl() { 4068sub reload_perl() {
3773 # coro crashes during coro_state_free->destroy here. 4070 # coro crashes during coro_state_free->destroy here.
3774 4071
3775 $RELOAD_WATCHER ||= cf::async { 4072 $RELOAD_WATCHER ||= cf::async {
3776 Coro::AIO::aio_wait cache_extensions; 4073 Coro::AIO::aio_wait cache_extensions;
3777 4074
3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4075 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3779 do_reload_perl; 4076 do_reload_perl;
3780 undef $RELOAD_WATCHER; 4077 undef $RELOAD_WATCHER;
3781 }; 4078 };
3782 }; 4079 };
3783} 4080}
3792 reload_perl; 4089 reload_perl;
3793 }; 4090 };
3794 } 4091 }
3795}; 4092};
3796 4093
3797unshift @INC, $LIBDIR; 4094#############################################################################
3798 4095
3799my $bug_warning = 0; 4096my $bug_warning = 0;
3800 4097
3801our @WAIT_FOR_TICK; 4098our @WAIT_FOR_TICK;
3802our @WAIT_FOR_TICK_BEGIN; 4099our @WAIT_FOR_TICK_BEGIN;
3803 4100
3804sub wait_for_tick { 4101sub wait_for_tick() {
3805 return if tick_inhibit || $Coro::current == $Coro::main; 4102 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3806 4103
3807 my $signal = new Coro::Signal; 4104 my $signal = new Coro::Signal;
3808 push @WAIT_FOR_TICK, $signal; 4105 push @WAIT_FOR_TICK, $signal;
3809 $signal->wait; 4106 $signal->wait;
3810} 4107}
3811 4108
3812sub wait_for_tick_begin { 4109sub wait_for_tick_begin() {
3813 return if tick_inhibit || $Coro::current == $Coro::main; 4110 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3814 4111
3815 my $signal = new Coro::Signal; 4112 my $signal = new Coro::Signal;
3816 push @WAIT_FOR_TICK_BEGIN, $signal; 4113 push @WAIT_FOR_TICK_BEGIN, $signal;
3817 $signal->wait; 4114 $signal->wait;
3818} 4115}
3824 return; 4121 return;
3825 } 4122 }
3826 4123
3827 cf::server_tick; # one server iteration 4124 cf::server_tick; # one server iteration
3828 4125
4126 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127
3829 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4128 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3830 $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.;
3831 Coro::async_pool { 4130 Coro::async_pool {
3832 $Coro::current->{desc} = "runtime saver"; 4131 $Coro::current->{desc} = "runtime saver";
3833 write_runtime_sync 4132 write_runtime_sync
3834 or warn "ERROR: unable to write runtime file: $!"; 4133 or error "ERROR: unable to write runtime file: $!";
3835 }; 4134 };
3836 } 4135 }
3837 4136
3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4137 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3839 $sig->send; 4138 $sig->send;
3847 4146
3848 if (0) { 4147 if (0) {
3849 if ($NEXT_TICK) { 4148 if ($NEXT_TICK) {
3850 my $jitter = $TICK_START - $NEXT_TICK; 4149 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4150 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d# 4151 debug "jitter $JITTER\n";#d#
3853 } 4152 }
3854 } 4153 }
3855} 4154}
3856 4155
3857{ 4156{
3858 # configure BDB 4157 # configure BDB
3859 4158
3860 BDB::min_parallel 8; 4159 BDB::min_parallel 16;
3861 BDB::max_poll_reqs $TICK * 0.1; 4160 BDB::max_poll_reqs $TICK * 0.1;
3862 $AnyEvent::BDB::WATCHER->priority (1); 4161 $AnyEvent::BDB::WATCHER->priority (1);
3863 4162
3864 unless ($DB_ENV) { 4163 unless ($DB_ENV) {
3865 $DB_ENV = BDB::db_env_create; 4164 $DB_ENV = BDB::db_env_create;
3902 IO::AIO::min_parallel 8; 4201 IO::AIO::min_parallel 8;
3903 IO::AIO::max_poll_time $TICK * 0.1; 4202 IO::AIO::max_poll_time $TICK * 0.1;
3904 undef $AnyEvent::AIO::WATCHER; 4203 undef $AnyEvent::AIO::WATCHER;
3905} 4204}
3906 4205
3907my $_log_backtrace; 4206our $_log_backtrace;
4207our $_log_backtrace_last;
3908 4208
3909sub _log_backtrace { 4209sub _log_backtrace {
3910 my ($msg, @addr) = @_; 4210 my ($msg, @addr) = @_;
3911 4211
3912 $msg =~ s/\n//; 4212 $msg =~ s/\n$//;
3913 4213
4214 if ($_log_backtrace_last eq $msg) {
4215 LOG llevInfo, "[ABT] $msg\n";
4216 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3914 # limit the # of concurrent backtraces 4217 # limit the # of concurrent backtraces
3915 if ($_log_backtrace < 2) { 4218 } elsif ($_log_backtrace < 2) {
4219 $_log_backtrace_last = $msg;
3916 ++$_log_backtrace; 4220 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg; 4221 my $perl_bt = Carp::longmess $msg;
3918 async { 4222 async {
3919 $Coro::current->{desc} = "abt $msg"; 4223 $Coro::current->{desc} = "abt $msg";
3920 4224
3940 LOG llevInfo, "[ABT] $_\n" for @bt; 4244 LOG llevInfo, "[ABT] $_\n" for @bt;
3941 --$_log_backtrace; 4245 --$_log_backtrace;
3942 }; 4246 };
3943 } else { 4247 } else {
3944 LOG llevInfo, "[ABT] $msg\n"; 4248 LOG llevInfo, "[ABT] $msg\n";
3945 LOG llevInfo, "[ABT] [suppressed]\n"; 4249 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3946 } 4250 }
3947} 4251}
3948 4252
3949# load additional modules 4253# load additional modules
3950require "cf/$_.pm" for @EXTRA_MODULES; 4254require "cf/$_.pm" for @EXTRA_MODULES;
4255cf::_connect_to_perl_2;
3951 4256
3952END { cf::emergency_save } 4257END { cf::emergency_save }
3953 4258
39541 42591
3955 4260

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines