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.405 by root, Mon Dec 17 08:03:22 2007 UTC vs.
Revision 1.512 by root, Sun Apr 11 04:52:07 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use EV 1.86; 32use EV;
10use Opcode; 33use Opcode;
11use Safe; 34use Safe;
12use Safe::Hole; 35use Safe::Hole;
13use Storable (); 36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 4.32 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
18use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
23use Coro::BDB; 51use Coro::BDB 1.6;
24use Coro::Storable; 52use Coro::Storable;
25use Coro::Util (); 53use Coro::Util ();
26 54
27use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
28use BDB (); 56use BDB ();
29use Data::Dumper; 57use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 58use Fcntl;
32use YAML::Syck (); 59use YAML::XS ();
33use IO::AIO 2.51 (); 60use IO::AIO ();
34use Time::HiRes; 61use Time::HiRes;
35use Compress::LZF; 62use Compress::LZF;
36use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
37 66
38# configure various modules to our taste 67# configure various modules to our taste
39# 68#
40$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
41Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
42Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
43 77
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 78# strictly for debugging
45$YAML::Syck::ImplicitUnicode = 1; 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
74our %RESOURCE; 111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
82 117
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 121our $DB_ENV;
88 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
89our %CFG; 125our %CFG;
90 126
91our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 128our $RUNTIME;
93our $NOW; 129our $NOW;
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
173returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$EV::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
226=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
267 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start;
336 };
337 $TICK_WATCHER->stop;
338 $guard
339} 396}
340 397
341=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
342 399
343Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
366 423
367=cut 424=cut
368 425
369our @SLOT_QUEUE; 426our @SLOT_QUEUE;
370our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
371 429
372$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
373$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
374 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
375 433
376 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
377 436
378 while () { 437 while () {
379 next_job: 438 next_job:
439
380 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
381 if ($avail > 0.01) { 441
382 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
383 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
384 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
385 $job->[2]->send; 446 $job->[2]->send;
386 Coro::cede; 447 Coro::cede;
387 goto next_job; 448 goto next_job;
388 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
389 } 451 }
390 } 452 }
391 453
392 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
393 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
394 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
395 $signal->wait; 457 $signal->wait;
396 } else { 458 } else {
459 $busy = 0;
397 Coro::schedule; 460 Coro::schedule;
398 } 461 }
399 } 462 }
400}; 463};
401 464
402sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
403 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
404 469
405 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
406 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
407 473
408 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
409 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
410 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
437 503
438sub sync_job(&) { 504sub sync_job(&) {
439 my ($job) = @_; 505 my ($job) = @_;
440 506
441 if ($Coro::current == $Coro::main) { 507 if ($Coro::current == $Coro::main) {
442 my $time = EV::time; 508 my $time = AE::time;
443 509
444 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
445 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
446 512
447 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
448 514
449 # TODO: use suspend/resume instead
450 # (but this is cancel-safe)
451 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
452 516
453 my $busy = 1; 517 my $busy = 1;
454 my @res; 518 my @res;
455 519
466 } else { 530 } else {
467 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
468 } 532 }
469 } 533 }
470 534
471 $time = EV::time - $time; 535 my $time = AE::time - $time;
472 536
473 LOG llevError | logBacktrace, Carp::longmess "long sync job"
474 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
475
476 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
477 538
478 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
479 } else { 540 } else {
480 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
481 542
523 reset_signals; 584 reset_signals;
524 &$cb 585 &$cb
525 }, @args; 586 }, @args;
526 587
527 wantarray ? @res : $res[-1] 588 wantarray ? @res : $res[-1]
589}
590
591=item $coin = coin_from_name $name
592
593=cut
594
595our %coin_alias = (
596 "silver" => "silvercoin",
597 "silvercoin" => "silvercoin",
598 "silvercoins" => "silvercoin",
599 "gold" => "goldcoin",
600 "goldcoin" => "goldcoin",
601 "goldcoins" => "goldcoin",
602 "platinum" => "platinacoin",
603 "platinumcoin" => "platinacoin",
604 "platinumcoins" => "platinacoin",
605 "platina" => "platinacoin",
606 "platinacoin" => "platinacoin",
607 "platinacoins" => "platinacoin",
608 "royalty" => "royalty",
609 "royalties" => "royalty",
610);
611
612sub coin_from_name($) {
613 $coin_alias{$_[0]}
614 ? cf::arch::find $coin_alias{$_[0]}
615 : undef
528} 616}
529 617
530=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
531 619
532Returns a single value from the environment database. 620Returns a single value from the environment database.
671 759
672############################################################################# 760#############################################################################
673 761
674=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
675 763
676Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
677attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
678to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
679 767
680In the following description, CLASS can be any of C<global>, C<object> 768In the following description, CLASS can be any of C<global>, C<object>
681C<player>, C<client> or C<map> (i.e. the attachable objects in 769C<player>, C<client> or C<map> (i.e. the attachable objects in
731=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
732 820
733Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
734given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
735 823
736Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
737that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
738 826
739These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
740 828
741=over 4 829=over 4
969 } 1057 }
970 1058
971 0 1059 0
972} 1060}
973 1061
974=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
975 1063
976=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
977 1065
978Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
979 1067
1032 1120
1033sub reattach { 1121sub reattach {
1034 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1035 my ($obj) = @_; 1123 my ($obj) = @_;
1036 1124
1125 # no longer needed after getting rid of delete_package?
1037 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1038 1127
1039 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1040 1129
1041 @$registry = (); 1130 @$registry = ();
1042 1131
1088 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1089 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1090 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1091 1180
1092 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1093 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1094 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1095 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1096 close $fh; 1188 aio_close $fh;
1097 1189
1098 if (@$objs) { 1190 if (@$objs) {
1099 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1100 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1101 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1102 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1103 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1104 close $fh; 1199 aio_close $fh;
1105 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1106 } 1201 }
1107 } else { 1202 } else {
1108 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1109 } 1204 }
1110 1205
1111 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1112 } else { 1210 } else {
1113 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1114 } 1212 }
1115 } else { 1213 } else {
1116 aio_unlink $filename; 1214 aio_unlink $filename;
1117 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1118 } 1216 }
1209 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1210 1308
1211 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1212} 1310}
1213 1311
1312use File::Glob ();
1313
1214cf::player->attach ( 1314cf::player->attach (
1215 on_command => sub { 1315 on_unknown_command => sub {
1216 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1217 1317
1218 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1219 or return; 1319 or return;
1220 1320
1250 1350
1251 cf::override; 1351 cf::override;
1252 }, 1352 },
1253); 1353);
1254 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1255sub load_extensions { 1368sub load_extensions {
1256 cf::sync_job { 1369 cf::sync_job {
1257 my %todo; 1370 my %todo;
1258 1371
1259 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1278 1391
1279 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1280 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1281 1394
1282 $ext{source} = 1395 $ext{source} =
1283 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1284 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1285 . $source 1398 . $source
1286 . "\n};\n1"; 1399 . "\n};\n1";
1287 1400
1288 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1289 } 1402 }
1290 1403
1404 my $pass = 0;
1291 my %done; 1405 my %done;
1292 while (%todo) { 1406 while (%todo) {
1293 my $progress; 1407 my $progress;
1294 1408
1409 ++$pass;
1410
1411 ext:
1295 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1296 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1297 goto skip 1414 next ext
1298 unless exists $done{$_}; 1415 unless exists $done{$_};
1299 } 1416 }
1300 1417
1301 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1302 1419
1303 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1304 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1305 : "$v->{base}: extension inactive.\n";
1306 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1307 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1308 warn $msg; 1427 } else {
1309 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1310 exit 1; 1429 push @EXTS, $v->{pkg};
1311 } 1430 $progress = 1;
1312 1431
1313 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1314 } 1434 }
1315
1316 $done{$k} = delete $todo{$k};
1317 push @EXTS, $v->{pkg};
1318 $progress = 1;
1319 } 1435 }
1320 1436
1321 skip: 1437 unless ($progress) {
1322 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1323 unless $progress; 1439
1440 while (my ($k, $v) = each %todo) {
1441 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442 if exists $v->{meta}{mandatory};
1443 }
1444 }
1324 } 1445 }
1325 }; 1446 };
1326} 1447}
1327 1448
1328############################################################################# 1449#############################################################################
1329 1450
1330=back 1451=back
1331 1452
1332=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1333 1454
1334Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1335 1456
1336=cut 1457=cut
1337 1458
1338package cf::player; 1459package cf::player;
1339 1460
1382 1503
1383sub exists($) { 1504sub exists($) {
1384 my ($login) = @_; 1505 my ($login) = @_;
1385 1506
1386 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1387 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1388} 1509}
1389 1510
1390sub find($) { 1511sub find($) {
1391 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1392 my $login = $_[0]; 1513 my $login = $_[0];
1404 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1405 or return; 1526 or return;
1406 1527
1407 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1408 or return; 1529 or return;
1530
1409 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1410 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1411 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1412 } 1534 }
1413 } 1535 }
1414} 1536}
1415 1537
1538cf::player->attach (
1539 on_load => sub {
1540 my ($pl, $path) = @_;
1541
1542 # restore slots saved in save, below
1543 my $slots = delete $pl->{_slots};
1544
1545 $pl->ob->current_weapon ($slots->[0]);
1546 $pl->combat_ob ($slots->[1]);
1547 $pl->ranged_ob ($slots->[2]);
1548 },
1549);
1550
1416sub save($) { 1551sub save($) {
1417 my ($pl) = @_; 1552 my ($pl) = @_;
1418 1553
1419 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1420 1555
1423 1558
1424 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1425 1560
1426 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1427 $pl->{last_save} = $cf::RUNTIME; 1562 $pl->{last_save} = $cf::RUNTIME;
1563
1564 cf::get_slot 0.01;
1565
1566 # save slots, to be restored later
1567 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1428 1568
1429 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1430 cf::cede_to_tick; 1570 cf::cede_to_tick;
1431} 1571}
1432 1572
1464 my ($pl) = @_; 1604 my ($pl) = @_;
1465 1605
1466 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1467 1607
1468 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1469 $pl->password ("*"); # this should lock out the player until we nuked the dir 1609 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1470 1610
1471 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1472 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1473 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1474 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1475 1617
1476 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1477 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1516 1658
1517 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1518 my $path = path $login; 1660 my $path = path $login;
1519 1661
1520 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1521 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1522 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1523 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1524 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1525 } 1668 }
1526 1669
1557 } 1700 }
1558 1701
1559 \@paths 1702 \@paths
1560} 1703}
1561 1704
1562=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1563 1706
1564Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1565
1566=cut
1567
1568use re 'eval';
1569
1570my $group;
1571my $interior; $interior = qr{
1572 # match a pod interior sequence sans C<< >>
1573 (?:
1574 \ (.*?)\ (?{ $group = $^N })
1575 | < (??{$interior}) >
1576 )
1577}x;
1578
1579sub expand_cfpod {
1580 my ($self, $pod) = @_;
1581
1582 my $xml;
1583
1584 while () {
1585 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1586 $group = $1;
1587
1588 $group =~ s/&/&amp;/g;
1589 $group =~ s/</&lt;/g;
1590
1591 $xml .= $group;
1592 } elsif ($pod =~ m%\G
1593 ([BCGHITU])
1594 <
1595 (?:
1596 ([^<>]*) (?{ $group = $^N })
1597 | < $interior >
1598 )
1599 >
1600 %gcsx
1601 ) {
1602 my ($code, $data) = ($1, $group);
1603
1604 if ($code eq "B") {
1605 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1606 } elsif ($code eq "I") {
1607 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1608 } elsif ($code eq "U") {
1609 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1610 } elsif ($code eq "C") {
1611 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1612 } elsif ($code eq "T") {
1613 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1614 } elsif ($code eq "G") {
1615 my ($male, $female) = split /\|/, $data;
1616 $data = $self->gender ? $female : $male;
1617 $xml .= expand_cfpod ($self, $data);
1618 } elsif ($code eq "H") {
1619 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1620 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1621 "")
1622 [$self->{hintmode}];
1623 } else {
1624 $xml .= "error processing '$code($data)' directive";
1625 }
1626 } else {
1627 if ($pod =~ /\G(.+)/) {
1628 warn "parse error while expanding $pod (at $1)";
1629 }
1630 last;
1631 }
1632 }
1633
1634 for ($xml) {
1635 # create single paragraphs (very hackish)
1636 s/(?<=\S)\n(?=\w)/ /g;
1637
1638 # compress some whitespace
1639 s/\s+\n/\n/g; # ws line-ends
1640 s/\n\n+/\n/g; # double lines
1641 s/^\n+//; # beginning lines
1642 s/\n+$//; # ending lines
1643 }
1644
1645 $xml
1646}
1647
1648no re 'eval';
1649
1650sub hintmode {
1651 $_[0]{hintmode} = $_[1] if @_ > 1;
1652 $_[0]{hintmode}
1653}
1654 1708
1655=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1656 1710
1657Sends an ext reply to the player. 1711Sends an ext reply to the player.
1658 1712
1725our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1726our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1727 1781
1728sub generate_random_map { 1782sub generate_random_map {
1729 my ($self, $rmp) = @_; 1783 my ($self, $rmp) = @_;
1784
1785 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786
1730 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1731 $self->_create_random_map ( 1788 $self->_create_random_map (
1732 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1733 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1734 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1736 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1737 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1738 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1856 1913
1857# the temporary/swap location 1914# the temporary/swap location
1858sub save_path { 1915sub save_path {
1859 my ($self) = @_; 1916 my ($self) = @_;
1860 1917
1861 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1862 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1863} 1920}
1864 1921
1865# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1866sub uniq_path { 1923sub uniq_path {
1867 my ($self) = @_; 1924 my ($self) = @_;
1868 1925
1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1870 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1871}
1872
1873# and all this just because we cannot iterate over
1874# all maps in C++...
1875sub change_all_map_light {
1876 my ($change) = @_;
1877
1878 $_->change_map_light ($change)
1879 for grep $_->outdoor, values %cf::MAP;
1880} 1928}
1881 1929
1882sub decay_objects { 1930sub decay_objects {
1883 my ($self) = @_; 1931 my ($self) = @_;
1884 1932
1968sub find { 2016sub find {
1969 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1970 2018
1971 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1972 2020
1973 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1974 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1975 2023
1976 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1977 my $guard1 = cf::lock_acquire "map_find:$path";
1978 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1979
1980 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1981 or return; 2026 or return;
1982 2027
1983 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1984 2029
1986 or return; 2031 or return;
1987 2032
1988 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1989 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1990 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1991 undef $guard1; 2037 undef $guard1;
1992 undef $guard2;
1993 $map->reset; 2038 $map->reset;
1994 return find $path; 2039 return find $path;
1995 } 2040 }
1996 2041
1997 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1998 } 2043 }
1999} 2044}
2000 2045
2001sub pre_load { } 2046sub pre_load { }
2002sub post_load { } 2047#sub post_load { } # XS
2003 2048
2004sub load { 2049sub load {
2005 my ($self) = @_; 2050 my ($self) = @_;
2006 2051
2007 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2024 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
2025 $f->skip_block; 2070 $f->skip_block;
2026 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
2027 or return; 2072 or return;
2028 2073
2029 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
2030 if delete $self->{load_original}; 2075 if delete $self->{load_original};
2031 2076
2032 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
2033 utf8::encode $uniq; 2078 utf8::encode $uniq;
2034 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
2052 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2053 $self->decay_objects; 2098 $self->decay_objects;
2054 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2055 $self->update_buttons; 2100 $self->update_buttons;
2056 cf::cede_to_tick; 2101 cf::cede_to_tick;
2057 $self->set_darkness_map;
2058 cf::cede_to_tick;
2059 $self->activate; 2102 $self->activate;
2060 } 2103 }
2061 2104
2062 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2063 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2064 2107
2065 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
2066 } 2109 }
2067 2110
2068 $self->post_load; 2111 $self->post_load;
2069} 2112}
2070 2113
2114# customize the map for a given player, i.e.
2115# return the _real_ map. used by e.g. per-player
2116# maps to change the path to ~playername/mappath
2071sub customise_for { 2117sub customise_for {
2072 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2073 2119
2074 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2075 if $self->per_player; 2121 if $self->per_player;
2128 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2129 2175
2130 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2131 2177
2132 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2133 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2134 } 2180 }
2135 2181
2136 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2137 2183
2138 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2175 cf::async { 2221 cf::async {
2176 $Coro::current->{desc} = "map player save"; 2222 $Coro::current->{desc} = "map player save";
2177 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2178 }; 2224 };
2179 2225
2226 cf::get_slot 0.02;
2227
2180 if ($uniq) { 2228 if ($uniq) {
2181 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2182 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2183 } else { 2231 } else {
2184 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2232 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2192 $self->save; 2240 $self->save;
2193 2241
2194 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2195 2243
2196 return if $self->players; 2244 return if $self->players;
2197 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2198 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2199 2247
2200 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2201 2249
2202 $self->deactivate; 2250 $self->deactivate;
2227 2275
2228 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2229 2277
2230 return if $self->players; 2278 return if $self->players;
2231 2279
2232 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2233 2281
2234 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2235 2283
2236 # need to save uniques path 2284 # need to save uniques path
2237 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2320 2368
2321sub unique_maps() { 2369sub unique_maps() {
2322 [ 2370 [
2323 map { 2371 map {
2324 utf8::decode $_; 2372 utf8::decode $_;
2325 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2326 ? normalise $_ 2376 : normalise $_
2327 : ()
2328 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2329 ] 2378 ]
2330} 2379}
2331 2380
2332package cf; 2381=item cf::map::static_maps
2382
2383Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2384file in the shared directory excluding F</styles> and F</editor>). May
2385block.
2386
2387=cut
2388
2389sub static_maps() {
2390 my @dirs = "";
2391 my @maps;
2392
2393 while (@dirs) {
2394 my $dir = shift @dirs;
2395
2396 next if $dir eq "/styles" || $dir eq "/editor";
2397
2398 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2399 or return;
2400
2401 for (@$files) {
2402 s/\.map$// or next;
2403 utf8::decode $_;
2404 push @maps, "$dir/$_";
2405 }
2406
2407 push @dirs, map "$dir/$_", @$dirs;
2408 }
2409
2410 \@maps
2411}
2333 2412
2334=back 2413=back
2335 2414
2336=head3 cf::object 2415=head3 cf::object
2337 2416
2341 2420
2342=over 4 2421=over 4
2343 2422
2344=item $ob->inv_recursive 2423=item $ob->inv_recursive
2345 2424
2346Returns the inventory of the object _and_ their inventories, recursively. 2425Returns the inventory of the object I<and> their inventories, recursively,
2426but I<not> the object itself.
2347 2427
2348=cut 2428=cut
2349 2429
2350sub inv_recursive_; 2430sub inv_recursive_;
2351sub inv_recursive_ { 2431sub inv_recursive_ {
2356 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2357} 2437}
2358 2438
2359=item $ref = $ob->ref 2439=item $ref = $ob->ref
2360 2440
2361creates and returns a persistent reference to an objetc that can be stored as a string. 2441Creates and returns a persistent reference to an object that can be stored as a string.
2362 2442
2363=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2364 2444
2365returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2445returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2366even if the object actually exists. May block. 2446even if the object actually exists. May block.
2398can be C<undef>. Does the right thing when the player is currently in a 2478can be C<undef>. Does the right thing when the player is currently in a
2399dialogue with the given NPC character. 2479dialogue with the given NPC character.
2400 2480
2401=cut 2481=cut
2402 2482
2483our $SAY_CHANNEL = {
2484 id => "say",
2485 title => "Map",
2486 reply => "say ",
2487 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2488};
2489
2490our $CHAT_CHANNEL = {
2491 id => "chat",
2492 title => "Chat",
2493 reply => "chat ",
2494 tooltip => "Player chat and shouts, global to the server.",
2495};
2496
2403# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2404# with dialog boxes. 2498# with dialog boxes.
2405#TODO: the first argument must go, split into a $npc->reply_to ( method 2499#TODO: the first argument must go, split into a $npc->reply_to ( method
2406sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2407 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2418 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2513 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2420 2514
2421 } else { 2515 } else {
2422 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2423 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2424 } 2518 }
2425 } 2519 }
2426} 2520}
2427 2521
2428=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2453 2547
2454=item $player_object->enter_link 2548=item $player_object->enter_link
2455 2549
2456Freezes the player and moves him/her to a special map (C<{link}>). 2550Freezes the player and moves him/her to a special map (C<{link}>).
2457 2551
2458The player should be reasonably safe there for short amounts of time. You 2552The player should be reasonably safe there for short amounts of time (e.g.
2459I<MUST> call C<leave_link> as soon as possible, though. 2553for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554though, as the palyer cannot control the character while it is on the link
2555map.
2460 2556
2461Will never block. 2557Will never block.
2462 2558
2463=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2464 2560
2516 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2517 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2518 2614
2519 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2520 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2521 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2522 2618
2523 $map->load; 2619 $map->load;
2524 $map->load_neighbours; 2620 $map->load_neighbours;
2525 2621
2526 return unless $self->contr->active; 2622 return unless $self->contr->active;
2527 $self->activate_recursive;
2528 2623
2529 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2530 $self->enter_map ($map, $x, $y); 2625 $self->enter_map ($map, $x, $y);
2626
2627 # only activate afterwards, to support waiting in hooks
2628 $self->activate_recursive;
2531} 2629}
2532 2630
2533=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2534 2632
2535Moves the player to the given map-path and coordinates by first freezing 2633Moves the player to the given map-path and coordinates by first freezing
2536her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2537that has to return the map if sucecssful, and then unfreezes the player on 2635that has to return the map if sucecssful, and then unfreezes the player on
2538the new (success) or old (failed) map position. In either case, $done will 2636the new (success) or old (failed) map position. In either case, $done will
2539be called at the end of this process. 2637be called at the end of this process.
2638
2639Note that $check will be called with a potentially non-loaded map, so if
2640it needs a loaded map it has to call C<< ->load >>.
2540 2641
2541=cut 2642=cut
2542 2643
2543our $GOTOGEN; 2644our $GOTOGEN;
2544 2645
2623} 2724}
2624 2725
2625sub prepare_random_map { 2726sub prepare_random_map {
2626 my ($exit) = @_; 2727 my ($exit) = @_;
2627 2728
2628 my $guard = cf::lock_acquire "exit_prepare:$exit";
2629
2630 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2631 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2632 # that depends on the exit object 2731 # that depends on the exit object
2633 2732
2634 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2636 if ($exit->map) { 2735 if ($exit->map) {
2637 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2638 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2639 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2640 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2641 } 2742 }
2642 2743
2643 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2644 2745
2645 my $data = cf::encode_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2646 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2647 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2648 2749
2649 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2650 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2651 undef $fh; 2752 undef $fh;
2652 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2653 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2654 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2655 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2656 } 2761 }
2657} 2762}
2658 2763
2659sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2660 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2661 2766
2662 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2663 2768
2664 if ($exit->slaying eq "/!") {
2665 #TODO: this should de-fi-ni-te-ly not be a sync-job
2666 # the problem is that $exit might not survive long enough
2667 # so it needs to be done right now, right here
2668 cf::sync_job { prepare_random_map $exit };
2669 }
2670
2671 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2672 my $hp = $exit->stats->hp;
2673 my $sp = $exit->stats->sp;
2674
2675 $self->enter_link; 2769 $self->enter_link;
2676 2770
2677 # if exit is damned, update players death & WoR home-position
2678 $self->contr->savebed ($slaying, $hp, $sp)
2679 if $exit->flag (FLAG_DAMNED);
2680
2681 (async { 2771 (async {
2682 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2772 $Coro::current->{desc} = "enter_exit";
2683 2773
2684 $self->deactivate_recursive; # just to be sure
2685 unless (eval { 2774 unless (eval {
2775 $self->deactivate_recursive; # just to be sure
2776
2777 # random map handling
2778 {
2779 my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781 prepare_random_map $exit
2782 if $exit->slaying eq "/!";
2783 }
2784
2785 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2786 my $x = $exit->stats->hp;
2787 my $y = $exit->stats->sp;
2788
2686 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2687 2790
2791 # if exit is damned, update players death & WoR home-position
2792 $self->contr->savebed ($map, $x, $y)
2793 if $exit->flag (cf::FLAG_DAMNED);
2794
2688 1; 2795 1
2689 }) { 2796 }) {
2690 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2691 . "I'll try to bring you back to the map you were before. " 2798 . "I'll try to bring you back to the map you were before. "
2692 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2693 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2694 2801
2695 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2712sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2713 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2714 2821
2715 utf8::encode $text; 2822 utf8::encode $text;
2716 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2823 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824}
2825
2826=item $client->send_big_packet ($pkt)
2827
2828Like C<send_packet>, but tries to compress large packets, and fragments
2829them as required.
2830
2831=cut
2832
2833our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2834
2835sub cf::client::send_big_packet {
2836 my ($self, $pkt) = @_;
2837
2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2841
2842 # split very large packets
2843 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2844 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2845 $pkt = "frag";
2846 }
2847
2848 $self->send_packet ($pkt);
2717} 2849}
2718 2850
2719=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2720 2852
2721Send a drawinfo or msg packet to the client, formatting the msg for the 2853Send a drawinfo or msg packet to the client, formatting the msg for the
2725 2857
2726=cut 2858=cut
2727 2859
2728# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2729our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2730 "c/identify" => { 2868 "c/identify" => {
2731 id => "infobox", 2869 id => "infobox",
2732 title => "Identify", 2870 title => "Identify",
2733 reply => undef, 2871 reply => undef,
2734 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2736 "c/examine" => { 2874 "c/examine" => {
2737 id => "infobox", 2875 id => "infobox",
2738 title => "Examine", 2876 title => "Examine",
2739 reply => undef, 2877 reply => undef,
2740 tooltip => "Signs and other items you examined", 2878 tooltip => "Signs and other items you examined",
2879 },
2880 "c/shopinfo" => {
2881 id => "infobox",
2882 title => "Shop Info",
2883 reply => undef,
2884 tooltip => "What your bargaining skill tells you about the shop",
2741 }, 2885 },
2742 "c/book" => { 2886 "c/book" => {
2743 id => "infobox", 2887 id => "infobox",
2744 title => "Book", 2888 title => "Book",
2745 reply => undef, 2889 reply => undef,
2761 id => "infobox", 2905 id => "infobox",
2762 title => "Body Parts", 2906 title => "Body Parts",
2763 reply => undef, 2907 reply => undef,
2764 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2765 }, 2909 },
2910 "c/statistics" => {
2911 id => "infobox",
2912 title => "Statistics",
2913 reply => undef,
2914 tooltip => "Shows your primary statistics",
2915 },
2916 "c/skills" => {
2917 id => "infobox",
2918 title => "Skills",
2919 reply => undef,
2920 tooltip => "Shows your experience per skill and item power",
2921 },
2922 "c/shopitems" => {
2923 id => "infobox",
2924 title => "Shop Items",
2925 reply => undef,
2926 tooltip => "Shows the items currently for sale in this shop",
2927 },
2928 "c/resistances" => {
2929 id => "infobox",
2930 title => "Resistances",
2931 reply => undef,
2932 tooltip => "Shows your resistances",
2933 },
2934 "c/pets" => {
2935 id => "infobox",
2936 title => "Pets",
2937 reply => undef,
2938 tooltip => "Shows information abotu your pets/a specific pet",
2939 },
2940 "c/perceiveself" => {
2941 id => "infobox",
2942 title => "Perceive Self",
2943 reply => undef,
2944 tooltip => "You gained detailed knowledge about yourself",
2945 },
2766 "c/uptime" => { 2946 "c/uptime" => {
2767 id => "infobox", 2947 id => "infobox",
2768 title => "Uptime", 2948 title => "Uptime",
2769 reply => undef, 2949 reply => undef,
2770 tooltip => "How long the server has been running since last restart", 2950 tooltip => "How long the server has been running since last restart",
2773 id => "infobox", 2953 id => "infobox",
2774 title => "Map Info", 2954 title => "Map Info",
2775 reply => undef, 2955 reply => undef,
2776 tooltip => "Information related to the maps", 2956 tooltip => "Information related to the maps",
2777 }, 2957 },
2958 "c/party" => {
2959 id => "party",
2960 title => "Party",
2961 reply => "gsay ",
2962 tooltip => "Messages and chat related to your party",
2963 },
2964 "c/death" => {
2965 id => "death",
2966 title => "Death",
2967 reply => undef,
2968 tooltip => "Reason for and more info about your most recent death",
2969 },
2970 "c/say" => $SAY_CHANNEL,
2971 "c/chat" => $CHAT_CHANNEL,
2778); 2972);
2779 2973
2780sub cf::client::send_msg { 2974sub cf::client::send_msg {
2781 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2782 2976
2783 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2784 2979
2785 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2786 2981
2787 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2788 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2789 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2790 2985
2791 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2792 if $self->can_msg;
2793
2794 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2795 2988
2796 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2797 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2798 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2799 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2800 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2801 if $self->can_msg;
2802 } 2994 }
2803 2995
2804 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2805 } 2997 }
2806 2998
2807 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2808 3000
2809 if ($self->can_msg) {
2810 # default colour, mask it out 3001 # default colour, mask it out
2811 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2812 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2813 3004
2814 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2815 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2816 } else { 3008 );
2817 if ($color >= 0) {
2818 # replace some tags by gcfclient-compatible ones
2819 for ($msg) {
2820 1 while
2821 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2822 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2823 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2824 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2825 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2826 }
2827 3009
2828 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2829
2830 utf8::encode $msg;
2831
2832 if (0 && $msg =~ /\[/) {
2833 # COMMAND/INFO
2834 $self->send_packet ("drawextinfo $color 10 8 $msg")
2835 } else {
2836 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2837 $self->send_packet ("drawinfo $color $msg")
2838 }
2839 }
2840 }
2841} 3011}
2842 3012
2843=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2844 3014
2845Sends an ext event to the client. 3015Sends an ext event to the client.
2848 3018
2849sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2850 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2851 3021
2852 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2853 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2854 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2855 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 } 3027 }
2858} 3028}
2859 3029
2860=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2861 3031
2865 3035
2866sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2867 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2868 3038
2869 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2870 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2871 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2872 #TODO: version 1, remove 3042 #TODO: version 1, remove
2873 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2874 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2875 } 3045 }
2876} 3046}
2877 3047
2878=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2879 3049
2980 3150
2981 $coro 3151 $coro
2982} 3152}
2983 3153
2984cf::client->attach ( 3154cf::client->attach (
2985 on_destroy => sub { 3155 on_client_destroy => sub {
2986 my ($ns) = @_; 3156 my ($ns) = @_;
2987 3157
2988 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2989 }, 3159 },
2990); 3160);
3006our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3007 3177
3008$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3009 3179
3010$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3011 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3012 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3013 sort time 3183 sort time
3014)); 3184));
3015 3185
3016# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3019 3189
3020The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3021 3191
3022 cf::object 3192 cf::object
3023 contr pay_amount pay_player map x y force_find force_add destroy 3193 contr pay_amount pay_player map x y force_find force_add destroy
3024 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
3025 3196
3026 cf::object::player 3197 cf::object::player
3027 player 3198 player
3028 3199
3029 cf::player 3200 cf::player
3034 3205
3035=cut 3206=cut
3036 3207
3037for ( 3208for (
3038 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3209 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3039 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3040 decrease_ob_nr destroy)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3041 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3042 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3043 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3044) { 3215) {
3045 no strict 'refs'; 3216 no strict 'refs';
3046 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3047 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3065 3236
3066 my $qcode = $code; 3237 my $qcode = $code;
3067 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3068 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3069 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3070 local $_; 3244 local $_;
3071 local @safe::cf::_safe_eval_args = values %vars;
3072 3245
3073 my $eval = 3246 my $eval =
3074 "do {\n" 3247 "do {\n"
3075 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3076 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3077 . $code 3250 . $code
3078 . "\n}" 3251 . "\n}"
3079 ; 3252 ;
3080 3253
3254 if ($CFG{safe_eval}) {
3081 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3082 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3083 sub_generation_inc; 3258 sub_generation_inc;
3259 } else {
3260 local @cf::_safe_eval_args = values %vars;
3261 @res = wantarray ? eval eval : scalar eval $eval;
3262 }
3084 3263
3085 if ($@) { 3264 if ($@) {
3086 warn "$@"; 3265 warn "$@";
3087 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3088 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3107=cut 3286=cut
3108 3287
3109sub register_script_function { 3288sub register_script_function {
3110 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3111 3290
3112 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3113 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3114} 3293}
3115 3294
3116=back 3295=back
3117 3296
3118=cut 3297=cut
3139 3318
3140 $facedata->{version} == 2 3319 $facedata->{version} == 2
3141 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3142 3321
3143 # patch in the exptable 3322 # patch in the exptable
3323 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3144 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3145 type => FT_RSRC, 3325 type => FT_RSRC,
3146 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3326 data => $exp_table,
3327 hash => (Digest::MD5::md5 $exp_table),
3147 }; 3328 };
3148 cf::cede_to_tick; 3329 cf::cede_to_tick;
3149 3330
3150 { 3331 {
3151 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3153 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3154 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3155 3336
3156 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3157 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3158 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3159 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3160 3341
3161 cf::cede_to_tick; 3342 cf::cede_to_tick;
3162 } 3343 }
3163 3344
3164 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3188 3369
3189 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3190 } 3371 }
3191 3372
3192 { 3373 {
3193 # TODO: for gcfclient pleasure, we should give resources
3194 # that gcfclient doesn't grok a >10000 face index.
3195 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3196 3375
3197 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3198 if (defined $info->{type}) { 3377 if (defined $info->{type}) {
3199 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3200 my $data;
3201 3379
3202 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3203 # prepend meta info
3204
3205 my $meta = $enc->encode ({
3206 name => $name,
3207 %{ $info->{meta} || {} },
3208 });
3209
3210 $data = pack "(w/a*)*", $meta, $info->{data};
3211 } else {
3212 $data = $info->{data};
3213 }
3214
3215 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3216 cf::face::set_type $idx, $info->{type}; 3381 cf::face::set_type $idx, $info->{type};
3217 } else { 3382 } else {
3218 $RESOURCE{$name} = $info; 3383 $RESOURCE{$name} = $info;
3219 } 3384 }
3220 3385
3221 cf::cede_to_tick; 3386 cf::cede_to_tick;
3222 } 3387 }
3223
3224 if (my $soundconf = delete $res->{"res/sound.conf"}) {
3225 $soundconf = $enc->decode (delete $soundconf->{data});
3226
3227 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3228 my $sound = $soundconf->{compat}[$_]
3229 or next;
3230
3231 my $face = cf::face::find "sound/$sound->[1]";
3232 cf::sound::set $sound->[0] => $face;
3233 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3234 }
3235
3236 while (my ($k, $v) = each %{$soundconf->{event}}) {
3237 my $face = cf::face::find "sound/$v";
3238 cf::sound::set $k => $face;
3239 }
3240 }
3241 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3242 3391
3243 1 3392 1
3244} 3393}
3394
3395cf::global->attach (on_resource_update => sub {
3396 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400 my $sound = $soundconf->{compat}[$_]
3401 or next;
3402
3403 my $face = cf::face::find "sound/$sound->[1]";
3404 cf::sound::set $sound->[0] => $face;
3405 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406 }
3407
3408 while (my ($k, $v) = each %{$soundconf->{event}}) {
3409 my $face = cf::face::find "sound/$v";
3410 cf::sound::set $k => $face;
3411 }
3412 }
3413});
3245 3414
3246register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3247 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3248 3417
3249 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3250 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3251 } 3420 }
3252}; 3421};
3422
3423sub load_resource_file($) {
3424 my $guard = lock_acquire "load_resource_file";
3425
3426 my $status = load_resource_file_ $_[0];
3427 get_slot 0.1, 100;
3428 cf::arch::commit_load;
3429
3430 $status
3431}
3253 3432
3254sub reload_regions { 3433sub reload_regions {
3255 # HACK to clear player env face cache, we need some signal framework 3434 # HACK to clear player env face cache, we need some signal framework
3256 # for this (global event?) 3435 # for this (global event?)
3257 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3271} 3450}
3272 3451
3273sub reload_archetypes { 3452sub reload_archetypes {
3274 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3275 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3276 #d# NEED to laod twice to resolve forward references
3277 # this really needs to be done in an extra post-pass
3278 # (which needs to be synchronous, so solve it differently)
3279 load_resource_file "$DATADIR/archetypes"
3280 or die "unable to load archetypes\n";
3281} 3455}
3282 3456
3283sub reload_treasures { 3457sub reload_treasures {
3284 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3285 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3286} 3460}
3287 3461
3288sub reload_resources { 3462sub reload_resources {
3289 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3290 3464
3465 reload_facedata;
3466 reload_archetypes;
3291 reload_regions; 3467 reload_regions;
3292 reload_facedata;
3293 #reload_archetypes;#d#
3294 reload_archetypes;
3295 reload_treasures; 3468 reload_treasures;
3296 3469
3297 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3298} 3471}
3299 3472
3300sub init {
3301 reload_resources;
3302}
3303
3304sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3305 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3306 or return; 3477 or return;
3307 3478
3308 local $/; 3479 local $/;
3309 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3310 3481
3311 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3312 3483
3313 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3484 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3314 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3485 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3318 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3319 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3320 }; 3491 };
3321 warn $@ if $@; 3492 warn $@ if $@;
3322 } 3493 }
3494
3495 warn "finished reloading resource files\n";
3496}
3497
3498sub pidfile() {
3499 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500 or die "$PIDFILE: $!";
3501 flock $fh, &Fcntl::LOCK_EX
3502 or die "$PIDFILE: flock: $!";
3503 $fh
3504}
3505
3506# make sure only one server instance is running at any one time
3507sub atomic {
3508 my $fh = pidfile;
3509
3510 my $pid = <$fh>;
3511 kill 9, $pid if $pid > 0;
3512
3513 seek $fh, 0, 0;
3514 print $fh $$;
3515}
3516
3517sub main_loop {
3518 warn "EV::loop starting\n";
3519 if (1) {
3520 EV::loop;
3521 }
3522 warn "EV::loop returned\n";
3523 goto &main_loop unless $REALLY_UNLOOP;
3323} 3524}
3324 3525
3325sub main { 3526sub main {
3527 cf::init_globals; # initialise logging
3528
3529 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3530 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533
3534 cf::init_experience;
3535 cf::init_anim;
3536 cf::init_attackmess;
3537 cf::init_dynamic;
3538
3539 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540
3326 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3327 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3328 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3543 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3329 (async { 3544 (async {
3330 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3331 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3332 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3333 }; 3548 };
3334 3549
3550 evthread_start IO::AIO::poll_fileno;
3551
3552 cf::sync_job {
3553 cf::load_settings;
3554 cf::load_materials;
3555
3556 reload_resources;
3335 reload_config; 3557 reload_config;
3336 db_init; 3558 db_init;
3559
3560 cf::init_uuid;
3561 cf::init_signals;
3562 cf::init_skills;
3563
3564 cf::init_beforeplay;
3565
3566 atomic;
3567
3337 load_extensions; 3568 load_extensions;
3338 3569
3339 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3340 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3571
3341 EV::loop; 3572 # no (long-running) fork's whatsoever before this point(!)
3573 use POSIX ();
3574 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575
3576 (pop @POST_INIT)->(0) while @POST_INIT;
3577 };
3578
3579 main_loop;
3342} 3580}
3343 3581
3344############################################################################# 3582#############################################################################
3345# initialisation and cleanup 3583# initialisation and cleanup
3346 3584
3347# install some emergency cleanup handlers 3585# install some emergency cleanup handlers
3348BEGIN { 3586BEGIN {
3349 our %SIGWATCHER = (); 3587 our %SIGWATCHER = ();
3350 for my $signal (qw(INT HUP TERM)) { 3588 for my $signal (qw(INT HUP TERM)) {
3351 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3589 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3352 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3353 }; 3591 };
3354 } 3592 }
3355} 3593}
3356 3594
3357sub write_runtime { 3595sub write_runtime_sync {
3358 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = AE::time;
3359 3597
3360 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3361 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3362 3600
3363 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3364 3602
3365 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3366 3604
3367 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3368 or return; 3606 or return;
3369 3607
3370 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3371 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3372 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3382 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3383 3621
3384 close $fh 3622 close $fh
3385 or return; 3623 or return;
3386 3624
3387 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3388 and return; 3626 and return;
3389 3627
3390 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3391 3629
3392 1 3630 1
3631}
3632
3633our $uuid_lock;
3634our $uuid_skip;
3635
3636sub write_uuid_sync($) {
3637 $uuid_skip ||= $_[0];
3638
3639 return if $uuid_lock;
3640 local $uuid_lock = 1;
3641
3642 my $uuid = "$LOCALDIR/uuid";
3643
3644 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3645 or return;
3646
3647 my $value = uuid_seq uuid_cur;
3648
3649 unless ($value) {
3650 warn "cowardly refusing to write zero uuid value!\n";
3651 return;
3652 }
3653
3654 my $value = uuid_str $value + $uuid_skip;
3655 $uuid_skip = 0;
3656
3657 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3658 and return;
3659
3660 # always fsync - this file is important
3661 aio_fsync $fh
3662 and return;
3663
3664 close $fh
3665 or return;
3666
3667 aio_rename "$uuid~", $uuid
3668 and return;
3669
3670 warn "uuid file written ($value).\n";
3671
3672 1
3673
3674}
3675
3676sub write_uuid($$) {
3677 my ($skip, $sync) = @_;
3678
3679 $sync ? write_uuid_sync $skip
3680 : async { write_uuid_sync $skip };
3393} 3681}
3394 3682
3395sub emergency_save() { 3683sub emergency_save() {
3396 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3397 3685
3398 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3399 3687
3400 cf::sync_job { 3688 cf::sync_job {
3689 # this is a trade-off: we want to be very quick here, so
3690 # save all maps without fsync, and later call a global sync
3691 # (which in turn might be very very slow)
3692 local $USE_FSYNC = 0;
3693
3401 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3402 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3403 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3404 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3405 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3406 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3407 $pl->valid or next; 3700 $pl->valid or next;
3408 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3409 $pl->save; 3702 $pl->save;
3410 } 3703 }
3411 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3412 3705
3413 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3414 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3415 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3416 $map->valid or next; 3709 $map->valid or next;
3417 $map->save; 3710 $map->save;
3418 } 3711 }
3419 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3420 3713
3421 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3422 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3423 warn "end emergency database checkpoint\n"; 3716 warn "emergency_perl_save: end database checkpoint\n";
3717
3718 warn "emergency_perl_save: begin write uuid\n";
3719 write_uuid_sync 1;
3720 warn "emergency_perl_save: end write uuid\n";
3424 }; 3721 };
3425 3722
3723 warn "emergency_perl_save: starting sync()\n";
3724 IO::AIO::aio_sync sub {
3725 warn "emergency_perl_save: finished sync()\n";
3726 };
3727
3426 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3427} 3729}
3428 3730
3429sub post_cleanup { 3731sub post_cleanup {
3430 my ($make_core) = @_; 3732 my ($make_core) = @_;
3431 3733
3432 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3433 if $make_core; 3735 if $make_core;
3736
3737 my $fh = pidfile;
3738 unlink $PIDFILE if <$fh> == $$;
3739}
3740
3741# a safer delete_package, copied from Symbol
3742sub clear_package($) {
3743 my $pkg = shift;
3744
3745 # expand to full symbol table name if needed
3746 unless ($pkg =~ /^main::.*::$/) {
3747 $pkg = "main$pkg" if $pkg =~ /^::/;
3748 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3749 $pkg .= '::' unless $pkg =~ /::$/;
3750 }
3751
3752 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3753 my $stem_symtab = *{$stem}{HASH};
3754
3755 defined $stem_symtab and exists $stem_symtab->{$leaf}
3756 or return;
3757
3758 # clear all symbols
3759 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760 for my $name (keys %$leaf_symtab) {
3761 _gv_clear *{"$pkg$name"};
3762# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763 }
3764 warn "cleared package $pkg\n";#d#
3434} 3765}
3435 3766
3436sub do_reload_perl() { 3767sub do_reload_perl() {
3437 # can/must only be called in main 3768 # can/must only be called in main
3438 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3439 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3440 return; 3771 return;
3441 } 3772 }
3442 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = AE::time;
3777
3778 while ($RELOAD) {
3443 warn "reloading..."; 3779 warn "reloading...";
3444 3780
3445 warn "entering sync_job"; 3781 warn "entering sync_job";
3446 3782
3447 cf::sync_job { 3783 cf::sync_job {
3448 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3449 cf::emergency_save; 3785 cf::emergency_save;
3450 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3451 3787
3452 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3453 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3454 3790
3455 # if anything goes wrong in here, we should simply crash as we already saved 3791 # if anything goes wrong in here, we should simply crash as we already saved
3456 3792
3457 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3458 for (;;) {
3459 BDB::flush;
3460 IO::AIO::flush;
3461 Coro::cede_notself;
3462 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3463 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3464 }
3465
3466 ++$RELOAD;
3467
3468 warn "cancelling all extension coros";
3469 $_->cancel for values %EXT_CORO;
3470 %EXT_CORO = ();
3471
3472 warn "removing commands";
3473 %COMMAND = ();
3474
3475 warn "removing ext/exti commands";
3476 %EXTCMD = ();
3477 %EXTICMD = ();
3478
3479 warn "unloading/nuking all extensions";
3480 for my $pkg (@EXTS) {
3481 warn "... unloading $pkg";
3482
3483 if (my $cb = $pkg->can ("unload")) {
3484 eval {
3485 $cb->($pkg);
3486 1
3487 } or warn "$pkg unloaded, but with errors: $@";
3488 } 3796 }
3489 3797
3490 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3491 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3492 } 3800 %EXT_CORO = ();
3493 3801
3494 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3495 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3496 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3497 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3498 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3499 delete $INC{$k};
3500 3812
3501 $k =~ s/\.pm$//;
3502 $k =~ s/\//::/g;
3503
3504 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3505 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3506 } 3822 }
3507 3823
3508 Symbol::delete_package $k; 3824 warn "unloading all perl modules loaded from $LIBDIR";
3825 while (my ($k, $v) = each %INC) {
3826 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827
3828 warn "... unloading $k";
3829 delete $INC{$k};
3830
3831 $k =~ s/\.pm$//;
3832 $k =~ s/\//::/g;
3833
3834 if (my $cb = $k->can ("unload_module")) {
3835 $cb->();
3836 }
3837
3838 clear_package $k;
3509 } 3839 }
3510 3840
3511 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3512 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3513 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3843 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3514 3844
3515 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3516 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3517 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3518 3848
3519 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3520 # and global variables created in xs 3850 # and global variables created in xs
3521 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3522 3852
3523 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3524 3854
3525 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3526 require cf; 3856 require cf;
3527 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3528 3858
3529 warn "loading config and database again"; 3859 warn "loading config and database again";
3530 cf::reload_config; 3860 cf::reload_config;
3531 3861
3532 warn "loading extensions"; 3862 warn "loading extensions";
3533 cf::load_extensions; 3863 cf::load_extensions;
3534 3864
3865 if ($REATTACH_ON_RELOAD) {
3535 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3536 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3537 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3538 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3539 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3540 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3541 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3542 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3543 3878
3544 1 3879 1
3545 } or do { 3880 } or do {
3546 warn $@; 3881 warn $@;
3547 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3548 exit 1;
3549 }; 3883 };
3550 3884
3551 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = AE::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3552}; 3891};
3553 3892
3554our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3555 3894
3556sub reload_perl() { 3895sub reload_perl() {
3557 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3558 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3559 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3560 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl;
3561 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3562 do_reload_perl; 3905 };
3563 }; 3906 };
3564} 3907}
3565 3908
3566register_command "reload" => sub { 3909register_command "reload" => sub {
3567 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3581 3924
3582our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3583our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3584 3927
3585sub wait_for_tick { 3928sub wait_for_tick {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3588 3930
3589 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3591 $signal->wait; 3933 $signal->wait;
3592} 3934}
3593 3935
3594sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3597 3938
3598 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3600 $signal->wait; 3941 $signal->wait;
3601} 3942}
3602 3943
3603$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3944sub tick {
3604 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3946 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3607 return; 3948 return;
3608 } 3949 }
3609 3950
3610 $NOW = $tick_start = EV::now;
3611
3612 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3613 3952
3614 $RUNTIME += $TICK; 3953 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3615 $NEXT_TICK = $_[0]->at;
3616 3954
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3957 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3959 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3960 or warn "ERROR: unable to write runtime file: $!";
3623 }; 3961 };
3624 } 3962 }
3625 3963
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3628 } 3966 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3968 $sig->send;
3631 } 3969 }
3632 3970
3633 $LOAD = ($NOW - $tick_start) / $TICK; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3634 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3635 3973
3636 _post_tick; 3974 if (0) {
3637}; 3975 if ($NEXT_TICK) {
3638$TICK_WATCHER->priority (EV::MAXPRI); 3976 my $jitter = $TICK_START - $NEXT_TICK;
3977 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978 warn "jitter $JITTER\n";#d#
3979 }
3980 }
3981}
3639 3982
3640{ 3983{
3641 # configure BDB 3984 # configure BDB
3642 3985
3643 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3644 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3645 $Coro::BDB::WATCHER->priority (1); 3988 $AnyEvent::BDB::WATCHER->priority (1);
3646 3989
3647 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3648 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3649 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3650 | BDB::LOG_AUTOREMOVE, 1); 3993 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3994 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3651 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3652 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3653 3997
3654 cf::sync_job { 3998 cf::sync_job {
3655 eval { 3999 eval {
3681{ 4025{
3682 # configure IO::AIO 4026 # configure IO::AIO
3683 4027
3684 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3685 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
3686 $Coro::AIO::WATCHER->priority (1); 4030 undef $AnyEvent::AIO::WATCHER;
3687} 4031}
3688 4032
3689my $_log_backtrace; 4033my $_log_backtrace;
3690 4034
3691sub _log_backtrace { 4035sub _log_backtrace {
3694 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3695 4039
3696 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3697 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3698 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3699 async { 4044 async {
3700 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3701 4046
3702 my @bt = fork_call { 4047 my @bt = fork_call {
3703 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3714 } 4059 }
3715 4060
3716 @funcs 4061 @funcs
3717 }; 4062 };
3718 4063
3719 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3720 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3721 --$_log_backtrace; 4067 --$_log_backtrace;
3722 }; 4068 };
3723 } else { 4069 } else {
3724 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3725 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3726 } 4072 }
3727} 4073}
3728 4074
3729# load additional modules 4075# load additional modules
3730use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3731 4078
3732END { cf::emergency_save } 4079END { cf::emergency_save }
3733 4080
37341 40811
3735 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines