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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines