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.465 by root, Thu Jan 8 00:54:55 2009 UTC vs.
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 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;
98
92our $DATADIR = datadir; 99our $DATADIR = datadir;
93our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
94our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
95our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
96our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
97our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
99our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
100our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
101our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid"; 110our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime"; 111our $RUNTIMEFILE = "$LOCALDIR/runtime";
104 112
105our %RESOURCE; 113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
106 120
107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
109our $NEXT_TICK; 123our $NEXT_TICK;
110our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
111 125
112our $BDB_DEADLOCK_WATCHER; 126our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER; 127our $BDB_CHECKPOINT_WATCHER;
114our $BDB_TRICKLE_WATCHER; 128our $BDB_TRICKLE_WATCHER;
115our $DB_ENV; 129our $DB_ENV;
116 130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
132
117our %CFG; 133our %CFG;
118 134
119our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
120our $RUNTIME; 136our $RUNTIME;
121our $NOW; 137our $NOW;
132our $JITTER; # average jitter 148our $JITTER; # average jitter
133our $TICK_START; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
134 150
135our @POST_INIT; 151our @POST_INIT;
136 152
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
138 155
139binmode STDOUT; 156binmode STDOUT;
140binmode STDERR; 157binmode STDERR;
141 158
142# read virtual server time, if available 159# read virtual server time, if available
144 open my $fh, "<", $RUNTIMEFILE 161 open my $fh, "<", $RUNTIMEFILE
145 or die "unable to read $RUNTIMEFILE file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
146 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
147} 164}
148 165
166eval "sub TICK() { $TICK } 1" or die;
167
149mkdir $_ 168mkdir $_
150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
151 170
152our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
153 172
154sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
155 189
156############################################################################# 190#############################################################################
157 191
158=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
159 193
201from wherever your confdir points to. 235from wherever your confdir points to.
202 236
203=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
204 238
205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
206returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
207per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
208 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
209=item @cf::INVOKE_RESULTS 248=item @cf::INVOKE_RESULTS
210 249
211This array contains the results of the last C<invoke ()> call. When 250This 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 251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
213that call. 252that call.
214 253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
215=back 260=back
216 261
217=cut 262=cut
218 263
219BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
220 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
221 my $msg = join "", @_; 271 my $msg = join "", @_;
222 272
223 $msg .= "\n" 273 $msg .= "\n"
224 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
225 275
226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
227 277
228 LOG llevError, $msg; 278 LOG llevWarn, $msg;
229 }; 279};
230}
231 280
232$Coro::State::DIEHOOK = sub { 281$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "==" 282 return unless $^S eq 0; # "eq", not "=="
234 283
235 if ($Coro::current == $Coro::main) {#d# 284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d# 287 error "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d# 288 return;#d#
238 }#d# 289 }#d#
239 290
240 # kill coroutine otherwise 291 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate 292 Coro::terminate
243}; 293};
244
245$SIG{__DIE__} = sub { }; #d#?
246 294
247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
264)) { 312)) {
265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
266} 314}
267 315
268$EV::DIED = sub { 316$EV::DIED = sub {
269 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
270}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
271 324
272############################################################################# 325#############################################################################
273 326
274=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
275 328
296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
297 $d 350 $d
298 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
299} 352}
300 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
301=item $ref = cf::decode_json $json 368=item $ref = cf::decode_json $json
302 369
303Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
304 371
305=item $json = cf::encode_json $ref 372=item $json = cf::encode_json $ref
311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
312 379
313sub encode_json($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
314sub decode_json($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
315 382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
316=item cf::post_init { BLOCK } 414=item cf::post_init { BLOCK }
317 415
318Execute the given codeblock, I<after> all extensions have been (re-)loaded, 416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again. 417but I<before> the server starts ticking again.
320 418
321The cdoeblock will have a single boolean argument to indicate whether this 419The codeblock will have a single boolean argument to indicate whether this
322is a reload or not. 420is a reload or not.
323 421
324=cut 422=cut
325 423
326sub post_init(&) { 424sub post_init(&) {
327 push @POST_INIT, shift; 425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
328} 443}
329 444
330=item cf::lock_wait $string 445=item cf::lock_wait $string
331 446
332Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
371} 486}
372 487
373=item cf::periodic $interval, $cb 488=item cf::periodic $interval, $cb
374 489
375Like EV::periodic, but randomly selects a starting point so that the actions 490Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer. 491get spread over time.
377 492
378=cut 493=cut
379 494
380sub periodic($$) { 495sub periodic($$) {
381 my ($interval, $cb) = @_; 496 my ($interval, $cb) = @_;
385 EV::periodic $start, $interval, 0, $cb 500 EV::periodic $start, $interval, 0, $cb
386} 501}
387 502
388=item cf::get_slot $time[, $priority[, $name]] 503=item cf::get_slot $time[, $priority[, $name]]
389 504
390Allocate $time seconds of blocking CPU time at priority C<$priority>: 505Allocate $time seconds of blocking CPU time at priority C<$priority>
391This call blocks and returns only when you have at least C<$time> seconds 506(default: 0): This call blocks and returns only when you have at least
392of cpu time till the next tick. The slot is only valid till the next cede. 507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
393 512
394The optional C<$name> can be used to identify the job to run. It might be 513The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class. 514used for statistical purposes and should identify the same time-class.
396 515
397Useful for short background jobs. 516Useful for short background jobs.
398 517
399=cut 518=cut
400 519
401our @SLOT_QUEUE; 520our @SLOT_QUEUE;
402our $SLOT_QUEUE; 521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
403 523
404$SLOT_QUEUE->cancel if $SLOT_QUEUE; 524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async { 525$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager"); 526 $Coro::current->desc ("timeslot manager");
407 527
408 my $signal = new Coro::Signal; 528 my $signal = new Coro::Signal;
529 my $busy;
409 530
410 while () { 531 while () {
411 next_job: 532 next_job:
533
412 my $avail = cf::till_tick; 534 my $avail = cf::till_tick;
413 if ($avail > 0.01) { 535
414 for (0 .. $#SLOT_QUEUE) { 536 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) { 537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
416 my $job = splice @SLOT_QUEUE, $_, 1, (); 539 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send; 540 $job->[2]->send;
418 Coro::cede; 541 Coro::cede;
419 goto next_job; 542 goto next_job;
420 } 543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
421 } 545 }
422 } 546 }
423 547
424 if (@SLOT_QUEUE) { 548 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive 549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal; 550 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait; 551 $signal->wait;
428 } else { 552 } else {
553 $busy = 0;
429 Coro::schedule; 554 Coro::schedule;
430 } 555 }
431 } 556 }
432}; 557};
433 558
434sub get_slot($;$$) { 559sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main; 560 return if tick_inhibit || $Coro::current == $Coro::main;
436 561
437 my ($time, $pri, $name) = @_; 562 my ($time, $pri, $name) = @_;
438 563
439 $time = $TICK * .6 if $time > $TICK * .6; 564 $time = clamp $time, 0.01, $TICK * .6;
565
440 my $sig = new Coro::Signal; 566 my $sig = new Coro::Signal;
441 567
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready; 570 $SLOT_QUEUE->ready;
470=cut 596=cut
471 597
472sub sync_job(&) { 598sub sync_job(&) {
473 my ($job) = @_; 599 my ($job) = @_;
474 600
475 if ($Coro::current == $Coro::main) { 601 if (in_main) {
476 my $time = EV::time; 602 my $time = AE::time;
477 603
478 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
479 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
480 606
481 LOG llevError, Carp::longmess "sync job";#d# 607 #LOG llevError, Carp::longmess "sync job";#d#
482 608
483 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
484 610
485 my $busy = 1; 611 my $busy = 1;
486 my @res; 612 my @res;
487 613
488 (async { 614 (async {
489 $Coro::current->desc ("sync job coro"); 615 $Coro::current->desc ("sync job coro");
490 @res = eval { $job->() }; 616 @res = eval { $job->() };
491 warn $@ if $@; 617 error $@ if $@;
492 undef $busy; 618 undef $busy;
493 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
494 620
495 while ($busy) { 621 while ($busy) {
496 if (Coro::nready) { 622 if (Coro::nready) {
498 } else { 624 } else {
499 EV::loop EV::LOOP_ONESHOT; 625 EV::loop EV::LOOP_ONESHOT;
500 } 626 }
501 } 627 }
502 628
503 my $time = EV::time - $time; 629 my $time = AE::time - $time;
504 630
505 $TICK_START += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
506 632
507 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
508 } else { 634 } else {
530 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
531 657
532 $coro 658 $coro
533} 659}
534 660
535=item fork_call { }, $args 661=item fork_call { }, @args
536 662
537Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling. 666never block itself or use any form of event handling.
541 667
542=cut 668=cut
543 669
670sub post_fork {
671 reset_signals;
672}
673
544sub fork_call(&@) { 674sub fork_call(&@) {
545 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
546 676
547 # we seemingly have to make a local copy of the whole thing, 677 # we seemingly have to make a local copy of the whole thing,
548 # otherwise perl prematurely frees the stuff :/ 678 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious) 679 # TODO: investigate and fix (likely this will be rather laborious)
550 680
551 my @res = Coro::Util::fork_eval { 681 my @res = Coro::Util::fork_eval {
552 reset_signals; 682 cf::post_fork;
553 &$cb 683 &$cb
554 }, @args; 684 } @args;
555 685
556 wantarray ? @res : $res[-1] 686 wantarray ? @res : $res[-1]
687}
688
689sub objinfo {
690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
557} 698}
558 699
559=item $coin = coin_from_name $name 700=item $coin = coin_from_name $name
560 701
561=cut 702=cut
598within each server. 739within each server.
599 740
600=cut 741=cut
601 742
602sub db_table($) { 743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
603 my ($name) = @_; 747 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV; 748 my $db = BDB::db_create $DB_ENV;
605 749
606 eval { 750 eval {
607 $db->set_flags (BDB::CHKSUM); 751 $db->set_flags (BDB::CHKSUM);
617} 761}
618 762
619our $DB; 763our $DB;
620 764
621sub db_init { 765sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db"; 766 $DB ||= db_table "db";
624 };
625} 767}
626 768
627sub db_get($$) { 769sub db_get($$) {
628 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
629 771
630 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
631 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
632 776
633 $! ? () 777 $! ? ()
634 : $data 778 : $data
635 }
636} 779}
637 780
638sub db_put($$$) { 781sub db_put($$$) {
639 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
668 811
669 my @data; 812 my @data;
670 my $md5; 813 my $md5;
671 814
672 for (0 .. $#$src) { 815 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
674 or Carp::croak "$src->[$_]: $!";
675 } 817 }
676 818
677 # if processing is expensive, check 819 # if processing is expensive, check
678 # checksum first 820 # checksum first
679 if (1) { 821 if (1) {
696 838
697 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data); 840 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
700 842
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
702 844
703 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
706 848
716 858
717=cut 859=cut
718 860
719sub datalog($@) { 861sub datalog($@) {
720 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
722} 864}
723 865
724=back 866=back
725 867
726=cut 868=cut
921 1063
922 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
923 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
924 1066
925 } elsif (ref $type) { 1067 } elsif (ref $type) {
926 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
927 1069
928 } else { 1070 } else {
929 shift @arg; 1071 shift @arg;
930 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
931 } 1073 }
932 } 1074 }
933} 1075}
934 1076
935sub _object_attach { 1077sub _object_attach {
945 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
946 } 1088 }
947 1089
948 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
949 } else { 1091 } else {
950 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
951 } 1093 }
952 1094
953 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
954} 1096}
955 1097
1014 1156
1015 for (@$callbacks) { 1157 for (@$callbacks) {
1016 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
1017 1159
1018 if ($@) { 1160 if ($@) {
1019 warn "$@";
1020 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1021 override; 1162 override;
1022 } 1163 }
1023 1164
1024 return 1 if $override; 1165 return 1 if $override;
1025 } 1166 }
1104 for (@$attach) { 1245 for (@$attach) {
1105 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
1106 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
1107 } 1248 }
1108 } else { 1249 } else {
1109 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
1110 } 1251 }
1111 } 1252 }
1112} 1253}
1113 1254
1114cf::attachable->attach ( 1255cf::attachable->attach (
1141 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
1142 1283
1143 sync_job { 1284 sync_job {
1144 if (length $$rdata) { 1285 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename); 1286 utf8::decode (my $decname = $filename);
1146 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
1147 $decname, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
1148 1290
1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1150 aio_chmod $fh, SAVE_MODE; 1292 aio_chmod $fh, SAVE_MODE;
1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1152 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
1153 aio_close $fh; 1298 aio_close $fh;
1154 1299
1155 if (@$objs) { 1300 if (@$objs) {
1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1302 aio_chmod $fh, SAVE_MODE;
1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1159 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
1160 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
1161 aio_close $fh; 1309 aio_close $fh;
1162 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
1163 } 1311 }
1164 } else { 1312 } else {
1165 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
1168 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1169 1317
1170 $filename =~ s%/[^/]+$%%; 1318 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC; 1319 aio_pathsync $filename if $cf::USE_FSYNC;
1172 } else { 1320 } else {
1173 warn "unable to save objects: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
1174 } 1322 }
1175 } else { 1323 } else {
1176 aio_unlink $filename; 1324 aio_unlink $filename;
1177 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1178 } 1326 }
1202 my $st = eval { Coro::Storable::thaw $av }; 1350 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs}; 1351 $av = $st->{objs};
1204 } 1352 }
1205 1353
1206 utf8::decode (my $decname = $filename); 1354 utf8::decode (my $decname = $filename);
1207 warn sprintf "loading %s (%d,%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1208 $decname, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1209 1358
1210 ($data, $av) 1359 ($data, $av)
1211} 1360}
1212 1361
1213=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1272} 1421}
1273 1422
1274use File::Glob (); 1423use File::Glob ();
1275 1424
1276cf::player->attach ( 1425cf::player->attach (
1277 on_command => sub { 1426 on_unknown_command => sub {
1278 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1279 1428
1280 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1281 or return; 1430 or return;
1282 1431
1305 1454
1306 $pl->ext_reply ($reply, @reply) 1455 $pl->ext_reply ($reply, @reply)
1307 if $reply; 1456 if $reply;
1308 1457
1309 } else { 1458 } else {
1310 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1311 } 1460 }
1312 1461
1313 cf::override; 1462 cf::override;
1314 }, 1463 },
1315); 1464);
1316 1465
1317# "readahead" all extensions 1466# "readahead" all extensions
1318sub cache_extensions { 1467sub cache_extensions {
1319 my $grp = IO::AIO::aio_group; 1468 my $grp = IO::AIO::aio_group;
1320 1469
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1322 for (grep /\.ext$/, @{$_[0]}) { 1471 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 } 1473 }
1325 }; 1474 };
1326 1475
1327 $grp 1476 $grp
1328} 1477}
1329 1478
1330sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1331 cf::sync_job { 1482 cf::sync_job {
1332 my %todo; 1483 my %todo;
1333 1484
1334 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1335 next unless -r $path; 1486 next unless -r $path;
1353 1504
1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1356 1507
1357 $ext{source} = 1508 $ext{source} =
1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1359 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1360 . $source 1511 . $source
1361 . "\n};\n1"; 1512 . "\n};\n1";
1362 1513
1363 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1364 } 1515 }
1365 1516
1517 my $pass = 0;
1366 my %done; 1518 my %done;
1367 while (%todo) { 1519 while (%todo) {
1368 my $progress; 1520 my $progress;
1369 1521
1522 ++$pass;
1523
1524 ext:
1370 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1371 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1372 goto skip 1527 next ext
1373 unless exists $done{$_}; 1528 unless exists $done{$_};
1374 } 1529 }
1375 1530
1376 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1377 1532
1378 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1379 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1380 : "$v->{base}: extension inactive.\n";
1381 1537
1382 if (exists $v->{meta}{mandatory}) {
1383 warn $msg;
1384 cf::cleanup "mandatory extension failed to load, exiting."; 1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1385 } 1539 if exists $v->{meta}{mandatory};
1386 1540
1387 warn $msg; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1542 delete $todo{$k};
1543 } else {
1544 $done{$k} = delete $todo{$k};
1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1388 } 1550 }
1389
1390 $done{$k} = delete $todo{$k};
1391 push @EXTS, $v->{pkg};
1392 $progress = 1;
1393 } 1551 }
1394 1552
1395 skip: 1553 unless ($progress) {
1396 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1397 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1398 } 1563 }
1399 }; 1564 };
1400} 1565}
1401 1566
1402############################################################################# 1567#############################################################################
1486 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1487 } 1652 }
1488 } 1653 }
1489} 1654}
1490 1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1668
1491sub save($) { 1669sub save($) {
1492 my ($pl) = @_; 1670 my ($pl) = @_;
1493 1671
1494 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1495 1673
1500 1678
1501 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1502 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1503 1681
1504 cf::get_slot 0.01; 1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1505 1686
1506 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1507 cf::cede_to_tick; 1688 cf::cede_to_tick;
1508} 1689}
1509 1690
1543 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1544 1725
1545 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1547 1728
1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1549 $pl->deactivate; 1730 $pl->deactivate;
1731
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1552 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1553 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1554 1737
1555 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1556 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1557 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1611 \@logins 1794 \@logins
1612} 1795}
1613 1796
1614=item $player->maps 1797=item $player->maps
1615 1798
1799=item cf::player::maps $login
1800
1616Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1617player. May block. 1802player. May block.
1618 1803
1619=cut 1804=cut
1620 1805
1682=cut 1867=cut
1683 1868
1684sub find_by_path($) { 1869sub find_by_path($) {
1685 my ($path) = @_; 1870 my ($path) = @_;
1686 1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1873
1687 my ($match, $specificity); 1874 my ($match, $specificity);
1688 1875
1689 for my $region (list) { 1876 for my $region (list) {
1690 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1691 ($match, $specificity) = ($region, $region->specificity) 1878 ($match, $specificity) = ($region, $region->specificity)
1719sub generate_random_map { 1906sub generate_random_map {
1720 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1721 1908
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723 1910
1724 # mit "rum" bekleckern, nicht
1725 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 $rmp->{exit_on_final_map},
1730 $rmp->{xsize}, $rmp->{ysize},
1731 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1732 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1733 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1734 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1735 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1736 (cf::region::find $rmp->{region}), $rmp->{custom}
1737 )
1738} 1912}
1739 1913
1740=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1741 1915
1742Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1747 1921
1748sub register { 1922sub register {
1749 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1750 my $pkg = caller; 1924 my $pkg = caller;
1751 1925
1752 no strict;
1753 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1754 1927
1755 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1756} 1929}
1757 1930
1758# also paths starting with '/' 1931# also paths starting with '/'
1759$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1760 1933
1761sub thawer_merge { 1934sub thawer_merge {
1762 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1763 1936
1764 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1769} 1942}
1770 1943
1771sub normalise { 1944sub normalise {
1772 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1773 1946
1774 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1775 1948
1776 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1777 1950
1778 # map plan: 1951 # map plan:
1779 # 1952 #
1794 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1795 $path = "$base/$path"; 1968 $path = "$base/$path";
1796 } 1969 }
1797 1970
1798 for ($path) { 1971 for ($path) {
1799 redo if s{//}{/};
1800 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1801 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1802 } 1974 }
1803 1975
1804 $path 1976 $path
1818 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1819 return $self; 1991 return $self;
1820 } 1992 }
1821 } 1993 }
1822 1994
1823 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1824 () 1996 ()
1825} 1997}
1826 1998
1999# may re-bless or do other evil things
1827sub init { 2000sub init {
1828 my ($self) = @_; 2001 my ($self) = @_;
1829 2002
1830 $self 2003 $self
1831} 2004}
1950} 2123}
1951 2124
1952sub find; 2125sub find;
1953sub find { 2126sub find {
1954 my ($path, $origin) = @_; 2127 my ($path, $origin) = @_;
2128
2129 cf::cede_to_tick;
1955 2130
1956 $path = normalise $path, $origin && $origin->path; 2131 $path = normalise $path, $origin && $origin->path;
1957 2132
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2133 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 my $guard2 = cf::lock_acquire "map_find:$path"; 2134 my $guard2 = cf::lock_acquire "map_find:$path";
1978 2153
1979 $cf::MAP{$path} = $map 2154 $cf::MAP{$path} = $map
1980 } 2155 }
1981} 2156}
1982 2157
1983sub pre_load { } 2158sub pre_load { }
1984sub post_load { } 2159#sub post_load { } # XS
1985 2160
1986sub load { 2161sub load {
1987 my ($self) = @_; 2162 my ($self) = @_;
1988 2163
1989 local $self->{deny_reset} = 1; # loading can take a long time 2164 local $self->{deny_reset} = 1; # loading can take a long time
2001 $self->alloc; 2176 $self->alloc;
2002 2177
2003 $self->pre_load; 2178 $self->pre_load;
2004 cf::cede_to_tick; 2179 cf::cede_to_tick;
2005 2180
2181 if (exists $self->{load_path}) {
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2182 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2183 $f->skip_block;
2008 $self->_load_objects ($f) 2184 $self->_load_objects ($f)
2009 or return; 2185 or return;
2010 2186
2011 $self->post_load_original 2187 $self->post_load_original
2012 if delete $self->{load_original}; 2188 if delete $self->{load_original};
2013 2189
2014 if (my $uniq = $self->uniq_path) { 2190 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2191 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2192 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) { 2193 if (my $f = new_from_file cf::object::thawer $uniq) {
2018 $self->clear_unique_items; 2194 $self->clear_unique_items;
2019 $self->_load_objects ($f); 2195 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs; 2196 $f->resolve_delayed_derefs;
2197 }
2021 } 2198 }
2022 } 2199 }
2023 }
2024 2200
2025 $f->resolve_delayed_derefs; 2201 $f->resolve_delayed_derefs;
2202 }
2026 2203
2027 cf::cede_to_tick; 2204 cf::cede_to_tick;
2028 # now do the right thing for maps 2205 # now do the right thing for maps
2029 $self->link_multipart_objects; 2206 $self->link_multipart_objects;
2030 $self->difficulty ($self->estimate_difficulty) 2207 $self->difficulty ($self->estimate_difficulty)
2044 2221
2045 $self->in_memory (cf::MAP_ACTIVE); 2222 $self->in_memory (cf::MAP_ACTIVE);
2046 } 2223 }
2047 2224
2048 $self->post_load; 2225 $self->post_load;
2049}
2050 2226
2227 1
2228}
2229
2230# customize the map for a given player, i.e.
2231# return the _real_ map. used by e.g. per-player
2232# maps to change the path to ~playername/mappath
2051sub customise_for { 2233sub customise_for {
2052 my ($self, $ob) = @_; 2234 my ($self, $ob) = @_;
2053 2235
2054 return find "~" . $ob->name . "/" . $self->{path} 2236 return find "~" . $ob->name . "/" . $self->{path}
2055 if $self->per_player; 2237 if $self->per_player;
2071 or next; 2253 or next;
2072 $neigh = find $neigh, $map 2254 $neigh = find $neigh, $map
2073 or next; 2255 or next;
2074 $neigh->load; 2256 $neigh->load;
2075 2257
2258 # now find the diagonal neighbours
2076 push @neigh, 2259 push @neigh,
2077 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2260 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2078 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2261 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2079 } 2262 }
2080 2263
2087} 2270}
2088 2271
2089sub find_sync { 2272sub find_sync {
2090 my ($path, $origin) = @_; 2273 my ($path, $origin) = @_;
2091 2274
2092 cf::sync_job { find $path, $origin } 2275 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2276 if $Coro::current == $Coro::main;
2277
2278 find $path, $origin
2093} 2279}
2094 2280
2095sub do_load_sync { 2281sub do_load_sync {
2096 my ($map) = @_; 2282 my ($map) = @_;
2097 2283
2098 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2284 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2099 if $Coro::current == $Coro::main; 2285 if $Coro::current == $Coro::main;
2100 2286
2101 cf::sync_job { $map->load }; 2287 $map->load;
2102} 2288}
2103 2289
2104our %MAP_PREFETCH; 2290our %MAP_PREFETCH;
2105our $MAP_PREFETCHER = undef; 2291our $MAP_PREFETCHER = undef;
2106 2292
2132 $MAP_PREFETCHER->prio (6); 2318 $MAP_PREFETCHER->prio (6);
2133 2319
2134 () 2320 ()
2135} 2321}
2136 2322
2323# common code, used by both ->save and ->swapout
2137sub save { 2324sub _save {
2138 my ($self) = @_; 2325 my ($self) = @_;
2139
2140 my $lock = cf::lock_acquire "map_data:$self->{path}";
2141 2326
2142 $self->{last_save} = $cf::RUNTIME; 2327 $self->{last_save} = $cf::RUNTIME;
2143 2328
2144 return unless $self->dirty; 2329 return unless $self->dirty;
2145 2330
2165 } else { 2350 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2351 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2167 } 2352 }
2168} 2353}
2169 2354
2355sub save {
2356 my ($self) = @_;
2357
2358 my $lock = cf::lock_acquire "map_data:$self->{path}";
2359
2360 $self->_save;
2361}
2362
2170sub swap_out { 2363sub swap_out {
2171 my ($self) = @_; 2364 my ($self) = @_;
2172 2365
2173 # save first because save cedes
2174 $self->save;
2175
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2366 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2367
2178 return if $self->players;
2179 return if $self->in_memory != cf::MAP_ACTIVE; 2368 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2369 return if $self->{deny_save};
2370 return if $self->players;
2181 2371
2372 # first deactivate the map and "unlink" it from the core
2373 $self->deactivate;
2374 $_->clear_links_to ($self) for values %cf::MAP;
2182 $self->in_memory (cf::MAP_SWAPPED); 2375 $self->in_memory (cf::MAP_SWAPPED);
2376
2377 # then atomically save
2378 $self->_save;
2379
2380 # then free the map
2381 $self->clear;
2382}
2383
2384sub reset_at {
2385 my ($self) = @_;
2386
2387 # TODO: safety, remove and allow resettable per-player maps
2388 return 1e99 if $self->{deny_reset};
2389
2390 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2391 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2392
2393 $time + $to
2394}
2395
2396sub should_reset {
2397 my ($self) = @_;
2398
2399 $self->reset_at <= $cf::RUNTIME
2400}
2401
2402sub reset {
2403 my ($self) = @_;
2404
2405 my $lock = cf::lock_acquire "map_data:$self->{path}";
2406
2407 return if $self->players;
2408
2409 cf::trace "resetting map ", $self->path, "\n";
2410
2411 $self->in_memory (cf::MAP_SWAPPED);
2412
2413 # need to save uniques path
2414 unless ($self->{deny_save}) {
2415 my $uniq = $self->uniq_path; utf8::encode $uniq;
2416
2417 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2418 if $uniq;
2419 }
2420
2421 delete $cf::MAP{$self->path};
2183 2422
2184 $self->deactivate; 2423 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP; 2424 $_->clear_links_to ($self) for values %cf::MAP;
2186 $self->clear; 2425 $self->clear;
2187}
2188
2189sub reset_at {
2190 my ($self) = @_;
2191
2192 # TODO: safety, remove and allow resettable per-player maps
2193 return 1e99 if $self->{deny_reset};
2194
2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2197
2198 $time + $to
2199}
2200
2201sub should_reset {
2202 my ($self) = @_;
2203
2204 $self->reset_at <= $cf::RUNTIME
2205}
2206
2207sub reset {
2208 my ($self) = @_;
2209
2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
2211
2212 return if $self->players;
2213
2214 warn "resetting map ", $self->path;
2215
2216 $self->in_memory (cf::MAP_SWAPPED);
2217
2218 # need to save uniques path
2219 unless ($self->{deny_save}) {
2220 my $uniq = $self->uniq_path; utf8::encode $uniq;
2221
2222 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2223 if $uniq;
2224 }
2225
2226 delete $cf::MAP{$self->path};
2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2230 $self->clear;
2231 2426
2232 $self->unlink_save; 2427 $self->unlink_save;
2233 $self->destroy; 2428 $self->destroy;
2234} 2429}
2235 2430
2243 2438
2244 delete $cf::MAP{$self->path}; 2439 delete $cf::MAP{$self->path};
2245 2440
2246 $self->unlink_save; 2441 $self->unlink_save;
2247 2442
2248 bless $self, "cf::map"; 2443 bless $self, "cf::map::wrap";
2249 delete $self->{deny_reset}; 2444 delete $self->{deny_reset};
2250 $self->{deny_save} = 1; 2445 $self->{deny_save} = 1;
2251 $self->reset_timeout (1); 2446 $self->reset_timeout (1);
2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2447 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2253 2448
2310 : normalise $_ 2505 : normalise $_
2311 } @{ aio_readdir $UNIQUEDIR or [] } 2506 } @{ aio_readdir $UNIQUEDIR or [] }
2312 ] 2507 ]
2313} 2508}
2314 2509
2510=item cf::map::static_maps
2511
2512Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2513file in the shared directory excluding F</styles> and F</editor>). May
2514block.
2515
2516=cut
2517
2518sub static_maps() {
2519 my @dirs = "";
2520 my @maps;
2521
2522 while (@dirs) {
2523 my $dir = shift @dirs;
2524
2525 next if $dir eq "/styles" || $dir eq "/editor";
2526
2527 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2528 or return;
2529
2530 for (@$files) {
2531 s/\.map$// or next;
2532 utf8::decode $_;
2533 push @maps, "$dir/$_";
2534 }
2535
2536 push @dirs, map "$dir/$_", @$dirs;
2537 }
2538
2539 \@maps
2540}
2541
2315=back 2542=back
2316 2543
2317=head3 cf::object 2544=head3 cf::object
2318 2545
2319=cut 2546=cut
2384 2611
2385our $SAY_CHANNEL = { 2612our $SAY_CHANNEL = {
2386 id => "say", 2613 id => "say",
2387 title => "Map", 2614 title => "Map",
2388 reply => "say ", 2615 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2616 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2390}; 2617};
2391 2618
2392our $CHAT_CHANNEL = { 2619our $CHAT_CHANNEL = {
2393 id => "chat", 2620 id => "chat",
2394 title => "Chat", 2621 title => "Chat",
2451 2678
2452Freezes the player and moves him/her to a special map (C<{link}>). 2679Freezes the player and moves him/her to a special map (C<{link}>).
2453 2680
2454The player should be reasonably safe there for short amounts of time (e.g. 2681The player should be reasonably safe there for short amounts of time (e.g.
2455for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2682for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link 2683though, as the player cannot control the character while it is on the link
2457map. 2684map.
2458 2685
2459Will never block. 2686Will never block.
2460 2687
2461=item $player_object->leave_link ($map, $x, $y) 2688=item $player_object->leave_link ($map, $x, $y)
2482sub cf::object::player::enter_link { 2709sub cf::object::player::enter_link {
2483 my ($self) = @_; 2710 my ($self) = @_;
2484 2711
2485 $self->deactivate_recursive; 2712 $self->deactivate_recursive;
2486 2713
2714 ++$self->{_link_recursion};
2715
2487 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2716 return if UNIVERSAL::isa $self->map, "ext::map_link";
2488 2717
2489 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2718 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2490 if $self->map && $self->map->{path} ne "{link}"; 2719 if $self->map && $self->map->{path} ne "{link}";
2491 2720
2492 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2721 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2493} 2722}
2494 2723
2495sub cf::object::player::leave_link { 2724sub cf::object::player::leave_link {
2496 my ($self, $map, $x, $y) = @_; 2725 my ($self, $map, $x, $y) = @_;
2497 2726
2514 ($x, $y) = (-1, -1) 2743 ($x, $y) = (-1, -1)
2515 unless (defined $x) && (defined $y); 2744 unless (defined $x) && (defined $y);
2516 2745
2517 # use -1 or undef as default coordinates, not 0, 0 2746 # use -1 or undef as default coordinates, not 0, 0
2518 ($x, $y) = ($map->enter_x, $map->enter_y) 2747 ($x, $y) = ($map->enter_x, $map->enter_y)
2519 if $x <=0 && $y <= 0; 2748 if $x <= 0 && $y <= 0;
2520 2749
2521 $map->load; 2750 $map->load;
2522 $map->load_neighbours; 2751 $map->load_neighbours;
2523 2752
2524 return unless $self->contr->active; 2753 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2526 $self->activate_recursive;
2527 2754
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2755 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $self->enter_map ($map, $x, $y); 2756 if ($self->enter_map ($map, $x, $y)) {
2530} 2757 # entering was successful
2758 delete $self->{_link_recursion};
2759 # only activate afterwards, to support waiting in hooks
2760 $self->activate_recursive;
2761 }
2531 2762
2763}
2764
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2765=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2533 2766
2534Moves the player to the given map-path and coordinates by first freezing 2767Moves the player to the given map-path and coordinates by first freezing
2535her, loading and preparing them map, calling the provided $check callback 2768her, loading and preparing them map, calling the provided $check callback
2536that has to return the map if sucecssful, and then unfreezes the player on 2769that has to return the map if sucecssful, and then unfreezes the player on
2537the new (success) or old (failed) map position. In either case, $done will 2770the new (success) or old (failed) map position. In either case, $done will
2544 2777
2545our $GOTOGEN; 2778our $GOTOGEN;
2546 2779
2547sub cf::object::player::goto { 2780sub cf::object::player::goto {
2548 my ($self, $path, $x, $y, $check, $done) = @_; 2781 my ($self, $path, $x, $y, $check, $done) = @_;
2782
2783 if ($self->{_link_recursion} >= $MAX_LINKS) {
2784 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2785 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2786 ($path, $x, $y) = @$EMERGENCY_POSITION;
2787 }
2549 2788
2550 # do generation counting so two concurrent goto's will be executed in-order 2789 # do generation counting so two concurrent goto's will be executed in-order
2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2790 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2552 2791
2553 $self->enter_link; 2792 $self->enter_link;
2577 my $map = eval { 2816 my $map = eval {
2578 my $map = defined $path ? cf::map::find $path : undef; 2817 my $map = defined $path ? cf::map::find $path : undef;
2579 2818
2580 if ($map) { 2819 if ($map) {
2581 $map = $map->customise_for ($self); 2820 $map = $map->customise_for ($self);
2582 $map = $check->($map) if $check && $map; 2821 $map = $check->($map, $x, $y, $self) if $check && $map;
2583 } else { 2822 } else {
2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2823 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2585 } 2824 }
2586 2825
2587 $map 2826 $map
2595 if ($gen == $self->{_goto_generation}) { 2834 if ($gen == $self->{_goto_generation}) {
2596 delete $self->{_goto_generation}; 2835 delete $self->{_goto_generation};
2597 $self->leave_link ($map, $x, $y); 2836 $self->leave_link ($map, $x, $y);
2598 } 2837 }
2599 2838
2600 $done->() if $done; 2839 $done->($self) if $done;
2601 })->prio (1); 2840 })->prio (1);
2602} 2841}
2603 2842
2604=item $player_object->enter_exit ($exit_object) 2843=item $player_object->enter_exit ($exit_object)
2605 2844
2698 $self->message ("Something went wrong deep within the deliantra server. " 2937 $self->message ("Something went wrong deep within the deliantra server. "
2699 . "I'll try to bring you back to the map you were before. " 2938 . "I'll try to bring you back to the map you were before. "
2700 . "Please report this to the dungeon master!", 2939 . "Please report this to the dungeon master!",
2701 cf::NDI_UNIQUE | cf::NDI_RED); 2940 cf::NDI_UNIQUE | cf::NDI_RED);
2702 2941
2703 warn "ERROR in enter_exit: $@"; 2942 error "ERROR in enter_exit: $@";
2704 $self->leave_link; 2943 $self->leave_link;
2705 } 2944 }
2706 })->prio (1); 2945 })->prio (1);
2707} 2946}
2708 2947
2720sub cf::client::send_drawinfo { 2959sub cf::client::send_drawinfo {
2721 my ($self, $text, $flags) = @_; 2960 my ($self, $text, $flags) = @_;
2722 2961
2723 utf8::encode $text; 2962 utf8::encode $text;
2724 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2963 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2964}
2965
2966=item $client->send_big_packet ($pkt)
2967
2968Like C<send_packet>, but tries to compress large packets, and fragments
2969them as required.
2970
2971=cut
2972
2973our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2974
2975sub cf::client::send_big_packet {
2976 my ($self, $pkt) = @_;
2977
2978 # try lzf for large packets
2979 $pkt = "lzf " . Compress::LZF::compress $pkt
2980 if 1024 <= length $pkt and $self->{can_lzf};
2981
2982 # split very large packets
2983 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2984 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2985 $pkt = "frag";
2986 }
2987
2988 $self->send_packet ($pkt);
2725} 2989}
2726 2990
2727=item $client->send_msg ($channel, $msg, $color, [extra...]) 2991=item $client->send_msg ($channel, $msg, $color, [extra...])
2728 2992
2729Send a drawinfo or msg packet to the client, formatting the msg for the 2993Send a drawinfo or msg packet to the client, formatting the msg for the
2733 2997
2734=cut 2998=cut
2735 2999
2736# non-persistent channels (usually the info channel) 3000# non-persistent channels (usually the info channel)
2737our %CHANNEL = ( 3001our %CHANNEL = (
3002 "c/motd" => {
3003 id => "infobox",
3004 title => "MOTD",
3005 reply => undef,
3006 tooltip => "The message of the day",
3007 },
2738 "c/identify" => { 3008 "c/identify" => {
2739 id => "infobox", 3009 id => "infobox",
2740 title => "Identify", 3010 title => "Identify",
2741 reply => undef, 3011 reply => undef,
2742 tooltip => "Items recently identified", 3012 tooltip => "Items recently identified",
2744 "c/examine" => { 3014 "c/examine" => {
2745 id => "infobox", 3015 id => "infobox",
2746 title => "Examine", 3016 title => "Examine",
2747 reply => undef, 3017 reply => undef,
2748 tooltip => "Signs and other items you examined", 3018 tooltip => "Signs and other items you examined",
3019 },
3020 "c/shopinfo" => {
3021 id => "infobox",
3022 title => "Shop Info",
3023 reply => undef,
3024 tooltip => "What your bargaining skill tells you about the shop",
2749 }, 3025 },
2750 "c/book" => { 3026 "c/book" => {
2751 id => "infobox", 3027 id => "infobox",
2752 title => "Book", 3028 title => "Book",
2753 reply => undef, 3029 reply => undef,
2781 id => "infobox", 3057 id => "infobox",
2782 title => "Skills", 3058 title => "Skills",
2783 reply => undef, 3059 reply => undef,
2784 tooltip => "Shows your experience per skill and item power", 3060 tooltip => "Shows your experience per skill and item power",
2785 }, 3061 },
3062 "c/shopitems" => {
3063 id => "infobox",
3064 title => "Shop Items",
3065 reply => undef,
3066 tooltip => "Shows the items currently for sale in this shop",
3067 },
2786 "c/resistances" => { 3068 "c/resistances" => {
2787 id => "infobox", 3069 id => "infobox",
2788 title => "Resistances", 3070 title => "Resistances",
2789 reply => undef, 3071 reply => undef,
2790 tooltip => "Shows your resistances", 3072 tooltip => "Shows your resistances",
2792 "c/pets" => { 3074 "c/pets" => {
2793 id => "infobox", 3075 id => "infobox",
2794 title => "Pets", 3076 title => "Pets",
2795 reply => undef, 3077 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet", 3078 tooltip => "Shows information abotu your pets/a specific pet",
3079 },
3080 "c/perceiveself" => {
3081 id => "infobox",
3082 title => "Perceive Self",
3083 reply => undef,
3084 tooltip => "You gained detailed knowledge about yourself",
2797 }, 3085 },
2798 "c/uptime" => { 3086 "c/uptime" => {
2799 id => "infobox", 3087 id => "infobox",
2800 title => "Uptime", 3088 title => "Uptime",
2801 reply => undef, 3089 reply => undef,
2857 my $pkt = "msg " 3145 my $pkt = "msg "
2858 . $self->{json_coder}->encode ( 3146 . $self->{json_coder}->encode (
2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3147 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 ); 3148 );
2861 3149
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt); 3150 $self->send_big_packet ($pkt);
2873} 3151}
2874 3152
2875=item $client->ext_msg ($type, @msg) 3153=item $client->ext_msg ($type, @msg)
2876 3154
2877Sends an ext event to the client. 3155Sends an ext event to the client.
2880 3158
2881sub cf::client::ext_msg($$@) { 3159sub cf::client::ext_msg($$@) {
2882 my ($self, $type, @msg) = @_; 3160 my ($self, $type, @msg) = @_;
2883 3161
2884 if ($self->extcmd == 2) { 3162 if ($self->extcmd == 2) {
2885 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3163 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2886 } elsif ($self->extcmd == 1) { # TODO: remove 3164 } elsif ($self->extcmd == 1) { # TODO: remove
2887 push @msg, msgtype => "event_$type"; 3165 push @msg, msgtype => "event_$type";
2888 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3166 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2889 } 3167 }
2890} 3168}
2891 3169
2892=item $client->ext_reply ($msgid, @msg) 3170=item $client->ext_reply ($msgid, @msg)
2893 3171
2897 3175
2898sub cf::client::ext_reply($$@) { 3176sub cf::client::ext_reply($$@) {
2899 my ($self, $id, @msg) = @_; 3177 my ($self, $id, @msg) = @_;
2900 3178
2901 if ($self->extcmd == 2) { 3179 if ($self->extcmd == 2) {
2902 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3180 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2903 } elsif ($self->extcmd == 1) { 3181 } elsif ($self->extcmd == 1) {
2904 #TODO: version 1, remove 3182 #TODO: version 1, remove
2905 unshift @msg, msgtype => "reply", msgid => $id; 3183 unshift @msg, msgtype => "reply", msgid => $id;
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3184 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2907 } 3185 }
2908} 3186}
2909 3187
2910=item $success = $client->query ($flags, "text", \&cb) 3188=item $success = $client->query ($flags, "text", \&cb)
2911 3189
2982 3260
2983 $ns->ext_reply ($reply, @reply) 3261 $ns->ext_reply ($reply, @reply)
2984 if $reply; 3262 if $reply;
2985 3263
2986 } else { 3264 } else {
2987 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3265 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2988 } 3266 }
2989 3267
2990 cf::override; 3268 cf::override;
2991 }, 3269 },
2992); 3270);
3012 3290
3013 $coro 3291 $coro
3014} 3292}
3015 3293
3016cf::client->attach ( 3294cf::client->attach (
3017 on_destroy => sub { 3295 on_client_destroy => sub {
3018 my ($ns) = @_; 3296 my ($ns) = @_;
3019 3297
3020 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3298 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3021 }, 3299 },
3022); 3300);
3038our $safe_hole = new Safe::Hole; 3316our $safe_hole = new Safe::Hole;
3039 3317
3040$SIG{FPE} = 'IGNORE'; 3318$SIG{FPE} = 'IGNORE';
3041 3319
3042$safe->permit_only (Opcode::opset qw( 3320$safe->permit_only (Opcode::opset qw(
3043 :base_core :base_mem :base_orig :base_math 3321 :base_core :base_mem :base_orig :base_math :base_loop
3044 grepstart grepwhile mapstart mapwhile 3322 grepstart grepwhile mapstart mapwhile
3045 sort time 3323 sort time
3046)); 3324));
3047 3325
3048# here we export the classes and methods available to script code 3326# here we export the classes and methods available to script code
3052The following functions and methods are available within a safe environment: 3330The following functions and methods are available within a safe environment:
3053 3331
3054 cf::object 3332 cf::object
3055 contr pay_amount pay_player map x y force_find force_add destroy 3333 contr pay_amount pay_player map x y force_find force_add destroy
3056 insert remove name archname title slaying race decrease split 3334 insert remove name archname title slaying race decrease split
3335 value
3057 3336
3058 cf::object::player 3337 cf::object::player
3059 player 3338 player
3060 3339
3061 cf::player 3340 cf::player
3067=cut 3346=cut
3068 3347
3069for ( 3348for (
3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3349 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3071 insert remove inv nrof name archname title slaying race 3350 insert remove inv nrof name archname title slaying race
3072 decrease split destroy change_exp)], 3351 decrease split destroy change_exp value msg lore send_msg)],
3073 ["cf::object::player" => qw(player)], 3352 ["cf::object::player" => qw(player)],
3074 ["cf::player" => qw(peaceful)], 3353 ["cf::player" => qw(peaceful send_msg)],
3075 ["cf::map" => qw(trigger)], 3354 ["cf::map" => qw(trigger)],
3076) { 3355) {
3077 no strict 'refs';
3078 my ($pkg, @funs) = @$_; 3356 my ($pkg, @funs) = @$_;
3079 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3357 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3080 for @funs; 3358 for @funs;
3081} 3359}
3082 3360
3097 3375
3098 my $qcode = $code; 3376 my $qcode = $code;
3099 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3377 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3100 $qcode =~ s/\n/\\n/g; 3378 $qcode =~ s/\n/\\n/g;
3101 3379
3380 %vars = (_dummy => 0) unless %vars;
3381
3382 my @res;
3102 local $_; 3383 local $_;
3103 local @safe::cf::_safe_eval_args = values %vars;
3104 3384
3105 my $eval = 3385 my $eval =
3106 "do {\n" 3386 "do {\n"
3107 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3387 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3108 . "#line 0 \"{$qcode}\"\n" 3388 . "#line 0 \"{$qcode}\"\n"
3109 . $code 3389 . $code
3110 . "\n}" 3390 . "\n}"
3111 ; 3391 ;
3112 3392
3393 if ($CFG{safe_eval}) {
3113 sub_generation_inc; 3394 sub_generation_inc;
3395 local @safe::cf::_safe_eval_args = values %vars;
3114 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3396 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3115 sub_generation_inc; 3397 sub_generation_inc;
3398 } else {
3399 local @cf::_safe_eval_args = values %vars;
3400 @res = wantarray ? eval eval : scalar eval $eval;
3401 }
3116 3402
3117 if ($@) { 3403 if ($@) {
3118 warn "$@"; 3404 warn "$@",
3119 warn "while executing safe code '$code'\n"; 3405 "while executing safe code '$code'\n",
3120 warn "with arguments " . (join " ", %vars) . "\n"; 3406 "with arguments " . (join " ", %vars) . "\n";
3121 } 3407 }
3122 3408
3123 wantarray ? @res : $res[0] 3409 wantarray ? @res : $res[0]
3124} 3410}
3125 3411
3139=cut 3425=cut
3140 3426
3141sub register_script_function { 3427sub register_script_function {
3142 my ($fun, $cb) = @_; 3428 my ($fun, $cb) = @_;
3143 3429
3144 no strict 'refs'; 3430 $fun = "safe::$fun" if $CFG{safe_eval};
3145 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3431 *$fun = $safe_hole->wrap ($cb);
3146} 3432}
3147 3433
3148=back 3434=back
3149 3435
3150=cut 3436=cut
3159 # for this (global event?) 3445 # for this (global event?)
3160 %ext::player_env::MUSIC_FACE_CACHE = (); 3446 %ext::player_env::MUSIC_FACE_CACHE = ();
3161 3447
3162 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3448 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3163 3449
3164 warn "loading facedata from $path\n"; 3450 trace "loading facedata from $path\n";
3165 3451
3166 my $facedata; 3452 my $facedata = decode_storable load_file $path;
3167 0 < aio_load $path, $facedata
3168 or die "$path: $!";
3169
3170 $facedata = Coro::Storable::thaw $facedata;
3171 3453
3172 $facedata->{version} == 2 3454 $facedata->{version} == 2
3173 or cf::cleanup "$path: version mismatch, cannot proceed."; 3455 or cf::cleanup "$path: version mismatch, cannot proceed.";
3174 3456
3175 # patch in the exptable 3457 # patch in the exptable
3458 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3176 $facedata->{resource}{"res/exp_table"} = { 3459 $facedata->{resource}{"res/exp_table"} = {
3177 type => FT_RSRC, 3460 type => FT_RSRC,
3178 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3461 data => $exp_table,
3462 hash => (Digest::MD5::md5 $exp_table),
3179 }; 3463 };
3180 cf::cede_to_tick; 3464 cf::cede_to_tick;
3181 3465
3182 { 3466 {
3183 my $faces = $facedata->{faceinfo}; 3467 my $faces = $facedata->{faceinfo};
3185 while (my ($face, $info) = each %$faces) { 3469 while (my ($face, $info) = each %$faces) {
3186 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3470 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3187 3471
3188 cf::face::set_visibility $idx, $info->{visibility}; 3472 cf::face::set_visibility $idx, $info->{visibility};
3189 cf::face::set_magicmap $idx, $info->{magicmap}; 3473 cf::face::set_magicmap $idx, $info->{magicmap};
3190 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3474 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3191 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3475 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3476 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3192 3477
3193 cf::cede_to_tick; 3478 cf::cede_to_tick;
3194 } 3479 }
3195 3480
3196 while (my ($face, $info) = each %$faces) { 3481 while (my ($face, $info) = each %$faces) {
3201 3486
3202 if (my $smooth = cf::face::find $info->{smooth}) { 3487 if (my $smooth = cf::face::find $info->{smooth}) {
3203 cf::face::set_smooth $idx, $smooth; 3488 cf::face::set_smooth $idx, $smooth;
3204 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3489 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3205 } else { 3490 } else {
3206 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3491 error "smooth face '$info->{smooth}' not found for face '$face'";
3207 } 3492 }
3208 3493
3209 cf::cede_to_tick; 3494 cf::cede_to_tick;
3210 } 3495 }
3211 } 3496 }
3220 3505
3221 cf::anim::invalidate_all; # d'oh 3506 cf::anim::invalidate_all; # d'oh
3222 } 3507 }
3223 3508
3224 { 3509 {
3225 # TODO: for gcfclient pleasure, we should give resources
3226 # that gcfclient doesn't grok a >10000 face index.
3227 my $res = $facedata->{resource}; 3510 my $res = $facedata->{resource};
3228 3511
3229 while (my ($name, $info) = each %$res) { 3512 while (my ($name, $info) = each %$res) {
3230 if (defined $info->{type}) { 3513 if (defined $info->{type}) {
3231 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3514 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3232 my $data;
3233 3515
3234 if ($info->{type} & 1) { 3516 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3235 # prepend meta info
3236
3237 my $meta = $enc->encode ({
3238 name => $name,
3239 %{ $info->{meta} || {} },
3240 });
3241
3242 $data = pack "(w/a*)*", $meta, $info->{data};
3243 } else {
3244 $data = $info->{data};
3245 }
3246
3247 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3248 cf::face::set_type $idx, $info->{type}; 3517 cf::face::set_type $idx, $info->{type};
3249 } else { 3518 } else {
3250 $RESOURCE{$name} = $info; 3519 $RESOURCE{$name} = $info; # unused
3251 } 3520 }
3252 3521
3253 cf::cede_to_tick; 3522 cf::cede_to_tick;
3254 } 3523 }
3255 } 3524 }
3256 3525
3257 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3526 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3258 3527
3259 1 3528 1
3260} 3529}
3261
3262cf::global->attach (on_resource_update => sub {
3263 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3264 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3265
3266 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3267 my $sound = $soundconf->{compat}[$_]
3268 or next;
3269
3270 my $face = cf::face::find "sound/$sound->[1]";
3271 cf::sound::set $sound->[0] => $face;
3272 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3273 }
3274
3275 while (my ($k, $v) = each %{$soundconf->{event}}) {
3276 my $face = cf::face::find "sound/$v";
3277 cf::sound::set $k => $face;
3278 }
3279 }
3280});
3281 3530
3282register_exticmd fx_want => sub { 3531register_exticmd fx_want => sub {
3283 my ($ns, $want) = @_; 3532 my ($ns, $want) = @_;
3284 3533
3285 while (my ($k, $v) = each %$want) { 3534 while (my ($k, $v) = each %$want) {
3324sub reload_treasures { 3573sub reload_treasures {
3325 load_resource_file "$DATADIR/treasures" 3574 load_resource_file "$DATADIR/treasures"
3326 or die "unable to load treasurelists\n"; 3575 or die "unable to load treasurelists\n";
3327} 3576}
3328 3577
3578sub reload_sound {
3579 trace "loading sound config from $DATADIR/sound\n";
3580
3581 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3582
3583 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3584 my $sound = $soundconf->{compat}[$_]
3585 or next;
3586
3587 my $face = cf::face::find "sound/$sound->[1]";
3588 cf::sound::set $sound->[0] => $face;
3589 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3590 }
3591
3592 while (my ($k, $v) = each %{$soundconf->{event}}) {
3593 my $face = cf::face::find "sound/$v";
3594 cf::sound::set $k => $face;
3595 }
3596}
3597
3329sub reload_resources { 3598sub reload_resources {
3330 warn "reloading resource files...\n"; 3599 trace "reloading resource files...\n";
3331 3600
3601 reload_exp_table;
3602 reload_materials;
3332 reload_facedata; 3603 reload_facedata;
3604 reload_sound;
3333 reload_archetypes; 3605 reload_archetypes;
3334 reload_regions; 3606 reload_regions;
3335 reload_treasures; 3607 reload_treasures;
3336 3608
3337 warn "finished reloading resource files\n"; 3609 trace "finished reloading resource files\n";
3338} 3610}
3339 3611
3340sub reload_config { 3612sub reload_config {
3341 open my $fh, "<:utf8", "$CONFDIR/config" 3613 trace "reloading config file...\n";
3342 or return;
3343 3614
3344 local $/; 3615 my $config = load_file "$CONFDIR/config";
3345 *CFG = YAML::Load <$fh>; 3616 utf8::decode $config;
3617 *CFG = decode_yaml $config;
3346 3618
3347 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3619 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3348 3620
3349 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3621 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3350 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3622 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3351 3623
3352 if (exists $CFG{mlockall}) { 3624 if (exists $CFG{mlockall}) {
3375 3647
3376 seek $fh, 0, 0; 3648 seek $fh, 0, 0;
3377 print $fh $$; 3649 print $fh $$;
3378} 3650}
3379 3651
3652sub main_loop {
3653 trace "EV::loop starting\n";
3654 if (1) {
3655 EV::loop;
3656 }
3657 trace "EV::loop returned\n";
3658 goto &main_loop unless $REALLY_UNLOOP;
3659}
3660
3380sub main { 3661sub main {
3381 cf::init_globals; # initialise logging 3662 cf::init_globals; # initialise logging
3382 3663
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3664 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3665 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3666 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3667 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392 3668
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3669 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394 3670
3395 # we must not ever block the main coroutine 3671 # we must not ever block the main coroutine
3396 local $Coro::idle = sub { 3672 local $Coro::idle = sub {
3402 }; 3678 };
3403 3679
3404 evthread_start IO::AIO::poll_fileno; 3680 evthread_start IO::AIO::poll_fileno;
3405 3681
3406 cf::sync_job { 3682 cf::sync_job {
3683 cf::incloader::init ();
3684
3685 cf::init_anim;
3686 cf::init_attackmess;
3687 cf::init_dynamic;
3688
3689 cf::load_settings;
3690
3407 reload_resources; 3691 reload_resources;
3408 reload_config; 3692 reload_config;
3409 db_init; 3693 db_init;
3410 3694
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid; 3695 cf::init_uuid;
3414 cf::init_signals; 3696 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills; 3697 cf::init_skills;
3417 3698
3418 cf::init_beforeplay; 3699 cf::init_beforeplay;
3419 3700
3420 atomic; 3701 atomic;
3422 load_extensions; 3703 load_extensions;
3423 3704
3424 utime time, time, $RUNTIMEFILE; 3705 utime time, time, $RUNTIMEFILE;
3425 3706
3426 # no (long-running) fork's whatsoever before this point(!) 3707 # no (long-running) fork's whatsoever before this point(!)
3708 use POSIX ();
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3709 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428 3710
3429 (pop @POST_INIT)->(0) while @POST_INIT; 3711 cf::_post_init 0;
3430 }; 3712 };
3431 3713
3432 EV::loop; 3714 cf::object::thawer::errors_are_fatal 0;
3715 info "parse errors in files are no longer fatal from this point on.\n";
3716
3717 my $free_main; $free_main = EV::idle sub {
3718 undef $free_main;
3719 undef &main; # free gobs of memory :)
3720 };
3721
3722 goto &main_loop;
3433} 3723}
3434 3724
3435############################################################################# 3725#############################################################################
3436# initialisation and cleanup 3726# initialisation and cleanup
3437 3727
3438# install some emergency cleanup handlers 3728# install some emergency cleanup handlers
3439BEGIN { 3729BEGIN {
3440 our %SIGWATCHER = (); 3730 our %SIGWATCHER = ();
3441 for my $signal (qw(INT HUP TERM)) { 3731 for my $signal (qw(INT HUP TERM)) {
3442 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3732 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3443 cf::cleanup "SIG$signal"; 3733 cf::cleanup "SIG$signal";
3444 }; 3734 };
3445 } 3735 }
3446} 3736}
3447 3737
3448sub write_runtime_sync { 3738sub write_runtime_sync {
3739 my $t0 = AE::time;
3740
3449 # first touch the runtime file to show we are still running: 3741 # first touch the runtime file to show we are still running:
3450 # the fsync below can take a very very long time. 3742 # the fsync below can take a very very long time.
3451 3743
3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3744 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3453 3745
3454 my $guard = cf::lock_acquire "write_runtime"; 3746 my $guard = cf::lock_acquire "write_runtime";
3455 3747
3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3748 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3457 or return; 3749 or return;
3458 3750
3459 my $value = $cf::RUNTIME + 90 + 10; 3751 my $value = $cf::RUNTIME + 90 + 10;
3460 # 10 is the runtime save interval, for a monotonic clock 3752 # 10 is the runtime save interval, for a monotonic clock
3461 # 60 allows for the watchdog to kill the server. 3753 # 60 allows for the watchdog to kill the server.
3474 or return; 3766 or return;
3475 3767
3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3768 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3477 and return; 3769 and return;
3478 3770
3479 warn "runtime file written.\n"; 3771 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3480 3772
3481 1 3773 1
3482} 3774}
3483 3775
3484our $uuid_lock; 3776our $uuid_lock;
3496 or return; 3788 or return;
3497 3789
3498 my $value = uuid_seq uuid_cur; 3790 my $value = uuid_seq uuid_cur;
3499 3791
3500 unless ($value) { 3792 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n"; 3793 info "cowardly refusing to write zero uuid value!\n";
3502 return; 3794 return;
3503 } 3795 }
3504 3796
3505 my $value = uuid_str $value + $uuid_skip; 3797 my $value = uuid_str $value + $uuid_skip;
3506 $uuid_skip = 0; 3798 $uuid_skip = 0;
3516 or return; 3808 or return;
3517 3809
3518 aio_rename "$uuid~", $uuid 3810 aio_rename "$uuid~", $uuid
3519 and return; 3811 and return;
3520 3812
3521 warn "uuid file written ($value).\n"; 3813 trace "uuid file written ($value).\n";
3522 3814
3523 1 3815 1
3524 3816
3525} 3817}
3526 3818
3532} 3824}
3533 3825
3534sub emergency_save() { 3826sub emergency_save() {
3535 my $freeze_guard = cf::freeze_mainloop; 3827 my $freeze_guard = cf::freeze_mainloop;
3536 3828
3537 warn "emergency_perl_save: enter\n"; 3829 info "emergency_perl_save: enter\n";
3830
3831 # this is a trade-off: we want to be very quick here, so
3832 # save all maps without fsync, and later call a global sync
3833 # (which in turn might be very very slow)
3834 local $USE_FSYNC = 0;
3538 3835
3539 cf::sync_job { 3836 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so 3837 cf::write_runtime_sync; # external watchdog should not bark
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544 3838
3545 # use a peculiar iteration method to avoid tripping on perl 3839 # use a peculiar iteration method to avoid tripping on perl
3546 # refcount bugs in for. also avoids problems with players 3840 # refcount bugs in for. also avoids problems with players
3547 # and maps saved/destroyed asynchronously. 3841 # and maps saved/destroyed asynchronously.
3548 warn "emergency_perl_save: begin player save\n"; 3842 info "emergency_perl_save: begin player save\n";
3549 for my $login (keys %cf::PLAYER) { 3843 for my $login (keys %cf::PLAYER) {
3550 my $pl = $cf::PLAYER{$login} or next; 3844 my $pl = $cf::PLAYER{$login} or next;
3551 $pl->valid or next; 3845 $pl->valid or next;
3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3846 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3553 $pl->save; 3847 $pl->save;
3554 } 3848 }
3555 warn "emergency_perl_save: end player save\n"; 3849 info "emergency_perl_save: end player save\n";
3556 3850
3851 cf::write_runtime_sync; # external watchdog should not bark
3852
3557 warn "emergency_perl_save: begin map save\n"; 3853 info "emergency_perl_save: begin map save\n";
3558 for my $path (keys %cf::MAP) { 3854 for my $path (keys %cf::MAP) {
3559 my $map = $cf::MAP{$path} or next; 3855 my $map = $cf::MAP{$path} or next;
3560 $map->valid or next; 3856 $map->valid or next;
3561 $map->save; 3857 $map->save;
3562 } 3858 }
3563 warn "emergency_perl_save: end map save\n"; 3859 info "emergency_perl_save: end map save\n";
3564 3860
3861 cf::write_runtime_sync; # external watchdog should not bark
3862
3565 warn "emergency_perl_save: begin database checkpoint\n"; 3863 info "emergency_perl_save: begin database checkpoint\n";
3566 BDB::db_env_txn_checkpoint $DB_ENV; 3864 BDB::db_env_txn_checkpoint $DB_ENV;
3567 warn "emergency_perl_save: end database checkpoint\n"; 3865 info "emergency_perl_save: end database checkpoint\n";
3568 3866
3569 warn "emergency_perl_save: begin write uuid\n"; 3867 info "emergency_perl_save: begin write uuid\n";
3570 write_uuid_sync 1; 3868 write_uuid_sync 1;
3571 warn "emergency_perl_save: end write uuid\n"; 3869 info "emergency_perl_save: end write uuid\n";
3870
3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 trace "emergency_perl_save: syncing database to disk";
3874 BDB::db_env_txn_checkpoint $DB_ENV;
3875
3876 info "emergency_perl_save: starting sync\n";
3877 IO::AIO::aio_sync sub {
3878 info "emergency_perl_save: finished sync\n";
3879 };
3880
3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 trace "emergency_perl_save: flushing outstanding aio requests";
3884 while (IO::AIO::nreqs || BDB::nreqs) {
3885 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3886 }
3887
3888 cf::write_runtime_sync; # external watchdog should not bark
3572 }; 3889 };
3573 3890
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3579 warn "emergency_perl_save: leave\n"; 3891 info "emergency_perl_save: leave\n";
3580} 3892}
3581 3893
3582sub post_cleanup { 3894sub post_cleanup {
3583 my ($make_core) = @_; 3895 my ($make_core) = @_;
3584 3896
3897 IO::AIO::flush;
3898
3585 warn Carp::longmess "post_cleanup backtrace" 3899 error Carp::longmess "post_cleanup backtrace"
3586 if $make_core; 3900 if $make_core;
3587 3901
3588 my $fh = pidfile; 3902 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$; 3903 unlink $PIDFILE if <$fh> == $$;
3590} 3904}
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3924 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) { 3925 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"}; 3926 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3927# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 } 3928 }
3615 warn "cleared package $pkg\n";#d#
3616} 3929}
3617 3930
3618sub do_reload_perl() { 3931sub do_reload_perl() {
3619 # can/must only be called in main 3932 # can/must only be called in main
3620 if ($Coro::current != $Coro::main) { 3933 unless (in_main) {
3621 warn "can only reload from main coroutine"; 3934 error "can only reload from main coroutine";
3622 return; 3935 return;
3623 } 3936 }
3624 3937
3625 return if $RELOAD++; 3938 return if $RELOAD++;
3626 3939
3627 my $t1 = EV::time; 3940 my $t1 = AE::time;
3628 3941
3629 while ($RELOAD) { 3942 while ($RELOAD) {
3630 warn "reloading..."; 3943 cf::get_slot 0.1, -1, "reload_perl";
3944 info "perl_reload: reloading...";
3631 3945
3632 warn "entering sync_job"; 3946 trace "perl_reload: entering sync_job";
3633 3947
3634 cf::sync_job { 3948 cf::sync_job {
3635 cf::write_runtime_sync; # external watchdog should not bark
3636 cf::emergency_save; 3949 #cf::emergency_save;
3637 cf::write_runtime_sync; # external watchdog should not bark
3638 3950
3639 warn "syncing database to disk";
3640 BDB::db_env_txn_checkpoint $DB_ENV;
3641
3642 # if anything goes wrong in here, we should simply crash as we already saved
3643
3644 warn "flushing outstanding aio requests";
3645 while (IO::AIO::nreqs || BDB::nreqs) {
3646 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3647 }
3648
3649 warn "cancelling all extension coros"; 3951 trace "perl_reload: cancelling all extension coros";
3650 $_->cancel for values %EXT_CORO; 3952 $_->cancel for values %EXT_CORO;
3651 %EXT_CORO = (); 3953 %EXT_CORO = ();
3652 3954
3653 warn "removing commands"; 3955 trace "perl_reload: removing commands";
3654 %COMMAND = (); 3956 %COMMAND = ();
3655 3957
3656 warn "removing ext/exti commands"; 3958 trace "perl_reload: removing ext/exti commands";
3657 %EXTCMD = (); 3959 %EXTCMD = ();
3658 %EXTICMD = (); 3960 %EXTICMD = ();
3659 3961
3660 warn "unloading/nuking all extensions"; 3962 trace "perl_reload: unloading/nuking all extensions";
3661 for my $pkg (@EXTS) { 3963 for my $pkg (@EXTS) {
3662 warn "... unloading $pkg"; 3964 trace "... unloading $pkg";
3663 3965
3664 if (my $cb = $pkg->can ("unload")) { 3966 if (my $cb = $pkg->can ("unload")) {
3665 eval { 3967 eval {
3666 $cb->($pkg); 3968 $cb->($pkg);
3667 1 3969 1
3668 } or warn "$pkg unloaded, but with errors: $@"; 3970 } or error "$pkg unloaded, but with errors: $@";
3669 } 3971 }
3670 3972
3671 warn "... clearing $pkg"; 3973 trace "... clearing $pkg";
3672 clear_package $pkg; 3974 clear_package $pkg;
3673 } 3975 }
3674 3976
3675 warn "unloading all perl modules loaded from $LIBDIR"; 3977 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) { 3978 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678 3980
3679 warn "... unloading $k"; 3981 trace "... unloading $k";
3680 delete $INC{$k}; 3982 delete $INC{$k};
3681 3983
3682 $k =~ s/\.pm$//; 3984 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g; 3985 $k =~ s/\//::/g;
3684 3986
3687 } 3989 }
3688 3990
3689 clear_package $k; 3991 clear_package $k;
3690 } 3992 }
3691 3993
3692 warn "getting rid of safe::, as good as possible"; 3994 trace "perl_reload: getting rid of safe::, as good as possible";
3693 clear_package "safe::$_" 3995 clear_package "safe::$_"
3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3996 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3695 3997
3696 warn "unloading cf.pm \"a bit\""; 3998 trace "perl_reload: unloading cf.pm \"a bit\"";
3697 delete $INC{"cf.pm"}; 3999 delete $INC{"cf.pm"};
3698 delete $INC{"cf/pod.pm"}; 4000 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3699 4001
3700 # don't, removes xs symbols, too, 4002 # don't, removes xs symbols, too,
3701 # and global variables created in xs 4003 # and global variables created in xs
3702 #clear_package __PACKAGE__; 4004 #clear_package __PACKAGE__;
3703 4005
3704 warn "unload completed, starting to reload now"; 4006 info "perl_reload: unload completed, starting to reload now";
3705 4007
3706 warn "reloading cf.pm"; 4008 trace "perl_reload: reloading cf.pm";
3707 require cf; 4009 require cf;
3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4010 cf::_connect_to_perl_1;
3709 4011
3710 warn "loading config and database again"; 4012 trace "perl_reload: loading config and database again";
3711 cf::reload_config; 4013 cf::reload_config;
3712 4014
3713 warn "loading extensions"; 4015 trace "perl_reload: loading extensions";
3714 cf::load_extensions; 4016 cf::load_extensions;
3715 4017
3716 if ($REATTACH_ON_RELOAD) { 4018 if ($REATTACH_ON_RELOAD) {
3717 warn "reattaching attachments to objects/players"; 4019 trace "perl_reload: reattaching attachments to objects/players";
3718 _global_reattach; # objects, sockets 4020 _global_reattach; # objects, sockets
3719 warn "reattaching attachments to maps"; 4021 trace "perl_reload: reattaching attachments to maps";
3720 reattach $_ for values %MAP; 4022 reattach $_ for values %MAP;
3721 warn "reattaching attachments to players"; 4023 trace "perl_reload: reattaching attachments to players";
3722 reattach $_ for values %PLAYER; 4024 reattach $_ for values %PLAYER;
3723 } 4025 }
3724 4026
3725 warn "running post_init jobs"; 4027 cf::_post_init 1;
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727 4028
3728 warn "leaving sync_job"; 4029 trace "perl_reload: leaving sync_job";
3729 4030
3730 1 4031 1
3731 } or do { 4032 } or do {
3732 warn $@; 4033 error $@;
3733 cf::cleanup "error while reloading, exiting."; 4034 cf::cleanup "perl_reload: error, exiting.";
3734 }; 4035 };
3735 4036
3736 warn "reloaded";
3737 --$RELOAD; 4037 --$RELOAD;
3738 } 4038 }
3739 4039
3740 $t1 = EV::time - $t1; 4040 $t1 = AE::time - $t1;
3741 warn "reload completed in ${t1}s\n"; 4041 info "perl_reload: completed in ${t1}s\n";
3742}; 4042};
3743 4043
3744our $RELOAD_WATCHER; # used only during reload 4044our $RELOAD_WATCHER; # used only during reload
3745 4045
3746sub reload_perl() { 4046sub reload_perl() {
3748 # coro crashes during coro_state_free->destroy here. 4048 # coro crashes during coro_state_free->destroy here.
3749 4049
3750 $RELOAD_WATCHER ||= cf::async { 4050 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions; 4051 Coro::AIO::aio_wait cache_extensions;
3752 4052
3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4053 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3754 do_reload_perl; 4054 do_reload_perl;
3755 undef $RELOAD_WATCHER; 4055 undef $RELOAD_WATCHER;
3756 }; 4056 };
3757 }; 4057 };
3758} 4058}
3767 reload_perl; 4067 reload_perl;
3768 }; 4068 };
3769 } 4069 }
3770}; 4070};
3771 4071
3772unshift @INC, $LIBDIR; 4072#############################################################################
3773 4073
3774my $bug_warning = 0; 4074my $bug_warning = 0;
3775 4075
3776our @WAIT_FOR_TICK; 4076our @WAIT_FOR_TICK;
3777our @WAIT_FOR_TICK_BEGIN; 4077our @WAIT_FOR_TICK_BEGIN;
3778 4078
3779sub wait_for_tick { 4079sub wait_for_tick() {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4080 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3781 4081
3782 my $signal = new Coro::Signal; 4082 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK, $signal; 4083 push @WAIT_FOR_TICK, $signal;
3784 $signal->wait; 4084 $signal->wait;
3785} 4085}
3786 4086
3787sub wait_for_tick_begin { 4087sub wait_for_tick_begin() {
3788 return if tick_inhibit || $Coro::current == $Coro::main; 4088 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3789 4089
3790 my $signal = new Coro::Signal; 4090 my $signal = new Coro::Signal;
3791 push @WAIT_FOR_TICK_BEGIN, $signal; 4091 push @WAIT_FOR_TICK_BEGIN, $signal;
3792 $signal->wait; 4092 $signal->wait;
3793} 4093}
3799 return; 4099 return;
3800 } 4100 }
3801 4101
3802 cf::server_tick; # one server iteration 4102 cf::server_tick; # one server iteration
3803 4103
4104 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105
3804 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4106 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3805 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4107 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3806 Coro::async_pool { 4108 Coro::async_pool {
3807 $Coro::current->{desc} = "runtime saver"; 4109 $Coro::current->{desc} = "runtime saver";
3808 write_runtime_sync 4110 write_runtime_sync
3809 or warn "ERROR: unable to write runtime file: $!"; 4111 or error "ERROR: unable to write runtime file: $!";
3810 }; 4112 };
3811 } 4113 }
3812 4114
3813 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4115 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3814 $sig->send; 4116 $sig->send;
3822 4124
3823 if (0) { 4125 if (0) {
3824 if ($NEXT_TICK) { 4126 if ($NEXT_TICK) {
3825 my $jitter = $TICK_START - $NEXT_TICK; 4127 my $jitter = $TICK_START - $NEXT_TICK;
3826 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4128 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3827 warn "jitter $JITTER\n";#d# 4129 debug "jitter $JITTER\n";#d#
3828 } 4130 }
3829 } 4131 }
3830} 4132}
3831 4133
3832{ 4134{
3833 # configure BDB 4135 # configure BDB
3834 4136
3835 BDB::min_parallel 8; 4137 BDB::min_parallel 16;
3836 BDB::max_poll_reqs $TICK * 0.1; 4138 BDB::max_poll_reqs $TICK * 0.1;
3837 $AnyEvent::BDB::WATCHER->priority (1); 4139 $AnyEvent::BDB::WATCHER->priority (1);
3838 4140
3839 unless ($DB_ENV) { 4141 unless ($DB_ENV) {
3840 $DB_ENV = BDB::db_env_create; 4142 $DB_ENV = BDB::db_env_create;
3877 IO::AIO::min_parallel 8; 4179 IO::AIO::min_parallel 8;
3878 IO::AIO::max_poll_time $TICK * 0.1; 4180 IO::AIO::max_poll_time $TICK * 0.1;
3879 undef $AnyEvent::AIO::WATCHER; 4181 undef $AnyEvent::AIO::WATCHER;
3880} 4182}
3881 4183
3882my $_log_backtrace; 4184our $_log_backtrace;
4185our $_log_backtrace_last;
3883 4186
3884sub _log_backtrace { 4187sub _log_backtrace {
3885 my ($msg, @addr) = @_; 4188 my ($msg, @addr) = @_;
3886 4189
3887 $msg =~ s/\n//; 4190 $msg =~ s/\n$//;
3888 4191
4192 if ($_log_backtrace_last eq $msg) {
4193 LOG llevInfo, "[ABT] $msg\n";
4194 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3889 # limit the # of concurrent backtraces 4195 # limit the # of concurrent backtraces
3890 if ($_log_backtrace < 2) { 4196 } elsif ($_log_backtrace < 2) {
4197 $_log_backtrace_last = $msg;
3891 ++$_log_backtrace; 4198 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg; 4199 my $perl_bt = Carp::longmess $msg;
3893 async { 4200 async {
3894 $Coro::current->{desc} = "abt $msg"; 4201 $Coro::current->{desc} = "abt $msg";
3895 4202
3915 LOG llevInfo, "[ABT] $_\n" for @bt; 4222 LOG llevInfo, "[ABT] $_\n" for @bt;
3916 --$_log_backtrace; 4223 --$_log_backtrace;
3917 }; 4224 };
3918 } else { 4225 } else {
3919 LOG llevInfo, "[ABT] $msg\n"; 4226 LOG llevInfo, "[ABT] $msg\n";
3920 LOG llevInfo, "[ABT] [suppressed]\n"; 4227 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3921 } 4228 }
3922} 4229}
3923 4230
3924# load additional modules 4231# load additional modules
3925use cf::pod; 4232require "cf/$_.pm" for @EXTRA_MODULES;
4233cf::_connect_to_perl_2;
3926 4234
3927END { cf::emergency_save } 4235END { cf::emergency_save }
3928 4236
39291 42371
3930 4238

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines