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.401 by root, Mon Dec 17 06:45:53 2007 UTC vs.
Revision 1.511 by root, Wed Apr 7 18:35:56 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; 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
111our %RESOURCE;
74 112
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 115our $NEXT_TICK;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
82our $BDB_POLL_WATCHER;
83our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
84our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
85our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
86our $DB_ENV; 121our $DB_ENV;
87 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
88our %CFG; 125our %CFG;
89 126
90our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
91our $RUNTIME; 128our $RUNTIME;
92our $NOW; 129our $NOW;
98# 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 ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 137
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
103our $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 :)
104 147
105binmode STDOUT; 148binmode STDOUT;
106binmode STDERR; 149binmode STDERR;
107 150
108# read virtual server time, if available 151# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
113} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
114 159
115mkdir $_ 160mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 162
118our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
119 164
120sub 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::"} };
121 177
122############################################################################# 178#############################################################################
123 179
124=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
125 181
172returns 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
173per 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.
174 230
175=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
176 232
177This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
178C<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
179that call. 235that call.
180 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
181=back 243=back
182 244
183=cut 245=cut
184 246
185BEGIN { 247$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 248 my $msg = join "", @_;
188 249
189 $msg .= "\n" 250 $msg .= "\n"
190 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
191 252
192 $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;
193 254
194 LOG llevError, $msg; 255 LOG llevError, $msg;
195 }; 256};
196} 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};
197 271
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 282for my $pkg (qw(
209 cf::global cf::attachable 283 cf::global cf::attachable
210 cf::object cf::object::player 284 cf::object cf::object::player
211 cf::client cf::player 285 cf::client cf::player
212 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
213 cf::map cf::party cf::region 288 cf::party cf::region
214)) { 289)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 291}
218 292
219$EV::DIED = sub { 293$EV::DIED = sub {
220 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
221}; 295};
222 296
223############################################################################# 297#############################################################################
224 298
225=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
262our $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
263 337
264sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
265sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
266 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
267=item cf::lock_wait $string 355=item cf::lock_wait $string
268 356
269Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
270 358
271=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
272 360
273Wait 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
274a 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,
275for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
276returned. 364returned.
277 365
278Locks 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
279deadlocked coro. 367deadlocked coro.
285 373
286Return 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.
287 375
288=cut 376=cut
289 377
290our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 379
293sub lock_wait($) { 380sub lock_wait($) {
294 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 382}
307 383
308sub lock_acquire($) { 384sub lock_acquire($) {
309 my ($key) = @_; 385 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 386}
323 387
324sub lock_active($) { 388sub lock_active($) {
325 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 390}
329 391
330sub freeze_mainloop { 392sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
332 394
333 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start;
335 };
336 $TICK_WATCHER->stop;
337 $guard
338} 396}
339 397
340=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
341 399
342Like 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
365 423
366=cut 424=cut
367 425
368our @SLOT_QUEUE; 426our @SLOT_QUEUE;
369our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
370 429
371$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
372$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
373 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
374 433
375 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
376 436
377 while () { 437 while () {
378 next_job: 438 next_job:
439
379 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
380 if ($avail > 0.01) { 441
381 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
382 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
383 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
384 $job->[2]->send; 446 $job->[2]->send;
385 Coro::cede; 447 Coro::cede;
386 goto next_job; 448 goto next_job;
387 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
388 } 451 }
389 } 452 }
390 453
391 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
392 # 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
393 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
394 $signal->wait; 457 $signal->wait;
395 } else { 458 } else {
459 $busy = 0;
396 Coro::schedule; 460 Coro::schedule;
397 } 461 }
398 } 462 }
399}; 463};
400 464
401sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
402 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
403 469
404 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
405 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
406 473
407 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
408 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
409 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
443 # this is the main coro, too bad, we have to block 510 # this is the main coro, too bad, we have to block
444 # till the operation succeeds, freezing the server :/ 511 # till the operation succeeds, freezing the server :/
445 512
446 LOG llevError, Carp::longmess "sync job";#d# 513 LOG llevError, Carp::longmess "sync job";#d#
447 514
448 # TODO: use suspend/resume instead
449 # (but this is cancel-safe)
450 my $freeze_guard = freeze_mainloop; 515 my $freeze_guard = freeze_mainloop;
451 516
452 my $busy = 1; 517 my $busy = 1;
453 my @res; 518 my @res;
454 519
465 } else { 530 } else {
466 EV::loop EV::LOOP_ONESHOT; 531 EV::loop EV::LOOP_ONESHOT;
467 } 532 }
468 } 533 }
469 534
470 $time = EV::time - $time; 535 my $time = EV::time - $time;
471 536
472 LOG llevError | logBacktrace, Carp::longmess "long sync job"
473 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
474
475 $tick_start += $time; # do not account sync jobs to server load 537 $TICK_START += $time; # do not account sync jobs to server load
476 538
477 wantarray ? @res : $res[0] 539 wantarray ? @res : $res[0]
478 } else { 540 } else {
479 # we are in another coroutine, how wonderful, everything just works 541 # we are in another coroutine, how wonderful, everything just works
480 542
522 reset_signals; 584 reset_signals;
523 &$cb 585 &$cb
524 }, @args; 586 }, @args;
525 587
526 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
527} 616}
528 617
529=item $value = cf::db_get $family => $key 618=item $value = cf::db_get $family => $key
530 619
531Returns a single value from the environment database. 620Returns a single value from the environment database.
670 759
671############################################################################# 760#############################################################################
672 761
673=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
674 763
675Many 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
676attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
677to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
678 767
679In 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>
680C<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
730=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
731 820
732Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
733given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
734 823
735Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
736that 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.
737 826
738These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
739 828
740=over 4 829=over 4
968 } 1057 }
969 1058
970 0 1059 0
971} 1060}
972 1061
973=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1062=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
974 1063
975=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1064=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
976 1065
977Generate an object-specific event with the given arguments. 1066Generate an object-specific event with the given arguments.
978 1067
1031 1120
1032sub reattach { 1121sub reattach {
1033 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1034 my ($obj) = @_; 1123 my ($obj) = @_;
1035 1124
1125 # no longer needed after getting rid of delete_package?
1036 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
1037 1127
1038 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1039 1129
1040 @$registry = (); 1130 @$registry = ();
1041 1131
1087 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1088 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1089 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1090 1180
1091 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1092 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1093 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1094 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 }
1095 close $fh; 1188 aio_close $fh;
1096 1189
1097 if (@$objs) { 1190 if (@$objs) {
1098 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) {
1099 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1100 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1101 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1102 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 }
1103 close $fh; 1199 aio_close $fh;
1104 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1105 } 1201 }
1106 } else { 1202 } else {
1107 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1108 } 1204 }
1109 1205
1110 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1111 } else { 1210 } else {
1112 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1113 } 1212 }
1114 } else { 1213 } else {
1115 aio_unlink $filename; 1214 aio_unlink $filename;
1116 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1117 } 1216 }
1208 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1209 1308
1210 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1211} 1310}
1212 1311
1312use File::Glob ();
1313
1213cf::player->attach ( 1314cf::player->attach (
1214 on_command => sub { 1315 on_unknown_command => sub {
1215 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1216 1317
1217 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
1218 or return; 1319 or return;
1219 1320
1249 1350
1250 cf::override; 1351 cf::override;
1251 }, 1352 },
1252); 1353);
1253 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
1254sub load_extensions { 1368sub load_extensions {
1255 cf::sync_job { 1369 cf::sync_job {
1256 my %todo; 1370 my %todo;
1257 1371
1258 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
1277 1391
1278 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1279 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1280 1394
1281 $ext{source} = 1395 $ext{source} =
1282 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1283 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1284 . $source 1398 . $source
1285 . "\n};\n1"; 1399 . "\n};\n1";
1286 1400
1287 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
1288 } 1402 }
1289 1403
1404 my $pass = 0;
1290 my %done; 1405 my %done;
1291 while (%todo) { 1406 while (%todo) {
1292 my $progress; 1407 my $progress;
1293 1408
1409 ++$pass;
1410
1411 ext:
1294 while (my ($k, $v) = each %todo) { 1412 while (my ($k, $v) = each %todo) {
1295 for (split /,\s*/, $v->{meta}{depends}) { 1413 for (split /,\s*/, $v->{meta}{depends}) {
1296 goto skip 1414 next ext
1297 unless exists $done{$_}; 1415 unless exists $done{$_};
1298 } 1416 }
1299 1417
1300 warn "... loading '$k' into '$v->{pkg}'\n"; 1418 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1301 1419
1302 unless (eval $v->{source}) { 1420 my $active = eval $v->{source};
1421
1422 if (length $@) {
1303 my $msg = $@ ? "$v->{path}: $@\n" 1423 warn "$v->{path}: $@\n";
1304 : "$v->{base}: extension inactive.\n";
1305 1424
1425 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1306 if (exists $v->{meta}{mandatory}) { 1426 if exists $v->{meta}{mandatory};
1307 warn $msg; 1427 } else {
1308 warn "mandatory extension failed to load, exiting.\n"; 1428 $done{$k} = delete $todo{$k};
1309 exit 1; 1429 push @EXTS, $v->{pkg};
1310 } 1430 $progress = 1;
1311 1431
1312 warn $msg; 1432 warn "$v->{base}: extension inactive.\n"
1433 unless $active;
1313 } 1434 }
1314
1315 $done{$k} = delete $todo{$k};
1316 push @EXTS, $v->{pkg};
1317 $progress = 1;
1318 } 1435 }
1319 1436
1320 skip: 1437 unless ($progress) {
1321 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1438 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1322 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 }
1323 } 1445 }
1324 }; 1446 };
1325} 1447}
1326 1448
1327############################################################################# 1449#############################################################################
1328 1450
1329=back 1451=back
1330 1452
1331=head2 CORE EXTENSIONS 1453=head2 CORE EXTENSIONS
1332 1454
1333Functions and methods that extend core crossfire objects. 1455Functions and methods that extend core deliantra objects.
1334 1456
1335=cut 1457=cut
1336 1458
1337package cf::player; 1459package cf::player;
1338 1460
1381 1503
1382sub exists($) { 1504sub exists($) {
1383 my ($login) = @_; 1505 my ($login) = @_;
1384 1506
1385 $cf::PLAYER{$login} 1507 $cf::PLAYER{$login}
1386 or cf::sync_job { !aio_stat path $login } 1508 or !aio_stat path $login
1387} 1509}
1388 1510
1389sub find($) { 1511sub find($) {
1390 return $cf::PLAYER{$_[0]} || do { 1512 return $cf::PLAYER{$_[0]} || do {
1391 my $login = $_[0]; 1513 my $login = $_[0];
1403 my $f = new_from_file cf::object::thawer path $login 1525 my $f = new_from_file cf::object::thawer path $login
1404 or return; 1526 or return;
1405 1527
1406 my $pl = cf::player::load_pl $f 1528 my $pl = cf::player::load_pl $f
1407 or return; 1529 or return;
1530
1408 local $cf::PLAYER_LOADING{$login} = $pl; 1531 local $cf::PLAYER_LOADING{$login} = $pl;
1409 $f->resolve_delayed_derefs; 1532 $f->resolve_delayed_derefs;
1410 $cf::PLAYER{$login} = $pl 1533 $cf::PLAYER{$login} = $pl
1411 } 1534 }
1412 } 1535 }
1413} 1536}
1414 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
1415sub save($) { 1551sub save($) {
1416 my ($pl) = @_; 1552 my ($pl) = @_;
1417 1553
1418 return if $pl->{deny_save}; 1554 return if $pl->{deny_save};
1419 1555
1422 1558
1423 return if $pl->{deny_save}; 1559 return if $pl->{deny_save};
1424 1560
1425 aio_mkdir playerdir $pl, 0770; 1561 aio_mkdir playerdir $pl, 0770;
1426 $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];
1427 1568
1428 $pl->save_pl ($path); 1569 $pl->save_pl ($path);
1429 cf::cede_to_tick; 1570 cf::cede_to_tick;
1430} 1571}
1431 1572
1463 my ($pl) = @_; 1604 my ($pl) = @_;
1464 1605
1465 my $name = $pl->ob->name; 1606 my $name = $pl->ob->name;
1466 1607
1467 $pl->{deny_save} = 1; 1608 $pl->{deny_save} = 1;
1468 $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
1469 1610
1470 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1611 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1471 $pl->deactivate; 1612 $pl->deactivate;
1613 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614 $pl->ob->check_score;
1472 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1615 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1473 $pl->ns->destroy if $pl->ns; 1616 $pl->ns->destroy if $pl->ns;
1474 1617
1475 my $path = playerdir $pl; 1618 my $path = playerdir $pl;
1476 my $temp = "$path~$cf::RUNTIME~deleting~"; 1619 my $temp = "$path~$cf::RUNTIME~deleting~";
1515 1658
1516 for my $login (@$dirs) { 1659 for my $login (@$dirs) {
1517 my $path = path $login; 1660 my $path = path $login;
1518 1661
1519 # a .pst is a dead give-away for a valid player 1662 # a .pst is a dead give-away for a valid player
1520 unless (-e "$path.pst") { 1663 # if no pst file found, open and chekc for blocked users
1664 if (aio_stat "$path.pst") {
1521 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1665 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1522 aio_read $fh, 0, 512, my $buf, 0 or next; 1666 aio_read $fh, 0, 512, my $buf, 0 or next;
1523 $buf !~ /^password -------------$/m or next; # official not-valid tag 1667 $buf !~ /^password -------------$/m or next; # official not-valid tag
1524 } 1668 }
1525 1669
1556 } 1700 }
1557 1701
1558 \@paths 1702 \@paths
1559} 1703}
1560 1704
1561=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1705=item $protocol_xml = $player->expand_cfpod ($cfpod)
1562 1706
1563Expand crossfire pod fragments into protocol xml. 1707Expand deliantra pod fragments into protocol xml.
1564
1565=cut
1566
1567use re 'eval';
1568
1569my $group;
1570my $interior; $interior = qr{
1571 # match a pod interior sequence sans C<< >>
1572 (?:
1573 \ (.*?)\ (?{ $group = $^N })
1574 | < (??{$interior}) >
1575 )
1576}x;
1577
1578sub expand_cfpod {
1579 my ($self, $pod) = @_;
1580
1581 my $xml;
1582
1583 while () {
1584 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1585 $group = $1;
1586
1587 $group =~ s/&/&amp;/g;
1588 $group =~ s/</&lt;/g;
1589
1590 $xml .= $group;
1591 } elsif ($pod =~ m%\G
1592 ([BCGHITU])
1593 <
1594 (?:
1595 ([^<>]*) (?{ $group = $^N })
1596 | < $interior >
1597 )
1598 >
1599 %gcsx
1600 ) {
1601 my ($code, $data) = ($1, $group);
1602
1603 if ($code eq "B") {
1604 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1605 } elsif ($code eq "I") {
1606 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1607 } elsif ($code eq "U") {
1608 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1609 } elsif ($code eq "C") {
1610 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1611 } elsif ($code eq "T") {
1612 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1613 } elsif ($code eq "G") {
1614 my ($male, $female) = split /\|/, $data;
1615 $data = $self->gender ? $female : $male;
1616 $xml .= expand_cfpod ($self, $data);
1617 } elsif ($code eq "H") {
1618 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1619 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1620 "")
1621 [$self->{hintmode}];
1622 } else {
1623 $xml .= "error processing '$code($data)' directive";
1624 }
1625 } else {
1626 if ($pod =~ /\G(.+)/) {
1627 warn "parse error while expanding $pod (at $1)";
1628 }
1629 last;
1630 }
1631 }
1632
1633 for ($xml) {
1634 # create single paragraphs (very hackish)
1635 s/(?<=\S)\n(?=\w)/ /g;
1636
1637 # compress some whitespace
1638 s/\s+\n/\n/g; # ws line-ends
1639 s/\n\n+/\n/g; # double lines
1640 s/^\n+//; # beginning lines
1641 s/\n+$//; # ending lines
1642 }
1643
1644 $xml
1645}
1646
1647no re 'eval';
1648
1649sub hintmode {
1650 $_[0]{hintmode} = $_[1] if @_ > 1;
1651 $_[0]{hintmode}
1652}
1653 1708
1654=item $player->ext_reply ($msgid, @msg) 1709=item $player->ext_reply ($msgid, @msg)
1655 1710
1656Sends an ext reply to the player. 1711Sends an ext reply to the player.
1657 1712
1724our $MAX_RESET = 3600; 1779our $MAX_RESET = 3600;
1725our $DEFAULT_RESET = 3000; 1780our $DEFAULT_RESET = 3000;
1726 1781
1727sub generate_random_map { 1782sub generate_random_map {
1728 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
1729 # mit "rum" bekleckern, nicht 1787 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1788 $self->_create_random_map (
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1789 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1790 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1791 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map}, 1792 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize}, 1793 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1794 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1795 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1855 1913
1856# the temporary/swap location 1914# the temporary/swap location
1857sub save_path { 1915sub save_path {
1858 my ($self) = @_; 1916 my ($self) = @_;
1859 1917
1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1918 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1861 "$TMPDIR/$path.map" 1919 "$TMPDIR/$path.map"
1862} 1920}
1863 1921
1864# the unique path, undef == no special unique path 1922# the unique path, undef == no special unique path
1865sub uniq_path { 1923sub uniq_path {
1866 my ($self) = @_; 1924 my ($self) = @_;
1867 1925
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 1927 "$UNIQUEDIR/$path"
1870}
1871
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879} 1928}
1880 1929
1881sub decay_objects { 1930sub decay_objects {
1882 my ($self) = @_; 1931 my ($self) = @_;
1883 1932
1967sub find { 2016sub find {
1968 my ($path, $origin) = @_; 2017 my ($path, $origin) = @_;
1969 2018
1970 $path = normalise $path, $origin && $origin->path; 2019 $path = normalise $path, $origin && $origin->path;
1971 2020
1972 cf::lock_wait "map_data:$path";#d#remove 2021 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2022 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2023
1975 $cf::MAP{$path} || do { 2024 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_find:$path";
1977 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1978
1979 my $map = new_from_path cf::map $path 2025 my $map = new_from_path cf::map $path
1980 or return; 2026 or return;
1981 2027
1982 $map->{last_save} = $cf::RUNTIME; 2028 $map->{last_save} = $cf::RUNTIME;
1983 2029
1985 or return; 2031 or return;
1986 2032
1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2033 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1988 # doing this can freeze the server in a sync job, obviously 2034 # doing this can freeze the server in a sync job, obviously
1989 #$cf::WAIT_FOR_TICK->wait; 2035 #$cf::WAIT_FOR_TICK->wait;
2036 undef $guard2;
1990 undef $guard1; 2037 undef $guard1;
1991 undef $guard2;
1992 $map->reset; 2038 $map->reset;
1993 return find $path; 2039 return find $path;
1994 } 2040 }
1995 2041
1996 $cf::MAP{$path} = $map 2042 $cf::MAP{$path} = $map
1997 } 2043 }
1998} 2044}
1999 2045
2000sub pre_load { } 2046sub pre_load { }
2001sub post_load { } 2047#sub post_load { } # XS
2002 2048
2003sub load { 2049sub load {
2004 my ($self) = @_; 2050 my ($self) = @_;
2005 2051
2006 local $self->{deny_reset} = 1; # loading can take a long time 2052 local $self->{deny_reset} = 1; # loading can take a long time
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2069 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2070 $f->skip_block;
2025 $self->_load_objects ($f) 2071 $self->_load_objects ($f)
2026 or return; 2072 or return;
2027 2073
2028 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2074 $self->post_load_original
2029 if delete $self->{load_original}; 2075 if delete $self->{load_original};
2030 2076
2031 if (my $uniq = $self->uniq_path) { 2077 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2078 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2079 unless (aio_stat $uniq) {
2051 unless ($self->{deny_activate}) { 2097 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2098 $self->decay_objects;
2053 $self->fix_auto_apply; 2099 $self->fix_auto_apply;
2054 $self->update_buttons; 2100 $self->update_buttons;
2055 cf::cede_to_tick; 2101 cf::cede_to_tick;
2056 $self->set_darkness_map;
2057 cf::cede_to_tick;
2058 $self->activate; 2102 $self->activate;
2059 } 2103 }
2060 2104
2061 $self->{last_save} = $cf::RUNTIME; 2105 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2106 $self->last_access ($cf::RUNTIME);
2063 2107
2064 $self->in_memory (cf::MAP_IN_MEMORY); 2108 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2109 }
2066 2110
2067 $self->post_load; 2111 $self->post_load;
2068} 2112}
2069 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
2070sub customise_for { 2117sub customise_for {
2071 my ($self, $ob) = @_; 2118 my ($self, $ob) = @_;
2072 2119
2073 return find "~" . $ob->name . "/" . $self->{path} 2120 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2121 if $self->per_player;
2127 my ($path, $origin, $load) = @_; 2174 my ($path, $origin, $load) = @_;
2128 2175
2129 $path = normalise $path, $origin && $origin->{path}; 2176 $path = normalise $path, $origin && $origin->{path};
2130 2177
2131 if (my $map = $cf::MAP{$path}) { 2178 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2179 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2133 } 2180 }
2134 2181
2135 $MAP_PREFETCH{$path} |= $load; 2182 $MAP_PREFETCH{$path} |= $load;
2136 2183
2137 $MAP_PREFETCHER ||= cf::async { 2184 $MAP_PREFETCHER ||= cf::async {
2174 cf::async { 2221 cf::async {
2175 $Coro::current->{desc} = "map player save"; 2222 $Coro::current->{desc} = "map player save";
2176 $_->contr->save for $self->players; 2223 $_->contr->save for $self->players;
2177 }; 2224 };
2178 2225
2226 cf::get_slot 0.02;
2227
2179 if ($uniq) { 2228 if ($uniq) {
2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2229 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2181 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2230 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2182 } else { 2231 } else {
2183 $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);
2191 $self->save; 2240 $self->save;
2192 2241
2193 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2194 2243
2195 return if $self->players; 2244 return if $self->players;
2196 return if $self->in_memory != cf::MAP_IN_MEMORY; 2245 return if $self->in_memory != cf::MAP_ACTIVE;
2197 return if $self->{deny_save}; 2246 return if $self->{deny_save};
2198 2247
2199 $self->in_memory (cf::MAP_SWAPPED); 2248 $self->in_memory (cf::MAP_SWAPPED);
2200 2249
2201 $self->deactivate; 2250 $self->deactivate;
2226 2275
2227 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2276 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2277
2229 return if $self->players; 2278 return if $self->players;
2230 2279
2231 warn "resetting map ", $self->path; 2280 warn "resetting map ", $self->path, "\n";
2232 2281
2233 $self->in_memory (cf::MAP_SWAPPED); 2282 $self->in_memory (cf::MAP_SWAPPED);
2234 2283
2235 # need to save uniques path 2284 # need to save uniques path
2236 unless ($self->{deny_save}) { 2285 unless ($self->{deny_save}) {
2319 2368
2320sub unique_maps() { 2369sub unique_maps() {
2321 [ 2370 [
2322 map { 2371 map {
2323 utf8::decode $_; 2372 utf8::decode $_;
2324 /\.map$/ 2373 s/\.map$//; # TODO future compatibility hack
2374 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2375 ? ()
2325 ? normalise $_ 2376 : normalise $_
2326 : ()
2327 } @{ aio_readdir $UNIQUEDIR or [] } 2377 } @{ aio_readdir $UNIQUEDIR or [] }
2328 ] 2378 ]
2329} 2379}
2330 2380
2331package 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}
2332 2412
2333=back 2413=back
2334 2414
2335=head3 cf::object 2415=head3 cf::object
2336 2416
2340 2420
2341=over 4 2421=over 4
2342 2422
2343=item $ob->inv_recursive 2423=item $ob->inv_recursive
2344 2424
2345Returns 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.
2346 2427
2347=cut 2428=cut
2348 2429
2349sub inv_recursive_; 2430sub inv_recursive_;
2350sub inv_recursive_ { 2431sub inv_recursive_ {
2355 inv_recursive_ inv $_[0] 2436 inv_recursive_ inv $_[0]
2356} 2437}
2357 2438
2358=item $ref = $ob->ref 2439=item $ref = $ob->ref
2359 2440
2360creates 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.
2361 2442
2362=item $ob = cf::object::deref ($refstring) 2443=item $ob = cf::object::deref ($refstring)
2363 2444
2364returns 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,
2365even if the object actually exists. May block. 2446even if the object actually exists. May block.
2397can 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
2398dialogue with the given NPC character. 2479dialogue with the given NPC character.
2399 2480
2400=cut 2481=cut
2401 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
2402# rough implementation of a future "reply" method that works 2497# rough implementation of a future "reply" method that works
2403# with dialog boxes. 2498# with dialog boxes.
2404#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
2405sub cf::object::player::reply($$$;$) { 2500sub cf::object::player::reply($$$;$) {
2406 my ($self, $npc, $msg, $flags) = @_; 2501 my ($self, $npc, $msg, $flags) = @_;
2417 my $dialog = $pl->{npc_dialog}; 2512 my $dialog = $pl->{npc_dialog};
2418 $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));
2419 2514
2420 } else { 2515 } else {
2421 $msg = $npc->name . " says: $msg" if $npc; 2516 $msg = $npc->name . " says: $msg" if $npc;
2422 $self->message ($msg, $flags); 2517 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2423 } 2518 }
2424 } 2519 }
2425} 2520}
2426 2521
2427=item $object->send_msg ($channel, $msg, $color, [extra...]) 2522=item $object->send_msg ($channel, $msg, $color, [extra...])
2452 2547
2453=item $player_object->enter_link 2548=item $player_object->enter_link
2454 2549
2455Freezes 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}>).
2456 2551
2457The 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.
2458I<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.
2459 2556
2460Will never block. 2557Will never block.
2461 2558
2462=item $player_object->leave_link ($map, $x, $y) 2559=item $player_object->leave_link ($map, $x, $y)
2463 2560
2515 ($x, $y) = (-1, -1) 2612 ($x, $y) = (-1, -1)
2516 unless (defined $x) && (defined $y); 2613 unless (defined $x) && (defined $y);
2517 2614
2518 # use -1 or undef as default coordinates, not 0, 0 2615 # use -1 or undef as default coordinates, not 0, 0
2519 ($x, $y) = ($map->enter_x, $map->enter_y) 2616 ($x, $y) = ($map->enter_x, $map->enter_y)
2520 if $x <=0 && $y <= 0; 2617 if $x <= 0 && $y <= 0;
2521 2618
2522 $map->load; 2619 $map->load;
2523 $map->load_neighbours; 2620 $map->load_neighbours;
2524 2621
2525 return unless $self->contr->active; 2622 return unless $self->contr->active;
2526 $self->activate_recursive;
2527 2623
2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2624 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2529 $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;
2530} 2629}
2531 2630
2532=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2631=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2533 2632
2534Moves 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
2535her, loading and preparing them map, calling the provided $check callback 2634her, loading and preparing them map, calling the provided $check callback
2536that 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
2537the 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
2538be 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 >>.
2539 2641
2540=cut 2642=cut
2541 2643
2542our $GOTOGEN; 2644our $GOTOGEN;
2543 2645
2622} 2724}
2623 2725
2624sub prepare_random_map { 2726sub prepare_random_map {
2625 my ($exit) = @_; 2727 my ($exit) = @_;
2626 2728
2627 my $guard = cf::lock_acquire "exit_prepare:$exit";
2628
2629 # all this does is basically replace the /! path by 2729 # all this does is basically replace the /! path by
2630 # a new random map path (?random/...) with a seed 2730 # a new random map path (?random/...) with a seed
2631 # that depends on the exit object 2731 # that depends on the exit object
2632 2732
2633 my $rmp = parse_random_map_params $exit->msg; 2733 my $rmp = parse_random_map_params $exit->msg;
2635 if ($exit->map) { 2735 if ($exit->map) {
2636 $rmp->{region} = $exit->region->name; 2736 $rmp->{region} = $exit->region->name;
2637 $rmp->{origin_map} = $exit->map->path; 2737 $rmp->{origin_map} = $exit->map->path;
2638 $rmp->{origin_x} = $exit->x; 2738 $rmp->{origin_x} = $exit->x;
2639 $rmp->{origin_y} = $exit->y; 2739 $rmp->{origin_y} = $exit->y;
2740
2741 $exit->map->touch;
2640 } 2742 }
2641 2743
2642 $rmp->{random_seed} ||= $exit->random_seed; 2744 $rmp->{random_seed} ||= $exit->random_seed;
2643 2745
2644 my $data = cf::encode_json $rmp; 2746 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2645 my $md5 = Digest::MD5::md5_hex $data; 2747 my $md5 = Digest::MD5::md5_hex $data;
2646 my $meta = "$RANDOMDIR/$md5.meta"; 2748 my $meta = "$RANDOMDIR/$md5.meta";
2647 2749
2648 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2750 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2649 aio_write $fh, 0, (length $data), $data, 0; 2751 aio_write $fh, 0, (length $data), $data, 0;
2650 undef $fh; 2752 undef $fh;
2651 aio_rename "$meta~", $meta; 2753 aio_rename "$meta~", $meta;
2652 2754
2755 my $slaying = "?random/$md5";
2756
2757 if ($exit->valid) {
2653 $exit->slaying ("?random/$md5"); 2758 $exit->slaying ("?random/$md5");
2654 $exit->msg (undef); 2759 $exit->msg (undef);
2760 }
2655 } 2761 }
2656} 2762}
2657 2763
2658sub cf::object::player::enter_exit { 2764sub cf::object::player::enter_exit {
2659 my ($self, $exit) = @_; 2765 my ($self, $exit) = @_;
2660 2766
2661 return unless $self->type == cf::PLAYER; 2767 return unless $self->type == cf::PLAYER;
2662 2768
2663 if ($exit->slaying eq "/!") {
2664 #TODO: this should de-fi-ni-te-ly not be a sync-job
2665 # the problem is that $exit might not survive long enough
2666 # so it needs to be done right now, right here
2667 cf::sync_job { prepare_random_map $exit };
2668 }
2669
2670 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2671 my $hp = $exit->stats->hp;
2672 my $sp = $exit->stats->sp;
2673
2674 $self->enter_link; 2769 $self->enter_link;
2675 2770
2676 # if exit is damned, update players death & WoR home-position
2677 $self->contr->savebed ($slaying, $hp, $sp)
2678 if $exit->flag (FLAG_DAMNED);
2679
2680 (async { 2771 (async {
2681 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2772 $Coro::current->{desc} = "enter_exit";
2682 2773
2683 $self->deactivate_recursive; # just to be sure
2684 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
2685 $self->goto ($slaying, $hp, $sp); 2789 $self->goto ($map, $x, $y);
2686 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
2687 1; 2795 1
2688 }) { 2796 }) {
2689 $self->message ("Something went wrong deep within the crossfire server. " 2797 $self->message ("Something went wrong deep within the deliantra server. "
2690 . "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. "
2691 . "Please report this to the dungeon master!", 2799 . "Please report this to the dungeon master!",
2692 cf::NDI_UNIQUE | cf::NDI_RED); 2800 cf::NDI_UNIQUE | cf::NDI_RED);
2693 2801
2694 warn "ERROR in enter_exit: $@"; 2802 warn "ERROR in enter_exit: $@";
2711sub cf::client::send_drawinfo { 2819sub cf::client::send_drawinfo {
2712 my ($self, $text, $flags) = @_; 2820 my ($self, $text, $flags) = @_;
2713 2821
2714 utf8::encode $text; 2822 utf8::encode $text;
2715 $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);
2716} 2849}
2717 2850
2718=item $client->send_msg ($channel, $msg, $color, [extra...]) 2851=item $client->send_msg ($channel, $msg, $color, [extra...])
2719 2852
2720Send 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
2724 2857
2725=cut 2858=cut
2726 2859
2727# non-persistent channels (usually the info channel) 2860# non-persistent channels (usually the info channel)
2728our %CHANNEL = ( 2861our %CHANNEL = (
2862 "c/motd" => {
2863 id => "infobox",
2864 title => "MOTD",
2865 reply => undef,
2866 tooltip => "The message of the day",
2867 },
2729 "c/identify" => { 2868 "c/identify" => {
2730 id => "infobox", 2869 id => "infobox",
2731 title => "Identify", 2870 title => "Identify",
2732 reply => undef, 2871 reply => undef,
2733 tooltip => "Items recently identified", 2872 tooltip => "Items recently identified",
2735 "c/examine" => { 2874 "c/examine" => {
2736 id => "infobox", 2875 id => "infobox",
2737 title => "Examine", 2876 title => "Examine",
2738 reply => undef, 2877 reply => undef,
2739 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",
2740 }, 2885 },
2741 "c/book" => { 2886 "c/book" => {
2742 id => "infobox", 2887 id => "infobox",
2743 title => "Book", 2888 title => "Book",
2744 reply => undef, 2889 reply => undef,
2760 id => "infobox", 2905 id => "infobox",
2761 title => "Body Parts", 2906 title => "Body Parts",
2762 reply => undef, 2907 reply => undef,
2763 tooltip => "Shows which body parts you posess and are available", 2908 tooltip => "Shows which body parts you posess and are available",
2764 }, 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 },
2765 "c/uptime" => { 2946 "c/uptime" => {
2766 id => "infobox", 2947 id => "infobox",
2767 title => "Uptime", 2948 title => "Uptime",
2768 reply => undef, 2949 reply => undef,
2769 tooltip => "How long the server has been running since last restart", 2950 tooltip => "How long the server has been running since last restart",
2772 id => "infobox", 2953 id => "infobox",
2773 title => "Map Info", 2954 title => "Map Info",
2774 reply => undef, 2955 reply => undef,
2775 tooltip => "Information related to the maps", 2956 tooltip => "Information related to the maps",
2776 }, 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,
2777); 2972);
2778 2973
2779sub cf::client::send_msg { 2974sub cf::client::send_msg {
2780 my ($self, $channel, $msg, $color, @extra) = @_; 2975 my ($self, $channel, $msg, $color, @extra) = @_;
2781 2976
2782 $msg = $self->pl->expand_cfpod ($msg); 2977 $msg = $self->pl->expand_cfpod ($msg)
2978 unless $color & cf::NDI_VERBATIM;
2783 2979
2784 $color &= cf::NDI_CLIENT_MASK; # just in case... 2980 $color &= cf::NDI_CLIENT_MASK; # just in case...
2785 2981
2786 # check predefined channels, for the benefit of C 2982 # check predefined channels, for the benefit of C
2787 if ($CHANNEL{$channel}) { 2983 if ($CHANNEL{$channel}) {
2788 $channel = $CHANNEL{$channel}; 2984 $channel = $CHANNEL{$channel};
2789 2985
2790 $self->ext_msg (channel_info => $channel) 2986 $self->ext_msg (channel_info => $channel);
2791 if $self->can_msg;
2792
2793 $channel = $channel->{id}; 2987 $channel = $channel->{id};
2794 2988
2795 } elsif (ref $channel) { 2989 } elsif (ref $channel) {
2796 # send meta info to client, if not yet sent 2990 # send meta info to client, if not yet sent
2797 unless (exists $self->{channel}{$channel->{id}}) { 2991 unless (exists $self->{channel}{$channel->{id}}) {
2798 $self->{channel}{$channel->{id}} = $channel; 2992 $self->{channel}{$channel->{id}} = $channel;
2799 $self->ext_msg (channel_info => $channel) 2993 $self->ext_msg (channel_info => $channel);
2800 if $self->can_msg;
2801 } 2994 }
2802 2995
2803 $channel = $channel->{id}; 2996 $channel = $channel->{id};
2804 } 2997 }
2805 2998
2806 return unless @extra || length $msg; 2999 return unless @extra || length $msg;
2807 3000
2808 if ($self->can_msg) {
2809 # default colour, mask it out 3001 # default colour, mask it out
2810 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3002 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2811 if $color & cf::NDI_DEF; 3003 if $color & cf::NDI_DEF;
2812 3004
2813 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3005 my $pkt = "msg "
3006 . $self->{json_coder}->encode (
2814 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3007 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2815 } else { 3008 );
2816 if ($color >= 0) {
2817 # replace some tags by gcfclient-compatible ones
2818 for ($msg) {
2819 1 while
2820 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2821 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2822 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2823 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2824 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2825 }
2826 3009
2827 $color &= cf::NDI_COLOR_MASK; 3010 $self->send_big_packet ($pkt);
2828
2829 utf8::encode $msg;
2830
2831 if (0 && $msg =~ /\[/) {
2832 # COMMAND/INFO
2833 $self->send_packet ("drawextinfo $color 10 8 $msg")
2834 } else {
2835 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2836 $self->send_packet ("drawinfo $color $msg")
2837 }
2838 }
2839 }
2840} 3011}
2841 3012
2842=item $client->ext_msg ($type, @msg) 3013=item $client->ext_msg ($type, @msg)
2843 3014
2844Sends an ext event to the client. 3015Sends an ext event to the client.
2847 3018
2848sub cf::client::ext_msg($$@) { 3019sub cf::client::ext_msg($$@) {
2849 my ($self, $type, @msg) = @_; 3020 my ($self, $type, @msg) = @_;
2850 3021
2851 if ($self->extcmd == 2) { 3022 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3023 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2853 } elsif ($self->extcmd == 1) { # TODO: remove 3024 } elsif ($self->extcmd == 1) { # TODO: remove
2854 push @msg, msgtype => "event_$type"; 3025 push @msg, msgtype => "event_$type";
2855 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3026 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2856 } 3027 }
2857} 3028}
2858 3029
2859=item $client->ext_reply ($msgid, @msg) 3030=item $client->ext_reply ($msgid, @msg)
2860 3031
2864 3035
2865sub cf::client::ext_reply($$@) { 3036sub cf::client::ext_reply($$@) {
2866 my ($self, $id, @msg) = @_; 3037 my ($self, $id, @msg) = @_;
2867 3038
2868 if ($self->extcmd == 2) { 3039 if ($self->extcmd == 2) {
2869 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3040 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2870 } elsif ($self->extcmd == 1) { 3041 } elsif ($self->extcmd == 1) {
2871 #TODO: version 1, remove 3042 #TODO: version 1, remove
2872 unshift @msg, msgtype => "reply", msgid => $id; 3043 unshift @msg, msgtype => "reply", msgid => $id;
2873 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3044 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2874 } 3045 }
2875} 3046}
2876 3047
2877=item $success = $client->query ($flags, "text", \&cb) 3048=item $success = $client->query ($flags, "text", \&cb)
2878 3049
2979 3150
2980 $coro 3151 $coro
2981} 3152}
2982 3153
2983cf::client->attach ( 3154cf::client->attach (
2984 on_destroy => sub { 3155 on_client_destroy => sub {
2985 my ($ns) = @_; 3156 my ($ns) = @_;
2986 3157
2987 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3158 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2988 }, 3159 },
2989); 3160);
3005our $safe_hole = new Safe::Hole; 3176our $safe_hole = new Safe::Hole;
3006 3177
3007$SIG{FPE} = 'IGNORE'; 3178$SIG{FPE} = 'IGNORE';
3008 3179
3009$safe->permit_only (Opcode::opset qw( 3180$safe->permit_only (Opcode::opset qw(
3010 :base_core :base_mem :base_orig :base_math 3181 :base_core :base_mem :base_orig :base_math :base_loop
3011 grepstart grepwhile mapstart mapwhile 3182 grepstart grepwhile mapstart mapwhile
3012 sort time 3183 sort time
3013)); 3184));
3014 3185
3015# here we export the classes and methods available to script code 3186# here we export the classes and methods available to script code
3018 3189
3019The following functions and methods are available within a safe environment: 3190The following functions and methods are available within a safe environment:
3020 3191
3021 cf::object 3192 cf::object
3022 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
3023 insert remove name archname title slaying race decrease_ob_nr 3194 insert remove name archname title slaying race decrease split
3195 value
3024 3196
3025 cf::object::player 3197 cf::object::player
3026 player 3198 player
3027 3199
3028 cf::player 3200 cf::player
3033 3205
3034=cut 3206=cut
3035 3207
3036for ( 3208for (
3037 ["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
3038 insert remove inv name archname title slaying race 3210 insert remove inv nrof name archname title slaying race
3039 decrease_ob_nr destroy)], 3211 decrease split destroy change_exp value msg lore send_msg)],
3040 ["cf::object::player" => qw(player)], 3212 ["cf::object::player" => qw(player)],
3041 ["cf::player" => qw(peaceful)], 3213 ["cf::player" => qw(peaceful send_msg)],
3042 ["cf::map" => qw(trigger)], 3214 ["cf::map" => qw(trigger)],
3043) { 3215) {
3044 no strict 'refs'; 3216 no strict 'refs';
3045 my ($pkg, @funs) = @$_; 3217 my ($pkg, @funs) = @$_;
3046 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3218 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3064 3236
3065 my $qcode = $code; 3237 my $qcode = $code;
3066 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3238 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3067 $qcode =~ s/\n/\\n/g; 3239 $qcode =~ s/\n/\\n/g;
3068 3240
3241 %vars = (_dummy => 0) unless %vars;
3242
3243 my @res;
3069 local $_; 3244 local $_;
3070 local @safe::cf::_safe_eval_args = values %vars;
3071 3245
3072 my $eval = 3246 my $eval =
3073 "do {\n" 3247 "do {\n"
3074 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3248 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3075 . "#line 0 \"{$qcode}\"\n" 3249 . "#line 0 \"{$qcode}\"\n"
3076 . $code 3250 . $code
3077 . "\n}" 3251 . "\n}"
3078 ; 3252 ;
3079 3253
3254 if ($CFG{safe_eval}) {
3080 sub_generation_inc; 3255 sub_generation_inc;
3256 local @safe::cf::_safe_eval_args = values %vars;
3081 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3257 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3082 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 }
3083 3263
3084 if ($@) { 3264 if ($@) {
3085 warn "$@"; 3265 warn "$@";
3086 warn "while executing safe code '$code'\n"; 3266 warn "while executing safe code '$code'\n";
3087 warn "with arguments " . (join " ", %vars) . "\n"; 3267 warn "with arguments " . (join " ", %vars) . "\n";
3106=cut 3286=cut
3107 3287
3108sub register_script_function { 3288sub register_script_function {
3109 my ($fun, $cb) = @_; 3289 my ($fun, $cb) = @_;
3110 3290
3111 no strict 'refs'; 3291 $fun = "safe::$fun" if $CFG{safe_eval};
3112 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3292 *$fun = $safe_hole->wrap ($cb);
3113} 3293}
3114 3294
3115=back 3295=back
3116 3296
3117=cut 3297=cut
3138 3318
3139 $facedata->{version} == 2 3319 $facedata->{version} == 2
3140 or cf::cleanup "$path: version mismatch, cannot proceed."; 3320 or cf::cleanup "$path: version mismatch, cannot proceed.";
3141 3321
3142 # 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]);
3143 $facedata->{resource}{"res/exp_table"} = { 3324 $facedata->{resource}{"res/exp_table"} = {
3144 type => FT_RSRC, 3325 type => FT_RSRC,
3145 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),
3146 }; 3328 };
3147 cf::cede_to_tick; 3329 cf::cede_to_tick;
3148 3330
3149 { 3331 {
3150 my $faces = $facedata->{faceinfo}; 3332 my $faces = $facedata->{faceinfo};
3151 3333
3152 while (my ($face, $info) = each %$faces) { 3334 while (my ($face, $info) = each %$faces) {
3153 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3335 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336
3154 cf::face::set_visibility $idx, $info->{visibility}; 3337 cf::face::set_visibility $idx, $info->{visibility};
3155 cf::face::set_magicmap $idx, $info->{magicmap}; 3338 cf::face::set_magicmap $idx, $info->{magicmap};
3156 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3339 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3157 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3340 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3158 3341
3159 cf::cede_to_tick; 3342 cf::cede_to_tick;
3160 } 3343 }
3161 3344
3162 while (my ($face, $info) = each %$faces) { 3345 while (my ($face, $info) = each %$faces) {
3163 next unless $info->{smooth}; 3346 next unless $info->{smooth};
3347
3164 my $idx = cf::face::find $face 3348 my $idx = cf::face::find $face
3165 or next; 3349 or next;
3350
3166 if (my $smooth = cf::face::find $info->{smooth}) { 3351 if (my $smooth = cf::face::find $info->{smooth}) {
3167 cf::face::set_smooth $idx, $smooth; 3352 cf::face::set_smooth $idx, $smooth;
3168 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3353 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3169 } else { 3354 } else {
3170 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3355 warn "smooth face '$info->{smooth}' not found for face '$face'";
3184 3369
3185 cf::anim::invalidate_all; # d'oh 3370 cf::anim::invalidate_all; # d'oh
3186 } 3371 }
3187 3372
3188 { 3373 {
3189 # TODO: for gcfclient pleasure, we should give resources
3190 # that gcfclient doesn't grok a >10000 face index.
3191 my $res = $facedata->{resource}; 3374 my $res = $facedata->{resource};
3192 3375
3193 my $soundconf = delete $res->{"res/sound.conf"};
3194
3195 while (my ($name, $info) = each %$res) { 3376 while (my ($name, $info) = each %$res) {
3377 if (defined $info->{type}) {
3196 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3378 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3197 my $data;
3198 3379
3199 if ($info->{type} & 1) { 3380 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3200 # prepend meta info 3381 cf::face::set_type $idx, $info->{type};
3201
3202 my $meta = $enc->encode ({
3203 name => $name,
3204 %{ $info->{meta} || {} },
3205 });
3206
3207 $data = pack "(w/a*)*", $meta, $info->{data};
3208 } else { 3382 } else {
3209 $data = $info->{data}; 3383 $RESOURCE{$name} = $info;
3210 } 3384 }
3211 3385
3212 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3213 cf::face::set_type $idx, $info->{type};
3214
3215 cf::cede_to_tick; 3386 cf::cede_to_tick;
3216 } 3387 }
3217
3218 if ($soundconf) {
3219 $soundconf = $enc->decode (delete $soundconf->{data});
3220
3221 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3222 my $sound = $soundconf->{compat}[$_]
3223 or next;
3224
3225 my $face = cf::face::find "sound/$sound->[1]";
3226 cf::sound::set $sound->[0] => $face;
3227 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3228 }
3229
3230 while (my ($k, $v) = each %{$soundconf->{event}}) {
3231 my $face = cf::face::find "sound/$v";
3232 cf::sound::set $k => $face;
3233 }
3234 }
3235 } 3388 }
3389
3390 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3236 3391
3237 1 3392 1
3238} 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});
3239 3414
3240register_exticmd fx_want => sub { 3415register_exticmd fx_want => sub {
3241 my ($ns, $want) = @_; 3416 my ($ns, $want) = @_;
3242 3417
3243 while (my ($k, $v) = each %$want) { 3418 while (my ($k, $v) = each %$want) {
3244 $ns->fx_want ($k, $v); 3419 $ns->fx_want ($k, $v);
3245 } 3420 }
3246}; 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}
3247 3432
3248sub reload_regions { 3433sub reload_regions {
3249 # 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
3250 # for this (global event?) 3435 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = (); 3436 %ext::player_env::MUSIC_FACE_CACHE = ();
3265} 3450}
3266 3451
3267sub reload_archetypes { 3452sub reload_archetypes {
3268 load_resource_file "$DATADIR/archetypes" 3453 load_resource_file "$DATADIR/archetypes"
3269 or die "unable to load archetypes\n"; 3454 or die "unable to load archetypes\n";
3270 #d# NEED to laod twice to resolve forward references
3271 # this really needs to be done in an extra post-pass
3272 # (which needs to be synchronous, so solve it differently)
3273 load_resource_file "$DATADIR/archetypes"
3274 or die "unable to load archetypes\n";
3275} 3455}
3276 3456
3277sub reload_treasures { 3457sub reload_treasures {
3278 load_resource_file "$DATADIR/treasures" 3458 load_resource_file "$DATADIR/treasures"
3279 or die "unable to load treasurelists\n"; 3459 or die "unable to load treasurelists\n";
3280} 3460}
3281 3461
3282sub reload_resources { 3462sub reload_resources {
3283 warn "reloading resource files...\n"; 3463 warn "reloading resource files...\n";
3284 3464
3465 reload_facedata;
3466 reload_archetypes;
3285 reload_regions; 3467 reload_regions;
3286 reload_facedata;
3287 #reload_archetypes;#d#
3288 reload_archetypes;
3289 reload_treasures; 3468 reload_treasures;
3290 3469
3291 warn "finished reloading resource files\n"; 3470 warn "finished reloading resource files\n";
3292} 3471}
3293 3472
3294sub init {
3295 reload_resources;
3296}
3297
3298sub reload_config { 3473sub reload_config {
3474 warn "reloading config file...\n";
3475
3299 open my $fh, "<:utf8", "$CONFDIR/config" 3476 open my $fh, "<:utf8", "$CONFDIR/config"
3300 or return; 3477 or return;
3301 3478
3302 local $/; 3479 local $/;
3303 *CFG = YAML::Syck::Load <$fh>; 3480 *CFG = YAML::XS::Load scalar <$fh>;
3304 3481
3305 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3482 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3306 3483
3307 $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};
3308 $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};
3312 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3489 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3313 and die "WARNING: m(un)lockall failed: $!\n"; 3490 and die "WARNING: m(un)lockall failed: $!\n";
3314 }; 3491 };
3315 warn $@ if $@; 3492 warn $@ if $@;
3316 } 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;
3317} 3524}
3318 3525
3319sub 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
3320 # we must not ever block the main coroutine 3541 # we must not ever block the main coroutine
3321 local $Coro::idle = sub { 3542 local $Coro::idle = sub {
3322 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#
3323 (async { 3544 (async {
3324 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3545 $Coro::current->{desc} = "IDLE BUG HANDLER";
3325 EV::loop EV::LOOP_ONESHOT; 3546 EV::loop EV::LOOP_ONESHOT;
3326 })->prio (Coro::PRIO_MAX); 3547 })->prio (Coro::PRIO_MAX);
3327 }; 3548 };
3328 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;
3329 reload_config; 3557 reload_config;
3330 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
3331 load_extensions; 3568 load_extensions;
3332 3569
3333 $TICK_WATCHER->start; 3570 utime time, time, $RUNTIMEFILE;
3334 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3571
3335 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;
3336} 3580}
3337 3581
3338############################################################################# 3582#############################################################################
3339# initialisation and cleanup 3583# initialisation and cleanup
3340 3584
3346 cf::cleanup "SIG$signal"; 3590 cf::cleanup "SIG$signal";
3347 }; 3591 };
3348 } 3592 }
3349} 3593}
3350 3594
3351sub write_runtime { 3595sub write_runtime_sync {
3352 my $runtime = "$LOCALDIR/runtime"; 3596 my $t0 = EV::time;
3353 3597
3354 # first touch the runtime file to show we are still running: 3598 # first touch the runtime file to show we are still running:
3355 # the fsync below can take a very very long time. 3599 # the fsync below can take a very very long time.
3356 3600
3357 IO::AIO::aio_utime $runtime, undef, undef; 3601 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3358 3602
3359 my $guard = cf::lock_acquire "write_runtime"; 3603 my $guard = cf::lock_acquire "write_runtime";
3360 3604
3361 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3605 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3362 or return; 3606 or return;
3363 3607
3364 my $value = $cf::RUNTIME + 90 + 10; 3608 my $value = $cf::RUNTIME + 90 + 10;
3365 # 10 is the runtime save interval, for a monotonic clock 3609 # 10 is the runtime save interval, for a monotonic clock
3366 # 60 allows for the watchdog to kill the server. 3610 # 60 allows for the watchdog to kill the server.
3376 aio_utime $fh, undef, undef; 3620 aio_utime $fh, undef, undef;
3377 3621
3378 close $fh 3622 close $fh
3379 or return; 3623 or return;
3380 3624
3381 aio_rename "$runtime~", $runtime 3625 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3382 and return; 3626 and return;
3383 3627
3384 warn "runtime file written.\n"; 3628 warn sprintf "runtime file written (%gs).\n", EV::time - $t0;
3385 3629
3386 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 };
3387} 3681}
3388 3682
3389sub emergency_save() { 3683sub emergency_save() {
3390 my $freeze_guard = cf::freeze_mainloop; 3684 my $freeze_guard = cf::freeze_mainloop;
3391 3685
3392 warn "enter emergency perl save\n"; 3686 warn "emergency_perl_save: enter\n";
3393 3687
3394 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
3395 # use a peculiar iteration method to avoid tripping on perl 3694 # use a peculiar iteration method to avoid tripping on perl
3396 # refcount bugs in for. also avoids problems with players 3695 # refcount bugs in for. also avoids problems with players
3397 # and maps saved/destroyed asynchronously. 3696 # and maps saved/destroyed asynchronously.
3398 warn "begin emergency player save\n"; 3697 warn "emergency_perl_save: begin player save\n";
3399 for my $login (keys %cf::PLAYER) { 3698 for my $login (keys %cf::PLAYER) {
3400 my $pl = $cf::PLAYER{$login} or next; 3699 my $pl = $cf::PLAYER{$login} or next;
3401 $pl->valid or next; 3700 $pl->valid or next;
3402 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3701 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3403 $pl->save; 3702 $pl->save;
3404 } 3703 }
3405 warn "end emergency player save\n"; 3704 warn "emergency_perl_save: end player save\n";
3406 3705
3407 warn "begin emergency map save\n"; 3706 warn "emergency_perl_save: begin map save\n";
3408 for my $path (keys %cf::MAP) { 3707 for my $path (keys %cf::MAP) {
3409 my $map = $cf::MAP{$path} or next; 3708 my $map = $cf::MAP{$path} or next;
3410 $map->valid or next; 3709 $map->valid or next;
3411 $map->save; 3710 $map->save;
3412 } 3711 }
3413 warn "end emergency map save\n"; 3712 warn "emergency_perl_save: end map save\n";
3414 3713
3415 warn "begin emergency database checkpoint\n"; 3714 warn "emergency_perl_save: begin database checkpoint\n";
3416 BDB::db_env_txn_checkpoint $DB_ENV; 3715 BDB::db_env_txn_checkpoint $DB_ENV;
3417 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";
3418 }; 3721 };
3419 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
3420 warn "leave emergency perl save\n"; 3728 warn "emergency_perl_save: leave\n";
3421} 3729}
3422 3730
3423sub post_cleanup { 3731sub post_cleanup {
3424 my ($make_core) = @_; 3732 my ($make_core) = @_;
3425 3733
3426 warn Carp::longmess "post_cleanup backtrace" 3734 warn Carp::longmess "post_cleanup backtrace"
3427 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#
3428} 3765}
3429 3766
3430sub do_reload_perl() { 3767sub do_reload_perl() {
3431 # can/must only be called in main 3768 # can/must only be called in main
3432 if ($Coro::current != $Coro::main) { 3769 if ($Coro::current != $Coro::main) {
3433 warn "can only reload from main coroutine"; 3770 warn "can only reload from main coroutine";
3434 return; 3771 return;
3435 } 3772 }
3436 3773
3774 return if $RELOAD++;
3775
3776 my $t1 = EV::time;
3777
3778 while ($RELOAD) {
3437 warn "reloading..."; 3779 warn "reloading...";
3438 3780
3439 warn "entering sync_job"; 3781 warn "entering sync_job";
3440 3782
3441 cf::sync_job { 3783 cf::sync_job {
3442 cf::write_runtime; # external watchdog should not bark 3784 cf::write_runtime_sync; # external watchdog should not bark
3443 cf::emergency_save; 3785 cf::emergency_save;
3444 cf::write_runtime; # external watchdog should not bark 3786 cf::write_runtime_sync; # external watchdog should not bark
3445 3787
3446 warn "syncing database to disk"; 3788 warn "syncing database to disk";
3447 BDB::db_env_txn_checkpoint $DB_ENV; 3789 BDB::db_env_txn_checkpoint $DB_ENV;
3448 3790
3449 # 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
3450 3792
3451 warn "flushing outstanding aio requests"; 3793 warn "flushing outstanding aio requests";
3452 for (;;) {
3453 BDB::flush;
3454 IO::AIO::flush;
3455 Coro::cede_notself;
3456 last unless IO::AIO::nreqs || BDB::nreqs; 3794 while (IO::AIO::nreqs || BDB::nreqs) {
3457 warn "iterate..."; 3795 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3458 }
3459
3460 ++$RELOAD;
3461
3462 warn "cancelling all extension coros";
3463 $_->cancel for values %EXT_CORO;
3464 %EXT_CORO = ();
3465
3466 warn "removing commands";
3467 %COMMAND = ();
3468
3469 warn "removing ext/exti commands";
3470 %EXTCMD = ();
3471 %EXTICMD = ();
3472
3473 warn "unloading/nuking all extensions";
3474 for my $pkg (@EXTS) {
3475 warn "... unloading $pkg";
3476
3477 if (my $cb = $pkg->can ("unload")) {
3478 eval {
3479 $cb->($pkg);
3480 1
3481 } or warn "$pkg unloaded, but with errors: $@";
3482 } 3796 }
3483 3797
3484 warn "... nuking $pkg"; 3798 warn "cancelling all extension coros";
3485 Symbol::delete_package $pkg; 3799 $_->cancel for values %EXT_CORO;
3486 } 3800 %EXT_CORO = ();
3487 3801
3488 warn "unloading all perl modules loaded from $LIBDIR"; 3802 warn "removing commands";
3489 while (my ($k, $v) = each %INC) { 3803 %COMMAND = ();
3490 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3491 3804
3805 warn "removing ext/exti commands";
3806 %EXTCMD = ();
3807 %EXTICMD = ();
3808
3809 warn "unloading/nuking all extensions";
3810 for my $pkg (@EXTS) {
3492 warn "... unloading $k"; 3811 warn "... unloading $pkg";
3493 delete $INC{$k};
3494 3812
3495 $k =~ s/\.pm$//;
3496 $k =~ s/\//::/g;
3497
3498 if (my $cb = $k->can ("unload_module")) { 3813 if (my $cb = $pkg->can ("unload")) {
3814 eval {
3499 $cb->(); 3815 $cb->($pkg);
3816 1
3817 } or warn "$pkg unloaded, but with errors: $@";
3818 }
3819
3820 warn "... clearing $pkg";
3821 clear_package $pkg;
3500 } 3822 }
3501 3823
3502 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;
3503 } 3839 }
3504 3840
3505 warn "getting rid of safe::, as good as possible"; 3841 warn "getting rid of safe::, as good as possible";
3506 Symbol::delete_package "safe::$_" 3842 clear_package "safe::$_"
3507 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);
3508 3844
3509 warn "unloading cf.pm \"a bit\""; 3845 warn "unloading cf.pm \"a bit\"";
3510 delete $INC{"cf.pm"}; 3846 delete $INC{"cf.pm"};
3511 delete $INC{"cf/pod.pm"}; 3847 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3512 3848
3513 # don't, removes xs symbols, too, 3849 # don't, removes xs symbols, too,
3514 # and global variables created in xs 3850 # and global variables created in xs
3515 #Symbol::delete_package __PACKAGE__; 3851 #clear_package __PACKAGE__;
3516 3852
3517 warn "unload completed, starting to reload now"; 3853 warn "unload completed, starting to reload now";
3518 3854
3519 warn "reloading cf.pm"; 3855 warn "reloading cf.pm";
3520 require cf; 3856 require cf;
3521 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3857 cf::_connect_to_perl_1;
3522 3858
3523 warn "loading config and database again"; 3859 warn "loading config and database again";
3524 cf::reload_config; 3860 cf::reload_config;
3525 3861
3526 warn "loading extensions"; 3862 warn "loading extensions";
3527 cf::load_extensions; 3863 cf::load_extensions;
3528 3864
3865 if ($REATTACH_ON_RELOAD) {
3529 warn "reattaching attachments to objects/players"; 3866 warn "reattaching attachments to objects/players";
3530 _global_reattach; # objects, sockets 3867 _global_reattach; # objects, sockets
3531 warn "reattaching attachments to maps"; 3868 warn "reattaching attachments to maps";
3532 reattach $_ for values %MAP; 3869 reattach $_ for values %MAP;
3533 warn "reattaching attachments to players"; 3870 warn "reattaching attachments to players";
3534 reattach $_ for values %PLAYER; 3871 reattach $_ for values %PLAYER;
3872 }
3535 3873
3874 warn "running post_init jobs";
3875 (pop @POST_INIT)->(1) while @POST_INIT;
3876
3536 warn "leaving sync_job"; 3877 warn "leaving sync_job";
3537 3878
3538 1 3879 1
3539 } or do { 3880 } or do {
3540 warn $@; 3881 warn $@;
3541 warn "error while reloading, exiting."; 3882 cf::cleanup "error while reloading, exiting.";
3542 exit 1;
3543 }; 3883 };
3544 3884
3545 warn "reloaded"; 3885 warn "reloaded";
3886 --$RELOAD;
3887 }
3888
3889 $t1 = EV::time - $t1;
3890 warn "reload completed in ${t1}s\n";
3546}; 3891};
3547 3892
3548our $RELOAD_WATCHER; # used only during reload 3893our $RELOAD_WATCHER; # used only during reload
3549 3894
3550sub reload_perl() { 3895sub reload_perl() {
3551 # doing reload synchronously and two reloads happen back-to-back, 3896 # doing reload synchronously and two reloads happen back-to-back,
3552 # coro crashes during coro_state_free->destroy here. 3897 # coro crashes during coro_state_free->destroy here.
3553 3898
3899 $RELOAD_WATCHER ||= cf::async {
3900 Coro::AIO::aio_wait cache_extensions;
3901
3554 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3902 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3903 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3904 undef $RELOAD_WATCHER;
3556 do_reload_perl; 3905 };
3557 }; 3906 };
3558} 3907}
3559 3908
3560register_command "reload" => sub { 3909register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3910 my ($who, $arg) = @_;
3575 3924
3576our @WAIT_FOR_TICK; 3925our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3926our @WAIT_FOR_TICK_BEGIN;
3578 3927
3579sub wait_for_tick { 3928sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3929 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3582 3930
3583 my $signal = new Coro::Signal; 3931 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3932 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3933 $signal->wait;
3586} 3934}
3587 3935
3588sub wait_for_tick_begin { 3936sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3937 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3591 3938
3592 my $signal = new Coro::Signal; 3939 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3940 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3941 $signal->wait;
3595} 3942}
3596 3943
3597$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3944sub tick {
3598 if ($Coro::current != $Coro::main) { 3945 if ($Coro::current != $Coro::main) {
3599 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"
3600 unless ++$bug_warning > 10; 3947 unless ++$bug_warning > 10;
3601 return; 3948 return;
3602 } 3949 }
3603 3950
3604 $NOW = $tick_start = EV::now;
3605
3606 cf::server_tick; # one server iteration 3951 cf::server_tick; # one server iteration
3607 3952
3608 $RUNTIME += $TICK; 3953 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3609 $NEXT_TICK += $TICK;
3610 3954
3611 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3955 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3612 $NEXT_RUNTIME_WRITE = $NOW + 10; 3956 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3613 Coro::async_pool { 3957 Coro::async_pool {
3614 $Coro::current->{desc} = "runtime saver"; 3958 $Coro::current->{desc} = "runtime saver";
3615 write_runtime 3959 write_runtime_sync
3616 or warn "ERROR: unable to write runtime file: $!"; 3960 or warn "ERROR: unable to write runtime file: $!";
3617 }; 3961 };
3618 } 3962 }
3619 3963
3620 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3964 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3622 } 3966 }
3623 while (my $sig = shift @WAIT_FOR_TICK) { 3967 while (my $sig = shift @WAIT_FOR_TICK) {
3624 $sig->send; 3968 $sig->send;
3625 } 3969 }
3626 3970
3627 $LOAD = ($NOW - $tick_start) / $TICK; 3971 $LOAD = ($NOW - $TICK_START) / $TICK;
3628 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3972 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3629 3973
3630 _post_tick; 3974 if (0) {
3631}; 3975 if ($NEXT_TICK) {
3632$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}
3633 3982
3634{ 3983{
3635 # configure BDB 3984 # configure BDB
3636 3985
3637 BDB::min_parallel 8; 3986 BDB::min_parallel 16;
3638 BDB::max_poll_reqs $TICK * 0.1; 3987 BDB::max_poll_reqs $TICK * 0.1;
3988 $AnyEvent::BDB::WATCHER->priority (1);
3639 3989
3640 unless ($DB_ENV) { 3990 unless ($DB_ENV) {
3641 $DB_ENV = BDB::db_env_create; 3991 $DB_ENV = BDB::db_env_create;
3642 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3992 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3643 | 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;
3644 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3995 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3645 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3996 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3646 3997
3647 cf::sync_job { 3998 cf::sync_job {
3648 eval { 3999 eval {
3674{ 4025{
3675 # configure IO::AIO 4026 # configure IO::AIO
3676 4027
3677 IO::AIO::min_parallel 8; 4028 IO::AIO::min_parallel 8;
3678 IO::AIO::max_poll_time $TICK * 0.1; 4029 IO::AIO::max_poll_time $TICK * 0.1;
4030 undef $AnyEvent::AIO::WATCHER;
3679} 4031}
3680 4032
3681my $_log_backtrace; 4033my $_log_backtrace;
3682 4034
3683sub _log_backtrace { 4035sub _log_backtrace {
3686 $msg =~ s/\n//; 4038 $msg =~ s/\n//;
3687 4039
3688 # limit the # of concurrent backtraces 4040 # limit the # of concurrent backtraces
3689 if ($_log_backtrace < 2) { 4041 if ($_log_backtrace < 2) {
3690 ++$_log_backtrace; 4042 ++$_log_backtrace;
4043 my $perl_bt = Carp::longmess $msg;
3691 async { 4044 async {
3692 $Coro::current->{desc} = "abt $msg"; 4045 $Coro::current->{desc} = "abt $msg";
3693 4046
3694 my @bt = fork_call { 4047 my @bt = fork_call {
3695 @addr = map { sprintf "%x", $_ } @addr; 4048 @addr = map { sprintf "%x", $_ } @addr;
3706 } 4059 }
3707 4060
3708 @funcs 4061 @funcs
3709 }; 4062 };
3710 4063
3711 LOG llevInfo, "[ABT] $msg\n"; 4064 LOG llevInfo, "[ABT] $perl_bt\n";
4065 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3712 LOG llevInfo, "[ABT] $_\n" for @bt; 4066 LOG llevInfo, "[ABT] $_\n" for @bt;
3713 --$_log_backtrace; 4067 --$_log_backtrace;
3714 }; 4068 };
3715 } else { 4069 } else {
3716 LOG llevInfo, "[ABT] $msg\n"; 4070 LOG llevInfo, "[ABT] $msg\n";
3717 LOG llevInfo, "[ABT] [suppressed]\n"; 4071 LOG llevInfo, "[ABT] [suppressed]\n";
3718 } 4072 }
3719} 4073}
3720 4074
3721# load additional modules 4075# load additional modules
3722use cf::pod; 4076require "cf/$_.pm" for @EXTRA_MODULES;
4077cf::_connect_to_perl_2;
3723 4078
3724END { cf::emergency_save } 4079END { cf::emergency_save }
3725 4080
37261 40811
3727 4082

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines