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.459 by root, Sat Dec 13 21:46:12 2008 UTC vs.
Revision 1.553 by root, Tue May 18 21:30:16 2010 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 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 "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;
92our $DATADIR = datadir; 98our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
100our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 110
105our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
106 118
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 121our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
111 123
112our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 127our $DB_ENV;
116 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
117our %CFG; 131our %CFG;
118 132
119our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 134our $RUNTIME;
121our $NOW; 135our $NOW;
132our $JITTER; # average jitter 146our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
134 148
135our @POST_INIT; 149our @POST_INIT;
136 150
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
138 153
139binmode STDOUT; 154binmode STDOUT;
140binmode STDERR; 155binmode STDERR;
141 156
142# read virtual server time, if available 157# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
147} 162}
148 163
164eval "sub TICK() { $TICK } 1" or die;
165
149mkdir $_ 166mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 168
152our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
153 170
154sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 187
156############################################################################# 188#############################################################################
157 189
158=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
159 191
201from wherever your confdir points to. 233from wherever your confdir points to.
202 234
203=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
204 236
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
209=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
210 247
211This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
212C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 250that call.
214 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
215=back 258=back
216 259
217=cut 260=cut
218 261
219BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 269 my $msg = join "", @_;
222 270
223 $msg .= "\n" 271 $msg .= "\n"
224 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
225 273
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 275
228 LOG llevError, $msg; 276 LOG llevWarn, $msg;
229 }; 277};
230}
231 278
232$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
234 281
235 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 286 return;#d#
238 }#d# 287 }#d#
239 288
240 # kill coroutine otherwise 289 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 290 Coro::terminate
243}; 291};
244
245$SIG{__DIE__} = sub { }; #d#?
246 292
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 310)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 312}
267 313
268$EV::DIED = sub { 314$EV::DIED = sub {
269 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
270}; 316};
271 317
272############################################################################# 318#############################################################################
273 319
274=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 358
313sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
315 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
316=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
317 375
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
320 378
321The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 380is a reload or not.
323 381
324=cut 382=cut
325 383
326sub post_init(&) { 384sub post_init(&) {
327 push @POST_INIT, shift; 385 push @POST_INIT, shift;
386}
387
388sub _post_init {
389 trace "running post_init jobs";
390
391 # run them in parallel...
392
393 my @join;
394
395 while () {
396 push @join, map &Coro::async ($_, 0), @POST_INIT;
397 @POST_INIT = ();
398
399 @join or last;
400
401 (pop @join)->join;
402 }
328} 403}
329 404
330=item cf::lock_wait $string 405=item cf::lock_wait $string
331 406
332Wait until the given lock is available. See cf::lock_acquire. 407Wait until the given lock is available. See cf::lock_acquire.
371} 446}
372 447
373=item cf::periodic $interval, $cb 448=item cf::periodic $interval, $cb
374 449
375Like EV::periodic, but randomly selects a starting point so that the actions 450Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 451get spread over time.
377 452
378=cut 453=cut
379 454
380sub periodic($$) { 455sub periodic($$) {
381 my ($interval, $cb) = @_; 456 my ($interval, $cb) = @_;
398 473
399=cut 474=cut
400 475
401our @SLOT_QUEUE; 476our @SLOT_QUEUE;
402our $SLOT_QUEUE; 477our $SLOT_QUEUE;
478our $SLOT_DECAY = 0.9;
403 479
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 480$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 481$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 482 $Coro::current->desc ("timeslot manager");
407 483
408 my $signal = new Coro::Signal; 484 my $signal = new Coro::Signal;
485 my $busy;
409 486
410 while () { 487 while () {
411 next_job: 488 next_job:
489
412 my $avail = cf::till_tick; 490 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 491
414 for (0 .. $#SLOT_QUEUE) { 492 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 493 if ($SLOT_QUEUE[$_][0] <= $avail) {
494 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 495 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 496 $job->[2]->send;
418 Coro::cede; 497 Coro::cede;
419 goto next_job; 498 goto next_job;
420 } 499 } else {
500 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 501 }
422 } 502 }
423 503
424 if (@SLOT_QUEUE) { 504 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 505 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 506 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 507 $signal->wait;
428 } else { 508 } else {
509 $busy = 0;
429 Coro::schedule; 510 Coro::schedule;
430 } 511 }
431 } 512 }
432}; 513};
433 514
434sub get_slot($;$$) { 515sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 516 return if tick_inhibit || $Coro::current == $Coro::main;
436 517
437 my ($time, $pri, $name) = @_; 518 my ($time, $pri, $name) = @_;
438 519
439 $time = $TICK * .6 if $time > $TICK * .6; 520 $time = clamp $time, 0.01, $TICK * .6;
521
440 my $sig = new Coro::Signal; 522 my $sig = new Coro::Signal;
441 523
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 524 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 525 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 526 $SLOT_QUEUE->ready;
470=cut 552=cut
471 553
472sub sync_job(&) { 554sub sync_job(&) {
473 my ($job) = @_; 555 my ($job) = @_;
474 556
475 if ($Coro::current == $Coro::main) { 557 if (in_main) {
476 my $time = EV::time; 558 my $time = AE::time;
477 559
478 # this is the main coro, too bad, we have to block 560 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 561 # till the operation succeeds, freezing the server :/
480 562
481 LOG llevError, Carp::longmess "sync job";#d# 563 #LOG llevError, Carp::longmess "sync job";#d#
482 564
483 my $freeze_guard = freeze_mainloop; 565 my $freeze_guard = freeze_mainloop;
484 566
485 my $busy = 1; 567 my $busy = 1;
486 my @res; 568 my @res;
487 569
488 (async { 570 (async {
489 $Coro::current->desc ("sync job coro"); 571 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 572 @res = eval { $job->() };
491 warn $@ if $@; 573 error $@ if $@;
492 undef $busy; 574 undef $busy;
493 })->prio (Coro::PRIO_MAX); 575 })->prio (Coro::PRIO_MAX);
494 576
495 while ($busy) { 577 while ($busy) {
496 if (Coro::nready) { 578 if (Coro::nready) {
498 } else { 580 } else {
499 EV::loop EV::LOOP_ONESHOT; 581 EV::loop EV::LOOP_ONESHOT;
500 } 582 }
501 } 583 }
502 584
503 my $time = EV::time - $time; 585 my $time = AE::time - $time;
504 586
505 $TICK_START += $time; # do not account sync jobs to server load 587 $TICK_START += $time; # do not account sync jobs to server load
506 588
507 wantarray ? @res : $res[0] 589 wantarray ? @res : $res[0]
508 } else { 590 } else {
530 $EXT_CORO{$coro+0} = $coro; 612 $EXT_CORO{$coro+0} = $coro;
531 613
532 $coro 614 $coro
533} 615}
534 616
535=item fork_call { }, $args 617=item fork_call { }, @args
536 618
537Executes the given code block with the given arguments in a seperate 619Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 620process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 621Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 622never block itself or use any form of event handling.
541 623
542=cut 624=cut
543 625
626sub post_fork {
627 reset_signals;
628}
629
544sub fork_call(&@) { 630sub fork_call(&@) {
545 my ($cb, @args) = @_; 631 my ($cb, @args) = @_;
546 632
547 # we seemingly have to make a local copy of the whole thing, 633 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 634 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 635 # TODO: investigate and fix (likely this will be rather laborious)
550 636
551 my @res = Coro::Util::fork_eval { 637 my @res = Coro::Util::fork_eval {
552 reset_signals; 638 cf::post_fork;
553 &$cb 639 &$cb
554 }, @args; 640 } @args;
555 641
556 wantarray ? @res : $res[-1] 642 wantarray ? @res : $res[-1]
643}
644
645sub objinfo {
646 (
647 "counter value" => cf::object::object_count,
648 "objects created" => cf::object::create_count,
649 "objects destroyed" => cf::object::destroy_count,
650 "freelist size" => cf::object::free_count,
651 "allocated objects" => cf::object::objects_size,
652 "active objects" => cf::object::actives_size,
653 )
557} 654}
558 655
559=item $coin = coin_from_name $name 656=item $coin = coin_from_name $name
560 657
561=cut 658=cut
598within each server. 695within each server.
599 696
600=cut 697=cut
601 698
602sub db_table($) { 699sub db_table($) {
700 cf::error "db_get called from main context"
701 if $Coro::current == $Coro::main;
702
603 my ($name) = @_; 703 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 704 my $db = BDB::db_create $DB_ENV;
605 705
606 eval { 706 eval {
607 $db->set_flags (BDB::CHKSUM); 707 $db->set_flags (BDB::CHKSUM);
617} 717}
618 718
619our $DB; 719our $DB;
620 720
621sub db_init { 721sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 722 $DB ||= db_table "db";
624 };
625} 723}
626 724
627sub db_get($$) { 725sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 726 my $key = "$_[0]/$_[1]";
629 727
630 cf::sync_job { 728 cf::error "db_get called from main context"
729 if $Coro::current == $Coro::main;
730
631 BDB::db_get $DB, undef, $key, my $data; 731 BDB::db_get $DB, undef, $key, my $data;
632 732
633 $! ? () 733 $! ? ()
634 : $data 734 : $data
635 }
636} 735}
637 736
638sub db_put($$$) { 737sub db_put($$$) {
639 BDB::dbreq_pri 4; 738 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 739 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
696 795
697 my $t1 = Time::HiRes::time; 796 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 797 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 798 my $t2 = Time::HiRes::time;
700 799
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 800 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 801
703 db_put cache => "$id/data", $data; 802 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 803 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 804 db_put cache => "$id/meta", $meta;
706 805
716 815
717=cut 816=cut
718 817
719sub datalog($@) { 818sub datalog($@) {
720 my ($type, %kv) = @_; 819 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 820 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 821}
723 822
724=back 823=back
725 824
726=cut 825=cut
921 1020
922 } elsif (exists $cb_id{$type}) { 1021 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1022 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1023
925 } elsif (ref $type) { 1024 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1025 error "attaching objects not supported, ignoring.\n";
927 1026
928 } else { 1027 } else {
929 shift @arg; 1028 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1029 error "attach argument '$type' not supported, ignoring.\n";
931 } 1030 }
932 } 1031 }
933} 1032}
934 1033
935sub _object_attach { 1034sub _object_attach {
945 _attach $registry, $klass, @attach; 1044 _attach $registry, $klass, @attach;
946 } 1045 }
947 1046
948 $obj->{$name} = \%arg; 1047 $obj->{$name} = \%arg;
949 } else { 1048 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1049 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1050 }
952 1051
953 $obj->{_attachment}{$name} = undef; 1052 $obj->{_attachment}{$name} = undef;
954} 1053}
955 1054
1014 1113
1015 for (@$callbacks) { 1114 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1115 eval { &{$_->[1]} };
1017 1116
1018 if ($@) { 1117 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1118 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1119 override;
1022 } 1120 }
1023 1121
1024 return 1 if $override; 1122 return 1 if $override;
1025 } 1123 }
1104 for (@$attach) { 1202 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1203 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1204 _attach $registry, $klass, @attach;
1107 } 1205 }
1108 } else { 1206 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1207 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1208 }
1111 } 1209 }
1112} 1210}
1113 1211
1114cf::attachable->attach ( 1212cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1239 my ($filename, $rdata, $objs) = @_;
1142 1240
1143 sync_job { 1241 sync_job {
1144 if (length $$rdata) { 1242 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1243 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1244 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1245 $decname, length $$rdata, scalar @$objs
1246 if $VERBOSE_IO;
1148 1247
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1248 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1249 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1250 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1251 if ($cf::USE_FSYNC) {
1252 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1253 aio_fsync $fh;
1254 }
1153 aio_close $fh; 1255 aio_close $fh;
1154 1256
1155 if (@$objs) { 1257 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1258 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1259 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1260 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1261 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1262 if ($cf::USE_FSYNC) {
1263 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1264 aio_fsync $fh;
1265 }
1161 aio_close $fh; 1266 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1267 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1268 }
1164 } else { 1269 } else {
1165 aio_unlink "$filename.pst"; 1270 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1273 aio_rename "$filename~", $filename;
1169 1274
1170 $filename =~ s%/[^/]+$%%; 1275 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1276 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1277 } else {
1173 warn "FATAL: $filename~: $!\n"; 1278 error "unable to save objects: $filename~: $!\n";
1174 } 1279 }
1175 } else { 1280 } else {
1176 aio_unlink $filename; 1281 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1282 aio_unlink "$filename.pst";
1178 } 1283 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1307 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1308 $av = $st->{objs};
1204 } 1309 }
1205 1310
1206 utf8::decode (my $decname = $filename); 1311 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1312 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1313 $decname, length $data, scalar @{$av || []}
1314 if $VERBOSE_IO;
1209 1315
1210 ($data, $av) 1316 ($data, $av)
1211} 1317}
1212 1318
1213=head2 COMMAND CALLBACKS 1319=head2 COMMAND CALLBACKS
1272} 1378}
1273 1379
1274use File::Glob (); 1380use File::Glob ();
1275 1381
1276cf::player->attach ( 1382cf::player->attach (
1277 on_command => sub { 1383 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1384 my ($pl, $name, $params) = @_;
1279 1385
1280 my $cb = $COMMAND{$name} 1386 my $cb = $COMMAND{$name}
1281 or return; 1387 or return;
1282 1388
1305 1411
1306 $pl->ext_reply ($reply, @reply) 1412 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1413 if $reply;
1308 1414
1309 } else { 1415 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1416 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1417 }
1312 1418
1313 cf::override; 1419 cf::override;
1314 }, 1420 },
1315); 1421);
1316 1422
1317# "readahead" all extensions 1423# "readahead" all extensions
1318sub cache_extensions { 1424sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1425 my $grp = IO::AIO::aio_group;
1320 1426
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1427 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1428 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1429 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1430 }
1325 }; 1431 };
1326 1432
1327 $grp 1433 $grp
1328} 1434}
1329 1435
1330sub load_extensions { 1436sub load_extensions {
1437 info "loading extensions...";
1438
1331 cf::sync_job { 1439 cf::sync_job {
1332 my %todo; 1440 my %todo;
1333 1441
1334 for my $path (<$LIBDIR/*.ext>) { 1442 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1443 next unless -r $path;
1353 1461
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1462 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1463 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1464
1357 $ext{source} = 1465 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1466 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1467 . "#line 1 \"$path\"\n{\n"
1360 . $source 1468 . $source
1361 . "\n};\n1"; 1469 . "\n};\n1";
1362 1470
1363 $todo{$base} = \%ext; 1471 $todo{$base} = \%ext;
1364 } 1472 }
1365 1473
1474 my $pass = 0;
1366 my %done; 1475 my %done;
1367 while (%todo) { 1476 while (%todo) {
1368 my $progress; 1477 my $progress;
1369 1478
1479 ++$pass;
1480
1481 ext:
1370 while (my ($k, $v) = each %todo) { 1482 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1483 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1484 next ext
1373 unless exists $done{$_}; 1485 unless exists $done{$_};
1374 } 1486 }
1375 1487
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1488 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1489
1378 unless (eval $v->{source}) { 1490 my $active = eval $v->{source};
1491
1492 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1493 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1494
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1495 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1496 if exists $v->{meta}{mandatory};
1386 1497
1387 warn $msg; 1498 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1499 delete $todo{$k};
1500 } else {
1501 $done{$k} = delete $todo{$k};
1502 push @EXTS, $v->{pkg};
1503 $progress = 1;
1504
1505 info "$v->{base}: extension inactive.\n"
1506 unless $active;
1388 } 1507 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1508 }
1394 1509
1395 skip: 1510 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1511 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1512
1513 while (my ($k, $v) = each %todo) {
1514 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515 if exists $v->{meta}{mandatory};
1516 }
1517 }
1398 } 1518 }
1399 }; 1519 };
1400} 1520}
1401 1521
1402############################################################################# 1522#############################################################################
1486 $cf::PLAYER{$login} = $pl 1606 $cf::PLAYER{$login} = $pl
1487 } 1607 }
1488 } 1608 }
1489} 1609}
1490 1610
1611cf::player->attach (
1612 on_load => sub {
1613 my ($pl, $path) = @_;
1614
1615 # restore slots saved in save, below
1616 my $slots = delete $pl->{_slots};
1617
1618 $pl->ob->current_weapon ($slots->[0]);
1619 $pl->combat_ob ($slots->[1]);
1620 $pl->ranged_ob ($slots->[2]);
1621 },
1622);
1623
1491sub save($) { 1624sub save($) {
1492 my ($pl) = @_; 1625 my ($pl) = @_;
1493 1626
1494 return if $pl->{deny_save}; 1627 return if $pl->{deny_save};
1495 1628
1500 1633
1501 aio_mkdir playerdir $pl, 0770; 1634 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1635 $pl->{last_save} = $cf::RUNTIME;
1503 1636
1504 cf::get_slot 0.01; 1637 cf::get_slot 0.01;
1638
1639 # save slots, to be restored later
1640 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1641
1506 $pl->save_pl ($path); 1642 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1643 cf::cede_to_tick;
1508} 1644}
1509 1645
1543 my $name = $pl->ob->name; 1679 my $name = $pl->ob->name;
1544 1680
1545 $pl->{deny_save} = 1; 1681 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1682 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1683
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1684 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1685 $pl->deactivate;
1686
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1687 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1688 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1689 ext::highscore::check ($pl->ob);
1690
1553 $pl->ns->destroy if $pl->ns; 1691 $pl->ns->destroy if $pl->ns;
1554 1692
1555 my $path = playerdir $pl; 1693 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1694 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1695 aio_rename $path, $temp;
1611 \@logins 1749 \@logins
1612} 1750}
1613 1751
1614=item $player->maps 1752=item $player->maps
1615 1753
1754=item cf::player::maps $login
1755
1616Returns an arrayref of map paths that are private for this 1756Returns an arrayref of map paths that are private for this
1617player. May block. 1757player. May block.
1618 1758
1619=cut 1759=cut
1620 1760
1682=cut 1822=cut
1683 1823
1684sub find_by_path($) { 1824sub find_by_path($) {
1685 my ($path) = @_; 1825 my ($path) = @_;
1686 1826
1827 $path =~ s/^~[^\/]*//; # skip ~login
1828
1687 my ($match, $specificity); 1829 my ($match, $specificity);
1688 1830
1689 for my $region (list) { 1831 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1832 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1833 ($match, $specificity) = ($region, $region->specificity)
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1864 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1865
1724 # mit "rum" bekleckern, nicht 1866 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1867 $self->_create_random_map (
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1868 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1869 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1870 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map}, 1871 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize}, 1872 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1873 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1874 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1747 1889
1748sub register { 1890sub register {
1749 my (undef, $regex, $prio) = @_; 1891 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1892 my $pkg = caller;
1751 1893
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1894 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1895
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1896 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1897}
1757 1898
1758# also paths starting with '/' 1899# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1900$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1901
1761sub thawer_merge { 1902sub thawer_merge {
1762 my ($self, $merge) = @_; 1903 my ($self, $merge) = @_;
1763 1904
1764 # we have to keep some variables in memory intact 1905 # we have to keep some variables in memory intact
1769} 1910}
1770 1911
1771sub normalise { 1912sub normalise {
1772 my ($path, $base) = @_; 1913 my ($path, $base) = @_;
1773 1914
1774 $path = "$path"; # make sure its a string 1915 $path = "$path"; # make sure it's a string
1775 1916
1776 $path =~ s/\.map$//; 1917 $path =~ s/\.map$//;
1777 1918
1778 # map plan: 1919 # map plan:
1779 # 1920 #
1794 $base =~ s{[^/]+/?$}{}; 1935 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1936 $path = "$base/$path";
1796 } 1937 }
1797 1938
1798 for ($path) { 1939 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1940 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1941 redo if s{/[^/]+/\.\./}{/};
1802 } 1942 }
1803 1943
1804 $path 1944 $path
1818 $self->init; # pass $1 etc. 1958 $self->init; # pass $1 etc.
1819 return $self; 1959 return $self;
1820 } 1960 }
1821 } 1961 }
1822 1962
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1963 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1964 ()
1825} 1965}
1826 1966
1827sub init { 1967sub init {
1828 my ($self) = @_; 1968 my ($self) = @_;
1860sub uniq_path { 2000sub uniq_path {
1861 my ($self) = @_; 2001 my ($self) = @_;
1862 2002
1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2003 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1864 "$UNIQUEDIR/$path" 2004 "$UNIQUEDIR/$path"
1865}
1866
1867# and all this just because we cannot iterate over
1868# all maps in C++...
1869sub change_all_map_light {
1870 my ($change) = @_;
1871
1872 $_->change_map_light ($change)
1873 for grep $_->outdoor, values %cf::MAP;
1874} 2005}
1875 2006
1876sub decay_objects { 2007sub decay_objects {
1877 my ($self) = @_; 2008 my ($self) = @_;
1878 2009
1959} 2090}
1960 2091
1961sub find; 2092sub find;
1962sub find { 2093sub find {
1963 my ($path, $origin) = @_; 2094 my ($path, $origin) = @_;
2095
2096 cf::cede_to_tick;
1964 2097
1965 $path = normalise $path, $origin && $origin->path; 2098 $path = normalise $path, $origin && $origin->path;
1966 2099
1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2100 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1968 my $guard2 = cf::lock_acquire "map_find:$path"; 2101 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2120
1988 $cf::MAP{$path} = $map 2121 $cf::MAP{$path} = $map
1989 } 2122 }
1990} 2123}
1991 2124
1992sub pre_load { } 2125sub pre_load { }
1993sub post_load { } 2126#sub post_load { } # XS
1994 2127
1995sub load { 2128sub load {
1996 my ($self) = @_; 2129 my ($self) = @_;
1997 2130
1998 local $self->{deny_reset} = 1; # loading can take a long time 2131 local $self->{deny_reset} = 1; # loading can take a long time
2043 unless ($self->{deny_activate}) { 2176 unless ($self->{deny_activate}) {
2044 $self->decay_objects; 2177 $self->decay_objects;
2045 $self->fix_auto_apply; 2178 $self->fix_auto_apply;
2046 $self->update_buttons; 2179 $self->update_buttons;
2047 cf::cede_to_tick; 2180 cf::cede_to_tick;
2048 $self->set_darkness_map;
2049 cf::cede_to_tick;
2050 $self->activate; 2181 $self->activate;
2051 } 2182 }
2052 2183
2053 $self->{last_save} = $cf::RUNTIME; 2184 $self->{last_save} = $cf::RUNTIME;
2054 $self->last_access ($cf::RUNTIME); 2185 $self->last_access ($cf::RUNTIME);
2055 2186
2056 $self->in_memory (cf::MAP_ACTIVE); 2187 $self->in_memory (cf::MAP_ACTIVE);
2057 } 2188 }
2058 2189
2059 $self->post_load; 2190 $self->post_load;
2060}
2061 2191
2192 1
2193}
2194
2195# customize the map for a given player, i.e.
2196# return the _real_ map. used by e.g. per-player
2197# maps to change the path to ~playername/mappath
2062sub customise_for { 2198sub customise_for {
2063 my ($self, $ob) = @_; 2199 my ($self, $ob) = @_;
2064 2200
2065 return find "~" . $ob->name . "/" . $self->{path} 2201 return find "~" . $ob->name . "/" . $self->{path}
2066 if $self->per_player; 2202 if $self->per_player;
2082 or next; 2218 or next;
2083 $neigh = find $neigh, $map 2219 $neigh = find $neigh, $map
2084 or next; 2220 or next;
2085 $neigh->load; 2221 $neigh->load;
2086 2222
2223 # now find the diagonal neighbours
2087 push @neigh, 2224 push @neigh,
2088 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2225 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2089 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2226 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2090 } 2227 }
2091 2228
2098} 2235}
2099 2236
2100sub find_sync { 2237sub find_sync {
2101 my ($path, $origin) = @_; 2238 my ($path, $origin) = @_;
2102 2239
2103 cf::sync_job { find $path, $origin } 2240 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2241 if $Coro::current == $Coro::main;
2242
2243 find $path, $origin
2104} 2244}
2105 2245
2106sub do_load_sync { 2246sub do_load_sync {
2107 my ($map) = @_; 2247 my ($map) = @_;
2108 2248
2109 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2249 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2110 if $Coro::current == $Coro::main; 2250 if $Coro::current == $Coro::main;
2111 2251
2112 cf::sync_job { $map->load }; 2252 $map->load;
2113} 2253}
2114 2254
2115our %MAP_PREFETCH; 2255our %MAP_PREFETCH;
2116our $MAP_PREFETCHER = undef; 2256our $MAP_PREFETCHER = undef;
2117 2257
2143 $MAP_PREFETCHER->prio (6); 2283 $MAP_PREFETCHER->prio (6);
2144 2284
2145 () 2285 ()
2146} 2286}
2147 2287
2288# common code, used by both ->save and ->swapout
2148sub save { 2289sub _save {
2149 my ($self) = @_; 2290 my ($self) = @_;
2150
2151 my $lock = cf::lock_acquire "map_data:$self->{path}";
2152 2291
2153 $self->{last_save} = $cf::RUNTIME; 2292 $self->{last_save} = $cf::RUNTIME;
2154 2293
2155 return unless $self->dirty; 2294 return unless $self->dirty;
2156 2295
2176 } else { 2315 } else {
2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2316 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2178 } 2317 }
2179} 2318}
2180 2319
2320sub save {
2321 my ($self) = @_;
2322
2323 my $lock = cf::lock_acquire "map_data:$self->{path}";
2324
2325 $self->_save;
2326}
2327
2181sub swap_out { 2328sub swap_out {
2182 my ($self) = @_; 2329 my ($self) = @_;
2183 2330
2184 # save first because save cedes
2185 $self->save;
2186
2187 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2331 my $lock = cf::lock_acquire "map_data:$self->{path}";
2188 2332
2189 return if $self->players;
2190 return if $self->in_memory != cf::MAP_ACTIVE; 2333 return if $self->in_memory != cf::MAP_ACTIVE;
2191 return if $self->{deny_save}; 2334 return if $self->{deny_save};
2335 return if $self->players;
2192 2336
2337 # first deactivate the map and "unlink" it from the core
2338 $self->deactivate;
2339 $_->clear_links_to ($self) for values %cf::MAP;
2193 $self->in_memory (cf::MAP_SWAPPED); 2340 $self->in_memory (cf::MAP_SWAPPED);
2341
2342 # then atomically save
2343 $self->_save;
2344
2345 # then free the map
2346 $self->clear;
2347}
2348
2349sub reset_at {
2350 my ($self) = @_;
2351
2352 # TODO: safety, remove and allow resettable per-player maps
2353 return 1e99 if $self->{deny_reset};
2354
2355 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2356 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2357
2358 $time + $to
2359}
2360
2361sub should_reset {
2362 my ($self) = @_;
2363
2364 $self->reset_at <= $cf::RUNTIME
2365}
2366
2367sub reset {
2368 my ($self) = @_;
2369
2370 my $lock = cf::lock_acquire "map_data:$self->{path}";
2371
2372 return if $self->players;
2373
2374 cf::trace "resetting map ", $self->path, "\n";
2375
2376 $self->in_memory (cf::MAP_SWAPPED);
2377
2378 # need to save uniques path
2379 unless ($self->{deny_save}) {
2380 my $uniq = $self->uniq_path; utf8::encode $uniq;
2381
2382 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2383 if $uniq;
2384 }
2385
2386 delete $cf::MAP{$self->path};
2194 2387
2195 $self->deactivate; 2388 $self->deactivate;
2196 $_->clear_links_to ($self) for values %cf::MAP; 2389 $_->clear_links_to ($self) for values %cf::MAP;
2197 $self->clear; 2390 $self->clear;
2198}
2199
2200sub reset_at {
2201 my ($self) = @_;
2202
2203 # TODO: safety, remove and allow resettable per-player maps
2204 return 1e99 if $self->{deny_reset};
2205
2206 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2207 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2208
2209 $time + $to
2210}
2211
2212sub should_reset {
2213 my ($self) = @_;
2214
2215 $self->reset_at <= $cf::RUNTIME
2216}
2217
2218sub reset {
2219 my ($self) = @_;
2220
2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2222
2223 return if $self->players;
2224
2225 warn "resetting map ", $self->path;
2226
2227 $self->in_memory (cf::MAP_SWAPPED);
2228
2229 # need to save uniques path
2230 unless ($self->{deny_save}) {
2231 my $uniq = $self->uniq_path; utf8::encode $uniq;
2232
2233 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2234 if $uniq;
2235 }
2236
2237 delete $cf::MAP{$self->path};
2238
2239 $self->deactivate;
2240 $_->clear_links_to ($self) for values %cf::MAP;
2241 $self->clear;
2242 2391
2243 $self->unlink_save; 2392 $self->unlink_save;
2244 $self->destroy; 2393 $self->destroy;
2245} 2394}
2246 2395
2254 2403
2255 delete $cf::MAP{$self->path}; 2404 delete $cf::MAP{$self->path};
2256 2405
2257 $self->unlink_save; 2406 $self->unlink_save;
2258 2407
2259 bless $self, "cf::map"; 2408 bless $self, "cf::map::wrap";
2260 delete $self->{deny_reset}; 2409 delete $self->{deny_reset};
2261 $self->{deny_save} = 1; 2410 $self->{deny_save} = 1;
2262 $self->reset_timeout (1); 2411 $self->reset_timeout (1);
2263 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2412 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2264 2413
2321 : normalise $_ 2470 : normalise $_
2322 } @{ aio_readdir $UNIQUEDIR or [] } 2471 } @{ aio_readdir $UNIQUEDIR or [] }
2323 ] 2472 ]
2324} 2473}
2325 2474
2475=item cf::map::static_maps
2476
2477Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2478file in the shared directory excluding F</styles> and F</editor>). May
2479block.
2480
2481=cut
2482
2483sub static_maps() {
2484 my @dirs = "";
2485 my @maps;
2486
2487 while (@dirs) {
2488 my $dir = shift @dirs;
2489
2490 next if $dir eq "/styles" || $dir eq "/editor";
2491
2492 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2493 or return;
2494
2495 for (@$files) {
2496 s/\.map$// or next;
2497 utf8::decode $_;
2498 push @maps, "$dir/$_";
2499 }
2500
2501 push @dirs, map "$dir/$_", @$dirs;
2502 }
2503
2504 \@maps
2505}
2506
2326=back 2507=back
2327 2508
2328=head3 cf::object 2509=head3 cf::object
2329 2510
2330=cut 2511=cut
2395 2576
2396our $SAY_CHANNEL = { 2577our $SAY_CHANNEL = {
2397 id => "say", 2578 id => "say",
2398 title => "Map", 2579 title => "Map",
2399 reply => "say ", 2580 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2581 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401}; 2582};
2402 2583
2403our $CHAT_CHANNEL = { 2584our $CHAT_CHANNEL = {
2404 id => "chat", 2585 id => "chat",
2405 title => "Chat", 2586 title => "Chat",
2462 2643
2463Freezes the player and moves him/her to a special map (C<{link}>). 2644Freezes the player and moves him/her to a special map (C<{link}>).
2464 2645
2465The player should be reasonably safe there for short amounts of time (e.g. 2646The player should be reasonably safe there for short amounts of time (e.g.
2466for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2647for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link 2648though, as the player cannot control the character while it is on the link
2468map. 2649map.
2469 2650
2470Will never block. 2651Will never block.
2471 2652
2472=item $player_object->leave_link ($map, $x, $y) 2653=item $player_object->leave_link ($map, $x, $y)
2493sub cf::object::player::enter_link { 2674sub cf::object::player::enter_link {
2494 my ($self) = @_; 2675 my ($self) = @_;
2495 2676
2496 $self->deactivate_recursive; 2677 $self->deactivate_recursive;
2497 2678
2679 ++$self->{_link_recursion};
2680
2498 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2681 return if UNIVERSAL::isa $self->map, "ext::map_link";
2499 2682
2500 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2683 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2501 if $self->map && $self->map->{path} ne "{link}"; 2684 if $self->map && $self->map->{path} ne "{link}";
2502 2685
2503 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2686 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2504} 2687}
2505 2688
2506sub cf::object::player::leave_link { 2689sub cf::object::player::leave_link {
2507 my ($self, $map, $x, $y) = @_; 2690 my ($self, $map, $x, $y) = @_;
2508 2691
2525 ($x, $y) = (-1, -1) 2708 ($x, $y) = (-1, -1)
2526 unless (defined $x) && (defined $y); 2709 unless (defined $x) && (defined $y);
2527 2710
2528 # use -1 or undef as default coordinates, not 0, 0 2711 # use -1 or undef as default coordinates, not 0, 0
2529 ($x, $y) = ($map->enter_x, $map->enter_y) 2712 ($x, $y) = ($map->enter_x, $map->enter_y)
2530 if $x <=0 && $y <= 0; 2713 if $x <= 0 && $y <= 0;
2531 2714
2532 $map->load; 2715 $map->load;
2533 $map->load_neighbours; 2716 $map->load_neighbours;
2534 2717
2535 return unless $self->contr->active; 2718 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2537 $self->activate_recursive;
2538 2719
2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2720 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2540 $self->enter_map ($map, $x, $y); 2721 if ($self->enter_map ($map, $x, $y)) {
2541} 2722 # entering was successful
2723 delete $self->{_link_recursion};
2724 # only activate afterwards, to support waiting in hooks
2725 $self->activate_recursive;
2726 }
2542 2727
2728}
2729
2543=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2730=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2544 2731
2545Moves the player to the given map-path and coordinates by first freezing 2732Moves the player to the given map-path and coordinates by first freezing
2546her, loading and preparing them map, calling the provided $check callback 2733her, loading and preparing them map, calling the provided $check callback
2547that has to return the map if sucecssful, and then unfreezes the player on 2734that has to return the map if sucecssful, and then unfreezes the player on
2548the new (success) or old (failed) map position. In either case, $done will 2735the new (success) or old (failed) map position. In either case, $done will
2555 2742
2556our $GOTOGEN; 2743our $GOTOGEN;
2557 2744
2558sub cf::object::player::goto { 2745sub cf::object::player::goto {
2559 my ($self, $path, $x, $y, $check, $done) = @_; 2746 my ($self, $path, $x, $y, $check, $done) = @_;
2747
2748 if ($self->{_link_recursion} >= $MAX_LINKS) {
2749 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2750 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2751 ($path, $x, $y) = @$EMERGENCY_POSITION;
2752 }
2560 2753
2561 # do generation counting so two concurrent goto's will be executed in-order 2754 # do generation counting so two concurrent goto's will be executed in-order
2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2755 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2563 2756
2564 $self->enter_link; 2757 $self->enter_link;
2588 my $map = eval { 2781 my $map = eval {
2589 my $map = defined $path ? cf::map::find $path : undef; 2782 my $map = defined $path ? cf::map::find $path : undef;
2590 2783
2591 if ($map) { 2784 if ($map) {
2592 $map = $map->customise_for ($self); 2785 $map = $map->customise_for ($self);
2593 $map = $check->($map) if $check && $map; 2786 $map = $check->($map, $x, $y, $self) if $check && $map;
2594 } else { 2787 } else {
2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2788 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2596 } 2789 }
2597 2790
2598 $map 2791 $map
2606 if ($gen == $self->{_goto_generation}) { 2799 if ($gen == $self->{_goto_generation}) {
2607 delete $self->{_goto_generation}; 2800 delete $self->{_goto_generation};
2608 $self->leave_link ($map, $x, $y); 2801 $self->leave_link ($map, $x, $y);
2609 } 2802 }
2610 2803
2611 $done->() if $done; 2804 $done->($self) if $done;
2612 })->prio (1); 2805 })->prio (1);
2613} 2806}
2614 2807
2615=item $player_object->enter_exit ($exit_object) 2808=item $player_object->enter_exit ($exit_object)
2616 2809
2709 $self->message ("Something went wrong deep within the deliantra server. " 2902 $self->message ("Something went wrong deep within the deliantra server. "
2710 . "I'll try to bring you back to the map you were before. " 2903 . "I'll try to bring you back to the map you were before. "
2711 . "Please report this to the dungeon master!", 2904 . "Please report this to the dungeon master!",
2712 cf::NDI_UNIQUE | cf::NDI_RED); 2905 cf::NDI_UNIQUE | cf::NDI_RED);
2713 2906
2714 warn "ERROR in enter_exit: $@"; 2907 error "ERROR in enter_exit: $@";
2715 $self->leave_link; 2908 $self->leave_link;
2716 } 2909 }
2717 })->prio (1); 2910 })->prio (1);
2718} 2911}
2719 2912
2731sub cf::client::send_drawinfo { 2924sub cf::client::send_drawinfo {
2732 my ($self, $text, $flags) = @_; 2925 my ($self, $text, $flags) = @_;
2733 2926
2734 utf8::encode $text; 2927 utf8::encode $text;
2735 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2928 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2929}
2930
2931=item $client->send_big_packet ($pkt)
2932
2933Like C<send_packet>, but tries to compress large packets, and fragments
2934them as required.
2935
2936=cut
2937
2938our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2939
2940sub cf::client::send_big_packet {
2941 my ($self, $pkt) = @_;
2942
2943 # try lzf for large packets
2944 $pkt = "lzf " . Compress::LZF::compress $pkt
2945 if 1024 <= length $pkt and $self->{can_lzf};
2946
2947 # split very large packets
2948 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2949 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2950 $pkt = "frag";
2951 }
2952
2953 $self->send_packet ($pkt);
2736} 2954}
2737 2955
2738=item $client->send_msg ($channel, $msg, $color, [extra...]) 2956=item $client->send_msg ($channel, $msg, $color, [extra...])
2739 2957
2740Send a drawinfo or msg packet to the client, formatting the msg for the 2958Send a drawinfo or msg packet to the client, formatting the msg for the
2744 2962
2745=cut 2963=cut
2746 2964
2747# non-persistent channels (usually the info channel) 2965# non-persistent channels (usually the info channel)
2748our %CHANNEL = ( 2966our %CHANNEL = (
2967 "c/motd" => {
2968 id => "infobox",
2969 title => "MOTD",
2970 reply => undef,
2971 tooltip => "The message of the day",
2972 },
2749 "c/identify" => { 2973 "c/identify" => {
2750 id => "infobox", 2974 id => "infobox",
2751 title => "Identify", 2975 title => "Identify",
2752 reply => undef, 2976 reply => undef,
2753 tooltip => "Items recently identified", 2977 tooltip => "Items recently identified",
2755 "c/examine" => { 2979 "c/examine" => {
2756 id => "infobox", 2980 id => "infobox",
2757 title => "Examine", 2981 title => "Examine",
2758 reply => undef, 2982 reply => undef,
2759 tooltip => "Signs and other items you examined", 2983 tooltip => "Signs and other items you examined",
2984 },
2985 "c/shopinfo" => {
2986 id => "infobox",
2987 title => "Shop Info",
2988 reply => undef,
2989 tooltip => "What your bargaining skill tells you about the shop",
2760 }, 2990 },
2761 "c/book" => { 2991 "c/book" => {
2762 id => "infobox", 2992 id => "infobox",
2763 title => "Book", 2993 title => "Book",
2764 reply => undef, 2994 reply => undef,
2780 id => "infobox", 3010 id => "infobox",
2781 title => "Body Parts", 3011 title => "Body Parts",
2782 reply => undef, 3012 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available", 3013 tooltip => "Shows which body parts you posess and are available",
2784 }, 3014 },
3015 "c/statistics" => {
3016 id => "infobox",
3017 title => "Statistics",
3018 reply => undef,
3019 tooltip => "Shows your primary statistics",
3020 },
2785 "c/skills" => { 3021 "c/skills" => {
2786 id => "infobox", 3022 id => "infobox",
2787 title => "Skills", 3023 title => "Skills",
2788 reply => undef, 3024 reply => undef,
2789 tooltip => "Shows your experience per skill and item power", 3025 tooltip => "Shows your experience per skill and item power",
3026 },
3027 "c/shopitems" => {
3028 id => "infobox",
3029 title => "Shop Items",
3030 reply => undef,
3031 tooltip => "Shows the items currently for sale in this shop",
3032 },
3033 "c/resistances" => {
3034 id => "infobox",
3035 title => "Resistances",
3036 reply => undef,
3037 tooltip => "Shows your resistances",
3038 },
3039 "c/pets" => {
3040 id => "infobox",
3041 title => "Pets",
3042 reply => undef,
3043 tooltip => "Shows information abotu your pets/a specific pet",
3044 },
3045 "c/perceiveself" => {
3046 id => "infobox",
3047 title => "Perceive Self",
3048 reply => undef,
3049 tooltip => "You gained detailed knowledge about yourself",
2790 }, 3050 },
2791 "c/uptime" => { 3051 "c/uptime" => {
2792 id => "infobox", 3052 id => "infobox",
2793 title => "Uptime", 3053 title => "Uptime",
2794 reply => undef, 3054 reply => undef,
2804 id => "party", 3064 id => "party",
2805 title => "Party", 3065 title => "Party",
2806 reply => "gsay ", 3066 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party", 3067 tooltip => "Messages and chat related to your party",
2808 }, 3068 },
3069 "c/death" => {
3070 id => "death",
3071 title => "Death",
3072 reply => undef,
3073 tooltip => "Reason for and more info about your most recent death",
3074 },
3075 "c/say" => $SAY_CHANNEL,
3076 "c/chat" => $CHAT_CHANNEL,
2809); 3077);
2810 3078
2811sub cf::client::send_msg { 3079sub cf::client::send_msg {
2812 my ($self, $channel, $msg, $color, @extra) = @_; 3080 my ($self, $channel, $msg, $color, @extra) = @_;
2813 3081
2818 3086
2819 # check predefined channels, for the benefit of C 3087 # check predefined channels, for the benefit of C
2820 if ($CHANNEL{$channel}) { 3088 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel}; 3089 $channel = $CHANNEL{$channel};
2822 3090
2823 $self->ext_msg (channel_info => $channel) 3091 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id}; 3092 $channel = $channel->{id};
2827 3093
2828 } elsif (ref $channel) { 3094 } elsif (ref $channel) {
2829 # send meta info to client, if not yet sent 3095 # send meta info to client, if not yet sent
2830 unless (exists $self->{channel}{$channel->{id}}) { 3096 unless (exists $self->{channel}{$channel->{id}}) {
2831 $self->{channel}{$channel->{id}} = $channel; 3097 $self->{channel}{$channel->{id}} = $channel;
2832 $self->ext_msg (channel_info => $channel) 3098 $self->ext_msg (channel_info => $channel);
2833 if $self->can_msg;
2834 } 3099 }
2835 3100
2836 $channel = $channel->{id}; 3101 $channel = $channel->{id};
2837 } 3102 }
2838 3103
2839 return unless @extra || length $msg; 3104 return unless @extra || length $msg;
2840 3105
2841 if ($self->can_msg) {
2842 # default colour, mask it out 3106 # default colour, mask it out
2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3107 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2844 if $color & cf::NDI_DEF; 3108 if $color & cf::NDI_DEF;
2845 3109
2846 my $pkt = "msg " 3110 my $pkt = "msg "
2847 . $self->{json_coder}->encode ( 3111 . $self->{json_coder}->encode (
2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3112 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 ); 3113 );
2850 3114
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt); 3115 $self->send_big_packet ($pkt);
2862 } else {
2863 if ($color >= 0) {
2864 # replace some tags by gcfclient-compatible ones
2865 for ($msg) {
2866 1 while
2867 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2868 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2869 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2870 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2871 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2872 }
2873
2874 $color &= cf::NDI_COLOR_MASK;
2875
2876 utf8::encode $msg;
2877
2878 if (0 && $msg =~ /\[/) {
2879 # COMMAND/INFO
2880 $self->send_packet ("drawextinfo $color 10 8 $msg")
2881 } else {
2882 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2883 $self->send_packet ("drawinfo $color $msg")
2884 }
2885 }
2886 }
2887} 3116}
2888 3117
2889=item $client->ext_msg ($type, @msg) 3118=item $client->ext_msg ($type, @msg)
2890 3119
2891Sends an ext event to the client. 3120Sends an ext event to the client.
2894 3123
2895sub cf::client::ext_msg($$@) { 3124sub cf::client::ext_msg($$@) {
2896 my ($self, $type, @msg) = @_; 3125 my ($self, $type, @msg) = @_;
2897 3126
2898 if ($self->extcmd == 2) { 3127 if ($self->extcmd == 2) {
2899 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3128 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2900 } elsif ($self->extcmd == 1) { # TODO: remove 3129 } elsif ($self->extcmd == 1) { # TODO: remove
2901 push @msg, msgtype => "event_$type"; 3130 push @msg, msgtype => "event_$type";
2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2903 } 3132 }
2904} 3133}
2905 3134
2906=item $client->ext_reply ($msgid, @msg) 3135=item $client->ext_reply ($msgid, @msg)
2907 3136
2911 3140
2912sub cf::client::ext_reply($$@) { 3141sub cf::client::ext_reply($$@) {
2913 my ($self, $id, @msg) = @_; 3142 my ($self, $id, @msg) = @_;
2914 3143
2915 if ($self->extcmd == 2) { 3144 if ($self->extcmd == 2) {
2916 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3145 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2917 } elsif ($self->extcmd == 1) { 3146 } elsif ($self->extcmd == 1) {
2918 #TODO: version 1, remove 3147 #TODO: version 1, remove
2919 unshift @msg, msgtype => "reply", msgid => $id; 3148 unshift @msg, msgtype => "reply", msgid => $id;
2920 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3149 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2921 } 3150 }
2922} 3151}
2923 3152
2924=item $success = $client->query ($flags, "text", \&cb) 3153=item $success = $client->query ($flags, "text", \&cb)
2925 3154
2996 3225
2997 $ns->ext_reply ($reply, @reply) 3226 $ns->ext_reply ($reply, @reply)
2998 if $reply; 3227 if $reply;
2999 3228
3000 } else { 3229 } else {
3001 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3230 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3002 } 3231 }
3003 3232
3004 cf::override; 3233 cf::override;
3005 }, 3234 },
3006); 3235);
3026 3255
3027 $coro 3256 $coro
3028} 3257}
3029 3258
3030cf::client->attach ( 3259cf::client->attach (
3031 on_destroy => sub { 3260 on_client_destroy => sub {
3032 my ($ns) = @_; 3261 my ($ns) = @_;
3033 3262
3034 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3263 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3035 }, 3264 },
3036); 3265);
3052our $safe_hole = new Safe::Hole; 3281our $safe_hole = new Safe::Hole;
3053 3282
3054$SIG{FPE} = 'IGNORE'; 3283$SIG{FPE} = 'IGNORE';
3055 3284
3056$safe->permit_only (Opcode::opset qw( 3285$safe->permit_only (Opcode::opset qw(
3057 :base_core :base_mem :base_orig :base_math 3286 :base_core :base_mem :base_orig :base_math :base_loop
3058 grepstart grepwhile mapstart mapwhile 3287 grepstart grepwhile mapstart mapwhile
3059 sort time 3288 sort time
3060)); 3289));
3061 3290
3062# here we export the classes and methods available to script code 3291# here we export the classes and methods available to script code
3066The following functions and methods are available within a safe environment: 3295The following functions and methods are available within a safe environment:
3067 3296
3068 cf::object 3297 cf::object
3069 contr pay_amount pay_player map x y force_find force_add destroy 3298 contr pay_amount pay_player map x y force_find force_add destroy
3070 insert remove name archname title slaying race decrease split 3299 insert remove name archname title slaying race decrease split
3300 value
3071 3301
3072 cf::object::player 3302 cf::object::player
3073 player 3303 player
3074 3304
3075 cf::player 3305 cf::player
3081=cut 3311=cut
3082 3312
3083for ( 3313for (
3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3314 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3085 insert remove inv nrof name archname title slaying race 3315 insert remove inv nrof name archname title slaying race
3086 decrease split destroy change_exp)], 3316 decrease split destroy change_exp value msg lore send_msg)],
3087 ["cf::object::player" => qw(player)], 3317 ["cf::object::player" => qw(player)],
3088 ["cf::player" => qw(peaceful)], 3318 ["cf::player" => qw(peaceful send_msg)],
3089 ["cf::map" => qw(trigger)], 3319 ["cf::map" => qw(trigger)],
3090) { 3320) {
3091 no strict 'refs';
3092 my ($pkg, @funs) = @$_; 3321 my ($pkg, @funs) = @$_;
3093 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3322 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3094 for @funs; 3323 for @funs;
3095} 3324}
3096 3325
3111 3340
3112 my $qcode = $code; 3341 my $qcode = $code;
3113 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3342 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3114 $qcode =~ s/\n/\\n/g; 3343 $qcode =~ s/\n/\\n/g;
3115 3344
3345 %vars = (_dummy => 0) unless %vars;
3346
3347 my @res;
3116 local $_; 3348 local $_;
3117 local @safe::cf::_safe_eval_args = values %vars;
3118 3349
3119 my $eval = 3350 my $eval =
3120 "do {\n" 3351 "do {\n"
3121 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3352 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3122 . "#line 0 \"{$qcode}\"\n" 3353 . "#line 0 \"{$qcode}\"\n"
3123 . $code 3354 . $code
3124 . "\n}" 3355 . "\n}"
3125 ; 3356 ;
3126 3357
3358 if ($CFG{safe_eval}) {
3127 sub_generation_inc; 3359 sub_generation_inc;
3360 local @safe::cf::_safe_eval_args = values %vars;
3128 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3361 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3129 sub_generation_inc; 3362 sub_generation_inc;
3363 } else {
3364 local @cf::_safe_eval_args = values %vars;
3365 @res = wantarray ? eval eval : scalar eval $eval;
3366 }
3130 3367
3131 if ($@) { 3368 if ($@) {
3132 warn "$@"; 3369 warn "$@",
3133 warn "while executing safe code '$code'\n"; 3370 "while executing safe code '$code'\n",
3134 warn "with arguments " . (join " ", %vars) . "\n"; 3371 "with arguments " . (join " ", %vars) . "\n";
3135 } 3372 }
3136 3373
3137 wantarray ? @res : $res[0] 3374 wantarray ? @res : $res[0]
3138} 3375}
3139 3376
3153=cut 3390=cut
3154 3391
3155sub register_script_function { 3392sub register_script_function {
3156 my ($fun, $cb) = @_; 3393 my ($fun, $cb) = @_;
3157 3394
3158 no strict 'refs'; 3395 $fun = "safe::$fun" if $CFG{safe_eval};
3159 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3396 *$fun = $safe_hole->wrap ($cb);
3160} 3397}
3161 3398
3162=back 3399=back
3163 3400
3164=cut 3401=cut
3173 # for this (global event?) 3410 # for this (global event?)
3174 %ext::player_env::MUSIC_FACE_CACHE = (); 3411 %ext::player_env::MUSIC_FACE_CACHE = ();
3175 3412
3176 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3413 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3177 3414
3178 warn "loading facedata from $path\n"; 3415 trace "loading facedata from $path\n";
3179 3416
3180 my $facedata;
3181 0 < aio_load $path, $facedata 3417 0 < aio_load $path, my $facedata
3182 or die "$path: $!"; 3418 or die "$path: $!";
3183 3419
3184 $facedata = Coro::Storable::thaw $facedata; 3420 $facedata = Coro::Storable::thaw $facedata;
3185 3421
3186 $facedata->{version} == 2 3422 $facedata->{version} == 2
3187 or cf::cleanup "$path: version mismatch, cannot proceed."; 3423 or cf::cleanup "$path: version mismatch, cannot proceed.";
3188 3424
3189 # patch in the exptable 3425 # patch in the exptable
3426 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3190 $facedata->{resource}{"res/exp_table"} = { 3427 $facedata->{resource}{"res/exp_table"} = {
3191 type => FT_RSRC, 3428 type => FT_RSRC,
3192 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3429 data => $exp_table,
3430 hash => (Digest::MD5::md5 $exp_table),
3193 }; 3431 };
3194 cf::cede_to_tick; 3432 cf::cede_to_tick;
3195 3433
3196 { 3434 {
3197 my $faces = $facedata->{faceinfo}; 3435 my $faces = $facedata->{faceinfo};
3199 while (my ($face, $info) = each %$faces) { 3437 while (my ($face, $info) = each %$faces) {
3200 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3438 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201 3439
3202 cf::face::set_visibility $idx, $info->{visibility}; 3440 cf::face::set_visibility $idx, $info->{visibility};
3203 cf::face::set_magicmap $idx, $info->{magicmap}; 3441 cf::face::set_magicmap $idx, $info->{magicmap};
3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3442 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3443 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3206 3444
3207 cf::cede_to_tick; 3445 cf::cede_to_tick;
3208 } 3446 }
3209 3447
3210 while (my ($face, $info) = each %$faces) { 3448 while (my ($face, $info) = each %$faces) {
3215 3453
3216 if (my $smooth = cf::face::find $info->{smooth}) { 3454 if (my $smooth = cf::face::find $info->{smooth}) {
3217 cf::face::set_smooth $idx, $smooth; 3455 cf::face::set_smooth $idx, $smooth;
3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3456 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3219 } else { 3457 } else {
3220 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3458 error "smooth face '$info->{smooth}' not found for face '$face'";
3221 } 3459 }
3222 3460
3223 cf::cede_to_tick; 3461 cf::cede_to_tick;
3224 } 3462 }
3225 } 3463 }
3234 3472
3235 cf::anim::invalidate_all; # d'oh 3473 cf::anim::invalidate_all; # d'oh
3236 } 3474 }
3237 3475
3238 { 3476 {
3239 # TODO: for gcfclient pleasure, we should give resources
3240 # that gcfclient doesn't grok a >10000 face index.
3241 my $res = $facedata->{resource}; 3477 my $res = $facedata->{resource};
3242 3478
3243 while (my ($name, $info) = each %$res) { 3479 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) { 3480 if (defined $info->{type}) {
3245 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3481 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3246 my $data;
3247 3482
3248 if ($info->{type} & 1) { 3483 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3249 # prepend meta info
3250
3251 my $meta = $enc->encode ({
3252 name => $name,
3253 %{ $info->{meta} || {} },
3254 });
3255
3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type}; 3484 cf::face::set_type $idx, $info->{type};
3263 } else { 3485 } else {
3264 $RESOURCE{$name} = $info; 3486 $RESOURCE{$name} = $info; # unused
3265 } 3487 }
3266 3488
3267 cf::cede_to_tick; 3489 cf::cede_to_tick;
3268 } 3490 }
3269 } 3491 }
3270 3492
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3493 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3272 3494
3273 1 3495 1
3274} 3496}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3295 3497
3296register_exticmd fx_want => sub { 3498register_exticmd fx_want => sub {
3297 my ($ns, $want) = @_; 3499 my ($ns, $want) = @_;
3298 3500
3299 while (my ($k, $v) = each %$want) { 3501 while (my ($k, $v) = each %$want) {
3338sub reload_treasures { 3540sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3541 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3542 or die "unable to load treasurelists\n";
3341} 3543}
3342 3544
3545sub reload_sound {
3546 trace "loading sound config from $DATADIR/sound\n";
3547
3548 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549 or die "$DATADIR/sound $!";
3550
3551 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3552
3553 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554 my $sound = $soundconf->{compat}[$_]
3555 or next;
3556
3557 my $face = cf::face::find "sound/$sound->[1]";
3558 cf::sound::set $sound->[0] => $face;
3559 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3560 }
3561
3562 while (my ($k, $v) = each %{$soundconf->{event}}) {
3563 my $face = cf::face::find "sound/$v";
3564 cf::sound::set $k => $face;
3565 }
3566}
3567
3343sub reload_resources { 3568sub reload_resources {
3344 warn "reloading resource files...\n"; 3569 trace "reloading resource files...\n";
3345 3570
3571 reload_exp_table;
3572 reload_materials;
3346 reload_facedata; 3573 reload_facedata;
3574 reload_sound;
3347 reload_archetypes; 3575 reload_archetypes;
3348 reload_regions; 3576 reload_regions;
3349 reload_treasures; 3577 reload_treasures;
3350 3578
3351 warn "finished reloading resource files\n"; 3579 trace "finished reloading resource files\n";
3352} 3580}
3353 3581
3354sub reload_config { 3582sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3583 trace "reloading config file...\n";
3356 or return;
3357 3584
3358 local $/; 3585 0 < aio_load "$CONFDIR/config", my $config
3359 *CFG = YAML::Load <$fh>; 3586 or die "$CONFDIR/config: $!";
3360 3587
3588 utf8::decode $config;
3589 *CFG = yaml_load $config;
3590
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3591 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3592
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3593 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3594 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3595
3366 if (exists $CFG{mlockall}) { 3596 if (exists $CFG{mlockall}) {
3389 3619
3390 seek $fh, 0, 0; 3620 seek $fh, 0, 0;
3391 print $fh $$; 3621 print $fh $$;
3392} 3622}
3393 3623
3624sub main_loop {
3625 trace "EV::loop starting\n";
3626 if (1) {
3627 EV::loop;
3628 }
3629 trace "EV::loop returned\n";
3630 goto &main_loop unless $REALLY_UNLOOP;
3631}
3632
3394sub main { 3633sub main {
3395 cf::init_globals; # initialise logging 3634 cf::init_globals; # initialise logging
3396 3635
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3636 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3637 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3638 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3639 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407 3640
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3641 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409 3642
3410 # we must not ever block the main coroutine 3643 # we must not ever block the main coroutine
3411 local $Coro::idle = sub { 3644 local $Coro::idle = sub {
3417 }; 3650 };
3418 3651
3419 evthread_start IO::AIO::poll_fileno; 3652 evthread_start IO::AIO::poll_fileno;
3420 3653
3421 cf::sync_job { 3654 cf::sync_job {
3655 cf::incloader::init ();
3656
3657 cf::init_anim;
3658 cf::init_attackmess;
3659 cf::init_dynamic;
3660
3661 cf::load_settings;
3662
3422 reload_resources; 3663 reload_resources;
3423 reload_config; 3664 reload_config;
3424 db_init; 3665 db_init;
3425 3666
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid; 3667 cf::init_uuid;
3429 cf::init_signals; 3668 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills; 3669 cf::init_skills;
3432 3670
3433 cf::init_beforeplay; 3671 cf::init_beforeplay;
3434 3672
3435 atomic; 3673 atomic;
3437 load_extensions; 3675 load_extensions;
3438 3676
3439 utime time, time, $RUNTIMEFILE; 3677 utime time, time, $RUNTIMEFILE;
3440 3678
3441 # no (long-running) fork's whatsoever before this point(!) 3679 # no (long-running) fork's whatsoever before this point(!)
3680 use POSIX ();
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3681 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443 3682
3444 (pop @POST_INIT)->(0) while @POST_INIT; 3683 cf::_post_init 0;
3445 }; 3684 };
3446 3685
3447 EV::loop; 3686 cf::object::thawer::errors_are_fatal 0;
3687 info "parse errors in files are no longer fatal from this point on.\n";
3688
3689 my $free_main; $free_main = EV::idle sub {
3690 undef $free_main;
3691 undef &main; # free gobs of memory :)
3692 };
3693
3694 goto &main_loop;
3448} 3695}
3449 3696
3450############################################################################# 3697#############################################################################
3451# initialisation and cleanup 3698# initialisation and cleanup
3452 3699
3453# install some emergency cleanup handlers 3700# install some emergency cleanup handlers
3454BEGIN { 3701BEGIN {
3455 our %SIGWATCHER = (); 3702 our %SIGWATCHER = ();
3456 for my $signal (qw(INT HUP TERM)) { 3703 for my $signal (qw(INT HUP TERM)) {
3457 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3704 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3458 cf::cleanup "SIG$signal"; 3705 cf::cleanup "SIG$signal";
3459 }; 3706 };
3460 } 3707 }
3461} 3708}
3462 3709
3463sub write_runtime_sync { 3710sub write_runtime_sync {
3711 my $t0 = AE::time;
3712
3464 # first touch the runtime file to show we are still running: 3713 # first touch the runtime file to show we are still running:
3465 # the fsync below can take a very very long time. 3714 # the fsync below can take a very very long time.
3466 3715
3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3716 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3468 3717
3469 my $guard = cf::lock_acquire "write_runtime"; 3718 my $guard = cf::lock_acquire "write_runtime";
3470 3719
3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3720 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3472 or return; 3721 or return;
3473 3722
3474 my $value = $cf::RUNTIME + 90 + 10; 3723 my $value = $cf::RUNTIME + 90 + 10;
3475 # 10 is the runtime save interval, for a monotonic clock 3724 # 10 is the runtime save interval, for a monotonic clock
3476 # 60 allows for the watchdog to kill the server. 3725 # 60 allows for the watchdog to kill the server.
3489 or return; 3738 or return;
3490 3739
3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3740 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3492 and return; 3741 and return;
3493 3742
3494 warn "runtime file written.\n"; 3743 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3495 3744
3496 1 3745 1
3497} 3746}
3498 3747
3499our $uuid_lock; 3748our $uuid_lock;
3511 or return; 3760 or return;
3512 3761
3513 my $value = uuid_seq uuid_cur; 3762 my $value = uuid_seq uuid_cur;
3514 3763
3515 unless ($value) { 3764 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n"; 3765 info "cowardly refusing to write zero uuid value!\n";
3517 return; 3766 return;
3518 } 3767 }
3519 3768
3520 my $value = uuid_str $value + $uuid_skip; 3769 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0; 3770 $uuid_skip = 0;
3531 or return; 3780 or return;
3532 3781
3533 aio_rename "$uuid~", $uuid 3782 aio_rename "$uuid~", $uuid
3534 and return; 3783 and return;
3535 3784
3536 warn "uuid file written ($value).\n"; 3785 trace "uuid file written ($value).\n";
3537 3786
3538 1 3787 1
3539 3788
3540} 3789}
3541 3790
3547} 3796}
3548 3797
3549sub emergency_save() { 3798sub emergency_save() {
3550 my $freeze_guard = cf::freeze_mainloop; 3799 my $freeze_guard = cf::freeze_mainloop;
3551 3800
3552 warn "emergency_perl_save: enter\n"; 3801 info "emergency_perl_save: enter\n";
3802
3803 # this is a trade-off: we want to be very quick here, so
3804 # save all maps without fsync, and later call a global sync
3805 # (which in turn might be very very slow)
3806 local $USE_FSYNC = 0;
3553 3807
3554 cf::sync_job { 3808 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so 3809 cf::write_runtime_sync; # external watchdog should not bark
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559 3810
3560 # use a peculiar iteration method to avoid tripping on perl 3811 # use a peculiar iteration method to avoid tripping on perl
3561 # refcount bugs in for. also avoids problems with players 3812 # refcount bugs in for. also avoids problems with players
3562 # and maps saved/destroyed asynchronously. 3813 # and maps saved/destroyed asynchronously.
3563 warn "emergency_perl_save: begin player save\n"; 3814 info "emergency_perl_save: begin player save\n";
3564 for my $login (keys %cf::PLAYER) { 3815 for my $login (keys %cf::PLAYER) {
3565 my $pl = $cf::PLAYER{$login} or next; 3816 my $pl = $cf::PLAYER{$login} or next;
3566 $pl->valid or next; 3817 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3818 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3568 $pl->save; 3819 $pl->save;
3569 } 3820 }
3570 warn "emergency_perl_save: end player save\n"; 3821 info "emergency_perl_save: end player save\n";
3571 3822
3823 cf::write_runtime_sync; # external watchdog should not bark
3824
3572 warn "emergency_perl_save: begin map save\n"; 3825 info "emergency_perl_save: begin map save\n";
3573 for my $path (keys %cf::MAP) { 3826 for my $path (keys %cf::MAP) {
3574 my $map = $cf::MAP{$path} or next; 3827 my $map = $cf::MAP{$path} or next;
3575 $map->valid or next; 3828 $map->valid or next;
3576 $map->save; 3829 $map->save;
3577 } 3830 }
3578 warn "emergency_perl_save: end map save\n"; 3831 info "emergency_perl_save: end map save\n";
3579 3832
3833 cf::write_runtime_sync; # external watchdog should not bark
3834
3580 warn "emergency_perl_save: begin database checkpoint\n"; 3835 info "emergency_perl_save: begin database checkpoint\n";
3581 BDB::db_env_txn_checkpoint $DB_ENV; 3836 BDB::db_env_txn_checkpoint $DB_ENV;
3582 warn "emergency_perl_save: end database checkpoint\n"; 3837 info "emergency_perl_save: end database checkpoint\n";
3583 3838
3584 warn "emergency_perl_save: begin write uuid\n"; 3839 info "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1; 3840 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n"; 3841 info "emergency_perl_save: end write uuid\n";
3842
3843 cf::write_runtime_sync; # external watchdog should not bark
3844
3845 trace "emergency_perl_save: syncing database to disk";
3846 BDB::db_env_txn_checkpoint $DB_ENV;
3847
3848 info "emergency_perl_save: starting sync\n";
3849 IO::AIO::aio_sync sub {
3850 info "emergency_perl_save: finished sync\n";
3851 };
3852
3853 cf::write_runtime_sync; # external watchdog should not bark
3854
3855 trace "emergency_perl_save: flushing outstanding aio requests";
3856 while (IO::AIO::nreqs || BDB::nreqs) {
3857 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3858 }
3859
3860 cf::write_runtime_sync; # external watchdog should not bark
3587 }; 3861 };
3588 3862
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3594 warn "emergency_perl_save: leave\n"; 3863 info "emergency_perl_save: leave\n";
3595} 3864}
3596 3865
3597sub post_cleanup { 3866sub post_cleanup {
3598 my ($make_core) = @_; 3867 my ($make_core) = @_;
3599 3868
3869 IO::AIO::flush;
3870
3600 warn Carp::longmess "post_cleanup backtrace" 3871 error Carp::longmess "post_cleanup backtrace"
3601 if $make_core; 3872 if $make_core;
3602 3873
3603 my $fh = pidfile; 3874 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$; 3875 unlink $PIDFILE if <$fh> == $$;
3605} 3876}
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3896 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) { 3897 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"}; 3898 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3899# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 } 3900 }
3630 warn "cleared package $pkg\n";#d#
3631} 3901}
3632 3902
3633sub do_reload_perl() { 3903sub do_reload_perl() {
3634 # can/must only be called in main 3904 # can/must only be called in main
3635 if ($Coro::current != $Coro::main) { 3905 unless (in_main) {
3636 warn "can only reload from main coroutine"; 3906 error "can only reload from main coroutine";
3637 return; 3907 return;
3638 } 3908 }
3639 3909
3640 return if $RELOAD++; 3910 return if $RELOAD++;
3641 3911
3642 my $t1 = EV::time; 3912 my $t1 = AE::time;
3643 3913
3644 while ($RELOAD) { 3914 while ($RELOAD) {
3645 warn "reloading..."; 3915 cf::get_slot 0.1, -1, "reload_perl";
3916 info "perl_reload: reloading...";
3646 3917
3647 warn "entering sync_job"; 3918 trace "perl_reload: entering sync_job";
3648 3919
3649 cf::sync_job { 3920 cf::sync_job {
3650 cf::write_runtime_sync; # external watchdog should not bark
3651 cf::emergency_save; 3921 #cf::emergency_save;
3652 cf::write_runtime_sync; # external watchdog should not bark
3653 3922
3654 warn "syncing database to disk";
3655 BDB::db_env_txn_checkpoint $DB_ENV;
3656
3657 # if anything goes wrong in here, we should simply crash as we already saved
3658
3659 warn "flushing outstanding aio requests";
3660 while (IO::AIO::nreqs || BDB::nreqs) {
3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3662 }
3663
3664 warn "cancelling all extension coros"; 3923 trace "perl_reload: cancelling all extension coros";
3665 $_->cancel for values %EXT_CORO; 3924 $_->cancel for values %EXT_CORO;
3666 %EXT_CORO = (); 3925 %EXT_CORO = ();
3667 3926
3668 warn "removing commands"; 3927 trace "perl_reload: removing commands";
3669 %COMMAND = (); 3928 %COMMAND = ();
3670 3929
3671 warn "removing ext/exti commands"; 3930 trace "perl_reload: removing ext/exti commands";
3672 %EXTCMD = (); 3931 %EXTCMD = ();
3673 %EXTICMD = (); 3932 %EXTICMD = ();
3674 3933
3675 warn "unloading/nuking all extensions"; 3934 trace "perl_reload: unloading/nuking all extensions";
3676 for my $pkg (@EXTS) { 3935 for my $pkg (@EXTS) {
3677 warn "... unloading $pkg"; 3936 trace "... unloading $pkg";
3678 3937
3679 if (my $cb = $pkg->can ("unload")) { 3938 if (my $cb = $pkg->can ("unload")) {
3680 eval { 3939 eval {
3681 $cb->($pkg); 3940 $cb->($pkg);
3682 1 3941 1
3683 } or warn "$pkg unloaded, but with errors: $@"; 3942 } or error "$pkg unloaded, but with errors: $@";
3684 } 3943 }
3685 3944
3686 warn "... clearing $pkg"; 3945 trace "... clearing $pkg";
3687 clear_package $pkg; 3946 clear_package $pkg;
3688 } 3947 }
3689 3948
3690 warn "unloading all perl modules loaded from $LIBDIR"; 3949 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) { 3950 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3951 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693 3952
3694 warn "... unloading $k"; 3953 trace "... unloading $k";
3695 delete $INC{$k}; 3954 delete $INC{$k};
3696 3955
3697 $k =~ s/\.pm$//; 3956 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g; 3957 $k =~ s/\//::/g;
3699 3958
3702 } 3961 }
3703 3962
3704 clear_package $k; 3963 clear_package $k;
3705 } 3964 }
3706 3965
3707 warn "getting rid of safe::, as good as possible"; 3966 trace "perl_reload: getting rid of safe::, as good as possible";
3708 clear_package "safe::$_" 3967 clear_package "safe::$_"
3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3968 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3710 3969
3711 warn "unloading cf.pm \"a bit\""; 3970 trace "perl_reload: unloading cf.pm \"a bit\"";
3712 delete $INC{"cf.pm"}; 3971 delete $INC{"cf.pm"};
3713 delete $INC{"cf/pod.pm"}; 3972 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3714 3973
3715 # don't, removes xs symbols, too, 3974 # don't, removes xs symbols, too,
3716 # and global variables created in xs 3975 # and global variables created in xs
3717 #clear_package __PACKAGE__; 3976 #clear_package __PACKAGE__;
3718 3977
3719 warn "unload completed, starting to reload now"; 3978 info "perl_reload: unload completed, starting to reload now";
3720 3979
3721 warn "reloading cf.pm"; 3980 trace "perl_reload: reloading cf.pm";
3722 require cf; 3981 require cf;
3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3982 cf::_connect_to_perl_1;
3724 3983
3725 warn "loading config and database again"; 3984 trace "perl_reload: loading config and database again";
3726 cf::reload_config; 3985 cf::reload_config;
3727 3986
3728 warn "loading extensions"; 3987 trace "perl_reload: loading extensions";
3729 cf::load_extensions; 3988 cf::load_extensions;
3730 3989
3731 if ($REATTACH_ON_RELOAD) { 3990 if ($REATTACH_ON_RELOAD) {
3732 warn "reattaching attachments to objects/players"; 3991 trace "perl_reload: reattaching attachments to objects/players";
3733 _global_reattach; # objects, sockets 3992 _global_reattach; # objects, sockets
3734 warn "reattaching attachments to maps"; 3993 trace "perl_reload: reattaching attachments to maps";
3735 reattach $_ for values %MAP; 3994 reattach $_ for values %MAP;
3736 warn "reattaching attachments to players"; 3995 trace "perl_reload: reattaching attachments to players";
3737 reattach $_ for values %PLAYER; 3996 reattach $_ for values %PLAYER;
3738 } 3997 }
3739 3998
3740 warn "running post_init jobs"; 3999 cf::_post_init 1;
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742 4000
3743 warn "leaving sync_job"; 4001 trace "perl_reload: leaving sync_job";
3744 4002
3745 1 4003 1
3746 } or do { 4004 } or do {
3747 warn $@; 4005 error $@;
3748 cf::cleanup "error while reloading, exiting."; 4006 cf::cleanup "perl_reload: error, exiting.";
3749 }; 4007 };
3750 4008
3751 warn "reloaded";
3752 --$RELOAD; 4009 --$RELOAD;
3753 } 4010 }
3754 4011
3755 $t1 = EV::time - $t1; 4012 $t1 = AE::time - $t1;
3756 warn "reload completed in ${t1}s\n"; 4013 info "perl_reload: completed in ${t1}s\n";
3757}; 4014};
3758 4015
3759our $RELOAD_WATCHER; # used only during reload 4016our $RELOAD_WATCHER; # used only during reload
3760 4017
3761sub reload_perl() { 4018sub reload_perl() {
3763 # coro crashes during coro_state_free->destroy here. 4020 # coro crashes during coro_state_free->destroy here.
3764 4021
3765 $RELOAD_WATCHER ||= cf::async { 4022 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions; 4023 Coro::AIO::aio_wait cache_extensions;
3767 4024
3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4025 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl; 4026 do_reload_perl;
3770 undef $RELOAD_WATCHER; 4027 undef $RELOAD_WATCHER;
3771 }; 4028 };
3772 }; 4029 };
3773} 4030}
3782 reload_perl; 4039 reload_perl;
3783 }; 4040 };
3784 } 4041 }
3785}; 4042};
3786 4043
3787unshift @INC, $LIBDIR; 4044#############################################################################
3788 4045
3789my $bug_warning = 0; 4046my $bug_warning = 0;
3790 4047
3791our @WAIT_FOR_TICK; 4048our @WAIT_FOR_TICK;
3792our @WAIT_FOR_TICK_BEGIN; 4049our @WAIT_FOR_TICK_BEGIN;
3793 4050
3794sub wait_for_tick { 4051sub wait_for_tick() {
3795 return if tick_inhibit || $Coro::current == $Coro::main; 4052 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3796 4053
3797 my $signal = new Coro::Signal; 4054 my $signal = new Coro::Signal;
3798 push @WAIT_FOR_TICK, $signal; 4055 push @WAIT_FOR_TICK, $signal;
3799 $signal->wait; 4056 $signal->wait;
3800} 4057}
3801 4058
3802sub wait_for_tick_begin { 4059sub wait_for_tick_begin() {
3803 return if tick_inhibit || $Coro::current == $Coro::main; 4060 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3804 4061
3805 my $signal = new Coro::Signal; 4062 my $signal = new Coro::Signal;
3806 push @WAIT_FOR_TICK_BEGIN, $signal; 4063 push @WAIT_FOR_TICK_BEGIN, $signal;
3807 $signal->wait; 4064 $signal->wait;
3808} 4065}
3814 return; 4071 return;
3815 } 4072 }
3816 4073
3817 cf::server_tick; # one server iteration 4074 cf::server_tick; # one server iteration
3818 4075
4076 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4077
3819 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4078 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4079 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3821 Coro::async_pool { 4080 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver"; 4081 $Coro::current->{desc} = "runtime saver";
3823 write_runtime_sync 4082 write_runtime_sync
3824 or warn "ERROR: unable to write runtime file: $!"; 4083 or error "ERROR: unable to write runtime file: $!";
3825 }; 4084 };
3826 } 4085 }
3827 4086
3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4087 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3829 $sig->send; 4088 $sig->send;
3837 4096
3838 if (0) { 4097 if (0) {
3839 if ($NEXT_TICK) { 4098 if ($NEXT_TICK) {
3840 my $jitter = $TICK_START - $NEXT_TICK; 4099 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4100 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d# 4101 debug "jitter $JITTER\n";#d#
3843 } 4102 }
3844 } 4103 }
3845} 4104}
3846 4105
3847{ 4106{
3848 # configure BDB 4107 # configure BDB
3849 4108
3850 BDB::min_parallel 8; 4109 BDB::min_parallel 16;
3851 BDB::max_poll_reqs $TICK * 0.1; 4110 BDB::max_poll_reqs $TICK * 0.1;
3852 $AnyEvent::BDB::WATCHER->priority (1); 4111 $AnyEvent::BDB::WATCHER->priority (1);
3853 4112
3854 unless ($DB_ENV) { 4113 unless ($DB_ENV) {
3855 $DB_ENV = BDB::db_env_create; 4114 $DB_ENV = BDB::db_env_create;
3892 IO::AIO::min_parallel 8; 4151 IO::AIO::min_parallel 8;
3893 IO::AIO::max_poll_time $TICK * 0.1; 4152 IO::AIO::max_poll_time $TICK * 0.1;
3894 undef $AnyEvent::AIO::WATCHER; 4153 undef $AnyEvent::AIO::WATCHER;
3895} 4154}
3896 4155
3897my $_log_backtrace; 4156our $_log_backtrace;
4157our $_log_backtrace_last;
3898 4158
3899sub _log_backtrace { 4159sub _log_backtrace {
3900 my ($msg, @addr) = @_; 4160 my ($msg, @addr) = @_;
3901 4161
3902 $msg =~ s/\n//; 4162 $msg =~ s/\n$//;
3903 4163
4164 if ($_log_backtrace_last eq $msg) {
4165 LOG llevInfo, "[ABT] $msg\n";
4166 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3904 # limit the # of concurrent backtraces 4167 # limit the # of concurrent backtraces
3905 if ($_log_backtrace < 2) { 4168 } elsif ($_log_backtrace < 2) {
4169 $_log_backtrace_last = $msg;
3906 ++$_log_backtrace; 4170 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg; 4171 my $perl_bt = Carp::longmess $msg;
3908 async { 4172 async {
3909 $Coro::current->{desc} = "abt $msg"; 4173 $Coro::current->{desc} = "abt $msg";
3910 4174
3930 LOG llevInfo, "[ABT] $_\n" for @bt; 4194 LOG llevInfo, "[ABT] $_\n" for @bt;
3931 --$_log_backtrace; 4195 --$_log_backtrace;
3932 }; 4196 };
3933 } else { 4197 } else {
3934 LOG llevInfo, "[ABT] $msg\n"; 4198 LOG llevInfo, "[ABT] $msg\n";
3935 LOG llevInfo, "[ABT] [suppressed]\n"; 4199 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3936 } 4200 }
3937} 4201}
3938 4202
3939# load additional modules 4203# load additional modules
3940use cf::pod; 4204require "cf/$_.pm" for @EXTRA_MODULES;
4205cf::_connect_to_perl_2;
3941 4206
3942END { cf::emergency_save } 4207END { cf::emergency_save }
3943 4208
39441 42091
3945 4210

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines