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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.488 by root, Wed Oct 21 00:44:39 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 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 Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
14 37
38use Guard ();
15use Coro 3.64 (); 39use Coro ();
16use Coro::State; 40use Coro::State;
17use Coro::Handle; 41use Coro::Handle;
42use Coro::EV;
18use Coro::Event; 43use Coro::AnyEvent;
19use Coro::Timer; 44use Coro::Timer;
20use Coro::Signal; 45use Coro::Signal;
21use Coro::Semaphore; 46use Coro::Semaphore;
47use Coro::SemaphoreSet;
48use Coro::AnyEvent;
22use Coro::AIO; 49use Coro::AIO;
50use Coro::BDB 1.6;
23use Coro::Storable; 51use Coro::Storable;
24use Coro::Util (); 52use Coro::Util ();
25 53
26use JSON::XS (); 54use JSON::XS 2.01 ();
27use BDB (); 55use BDB ();
28use Data::Dumper; 56use Data::Dumper;
29use Digest::MD5; 57use Digest::MD5;
30use Fcntl; 58use Fcntl;
31use YAML::Syck (); 59use YAML::XS ();
32use IO::AIO 2.32 (); 60use IO::AIO ();
33use Time::HiRes; 61use Time::HiRes;
34use Compress::LZF; 62use Compress::LZF;
35use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
36 66
37# configure various modules to our taste 67# configure various modules to our taste
38# 68#
39$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
40Coro::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";
41Compress::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
42 77
43$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
44 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 80
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 82
52our %COMMAND = (); 83our %COMMAND = ();
53our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
56our %EXTCMD = (); 87our %EXTCMD = ();
57our %EXTICMD = (); 88our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
60 91
61our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
63 96
64our $CONFDIR = confdir; 97our $CONFDIR = confdir;
65our $DATADIR = datadir; 98our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
75 112
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 115our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
83 117
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 121our $DB_ENV;
89 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
90our %CFG; 125our %CFG;
91 126
92our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 128our $RUNTIME;
129our $NOW;
94 130
95our (%PLAYER, %PLAYER_LOADING); # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 132our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
98 134
99# used to convert map paths into valid unix filenames by replacing / by ∕ 135# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 137
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
105 147
106binmode STDOUT; 148binmode STDOUT;
107binmode STDERR; 149binmode STDERR;
108 150
109# read virtual server time, if available 151# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
114} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
115 159
116mkdir $_ 160mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 162
119our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
120 164
121sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
122 177
123############################################################################# 178#############################################################################
124 179
125=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
126 181
162 217
163The raw value load value from the last tick. 218The raw value load value from the last tick.
164 219
165=item %cf::CFG 220=item %cf::CFG
166 221
167Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 223from wherever your confdir points to.
169 224
170=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
171 226
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 227These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
173returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
174per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
175 230
176=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
177 232
178This array contains the results of the last C<invoke ()> call. When 233This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call. 235that call.
181 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
182=back 243=back
183 244
184=cut 245=cut
185 246
186BEGIN { 247$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 248 my $msg = join "", @_;
189 249
190 $msg .= "\n" 250 $msg .= "\n"
191 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
192 252
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 254
195 LOG llevError, $msg; 255 LOG llevError, $msg;
196 }; 256};
197} 257
258$Coro::State::DIEHOOK = sub {
259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
262
263 if ($Coro::current == $Coro::main) {#d#
264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
265 return;#d#
266 }#d#
267
268 # kill coroutine otherwise
269 Coro::terminate
270};
198 271
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 282for my $pkg (qw(
210 cf::global cf::attachable 283 cf::global cf::attachable
211 cf::object cf::object::player 284 cf::object cf::object::player
212 cf::client cf::player 285 cf::client cf::player
213 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
214 cf::map cf::party cf::region 288 cf::party cf::region
215)) { 289)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 291}
219 292
220$Event::DIED = sub { 293$EV::DIED = sub {
221 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
222}; 295};
223 296
224############################################################################# 297#############################################################################
225 298
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 321 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 322 $d
250 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
251} 324}
252 325
253=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
254 327
255Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
256 329
257=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
258 331
259Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
260 333
261=cut 334=cut
262 335
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 337
265sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
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}
267 354
268=item cf::lock_wait $string 355=item cf::lock_wait $string
269 356
270Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
271 358
272=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
273 360
274Wait until the given lock is available and then acquires it and returns 361Wait until the given lock is available and then acquires it and returns
275a Coro::guard object. If the guard object gets destroyed (goes out of scope, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
276for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
277returned. 364returned.
278 365
279Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 367deadlocked coro.
286 373
287Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
288 375
289=cut 376=cut
290 377
291our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 379
294sub lock_wait($) { 380sub lock_wait($) {
295 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 382}
308 383
309sub lock_acquire($) { 384sub lock_acquire($) {
310 my ($key) = @_; 385 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 386}
324 387
325sub lock_active($) { 388sub lock_active($) {
326 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 390}
330 391
331sub freeze_mainloop { 392sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
333 394
334 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 396}
336 }; 397
337 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
338 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
339} 411}
340 412
341=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
342 414
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
354our @SLOT_QUEUE; 426our @SLOT_QUEUE;
355our $SLOT_QUEUE; 427our $SLOT_QUEUE;
356 428
357$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
359 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
360 434
361 while () { 435 while () {
362 next_job: 436 next_job:
363 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
371 } 445 }
372 } 446 }
373 } 447 }
374 448
375 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
376 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
377 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
378 $signal->wait; 452 $signal->wait;
379 } else { 453 } else {
380 Coro::schedule; 454 Coro::schedule;
381 } 455 }
382 } 456 }
383}; 457};
384 458
385sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
386 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
387 463
388 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
389 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
390 466
404 480
405BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
406 482
407=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
408 484
409The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
410is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
411partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
412acceptable. 488acceptable.
413 489
414If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
415the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
420 496
421sub sync_job(&) { 497sub sync_job(&) {
422 my ($job) = @_; 498 my ($job) = @_;
423 499
424 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
425 my $time = Event::time; 501 my $time = EV::time;
426 502
427 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
428 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
429 505
430 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
431 # (but this is cancel-safe) 507
432 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
433 509
434 my $busy = 1; 510 my $busy = 1;
435 my @res; 511 my @res;
436 512
437 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
438 @res = eval { $job->() }; 515 @res = eval { $job->() };
439 warn $@ if $@; 516 warn $@ if $@;
440 undef $busy; 517 undef $busy;
441 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
442 519
443 while ($busy) { 520 while ($busy) {
444 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
445 } 525 }
526 }
446 527
447 $time = Event::time - $time; 528 my $time = EV::time - $time;
448 529
449 LOG llevError | logBacktrace, Carp::longmess "long sync job"
450 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
451
452 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
453 531
454 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
455 } else { 533 } else {
456 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
457 535
482=item fork_call { }, $args 560=item fork_call { }, $args
483 561
484Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
485process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
486Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
487never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
488 566
489=cut 567=cut
490 568
491sub fork_call(&@) { 569sub fork_call(&@) {
492 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
499 reset_signals; 577 reset_signals;
500 &$cb 578 &$cb
501 }, @args; 579 }, @args;
502 580
503 wantarray ? @res : $res[-1] 581 wantarray ? @res : $res[-1]
582}
583
584=item $coin = coin_from_name $name
585
586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
504} 609}
505 610
506=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
507 612
508Returns a single value from the environment database. 613Returns a single value from the environment database.
647 752
648############################################################################# 753#############################################################################
649 754
650=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
651 756
652Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
653attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
654to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
655 760
656In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
657C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
658Crossfire TRT). 763Deliantra).
659 764
660=over 4 765=over 4
661 766
662=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
663 768
707=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
708 813
709Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
710given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
711 816
712Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
713that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
714 819
715These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
716 821
717=over 4 822=over 4
945 } 1050 }
946 1051
947 0 1052 0
948} 1053}
949 1054
950=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
951 1056
952=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
953 1058
954Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
955 1060
961 1066
962=cut 1067=cut
963 1068
964############################################################################# 1069#############################################################################
965# object support 1070# object support
966#
967 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
968sub _can_merge { 1105sub _can_merge {
969 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
970 1107
971 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
972 my $fob1 = Storable::freeze $ob1;
973 my $fob2 = Storable::freeze $ob2;
974 1109
975 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
976} 1112}
977 1113
978sub reattach { 1114sub reattach {
979 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
980 my ($obj) = @_; 1116 my ($obj) = @_;
981 1117
1118 # no longer needed after getting rid of delete_package?
982 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
983 1120
984 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
985 1122
986 @$registry = (); 1123 @$registry = ();
987 1124
1002cf::attachable->attach ( 1139cf::attachable->attach (
1003 prio => -1000000, 1140 prio => -1000000,
1004 on_instantiate => sub { 1141 on_instantiate => sub {
1005 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1006 1143
1007 $data = from_json $data; 1144 $data = decode_json $data;
1008 1145
1009 for (@$data) { 1146 for (@$data) {
1010 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1011 1148
1012 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1025 }, 1162 },
1026); 1163);
1027 1164
1028sub object_freezer_save { 1165sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1030
1031 my $guard = cf::lock_acquire "io";
1032 1167
1033 sync_job { 1168 sync_job {
1034 if (length $$rdata) { 1169 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1170 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1038 1173
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 aio_fsync $fh if $cf::USE_FSYNC; 1177 if ($cf::USE_FSYNC) {
1178 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;
1179 aio_fsync $fh;
1180 }
1043 close $fh; 1181 aio_close $fh;
1044 1182
1045 if (@$objs) { 1183 if (@$objs) {
1046 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1184 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1047 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
1050 aio_fsync $fh if $cf::USE_FSYNC; 1188 if ($cf::USE_FSYNC) {
1189 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;
1190 aio_fsync $fh;
1191 }
1051 close $fh; 1192 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1194 }
1054 } else { 1195 } else {
1055 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
1056 } 1197 }
1057 1198
1058 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1203 } else {
1060 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
1061 } 1205 }
1062 } else { 1206 } else {
1063 aio_unlink $filename; 1207 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1065 } 1209 }
1066 }; 1210 };
1067
1068 undef $guard;
1069} 1211}
1070 1212
1071sub object_freezer_as_string { 1213sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1073 1215
1078 1220
1079sub object_thawer_load { 1221sub object_thawer_load {
1080 my ($filename) = @_; 1222 my ($filename) = @_;
1081 1223
1082 my ($data, $av); 1224 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1225
1086 (aio_load $filename, $data) >= 0 1226 (aio_load $filename, $data) >= 0
1087 or return; 1227 or return;
1088 1228
1089 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1231 or return;
1092 1232
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1095 } 1235 }
1096 1236
1097 utf8::decode (my $decname = $filename); 1237 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1160 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1161 1301
1162 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1163} 1303}
1164 1304
1305use File::Glob ();
1306
1165cf::player->attach ( 1307cf::player->attach (
1166 on_command => sub { 1308 on_command => sub {
1167 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1168 1310
1169 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1201 1343
1202 cf::override; 1344 cf::override;
1203 }, 1345 },
1204); 1346);
1205 1347
1348# "readahead" all extensions
1349sub cache_extensions {
1350 my $grp = IO::AIO::aio_group;
1351
1352 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1353 for (grep /\.ext$/, @{$_[0]}) {
1354 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1355 }
1356 };
1357
1358 $grp
1359}
1360
1206sub load_extensions { 1361sub load_extensions {
1207 cf::sync_job { 1362 cf::sync_job {
1208 my %todo; 1363 my %todo;
1209 1364
1210 for my $path (<$LIBDIR/*.ext>) { 1365 for my $path (<$LIBDIR/*.ext>) {
1229 1384
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1387
1233 $ext{source} = 1388 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1235 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1236 . $source 1391 . $source
1237 . "\n};\n1"; 1392 . "\n};\n1";
1238 1393
1239 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1255 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1256 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1257 1412
1258 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1259 warn $msg; 1414 warn $msg;
1260 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1261 exit 1;
1262 } 1416 }
1263 1417
1264 warn $msg; 1418 warn $msg;
1265 } 1419 }
1266 1420
1280 1434
1281=back 1435=back
1282 1436
1283=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1284 1438
1285Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1286 1440
1287=cut 1441=cut
1288 1442
1289package cf::player; 1443package cf::player;
1290 1444
1333 1487
1334sub exists($) { 1488sub exists($) {
1335 my ($login) = @_; 1489 my ($login) = @_;
1336 1490
1337 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1339} 1493}
1340 1494
1341sub find($) { 1495sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1497 my $login = $_[0];
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1508
1355 my $f = new_from_file cf::object::thawer path $login 1509 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1510 or return;
1357 1511
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1512 my $pl = cf::player::load_pl $f
1360 or return; 1513 or return;
1514
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1515 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1516 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1364 } 1518 }
1365 } 1519 }
1375 1529
1376 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1377 1531
1378 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1379 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1534
1535 cf::get_slot 0.01;
1380 1536
1381 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1538 cf::cede_to_tick;
1383} 1539}
1384 1540
1416 my ($pl) = @_; 1572 my ($pl) = @_;
1417 1573
1418 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1419 1575
1420 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1421 $pl->password ("*"); # this should lock out the player until we nuked the dir 1577 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1422 1578
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1424 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1426 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1427 1585
1428 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1468 1626
1469 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1470 my $path = path $login; 1628 my $path = path $login;
1471 1629
1472 # a .pst is a dead give-away for a valid player 1630 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1636 }
1478 1637
1509 } 1668 }
1510 1669
1511 \@paths 1670 \@paths
1512} 1671}
1513 1672
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1674
1516Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564 1676
1565=item $player->ext_reply ($msgid, @msg) 1677=item $player->ext_reply ($msgid, @msg)
1566 1678
1567Sends an ext reply to the player. 1679Sends an ext reply to the player.
1568 1680
1635our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1637 1749
1638sub generate_random_map { 1750sub generate_random_map {
1639 my ($self, $rmp) = @_; 1751 my ($self, $rmp) = @_;
1752
1753 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754
1640 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1641 $self->_create_random_map ( 1756 $self->_create_random_map (
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1766 1881
1767# the temporary/swap location 1882# the temporary/swap location
1768sub save_path { 1883sub save_path {
1769 my ($self) = @_; 1884 my ($self) = @_;
1770 1885
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1773} 1888}
1774 1889
1775# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1776sub uniq_path { 1891sub uniq_path {
1777 my ($self) = @_; 1892 my ($self) = @_;
1778 1893
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1781}
1782
1783# and all this just because we cannot iterate over
1784# all maps in C++...
1785sub change_all_map_light {
1786 my ($change) = @_;
1787
1788 $_->change_map_light ($change)
1789 for grep $_->outdoor, values %cf::MAP;
1790} 1896}
1791 1897
1792sub decay_objects { 1898sub decay_objects {
1793 my ($self) = @_; 1899 my ($self) = @_;
1794 1900
1878sub find { 1984sub find {
1879 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1880 1986
1881 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1882 1988
1883 cf::lock_wait "map_data:$path";#d#remove 1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1885 1991
1886 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1890 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1891 or return; 1994 or return;
1892 1995
1893 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1894 1997
1896 or return; 1999 or return;
1897 2000
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
1901 undef $guard1; 2005 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2006 $map->reset;
1904 return find $path; 2007 return find $path;
1905 } 2008 }
1906 2009
1907 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2037 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2038 $f->skip_block;
1936 $self->_load_objects ($f) 2039 $self->_load_objects ($f)
1937 or return; 2040 or return;
1938 2041
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1940 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1941 2044
1942 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2046 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2047 unless (aio_stat $uniq) {
1962 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2066 $self->decay_objects;
1964 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1965 $self->update_buttons; 2068 $self->update_buttons;
1966 cf::cede_to_tick; 2069 cf::cede_to_tick;
1967 $self->set_darkness_map;
1968 cf::cede_to_tick;
1969 $self->activate; 2070 $self->activate;
1970 } 2071 }
1971 2072
1972 $self->{last_save} = $cf::RUNTIME; 2073 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2074 $self->last_access ($cf::RUNTIME);
1974 2075
1975 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1976 } 2077 }
1977 2078
1978 $self->post_load; 2079 $self->post_load;
1979} 2080}
1980 2081
2038 my ($path, $origin, $load) = @_; 2139 my ($path, $origin, $load) = @_;
2039 2140
2040 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
2041 2142
2042 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2044 } 2145 }
2045 2146
2046 $MAP_PREFETCH{$path} |= $load; 2147 $MAP_PREFETCH{$path} |= $load;
2047 2148
2048 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
2049 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2154 if (my $map = find $k) {
2052 $map->load if $v; 2155 $map->load if $v;
2053 } 2156 }
2079 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2080 2183
2081 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
2082 2185
2083 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
2085 }; 2189 };
2190
2191 cf::get_slot 0.02;
2086 2192
2087 if ($uniq) { 2193 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2196 } else {
2099 $self->save; 2205 $self->save;
2100 2206
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2208
2103 return if $self->players; 2209 return if $self->players;
2104 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
2105 return if $self->{deny_save}; 2211 return if $self->{deny_save};
2106 2212
2107 $self->in_memory (cf::MAP_SWAPPED); 2213 $self->in_memory (cf::MAP_SWAPPED);
2108 2214
2109 $self->deactivate; 2215 $self->deactivate;
2134 2240
2135 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136 2242
2137 return if $self->players; 2243 return if $self->players;
2138 2244
2139 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
2140 2246
2141 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2142 2248
2143 # need to save uniques path 2249 # need to save uniques path
2144 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2227 2333
2228sub unique_maps() { 2334sub unique_maps() {
2229 [ 2335 [
2230 map { 2336 map {
2231 utf8::decode $_; 2337 utf8::decode $_;
2232 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2233 ? normalise $_ 2341 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2343 ]
2237} 2344}
2238 2345
2239package cf;
2240
2241=back 2346=back
2242 2347
2243=head3 cf::object 2348=head3 cf::object
2244 2349
2245=cut 2350=cut
2248 2353
2249=over 4 2354=over 4
2250 2355
2251=item $ob->inv_recursive 2356=item $ob->inv_recursive
2252 2357
2253Returns the inventory of the object _and_ their inventories, recursively. 2358Returns the inventory of the object I<and> their inventories, recursively,
2359but I<not> the object itself.
2254 2360
2255=cut 2361=cut
2256 2362
2257sub inv_recursive_; 2363sub inv_recursive_;
2258sub inv_recursive_ { 2364sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2369 inv_recursive_ inv $_[0]
2264} 2370}
2265 2371
2266=item $ref = $ob->ref 2372=item $ref = $ob->ref
2267 2373
2268creates and returns a persistent reference to an objetc that can be stored as a string. 2374Creates and returns a persistent reference to an object that can be stored as a string.
2269 2375
2270=item $ob = cf::object::deref ($refstring) 2376=item $ob = cf::object::deref ($refstring)
2271 2377
2272returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2378returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2273even if the object actually exists. May block. 2379even if the object actually exists. May block.
2275=cut 2381=cut
2276 2382
2277sub deref { 2383sub deref {
2278 my ($ref) = @_; 2384 my ($ref) = @_;
2279 2385
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2386 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2387 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2388 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2389 or return;
2287 $pl->ob->uuid eq $uuid 2390 $pl->ob->uuid eq $uuid
2288 or return; 2391 or return;
2308can be C<undef>. Does the right thing when the player is currently in a 2411can be C<undef>. Does the right thing when the player is currently in a
2309dialogue with the given NPC character. 2412dialogue with the given NPC character.
2310 2413
2311=cut 2414=cut
2312 2415
2416our $SAY_CHANNEL = {
2417 id => "say",
2418 title => "Map",
2419 reply => "say ",
2420 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2421};
2422
2423our $CHAT_CHANNEL = {
2424 id => "chat",
2425 title => "Chat",
2426 reply => "chat ",
2427 tooltip => "Player chat and shouts, global to the server.",
2428};
2429
2313# rough implementation of a future "reply" method that works 2430# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2431# with dialog boxes.
2315#TODO: the first argument must go, split into a $npc->reply_to ( method 2432#TODO: the first argument must go, split into a $npc->reply_to ( method
2316sub cf::object::player::reply($$$;$) { 2433sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2434 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2445 my $dialog = $pl->{npc_dialog};
2329 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2446 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2330 2447
2331 } else { 2448 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2449 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2450 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2451 }
2335 } 2452 }
2336} 2453}
2337 2454
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2455=item $object->send_msg ($channel, $msg, $color, [extra...])
2363 2480
2364=item $player_object->enter_link 2481=item $player_object->enter_link
2365 2482
2366Freezes the player and moves him/her to a special map (C<{link}>). 2483Freezes the player and moves him/her to a special map (C<{link}>).
2367 2484
2368The player should be reasonably safe there for short amounts of time. You 2485The player should be reasonably safe there for short amounts of time (e.g.
2369I<MUST> call C<leave_link> as soon as possible, though. 2486for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487though, as the palyer cannot control the character while it is on the link
2488map.
2370 2489
2371Will never block. 2490Will never block.
2372 2491
2373=item $player_object->leave_link ($map, $x, $y) 2492=item $player_object->leave_link ($map, $x, $y)
2374 2493
2432 2551
2433 $map->load; 2552 $map->load;
2434 $map->load_neighbours; 2553 $map->load_neighbours;
2435 2554
2436 return unless $self->contr->active; 2555 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2556
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2557 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2558 $self->enter_map ($map, $x, $y);
2559
2560 # only activate afterwards, to support waiting in hooks
2561 $self->activate_recursive;
2441} 2562}
2442 2563
2443=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2564=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2444 2565
2445Moves the player to the given map-path and coordinates by first freezing 2566Moves the player to the given map-path and coordinates by first freezing
2446her, loading and preparing them map, calling the provided $check callback 2567her, loading and preparing them map, calling the provided $check callback
2447that has to return the map if sucecssful, and then unfreezes the player on 2568that has to return the map if sucecssful, and then unfreezes the player on
2448the new (success) or old (failed) map position. In either case, $done will 2569the new (success) or old (failed) map position. In either case, $done will
2449be called at the end of this process. 2570be called at the end of this process.
2450 2571
2572Note that $check will be called with a potentially non-loaded map, so if
2573it needs a loaded map it has to call C<< ->load >>.
2574
2451=cut 2575=cut
2452 2576
2453our $GOTOGEN; 2577our $GOTOGEN;
2454 2578
2455sub cf::object::player::goto { 2579sub cf::object::player::goto {
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2583 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2584
2461 $self->enter_link; 2585 $self->enter_link;
2462 2586
2463 (async { 2587 (async {
2588 $Coro::current->{desc} = "player::goto $path $x $y";
2589
2464 # *tag paths override both path and x|y 2590 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2591 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2592 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2593 my $ob = $obs[rand @obs];
2468 2594
2531} 2657}
2532 2658
2533sub prepare_random_map { 2659sub prepare_random_map {
2534 my ($exit) = @_; 2660 my ($exit) = @_;
2535 2661
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2662 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2663 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2664 # that depends on the exit object
2541 2665
2542 my $rmp = parse_random_map_params $exit->msg; 2666 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2668 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2669 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2670 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2671 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2672 $rmp->{origin_y} = $exit->y;
2673
2674 $exit->map->touch;
2549 } 2675 }
2550 2676
2551 $rmp->{random_seed} ||= $exit->random_seed; 2677 $rmp->{random_seed} ||= $exit->random_seed;
2552 2678
2553 my $data = cf::to_json $rmp; 2679 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2680 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2681 my $meta = "$RANDOMDIR/$md5.meta";
2556 2682
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2683 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2684 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2685 undef $fh;
2560 aio_rename "$meta~", $meta; 2686 aio_rename "$meta~", $meta;
2561 2687
2688 my $slaying = "?random/$md5";
2689
2690 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2691 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2692 $exit->msg (undef);
2693 }
2564 } 2694 }
2565} 2695}
2566 2696
2567sub cf::object::player::enter_exit { 2697sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2698 my ($self, $exit) = @_;
2569 2699
2570 return unless $self->type == cf::PLAYER; 2700 return unless $self->type == cf::PLAYER;
2571 2701
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2702 $self->enter_link;
2584 2703
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2704 (async {
2590 $self->deactivate_recursive; # just to be sure 2705 $Coro::current->{desc} = "enter_exit";
2706
2591 unless (eval { 2707 unless (eval {
2708 $self->deactivate_recursive; # just to be sure
2709
2710 # random map handling
2711 {
2712 my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714 prepare_random_map $exit
2715 if $exit->slaying eq "/!";
2716 }
2717
2718 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2719 my $x = $exit->stats->hp;
2720 my $y = $exit->stats->sp;
2721
2592 $self->goto ($slaying, $hp, $sp); 2722 $self->goto ($map, $x, $y);
2593 2723
2724 # if exit is damned, update players death & WoR home-position
2725 $self->contr->savebed ($map, $x, $y)
2726 if $exit->flag (cf::FLAG_DAMNED);
2727
2594 1; 2728 1
2595 }) { 2729 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 2730 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "I'll try to bring you back to the map you were before. " 2731 . "I'll try to bring you back to the map you were before. "
2598 . "Please report this to the dungeon master!", 2732 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 2733 cf::NDI_UNIQUE | cf::NDI_RED);
2600 2734
2601 warn "ERROR in enter_exit: $@"; 2735 warn "ERROR in enter_exit: $@";
2629the message, with C<log> being the default. If C<$color> is negative, suppress 2763the message, with C<log> being the default. If C<$color> is negative, suppress
2630the message unless the client supports the msg packet. 2764the message unless the client supports the msg packet.
2631 2765
2632=cut 2766=cut
2633 2767
2768# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 2769our %CHANNEL = (
2770 "c/motd" => {
2771 id => "infobox",
2772 title => "MOTD",
2773 reply => undef,
2774 tooltip => "The message of the day",
2775 },
2635 "c/identify" => { 2776 "c/identify" => {
2636 id => "identify", 2777 id => "infobox",
2637 title => "Identify", 2778 title => "Identify",
2638 reply => undef, 2779 reply => undef,
2639 tooltip => "Items recently identified", 2780 tooltip => "Items recently identified",
2640 }, 2781 },
2641 "c/examine" => { 2782 "c/examine" => {
2642 id => "examine", 2783 id => "infobox",
2643 title => "Examine", 2784 title => "Examine",
2644 reply => undef, 2785 reply => undef,
2645 tooltip => "Signs and other items you examined", 2786 tooltip => "Signs and other items you examined",
2646 }, 2787 },
2788 "c/shopinfo" => {
2789 id => "infobox",
2790 title => "Shop Info",
2791 reply => undef,
2792 tooltip => "What your bargaining skill tells you about the shop",
2793 },
2794 "c/book" => {
2795 id => "infobox",
2796 title => "Book",
2797 reply => undef,
2798 tooltip => "The contents of a note or book",
2799 },
2800 "c/lookat" => {
2801 id => "infobox",
2802 title => "Look",
2803 reply => undef,
2804 tooltip => "What you saw there",
2805 },
2806 "c/who" => {
2807 id => "infobox",
2808 title => "Players",
2809 reply => undef,
2810 tooltip => "Shows players who are currently online",
2811 },
2812 "c/body" => {
2813 id => "infobox",
2814 title => "Body Parts",
2815 reply => undef,
2816 tooltip => "Shows which body parts you posess and are available",
2817 },
2818 "c/statistics" => {
2819 id => "infobox",
2820 title => "Statistics",
2821 reply => undef,
2822 tooltip => "Shows your primary statistics",
2823 },
2824 "c/skills" => {
2825 id => "infobox",
2826 title => "Skills",
2827 reply => undef,
2828 tooltip => "Shows your experience per skill and item power",
2829 },
2830 "c/shopitems" => {
2831 id => "infobox",
2832 title => "Shop Items",
2833 reply => undef,
2834 tooltip => "Shows the items currently for sale in this shop",
2835 },
2836 "c/resistances" => {
2837 id => "infobox",
2838 title => "Resistances",
2839 reply => undef,
2840 tooltip => "Shows your resistances",
2841 },
2842 "c/pets" => {
2843 id => "infobox",
2844 title => "Pets",
2845 reply => undef,
2846 tooltip => "Shows information abotu your pets/a specific pet",
2847 },
2848 "c/perceiveself" => {
2849 id => "infobox",
2850 title => "Perceive Self",
2851 reply => undef,
2852 tooltip => "You gained detailed knowledge about yourself",
2853 },
2854 "c/uptime" => {
2855 id => "infobox",
2856 title => "Uptime",
2857 reply => undef,
2858 tooltip => "How long the server has been running since last restart",
2859 },
2860 "c/mapinfo" => {
2861 id => "infobox",
2862 title => "Map Info",
2863 reply => undef,
2864 tooltip => "Information related to the maps",
2865 },
2866 "c/party" => {
2867 id => "party",
2868 title => "Party",
2869 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party",
2871 },
2872 "c/death" => {
2873 id => "death",
2874 title => "Death",
2875 reply => undef,
2876 tooltip => "Reason for and more info about your most recent death",
2877 },
2878 "c/say" => $SAY_CHANNEL,
2879 "c/chat" => $CHAT_CHANNEL,
2647); 2880);
2648 2881
2649sub cf::client::send_msg { 2882sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 2883 my ($self, $channel, $msg, $color, @extra) = @_;
2651 2884
2652 $msg = $self->pl->expand_cfpod ($msg); 2885 $msg = $self->pl->expand_cfpod ($msg)
2886 unless $color & cf::NDI_VERBATIM;
2653 2887
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 2888 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 2889
2656 # check predefined channels, for the benefit of C 2890 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2891 if ($CHANNEL{$channel}) {
2892 $channel = $CHANNEL{$channel};
2658 2893
2894 $self->ext_msg (channel_info => $channel);
2895 $channel = $channel->{id};
2896
2659 if (ref $channel) { 2897 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 2898 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 2899 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 2900 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 2901 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 2902 }
2666 2903
2667 $channel = $channel->{id}; 2904 $channel = $channel->{id};
2668 } 2905 }
2669 2906
2670 return unless @extra || length $msg; 2907 return unless @extra || length $msg;
2671 2908
2672 if ($self->can_msg) {
2673 # default colour, mask it out 2909 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2910 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 2911 if $color & cf::NDI_DEF;
2676 2912
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2913 my $pkt = "msg "
2914 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2915 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 2916 );
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690 2917
2691 $color &= cf::NDI_COLOR_MASK; 2918 # try lzf for large packets
2919 $pkt = "lzf " . Compress::LZF::compress $pkt
2920 if 1024 <= length $pkt and $self->{can_lzf};
2692 2921
2693 utf8::encode $msg; 2922 # split very large packets
2694 2923 if (8192 < length $pkt and $self->{can_lzf}) {
2695 if (0 && $msg =~ /\[/) { 2924 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2696 # COMMAND/INFO 2925 $pkt = "frag";
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 } 2926 }
2927
2928 $self->send_packet ($pkt);
2704} 2929}
2705 2930
2706=item $client->ext_msg ($type, @msg) 2931=item $client->ext_msg ($type, @msg)
2707 2932
2708Sends an ext event to the client. 2933Sends an ext event to the client.
2881=pod 3106=pod
2882 3107
2883The following functions and methods are available within a safe environment: 3108The following functions and methods are available within a safe environment:
2884 3109
2885 cf::object 3110 cf::object
2886 contr pay_amount pay_player map x y force_find force_add 3111 contr pay_amount pay_player map x y force_find force_add destroy
2887 insert remove name archname title slaying race decrease_ob_nr 3112 insert remove name archname title slaying race decrease split
3113 value
2888 3114
2889 cf::object::player 3115 cf::object::player
2890 player 3116 player
2891 3117
2892 cf::player 3118 cf::player
2897 3123
2898=cut 3124=cut
2899 3125
2900for ( 3126for (
2901 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3127 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2902 insert remove inv name archname title slaying race 3128 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3129 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3130 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3131 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3132 ["cf::map" => qw(trigger)],
2907) { 3133) {
2908 no strict 'refs'; 3134 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3135 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3136 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2927 my ($code, %vars) = @_; 3153 my ($code, %vars) = @_;
2928 3154
2929 my $qcode = $code; 3155 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3156 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3157 $qcode =~ s/\n/\\n/g;
3158
3159 %vars = (_dummy => 0) unless %vars;
2932 3160
2933 local $_; 3161 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars; 3162 local @safe::cf::_safe_eval_args = values %vars;
2935 3163
2936 my $eval = 3164 my $eval =
3013 { 3241 {
3014 my $faces = $facedata->{faceinfo}; 3242 my $faces = $facedata->{faceinfo};
3015 3243
3016 while (my ($face, $info) = each %$faces) { 3244 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3245 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3246
3018 cf::face::set_visibility $idx, $info->{visibility}; 3247 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3248 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3249 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3250 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3022 3251
3023 cf::cede_to_tick; 3252 cf::cede_to_tick;
3024 } 3253 }
3025 3254
3026 while (my ($face, $info) = each %$faces) { 3255 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3256 next unless $info->{smooth};
3257
3028 my $idx = cf::face::find $face 3258 my $idx = cf::face::find $face
3029 or next; 3259 or next;
3260
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3261 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3262 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3263 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3264 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3265 warn "smooth face '$info->{smooth}' not found for face '$face'";
3052 { 3283 {
3053 # TODO: for gcfclient pleasure, we should give resources 3284 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index. 3285 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3286 my $res = $facedata->{resource};
3056 3287
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3288 while (my ($name, $info) = each %$res) {
3289 if (defined $info->{type}) {
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3290 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data; 3291 my $data;
3062 3292
3063 if ($info->{type} & 1) { 3293 if ($info->{type} & 1) {
3064 # prepend meta info 3294 # prepend meta info
3065 3295
3066 my $meta = $enc->encode ({ 3296 my $meta = $enc->encode ({
3067 name => $name, 3297 name => $name,
3068 %{ $info->{meta} || {} }, 3298 %{ $info->{meta} || {} },
3069 }); 3299 });
3070 3300
3071 $data = pack "(w/a*)*", $meta, $info->{data}; 3301 $data = pack "(w/a*)*", $meta, $info->{data};
3302 } else {
3303 $data = $info->{data};
3304 }
3305
3306 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3307 cf::face::set_type $idx, $info->{type};
3072 } else { 3308 } else {
3073 $data = $info->{data}; 3309 $RESOURCE{$name} = $info;
3074 } 3310 }
3075 3311
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3312 cf::cede_to_tick;
3080 } 3313 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3314 }
3315
3316 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3317
3101 1 3318 1
3102} 3319}
3320
3321cf::global->attach (on_resource_update => sub {
3322 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3323 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3324
3325 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3326 my $sound = $soundconf->{compat}[$_]
3327 or next;
3328
3329 my $face = cf::face::find "sound/$sound->[1]";
3330 cf::sound::set $sound->[0] => $face;
3331 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3332 }
3333
3334 while (my ($k, $v) = each %{$soundconf->{event}}) {
3335 my $face = cf::face::find "sound/$v";
3336 cf::sound::set $k => $face;
3337 }
3338 }
3339});
3103 3340
3104register_exticmd fx_want => sub { 3341register_exticmd fx_want => sub {
3105 my ($ns, $want) = @_; 3342 my ($ns, $want) = @_;
3106 3343
3107 while (my ($k, $v) = each %$want) { 3344 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3345 $ns->fx_want ($k, $v);
3109 } 3346 }
3110}; 3347};
3348
3349sub load_resource_file($) {
3350 my $guard = lock_acquire "load_resource_file";
3351
3352 my $status = load_resource_file_ $_[0];
3353 get_slot 0.1, 100;
3354 cf::arch::commit_load;
3355
3356 $status
3357}
3111 3358
3112sub reload_regions { 3359sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3360 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3361 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3362 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3376}
3130 3377
3131sub reload_archetypes { 3378sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3379 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3380 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3381}
3140 3382
3141sub reload_treasures { 3383sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3384 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3385 or die "unable to load treasurelists\n";
3144} 3386}
3145 3387
3146sub reload_resources { 3388sub reload_resources {
3147 warn "reloading resource files...\n"; 3389 warn "reloading resource files...\n";
3148 3390
3391 reload_facedata;
3392 reload_archetypes;
3149 reload_regions; 3393 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3394 reload_treasures;
3154 3395
3155 warn "finished reloading resource files\n"; 3396 warn "finished reloading resource files\n";
3156} 3397}
3157 3398
3158sub init {
3159 reload_resources;
3160}
3161
3162sub reload_config { 3399sub reload_config {
3400 warn "reloading config file...\n";
3401
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3402 open my $fh, "<:utf8", "$CONFDIR/config"
3164 or return; 3403 or return;
3165 3404
3166 local $/; 3405 local $/;
3167 *CFG = YAML::Syck::Load <$fh>; 3406 *CFG = YAML::XS::Load scalar <$fh>;
3168 3407
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3408 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3170 3409
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3410 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3411 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3176 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3415 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3177 and die "WARNING: m(un)lockall failed: $!\n"; 3416 and die "WARNING: m(un)lockall failed: $!\n";
3178 }; 3417 };
3179 warn $@ if $@; 3418 warn $@ if $@;
3180 } 3419 }
3420
3421 warn "finished reloading resource files\n";
3422}
3423
3424sub pidfile() {
3425 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3426 or die "$PIDFILE: $!";
3427 flock $fh, &Fcntl::LOCK_EX
3428 or die "$PIDFILE: flock: $!";
3429 $fh
3430}
3431
3432# make sure only one server instance is running at any one time
3433sub atomic {
3434 my $fh = pidfile;
3435
3436 my $pid = <$fh>;
3437 kill 9, $pid if $pid > 0;
3438
3439 seek $fh, 0, 0;
3440 print $fh $$;
3441}
3442
3443sub main_loop {
3444 warn "EV::loop starting\n";
3445 if (1) {
3446 EV::loop;
3447 }
3448 warn "EV::loop returned\n";
3449 goto &main_loop unless $REALLY_UNLOOP;
3181} 3450}
3182 3451
3183sub main { 3452sub main {
3453 cf::init_globals; # initialise logging
3454
3455 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3456 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3457 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3458 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3459
3460 cf::init_experience;
3461 cf::init_anim;
3462 cf::init_attackmess;
3463 cf::init_dynamic;
3464
3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466
3184 # we must not ever block the main coroutine 3467 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3468 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3469 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3470 (async {
3188 Event::one_event; 3471 $Coro::current->{desc} = "IDLE BUG HANDLER";
3472 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3473 })->prio (Coro::PRIO_MAX);
3190 }; 3474 };
3191 3475
3476 evthread_start IO::AIO::poll_fileno;
3477
3478 cf::sync_job {
3479 reload_resources;
3192 reload_config; 3480 reload_config;
3193 db_init; 3481 db_init;
3482
3483 cf::load_settings;
3484 cf::load_materials;
3485 cf::init_uuid;
3486 cf::init_signals;
3487 cf::init_commands;
3488 cf::init_skills;
3489
3490 cf::init_beforeplay;
3491
3492 atomic;
3493
3194 load_extensions; 3494 load_extensions;
3195 3495
3196 $TICK_WATCHER->start; 3496 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3497
3498 # no (long-running) fork's whatsoever before this point(!)
3499 use POSIX ();
3500 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3501
3502 (pop @POST_INIT)->(0) while @POST_INIT;
3503 };
3504
3505 main_loop;
3198} 3506}
3199 3507
3200############################################################################# 3508#############################################################################
3201# initialisation and cleanup 3509# initialisation and cleanup
3202 3510
3203# install some emergency cleanup handlers 3511# install some emergency cleanup handlers
3204BEGIN { 3512BEGIN {
3513 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3514 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3515 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3516 cf::cleanup "SIG$signal";
3213 },
3214 ); 3517 };
3215 } 3518 }
3216} 3519}
3217 3520
3218sub write_runtime { 3521sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime";
3220
3221 # first touch the runtime file to show we are still running: 3522 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3523 # the fsync below can take a very very long time.
3223 3524
3224 IO::AIO::aio_utime $runtime, undef, undef; 3525 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3526
3226 my $guard = cf::lock_acquire "write_runtime"; 3527 my $guard = cf::lock_acquire "write_runtime";
3227 3528
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3529 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3229 or return; 3530 or return;
3230 3531
3231 my $value = $cf::RUNTIME + 90 + 10; 3532 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3533 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3534 # 60 allows for the watchdog to kill the server.
3243 aio_utime $fh, undef, undef; 3544 aio_utime $fh, undef, undef;
3244 3545
3245 close $fh 3546 close $fh
3246 or return; 3547 or return;
3247 3548
3248 aio_rename "$runtime~", $runtime 3549 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3550 and return;
3250 3551
3251 warn "runtime file written.\n"; 3552 warn "runtime file written.\n";
3252 3553
3253 1 3554 1
3555}
3556
3557our $uuid_lock;
3558our $uuid_skip;
3559
3560sub write_uuid_sync($) {
3561 $uuid_skip ||= $_[0];
3562
3563 return if $uuid_lock;
3564 local $uuid_lock = 1;
3565
3566 my $uuid = "$LOCALDIR/uuid";
3567
3568 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3569 or return;
3570
3571 my $value = uuid_seq uuid_cur;
3572
3573 unless ($value) {
3574 warn "cowardly refusing to write zero uuid value!\n";
3575 return;
3576 }
3577
3578 my $value = uuid_str $value + $uuid_skip;
3579 $uuid_skip = 0;
3580
3581 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3582 and return;
3583
3584 # always fsync - this file is important
3585 aio_fsync $fh
3586 and return;
3587
3588 close $fh
3589 or return;
3590
3591 aio_rename "$uuid~", $uuid
3592 and return;
3593
3594 warn "uuid file written ($value).\n";
3595
3596 1
3597
3598}
3599
3600sub write_uuid($$) {
3601 my ($skip, $sync) = @_;
3602
3603 $sync ? write_uuid_sync $skip
3604 : async { write_uuid_sync $skip };
3254} 3605}
3255 3606
3256sub emergency_save() { 3607sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3608 my $freeze_guard = cf::freeze_mainloop;
3258 3609
3259 warn "enter emergency perl save\n"; 3610 warn "emergency_perl_save: enter\n";
3260 3611
3261 cf::sync_job { 3612 cf::sync_job {
3613 # this is a trade-off: we want to be very quick here, so
3614 # save all maps without fsync, and later call a global sync
3615 # (which in turn might be very very slow)
3616 local $USE_FSYNC = 0;
3617
3262 # use a peculiar iteration method to avoid tripping on perl 3618 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3619 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3620 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3621 warn "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3622 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3623 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3624 $pl->valid or next;
3625 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3626 $pl->save;
3270 } 3627 }
3271 warn "end emergency player save\n"; 3628 warn "emergency_perl_save: end player save\n";
3272 3629
3273 warn "begin emergency map save\n"; 3630 warn "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3631 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3632 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3633 $map->valid or next;
3277 $map->save; 3634 $map->save;
3278 } 3635 }
3279 warn "end emergency map save\n"; 3636 warn "emergency_perl_save: end map save\n";
3280 3637
3281 warn "begin emergency database checkpoint\n"; 3638 warn "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3639 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3640 warn "emergency_perl_save: end database checkpoint\n";
3641
3642 warn "emergency_perl_save: begin write uuid\n";
3643 write_uuid_sync 1;
3644 warn "emergency_perl_save: end write uuid\n";
3284 }; 3645 };
3285 3646
3647 warn "emergency_perl_save: starting sync()\n";
3648 IO::AIO::aio_sync sub {
3649 warn "emergency_perl_save: finished sync()\n";
3650 };
3651
3286 warn "leave emergency perl save\n"; 3652 warn "emergency_perl_save: leave\n";
3287} 3653}
3288 3654
3289sub post_cleanup { 3655sub post_cleanup {
3290 my ($make_core) = @_; 3656 my ($make_core) = @_;
3291 3657
3292 warn Carp::longmess "post_cleanup backtrace" 3658 warn Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3659 if $make_core;
3660
3661 my $fh = pidfile;
3662 unlink $PIDFILE if <$fh> == $$;
3663}
3664
3665# a safer delete_package, copied from Symbol
3666sub clear_package($) {
3667 my $pkg = shift;
3668
3669 # expand to full symbol table name if needed
3670 unless ($pkg =~ /^main::.*::$/) {
3671 $pkg = "main$pkg" if $pkg =~ /^::/;
3672 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3673 $pkg .= '::' unless $pkg =~ /::$/;
3674 }
3675
3676 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3677 my $stem_symtab = *{$stem}{HASH};
3678
3679 defined $stem_symtab and exists $stem_symtab->{$leaf}
3680 or return;
3681
3682 # clear all symbols
3683 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3684 for my $name (keys %$leaf_symtab) {
3685 _gv_clear *{"$pkg$name"};
3686# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3687 }
3688 warn "cleared package $pkg\n";#d#
3294} 3689}
3295 3690
3296sub do_reload_perl() { 3691sub do_reload_perl() {
3297 # can/must only be called in main 3692 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 3693 if ($Coro::current != $Coro::main) {
3299 warn "can only reload from main coroutine"; 3694 warn "can only reload from main coroutine";
3300 return; 3695 return;
3301 } 3696 }
3302 3697
3698 return if $RELOAD++;
3699
3700 my $t1 = EV::time;
3701
3702 while ($RELOAD) {
3303 warn "reloading..."; 3703 warn "reloading...";
3304 3704
3305 warn "entering sync_job"; 3705 warn "entering sync_job";
3306 3706
3307 cf::sync_job { 3707 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark 3708 cf::write_runtime_sync; # external watchdog should not bark
3309 cf::emergency_save; 3709 cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark 3710 cf::write_runtime_sync; # external watchdog should not bark
3311 3711
3312 warn "syncing database to disk"; 3712 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV; 3713 BDB::db_env_txn_checkpoint $DB_ENV;
3314 3714
3315 # if anything goes wrong in here, we should simply crash as we already saved 3715 # if anything goes wrong in here, we should simply crash as we already saved
3316 3716
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests"; 3717 warn "flushing outstanding aio requests";
3323 for (;;) {
3324 BDB::flush;
3325 IO::AIO::flush;
3326 Coro::cede;
3327 last unless IO::AIO::nreqs || BDB::nreqs; 3718 while (IO::AIO::nreqs || BDB::nreqs) {
3328 warn "iterate..."; 3719 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = ();
3336
3337 warn "removing commands";
3338 %COMMAND = ();
3339
3340 warn "removing ext/exti commands";
3341 %EXTCMD = ();
3342 %EXTICMD = ();
3343
3344 warn "unloading/nuking all extensions";
3345 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg";
3347
3348 if (my $cb = $pkg->can ("unload")) {
3349 eval {
3350 $cb->($pkg);
3351 1
3352 } or warn "$pkg unloaded, but with errors: $@";
3353 } 3720 }
3354 3721
3355 warn "... nuking $pkg"; 3722 warn "cancelling all extension coros";
3356 Symbol::delete_package $pkg; 3723 $_->cancel for values %EXT_CORO;
3357 } 3724 %EXT_CORO = ();
3358 3725
3359 warn "unloading all perl modules loaded from $LIBDIR"; 3726 warn "removing commands";
3360 while (my ($k, $v) = each %INC) { 3727 %COMMAND = ();
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 3728
3729 warn "removing ext/exti commands";
3730 %EXTCMD = ();
3731 %EXTICMD = ();
3732
3733 warn "unloading/nuking all extensions";
3734 for my $pkg (@EXTS) {
3363 warn "... unloading $k"; 3735 warn "... unloading $pkg";
3364 delete $INC{$k};
3365 3736
3366 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g;
3368
3369 if (my $cb = $k->can ("unload_module")) { 3737 if (my $cb = $pkg->can ("unload")) {
3738 eval {
3370 $cb->(); 3739 $cb->($pkg);
3740 1
3741 } or warn "$pkg unloaded, but with errors: $@";
3742 }
3743
3744 warn "... clearing $pkg";
3745 clear_package $pkg;
3371 } 3746 }
3372 3747
3373 Symbol::delete_package $k; 3748 warn "unloading all perl modules loaded from $LIBDIR";
3749 while (my ($k, $v) = each %INC) {
3750 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3751
3752 warn "... unloading $k";
3753 delete $INC{$k};
3754
3755 $k =~ s/\.pm$//;
3756 $k =~ s/\//::/g;
3757
3758 if (my $cb = $k->can ("unload_module")) {
3759 $cb->();
3760 }
3761
3762 clear_package $k;
3374 } 3763 }
3375 3764
3376 warn "getting rid of safe::, as good as possible"; 3765 warn "getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 3766 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3767 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 3768
3380 warn "unloading cf.pm \"a bit\""; 3769 warn "unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 3770 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 3771 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 3772
3384 # don't, removes xs symbols, too, 3773 # don't, removes xs symbols, too,
3385 # and global variables created in xs 3774 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 3775 #clear_package __PACKAGE__;
3387 3776
3388 warn "unload completed, starting to reload now"; 3777 warn "unload completed, starting to reload now";
3389 3778
3390 warn "reloading cf.pm"; 3779 warn "reloading cf.pm";
3391 require cf; 3780 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3781 cf::_connect_to_perl_1;
3393 3782
3394 warn "loading config and database again"; 3783 warn "loading config and database again";
3395 cf::reload_config; 3784 cf::reload_config;
3396 3785
3397 warn "loading extensions"; 3786 warn "loading extensions";
3398 cf::load_extensions; 3787 cf::load_extensions;
3399 3788
3789 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 3790 warn "reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 3791 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 3792 warn "reattaching attachments to maps";
3403 reattach $_ for values %MAP; 3793 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 3794 warn "reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 3795 reattach $_ for values %PLAYER;
3796 }
3406 3797
3798 warn "running post_init jobs";
3799 (pop @POST_INIT)->(1) while @POST_INIT;
3800
3407 warn "leaving sync_job"; 3801 warn "leaving sync_job";
3408 3802
3409 1 3803 1
3410 } or do { 3804 } or do {
3411 warn $@; 3805 warn $@;
3412 warn "error while reloading, exiting."; 3806 cf::cleanup "error while reloading, exiting.";
3413 exit 1;
3414 }; 3807 };
3415 3808
3416 warn "reloaded"; 3809 warn "reloaded";
3810 --$RELOAD;
3811 }
3812
3813 $t1 = EV::time - $t1;
3814 warn "reload completed in ${t1}s\n";
3417}; 3815};
3418 3816
3419our $RELOAD_WATCHER; # used only during reload 3817our $RELOAD_WATCHER; # used only during reload
3420 3818
3421sub reload_perl() { 3819sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 3820 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 3821 # coro crashes during coro_state_free->destroy here.
3424 3822
3425 $RELOAD_WATCHER ||= Event->timer ( 3823 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 3824 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 3825
3428 data => WF_AUTOCANCEL, 3826 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 3827 do_reload_perl;
3431 undef $RELOAD_WATCHER; 3828 undef $RELOAD_WATCHER;
3432 }, 3829 };
3433 ); 3830 };
3434} 3831}
3435 3832
3436register_command "reload" => sub { 3833register_command "reload" => sub {
3437 my ($who, $arg) = @_; 3834 my ($who, $arg) = @_;
3438 3835
3439 if ($who->flag (FLAG_WIZ)) { 3836 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 3837 $who->message ("reloading server.");
3838 async {
3839 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 3840 reload_perl;
3841 };
3442 } 3842 }
3443}; 3843};
3444 3844
3445unshift @INC, $LIBDIR; 3845unshift @INC, $LIBDIR;
3446 3846
3448 3848
3449our @WAIT_FOR_TICK; 3849our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN; 3850our @WAIT_FOR_TICK_BEGIN;
3451 3851
3452sub wait_for_tick { 3852sub wait_for_tick {
3453 return unless $TICK_WATCHER->is_active;
3454 return if $Coro::current == $Coro::main; 3853 return if tick_inhibit || $Coro::current == $Coro::main;
3455 3854
3456 my $signal = new Coro::Signal; 3855 my $signal = new Coro::Signal;
3457 push @WAIT_FOR_TICK, $signal; 3856 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait; 3857 $signal->wait;
3459} 3858}
3460 3859
3461sub wait_for_tick_begin { 3860sub wait_for_tick_begin {
3462 return unless $TICK_WATCHER->is_active;
3463 return if $Coro::current == $Coro::main; 3861 return if tick_inhibit || $Coro::current == $Coro::main;
3464 3862
3465 my $signal = new Coro::Signal; 3863 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 3864 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 3865 $signal->wait;
3468} 3866}
3469 3867
3470$TICK_WATCHER = Event->timer ( 3868sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 3869 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3870 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 3871 unless ++$bug_warning > 10;
3480 return; 3872 return;
3481 } 3873 }
3482 3874
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3875 cf::server_tick; # one server iteration
3486 3876
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3877 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3878 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3879 Coro::async_pool {
3880 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3881 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3882 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3883 };
3884 }
3497 3885
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3886 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 3887 $sig->send;
3500 } 3888 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 3889 while (my $sig = shift @WAIT_FOR_TICK) {
3502 $sig->send; 3890 $sig->send;
3503 } 3891 }
3504 3892
3505 $NOW = Event::time; 3893 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3894 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 3895
3516 _post_tick; 3896 if (0) {
3897 if ($NEXT_TICK) {
3898 my $jitter = $TICK_START - $NEXT_TICK;
3899 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3900 warn "jitter $JITTER\n";#d#
3901 }
3517 }, 3902 }
3518); 3903}
3519 3904
3520{ 3905{
3906 # configure BDB
3907
3521 BDB::min_parallel 8; 3908 BDB::min_parallel 8;
3522 BDB::max_poll_time $TICK * 0.1; 3909 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 3910 $AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 3911
3547 unless ($DB_ENV) { 3912 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 3913 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3914 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 3915 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3916 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3917 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3918 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 3919
3554 cf::sync_job { 3920 cf::sync_job {
3555 eval { 3921 eval {
3565 3931
3566 cf::cleanup "db_env_open(db): $@" if $@; 3932 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 3933 };
3568 } 3934 }
3569 3935
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 3936 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3937 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 3938 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3939 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3940 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 3941 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 3942 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3943 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 3944 };
3600} 3945}
3601 3946
3602{ 3947{
3948 # configure IO::AIO
3949
3603 IO::AIO::min_parallel 8; 3950 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 3951 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 3952 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 3953}
3616 3954
3617my $_log_backtrace; 3955my $_log_backtrace;
3618 3956
3619sub _log_backtrace { 3957sub _log_backtrace {
3622 $msg =~ s/\n//; 3960 $msg =~ s/\n//;
3623 3961
3624 # limit the # of concurrent backtraces 3962 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 3963 if ($_log_backtrace < 2) {
3626 ++$_log_backtrace; 3964 ++$_log_backtrace;
3965 my $perl_bt = Carp::longmess $msg;
3627 async { 3966 async {
3967 $Coro::current->{desc} = "abt $msg";
3968
3628 my @bt = fork_call { 3969 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 3970 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3971 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3972 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 3973 or die "addr2line: $!";
3640 } 3981 }
3641 3982
3642 @funcs 3983 @funcs
3643 }; 3984 };
3644 3985
3645 LOG llevInfo, "[ABT] $msg\n"; 3986 LOG llevInfo, "[ABT] $perl_bt\n";
3987 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 3988 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 3989 --$_log_backtrace;
3648 }; 3990 };
3649 } else { 3991 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 3992 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 3993 LOG llevInfo, "[ABT] [suppressed]\n";
3652 } 3994 }
3653} 3995}
3654 3996
3655# load additional modules 3997# load additional modules
3656use cf::pod; 3998require "cf/$_.pm" for @EXTRA_MODULES;
3999cf::_connect_to_perl_2;
3657 4000
3658END { cf::emergency_save } 4001END { cf::emergency_save }
3659 4002
36601 40031
3661 4004

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines