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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.549 by root, Tue May 11 13:19:59 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36 36
37use Guard ();
37use Coro (); 38use Coro ();
38use Coro::State; 39use Coro::State;
39use Coro::Handle; 40use Coro::Handle;
40use Coro::EV; 41use Coro::EV;
41use Coro::AnyEvent; 42use Coro::AnyEvent;
42use Coro::Timer; 43use Coro::Timer;
43use Coro::Signal; 44use Coro::Signal;
44use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
45use Coro::AnyEvent; 47use Coro::AnyEvent;
46use Coro::AIO; 48use Coro::AIO;
47use Coro::BDB 1.6; 49use Coro::BDB 1.6;
48use Coro::Storable; 50use Coro::Storable;
49use Coro::Util (); 51use Coro::Util ();
50 52
51use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
52use BDB (); 54use BDB ();
53use Data::Dumper; 55use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 56use Fcntl;
56use YAML (); 57use YAML::XS ();
57use IO::AIO (); 58use IO::AIO ();
58use Time::HiRes; 59use Time::HiRes;
59use Compress::LZF; 60use Compress::LZF;
60use Digest::MD5 (); 61use Digest::MD5 ();
61 62
70 71
71# make sure c-lzf reinitialises itself 72# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 75
76# strictly for debugging
77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
78
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
76 82
77our %COMMAND = (); 83our %COMMAND = ();
78our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
79 85
80our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
85 91
86our $RELOAD; # number of reloads so far, non-zero while in reload 92our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
88 96
89our $CONFDIR = confdir; 97our $CONFDIR = confdir;
90our $DATADIR = datadir; 98our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
98our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 108our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 109our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 110
103our %RESOURCE; 111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
104 118
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 121our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
109 123
110our $BDB_DEADLOCK_WATCHER; 124our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 125our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 126our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 127our $DB_ENV;
114 128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
130
115our %CFG; 131our %CFG;
116 132
117our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 134our $RUNTIME;
119our $NOW; 135our $NOW;
130our $JITTER; # average jitter 146our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
132 148
133our @POST_INIT; 149our @POST_INIT;
134 150
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
136 153
137binmode STDOUT; 154binmode STDOUT;
138binmode STDERR; 155binmode STDERR;
139 156
140# read virtual server time, if available 157# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 159 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
145} 162}
146 163
164eval "sub TICK() { $TICK } 1" or die;
165
147mkdir $_ 166mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 168
150our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
151 170
152sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
153 187
154############################################################################# 188#############################################################################
155 189
156=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
157 191
199from wherever your confdir points to. 233from wherever your confdir points to.
200 234
201=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
202 236
203These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
204returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
205per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
206 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
207=item @cf::INVOKE_RESULTS 246=item @cf::INVOKE_RESULTS
208 247
209This array contains the results of the last C<invoke ()> call. When 248This array contains the results of the last C<invoke ()> call. When
210C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
211that call. 250that call.
212 251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
213=back 258=back
214 259
215=cut 260=cut
216 261
217BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
218 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
219 my $msg = join "", @_; 269 my $msg = join "", @_;
220 270
221 $msg .= "\n" 271 $msg .= "\n"
222 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
223 273
224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
225 275
226 LOG llevError, $msg; 276 LOG llevWarn, $msg;
227 }; 277};
228}
229 278
230$Coro::State::DIEHOOK = sub { 279$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 280 return unless $^S eq 0; # "eq", not "=="
232 281
233 if ($Coro::current == $Coro::main) {#d# 282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 285 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 286 return;#d#
236 }#d# 287 }#d#
237 288
238 # kill coroutine otherwise 289 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 290 Coro::terminate
241}; 291};
242
243$SIG{__DIE__} = sub { }; #d#?
244 292
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 310)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 312}
265 313
266$EV::DIED = sub { 314$EV::DIED = sub {
267 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
268}; 316};
269 317
270############################################################################# 318#############################################################################
271 319
272=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
310 358
311sub encode_json($) { $json_coder->encode ($_[0]) } 359sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 360sub decode_json($) { $json_coder->decode ($_[0]) }
313 361
362=item $ref = cf::yaml_load $scalar
363
364Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365
366=cut
367
368sub fork_call(&@);
369
370sub yaml_load($) {
371 fork_call { YAML::XS::Load $_[0] } @_
372}
373
314=item cf::post_init { BLOCK } 374=item cf::post_init { BLOCK }
315 375
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 376Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 377but I<before> the server starts ticking again.
318 378
319The cdoeblock will have a single boolean argument to indicate whether this 379The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 380is a reload or not.
321 381
322=cut 382=cut
323 383
324sub post_init(&) { 384sub post_init(&) {
330Wait until the given lock is available. See cf::lock_acquire. 390Wait until the given lock is available. See cf::lock_acquire.
331 391
332=item my $lock = cf::lock_acquire $string 392=item my $lock = cf::lock_acquire $string
333 393
334Wait until the given lock is available and then acquires it and returns 394Wait until the given lock is available and then acquires it and returns
335a Coro::guard object. If the guard object gets destroyed (goes out of scope, 395a L<Guard> object. If the guard object gets destroyed (goes out of scope,
336for example when the coroutine gets canceled), the lock is automatically 396for example when the coroutine gets canceled), the lock is automatically
337returned. 397returned.
338 398
339Locks are *not* recursive, locking from the same coro twice results in a 399Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro. 400deadlocked coro.
346 406
347Return true if the lock is currently active, i.e. somebody has locked it. 407Return true if the lock is currently active, i.e. somebody has locked it.
348 408
349=cut 409=cut
350 410
351our %LOCK; 411our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 412
354sub lock_wait($) { 413sub lock_wait($) {
355 my ($key) = @_; 414 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 415}
369 416
370sub lock_acquire($) { 417sub lock_acquire($) {
371 my ($key) = @_; 418 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 419}
385 420
386sub lock_active($) { 421sub lock_active($) {
387 my ($key) = @_; 422 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 423}
391 424
392sub freeze_mainloop { 425sub freeze_mainloop {
393 tick_inhibit_inc; 426 tick_inhibit_inc;
394 427
395 Coro::guard \&tick_inhibit_dec; 428 &Guard::guard (\&tick_inhibit_dec);
396} 429}
397 430
398=item cf::periodic $interval, $cb 431=item cf::periodic $interval, $cb
399 432
400Like EV::periodic, but randomly selects a starting point so that the actions 433Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer. 434get spread over time.
402 435
403=cut 436=cut
404 437
405sub periodic($$) { 438sub periodic($$) {
406 my ($interval, $cb) = @_; 439 my ($interval, $cb) = @_;
423 456
424=cut 457=cut
425 458
426our @SLOT_QUEUE; 459our @SLOT_QUEUE;
427our $SLOT_QUEUE; 460our $SLOT_QUEUE;
461our $SLOT_DECAY = 0.9;
428 462
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 463$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 464$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 465 $Coro::current->desc ("timeslot manager");
432 466
433 my $signal = new Coro::Signal; 467 my $signal = new Coro::Signal;
468 my $busy;
434 469
435 while () { 470 while () {
436 next_job: 471 next_job:
472
437 my $avail = cf::till_tick; 473 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 474
439 for (0 .. $#SLOT_QUEUE) { 475 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 476 if ($SLOT_QUEUE[$_][0] <= $avail) {
477 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 478 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 479 $job->[2]->send;
443 Coro::cede; 480 Coro::cede;
444 goto next_job; 481 goto next_job;
445 } 482 } else {
483 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 484 }
447 } 485 }
448 486
449 if (@SLOT_QUEUE) { 487 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive 488 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal; 489 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait; 490 $signal->wait;
453 } else { 491 } else {
492 $busy = 0;
454 Coro::schedule; 493 Coro::schedule;
455 } 494 }
456 } 495 }
457}; 496};
458 497
459sub get_slot($;$$) { 498sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 499 return if tick_inhibit || $Coro::current == $Coro::main;
461 500
462 my ($time, $pri, $name) = @_; 501 my ($time, $pri, $name) = @_;
463 502
464 $time = $TICK * .6 if $time > $TICK * .6; 503 $time = clamp $time, 0.01, $TICK * .6;
504
465 my $sig = new Coro::Signal; 505 my $sig = new Coro::Signal;
466 506
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 507 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 508 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 509 $SLOT_QUEUE->ready;
495=cut 535=cut
496 536
497sub sync_job(&) { 537sub sync_job(&) {
498 my ($job) = @_; 538 my ($job) = @_;
499 539
500 if ($Coro::current == $Coro::main) { 540 if (in_main) {
501 my $time = EV::time; 541 my $time = AE::time;
502 542
503 # this is the main coro, too bad, we have to block 543 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 544 # till the operation succeeds, freezing the server :/
505 545
506 LOG llevError, Carp::longmess "sync job";#d# 546 #LOG llevError, Carp::longmess "sync job";#d#
507 547
508 my $freeze_guard = freeze_mainloop; 548 my $freeze_guard = freeze_mainloop;
509 549
510 my $busy = 1; 550 my $busy = 1;
511 my @res; 551 my @res;
512 552
513 (async { 553 (async {
514 $Coro::current->desc ("sync job coro"); 554 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 555 @res = eval { $job->() };
516 warn $@ if $@; 556 error $@ if $@;
517 undef $busy; 557 undef $busy;
518 })->prio (Coro::PRIO_MAX); 558 })->prio (Coro::PRIO_MAX);
519 559
520 while ($busy) { 560 while ($busy) {
521 if (Coro::nready) { 561 if (Coro::nready) {
523 } else { 563 } else {
524 EV::loop EV::LOOP_ONESHOT; 564 EV::loop EV::LOOP_ONESHOT;
525 } 565 }
526 } 566 }
527 567
528 my $time = EV::time - $time; 568 my $time = AE::time - $time;
529 569
530 $TICK_START += $time; # do not account sync jobs to server load 570 $TICK_START += $time; # do not account sync jobs to server load
531 571
532 wantarray ? @res : $res[0] 572 wantarray ? @res : $res[0]
533 } else { 573 } else {
555 $EXT_CORO{$coro+0} = $coro; 595 $EXT_CORO{$coro+0} = $coro;
556 596
557 $coro 597 $coro
558} 598}
559 599
560=item fork_call { }, $args 600=item fork_call { }, @args
561 601
562Executes the given code block with the given arguments in a seperate 602Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 603process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 604Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 605never block itself or use any form of event handling.
566 606
567=cut 607=cut
568 608
609sub post_fork {
610 reset_signals;
611}
612
569sub fork_call(&@) { 613sub fork_call(&@) {
570 my ($cb, @args) = @_; 614 my ($cb, @args) = @_;
571 615
572 # we seemingly have to make a local copy of the whole thing, 616 # we seemingly have to make a local copy of the whole thing,
573 # otherwise perl prematurely frees the stuff :/ 617 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 618 # TODO: investigate and fix (likely this will be rather laborious)
575 619
576 my @res = Coro::Util::fork_eval { 620 my @res = Coro::Util::fork_eval {
577 reset_signals; 621 cf::post_fork;
578 &$cb 622 &$cb
579 }, @args; 623 } @args;
580 624
581 wantarray ? @res : $res[-1] 625 wantarray ? @res : $res[-1]
626}
627
628sub objinfo {
629 (
630 "counter value" => cf::object::object_count,
631 "objects created" => cf::object::create_count,
632 "objects destroyed" => cf::object::destroy_count,
633 "freelist size" => cf::object::free_count,
634 "allocated objects" => cf::object::objects_size,
635 "active objects" => cf::object::actives_size,
636 )
582} 637}
583 638
584=item $coin = coin_from_name $name 639=item $coin = coin_from_name $name
585 640
586=cut 641=cut
623within each server. 678within each server.
624 679
625=cut 680=cut
626 681
627sub db_table($) { 682sub db_table($) {
683 cf::error "db_get called from main context"
684 if $Coro::current == $Coro::main;
685
628 my ($name) = @_; 686 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 687 my $db = BDB::db_create $DB_ENV;
630 688
631 eval { 689 eval {
632 $db->set_flags (BDB::CHKSUM); 690 $db->set_flags (BDB::CHKSUM);
642} 700}
643 701
644our $DB; 702our $DB;
645 703
646sub db_init { 704sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 705 $DB ||= db_table "db";
649 };
650} 706}
651 707
652sub db_get($$) { 708sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 709 my $key = "$_[0]/$_[1]";
654 710
655 cf::sync_job { 711 cf::error "db_get called from main context"
712 if $Coro::current == $Coro::main;
713
656 BDB::db_get $DB, undef, $key, my $data; 714 BDB::db_get $DB, undef, $key, my $data;
657 715
658 $! ? () 716 $! ? ()
659 : $data 717 : $data
660 }
661} 718}
662 719
663sub db_put($$$) { 720sub db_put($$$) {
664 BDB::dbreq_pri 4; 721 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 722 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 778
722 my $t1 = Time::HiRes::time; 779 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 780 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 781 my $t2 = Time::HiRes::time;
725 782
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 783 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 784
728 db_put cache => "$id/data", $data; 785 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 786 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 787 db_put cache => "$id/meta", $meta;
731 788
741 798
742=cut 799=cut
743 800
744sub datalog($@) { 801sub datalog($@) {
745 my ($type, %kv) = @_; 802 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 803 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 804}
748 805
749=back 806=back
750 807
751=cut 808=cut
946 1003
947 } elsif (exists $cb_id{$type}) { 1004 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1005 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1006
950 } elsif (ref $type) { 1007 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1008 error "attaching objects not supported, ignoring.\n";
952 1009
953 } else { 1010 } else {
954 shift @arg; 1011 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1012 error "attach argument '$type' not supported, ignoring.\n";
956 } 1013 }
957 } 1014 }
958} 1015}
959 1016
960sub _object_attach { 1017sub _object_attach {
970 _attach $registry, $klass, @attach; 1027 _attach $registry, $klass, @attach;
971 } 1028 }
972 1029
973 $obj->{$name} = \%arg; 1030 $obj->{$name} = \%arg;
974 } else { 1031 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1032 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1033 }
977 1034
978 $obj->{_attachment}{$name} = undef; 1035 $obj->{_attachment}{$name} = undef;
979} 1036}
980 1037
1039 1096
1040 for (@$callbacks) { 1097 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1098 eval { &{$_->[1]} };
1042 1099
1043 if ($@) { 1100 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1101 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1102 override;
1047 } 1103 }
1048 1104
1049 return 1 if $override; 1105 return 1 if $override;
1050 } 1106 }
1129 for (@$attach) { 1185 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1186 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1187 _attach $registry, $klass, @attach;
1132 } 1188 }
1133 } else { 1189 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1190 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1191 }
1136 } 1192 }
1137} 1193}
1138 1194
1139cf::attachable->attach ( 1195cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1222 my ($filename, $rdata, $objs) = @_;
1167 1223
1168 sync_job { 1224 sync_job {
1169 if (length $$rdata) { 1225 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1226 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1227 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1228 $decname, length $$rdata, scalar @$objs
1229 if $VERBOSE_IO;
1173 1230
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1231 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1232 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1233 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 aio_fsync $fh if $cf::USE_FSYNC; 1234 if ($cf::USE_FSYNC) {
1235 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;
1236 aio_fsync $fh;
1237 }
1178 aio_close $fh; 1238 aio_close $fh;
1179 1239
1180 if (@$objs) { 1240 if (@$objs) {
1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1241 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1182 aio_chmod $fh, SAVE_MODE; 1242 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1243 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1244 aio_write $fh, 0, (length $data), $data, 0;
1185 aio_fsync $fh if $cf::USE_FSYNC; 1245 if ($cf::USE_FSYNC) {
1246 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;
1247 aio_fsync $fh;
1248 }
1186 aio_close $fh; 1249 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1250 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1251 }
1189 } else { 1252 } else {
1190 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1256 aio_rename "$filename~", $filename;
1194 1257
1195 $filename =~ s%/[^/]+$%%; 1258 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1259 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1260 } else {
1198 warn "FATAL: $filename~: $!\n"; 1261 error "unable to save objects: $filename~: $!\n";
1199 } 1262 }
1200 } else { 1263 } else {
1201 aio_unlink $filename; 1264 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1265 aio_unlink "$filename.pst";
1203 } 1266 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1290 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1291 $av = $st->{objs};
1229 } 1292 }
1230 1293
1231 utf8::decode (my $decname = $filename); 1294 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1295 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1296 $decname, length $data, scalar @{$av || []}
1297 if $VERBOSE_IO;
1234 1298
1235 ($data, $av) 1299 ($data, $av)
1236} 1300}
1237 1301
1238=head2 COMMAND CALLBACKS 1302=head2 COMMAND CALLBACKS
1297} 1361}
1298 1362
1299use File::Glob (); 1363use File::Glob ();
1300 1364
1301cf::player->attach ( 1365cf::player->attach (
1302 on_command => sub { 1366 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1367 my ($pl, $name, $params) = @_;
1304 1368
1305 my $cb = $COMMAND{$name} 1369 my $cb = $COMMAND{$name}
1306 or return; 1370 or return;
1307 1371
1330 1394
1331 $pl->ext_reply ($reply, @reply) 1395 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1396 if $reply;
1333 1397
1334 } else { 1398 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1399 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1400 }
1337 1401
1338 cf::override; 1402 cf::override;
1339 }, 1403 },
1340); 1404);
1341 1405
1342# "readahead" all extensions 1406# "readahead" all extensions
1343sub cache_extensions { 1407sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1408 my $grp = IO::AIO::aio_group;
1345 1409
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1410 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1411 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1412 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1413 }
1350 }; 1414 };
1351 1415
1352 $grp 1416 $grp
1353} 1417}
1354 1418
1355sub load_extensions { 1419sub load_extensions {
1420 info "loading extensions...";
1421
1356 cf::sync_job { 1422 cf::sync_job {
1357 my %todo; 1423 my %todo;
1358 1424
1359 for my $path (<$LIBDIR/*.ext>) { 1425 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1426 next unless -r $path;
1378 1444
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1445 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1446 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1447
1382 $ext{source} = 1448 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1449 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1450 . "#line 1 \"$path\"\n{\n"
1385 . $source 1451 . $source
1386 . "\n};\n1"; 1452 . "\n};\n1";
1387 1453
1388 $todo{$base} = \%ext; 1454 $todo{$base} = \%ext;
1389 } 1455 }
1390 1456
1457 my $pass = 0;
1391 my %done; 1458 my %done;
1392 while (%todo) { 1459 while (%todo) {
1393 my $progress; 1460 my $progress;
1394 1461
1462 ++$pass;
1463
1464 ext:
1395 while (my ($k, $v) = each %todo) { 1465 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1466 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1467 next ext
1398 unless exists $done{$_}; 1468 unless exists $done{$_};
1399 } 1469 }
1400 1470
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1471 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1472
1403 unless (eval $v->{source}) { 1473 my $active = eval $v->{source};
1474
1475 if (length $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1476 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1477
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1478 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1479 if exists $v->{meta}{mandatory};
1411 1480
1412 warn $msg; 1481 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1482 delete $todo{$k};
1483 } else {
1484 $done{$k} = delete $todo{$k};
1485 push @EXTS, $v->{pkg};
1486 $progress = 1;
1487
1488 info "$v->{base}: extension inactive.\n"
1489 unless $active;
1413 } 1490 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1491 }
1419 1492
1420 skip: 1493 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1494 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 unless $progress; 1495
1496 while (my ($k, $v) = each %todo) {
1497 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498 if exists $v->{meta}{mandatory};
1499 }
1500 }
1423 } 1501 }
1424 }; 1502 };
1425} 1503}
1426 1504
1427############################################################################# 1505#############################################################################
1511 $cf::PLAYER{$login} = $pl 1589 $cf::PLAYER{$login} = $pl
1512 } 1590 }
1513 } 1591 }
1514} 1592}
1515 1593
1594cf::player->attach (
1595 on_load => sub {
1596 my ($pl, $path) = @_;
1597
1598 # restore slots saved in save, below
1599 my $slots = delete $pl->{_slots};
1600
1601 $pl->ob->current_weapon ($slots->[0]);
1602 $pl->combat_ob ($slots->[1]);
1603 $pl->ranged_ob ($slots->[2]);
1604 },
1605);
1606
1516sub save($) { 1607sub save($) {
1517 my ($pl) = @_; 1608 my ($pl) = @_;
1518 1609
1519 return if $pl->{deny_save}; 1610 return if $pl->{deny_save};
1520 1611
1525 1616
1526 aio_mkdir playerdir $pl, 0770; 1617 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1618 $pl->{last_save} = $cf::RUNTIME;
1528 1619
1529 cf::get_slot 0.01; 1620 cf::get_slot 0.01;
1621
1622 # save slots, to be restored later
1623 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1530 1624
1531 $pl->save_pl ($path); 1625 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1626 cf::cede_to_tick;
1533} 1627}
1534 1628
1568 my $name = $pl->ob->name; 1662 my $name = $pl->ob->name;
1569 1663
1570 $pl->{deny_save} = 1; 1664 $pl->{deny_save} = 1;
1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1665 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1572 1666
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1667 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1668 $pl->deactivate;
1669
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1670 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1671 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1672 ext::highscore::check ($pl->ob);
1673
1578 $pl->ns->destroy if $pl->ns; 1674 $pl->ns->destroy if $pl->ns;
1579 1675
1580 my $path = playerdir $pl; 1676 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1677 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1678 aio_rename $path, $temp;
1636 \@logins 1732 \@logins
1637} 1733}
1638 1734
1639=item $player->maps 1735=item $player->maps
1640 1736
1737=item cf::player::maps $login
1738
1641Returns an arrayref of map paths that are private for this 1739Returns an arrayref of map paths that are private for this
1642player. May block. 1740player. May block.
1643 1741
1644=cut 1742=cut
1645 1743
1707=cut 1805=cut
1708 1806
1709sub find_by_path($) { 1807sub find_by_path($) {
1710 my ($path) = @_; 1808 my ($path) = @_;
1711 1809
1810 $path =~ s/^~[^\/]*//; # skip ~login
1811
1712 my ($match, $specificity); 1812 my ($match, $specificity);
1713 1813
1714 for my $region (list) { 1814 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1815 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1816 ($match, $specificity) = ($region, $region->specificity)
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1847 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748 1848
1749 # mit "rum" bekleckern, nicht 1849 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1850 $self->_create_random_map (
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1851 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1852 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1853 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map}, 1854 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize}, 1855 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1856 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1857 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1772 1872
1773sub register { 1873sub register {
1774 my (undef, $regex, $prio) = @_; 1874 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 1875 my $pkg = caller;
1776 1876
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 1877 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 1878
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1879 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 1880}
1782 1881
1783# also paths starting with '/' 1882# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1883$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 1884
1786sub thawer_merge { 1885sub thawer_merge {
1787 my ($self, $merge) = @_; 1886 my ($self, $merge) = @_;
1788 1887
1789 # we have to keep some variables in memory intact 1888 # we have to keep some variables in memory intact
1794} 1893}
1795 1894
1796sub normalise { 1895sub normalise {
1797 my ($path, $base) = @_; 1896 my ($path, $base) = @_;
1798 1897
1799 $path = "$path"; # make sure its a string 1898 $path = "$path"; # make sure it's a string
1800 1899
1801 $path =~ s/\.map$//; 1900 $path =~ s/\.map$//;
1802 1901
1803 # map plan: 1902 # map plan:
1804 # 1903 #
1843 $self->init; # pass $1 etc. 1942 $self->init; # pass $1 etc.
1844 return $self; 1943 return $self;
1845 } 1944 }
1846 } 1945 }
1847 1946
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1947 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 1948 ()
1850} 1949}
1851 1950
1852sub init { 1951sub init {
1853 my ($self) = @_; 1952 my ($self) = @_;
1885sub uniq_path { 1984sub uniq_path {
1886 my ($self) = @_; 1985 my ($self) = @_;
1887 1986
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1987 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 1988 "$UNIQUEDIR/$path"
1890}
1891
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899} 1989}
1900 1990
1901sub decay_objects { 1991sub decay_objects {
1902 my ($self) = @_; 1992 my ($self) = @_;
1903 1993
1985 2075
1986sub find; 2076sub find;
1987sub find { 2077sub find {
1988 my ($path, $origin) = @_; 2078 my ($path, $origin) = @_;
1989 2079
2080 cf::cede_to_tick;
2081
1990 $path = normalise $path, $origin && $origin->path; 2082 $path = normalise $path, $origin && $origin->path;
1991 2083
1992 cf::lock_wait "map_data:$path";#d#remove 2084 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2085 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2086
1995 $cf::MAP{$path} || do { 2087 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2088 my $map = new_from_path cf::map $path
2000 or return; 2089 or return;
2001 2090
2002 $map->{last_save} = $cf::RUNTIME; 2091 $map->{last_save} = $cf::RUNTIME;
2003 2092
2015 2104
2016 $cf::MAP{$path} = $map 2105 $cf::MAP{$path} = $map
2017 } 2106 }
2018} 2107}
2019 2108
2020sub pre_load { } 2109sub pre_load { }
2021sub post_load { } 2110#sub post_load { } # XS
2022 2111
2023sub load { 2112sub load {
2024 my ($self) = @_; 2113 my ($self) = @_;
2025 2114
2026 local $self->{deny_reset} = 1; # loading can take a long time 2115 local $self->{deny_reset} = 1; # loading can take a long time
2071 unless ($self->{deny_activate}) { 2160 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2161 $self->decay_objects;
2073 $self->fix_auto_apply; 2162 $self->fix_auto_apply;
2074 $self->update_buttons; 2163 $self->update_buttons;
2075 cf::cede_to_tick; 2164 cf::cede_to_tick;
2076 $self->set_darkness_map;
2077 cf::cede_to_tick;
2078 $self->activate; 2165 $self->activate;
2079 } 2166 }
2080 2167
2081 $self->{last_save} = $cf::RUNTIME; 2168 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2169 $self->last_access ($cf::RUNTIME);
2085 } 2172 }
2086 2173
2087 $self->post_load; 2174 $self->post_load;
2088} 2175}
2089 2176
2177# customize the map for a given player, i.e.
2178# return the _real_ map. used by e.g. per-player
2179# maps to change the path to ~playername/mappath
2090sub customise_for { 2180sub customise_for {
2091 my ($self, $ob) = @_; 2181 my ($self, $ob) = @_;
2092 2182
2093 return find "~" . $ob->name . "/" . $self->{path} 2183 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2184 if $self->per_player;
2110 or next; 2200 or next;
2111 $neigh = find $neigh, $map 2201 $neigh = find $neigh, $map
2112 or next; 2202 or next;
2113 $neigh->load; 2203 $neigh->load;
2114 2204
2205 # now find the diagonal neighbours
2115 push @neigh, 2206 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh], 2207 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2208 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 } 2209 }
2119 2210
2126} 2217}
2127 2218
2128sub find_sync { 2219sub find_sync {
2129 my ($path, $origin) = @_; 2220 my ($path, $origin) = @_;
2130 2221
2131 cf::sync_job { find $path, $origin } 2222 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223 if $Coro::current == $Coro::main;
2224
2225 find $path, $origin
2132} 2226}
2133 2227
2134sub do_load_sync { 2228sub do_load_sync {
2135 my ($map) = @_; 2229 my ($map) = @_;
2136 2230
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2231 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2232 if $Coro::current == $Coro::main;
2139 2233
2140 cf::sync_job { $map->load }; 2234 $map->load;
2141} 2235}
2142 2236
2143our %MAP_PREFETCH; 2237our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2238our $MAP_PREFETCHER = undef;
2145 2239
2171 $MAP_PREFETCHER->prio (6); 2265 $MAP_PREFETCHER->prio (6);
2172 2266
2173 () 2267 ()
2174} 2268}
2175 2269
2270# common code, used by both ->save and ->swapout
2176sub save { 2271sub _save {
2177 my ($self) = @_; 2272 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2273
2181 $self->{last_save} = $cf::RUNTIME; 2274 $self->{last_save} = $cf::RUNTIME;
2182 2275
2183 return unless $self->dirty; 2276 return unless $self->dirty;
2184 2277
2204 } else { 2297 } else {
2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2298 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206 } 2299 }
2207} 2300}
2208 2301
2302sub save {
2303 my ($self) = @_;
2304
2305 my $lock = cf::lock_acquire "map_data:$self->{path}";
2306
2307 $self->_save;
2308}
2309
2209sub swap_out { 2310sub swap_out {
2210 my ($self) = @_; 2311 my ($self) = @_;
2211 2312
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2313 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2314
2217 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2315 return if $self->in_memory != cf::MAP_ACTIVE;
2219 return if $self->{deny_save}; 2316 return if $self->{deny_save};
2317 return if $self->players;
2220 2318
2319 # first deactivate the map and "unlink" it from the core
2320 $self->deactivate;
2321 $_->clear_links_to ($self) for values %cf::MAP;
2221 $self->in_memory (cf::MAP_SWAPPED); 2322 $self->in_memory (cf::MAP_SWAPPED);
2323
2324 # then atomically save
2325 $self->_save;
2326
2327 # then free the map
2328 $self->clear;
2329}
2330
2331sub reset_at {
2332 my ($self) = @_;
2333
2334 # TODO: safety, remove and allow resettable per-player maps
2335 return 1e99 if $self->{deny_reset};
2336
2337 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2338 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2339
2340 $time + $to
2341}
2342
2343sub should_reset {
2344 my ($self) = @_;
2345
2346 $self->reset_at <= $cf::RUNTIME
2347}
2348
2349sub reset {
2350 my ($self) = @_;
2351
2352 my $lock = cf::lock_acquire "map_data:$self->{path}";
2353
2354 return if $self->players;
2355
2356 cf::trace "resetting map ", $self->path, "\n";
2357
2358 $self->in_memory (cf::MAP_SWAPPED);
2359
2360 # need to save uniques path
2361 unless ($self->{deny_save}) {
2362 my $uniq = $self->uniq_path; utf8::encode $uniq;
2363
2364 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2365 if $uniq;
2366 }
2367
2368 delete $cf::MAP{$self->path};
2222 2369
2223 $self->deactivate; 2370 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2371 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2372 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2373
2271 $self->unlink_save; 2374 $self->unlink_save;
2272 $self->destroy; 2375 $self->destroy;
2273} 2376}
2274 2377
2282 2385
2283 delete $cf::MAP{$self->path}; 2386 delete $cf::MAP{$self->path};
2284 2387
2285 $self->unlink_save; 2388 $self->unlink_save;
2286 2389
2287 bless $self, "cf::map"; 2390 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2391 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2392 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2393 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2394 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2395
2349 : normalise $_ 2452 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2453 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2454 ]
2352} 2455}
2353 2456
2457=item cf::map::static_maps
2458
2459Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2460file in the shared directory excluding F</styles> and F</editor>). May
2461block.
2462
2463=cut
2464
2465sub static_maps() {
2466 my @dirs = "";
2467 my @maps;
2468
2469 while (@dirs) {
2470 my $dir = shift @dirs;
2471
2472 next if $dir eq "/styles" || $dir eq "/editor";
2473
2474 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2475 or return;
2476
2477 for (@$files) {
2478 s/\.map$// or next;
2479 utf8::decode $_;
2480 push @maps, "$dir/$_";
2481 }
2482
2483 push @dirs, map "$dir/$_", @$dirs;
2484 }
2485
2486 \@maps
2487}
2488
2354=back 2489=back
2355 2490
2356=head3 cf::object 2491=head3 cf::object
2357 2492
2358=cut 2493=cut
2423 2558
2424our $SAY_CHANNEL = { 2559our $SAY_CHANNEL = {
2425 id => "say", 2560 id => "say",
2426 title => "Map", 2561 title => "Map",
2427 reply => "say ", 2562 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2563 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2564};
2430 2565
2431our $CHAT_CHANNEL = { 2566our $CHAT_CHANNEL = {
2432 id => "chat", 2567 id => "chat",
2433 title => "Chat", 2568 title => "Chat",
2490 2625
2491Freezes the player and moves him/her to a special map (C<{link}>). 2626Freezes the player and moves him/her to a special map (C<{link}>).
2492 2627
2493The player should be reasonably safe there for short amounts of time (e.g. 2628The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2629for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2630though, as the player cannot control the character while it is on the link
2496map. 2631map.
2497 2632
2498Will never block. 2633Will never block.
2499 2634
2500=item $player_object->leave_link ($map, $x, $y) 2635=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2656sub cf::object::player::enter_link {
2522 my ($self) = @_; 2657 my ($self) = @_;
2523 2658
2524 $self->deactivate_recursive; 2659 $self->deactivate_recursive;
2525 2660
2661 ++$self->{_link_recursion};
2662
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2663 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2664
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2665 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2666 if $self->map && $self->map->{path} ne "{link}";
2530 2667
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2668 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2669}
2533 2670
2534sub cf::object::player::leave_link { 2671sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2672 my ($self, $map, $x, $y) = @_;
2536 2673
2553 ($x, $y) = (-1, -1) 2690 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2691 unless (defined $x) && (defined $y);
2555 2692
2556 # use -1 or undef as default coordinates, not 0, 0 2693 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2694 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2695 if $x <= 0 && $y <= 0;
2559 2696
2560 $map->load; 2697 $map->load;
2561 $map->load_neighbours; 2698 $map->load_neighbours;
2562 2699
2563 return unless $self->contr->active; 2700 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2701
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2702 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2703 if ($self->enter_map ($map, $x, $y)) {
2569} 2704 # entering was successful
2705 delete $self->{_link_recursion};
2706 # only activate afterwards, to support waiting in hooks
2707 $self->activate_recursive;
2708 }
2570 2709
2710}
2711
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2712=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572 2713
2573Moves the player to the given map-path and coordinates by first freezing 2714Moves the player to the given map-path and coordinates by first freezing
2574her, loading and preparing them map, calling the provided $check callback 2715her, loading and preparing them map, calling the provided $check callback
2575that has to return the map if sucecssful, and then unfreezes the player on 2716that has to return the map if sucecssful, and then unfreezes the player on
2576the new (success) or old (failed) map position. In either case, $done will 2717the new (success) or old (failed) map position. In either case, $done will
2583 2724
2584our $GOTOGEN; 2725our $GOTOGEN;
2585 2726
2586sub cf::object::player::goto { 2727sub cf::object::player::goto {
2587 my ($self, $path, $x, $y, $check, $done) = @_; 2728 my ($self, $path, $x, $y, $check, $done) = @_;
2729
2730 if ($self->{_link_recursion} >= $MAX_LINKS) {
2731 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2732 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2733 ($path, $x, $y) = @$EMERGENCY_POSITION;
2734 }
2588 2735
2589 # do generation counting so two concurrent goto's will be executed in-order 2736 # do generation counting so two concurrent goto's will be executed in-order
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2737 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2738
2592 $self->enter_link; 2739 $self->enter_link;
2616 my $map = eval { 2763 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2764 my $map = defined $path ? cf::map::find $path : undef;
2618 2765
2619 if ($map) { 2766 if ($map) {
2620 $map = $map->customise_for ($self); 2767 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2768 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2769 } else {
2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2770 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624 } 2771 }
2625 2772
2626 $map 2773 $map
2634 if ($gen == $self->{_goto_generation}) { 2781 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2782 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2783 $self->leave_link ($map, $x, $y);
2637 } 2784 }
2638 2785
2639 $done->() if $done; 2786 $done->($self) if $done;
2640 })->prio (1); 2787 })->prio (1);
2641} 2788}
2642 2789
2643=item $player_object->enter_exit ($exit_object) 2790=item $player_object->enter_exit ($exit_object)
2644 2791
2737 $self->message ("Something went wrong deep within the deliantra server. " 2884 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "I'll try to bring you back to the map you were before. " 2885 . "I'll try to bring you back to the map you were before. "
2739 . "Please report this to the dungeon master!", 2886 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 2887 cf::NDI_UNIQUE | cf::NDI_RED);
2741 2888
2742 warn "ERROR in enter_exit: $@"; 2889 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 2890 $self->leave_link;
2744 } 2891 }
2745 })->prio (1); 2892 })->prio (1);
2746} 2893}
2747 2894
2759sub cf::client::send_drawinfo { 2906sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 2907 my ($self, $text, $flags) = @_;
2761 2908
2762 utf8::encode $text; 2909 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2910 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911}
2912
2913=item $client->send_big_packet ($pkt)
2914
2915Like C<send_packet>, but tries to compress large packets, and fragments
2916them as required.
2917
2918=cut
2919
2920our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2921
2922sub cf::client::send_big_packet {
2923 my ($self, $pkt) = @_;
2924
2925 # try lzf for large packets
2926 $pkt = "lzf " . Compress::LZF::compress $pkt
2927 if 1024 <= length $pkt and $self->{can_lzf};
2928
2929 # split very large packets
2930 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2931 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2932 $pkt = "frag";
2933 }
2934
2935 $self->send_packet ($pkt);
2764} 2936}
2765 2937
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 2938=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 2939
2768Send a drawinfo or msg packet to the client, formatting the msg for the 2940Send a drawinfo or msg packet to the client, formatting the msg for the
2772 2944
2773=cut 2945=cut
2774 2946
2775# non-persistent channels (usually the info channel) 2947# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 2948our %CHANNEL = (
2949 "c/motd" => {
2950 id => "infobox",
2951 title => "MOTD",
2952 reply => undef,
2953 tooltip => "The message of the day",
2954 },
2777 "c/identify" => { 2955 "c/identify" => {
2778 id => "infobox", 2956 id => "infobox",
2779 title => "Identify", 2957 title => "Identify",
2780 reply => undef, 2958 reply => undef,
2781 tooltip => "Items recently identified", 2959 tooltip => "Items recently identified",
2783 "c/examine" => { 2961 "c/examine" => {
2784 id => "infobox", 2962 id => "infobox",
2785 title => "Examine", 2963 title => "Examine",
2786 reply => undef, 2964 reply => undef,
2787 tooltip => "Signs and other items you examined", 2965 tooltip => "Signs and other items you examined",
2966 },
2967 "c/shopinfo" => {
2968 id => "infobox",
2969 title => "Shop Info",
2970 reply => undef,
2971 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 2972 },
2789 "c/book" => { 2973 "c/book" => {
2790 id => "infobox", 2974 id => "infobox",
2791 title => "Book", 2975 title => "Book",
2792 reply => undef, 2976 reply => undef,
2808 id => "infobox", 2992 id => "infobox",
2809 title => "Body Parts", 2993 title => "Body Parts",
2810 reply => undef, 2994 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 2995 tooltip => "Shows which body parts you posess and are available",
2812 }, 2996 },
2997 "c/statistics" => {
2998 id => "infobox",
2999 title => "Statistics",
3000 reply => undef,
3001 tooltip => "Shows your primary statistics",
3002 },
2813 "c/skills" => { 3003 "c/skills" => {
2814 id => "infobox", 3004 id => "infobox",
2815 title => "Skills", 3005 title => "Skills",
2816 reply => undef, 3006 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 3007 tooltip => "Shows your experience per skill and item power",
3008 },
3009 "c/shopitems" => {
3010 id => "infobox",
3011 title => "Shop Items",
3012 reply => undef,
3013 tooltip => "Shows the items currently for sale in this shop",
3014 },
3015 "c/resistances" => {
3016 id => "infobox",
3017 title => "Resistances",
3018 reply => undef,
3019 tooltip => "Shows your resistances",
3020 },
3021 "c/pets" => {
3022 id => "infobox",
3023 title => "Pets",
3024 reply => undef,
3025 tooltip => "Shows information abotu your pets/a specific pet",
3026 },
3027 "c/perceiveself" => {
3028 id => "infobox",
3029 title => "Perceive Self",
3030 reply => undef,
3031 tooltip => "You gained detailed knowledge about yourself",
2818 }, 3032 },
2819 "c/uptime" => { 3033 "c/uptime" => {
2820 id => "infobox", 3034 id => "infobox",
2821 title => "Uptime", 3035 title => "Uptime",
2822 reply => undef, 3036 reply => undef,
2832 id => "party", 3046 id => "party",
2833 title => "Party", 3047 title => "Party",
2834 reply => "gsay ", 3048 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3049 tooltip => "Messages and chat related to your party",
2836 }, 3050 },
3051 "c/death" => {
3052 id => "death",
3053 title => "Death",
3054 reply => undef,
3055 tooltip => "Reason for and more info about your most recent death",
3056 },
3057 "c/say" => $SAY_CHANNEL,
3058 "c/chat" => $CHAT_CHANNEL,
2837); 3059);
2838 3060
2839sub cf::client::send_msg { 3061sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3062 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3063
2846 3068
2847 # check predefined channels, for the benefit of C 3069 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3070 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3071 $channel = $CHANNEL{$channel};
2850 3072
2851 $self->ext_msg (channel_info => $channel) 3073 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3074 $channel = $channel->{id};
2855 3075
2856 } elsif (ref $channel) { 3076 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3077 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3078 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3079 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3080 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3081 }
2863 3082
2864 $channel = $channel->{id}; 3083 $channel = $channel->{id};
2865 } 3084 }
2866 3085
2867 return unless @extra || length $msg; 3086 return unless @extra || length $msg;
2868 3087
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3088 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3089 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3090 if $color & cf::NDI_DEF;
2873 3091
2874 my $pkt = "msg " 3092 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3093 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3094 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3095 );
2878 3096
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3097 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3098}
2916 3099
2917=item $client->ext_msg ($type, @msg) 3100=item $client->ext_msg ($type, @msg)
2918 3101
2919Sends an ext event to the client. 3102Sends an ext event to the client.
2922 3105
2923sub cf::client::ext_msg($$@) { 3106sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3107 my ($self, $type, @msg) = @_;
2925 3108
2926 if ($self->extcmd == 2) { 3109 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3110 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove 3111 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type"; 3112 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3113 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 } 3114 }
2932} 3115}
2933 3116
2934=item $client->ext_reply ($msgid, @msg) 3117=item $client->ext_reply ($msgid, @msg)
2935 3118
2939 3122
2940sub cf::client::ext_reply($$@) { 3123sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3124 my ($self, $id, @msg) = @_;
2942 3125
2943 if ($self->extcmd == 2) { 3126 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3127 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) { 3128 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove 3129 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id; 3130 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3131 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 } 3132 }
2950} 3133}
2951 3134
2952=item $success = $client->query ($flags, "text", \&cb) 3135=item $success = $client->query ($flags, "text", \&cb)
2953 3136
3024 3207
3025 $ns->ext_reply ($reply, @reply) 3208 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3209 if $reply;
3027 3210
3028 } else { 3211 } else {
3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3212 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030 } 3213 }
3031 3214
3032 cf::override; 3215 cf::override;
3033 }, 3216 },
3034); 3217);
3054 3237
3055 $coro 3238 $coro
3056} 3239}
3057 3240
3058cf::client->attach ( 3241cf::client->attach (
3059 on_destroy => sub { 3242 on_client_destroy => sub {
3060 my ($ns) = @_; 3243 my ($ns) = @_;
3061 3244
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3245 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3246 },
3064); 3247);
3080our $safe_hole = new Safe::Hole; 3263our $safe_hole = new Safe::Hole;
3081 3264
3082$SIG{FPE} = 'IGNORE'; 3265$SIG{FPE} = 'IGNORE';
3083 3266
3084$safe->permit_only (Opcode::opset qw( 3267$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3268 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3269 grepstart grepwhile mapstart mapwhile
3087 sort time 3270 sort time
3088)); 3271));
3089 3272
3090# here we export the classes and methods available to script code 3273# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3277The following functions and methods are available within a safe environment:
3095 3278
3096 cf::object 3279 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3280 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3281 insert remove name archname title slaying race decrease split
3282 value
3099 3283
3100 cf::object::player 3284 cf::object::player
3101 player 3285 player
3102 3286
3103 cf::player 3287 cf::player
3109=cut 3293=cut
3110 3294
3111for ( 3295for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3296 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3297 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3298 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3299 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3300 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3301 ["cf::map" => qw(trigger)],
3118) { 3302) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3303 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3304 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3305 for @funs;
3123} 3306}
3124 3307
3139 3322
3140 my $qcode = $code; 3323 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3324 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3325 $qcode =~ s/\n/\\n/g;
3143 3326
3327 %vars = (_dummy => 0) unless %vars;
3328
3329 my @res;
3144 local $_; 3330 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3331
3147 my $eval = 3332 my $eval =
3148 "do {\n" 3333 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3334 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3335 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3336 . $code
3152 . "\n}" 3337 . "\n}"
3153 ; 3338 ;
3154 3339
3340 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3341 sub_generation_inc;
3342 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3343 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3344 sub_generation_inc;
3345 } else {
3346 local @cf::_safe_eval_args = values %vars;
3347 @res = wantarray ? eval eval : scalar eval $eval;
3348 }
3158 3349
3159 if ($@) { 3350 if ($@) {
3160 warn "$@"; 3351 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3352 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3353 "with arguments " . (join " ", %vars) . "\n";
3163 } 3354 }
3164 3355
3165 wantarray ? @res : $res[0] 3356 wantarray ? @res : $res[0]
3166} 3357}
3167 3358
3181=cut 3372=cut
3182 3373
3183sub register_script_function { 3374sub register_script_function {
3184 my ($fun, $cb) = @_; 3375 my ($fun, $cb) = @_;
3185 3376
3186 no strict 'refs'; 3377 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3378 *$fun = $safe_hole->wrap ($cb);
3188} 3379}
3189 3380
3190=back 3381=back
3191 3382
3192=cut 3383=cut
3201 # for this (global event?) 3392 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3394
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3395 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3396
3206 warn "loading facedata from $path\n"; 3397 trace "loading facedata from $path\n";
3207 3398
3208 my $facedata;
3209 0 < aio_load $path, $facedata 3399 0 < aio_load $path, my $facedata
3210 or die "$path: $!"; 3400 or die "$path: $!";
3211 3401
3212 $facedata = Coro::Storable::thaw $facedata; 3402 $facedata = Coro::Storable::thaw $facedata;
3213 3403
3214 $facedata->{version} == 2 3404 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3405 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3406
3217 # patch in the exptable 3407 # patch in the exptable
3408 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3218 $facedata->{resource}{"res/exp_table"} = { 3409 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC, 3410 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3411 data => $exp_table,
3412 hash => (Digest::MD5::md5 $exp_table),
3221 }; 3413 };
3222 cf::cede_to_tick; 3414 cf::cede_to_tick;
3223 3415
3224 { 3416 {
3225 my $faces = $facedata->{faceinfo}; 3417 my $faces = $facedata->{faceinfo};
3227 while (my ($face, $info) = each %$faces) { 3419 while (my ($face, $info) = each %$faces) {
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3420 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3421
3230 cf::face::set_visibility $idx, $info->{visibility}; 3422 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3423 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3424 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3425 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3234 3426
3235 cf::cede_to_tick; 3427 cf::cede_to_tick;
3236 } 3428 }
3237 3429
3238 while (my ($face, $info) = each %$faces) { 3430 while (my ($face, $info) = each %$faces) {
3243 3435
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3436 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3437 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3438 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3439 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3440 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3441 }
3250 3442
3251 cf::cede_to_tick; 3443 cf::cede_to_tick;
3252 } 3444 }
3253 } 3445 }
3262 3454
3263 cf::anim::invalidate_all; # d'oh 3455 cf::anim::invalidate_all; # d'oh
3264 } 3456 }
3265 3457
3266 { 3458 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3459 my $res = $facedata->{resource};
3270 3460
3271 while (my ($name, $info) = each %$res) { 3461 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3462 if (defined $info->{type}) {
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3463 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3464
3276 if ($info->{type} & 1) { 3465 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3466 cf::face::set_type $idx, $info->{type};
3291 } else { 3467 } else {
3292 $RESOURCE{$name} = $info; 3468 $RESOURCE{$name} = $info; # unused
3293 } 3469 }
3294 3470
3295 cf::cede_to_tick; 3471 cf::cede_to_tick;
3296 } 3472 }
3297 } 3473 }
3298 3474
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3475 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3476
3301 1 3477 1
3302} 3478}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3479
3324register_exticmd fx_want => sub { 3480register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3481 my ($ns, $want) = @_;
3326 3482
3327 while (my ($k, $v) = each %$want) { 3483 while (my ($k, $v) = each %$want) {
3366sub reload_treasures { 3522sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3523 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3524 or die "unable to load treasurelists\n";
3369} 3525}
3370 3526
3527sub reload_sound {
3528 trace "loading sound config from $DATADIR/sound\n";
3529
3530 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531 or die "$DATADIR/sound $!";
3532
3533 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3534
3535 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536 my $sound = $soundconf->{compat}[$_]
3537 or next;
3538
3539 my $face = cf::face::find "sound/$sound->[1]";
3540 cf::sound::set $sound->[0] => $face;
3541 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3542 }
3543
3544 while (my ($k, $v) = each %{$soundconf->{event}}) {
3545 my $face = cf::face::find "sound/$v";
3546 cf::sound::set $k => $face;
3547 }
3548}
3549
3371sub reload_resources { 3550sub reload_resources {
3372 warn "reloading resource files...\n"; 3551 trace "reloading resource files...\n";
3373 3552
3553 reload_exp_table;
3554 reload_materials;
3374 reload_facedata; 3555 reload_facedata;
3556 reload_sound;
3375 reload_archetypes; 3557 reload_archetypes;
3376 reload_regions; 3558 reload_regions;
3377 reload_treasures; 3559 reload_treasures;
3378 3560
3379 warn "finished reloading resource files\n"; 3561 trace "finished reloading resource files\n";
3380} 3562}
3381 3563
3382sub reload_config { 3564sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3565 trace "reloading config file...\n";
3384 or return;
3385 3566
3386 local $/; 3567 0 < aio_load "$CONFDIR/config", my $config
3387 *CFG = YAML::Load <$fh>; 3568 or die "$CONFDIR/config: $!";
3388 3569
3570 utf8::decode $config;
3571 *CFG = yaml_load $config;
3572
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3573 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3574
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3575 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3576 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3577
3394 if (exists $CFG{mlockall}) { 3578 if (exists $CFG{mlockall}) {
3417 3601
3418 seek $fh, 0, 0; 3602 seek $fh, 0, 0;
3419 print $fh $$; 3603 print $fh $$;
3420} 3604}
3421 3605
3606sub main_loop {
3607 trace "EV::loop starting\n";
3608 if (1) {
3609 EV::loop;
3610 }
3611 trace "EV::loop returned\n";
3612 goto &main_loop unless $REALLY_UNLOOP;
3613}
3614
3422sub main { 3615sub main {
3423 cf::init_globals; # initialise logging 3616 cf::init_globals; # initialise logging
3424 3617
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3618 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3619 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3620 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3621 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435 3622
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3623 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3624
3438 # we must not ever block the main coroutine 3625 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3626 local $Coro::idle = sub {
3445 }; 3632 };
3446 3633
3447 evthread_start IO::AIO::poll_fileno; 3634 evthread_start IO::AIO::poll_fileno;
3448 3635
3449 cf::sync_job { 3636 cf::sync_job {
3637 cf::incloader::init ();
3638
3639 cf::init_anim;
3640 cf::init_attackmess;
3641 cf::init_dynamic;
3642
3643 cf::load_settings;
3644
3450 reload_resources; 3645 reload_resources;
3451 reload_config; 3646 reload_config;
3452 db_init; 3647 db_init;
3453 3648
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3649 cf::init_uuid;
3457 cf::init_signals; 3650 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3651 cf::init_skills;
3460 3652
3461 cf::init_beforeplay; 3653 cf::init_beforeplay;
3462 3654
3463 atomic; 3655 atomic;
3465 load_extensions; 3657 load_extensions;
3466 3658
3467 utime time, time, $RUNTIMEFILE; 3659 utime time, time, $RUNTIMEFILE;
3468 3660
3469 # no (long-running) fork's whatsoever before this point(!) 3661 # no (long-running) fork's whatsoever before this point(!)
3662 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3663 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3664
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3665 (pop @POST_INIT)->(0) while @POST_INIT;
3473 }; 3666 };
3474 3667
3475 EV::loop; 3668 cf::object::thawer::errors_are_fatal 0;
3669 info "parse errors in files are no longer fatal from this point on.\n";
3670
3671 my $free_main; $free_main = EV::idle sub {
3672 undef $free_main;
3673 undef &main; # free gobs of memory :)
3674 };
3675
3676 goto &main_loop;
3476} 3677}
3477 3678
3478############################################################################# 3679#############################################################################
3479# initialisation and cleanup 3680# initialisation and cleanup
3480 3681
3481# install some emergency cleanup handlers 3682# install some emergency cleanup handlers
3482BEGIN { 3683BEGIN {
3483 our %SIGWATCHER = (); 3684 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3685 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3686 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3687 cf::cleanup "SIG$signal";
3487 }; 3688 };
3488 } 3689 }
3489} 3690}
3490 3691
3491sub write_runtime_sync { 3692sub write_runtime_sync {
3693 my $t0 = AE::time;
3694
3492 # first touch the runtime file to show we are still running: 3695 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3696 # the fsync below can take a very very long time.
3494 3697
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3698 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3699
3497 my $guard = cf::lock_acquire "write_runtime"; 3700 my $guard = cf::lock_acquire "write_runtime";
3498 3701
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3702 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3703 or return;
3501 3704
3502 my $value = $cf::RUNTIME + 90 + 10; 3705 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3706 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3707 # 60 allows for the watchdog to kill the server.
3517 or return; 3720 or return;
3518 3721
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3722 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3723 and return;
3521 3724
3522 warn "runtime file written.\n"; 3725 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3726
3524 1 3727 1
3525} 3728}
3526 3729
3527our $uuid_lock; 3730our $uuid_lock;
3539 or return; 3742 or return;
3540 3743
3541 my $value = uuid_seq uuid_cur; 3744 my $value = uuid_seq uuid_cur;
3542 3745
3543 unless ($value) { 3746 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3747 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3748 return;
3546 } 3749 }
3547 3750
3548 my $value = uuid_str $value + $uuid_skip; 3751 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3752 $uuid_skip = 0;
3559 or return; 3762 or return;
3560 3763
3561 aio_rename "$uuid~", $uuid 3764 aio_rename "$uuid~", $uuid
3562 and return; 3765 and return;
3563 3766
3564 warn "uuid file written ($value).\n"; 3767 trace "uuid file written ($value).\n";
3565 3768
3566 1 3769 1
3567 3770
3568} 3771}
3569 3772
3575} 3778}
3576 3779
3577sub emergency_save() { 3780sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3781 my $freeze_guard = cf::freeze_mainloop;
3579 3782
3580 warn "emergency_perl_save: enter\n"; 3783 info "emergency_perl_save: enter\n";
3784
3785 # this is a trade-off: we want to be very quick here, so
3786 # save all maps without fsync, and later call a global sync
3787 # (which in turn might be very very slow)
3788 local $USE_FSYNC = 0;
3581 3789
3582 cf::sync_job { 3790 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 3791 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 3792
3588 # use a peculiar iteration method to avoid tripping on perl 3793 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 3794 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 3795 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 3796 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 3797 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 3798 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 3799 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3800 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 3801 $pl->save;
3597 } 3802 }
3598 warn "emergency_perl_save: end player save\n"; 3803 info "emergency_perl_save: end player save\n";
3599 3804
3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3600 warn "emergency_perl_save: begin map save\n"; 3807 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 3808 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 3809 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 3810 $map->valid or next;
3604 $map->save; 3811 $map->save;
3605 } 3812 }
3606 warn "emergency_perl_save: end map save\n"; 3813 info "emergency_perl_save: end map save\n";
3607 3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3608 warn "emergency_perl_save: begin database checkpoint\n"; 3817 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 3818 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 3819 info "emergency_perl_save: end database checkpoint\n";
3611 3820
3612 warn "emergency_perl_save: begin write uuid\n"; 3821 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 3822 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 3823 info "emergency_perl_save: end write uuid\n";
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: syncing database to disk";
3828 BDB::db_env_txn_checkpoint $DB_ENV;
3829
3830 info "emergency_perl_save: starting sync\n";
3831 IO::AIO::aio_sync sub {
3832 info "emergency_perl_save: finished sync\n";
3833 };
3834
3835 cf::write_runtime_sync; # external watchdog should not bark
3836
3837 trace "emergency_perl_save: flushing outstanding aio requests";
3838 while (IO::AIO::nreqs || BDB::nreqs) {
3839 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3840 }
3841
3842 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 3843 };
3616 3844
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 3845 info "emergency_perl_save: leave\n";
3623} 3846}
3624 3847
3625sub post_cleanup { 3848sub post_cleanup {
3626 my ($make_core) = @_; 3849 my ($make_core) = @_;
3627 3850
3851 IO::AIO::flush;
3852
3628 warn Carp::longmess "post_cleanup backtrace" 3853 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 3854 if $make_core;
3630 3855
3631 my $fh = pidfile; 3856 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 3857 unlink $PIDFILE if <$fh> == $$;
3633} 3858}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3878 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 3879 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 3880 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3881# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 3882 }
3658 warn "cleared package $pkg\n";#d#
3659} 3883}
3660 3884
3661sub do_reload_perl() { 3885sub do_reload_perl() {
3662 # can/must only be called in main 3886 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 3887 unless (in_main) {
3664 warn "can only reload from main coroutine"; 3888 error "can only reload from main coroutine";
3665 return; 3889 return;
3666 } 3890 }
3667 3891
3668 return if $RELOAD++; 3892 return if $RELOAD++;
3669 3893
3670 my $t1 = EV::time; 3894 my $t1 = AE::time;
3671 3895
3672 while ($RELOAD) { 3896 while ($RELOAD) {
3897 cf::get_slot 0.1, -1, "reload_perl";
3673 warn "reloading..."; 3898 info "reloading...";
3674 3899
3675 warn "entering sync_job"; 3900 trace "entering sync_job";
3676 3901
3677 cf::sync_job { 3902 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 3903 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 3904
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 3905 trace "cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 3906 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 3907 %EXT_CORO = ();
3695 3908
3696 warn "removing commands"; 3909 trace "removing commands";
3697 %COMMAND = (); 3910 %COMMAND = ();
3698 3911
3699 warn "removing ext/exti commands"; 3912 trace "removing ext/exti commands";
3700 %EXTCMD = (); 3913 %EXTCMD = ();
3701 %EXTICMD = (); 3914 %EXTICMD = ();
3702 3915
3703 warn "unloading/nuking all extensions"; 3916 trace "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 3917 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 3918 trace "... unloading $pkg";
3706 3919
3707 if (my $cb = $pkg->can ("unload")) { 3920 if (my $cb = $pkg->can ("unload")) {
3708 eval { 3921 eval {
3709 $cb->($pkg); 3922 $cb->($pkg);
3710 1 3923 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 3924 } or error "$pkg unloaded, but with errors: $@";
3712 } 3925 }
3713 3926
3714 warn "... clearing $pkg"; 3927 trace "... clearing $pkg";
3715 clear_package $pkg; 3928 clear_package $pkg;
3716 } 3929 }
3717 3930
3718 warn "unloading all perl modules loaded from $LIBDIR"; 3931 trace "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 3932 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3933 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 3934
3722 warn "... unloading $k"; 3935 trace "... unloading $k";
3723 delete $INC{$k}; 3936 delete $INC{$k};
3724 3937
3725 $k =~ s/\.pm$//; 3938 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 3939 $k =~ s/\//::/g;
3727 3940
3730 } 3943 }
3731 3944
3732 clear_package $k; 3945 clear_package $k;
3733 } 3946 }
3734 3947
3735 warn "getting rid of safe::, as good as possible"; 3948 trace "getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 3949 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3950 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 3951
3739 warn "unloading cf.pm \"a bit\""; 3952 trace "unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 3953 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 3954 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 3955
3743 # don't, removes xs symbols, too, 3956 # don't, removes xs symbols, too,
3744 # and global variables created in xs 3957 # and global variables created in xs
3745 #clear_package __PACKAGE__; 3958 #clear_package __PACKAGE__;
3746 3959
3747 warn "unload completed, starting to reload now"; 3960 info "unload completed, starting to reload now";
3748 3961
3749 warn "reloading cf.pm"; 3962 trace "reloading cf.pm";
3750 require cf; 3963 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3964 cf::_connect_to_perl_1;
3752 3965
3753 warn "loading config and database again"; 3966 trace "loading config and database again";
3754 cf::reload_config; 3967 cf::reload_config;
3755 3968
3756 warn "loading extensions"; 3969 trace "loading extensions";
3757 cf::load_extensions; 3970 cf::load_extensions;
3758 3971
3759 if ($REATTACH_ON_RELOAD) { 3972 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 3973 trace "reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 3974 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 3975 trace "reattaching attachments to maps";
3763 reattach $_ for values %MAP; 3976 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 3977 trace "reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 3978 reattach $_ for values %PLAYER;
3766 } 3979 }
3767 3980
3768 warn "running post_init jobs"; 3981 trace "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT; 3982 (pop @POST_INIT)->(1) while @POST_INIT;
3770 3983
3771 warn "leaving sync_job"; 3984 trace "leaving sync_job";
3772 3985
3773 1 3986 1
3774 } or do { 3987 } or do {
3775 warn $@; 3988 error $@;
3776 cf::cleanup "error while reloading, exiting."; 3989 cf::cleanup "error while reloading, exiting.";
3777 }; 3990 };
3778 3991
3779 warn "reloaded"; 3992 info "reloaded";
3780 --$RELOAD; 3993 --$RELOAD;
3781 } 3994 }
3782 3995
3783 $t1 = EV::time - $t1; 3996 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 3997 info "reload completed in ${t1}s\n";
3785}; 3998};
3786 3999
3787our $RELOAD_WATCHER; # used only during reload 4000our $RELOAD_WATCHER; # used only during reload
3788 4001
3789sub reload_perl() { 4002sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4004 # coro crashes during coro_state_free->destroy here.
3792 4005
3793 $RELOAD_WATCHER ||= cf::async { 4006 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4007 Coro::AIO::aio_wait cache_extensions;
3795 4008
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4009 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4010 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4011 undef $RELOAD_WATCHER;
3799 }; 4012 };
3800 }; 4013 };
3801} 4014}
3810 reload_perl; 4023 reload_perl;
3811 }; 4024 };
3812 } 4025 }
3813}; 4026};
3814 4027
3815unshift @INC, $LIBDIR; 4028#############################################################################
3816 4029
3817my $bug_warning = 0; 4030my $bug_warning = 0;
3818 4031
3819our @WAIT_FOR_TICK; 4032our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN; 4033our @WAIT_FOR_TICK_BEGIN;
3821 4034
3822sub wait_for_tick { 4035sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4036 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3824 4037
3825 my $signal = new Coro::Signal; 4038 my $signal = new Coro::Signal;
3826 push @WAIT_FOR_TICK, $signal; 4039 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait; 4040 $signal->wait;
3828} 4041}
3829 4042
3830sub wait_for_tick_begin { 4043sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4044 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3832 4045
3833 my $signal = new Coro::Signal; 4046 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4047 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4048 $signal->wait;
3836} 4049}
3842 return; 4055 return;
3843 } 4056 }
3844 4057
3845 cf::server_tick; # one server iteration 4058 cf::server_tick; # one server iteration
3846 4059
4060 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4061
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4062 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4063 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4064 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4065 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4066 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4067 or error "ERROR: unable to write runtime file: $!";
3853 }; 4068 };
3854 } 4069 }
3855 4070
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4071 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4072 $sig->send;
3865 4080
3866 if (0) { 4081 if (0) {
3867 if ($NEXT_TICK) { 4082 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4083 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4084 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4085 debug "jitter $JITTER\n";#d#
3871 } 4086 }
3872 } 4087 }
3873} 4088}
3874 4089
3875{ 4090{
3876 # configure BDB 4091 # configure BDB
3877 4092
3878 BDB::min_parallel 8; 4093 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4094 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4095 $AnyEvent::BDB::WATCHER->priority (1);
3881 4096
3882 unless ($DB_ENV) { 4097 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4098 $DB_ENV = BDB::db_env_create;
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4178 LOG llevInfo, "[ABT] [suppressed]\n";
3964 } 4179 }
3965} 4180}
3966 4181
3967# load additional modules 4182# load additional modules
3968use cf::pod; 4183require "cf/$_.pm" for @EXTRA_MODULES;
4184cf::_connect_to_perl_2;
3969 4185
3970END { cf::emergency_save } 4186END { cf::emergency_save }
3971 4187
39721 41881
3973 4189

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines