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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.490 by root, Sat Oct 24 06:16:40 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.61 (); 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;
52use Coro::Util ();
24 53
25use JSON::XS 1.4 (); 54use JSON::XS 2.01 ();
26use BDB (); 55use BDB ();
27use Data::Dumper; 56use Data::Dumper;
28use Digest::MD5; 57use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
63use Digest::MD5 ();
64
65AnyEvent::detect;
34 66
35# configure various modules to our taste 67# configure various modules to our taste
36# 68#
37$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40 77
41$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
42 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 80
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 82
50our %COMMAND = (); 83our %COMMAND = ();
51our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
54our %EXTCMD = (); 87our %EXTCMD = ();
55our %EXTICMD = (); 88our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
58 91
59our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
61 96
62our $CONFDIR = confdir; 97our $CONFDIR = confdir;
63our $DATADIR = datadir; 98our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
73 112
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 115our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
81 117
118our $BDB_DEADLOCK_WATCHER;
119our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 120our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 121our $DB_ENV;
122
123our @EXTRA_MODULES = qw(pod match mapscript);
84 124
85our %CFG; 125our %CFG;
86 126
87our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 128our $RUNTIME;
129our $NOW;
89 130
90our %PLAYER; # all users 131our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 132our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 133our $LINK_MAP; # the special {link} map, which is always available
93 134
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 136our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 137
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
140our $JITTER; # average jitter
99our $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 :)
100 147
101binmode STDOUT; 148binmode STDOUT;
102binmode STDERR; 149binmode STDERR;
103 150
104# read virtual server time, if available 151# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
109} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
110 159
111mkdir $_ 160mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
113 162
114our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
115 164
116sub 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::"} };
117 177
118############################################################################# 178#############################################################################
119 179
120=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
121 181
157 217
158The raw value load value from the last tick. 218The raw value load value from the last tick.
159 219
160=item %cf::CFG 220=item %cf::CFG
161 221
162Configuration for the server, loaded from C</etc/crossfire/config>, or 222Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 223from wherever your confdir points to.
164 224
165=item cf::wait_for_tick, cf::wait_for_tick_begin 225=item cf::wait_for_tick, cf::wait_for_tick_begin
166 226
167These 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
168returns 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
169per 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.
170 230
231=item @cf::INVOKE_RESULTS
232
233This array contains the results of the last C<invoke ()> call. When
234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235that call.
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
171=back 243=back
172 244
173=cut 245=cut
174 246
175BEGIN { 247$Coro::State::WARNHOOK = sub {
176 *CORE::GLOBAL::warn = sub {
177 my $msg = join "", @_; 248 my $msg = join "", @_;
178 249
179 $msg .= "\n" 250 $msg .= "\n"
180 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
181 252
182 $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;
183 254
184 utf8::encode $msg;
185 LOG llevError, $msg; 255 LOG llevError, $msg;
186 }; 256};
187} 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};
188 271
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 282for my $pkg (qw(
200 cf::global cf::attachable 283 cf::global cf::attachable
201 cf::object cf::object::player 284 cf::object cf::object::player
202 cf::client cf::player 285 cf::client cf::player
203 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
204 cf::map cf::party cf::region 288 cf::party cf::region
205)) { 289)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 291}
209 292
210$Event::DIED = sub { 293$EV::DIED = sub {
211 warn "error in event callback: @_"; 294 warn "error in event callback: @_";
212}; 295};
213 296
214############################################################################# 297#############################################################################
215 298
238 $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;
239 $d 322 $d
240 } || "[unable to dump $_[0]: '$@']"; 323 } || "[unable to dump $_[0]: '$@']";
241} 324}
242 325
243=item $ref = cf::from_json $json 326=item $ref = cf::decode_json $json
244 327
245Converts a JSON string into the corresponding perl data structure. 328Converts a JSON string into the corresponding perl data structure.
246 329
247=item $json = cf::to_json $ref 330=item $json = cf::encode_json $ref
248 331
249Converts a perl data structure into its JSON representation. 332Converts a perl data structure into its JSON representation.
250 333
251=cut 334=cut
252 335
253our $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
254 337
255sub to_json ($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
256sub 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}
257 354
258=item cf::lock_wait $string 355=item cf::lock_wait $string
259 356
260Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
261 358
262=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
263 360
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
267returned. 364returned.
268 365
366Locks are *not* recursive, locking from the same coro twice results in a
367deadlocked coro.
368
269Lock names should begin with a unique identifier (for example, cf::map::find 369Lock names should begin with a unique identifier (for example, cf::map::find
270uses map_find and cf::map::load uses map_load). 370uses map_find and cf::map::load uses map_load).
271 371
272=item $locked = cf::lock_active $string 372=item $locked = cf::lock_active $string
273 373
274Return 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.
275 375
276=cut 376=cut
277 377
278our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
279 379
280sub lock_wait($) { 380sub lock_wait($) {
281 my ($key) = @_; 381 $LOCKS->wait ($_[0]);
282
283 # wait for lock, if any
284 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule;
287 }
288} 382}
289 383
290sub lock_acquire($) { 384sub lock_acquire($) {
291 my ($key) = @_; 385 $LOCKS->guard ($_[0])
292
293 # wait, to be sure we are not locked
294 lock_wait $key;
295
296 $LOCK{$key} = [];
297
298 Coro::guard {
299 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} };
301 }
302} 386}
303 387
304sub lock_active($) { 388sub lock_active($) {
305 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
306
307 ! ! $LOCK{$key}
308} 390}
309 391
310sub freeze_mainloop { 392sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
312 394
313 my $guard = Coro::guard { 395 &Guard::guard (\&tick_inhibit_dec);
314 $TICK_WATCHER->start; 396}
397
398=item cf::periodic $interval, $cb
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
411}
412
413=item cf::get_slot $time[, $priority[, $name]]
414
415Allocate $time seconds of blocking CPU time at priority C<$priority>:
416This call blocks and returns only when you have at least C<$time> seconds
417of cpu time till the next tick. The slot is only valid till the next cede.
418
419The optional C<$name> can be used to identify the job to run. It might be
420used for statistical purposes and should identify the same time-class.
421
422Useful for short background jobs.
423
424=cut
425
426our @SLOT_QUEUE;
427our $SLOT_QUEUE;
428
429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
433 my $signal = new Coro::Signal;
434
435 while () {
436 next_job:
437 my $avail = cf::till_tick;
438 if ($avail > 0.01) {
439 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) {
441 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send;
443 Coro::cede;
444 goto next_job;
445 }
446 }
447 }
448
449 if (@SLOT_QUEUE) {
450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
451 push @cf::WAIT_FOR_TICK, $signal;
452 $signal->wait;
453 } else {
454 Coro::schedule;
455 }
315 }; 456 }
316 $TICK_WATCHER->stop; 457};
317 $guard 458
459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
462 my ($time, $pri, $name) = @_;
463
464 $time = $TICK * .6 if $time > $TICK * .6;
465 my $sig = new Coro::Signal;
466
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready;
470 $sig->wait;
318} 471}
319 472
320=item cf::async { BLOCK } 473=item cf::async { BLOCK }
321 474
322Currently the same as Coro::async_pool, meaning you cannot use 475Currently the same as Coro::async_pool, meaning you cannot use
327 480
328BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
329 482
330=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
331 484
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 488acceptable.
336 489
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
343 496
344sub sync_job(&) { 497sub sync_job(&) {
345 my ($job) = @_; 498 my ($job) = @_;
346 499
347 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 501 my $time = EV::time;
349 502
350 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
352 505
353 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 507
355 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
356 509
357 my $busy = 1; 510 my $busy = 1;
358 my @res; 511 my @res;
359 512
360 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 515 @res = eval { $job->() };
362 warn $@ if $@; 516 warn $@ if $@;
363 undef $busy; 517 undef $busy;
364 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
365 519
366 while ($busy) { 520 while ($busy) {
367 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
368 } 525 }
526 }
369 527
370 $time = Event::time - $time; 528 my $time = EV::time - $time;
371 529
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
376 531
377 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
378 } else { 533 } else {
379 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
380 535
405=item fork_call { }, $args 560=item fork_call { }, $args
406 561
407Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
411 566
412=cut 567=cut
413
414sub _store_scalar {
415 open my $fh, ">", \my $buf
416 or die "fork_call: cannot open fh-to-buf in child : $!";
417 Storable::store_fd $_[0], $fh;
418 close $fh;
419
420 $buf
421}
422 568
423sub fork_call(&@) { 569sub fork_call(&@) {
424 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
425 571
426# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
427# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
428 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
429 or die "pipe: $!";
430 575
431 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
432 close $fh2;
433
434 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
435 warn "pst<$res>" unless $res =~ /^pst/;
436 $res = Coro::Storable::thaw $res;
437
438 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
439
440 Carp::confess $$res unless "ARRAY" eq ref $res;
441
442 return wantarray ? @$res : $res->[-1];
443 } else {
444 reset_signals; 577 reset_signals;
445 local $SIG{__WARN__}; 578 &$cb
446 local $SIG{__DIE__}; 579 }, @args;
447 # just in case, this hack effectively disables event
448 # in the child. cleaner and slower would be canceling all watchers,
449 # but this works for the time being.
450 local $Coro::idle;
451 $Coro::current->prio (Coro::PRIO_MAX);
452 580
453 eval { 581 wantarray ? @res : $res[-1]
454 close $fh1; 582}
455 583
456 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
457 585
458 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
459 close $fh2;
460 };
461 587
462 warn $@ if $@; 588our %coin_alias = (
463 _exit 0; 589 "silver" => "silvercoin",
464 } 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
465} 609}
466 610
467=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
468 612
469Returns a single value from the environment database. 613Returns a single value from the environment database.
471=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
472 616
473Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
474data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
475 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
476=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
477 643
478our $DB; 644our $DB;
479 645
480sub db_init { 646sub db_init {
481 unless ($DB) {
482 $DB = BDB::db_create $DB_ENV;
483
484 cf::sync_job { 647 cf::sync_job {
485 eval { 648 $DB ||= db_table "db";
486 $DB->set_flags (BDB::CHKSUM);
487
488 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
489 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
490 cf::cleanup "db_open(db): $!" if $!;
491 };
492 cf::cleanup "db_open(db): $@" if $@;
493 };
494 } 649 };
495} 650}
496 651
497sub db_get($$) { 652sub db_get($$) {
498 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
499 654
549 if (1) { 704 if (1) {
550 $md5 = 705 $md5 =
551 join "\x00", 706 join "\x00",
552 $processversion, 707 $processversion,
553 map { 708 map {
554 Coro::cede; 709 cf::cede_to_tick;
555 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
556 } 0.. $#$src; 711 } 0.. $#$src;
557 712
558 713
559 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
597 752
598############################################################################# 753#############################################################################
599 754
600=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
601 756
602Many 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
603attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
604to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
605 760
606In 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>
607C<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
608Crossfire TRT). 763Deliantra).
609 764
610=over 4 765=over 4
611 766
612=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
613 768
657=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
658 813
659Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
660given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
661 816
662Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
663that 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.
664 819
665These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
666 821
667=over 4 822=over 4
865 "; 1020 ";
866 die if $@; 1021 die if $@;
867} 1022}
868 1023
869our $override; 1024our $override;
870our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1025our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
871 1026
872sub override { 1027sub override {
873 $override = 1; 1028 $override = 1;
874 @invoke_results = (); 1029 @INVOKE_RESULTS = (@_);
875} 1030}
876 1031
877sub do_invoke { 1032sub do_invoke {
878 my $event = shift; 1033 my $event = shift;
879 my $callbacks = shift; 1034 my $callbacks = shift;
880 1035
881 @invoke_results = (); 1036 @INVOKE_RESULTS = ();
882 1037
883 local $override; 1038 local $override;
884 1039
885 for (@$callbacks) { 1040 for (@$callbacks) {
886 eval { &{$_->[1]} }; 1041 eval { &{$_->[1]} };
895 } 1050 }
896 1051
897 0 1052 0
898} 1053}
899 1054
900=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
901 1056
902=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
903 1058
904Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
905 1060
906This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1061This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
907removed in future versions), and there is no public API to access override 1062removed in future versions), and there is no public API to access override
908results (if you must, access C<@cf::invoke_results> directly). 1063results (if you must, access C<@cf::INVOKE_RESULTS> directly).
909 1064
910=back 1065=back
911 1066
912=cut 1067=cut
913 1068
914############################################################################# 1069#############################################################################
915# object support 1070# object support
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#
1105sub _can_merge {
1106 my ($ob1, $ob2) = @_;
1107
1108 ++$SLOW_MERGES;#d#
1109
1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
1112}
916 1113
917sub reattach { 1114sub reattach {
918 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
919 my ($obj) = @_; 1116 my ($obj) = @_;
920 1117
1118 # no longer needed after getting rid of delete_package?
921 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
922 1120
923 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
924 1122
925 @$registry = (); 1123 @$registry = ();
926 1124
941cf::attachable->attach ( 1139cf::attachable->attach (
942 prio => -1000000, 1140 prio => -1000000,
943 on_instantiate => sub { 1141 on_instantiate => sub {
944 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
945 1143
946 $data = from_json $data; 1144 $data = decode_json $data;
947 1145
948 for (@$data) { 1146 for (@$data) {
949 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
950 1148
951 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
967sub object_freezer_save { 1165sub object_freezer_save {
968 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
969 1167
970 sync_job { 1168 sync_job {
971 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
972 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
973 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
974 1173
975 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
976 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
977 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
978 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 }
979 close $fh; 1181 aio_close $fh;
980 1182
981 if (@$objs) { 1183 if (@$objs) {
982 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) {
983 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
984 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
985 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
986 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 }
987 close $fh; 1192 aio_close $fh;
988 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
989 } 1194 }
990 } else { 1195 } else {
991 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
992 } 1197 }
993 1198
994 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
995 } else { 1203 } else {
996 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
997 } 1205 }
998 } else { 1206 } else {
999 aio_unlink $filename; 1207 aio_unlink $filename;
1000 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
1001 } 1209 }
1002 } 1210 };
1003} 1211}
1004 1212
1005sub object_freezer_as_string { 1213sub object_freezer_as_string {
1006 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
1007 1215
1019 or return; 1227 or return;
1020 1228
1021 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1022 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1023 or return; 1231 or return;
1232
1024 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1025 } 1235 }
1026 1236
1237 utf8::decode (my $decname = $filename);
1027 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1028 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1029 return ($data, $av); 1241 ($data, $av)
1030} 1242}
1031 1243
1032=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1033 1245
1034=over 4 1246=over 4
1088 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1089 1301
1090 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1091} 1303}
1092 1304
1305use File::Glob ();
1306
1093cf::player->attach ( 1307cf::player->attach (
1094 on_command => sub { 1308 on_command => sub {
1095 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1096 1310
1097 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
1107 my ($pl, $buf) = @_; 1321 my ($pl, $buf) = @_;
1108 1322
1109 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1110 1324
1111 if (ref $msg) { 1325 if (ref $msg) {
1326 my ($type, $reply, @payload) =
1327 "ARRAY" eq ref $msg
1328 ? @$msg
1329 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330
1331 my @reply;
1332
1112 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1333 if (my $cb = $EXTCMD{$type}) {
1113 if (my %reply = $cb->($pl, $msg)) { 1334 @reply = $cb->($pl, @payload);
1114 $pl->ext_reply ($msg->{msgid}, %reply);
1115 }
1116 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1117 } else { 1340 } else {
1118 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1119 } 1342 }
1120 1343
1121 cf::override; 1344 cf::override;
1122 }, 1345 },
1123); 1346);
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}
1124 1360
1125sub load_extensions { 1361sub load_extensions {
1126 cf::sync_job { 1362 cf::sync_job {
1127 my %todo; 1363 my %todo;
1128 1364
1148 1384
1149 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1150 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1151 1387
1152 $ext{source} = 1388 $ext{source} =
1153 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1154 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1155 . $source 1391 . $source
1156 . "\n};\n1"; 1392 . "\n};\n1";
1157 1393
1158 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
1174 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1175 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1176 1412
1177 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1178 warn $msg; 1414 warn $msg;
1179 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1180 exit 1;
1181 } 1416 }
1182 1417
1183 warn $msg; 1418 warn $msg;
1184 } 1419 }
1185 1420
1199 1434
1200=back 1435=back
1201 1436
1202=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1203 1438
1204Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1205 1440
1206=cut 1441=cut
1207 1442
1208package cf::player; 1443package cf::player;
1209 1444
1210use Coro::AIO; 1445use Coro::AIO;
1211 1446
1212=head3 cf::player 1447=head3 cf::player
1213 1448
1214=over 4 1449=over 4
1450
1451=item cf::player::num_playing
1452
1453Returns the official number of playing players, as per the Crossfire metaserver rules.
1454
1455=cut
1456
1457sub num_playing {
1458 scalar grep
1459 $_->ob->map
1460 && !$_->hidden
1461 && !$_->ob->flag (cf::FLAG_WIZ),
1462 cf::player::list
1463}
1215 1464
1216=item cf::player::find $login 1465=item cf::player::find $login
1217 1466
1218Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1219 1468
1238 1487
1239sub exists($) { 1488sub exists($) {
1240 my ($login) = @_; 1489 my ($login) = @_;
1241 1490
1242 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1243 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1244} 1493}
1245 1494
1246sub find($) { 1495sub find($) {
1247 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1248 my $login = $_[0]; 1497 my $login = $_[0];
1255 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1256 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1257 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1258 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1259 1508
1260 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1261 or return; 1510 or return;
1511
1512 my $pl = cf::player::load_pl $f
1513 or return;
1514
1515 local $cf::PLAYER_LOADING{$login} = $pl;
1516 $f->resolve_delayed_derefs;
1262 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1263 } 1518 }
1264 } 1519 }
1265} 1520}
1266 1521
1275 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1276 1531
1277 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1278 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1279 1534
1535 cf::get_slot 0.01;
1536
1280 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1281 Coro::cede; 1538 cf::cede_to_tick;
1282} 1539}
1283 1540
1284sub new($) { 1541sub new($) {
1285 my ($login) = @_; 1542 my ($login) = @_;
1286 1543
1292 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1293 1550
1294 $self 1551 $self
1295} 1552}
1296 1553
1554=item $player->send_msg ($channel, $msg, $color, [extra...])
1555
1556=cut
1557
1558sub send_msg {
1559 my $ns = shift->ns
1560 or return;
1561 $ns->send_msg (@_);
1562}
1563
1297=item $pl->quit_character 1564=item $pl->quit_character
1298 1565
1299Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1300be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1301 1568
1305 my ($pl) = @_; 1572 my ($pl) = @_;
1306 1573
1307 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1308 1575
1309 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1310 $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
1311 1578
1312 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1313 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1314 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1315 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1316 1585
1317 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1318 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
1354 or return []; 1623 or return [];
1355 1624
1356 my @logins; 1625 my @logins;
1357 1626
1358 for my $login (@$dirs) { 1627 for my $login (@$dirs) {
1628 my $path = path $login;
1629
1630 # a .pst is a dead give-away for a valid player
1631 # if no pst file found, open and chekc for blocked users
1632 if (aio_stat "$path.pst") {
1359 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1360 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1361 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1362 1637
1363 utf8::decode $login; 1638 utf8::decode $login;
1364 push @logins, $login; 1639 push @logins, $login;
1365 } 1640 }
1366 1641
1393 } 1668 }
1394 1669
1395 \@paths 1670 \@paths
1396} 1671}
1397 1672
1398=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1399 1674
1400Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1401 1676
1402=cut
1403
1404sub expand_cfpod {
1405 ((my $self), (local $_)) = @_;
1406
1407 # escape & and <
1408 s/&/&amp;/g;
1409 s/(?<![BIUGH])</&lt;/g;
1410
1411 # this is buggy, it needs to properly take care of nested <'s
1412
1413 1 while
1414 # replace B<>, I<>, U<> etc.
1415 s/B<([^\>]*)>/<b>$1<\/b>/
1416 || s/I<([^\>]*)>/<i>$1<\/i>/
1417 || s/U<([^\>]*)>/<u>$1<\/u>/
1418 # replace G<male|female> tags
1419 || s{G<([^>|]*)\|([^>]*)>}{
1420 $self->gender ? $2 : $1
1421 }ge
1422 # replace H<hint text>
1423 || s{H<([^\>]*)>}
1424 {
1425 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1426 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1427 "")
1428 [$self->{hintmode}]
1429 }ge;
1430
1431 # create single paragraphs (very hackish)
1432 s/(?<=\S)\n(?=\w)/ /g;
1433
1434 # compress some whitespace
1435 s/\s+\n/\n/g; # ws line-ends
1436 s/\n\n+/\n/g; # double lines
1437 s/^\n+//; # beginning lines
1438 s/\n+$//; # ending lines
1439
1440 warn $_;#d#
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1677=item $player->ext_reply ($msgid, @msg)
1450 1678
1451Sends an ext reply to the player. 1679Sends an ext reply to the player.
1452 1680
1453=cut 1681=cut
1454 1682
1455sub ext_reply($$%) { 1683sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1684 my ($self, $id, @msg) = @_;
1457 1685
1458 $msg{msgid} = $id; 1686 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1687}
1461 1688
1462=item $player->ext_event ($type, %msg) 1689=item $player->ext_msg ($type, @msg)
1463 1690
1464Sends an ext event to the client. 1691Sends an ext event to the client.
1465 1692
1466=cut 1693=cut
1467 1694
1468sub ext_event($$%) { 1695sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1696 my ($self, $type, @msg) = @_;
1470 1697
1471 $self->ns->ext_event ($type, %msg); 1698 $self->ns->ext_msg ($type, @msg);
1472} 1699}
1473 1700
1474=head3 cf::region 1701=head3 cf::region
1475 1702
1476=over 4 1703=over 4
1489 my ($path) = @_; 1716 my ($path) = @_;
1490 1717
1491 my ($match, $specificity); 1718 my ($match, $specificity);
1492 1719
1493 for my $region (list) { 1720 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1721 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1722 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1723 if $region->specificity > $specificity;
1497 } 1724 }
1498 } 1725 }
1499 1726
1520our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1522 1749
1523sub generate_random_map { 1750sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1756 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1849 $self->init; # pass $1 etc.
1620 return $self; 1850 return $self;
1621 } 1851 }
1622 } 1852 }
1623 1853
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1854 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1855 ()
1626} 1856}
1627 1857
1628sub init { 1858sub init {
1629 my ($self) = @_; 1859 my ($self) = @_;
1651 1881
1652# the temporary/swap location 1882# the temporary/swap location
1653sub save_path { 1883sub save_path {
1654 my ($self) = @_; 1884 my ($self) = @_;
1655 1885
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1658} 1888}
1659 1889
1660# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1661sub uniq_path { 1891sub uniq_path {
1662 my ($self) = @_; 1892 my ($self) = @_;
1663 1893
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 1896}
1676 1897
1677sub decay_objects { 1898sub decay_objects {
1678 my ($self) = @_; 1899 my ($self) = @_;
1679 1900
1692 1913
1693sub load_header_from($) { 1914sub load_header_from($) {
1694 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1695 1916
1696 utf8::encode $path; 1917 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 1919 or return;
1920
1921 $self->_load_header ($f)
1922 or return;
1923
1924 local $MAP_LOADING{$self->{path}} = $self;
1925 $f->resolve_delayed_derefs;
1702 1926
1703 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1704 1928
1705 1 1929 1
1706} 1930}
1760sub find { 1984sub find {
1761 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1762 1986
1763 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1764 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1766 1991
1767 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1770 or return; 1994 or return;
1771 1995
1772 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1773 1997
1775 or return; 1999 or return;
1776 2000
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1780 $map->reset; 2006 $map->reset;
1781 undef $guard;
1782 return find $path; 2007 return find $path;
1783 } 2008 }
1784 2009
1785 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1786 } 2011 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1796 2021
1797 my $path = $self->{path}; 2022 my $path = $self->{path};
1798 2023
1799 { 2024 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1801 2026
2027 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2029
1804 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1805 2031
1806 $self->alloc; 2032 $self->alloc;
1807 2033
1808 $self->pre_load; 2034 $self->pre_load;
1809 Coro::cede; 2035 cf::cede_to_tick;
1810 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1812 or return; 2040 or return;
1813 2041
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1815 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1816 2044
1817 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2046 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2049 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1822 } 2053 }
1823 } 2054 }
1824 2055
1825 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1826 # now do the right thing for maps 2059 # now do the right thing for maps
1827 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2062 unless $self->difficulty;
1830 Coro::cede; 2063 cf::cede_to_tick;
1831 2064
1832 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2066 $self->decay_objects;
1834 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1835 $self->update_buttons; 2068 $self->update_buttons;
1836 Coro::cede; 2069 cf::cede_to_tick;
1837 $self->set_darkness_map;
1838 Coro::cede;
1839 $self->activate; 2070 $self->activate;
1840 } 2071 }
1841 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2077 }
1844 2078
1845 $self->post_load; 2079 $self->post_load;
1846} 2080}
1847 2081
1856 2090
1857 $self 2091 $self
1858} 2092}
1859 2093
1860# find and load all maps in the 3x3 area around a map 2094# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2095sub load_neighbours {
1862 my ($map) = @_; 2096 my ($map) = @_;
1863 2097
1864 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1865 2099
1866 for (0 .. 3) { 2100 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1868 or next; 2102 or next;
1869 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1870 or next; 2104 or next;
1871 $neigh->load; 2105 $neigh->load;
1872 2106
2107 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2110 }
1876 2111
1877 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1879 or next; 2115 or next;
1880 $neigh->load; 2116 $neigh->load;
1881 } 2117 }
1882} 2118}
1883 2119
1888} 2124}
1889 2125
1890sub do_load_sync { 2126sub do_load_sync {
1891 my ($map) = @_; 2127 my ($map) = @_;
1892 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1893 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1894} 2133}
1895 2134
1896our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1898 2137
1899sub find_async { 2138sub find_async {
1900 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1901 2140
1902 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1903 2142
1904 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2145 }
1907 2146
1908 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1909 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1910 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2154 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2155 $map->load if $v;
2156 }
1915 2157
1916 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1917 } 2159 }
1918 } 2160 }
1919 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1920 }; 2162 };
1921 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
1924} 2166}
1925 2167
1926sub save { 2168sub save {
1927 my ($self) = @_; 2169 my ($self) = @_;
1928 2170
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2172
1931 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1932 2174
1933 return unless $self->dirty; 2175 return unless $self->dirty;
1934 2176
1940 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1941 2183
1942 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1943 2185
1944 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1946 }; 2189 };
2190
2191 cf::get_slot 0.02;
1947 2192
1948 if ($uniq) { 2193 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2196 } else {
1957 my ($self) = @_; 2202 my ($self) = @_;
1958 2203
1959 # save first because save cedes 2204 # save first because save cedes
1960 $self->save; 2205 $self->save;
1961 2206
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2208
1964 return if $self->players; 2209 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2211 return if $self->{deny_save};
1967 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2217 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2218}
1971 2219
1972sub reset_at { 2220sub reset_at {
1973 my ($self) = @_; 2221 my ($self) = @_;
1974 2222
1992 2240
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2242
1995 return if $self->players; 2243 return if $self->players;
1996 2244
1997 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
1998 2246
1999 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
2000 2248
2001 # need to save uniques path 2249 # need to save uniques path
2002 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
2006 if $uniq; 2254 if $uniq;
2007 } 2255 }
2008 2256
2009 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
2010 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2261 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2262
2015 $self->unlink_save; 2263 $self->unlink_save;
2016 $self->destroy; 2264 $self->destroy;
2017} 2265}
2018 2266
2019my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2020 2268
2021sub nuke { 2269sub nuke {
2022 my ($self) = @_; 2270 my ($self) = @_;
2023 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2024 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2025 2276
2026 $self->unlink_save; 2277 $self->unlink_save;
2027 2278
2028 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2284
2034 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2035 2287
2036 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2037} 2289}
2038 2290
2039=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
2081 2333
2082sub unique_maps() { 2334sub unique_maps() {
2083 [ 2335 [
2084 map { 2336 map {
2085 utf8::decode $_; 2337 utf8::decode $_;
2086 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2087 ? normalise $_ 2341 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2343 ]
2091} 2344}
2092 2345
2093package cf; 2346=item cf::map::static_maps
2347
2348Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2349file in the shared directory excluding F</styles>). May block.
2350
2351=cut
2352
2353sub static_maps() {
2354 my @dirs = "";
2355 my @maps;
2356
2357 while (@dirs) {
2358 my $dir = shift @dirs;
2359
2360 next if $dir eq "/styles";
2361
2362 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2363 or return;
2364
2365 for (@$files) {
2366 s/\.map$// or next;
2367 utf8::decode $_;
2368 push @maps, "$dir/$_";
2369 }
2370
2371 push @dirs, map "$dir/$_", @$dirs;
2372 }
2373
2374 \@maps
2375}
2094 2376
2095=back 2377=back
2096 2378
2097=head3 cf::object 2379=head3 cf::object
2098 2380
2102 2384
2103=over 4 2385=over 4
2104 2386
2105=item $ob->inv_recursive 2387=item $ob->inv_recursive
2106 2388
2107Returns the inventory of the object _and_ their inventories, recursively. 2389Returns the inventory of the object I<and> their inventories, recursively,
2390but I<not> the object itself.
2108 2391
2109=cut 2392=cut
2110 2393
2111sub inv_recursive_; 2394sub inv_recursive_;
2112sub inv_recursive_ { 2395sub inv_recursive_ {
2115 2398
2116sub inv_recursive { 2399sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2400 inv_recursive_ inv $_[0]
2118} 2401}
2119 2402
2403=item $ref = $ob->ref
2404
2405Creates and returns a persistent reference to an object that can be stored as a string.
2406
2407=item $ob = cf::object::deref ($refstring)
2408
2409returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2410even if the object actually exists. May block.
2411
2412=cut
2413
2414sub deref {
2415 my ($ref) = @_;
2416
2417 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2418 my ($uuid, $name) = ($1, $2);
2419 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2420 or return;
2421 $pl->ob->uuid eq $uuid
2422 or return;
2423
2424 $pl->ob
2425 } else {
2426 warn "$ref: cannot resolve object reference\n";
2427 undef
2428 }
2429}
2430
2120package cf; 2431package cf;
2121 2432
2122=back 2433=back
2123 2434
2124=head3 cf::object::player 2435=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2441Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2442can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2443dialogue with the given NPC character.
2133 2444
2134=cut 2445=cut
2446
2447our $SAY_CHANNEL = {
2448 id => "say",
2449 title => "Map",
2450 reply => "say ",
2451 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2452};
2453
2454our $CHAT_CHANNEL = {
2455 id => "chat",
2456 title => "Chat",
2457 reply => "chat ",
2458 tooltip => "Player chat and shouts, global to the server.",
2459};
2135 2460
2136# rough implementation of a future "reply" method that works 2461# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2462# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2463#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2464sub cf::object::player::reply($$$;$) {
2146 2471
2147 } else { 2472 } else {
2148 my $pl = $self->contr; 2473 my $pl = $self->contr;
2149 2474
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2475 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2476 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2477 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2478
2159 } else { 2479 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2480 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2481 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2482 }
2163 } 2483 }
2484}
2485
2486=item $object->send_msg ($channel, $msg, $color, [extra...])
2487
2488=cut
2489
2490sub cf::object::send_msg {
2491 my $pl = shift->contr
2492 or return;
2493 $pl->send_msg (@_);
2164} 2494}
2165 2495
2166=item $player_object->may ("access") 2496=item $player_object->may ("access")
2167 2497
2168Returns wether the given player is authorized to access resource "access" 2498Returns wether the given player is authorized to access resource "access"
2181 2511
2182=item $player_object->enter_link 2512=item $player_object->enter_link
2183 2513
2184Freezes the player and moves him/her to a special map (C<{link}>). 2514Freezes the player and moves him/her to a special map (C<{link}>).
2185 2515
2186The player should be reasonably safe there for short amounts of time. You 2516The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2517for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2518though, as the palyer cannot control the character while it is on the link
2519map.
2188 2520
2189Will never block. 2521Will never block.
2190 2522
2191=item $player_object->leave_link ($map, $x, $y) 2523=item $player_object->leave_link ($map, $x, $y)
2192 2524
2247 # use -1 or undef as default coordinates, not 0, 0 2579 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2580 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2581 if $x <=0 && $y <= 0;
2250 2582
2251 $map->load; 2583 $map->load;
2252 $map->load_diag; 2584 $map->load_neighbours;
2253 2585
2254 return unless $self->contr->active; 2586 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2587
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2589 $self->enter_map ($map, $x, $y);
2259}
2260 2590
2591 # only activate afterwards, to support waiting in hooks
2592 $self->activate_recursive;
2593}
2594
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2595=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2596
2263Moves the player to the given map-path and coordinates by first freezing 2597Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2598her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2599that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. 2600the new (success) or old (failed) map position. In either case, $done will
2601be called at the end of this process.
2602
2603Note that $check will be called with a potentially non-loaded map, so if
2604it needs a loaded map it has to call C<< ->load >>.
2267 2605
2268=cut 2606=cut
2269 2607
2270our $GOTOGEN; 2608our $GOTOGEN;
2271 2609
2272sub cf::object::player::goto { 2610sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2611 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2612
2275 # do generation counting so two concurrent goto's will be executed in-order 2613 # do generation counting so two concurrent goto's will be executed in-order
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2614 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2615
2278 $self->enter_link; 2616 $self->enter_link;
2279 2617
2280 (async { 2618 (async {
2619 $Coro::current->{desc} = "player::goto $path $x $y";
2620
2621 # *tag paths override both path and x|y
2622 if ($path =~ /^\*(.*)$/) {
2623 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2624 my $ob = $obs[rand @obs];
2625
2626 # see if we actually can go there
2627 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2628 $ob = $obs[rand @obs];
2629 } else {
2630 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2631 }
2632 # else put us there anyways for now #d#
2633
2634 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2635 } else {
2636 ($path, $x, $y) = (undef, undef, undef);
2637 }
2638 }
2639
2281 my $map = eval { 2640 my $map = eval {
2282 my $map = cf::map::find $path; 2641 my $map = defined $path ? cf::map::find $path : undef;
2283 2642
2284 if ($map) { 2643 if ($map) {
2285 $map = $map->customise_for ($self); 2644 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2645 $map = $check->($map) if $check && $map;
2287 } else { 2646 } else {
2288 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2647 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2289 } 2648 }
2290 2649
2291 $map 2650 $map
2292 }; 2651 };
2293 2652
2298 2657
2299 if ($gen == $self->{_goto_generation}) { 2658 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2659 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2660 $self->leave_link ($map, $x, $y);
2302 } 2661 }
2662
2663 $done->() if $done;
2303 })->prio (1); 2664 })->prio (1);
2304} 2665}
2305 2666
2306=item $player_object->enter_exit ($exit_object) 2667=item $player_object->enter_exit ($exit_object)
2307 2668
2327} 2688}
2328 2689
2329sub prepare_random_map { 2690sub prepare_random_map {
2330 my ($exit) = @_; 2691 my ($exit) = @_;
2331 2692
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2693 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2694 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2695 # that depends on the exit object
2337 2696
2338 my $rmp = parse_random_map_params $exit->msg; 2697 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2699 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2700 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2701 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2702 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2703 $rmp->{origin_y} = $exit->y;
2704
2705 $exit->map->touch;
2345 } 2706 }
2346 2707
2347 $rmp->{random_seed} ||= $exit->random_seed; 2708 $rmp->{random_seed} ||= $exit->random_seed;
2348 2709
2349 my $data = cf::to_json $rmp; 2710 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2711 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2712 my $meta = "$RANDOMDIR/$md5.meta";
2352 2713
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2714 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2715 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2716 undef $fh;
2356 aio_rename "$meta~", $meta; 2717 aio_rename "$meta~", $meta;
2357 2718
2719 my $slaying = "?random/$md5";
2720
2721 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2722 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2723 $exit->msg (undef);
2724 }
2360 } 2725 }
2361} 2726}
2362 2727
2363sub cf::object::player::enter_exit { 2728sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2729 my ($self, $exit) = @_;
2365 2730
2366 return unless $self->type == cf::PLAYER; 2731 return unless $self->type == cf::PLAYER;
2367 2732
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2733 $self->enter_link;
2380 2734
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2735 (async {
2386 $self->deactivate_recursive; # just to be sure 2736 $Coro::current->{desc} = "enter_exit";
2737
2387 unless (eval { 2738 unless (eval {
2739 $self->deactivate_recursive; # just to be sure
2740
2741 # random map handling
2742 {
2743 my $guard = cf::lock_acquire "exit_prepare:$exit";
2744
2745 prepare_random_map $exit
2746 if $exit->slaying eq "/!";
2747 }
2748
2749 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2750 my $x = $exit->stats->hp;
2751 my $y = $exit->stats->sp;
2752
2388 $self->goto ($slaying, $hp, $sp); 2753 $self->goto ($map, $x, $y);
2389 2754
2755 # if exit is damned, update players death & WoR home-position
2756 $self->contr->savebed ($map, $x, $y)
2757 if $exit->flag (cf::FLAG_DAMNED);
2758
2390 1; 2759 1
2391 }) { 2760 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2761 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "I'll try to bring you back to the map you were before. " 2762 . "I'll try to bring you back to the map you were before. "
2394 . "Please report this to the dungeon master!", 2763 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2764 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2765
2397 warn "ERROR in enter_exit: $@"; 2766 warn "ERROR in enter_exit: $@";
2416 2785
2417 utf8::encode $text; 2786 utf8::encode $text;
2418 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2787 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2419} 2788}
2420 2789
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2790=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2791
2423Send a drawinfo or msg packet to the client, formatting the msg for the 2792Send a drawinfo or msg packet to the client, formatting the msg for the
2424client if neccessary. C<$type> should be a string identifying the type of 2793client if neccessary. C<$type> should be a string identifying the type of
2425the message, with C<log> being the default. If C<$color> is negative, suppress 2794the message, with C<log> being the default. If C<$color> is negative, suppress
2426the message unless the client supports the msg packet. 2795the message unless the client supports the msg packet.
2427 2796
2428=cut 2797=cut
2429 2798
2799# non-persistent channels (usually the info channel)
2800our %CHANNEL = (
2801 "c/motd" => {
2802 id => "infobox",
2803 title => "MOTD",
2804 reply => undef,
2805 tooltip => "The message of the day",
2806 },
2807 "c/identify" => {
2808 id => "infobox",
2809 title => "Identify",
2810 reply => undef,
2811 tooltip => "Items recently identified",
2812 },
2813 "c/examine" => {
2814 id => "infobox",
2815 title => "Examine",
2816 reply => undef,
2817 tooltip => "Signs and other items you examined",
2818 },
2819 "c/shopinfo" => {
2820 id => "infobox",
2821 title => "Shop Info",
2822 reply => undef,
2823 tooltip => "What your bargaining skill tells you about the shop",
2824 },
2825 "c/book" => {
2826 id => "infobox",
2827 title => "Book",
2828 reply => undef,
2829 tooltip => "The contents of a note or book",
2830 },
2831 "c/lookat" => {
2832 id => "infobox",
2833 title => "Look",
2834 reply => undef,
2835 tooltip => "What you saw there",
2836 },
2837 "c/who" => {
2838 id => "infobox",
2839 title => "Players",
2840 reply => undef,
2841 tooltip => "Shows players who are currently online",
2842 },
2843 "c/body" => {
2844 id => "infobox",
2845 title => "Body Parts",
2846 reply => undef,
2847 tooltip => "Shows which body parts you posess and are available",
2848 },
2849 "c/statistics" => {
2850 id => "infobox",
2851 title => "Statistics",
2852 reply => undef,
2853 tooltip => "Shows your primary statistics",
2854 },
2855 "c/skills" => {
2856 id => "infobox",
2857 title => "Skills",
2858 reply => undef,
2859 tooltip => "Shows your experience per skill and item power",
2860 },
2861 "c/shopitems" => {
2862 id => "infobox",
2863 title => "Shop Items",
2864 reply => undef,
2865 tooltip => "Shows the items currently for sale in this shop",
2866 },
2867 "c/resistances" => {
2868 id => "infobox",
2869 title => "Resistances",
2870 reply => undef,
2871 tooltip => "Shows your resistances",
2872 },
2873 "c/pets" => {
2874 id => "infobox",
2875 title => "Pets",
2876 reply => undef,
2877 tooltip => "Shows information abotu your pets/a specific pet",
2878 },
2879 "c/perceiveself" => {
2880 id => "infobox",
2881 title => "Perceive Self",
2882 reply => undef,
2883 tooltip => "You gained detailed knowledge about yourself",
2884 },
2885 "c/uptime" => {
2886 id => "infobox",
2887 title => "Uptime",
2888 reply => undef,
2889 tooltip => "How long the server has been running since last restart",
2890 },
2891 "c/mapinfo" => {
2892 id => "infobox",
2893 title => "Map Info",
2894 reply => undef,
2895 tooltip => "Information related to the maps",
2896 },
2897 "c/party" => {
2898 id => "party",
2899 title => "Party",
2900 reply => "gsay ",
2901 tooltip => "Messages and chat related to your party",
2902 },
2903 "c/death" => {
2904 id => "death",
2905 title => "Death",
2906 reply => undef,
2907 tooltip => "Reason for and more info about your most recent death",
2908 },
2909 "c/say" => $SAY_CHANNEL,
2910 "c/chat" => $CHAT_CHANNEL,
2911);
2912
2430sub cf::client::send_msg { 2913sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2914 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2915
2433 $msg = $self->pl->expand_cfpod ($msg); 2916 $msg = $self->pl->expand_cfpod ($msg)
2917 unless $color & cf::NDI_VERBATIM;
2918
2919 $color &= cf::NDI_CLIENT_MASK; # just in case...
2920
2921 # check predefined channels, for the benefit of C
2922 if ($CHANNEL{$channel}) {
2923 $channel = $CHANNEL{$channel};
2924
2925 $self->ext_msg (channel_info => $channel);
2926 $channel = $channel->{id};
2927
2928 } elsif (ref $channel) {
2929 # send meta info to client, if not yet sent
2930 unless (exists $self->{channel}{$channel->{id}}) {
2931 $self->{channel}{$channel->{id}} = $channel;
2932 $self->ext_msg (channel_info => $channel);
2933 }
2934
2935 $channel = $channel->{id};
2936 }
2434 2937
2435 return unless @extra || length $msg; 2938 return unless @extra || length $msg;
2436 2939
2437 if ($self->can_msg) { 2940 # default colour, mask it out
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2941 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2439 } else { 2942 if $color & cf::NDI_DEF;
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449 2943
2450 if ($color >= 0) { 2944 my $pkt = "msg "
2451 if (0 && $msg =~ /\[/) { 2945 . $self->{json_coder}->encode (
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2946 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2453 } else { 2947 );
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg")
2456 }
2457 }
2458 }
2459}
2460 2948
2949 # try lzf for large packets
2950 $pkt = "lzf " . Compress::LZF::compress $pkt
2951 if 1024 <= length $pkt and $self->{can_lzf};
2952
2953 # split very large packets
2954 if (8192 < length $pkt and $self->{can_lzf}) {
2955 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2956 $pkt = "frag";
2957 }
2958
2959 $self->send_packet ($pkt);
2960}
2961
2461=item $client->ext_event ($type, %msg) 2962=item $client->ext_msg ($type, @msg)
2462 2963
2463Sends an ext event to the client. 2964Sends an ext event to the client.
2464 2965
2465=cut 2966=cut
2466 2967
2467sub cf::client::ext_event($$%) { 2968sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2969 my ($self, $type, @msg) = @_;
2469 2970
2971 if ($self->extcmd == 2) {
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2973 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2974 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2975 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2976 }
2977}
2978
2979=item $client->ext_reply ($msgid, @msg)
2980
2981Sends an ext reply to the client.
2982
2983=cut
2984
2985sub cf::client::ext_reply($$@) {
2986 my ($self, $id, @msg) = @_;
2987
2988 if ($self->extcmd == 2) {
2989 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2990 } elsif ($self->extcmd == 1) {
2991 #TODO: version 1, remove
2992 unshift @msg, msgtype => "reply", msgid => $id;
2993 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2994 }
2472} 2995}
2473 2996
2474=item $success = $client->query ($flags, "text", \&cb) 2997=item $success = $client->query ($flags, "text", \&cb)
2475 2998
2476Queues a query to the client, calling the given callback with 2999Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 3054 my ($ns, $buf) = @_;
2532 3055
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3056 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 3057
2535 if (ref $msg) { 3058 if (ref $msg) {
3059 my ($type, $reply, @payload) =
3060 "ARRAY" eq ref $msg
3061 ? @$msg
3062 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3063
3064 my @reply;
3065
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3066 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 3067 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 3068 }
3069
3070 $ns->ext_reply ($reply, @reply)
3071 if $reply;
3072
2542 } else { 3073 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3074 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 3075 }
2545 3076
2546 cf::override; 3077 cf::override;
2593our $safe = new Safe "safe"; 3124our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3125our $safe_hole = new Safe::Hole;
2595 3126
2596$SIG{FPE} = 'IGNORE'; 3127$SIG{FPE} = 'IGNORE';
2597 3128
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3129$safe->permit_only (Opcode::opset qw(
3130 :base_core :base_mem :base_orig :base_math
3131 grepstart grepwhile mapstart mapwhile
3132 sort time
3133));
2599 3134
2600# here we export the classes and methods available to script code 3135# here we export the classes and methods available to script code
2601 3136
2602=pod 3137=pod
2603 3138
2604The following functions and methods are available within a safe environment: 3139The following functions and methods are available within a safe environment:
2605 3140
2606 cf::object 3141 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3142 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3143 insert remove name archname title slaying race decrease split
3144 value
2609 3145
2610 cf::object::player 3146 cf::object::player
2611 player 3147 player
2612 3148
2613 cf::player 3149 cf::player
2618 3154
2619=cut 3155=cut
2620 3156
2621for ( 3157for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3158 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3159 insert remove inv nrof name archname title slaying race
3160 decrease split destroy change_exp value msg lore send_msg)],
2624 ["cf::object::player" => qw(player)], 3161 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3162 ["cf::player" => qw(peaceful send_msg)],
2626 ["cf::map" => qw(trigger)], 3163 ["cf::map" => qw(trigger)],
2627) { 3164) {
2628 no strict 'refs'; 3165 no strict 'refs';
2629 my ($pkg, @funs) = @$_; 3166 my ($pkg, @funs) = @$_;
2630 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3167 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2647 my ($code, %vars) = @_; 3184 my ($code, %vars) = @_;
2648 3185
2649 my $qcode = $code; 3186 my $qcode = $code;
2650 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3187 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2651 $qcode =~ s/\n/\\n/g; 3188 $qcode =~ s/\n/\\n/g;
3189
3190 %vars = (_dummy => 0) unless %vars;
2652 3191
2653 local $_; 3192 local $_;
2654 local @safe::cf::_safe_eval_args = values %vars; 3193 local @safe::cf::_safe_eval_args = values %vars;
2655 3194
2656 my $eval = 3195 my $eval =
2704# the server's init and main functions 3243# the server's init and main functions
2705 3244
2706sub load_facedata($) { 3245sub load_facedata($) {
2707 my ($path) = @_; 3246 my ($path) = @_;
2708 3247
3248 # HACK to clear player env face cache, we need some signal framework
3249 # for this (global event?)
3250 %ext::player_env::MUSIC_FACE_CACHE = ();
3251
3252 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3253
2709 warn "loading facedata from $path\n"; 3254 warn "loading facedata from $path\n";
2710 3255
2711 my $facedata; 3256 my $facedata;
2712 0 < aio_load $path, $facedata 3257 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3258 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3260 $facedata = Coro::Storable::thaw $facedata;
2716 3261
2717 $facedata->{version} == 2 3262 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3263 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3264
3265 # patch in the exptable
3266 $facedata->{resource}{"res/exp_table"} = {
3267 type => FT_RSRC,
3268 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3269 };
3270 cf::cede_to_tick;
3271
2720 { 3272 {
2721 my $faces = $facedata->{faceinfo}; 3273 my $faces = $facedata->{faceinfo};
2722 3274
2723 while (my ($face, $info) = each %$faces) { 3275 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3276 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3277
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3278 cf::face::set_visibility $idx, $info->{visibility};
3279 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3280 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3281 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3282
3283 cf::cede_to_tick;
2729 } 3284 }
2730 3285
2731 while (my ($face, $info) = each %$faces) { 3286 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3287 next unless $info->{smooth};
3288
2733 my $idx = cf::face::find $face 3289 my $idx = cf::face::find $face
2734 or next; 3290 or next;
3291
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3292 if (my $smooth = cf::face::find $info->{smooth}) {
3293 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3294 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3295 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3296 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3297 }
2740 Coro::cede; 3298
3299 cf::cede_to_tick;
2741 } 3300 }
2742 } 3301 }
2743 3302
2744 { 3303 {
2745 my $anims = $facedata->{animinfo}; 3304 my $anims = $facedata->{animinfo};
2746 3305
2747 while (my ($anim, $info) = each %$anims) { 3306 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3307 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3308 cf::cede_to_tick;
2750 } 3309 }
2751 3310
2752 cf::anim::invalidate_all; # d'oh 3311 cf::anim::invalidate_all; # d'oh
2753 } 3312 }
2754 3313
3314 {
3315 # TODO: for gcfclient pleasure, we should give resources
3316 # that gcfclient doesn't grok a >10000 face index.
3317 my $res = $facedata->{resource};
3318
3319 while (my ($name, $info) = each %$res) {
3320 if (defined $info->{type}) {
3321 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3322 my $data;
3323
3324 if ($info->{type} & 1) {
3325 # prepend meta info
3326
3327 my $meta = $enc->encode ({
3328 name => $name,
3329 %{ $info->{meta} || {} },
3330 });
3331
3332 $data = pack "(w/a*)*", $meta, $info->{data};
3333 } else {
3334 $data = $info->{data};
3335 }
3336
3337 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3338 cf::face::set_type $idx, $info->{type};
3339 } else {
3340 $RESOURCE{$name} = $info;
3341 }
3342
3343 cf::cede_to_tick;
3344 }
3345 }
3346
3347 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3348
2755 1 3349 1
2756} 3350}
2757 3351
3352cf::global->attach (on_resource_update => sub {
3353 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3354 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3355
3356 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3357 my $sound = $soundconf->{compat}[$_]
3358 or next;
3359
3360 my $face = cf::face::find "sound/$sound->[1]";
3361 cf::sound::set $sound->[0] => $face;
3362 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3363 }
3364
3365 while (my ($k, $v) = each %{$soundconf->{event}}) {
3366 my $face = cf::face::find "sound/$v";
3367 cf::sound::set $k => $face;
3368 }
3369 }
3370});
3371
3372register_exticmd fx_want => sub {
3373 my ($ns, $want) = @_;
3374
3375 while (my ($k, $v) = each %$want) {
3376 $ns->fx_want ($k, $v);
3377 }
3378};
3379
3380sub load_resource_file($) {
3381 my $guard = lock_acquire "load_resource_file";
3382
3383 my $status = load_resource_file_ $_[0];
3384 get_slot 0.1, 100;
3385 cf::arch::commit_load;
3386
3387 $status
3388}
3389
2758sub reload_regions { 3390sub reload_regions {
3391 # HACK to clear player env face cache, we need some signal framework
3392 # for this (global event?)
3393 %ext::player_env::MUSIC_FACE_CACHE = ();
3394
2759 load_resource_file "$MAPDIR/regions" 3395 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 3396 or die "unable to load regions file\n";
3397
3398 for (cf::region::list) {
3399 $_->{match} = qr/$_->{match}/
3400 if exists $_->{match};
3401 }
2761} 3402}
2762 3403
2763sub reload_facedata { 3404sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3405 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3406 or die "unable to load facedata\n";
2766} 3407}
2767 3408
2768sub reload_archetypes { 3409sub reload_archetypes {
2769 load_resource_file "$DATADIR/archetypes" 3410 load_resource_file "$DATADIR/archetypes"
2770 or die "unable to load archetypes\n"; 3411 or die "unable to load archetypes\n";
2771 #d# NEED to laod twice to resolve forward references
2772 # this really needs to be done in an extra post-pass
2773 # (which needs to be synchronous, so solve it differently)
2774 load_resource_file "$DATADIR/archetypes"
2775 or die "unable to load archetypes\n";
2776} 3412}
2777 3413
2778sub reload_treasures { 3414sub reload_treasures {
2779 load_resource_file "$DATADIR/treasures" 3415 load_resource_file "$DATADIR/treasures"
2780 or die "unable to load treasurelists\n"; 3416 or die "unable to load treasurelists\n";
2781} 3417}
2782 3418
2783sub reload_resources { 3419sub reload_resources {
2784 warn "reloading resource files...\n"; 3420 warn "reloading resource files...\n";
2785 3421
3422 reload_facedata;
3423 reload_archetypes;
2786 reload_regions; 3424 reload_regions;
2787 reload_facedata;
2788 #reload_archetypes;#d#
2789 reload_archetypes;
2790 reload_treasures; 3425 reload_treasures;
2791 3426
2792 warn "finished reloading resource files\n"; 3427 warn "finished reloading resource files\n";
2793} 3428}
2794 3429
2795sub init { 3430sub reload_config {
2796 reload_resources; 3431 warn "reloading config file...\n";
2797}
2798 3432
2799sub cfg_load {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3433 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3434 or return;
2802 3435
2803 local $/; 3436 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3437 *CFG = YAML::XS::Load scalar <$fh>;
2805 3438
2806 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3439 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2807 3440
2808 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3441 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2809 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3442 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2813 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3446 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2814 and die "WARNING: m(un)lockall failed: $!\n"; 3447 and die "WARNING: m(un)lockall failed: $!\n";
2815 }; 3448 };
2816 warn $@ if $@; 3449 warn $@ if $@;
2817 } 3450 }
3451
3452 warn "finished reloading resource files\n";
3453}
3454
3455sub pidfile() {
3456 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3457 or die "$PIDFILE: $!";
3458 flock $fh, &Fcntl::LOCK_EX
3459 or die "$PIDFILE: flock: $!";
3460 $fh
3461}
3462
3463# make sure only one server instance is running at any one time
3464sub atomic {
3465 my $fh = pidfile;
3466
3467 my $pid = <$fh>;
3468 kill 9, $pid if $pid > 0;
3469
3470 seek $fh, 0, 0;
3471 print $fh $$;
3472}
3473
3474sub main_loop {
3475 warn "EV::loop starting\n";
3476 if (1) {
3477 EV::loop;
3478 }
3479 warn "EV::loop returned\n";
3480 goto &main_loop unless $REALLY_UNLOOP;
2818} 3481}
2819 3482
2820sub main { 3483sub main {
3484 cf::init_globals; # initialise logging
3485
3486 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3487 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3488 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3489 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3490
3491 cf::init_experience;
3492 cf::init_anim;
3493 cf::init_attackmess;
3494 cf::init_dynamic;
3495
3496 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3497
2821 # we must not ever block the main coroutine 3498 # we must not ever block the main coroutine
2822 local $Coro::idle = sub { 3499 local $Coro::idle = sub {
2823 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3500 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2824 (async { 3501 (async {
2825 Event::one_event; 3502 $Coro::current->{desc} = "IDLE BUG HANDLER";
3503 EV::loop EV::LOOP_ONESHOT;
2826 })->prio (Coro::PRIO_MAX); 3504 })->prio (Coro::PRIO_MAX);
2827 }; 3505 };
2828 3506
2829 cfg_load; 3507 evthread_start IO::AIO::poll_fileno;
3508
3509 cf::sync_job {
3510 reload_resources;
3511 reload_config;
2830 db_init; 3512 db_init;
3513
3514 cf::load_settings;
3515 cf::load_materials;
3516 cf::init_uuid;
3517 cf::init_signals;
3518 cf::init_commands;
3519 cf::init_skills;
3520
3521 cf::init_beforeplay;
3522
3523 atomic;
3524
2831 load_extensions; 3525 load_extensions;
2832 3526
2833 $TICK_WATCHER->start; 3527 utime time, time, $RUNTIMEFILE;
2834 Event::loop; 3528
3529 # no (long-running) fork's whatsoever before this point(!)
3530 use POSIX ();
3531 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3532
3533 (pop @POST_INIT)->(0) while @POST_INIT;
3534 };
3535
3536 main_loop;
2835} 3537}
2836 3538
2837############################################################################# 3539#############################################################################
2838# initialisation and cleanup 3540# initialisation and cleanup
2839 3541
2840# install some emergency cleanup handlers 3542# install some emergency cleanup handlers
2841BEGIN { 3543BEGIN {
3544 our %SIGWATCHER = ();
2842 for my $signal (qw(INT HUP TERM)) { 3545 for my $signal (qw(INT HUP TERM)) {
2843 Event->signal ( 3546 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2844 reentrant => 0,
2845 data => WF_AUTOCANCEL,
2846 signal => $signal,
2847 prio => 0,
2848 cb => sub {
2849 cf::cleanup "SIG$signal"; 3547 cf::cleanup "SIG$signal";
2850 },
2851 ); 3548 };
2852 } 3549 }
2853} 3550}
2854 3551
2855sub write_runtime { 3552sub write_runtime_sync {
2856 my $runtime = "$LOCALDIR/runtime";
2857
2858 # first touch the runtime file to show we are still running: 3553 # first touch the runtime file to show we are still running:
2859 # the fsync below can take a very very long time. 3554 # the fsync below can take a very very long time.
2860 3555
2861 IO::AIO::aio_utime $runtime, undef, undef; 3556 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2862 3557
2863 my $guard = cf::lock_acquire "write_runtime"; 3558 my $guard = cf::lock_acquire "write_runtime";
2864 3559
2865 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3560 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2866 or return; 3561 or return;
2867 3562
2868 my $value = $cf::RUNTIME + 90 + 10; 3563 my $value = $cf::RUNTIME + 90 + 10;
2869 # 10 is the runtime save interval, for a monotonic clock 3564 # 10 is the runtime save interval, for a monotonic clock
2870 # 60 allows for the watchdog to kill the server. 3565 # 60 allows for the watchdog to kill the server.
2880 aio_utime $fh, undef, undef; 3575 aio_utime $fh, undef, undef;
2881 3576
2882 close $fh 3577 close $fh
2883 or return; 3578 or return;
2884 3579
2885 aio_rename "$runtime~", $runtime 3580 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2886 and return; 3581 and return;
2887 3582
2888 warn "runtime file written.\n"; 3583 warn "runtime file written.\n";
2889 3584
2890 1 3585 1
3586}
3587
3588our $uuid_lock;
3589our $uuid_skip;
3590
3591sub write_uuid_sync($) {
3592 $uuid_skip ||= $_[0];
3593
3594 return if $uuid_lock;
3595 local $uuid_lock = 1;
3596
3597 my $uuid = "$LOCALDIR/uuid";
3598
3599 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3600 or return;
3601
3602 my $value = uuid_seq uuid_cur;
3603
3604 unless ($value) {
3605 warn "cowardly refusing to write zero uuid value!\n";
3606 return;
3607 }
3608
3609 my $value = uuid_str $value + $uuid_skip;
3610 $uuid_skip = 0;
3611
3612 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3613 and return;
3614
3615 # always fsync - this file is important
3616 aio_fsync $fh
3617 and return;
3618
3619 close $fh
3620 or return;
3621
3622 aio_rename "$uuid~", $uuid
3623 and return;
3624
3625 warn "uuid file written ($value).\n";
3626
3627 1
3628
3629}
3630
3631sub write_uuid($$) {
3632 my ($skip, $sync) = @_;
3633
3634 $sync ? write_uuid_sync $skip
3635 : async { write_uuid_sync $skip };
2891} 3636}
2892 3637
2893sub emergency_save() { 3638sub emergency_save() {
2894 my $freeze_guard = cf::freeze_mainloop; 3639 my $freeze_guard = cf::freeze_mainloop;
2895 3640
2896 warn "enter emergency perl save\n"; 3641 warn "emergency_perl_save: enter\n";
2897 3642
2898 cf::sync_job { 3643 cf::sync_job {
3644 # this is a trade-off: we want to be very quick here, so
3645 # save all maps without fsync, and later call a global sync
3646 # (which in turn might be very very slow)
3647 local $USE_FSYNC = 0;
3648
2899 # use a peculiar iteration method to avoid tripping on perl 3649 # use a peculiar iteration method to avoid tripping on perl
2900 # refcount bugs in for. also avoids problems with players 3650 # refcount bugs in for. also avoids problems with players
2901 # and maps saved/destroyed asynchronously. 3651 # and maps saved/destroyed asynchronously.
2902 warn "begin emergency player save\n"; 3652 warn "emergency_perl_save: begin player save\n";
2903 for my $login (keys %cf::PLAYER) { 3653 for my $login (keys %cf::PLAYER) {
2904 my $pl = $cf::PLAYER{$login} or next; 3654 my $pl = $cf::PLAYER{$login} or next;
2905 $pl->valid or next; 3655 $pl->valid or next;
3656 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906 $pl->save; 3657 $pl->save;
2907 } 3658 }
2908 warn "end emergency player save\n"; 3659 warn "emergency_perl_save: end player save\n";
2909 3660
2910 warn "begin emergency map save\n"; 3661 warn "emergency_perl_save: begin map save\n";
2911 for my $path (keys %cf::MAP) { 3662 for my $path (keys %cf::MAP) {
2912 my $map = $cf::MAP{$path} or next; 3663 my $map = $cf::MAP{$path} or next;
2913 $map->valid or next; 3664 $map->valid or next;
2914 $map->save; 3665 $map->save;
2915 } 3666 }
2916 warn "end emergency map save\n"; 3667 warn "emergency_perl_save: end map save\n";
2917 3668
2918 warn "begin emergency database checkpoint\n"; 3669 warn "emergency_perl_save: begin database checkpoint\n";
2919 BDB::db_env_txn_checkpoint $DB_ENV; 3670 BDB::db_env_txn_checkpoint $DB_ENV;
2920 warn "end emergency database checkpoint\n"; 3671 warn "emergency_perl_save: end database checkpoint\n";
3672
3673 warn "emergency_perl_save: begin write uuid\n";
3674 write_uuid_sync 1;
3675 warn "emergency_perl_save: end write uuid\n";
2921 }; 3676 };
2922 3677
3678 warn "emergency_perl_save: starting sync()\n";
3679 IO::AIO::aio_sync sub {
3680 warn "emergency_perl_save: finished sync()\n";
3681 };
3682
2923 warn "leave emergency perl save\n"; 3683 warn "emergency_perl_save: leave\n";
2924} 3684}
2925 3685
2926sub post_cleanup { 3686sub post_cleanup {
2927 my ($make_core) = @_; 3687 my ($make_core) = @_;
2928 3688
2929 warn Carp::longmess "post_cleanup backtrace" 3689 warn Carp::longmess "post_cleanup backtrace"
2930 if $make_core; 3690 if $make_core;
3691
3692 my $fh = pidfile;
3693 unlink $PIDFILE if <$fh> == $$;
3694}
3695
3696# a safer delete_package, copied from Symbol
3697sub clear_package($) {
3698 my $pkg = shift;
3699
3700 # expand to full symbol table name if needed
3701 unless ($pkg =~ /^main::.*::$/) {
3702 $pkg = "main$pkg" if $pkg =~ /^::/;
3703 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3704 $pkg .= '::' unless $pkg =~ /::$/;
3705 }
3706
3707 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3708 my $stem_symtab = *{$stem}{HASH};
3709
3710 defined $stem_symtab and exists $stem_symtab->{$leaf}
3711 or return;
3712
3713 # clear all symbols
3714 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3715 for my $name (keys %$leaf_symtab) {
3716 _gv_clear *{"$pkg$name"};
3717# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3718 }
3719 warn "cleared package $pkg\n";#d#
2931} 3720}
2932 3721
2933sub do_reload_perl() { 3722sub do_reload_perl() {
2934 # can/must only be called in main 3723 # can/must only be called in main
2935 if ($Coro::current != $Coro::main) { 3724 if ($Coro::current != $Coro::main) {
2936 warn "can only reload from main coroutine"; 3725 warn "can only reload from main coroutine";
2937 return; 3726 return;
2938 } 3727 }
2939 3728
3729 return if $RELOAD++;
3730
3731 my $t1 = EV::time;
3732
3733 while ($RELOAD) {
2940 warn "reloading..."; 3734 warn "reloading...";
2941 3735
2942 warn "entering sync_job"; 3736 warn "entering sync_job";
2943 3737
2944 cf::sync_job { 3738 cf::sync_job {
2945 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
2946 cf::emergency_save; 3740 cf::emergency_save;
2947 cf::write_runtime; # external watchdog should not bark 3741 cf::write_runtime_sync; # external watchdog should not bark
2948 3742
2949 warn "syncing database to disk"; 3743 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV; 3744 BDB::db_env_txn_checkpoint $DB_ENV;
2951 3745
2952 # if anything goes wrong in here, we should simply crash as we already saved 3746 # if anything goes wrong in here, we should simply crash as we already saved
2953 3747
2954 warn "cancelling all WF_AUTOCANCEL watchers";
2955 for (Event::all_watchers) {
2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2957 }
2958
2959 warn "flushing outstanding aio requests"; 3748 warn "flushing outstanding aio requests";
2960 for (;;) {
2961 BDB::flush;
2962 IO::AIO::flush;
2963 Coro::cede;
2964 last unless IO::AIO::nreqs || BDB::nreqs; 3749 while (IO::AIO::nreqs || BDB::nreqs) {
2965 warn "iterate..."; 3750 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2966 }
2967
2968 ++$RELOAD;
2969
2970 warn "cancelling all extension coros";
2971 $_->cancel for values %EXT_CORO;
2972 %EXT_CORO = ();
2973
2974 warn "removing commands";
2975 %COMMAND = ();
2976
2977 warn "removing ext/exti commands";
2978 %EXTCMD = ();
2979 %EXTICMD = ();
2980
2981 warn "unloading/nuking all extensions";
2982 for my $pkg (@EXTS) {
2983 warn "... unloading $pkg";
2984
2985 if (my $cb = $pkg->can ("unload")) {
2986 eval {
2987 $cb->($pkg);
2988 1
2989 } or warn "$pkg unloaded, but with errors: $@";
2990 } 3751 }
2991 3752
2992 warn "... nuking $pkg"; 3753 warn "cancelling all extension coros";
2993 Symbol::delete_package $pkg; 3754 $_->cancel for values %EXT_CORO;
2994 } 3755 %EXT_CORO = ();
2995 3756
2996 warn "unloading all perl modules loaded from $LIBDIR"; 3757 warn "removing commands";
2997 while (my ($k, $v) = each %INC) { 3758 %COMMAND = ();
2998 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2999 3759
3760 warn "removing ext/exti commands";
3761 %EXTCMD = ();
3762 %EXTICMD = ();
3763
3764 warn "unloading/nuking all extensions";
3765 for my $pkg (@EXTS) {
3000 warn "... unloading $k"; 3766 warn "... unloading $pkg";
3001 delete $INC{$k};
3002 3767
3003 $k =~ s/\.pm$//;
3004 $k =~ s/\//::/g;
3005
3006 if (my $cb = $k->can ("unload_module")) { 3768 if (my $cb = $pkg->can ("unload")) {
3769 eval {
3007 $cb->(); 3770 $cb->($pkg);
3771 1
3772 } or warn "$pkg unloaded, but with errors: $@";
3773 }
3774
3775 warn "... clearing $pkg";
3776 clear_package $pkg;
3008 } 3777 }
3009 3778
3010 Symbol::delete_package $k; 3779 warn "unloading all perl modules loaded from $LIBDIR";
3780 while (my ($k, $v) = each %INC) {
3781 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3782
3783 warn "... unloading $k";
3784 delete $INC{$k};
3785
3786 $k =~ s/\.pm$//;
3787 $k =~ s/\//::/g;
3788
3789 if (my $cb = $k->can ("unload_module")) {
3790 $cb->();
3791 }
3792
3793 clear_package $k;
3011 } 3794 }
3012 3795
3013 warn "getting rid of safe::, as good as possible"; 3796 warn "getting rid of safe::, as good as possible";
3014 Symbol::delete_package "safe::$_" 3797 clear_package "safe::$_"
3015 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3798 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3016 3799
3017 warn "unloading cf.pm \"a bit\""; 3800 warn "unloading cf.pm \"a bit\"";
3018 delete $INC{"cf.pm"}; 3801 delete $INC{"cf.pm"};
3019 delete $INC{"cf/pod.pm"}; 3802 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3020 3803
3021 # don't, removes xs symbols, too, 3804 # don't, removes xs symbols, too,
3022 # and global variables created in xs 3805 # and global variables created in xs
3023 #Symbol::delete_package __PACKAGE__; 3806 #clear_package __PACKAGE__;
3024 3807
3025 warn "unload completed, starting to reload now"; 3808 warn "unload completed, starting to reload now";
3026 3809
3027 warn "reloading cf.pm"; 3810 warn "reloading cf.pm";
3028 require cf; 3811 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3812 cf::_connect_to_perl_1;
3030 3813
3031 warn "loading config and database again"; 3814 warn "loading config and database again";
3032 cf::cfg_load; 3815 cf::reload_config;
3033 3816
3034 warn "loading extensions"; 3817 warn "loading extensions";
3035 cf::load_extensions; 3818 cf::load_extensions;
3036 3819
3820 if ($REATTACH_ON_RELOAD) {
3037 warn "reattaching attachments to objects/players"; 3821 warn "reattaching attachments to objects/players";
3038 _global_reattach; # objects, sockets 3822 _global_reattach; # objects, sockets
3039 warn "reattaching attachments to maps"; 3823 warn "reattaching attachments to maps";
3040 reattach $_ for values %MAP; 3824 reattach $_ for values %MAP;
3041 warn "reattaching attachments to players"; 3825 warn "reattaching attachments to players";
3042 reattach $_ for values %PLAYER; 3826 reattach $_ for values %PLAYER;
3827 }
3043 3828
3829 warn "running post_init jobs";
3830 (pop @POST_INIT)->(1) while @POST_INIT;
3831
3044 warn "leaving sync_job"; 3832 warn "leaving sync_job";
3045 3833
3046 1 3834 1
3047 } or do { 3835 } or do {
3048 warn $@; 3836 warn $@;
3049 warn "error while reloading, exiting."; 3837 cf::cleanup "error while reloading, exiting.";
3050 exit 1;
3051 }; 3838 };
3052 3839
3053 warn "reloaded"; 3840 warn "reloaded";
3841 --$RELOAD;
3842 }
3843
3844 $t1 = EV::time - $t1;
3845 warn "reload completed in ${t1}s\n";
3054}; 3846};
3055 3847
3056our $RELOAD_WATCHER; # used only during reload 3848our $RELOAD_WATCHER; # used only during reload
3057 3849
3058sub reload_perl() { 3850sub reload_perl() {
3059 # doing reload synchronously and two reloads happen back-to-back, 3851 # doing reload synchronously and two reloads happen back-to-back,
3060 # coro crashes during coro_state_free->destroy here. 3852 # coro crashes during coro_state_free->destroy here.
3061 3853
3062 $RELOAD_WATCHER ||= Event->timer ( 3854 $RELOAD_WATCHER ||= cf::async {
3063 reentrant => 0, 3855 Coro::AIO::aio_wait cache_extensions;
3064 after => 0, 3856
3065 data => WF_AUTOCANCEL, 3857 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3066 cb => sub {
3067 do_reload_perl; 3858 do_reload_perl;
3068 undef $RELOAD_WATCHER; 3859 undef $RELOAD_WATCHER;
3069 }, 3860 };
3070 ); 3861 };
3071} 3862}
3072 3863
3073register_command "reload" => sub { 3864register_command "reload" => sub {
3074 my ($who, $arg) = @_; 3865 my ($who, $arg) = @_;
3075 3866
3076 if ($who->flag (FLAG_WIZ)) { 3867 if ($who->flag (FLAG_WIZ)) {
3077 $who->message ("reloading server."); 3868 $who->message ("reloading server.");
3869 async {
3870 $Coro::current->{desc} = "perl_reload";
3078 async { reload_perl }; 3871 reload_perl;
3872 };
3079 } 3873 }
3080}; 3874};
3081 3875
3082unshift @INC, $LIBDIR; 3876unshift @INC, $LIBDIR;
3083 3877
3085 3879
3086our @WAIT_FOR_TICK; 3880our @WAIT_FOR_TICK;
3087our @WAIT_FOR_TICK_BEGIN; 3881our @WAIT_FOR_TICK_BEGIN;
3088 3882
3089sub wait_for_tick { 3883sub wait_for_tick {
3090 return unless $TICK_WATCHER->is_active;
3091 return if $Coro::current == $Coro::main; 3884 return if tick_inhibit || $Coro::current == $Coro::main;
3092 3885
3093 my $signal = new Coro::Signal; 3886 my $signal = new Coro::Signal;
3094 push @WAIT_FOR_TICK, $signal; 3887 push @WAIT_FOR_TICK, $signal;
3095 $signal->wait; 3888 $signal->wait;
3096} 3889}
3097 3890
3098sub wait_for_tick_begin { 3891sub wait_for_tick_begin {
3099 return unless $TICK_WATCHER->is_active;
3100 return if $Coro::current == $Coro::main; 3892 return if tick_inhibit || $Coro::current == $Coro::main;
3101 3893
3102 my $signal = new Coro::Signal; 3894 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3895 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3896 $signal->wait;
3105} 3897}
3106 3898
3107 my $min = 1e6;#d# 3899sub tick {
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer (
3110 reentrant => 0,
3111 parked => 1,
3112 prio => 0,
3113 at => $NEXT_TICK || $TICK,
3114 data => WF_AUTOCANCEL,
3115 cb => sub {
3116 if ($Coro::current != $Coro::main) { 3900 if ($Coro::current != $Coro::main) {
3117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3901 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3118 unless ++$bug_warning > 10; 3902 unless ++$bug_warning > 10;
3119 return; 3903 return;
3120 } 3904 }
3121 3905
3122 $NOW = $tick_start = Event::time;
3123
3124 cf::server_tick; # one server iteration 3906 cf::server_tick; # one server iteration
3125 3907
3126 0 && sync_job {#d# 3908 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 for(1..10) { 3909 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 my $t = Event::time; 3910 Coro::async_pool {
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3911 $Coro::current->{desc} = "runtime saver";
3130 or die; 3912 write_runtime_sync
3131 3913 or warn "ERROR: unable to write runtime file: $!";
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 }; 3914 };
3915 }
3148 3916
3149 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK;
3151
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 Coro::async_pool {
3155 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
3158 }
3159
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3917 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3918 $sig->send;
3165 } 3919 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3920 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3921 $sig->send;
3168 } 3922 }
3169 3923
3170 $NOW = Event::time; 3924 $LOAD = ($NOW - $TICK_START) / $TICK;
3171
3172 # if we are delayed by four ticks or more, skip them all
3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3174
3175 $TICK_WATCHER->at ($NEXT_TICK);
3176 $TICK_WATCHER->start;
3177
3178 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3925 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3926
3181 _post_tick; 3927 if (0) {
3182 3928 if ($NEXT_TICK) {
3183 3929 my $jitter = $TICK_START - $NEXT_TICK;
3930 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3931 warn "jitter $JITTER\n";#d#
3932 }
3184 }, 3933 }
3185); 3934}
3186 3935
3187{ 3936{
3188 BDB::max_poll_time $TICK * 0.1; 3937 # configure BDB
3189 $BDB_POLL_WATCHER = Event->io ( 3938
3190 reentrant => 0,
3191 fd => BDB::poll_fileno,
3192 poll => 'r',
3193 prio => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb,
3196 );
3197 BDB::min_parallel 8; 3939 BDB::min_parallel 8;
3198 3940 BDB::max_poll_reqs $TICK * 0.1;
3199 BDB::set_sync_prepare { 3941 $AnyEvent::BDB::WATCHER->priority (1);
3200 my $status;
3201 my $current = $Coro::current;
3202 (
3203 sub {
3204 $status = $!;
3205 $current->ready; undef $current;
3206 },
3207 sub {
3208 Coro::schedule while defined $current;
3209 $! = $status;
3210 },
3211 )
3212 };
3213 3942
3214 unless ($DB_ENV) { 3943 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create; 3944 $DB_ENV = BDB::db_env_create;
3945 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3946 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3947 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3948 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3949 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216 3950
3217 cf::sync_job { 3951 cf::sync_job {
3218 eval { 3952 eval {
3219 BDB::db_env_open 3953 BDB::db_env_open
3220 $DB_ENV, 3954 $DB_ENV,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3956 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3957 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3958 0666;
3225 3959
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3960 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3961 };
3231 3962
3232 cf::cleanup "db_env_open(db): $@" if $@; 3963 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3964 };
3234 } 3965 }
3966
3967 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3968 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3969 };
3970 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3971 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3972 };
3973 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3974 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3975 };
3235} 3976}
3236 3977
3237{ 3978{
3979 # configure IO::AIO
3980
3238 IO::AIO::min_parallel 8; 3981 IO::AIO::min_parallel 8;
3239
3240 undef $Coro::AIO::WATCHER;
3241 IO::AIO::max_poll_time $TICK * 0.1; 3982 IO::AIO::max_poll_time $TICK * 0.1;
3242 $AIO_POLL_WATCHER = Event->io ( 3983 undef $AnyEvent::AIO::WATCHER;
3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
3245 fd => IO::AIO::poll_fileno,
3246 poll => 'r',
3247 prio => 6,
3248 cb => \&IO::AIO::poll_cb,
3249 );
3250} 3984}
3251 3985
3252my $_log_backtrace; 3986my $_log_backtrace;
3253 3987
3254sub _log_backtrace { 3988sub _log_backtrace {
3257 $msg =~ s/\n//; 3991 $msg =~ s/\n//;
3258 3992
3259 # limit the # of concurrent backtraces 3993 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) { 3994 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace; 3995 ++$_log_backtrace;
3996 my $perl_bt = Carp::longmess $msg;
3262 async { 3997 async {
3998 $Coro::current->{desc} = "abt $msg";
3999
3263 my @bt = fork_call { 4000 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr; 4001 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!"; 4004 or die "addr2line: $!";
3275 } 4012 }
3276 4013
3277 @funcs 4014 @funcs
3278 }; 4015 };
3279 4016
3280 LOG llevInfo, "[ABT] $msg\n"; 4017 LOG llevInfo, "[ABT] $perl_bt\n";
4018 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3281 LOG llevInfo, "[ABT] $_\n" for @bt; 4019 LOG llevInfo, "[ABT] $_\n" for @bt;
3282 --$_log_backtrace; 4020 --$_log_backtrace;
3283 }; 4021 };
3284 } else { 4022 } else {
3285 LOG llevInfo, "[ABT] $msg\n"; 4023 LOG llevInfo, "[ABT] $msg\n";
3286 LOG llevInfo, "[ABT] [suppressed]\n"; 4024 LOG llevInfo, "[ABT] [suppressed]\n";
3287 } 4025 }
3288} 4026}
3289 4027
3290# load additional modules 4028# load additional modules
3291use cf::pod; 4029require "cf/$_.pm" for @EXTRA_MODULES;
4030cf::_connect_to_perl_2;
3292 4031
3293END { cf::emergency_save } 4032END { cf::emergency_save }
3294 4033
32951 40341
3296 4035

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines