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.297 by root, Thu Jul 5 08:10:30 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 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 577 reset_signals;
435 local $SIG{__WARN__}; 578 &$cb
436 local $SIG{__DIE__}; 579 }, @args;
437 eval {
438 close $fh1;
439 580
440 my @res = eval { $cb->(@args) }; 581 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 582}
442 };
443 583
444 warn $@ if $@; 584=item $coin = coin_from_name $name
445 _exit 0; 585
446 } 586=cut
587
588our %coin_alias = (
589 "silver" => "silvercoin",
590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
447} 609}
448 610
449=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
450 612
451Returns a single value from the environment database. 613Returns a single value from the environment database.
… …
453=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
454 616
455Stores 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
456data 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).
457 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
458=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}
459 643
460our $DB; 644our $DB;
461 645
462sub db_init { 646sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 647 cf::sync_job {
467 eval { 648 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 649 };
477} 650}
478 651
479sub db_get($$) { 652sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
481 654
… …
531 if (1) { 704 if (1) {
532 $md5 = 705 $md5 =
533 join "\x00", 706 join "\x00",
534 $processversion, 707 $processversion,
535 map { 708 map {
536 Coro::cede; 709 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 711 } 0.. $#$src;
539 712
540 713
541 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
… …
579 752
580############################################################################# 753#############################################################################
581 754
582=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
583 756
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
587 760
588In 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>
589C<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
590Crossfire TRT). 763Deliantra).
591 764
592=over 4 765=over 4
593 766
594=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
595 768
… …
639=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
640 813
641Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
643 816
644Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 819
647These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
648 821
649=over 4 822=over 4
… …
847 "; 1020 ";
848 die if $@; 1021 die if $@;
849} 1022}
850 1023
851our $override; 1024our $override;
852our @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?
853 1026
854sub override { 1027sub override {
855 $override = 1; 1028 $override = 1;
856 @invoke_results = (); 1029 @INVOKE_RESULTS = (@_);
857} 1030}
858 1031
859sub do_invoke { 1032sub do_invoke {
860 my $event = shift; 1033 my $event = shift;
861 my $callbacks = shift; 1034 my $callbacks = shift;
862 1035
863 @invoke_results = (); 1036 @INVOKE_RESULTS = ();
864 1037
865 local $override; 1038 local $override;
866 1039
867 for (@$callbacks) { 1040 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1041 eval { &{$_->[1]} };
… …
877 } 1050 }
878 1051
879 0 1052 0
880} 1053}
881 1054
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1056
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1058
886Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
887 1060
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1063results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1064
892=back 1065=back
893 1066
894=cut 1067=cut
895 1068
896############################################################################# 1069#############################################################################
897# 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}
898 1113
899sub reattach { 1114sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1116 my ($obj) = @_;
902 1117
1118 # no longer needed after getting rid of delete_package?
903 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
904 1120
905 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
906 1122
907 @$registry = (); 1123 @$registry = ();
908 1124
… …
923cf::attachable->attach ( 1139cf::attachable->attach (
924 prio => -1000000, 1140 prio => -1000000,
925 on_instantiate => sub { 1141 on_instantiate => sub {
926 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
927 1143
928 $data = from_json $data; 1144 $data = decode_json $data;
929 1145
930 for (@$data) { 1146 for (@$data) {
931 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
932 1148
933 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
… …
949sub object_freezer_save { 1165sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
951 1167
952 sync_job { 1168 sync_job {
953 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
956 1173
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 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 }
961 close $fh; 1181 aio_close $fh;
962 1182
963 if (@$objs) { 1183 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1185 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1186 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1187 aio_write $fh, 0, (length $data), $data, 0;
968 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 }
969 close $fh; 1192 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1193 aio_rename "$filename.pst~", "$filename.pst";
971 } 1194 }
972 } else { 1195 } else {
973 aio_unlink "$filename.pst"; 1196 aio_unlink "$filename.pst";
974 } 1197 }
975 1198
976 aio_rename "$filename~", $filename; 1199 aio_rename "$filename~", $filename;
1200
1201 $filename =~ s%/[^/]+$%%;
1202 aio_pathsync $filename if $cf::USE_FSYNC;
977 } else { 1203 } else {
978 warn "FATAL: $filename~: $!\n"; 1204 warn "unable to save objects: $filename~: $!\n";
979 } 1205 }
980 } else { 1206 } else {
981 aio_unlink $filename; 1207 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1208 aio_unlink "$filename.pst";
983 } 1209 }
984 } 1210 };
985} 1211}
986 1212
987sub object_freezer_as_string { 1213sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1214 my ($rdata, $objs) = @_;
989 1215
… …
1001 or return; 1227 or return;
1002 1228
1003 unless (aio_stat "$filename.pst") { 1229 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1230 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1231 or return;
1232
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1233 my $st = eval { Coro::Storable::thaw $av };
1234 $av = $st->{objs};
1007 } 1235 }
1008 1236
1237 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1238 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1239 $decname, length $data, scalar @{$av || []};
1240
1011 return ($data, $av); 1241 ($data, $av)
1012} 1242}
1013 1243
1014=head2 COMMAND CALLBACKS 1244=head2 COMMAND CALLBACKS
1015 1245
1016=over 4 1246=over 4
… …
1070 my ($name, $cb) = @_; 1300 my ($name, $cb) = @_;
1071 1301
1072 $EXTICMD{$name} = $cb; 1302 $EXTICMD{$name} = $cb;
1073} 1303}
1074 1304
1305use File::Glob ();
1306
1075cf::player->attach ( 1307cf::player->attach (
1076 on_command => sub { 1308 on_command => sub {
1077 my ($pl, $name, $params) = @_; 1309 my ($pl, $name, $params) = @_;
1078 1310
1079 my $cb = $COMMAND{$name} 1311 my $cb = $COMMAND{$name}
… …
1089 my ($pl, $buf) = @_; 1321 my ($pl, $buf) = @_;
1090 1322
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1323 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1324
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1333 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1334 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1335 }
1336
1337 $pl->ext_reply ($reply, @reply)
1338 if $reply;
1339
1099 } else { 1340 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1341 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1342 }
1102 1343
1103 cf::override; 1344 cf::override;
1104 }, 1345 },
1105); 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}
1106 1360
1107sub load_extensions { 1361sub load_extensions {
1108 cf::sync_job { 1362 cf::sync_job {
1109 my %todo; 1363 my %todo;
1110 1364
… …
1130 1384
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1385 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1386 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1387
1134 $ext{source} = 1388 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1389 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1390 . "#line 1 \"$path\"\n{\n"
1137 . $source 1391 . $source
1138 . "\n};\n1"; 1392 . "\n};\n1";
1139 1393
1140 $todo{$base} = \%ext; 1394 $todo{$base} = \%ext;
… …
1156 my $msg = $@ ? "$v->{path}: $@\n" 1410 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1411 : "$v->{base}: extension inactive.\n";
1158 1412
1159 if (exists $v->{meta}{mandatory}) { 1413 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1414 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1415 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1416 }
1164 1417
1165 warn $msg; 1418 warn $msg;
1166 } 1419 }
1167 1420
… …
1181 1434
1182=back 1435=back
1183 1436
1184=head2 CORE EXTENSIONS 1437=head2 CORE EXTENSIONS
1185 1438
1186Functions and methods that extend core crossfire objects. 1439Functions and methods that extend core deliantra objects.
1187 1440
1188=cut 1441=cut
1189 1442
1190package cf::player; 1443package cf::player;
1191 1444
1192use Coro::AIO; 1445use Coro::AIO;
1193 1446
1194=head3 cf::player 1447=head3 cf::player
1195 1448
1196=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}
1197 1464
1198=item cf::player::find $login 1465=item cf::player::find $login
1199 1466
1200Returns the given player object, loading it if necessary (might block). 1467Returns the given player object, loading it if necessary (might block).
1201 1468
… …
1220 1487
1221sub exists($) { 1488sub exists($) {
1222 my ($login) = @_; 1489 my ($login) = @_;
1223 1490
1224 $cf::PLAYER{$login} 1491 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1492 or !aio_stat path $login
1226} 1493}
1227 1494
1228sub find($) { 1495sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1496 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1497 my $login = $_[0];
… …
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1504 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1505 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1506 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1507 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1508
1242 my $pl = load_pl path $login 1509 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1517 $cf::PLAYER{$login} = $pl
1245 } 1518 }
1246 } 1519 }
1247} 1520}
1248 1521
… …
1257 return if $pl->{deny_save}; 1530 return if $pl->{deny_save};
1258 1531
1259 aio_mkdir playerdir $pl, 0770; 1532 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1533 $pl->{last_save} = $cf::RUNTIME;
1261 1534
1535 cf::get_slot 0.01;
1536
1262 $pl->save_pl ($path); 1537 $pl->save_pl ($path);
1263 Coro::cede; 1538 cf::cede_to_tick;
1264} 1539}
1265 1540
1266sub new($) { 1541sub new($) {
1267 my ($login) = @_; 1542 my ($login) = @_;
1268 1543
… …
1274 $cf::PLAYER{$login} = $self; 1549 $cf::PLAYER{$login} = $self;
1275 1550
1276 $self 1551 $self
1277} 1552}
1278 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
1279=item $pl->quit_character 1564=item $pl->quit_character
1280 1565
1281Nukes the player without looking back. If logged in, the connection will 1566Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1567be destroyed. May block for a long time.
1283 1568
… …
1287 my ($pl) = @_; 1572 my ($pl) = @_;
1288 1573
1289 my $name = $pl->ob->name; 1574 my $name = $pl->ob->name;
1290 1575
1291 $pl->{deny_save} = 1; 1576 $pl->{deny_save} = 1;
1292 $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
1293 1578
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1579 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1580 $pl->deactivate;
1581 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1583 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1584 $pl->ns->destroy if $pl->ns;
1298 1585
1299 my $path = playerdir $pl; 1586 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1587 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1336 or return []; 1623 or return [];
1337 1624
1338 my @logins; 1625 my @logins;
1339 1626
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1633 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1634 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1635 $buf !~ /^password -------------$/m or next; # official not-valid tag
1636 }
1344 1637
1345 utf8::decode $login; 1638 utf8::decode $login;
1346 push @logins, $login; 1639 push @logins, $login;
1347 } 1640 }
1348 1641
… …
1375 } 1668 }
1376 1669
1377 \@paths 1670 \@paths
1378} 1671}
1379 1672
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1673=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1674
1382Expand crossfire pod fragments into protocol xml. 1675Expand deliantra pod fragments into protocol xml.
1383 1676
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s{H<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1430=item $player->ext_reply ($msgid, %msg) 1677=item $player->ext_reply ($msgid, @msg)
1431 1678
1432Sends an ext reply to the player. 1679Sends an ext reply to the player.
1433 1680
1434=cut 1681=cut
1435 1682
1436sub ext_reply($$%) { 1683sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1684 my ($self, $id, @msg) = @_;
1438 1685
1439 $msg{msgid} = $id; 1686 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1687}
1442 1688
1443=item $player->ext_event ($type, %msg) 1689=item $player->ext_msg ($type, @msg)
1444 1690
1445Sends an ext event to the client. 1691Sends an ext event to the client.
1446 1692
1447=cut 1693=cut
1448 1694
1449sub ext_event($$%) { 1695sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1696 my ($self, $type, @msg) = @_;
1451 1697
1452 $self->ns->ext_event ($type, %msg); 1698 $self->ns->ext_msg ($type, @msg);
1453} 1699}
1454 1700
1455=head3 cf::region 1701=head3 cf::region
1456 1702
1457=over 4 1703=over 4
… …
1470 my ($path) = @_; 1716 my ($path) = @_;
1471 1717
1472 my ($match, $specificity); 1718 my ($match, $specificity);
1473 1719
1474 for my $region (list) { 1720 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1721 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1722 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1723 if $region->specificity > $specificity;
1478 } 1724 }
1479 } 1725 }
1480 1726
… …
1501our $MAX_RESET = 3600; 1747our $MAX_RESET = 3600;
1502our $DEFAULT_RESET = 3000; 1748our $DEFAULT_RESET = 3000;
1503 1749
1504sub generate_random_map { 1750sub generate_random_map {
1505 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
1506 # mit "rum" bekleckern, nicht 1755 # mit "rum" bekleckern, nicht
1507 $self->_create_random_map ( 1756 $self->_create_random_map (
1508 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1757 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1509 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1758 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1510 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1759 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1600 $self->init; # pass $1 etc. 1849 $self->init; # pass $1 etc.
1601 return $self; 1850 return $self;
1602 } 1851 }
1603 } 1852 }
1604 1853
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1854 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1855 ()
1607} 1856}
1608 1857
1609sub init { 1858sub init {
1610 my ($self) = @_; 1859 my ($self) = @_;
… …
1632 1881
1633# the temporary/swap location 1882# the temporary/swap location
1634sub save_path { 1883sub save_path {
1635 my ($self) = @_; 1884 my ($self) = @_;
1636 1885
1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1886 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1638 "$TMPDIR/$path.map" 1887 "$TMPDIR/$path.map"
1639} 1888}
1640 1889
1641# the unique path, undef == no special unique path 1890# the unique path, undef == no special unique path
1642sub uniq_path { 1891sub uniq_path {
1643 my ($self) = @_; 1892 my ($self) = @_;
1644 1893
1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1894 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1646 "$UNIQUEDIR/$path" 1895 "$UNIQUEDIR/$path"
1647}
1648
1649# and all this just because we cannot iterate over
1650# all maps in C++...
1651sub change_all_map_light {
1652 my ($change) = @_;
1653
1654 $_->change_map_light ($change)
1655 for grep $_->outdoor, values %cf::MAP;
1656} 1896}
1657 1897
1658sub decay_objects { 1898sub decay_objects {
1659 my ($self) = @_; 1899 my ($self) = @_;
1660 1900
… …
1673 1913
1674sub load_header_from($) { 1914sub load_header_from($) {
1675 my ($self, $path) = @_; 1915 my ($self, $path) = @_;
1676 1916
1677 utf8::encode $path; 1917 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1918 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 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;
1683 1926
1684 $self->{load_path} = $path; 1927 $self->{load_path} = $path;
1685 1928
1686 1 1929 1
1687} 1930}
… …
1741sub find { 1984sub find {
1742 my ($path, $origin) = @_; 1985 my ($path, $origin) = @_;
1743 1986
1744 $path = normalise $path, $origin && $origin->path; 1987 $path = normalise $path, $origin && $origin->path;
1745 1988
1989 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 1990 my $guard2 = cf::lock_acquire "map_find:$path";
1747 1991
1748 $cf::MAP{$path} || do { 1992 $cf::MAP{$path} || do {
1749 my $guard = cf::lock_acquire "map_find:$path";
1750 my $map = new_from_path cf::map $path 1993 my $map = new_from_path cf::map $path
1751 or return; 1994 or return;
1752 1995
1753 $map->{last_save} = $cf::RUNTIME; 1996 $map->{last_save} = $cf::RUNTIME;
1754 1997
… …
1756 or return; 1999 or return;
1757 2000
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2001 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 2002 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 2003 #$cf::WAIT_FOR_TICK->wait;
2004 undef $guard2;
2005 undef $guard1;
1761 $map->reset; 2006 $map->reset;
1762 undef $guard;
1763 return find $path; 2007 return find $path;
1764 } 2008 }
1765 2009
1766 $cf::MAP{$path} = $map 2010 $cf::MAP{$path} = $map
1767 } 2011 }
… …
1776 local $self->{deny_reset} = 1; # loading can take a long time 2020 local $self->{deny_reset} = 1; # loading can take a long time
1777 2021
1778 my $path = $self->{path}; 2022 my $path = $self->{path};
1779 2023
1780 { 2024 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 2025 my $guard = cf::lock_acquire "map_data:$path";
1782 2026
2027 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 2028 return unless $self->in_memory == cf::MAP_SWAPPED;
1784 2029
1785 $self->in_memory (cf::MAP_LOADING); 2030 $self->in_memory (cf::MAP_LOADING);
1786 2031
1787 $self->alloc; 2032 $self->alloc;
1788 2033
1789 $self->pre_load; 2034 $self->pre_load;
1790 Coro::cede; 2035 cf::cede_to_tick;
1791 2036
2037 my $f = new_from_file cf::object::thawer $self->{load_path};
2038 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 2039 $self->_load_objects ($f)
1793 or return; 2040 or return;
1794 2041
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2042 $self->post_load_original
1796 if delete $self->{load_original}; 2043 if delete $self->{load_original};
1797 2044
1798 if (my $uniq = $self->uniq_path) { 2045 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 2046 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 2047 unless (aio_stat $uniq) {
2048 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 2049 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 2050 $self->_load_objects ($f);
2051 $f->resolve_delayed_derefs;
2052 }
1803 } 2053 }
1804 } 2054 }
1805 2055
1806 Coro::cede; 2056 $f->resolve_delayed_derefs;
2057
2058 cf::cede_to_tick;
1807 # now do the right thing for maps 2059 # now do the right thing for maps
1808 $self->link_multipart_objects; 2060 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 2061 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 2062 unless $self->difficulty;
1811 Coro::cede; 2063 cf::cede_to_tick;
1812 2064
1813 unless ($self->{deny_activate}) { 2065 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 2066 $self->decay_objects;
1815 $self->fix_auto_apply; 2067 $self->fix_auto_apply;
1816 $self->update_buttons; 2068 $self->update_buttons;
1817 Coro::cede; 2069 cf::cede_to_tick;
1818 $self->set_darkness_map;
1819 Coro::cede;
1820 $self->activate; 2070 $self->activate;
1821 } 2071 }
1822 2072
2073 $self->{last_save} = $cf::RUNTIME;
2074 $self->last_access ($cf::RUNTIME);
2075
1823 $self->in_memory (cf::MAP_IN_MEMORY); 2076 $self->in_memory (cf::MAP_ACTIVE);
1824 } 2077 }
1825 2078
1826 $self->post_load; 2079 $self->post_load;
1827} 2080}
1828 2081
… …
1837 2090
1838 $self 2091 $self
1839} 2092}
1840 2093
1841# 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
1842sub load_diag { 2095sub load_neighbours {
1843 my ($map) = @_; 2096 my ($map) = @_;
1844 2097
1845 my @diag; # diagonal neighbours 2098 my @neigh; # diagonal neighbours
1846 2099
1847 for (0 .. 3) { 2100 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 2101 my $neigh = $map->tile_path ($_)
1849 or next; 2102 or next;
1850 $neigh = find $neigh, $map 2103 $neigh = find $neigh, $map
1851 or next; 2104 or next;
1852 $neigh->load; 2105 $neigh->load;
1853 2106
2107 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2108 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2109 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 2110 }
1857 2111
1858 for (@diag) { 2112 for (grep defined $_->[0], @neigh) {
2113 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 2114 my $neigh = find $path, $origin
1860 or next; 2115 or next;
1861 $neigh->load; 2116 $neigh->load;
1862 } 2117 }
1863} 2118}
1864 2119
… …
1869} 2124}
1870 2125
1871sub do_load_sync { 2126sub do_load_sync {
1872 my ($map) = @_; 2127 my ($map) = @_;
1873 2128
2129 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2130 if $Coro::current == $Coro::main;
2131
1874 cf::sync_job { $map->load }; 2132 cf::sync_job { $map->load };
1875} 2133}
1876 2134
1877our %MAP_PREFETCH; 2135our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2136our $MAP_PREFETCHER = undef;
1879 2137
1880sub find_async { 2138sub find_async {
1881 my ($path, $origin) = @_; 2139 my ($path, $origin, $load) = @_;
1882 2140
1883 $path = normalise $path, $origin && $origin->{path}; 2141 $path = normalise $path, $origin && $origin->{path};
1884 2142
1885 if (my $map = $cf::MAP{$path}) { 2143 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2144 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1887 } 2145 }
1888 2146
1889 undef $MAP_PREFETCH{$path}; 2147 $MAP_PREFETCH{$path} |= $load;
2148
1890 $MAP_PREFETCHER ||= cf::async { 2149 $MAP_PREFETCHER ||= cf::async {
2150 $Coro::current->{desc} = "map prefetcher";
2151
1891 while (%MAP_PREFETCH) { 2152 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2153 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2154 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2155 $map->load if $v;
2156 }
1896 2157
1897 delete $MAP_PREFETCH{$path}; 2158 delete $MAP_PREFETCH{$k};
1898 } 2159 }
1899 } 2160 }
1900 undef $MAP_PREFETCHER; 2161 undef $MAP_PREFETCHER;
1901 }; 2162 };
1902 $MAP_PREFETCHER->prio (6); 2163 $MAP_PREFETCHER->prio (6);
… …
1905} 2166}
1906 2167
1907sub save { 2168sub save {
1908 my ($self) = @_; 2169 my ($self) = @_;
1909 2170
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2171 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2172
1912 $self->{last_save} = $cf::RUNTIME; 2173 $self->{last_save} = $cf::RUNTIME;
1913 2174
1914 return unless $self->dirty; 2175 return unless $self->dirty;
1915 2176
… …
1921 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1922 2183
1923 local $self->{last_access} = $self->last_access;#d# 2184 local $self->{last_access} = $self->last_access;#d#
1924 2185
1925 cf::async { 2186 cf::async {
2187 $Coro::current->{desc} = "map player save";
1926 $_->contr->save for $self->players; 2188 $_->contr->save for $self->players;
1927 }; 2189 };
2190
2191 cf::get_slot 0.02;
1928 2192
1929 if ($uniq) { 2193 if ($uniq) {
1930 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2194 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1931 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2195 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1932 } else { 2196 } else {
… …
1938 my ($self) = @_; 2202 my ($self) = @_;
1939 2203
1940 # save first because save cedes 2204 # save first because save cedes
1941 $self->save; 2205 $self->save;
1942 2206
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2207 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2208
1945 return if $self->players; 2209 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2210 return if $self->in_memory != cf::MAP_ACTIVE;
1947 return if $self->{deny_save}; 2211 return if $self->{deny_save};
1948 2212
2213 $self->in_memory (cf::MAP_SWAPPED);
2214
2215 $self->deactivate;
2216 $_->clear_links_to ($self) for values %cf::MAP;
1949 $self->clear; 2217 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED);
1951} 2218}
1952 2219
1953sub reset_at { 2220sub reset_at {
1954 my ($self) = @_; 2221 my ($self) = @_;
1955 2222
… …
1973 2240
1974 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
1975 2242
1976 return if $self->players; 2243 return if $self->players;
1977 2244
1978 warn "resetting map ", $self->path; 2245 warn "resetting map ", $self->path, "\n";
1979 2246
1980 $self->in_memory (cf::MAP_SWAPPED); 2247 $self->in_memory (cf::MAP_SWAPPED);
1981 2248
1982 # need to save uniques path 2249 # need to save uniques path
1983 unless ($self->{deny_save}) { 2250 unless ($self->{deny_save}) {
… …
1987 if $uniq; 2254 if $uniq;
1988 } 2255 }
1989 2256
1990 delete $cf::MAP{$self->path}; 2257 delete $cf::MAP{$self->path};
1991 2258
2259 $self->deactivate;
2260 $_->clear_links_to ($self) for values %cf::MAP;
1992 $self->clear; 2261 $self->clear;
1993
1994 $_->clear_links_to ($self) for values %cf::MAP;
1995 2262
1996 $self->unlink_save; 2263 $self->unlink_save;
1997 $self->destroy; 2264 $self->destroy;
1998} 2265}
1999 2266
2000my $nuke_counter = "aaaa"; 2267my $nuke_counter = "aaaa";
2001 2268
2002sub nuke { 2269sub nuke {
2003 my ($self) = @_; 2270 my ($self) = @_;
2004 2271
2272 {
2273 my $lock = cf::lock_acquire "map_data:$self->{path}";
2274
2005 delete $cf::MAP{$self->path}; 2275 delete $cf::MAP{$self->path};
2006 2276
2007 $self->unlink_save; 2277 $self->unlink_save;
2008 2278
2009 bless $self, "cf::map"; 2279 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2280 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2281 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2282 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2283 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2284
2015 $cf::MAP{$self->path} = $self; 2285 $cf::MAP{$self->path} = $self;
2286 }
2016 2287
2017 $self->reset; # polite request, might not happen 2288 $self->reset; # polite request, might not happen
2018} 2289}
2019 2290
2020=item $maps = cf::map::tmp_maps 2291=item $maps = cf::map::tmp_maps
… …
2062 2333
2063sub unique_maps() { 2334sub unique_maps() {
2064 [ 2335 [
2065 map { 2336 map {
2066 utf8::decode $_; 2337 utf8::decode $_;
2067 /\.map$/ 2338 s/\.map$//; # TODO future compatibility hack
2339 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2340 ? ()
2068 ? normalise $_ 2341 : normalise $_
2069 : ()
2070 } @{ aio_readdir $UNIQUEDIR or [] } 2342 } @{ aio_readdir $UNIQUEDIR or [] }
2071 ] 2343 ]
2072} 2344}
2073 2345
2074package 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}
2075 2374
2076=back 2375=back
2077 2376
2078=head3 cf::object 2377=head3 cf::object
2079 2378
… …
2083 2382
2084=over 4 2383=over 4
2085 2384
2086=item $ob->inv_recursive 2385=item $ob->inv_recursive
2087 2386
2088Returns 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.
2089 2389
2090=cut 2390=cut
2091 2391
2092sub inv_recursive_; 2392sub inv_recursive_;
2093sub inv_recursive_ { 2393sub inv_recursive_ {
… …
2096 2396
2097sub inv_recursive { 2397sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2398 inv_recursive_ inv $_[0]
2099} 2399}
2100 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
2101package cf; 2429package cf;
2102 2430
2103=back 2431=back
2104 2432
2105=head3 cf::object::player 2433=head3 cf::object::player
… …
2111Sends 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>
2112can 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
2113dialogue with the given NPC character. 2441dialogue with the given NPC character.
2114 2442
2115=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};
2116 2458
2117# rough implementation of a future "reply" method that works 2459# rough implementation of a future "reply" method that works
2118# with dialog boxes. 2460# with dialog boxes.
2119#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
2120sub cf::object::player::reply($$$;$) { 2462sub cf::object::player::reply($$$;$) {
… …
2127 2469
2128 } else { 2470 } else {
2129 my $pl = $self->contr; 2471 my $pl = $self->contr;
2130 2472
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2473 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2474 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2475 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2476
2140 } else { 2477 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2478 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2479 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2143 } 2480 }
2144 } 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 (@_);
2145} 2492}
2146 2493
2147=item $player_object->may ("access") 2494=item $player_object->may ("access")
2148 2495
2149Returns wether the given player is authorized to access resource "access" 2496Returns wether the given player is authorized to access resource "access"
… …
2162 2509
2163=item $player_object->enter_link 2510=item $player_object->enter_link
2164 2511
2165Freezes 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}>).
2166 2513
2167The 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.
2168I<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.
2169 2518
2170Will never block. 2519Will never block.
2171 2520
2172=item $player_object->leave_link ($map, $x, $y) 2521=item $player_object->leave_link ($map, $x, $y)
2173 2522
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2577 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2578 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2579 if $x <=0 && $y <= 0;
2231 2580
2232 $map->load; 2581 $map->load;
2233 $map->load_diag; 2582 $map->load_neighbours;
2234 2583
2235 return unless $self->contr->active; 2584 return unless $self->contr->active;
2236 $self->activate_recursive;
2237 2585
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2586 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2587 $self->enter_map ($map, $x, $y);
2240}
2241 2588
2589 # only activate afterwards, to support waiting in hooks
2590 $self->activate_recursive;
2591}
2592
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2593=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2594
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2596her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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 >>.
2248 2603
2249=cut 2604=cut
2250 2605
2251our $GOTOGEN; 2606our $GOTOGEN;
2252 2607
2253sub cf::object::player::goto { 2608sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2609 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2610
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2612 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2613
2259 $self->enter_link; 2614 $self->enter_link;
2260 2615
2261 (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
2262 my $map = eval { 2638 my $map = eval {
2263 my $map = cf::map::find $path; 2639 my $map = defined $path ? cf::map::find $path : undef;
2264 2640
2265 if ($map) { 2641 if ($map) {
2266 $map = $map->customise_for ($self); 2642 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2643 $map = $check->($map) if $check && $map;
2268 } else { 2644 } else {
2269 $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);
2270 } 2646 }
2271 2647
2272 $map 2648 $map
2273 }; 2649 };
2274 2650
… …
2279 2655
2280 if ($gen == $self->{_goto_generation}) { 2656 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2657 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2658 $self->leave_link ($map, $x, $y);
2283 } 2659 }
2660
2661 $done->() if $done;
2284 })->prio (1); 2662 })->prio (1);
2285} 2663}
2286 2664
2287=item $player_object->enter_exit ($exit_object) 2665=item $player_object->enter_exit ($exit_object)
2288 2666
… …
2308} 2686}
2309 2687
2310sub prepare_random_map { 2688sub prepare_random_map {
2311 my ($exit) = @_; 2689 my ($exit) = @_;
2312 2690
2313 my $guard = cf::lock_acquire "exit_prepare:$exit";
2314
2315 # all this does is basically replace the /! path by 2691 # all this does is basically replace the /! path by
2316 # a new random map path (?random/...) with a seed 2692 # a new random map path (?random/...) with a seed
2317 # that depends on the exit object 2693 # that depends on the exit object
2318 2694
2319 my $rmp = parse_random_map_params $exit->msg; 2695 my $rmp = parse_random_map_params $exit->msg;
… …
2321 if ($exit->map) { 2697 if ($exit->map) {
2322 $rmp->{region} = $exit->region->name; 2698 $rmp->{region} = $exit->region->name;
2323 $rmp->{origin_map} = $exit->map->path; 2699 $rmp->{origin_map} = $exit->map->path;
2324 $rmp->{origin_x} = $exit->x; 2700 $rmp->{origin_x} = $exit->x;
2325 $rmp->{origin_y} = $exit->y; 2701 $rmp->{origin_y} = $exit->y;
2702
2703 $exit->map->touch;
2326 } 2704 }
2327 2705
2328 $rmp->{random_seed} ||= $exit->random_seed; 2706 $rmp->{random_seed} ||= $exit->random_seed;
2329 2707
2330 my $data = cf::to_json $rmp; 2708 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2331 my $md5 = Digest::MD5::md5_hex $data; 2709 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2710 my $meta = "$RANDOMDIR/$md5.meta";
2333 2711
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2712 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2713 aio_write $fh, 0, (length $data), $data, 0;
2336 undef $fh; 2714 undef $fh;
2337 aio_rename "$meta~", $meta; 2715 aio_rename "$meta~", $meta;
2338 2716
2717 my $slaying = "?random/$md5";
2718
2719 if ($exit->valid) {
2339 $exit->slaying ("?random/$md5"); 2720 $exit->slaying ("?random/$md5");
2340 $exit->msg (undef); 2721 $exit->msg (undef);
2722 }
2341 } 2723 }
2342} 2724}
2343 2725
2344sub cf::object::player::enter_exit { 2726sub cf::object::player::enter_exit {
2345 my ($self, $exit) = @_; 2727 my ($self, $exit) = @_;
2346 2728
2347 return unless $self->type == cf::PLAYER; 2729 return unless $self->type == cf::PLAYER;
2348 2730
2349 if ($exit->slaying eq "/!") {
2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
2353 cf::sync_job { prepare_random_map $exit };
2354 }
2355
2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2357 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp;
2359
2360 $self->enter_link; 2731 $self->enter_link;
2361 2732
2362 # if exit is damned, update players death & WoR home-position
2363 $self->contr->savebed ($slaying, $hp, $sp)
2364 if $exit->flag (FLAG_DAMNED);
2365
2366 (async { 2733 (async {
2367 $self->deactivate_recursive; # just to be sure 2734 $Coro::current->{desc} = "enter_exit";
2735
2368 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
2369 $self->goto ($slaying, $hp, $sp); 2751 $self->goto ($map, $x, $y);
2370 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
2371 1; 2757 1
2372 }) { 2758 }) {
2373 $self->message ("Something went wrong deep within the crossfire server. " 2759 $self->message ("Something went wrong deep within the deliantra server. "
2374 . "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. "
2375 . "Please report this to the dungeon master!", 2761 . "Please report this to the dungeon master!",
2376 cf::NDI_UNIQUE | cf::NDI_RED); 2762 cf::NDI_UNIQUE | cf::NDI_RED);
2377 2763
2378 warn "ERROR in enter_exit: $@"; 2764 warn "ERROR in enter_exit: $@";
… …
2397 2783
2398 utf8::encode $text; 2784 utf8::encode $text;
2399 $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);
2400} 2786}
2401 2787
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2788=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2789
2404Send 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
2405client 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
2406the 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
2407the message unless the client supports the msg packet. 2793the message unless the client supports the msg packet.
2408 2794
2409=cut 2795=cut
2410 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
2411sub cf::client::send_msg { 2911sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2912 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2913
2414 $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 }
2415 2935
2416 return unless @extra || length $msg; 2936 return unless @extra || length $msg;
2417 2937
2418 if ($self->can_msg) { 2938 # default colour, mask it out
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2939 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2420 } else { 2940 if $color & cf::NDI_DEF;
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430 2941
2431 if ($color >= 0) { 2942 my $pkt = "msg "
2432 if (0 && $msg =~ /\[/) { 2943 . $self->{json_coder}->encode (
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2944 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2434 } else { 2945 );
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg")
2437 }
2438 }
2439 }
2440}
2441 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
2442=item $client->ext_event ($type, %msg) 2960=item $client->ext_msg ($type, @msg)
2443 2961
2444Sends an ext event to the client. 2962Sends an ext event to the client.
2445 2963
2446=cut 2964=cut
2447 2965
2448sub cf::client::ext_event($$%) { 2966sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2967 my ($self, $type, @msg) = @_;
2450 2968
2969 if ($self->extcmd == 2) {
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2971 } elsif ($self->extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2972 push @msg, msgtype => "event_$type";
2452 $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 }
2453} 2993}
2454 2994
2455=item $success = $client->query ($flags, "text", \&cb) 2995=item $success = $client->query ($flags, "text", \&cb)
2456 2996
2457Queues a query to the client, calling the given callback with 2997Queues a query to the client, calling the given callback with
… …
2512 my ($ns, $buf) = @_; 3052 my ($ns, $buf) = @_;
2513 3053
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3054 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 3055
2516 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
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3064 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 3065 @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 } 3066 }
3067
3068 $ns->ext_reply ($reply, @reply)
3069 if $reply;
3070
2523 } else { 3071 } else {
2524 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";
2525 } 3073 }
2526 3074
2527 cf::override; 3075 cf::override;
… …
2574our $safe = new Safe "safe"; 3122our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 3123our $safe_hole = new Safe::Hole;
2576 3124
2577$SIG{FPE} = 'IGNORE'; 3125$SIG{FPE} = 'IGNORE';
2578 3126
2579$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));
2580 3132
2581# here we export the classes and methods available to script code 3133# here we export the classes and methods available to script code
2582 3134
2583=pod 3135=pod
2584 3136
2585The following functions and methods are available within a safe environment: 3137The following functions and methods are available within a safe environment:
2586 3138
2587 cf::object 3139 cf::object
2588 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
2589 insert remove 3141 insert remove name archname title slaying race decrease split
3142 value
2590 3143
2591 cf::object::player 3144 cf::object::player
2592 player 3145 player
2593 3146
2594 cf::player 3147 cf::player
… …
2599 3152
2600=cut 3153=cut
2601 3154
2602for ( 3155for (
2603 ["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
2604 insert remove)], 3157 insert remove inv nrof name archname title slaying race
3158 decrease split destroy change_exp value msg lore send_msg)],
2605 ["cf::object::player" => qw(player)], 3159 ["cf::object::player" => qw(player)],
2606 ["cf::player" => qw(peaceful)], 3160 ["cf::player" => qw(peaceful send_msg)],
2607 ["cf::map" => qw(trigger)], 3161 ["cf::map" => qw(trigger)],
2608) { 3162) {
2609 no strict 'refs'; 3163 no strict 'refs';
2610 my ($pkg, @funs) = @$_; 3164 my ($pkg, @funs) = @$_;
2611 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3165 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2628 my ($code, %vars) = @_; 3182 my ($code, %vars) = @_;
2629 3183
2630 my $qcode = $code; 3184 my $qcode = $code;
2631 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3185 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2632 $qcode =~ s/\n/\\n/g; 3186 $qcode =~ s/\n/\\n/g;
3187
3188 %vars = (_dummy => 0) unless %vars;
2633 3189
2634 local $_; 3190 local $_;
2635 local @safe::cf::_safe_eval_args = values %vars; 3191 local @safe::cf::_safe_eval_args = values %vars;
2636 3192
2637 my $eval = 3193 my $eval =
… …
2685# the server's init and main functions 3241# the server's init and main functions
2686 3242
2687sub load_facedata($) { 3243sub load_facedata($) {
2688 my ($path) = @_; 3244 my ($path) = @_;
2689 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
2690 warn "loading facedata from $path\n"; 3252 warn "loading facedata from $path\n";
2691 3253
2692 my $facedata; 3254 my $facedata;
2693 0 < aio_load $path, $facedata 3255 0 < aio_load $path, $facedata
2694 or die "$path: $!"; 3256 or die "$path: $!";
… …
2696 $facedata = Coro::Storable::thaw $facedata; 3258 $facedata = Coro::Storable::thaw $facedata;
2697 3259
2698 $facedata->{version} == 2 3260 $facedata->{version} == 2
2699 or cf::cleanup "$path: version mismatch, cannot proceed."; 3261 or cf::cleanup "$path: version mismatch, cannot proceed.";
2700 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
2701 { 3270 {
2702 my $faces = $facedata->{faceinfo}; 3271 my $faces = $facedata->{faceinfo};
2703 3272
2704 while (my ($face, $info) = each %$faces) { 3273 while (my ($face, $info) = each %$faces) {
2705 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3274 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3275
2706 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3276 cf::face::set_visibility $idx, $info->{visibility};
3277 cf::face::set_magicmap $idx, $info->{magicmap};
2707 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3278 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2708 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3279 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2709 Coro::cede; 3280
3281 cf::cede_to_tick;
2710 } 3282 }
2711 3283
2712 while (my ($face, $info) = each %$faces) { 3284 while (my ($face, $info) = each %$faces) {
2713 next unless $info->{smooth}; 3285 next unless $info->{smooth};
3286
2714 my $idx = cf::face::find $face 3287 my $idx = cf::face::find $face
2715 or next; 3288 or next;
3289
2716 if (my $smooth = cf::face::find $info->{smooth}) { 3290 if (my $smooth = cf::face::find $info->{smooth}) {
3291 cf::face::set_smooth $idx, $smooth;
2717 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3292 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718 } else { 3293 } else {
2719 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3294 warn "smooth face '$info->{smooth}' not found for face '$face'";
2720 } 3295 }
2721 Coro::cede; 3296
3297 cf::cede_to_tick;
2722 } 3298 }
2723 } 3299 }
2724 3300
2725 { 3301 {
2726 my $anims = $facedata->{animinfo}; 3302 my $anims = $facedata->{animinfo};
2727 3303
2728 while (my ($anim, $info) = each %$anims) { 3304 while (my ($anim, $info) = each %$anims) {
2729 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3305 cf::anim::set $anim, $info->{frames}, $info->{facings};
2730 Coro::cede; 3306 cf::cede_to_tick;
2731 } 3307 }
2732 3308
2733 cf::anim::invalidate_all; # d'oh 3309 cf::anim::invalidate_all; # d'oh
2734 } 3310 }
2735 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
2736 1 3347 1
2737} 3348}
2738 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
2739sub 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
2740 load_resource_file "$MAPDIR/regions" 3393 load_resource_file "$MAPDIR/regions"
2741 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 }
2742} 3400}
2743 3401
2744sub reload_facedata { 3402sub reload_facedata {
2745 load_facedata "$DATADIR/facedata" 3403 load_facedata "$DATADIR/facedata"
2746 or die "unable to load facedata\n"; 3404 or die "unable to load facedata\n";
2747} 3405}
2748 3406
2749sub reload_archetypes { 3407sub reload_archetypes {
2750 load_resource_file "$DATADIR/archetypes" 3408 load_resource_file "$DATADIR/archetypes"
2751 or die "unable to load archetypes\n"; 3409 or die "unable to load archetypes\n";
2752 #d# NEED to laod twice to resolve forward references
2753 # this really needs to be done in an extra post-pass
2754 # (which needs to be synchronous, so solve it differently)
2755 load_resource_file "$DATADIR/archetypes"
2756 or die "unable to load archetypes\n";
2757} 3410}
2758 3411
2759sub reload_treasures { 3412sub reload_treasures {
2760 load_resource_file "$DATADIR/treasures" 3413 load_resource_file "$DATADIR/treasures"
2761 or die "unable to load treasurelists\n"; 3414 or die "unable to load treasurelists\n";
2762} 3415}
2763 3416
2764sub reload_resources { 3417sub reload_resources {
2765 warn "reloading resource files...\n"; 3418 warn "reloading resource files...\n";
2766 3419
3420 reload_facedata;
3421 reload_archetypes;
2767 reload_regions; 3422 reload_regions;
2768 reload_facedata;
2769 #reload_archetypes;#d#
2770 reload_archetypes;
2771 reload_treasures; 3423 reload_treasures;
2772 3424
2773 warn "finished reloading resource files\n"; 3425 warn "finished reloading resource files\n";
2774} 3426}
2775 3427
2776sub init { 3428sub reload_config {
2777 reload_resources; 3429 warn "reloading config file...\n";
2778}
2779 3430
2780sub cfg_load {
2781 open my $fh, "<:utf8", "$CONFDIR/config" 3431 open my $fh, "<:utf8", "$CONFDIR/config"
2782 or return; 3432 or return;
2783 3433
2784 local $/; 3434 local $/;
2785 *CFG = YAML::Syck::Load <$fh>; 3435 *CFG = YAML::XS::Load scalar <$fh>;
2786 3436
2787 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3437 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2788 3438
2789 $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};
2790 $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};
… …
2794 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3444 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2795 and die "WARNING: m(un)lockall failed: $!\n"; 3445 and die "WARNING: m(un)lockall failed: $!\n";
2796 }; 3446 };
2797 warn $@ if $@; 3447 warn $@ if $@;
2798 } 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;
2799} 3479}
2800 3480
2801sub 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
2802 # we must not ever block the main coroutine 3496 # we must not ever block the main coroutine
2803 local $Coro::idle = sub { 3497 local $Coro::idle = sub {
2804 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#
2805 (async { 3499 (async {
2806 Event::one_event; 3500 $Coro::current->{desc} = "IDLE BUG HANDLER";
3501 EV::loop EV::LOOP_ONESHOT;
2807 })->prio (Coro::PRIO_MAX); 3502 })->prio (Coro::PRIO_MAX);
2808 }; 3503 };
2809 3504
2810 cfg_load; 3505 evthread_start IO::AIO::poll_fileno;
3506
3507 cf::sync_job {
3508 reload_resources;
3509 reload_config;
2811 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
2812 load_extensions; 3523 load_extensions;
2813 3524
2814 $TICK_WATCHER->start; 3525 utime time, time, $RUNTIMEFILE;
2815 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;
2816} 3535}
2817 3536
2818############################################################################# 3537#############################################################################
2819# initialisation and cleanup 3538# initialisation and cleanup
2820 3539
2821# install some emergency cleanup handlers 3540# install some emergency cleanup handlers
2822BEGIN { 3541BEGIN {
3542 our %SIGWATCHER = ();
2823 for my $signal (qw(INT HUP TERM)) { 3543 for my $signal (qw(INT HUP TERM)) {
2824 Event->signal ( 3544 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2825 reentrant => 0,
2826 data => WF_AUTOCANCEL,
2827 signal => $signal,
2828 prio => 0,
2829 cb => sub {
2830 cf::cleanup "SIG$signal"; 3545 cf::cleanup "SIG$signal";
2831 },
2832 ); 3546 };
2833 } 3547 }
2834} 3548}
2835 3549
2836sub write_runtime { 3550sub write_runtime_sync {
2837 my $runtime = "$LOCALDIR/runtime";
2838
2839 # first touch the runtime file to show we are still running: 3551 # first touch the runtime file to show we are still running:
2840 # the fsync below can take a very very long time. 3552 # the fsync below can take a very very long time.
2841 3553
2842 IO::AIO::aio_utime $runtime, undef, undef; 3554 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2843 3555
2844 my $guard = cf::lock_acquire "write_runtime"; 3556 my $guard = cf::lock_acquire "write_runtime";
2845 3557
2846 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3558 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2847 or return; 3559 or return;
2848 3560
2849 my $value = $cf::RUNTIME + 90 + 10; 3561 my $value = $cf::RUNTIME + 90 + 10;
2850 # 10 is the runtime save interval, for a monotonic clock 3562 # 10 is the runtime save interval, for a monotonic clock
2851 # 60 allows for the watchdog to kill the server. 3563 # 60 allows for the watchdog to kill the server.
… …
2861 aio_utime $fh, undef, undef; 3573 aio_utime $fh, undef, undef;
2862 3574
2863 close $fh 3575 close $fh
2864 or return; 3576 or return;
2865 3577
2866 aio_rename "$runtime~", $runtime 3578 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2867 and return; 3579 and return;
2868 3580
2869 warn "runtime file written.\n"; 3581 warn "runtime file written.\n";
2870 3582
2871 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 };
2872} 3634}
2873 3635
2874sub emergency_save() { 3636sub emergency_save() {
2875 my $freeze_guard = cf::freeze_mainloop; 3637 my $freeze_guard = cf::freeze_mainloop;
2876 3638
2877 warn "enter emergency perl save\n"; 3639 warn "emergency_perl_save: enter\n";
2878 3640
2879 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
2880 # use a peculiar iteration method to avoid tripping on perl 3647 # use a peculiar iteration method to avoid tripping on perl
2881 # refcount bugs in for. also avoids problems with players 3648 # refcount bugs in for. also avoids problems with players
2882 # and maps saved/destroyed asynchronously. 3649 # and maps saved/destroyed asynchronously.
2883 warn "begin emergency player save\n"; 3650 warn "emergency_perl_save: begin player save\n";
2884 for my $login (keys %cf::PLAYER) { 3651 for my $login (keys %cf::PLAYER) {
2885 my $pl = $cf::PLAYER{$login} or next; 3652 my $pl = $cf::PLAYER{$login} or next;
2886 $pl->valid or next; 3653 $pl->valid or next;
3654 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2887 $pl->save; 3655 $pl->save;
2888 } 3656 }
2889 warn "end emergency player save\n"; 3657 warn "emergency_perl_save: end player save\n";
2890 3658
2891 warn "begin emergency map save\n"; 3659 warn "emergency_perl_save: begin map save\n";
2892 for my $path (keys %cf::MAP) { 3660 for my $path (keys %cf::MAP) {
2893 my $map = $cf::MAP{$path} or next; 3661 my $map = $cf::MAP{$path} or next;
2894 $map->valid or next; 3662 $map->valid or next;
2895 $map->save; 3663 $map->save;
2896 } 3664 }
2897 warn "end emergency map save\n"; 3665 warn "emergency_perl_save: end map save\n";
2898 3666
2899 warn "begin emergency database checkpoint\n"; 3667 warn "emergency_perl_save: begin database checkpoint\n";
2900 BDB::db_env_txn_checkpoint $DB_ENV; 3668 BDB::db_env_txn_checkpoint $DB_ENV;
2901 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";
2902 }; 3674 };
2903 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
2904 warn "leave emergency perl save\n"; 3681 warn "emergency_perl_save: leave\n";
2905} 3682}
2906 3683
2907sub post_cleanup { 3684sub post_cleanup {
2908 my ($make_core) = @_; 3685 my ($make_core) = @_;
2909 3686
2910 warn Carp::longmess "post_cleanup backtrace" 3687 warn Carp::longmess "post_cleanup backtrace"
2911 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#
2912} 3718}
2913 3719
2914sub do_reload_perl() { 3720sub do_reload_perl() {
2915 # can/must only be called in main 3721 # can/must only be called in main
2916 if ($Coro::current != $Coro::main) { 3722 if ($Coro::current != $Coro::main) {
2917 warn "can only reload from main coroutine"; 3723 warn "can only reload from main coroutine";
2918 return; 3724 return;
2919 } 3725 }
2920 3726
3727 return if $RELOAD++;
3728
3729 my $t1 = EV::time;
3730
3731 while ($RELOAD) {
2921 warn "reloading..."; 3732 warn "reloading...";
2922 3733
2923 warn "entering sync_job"; 3734 warn "entering sync_job";
2924 3735
2925 cf::sync_job { 3736 cf::sync_job {
2926 cf::write_runtime; # external watchdog should not bark 3737 cf::write_runtime_sync; # external watchdog should not bark
2927 cf::emergency_save; 3738 cf::emergency_save;
2928 cf::write_runtime; # external watchdog should not bark 3739 cf::write_runtime_sync; # external watchdog should not bark
2929 3740
2930 warn "syncing database to disk"; 3741 warn "syncing database to disk";
2931 BDB::db_env_txn_checkpoint $DB_ENV; 3742 BDB::db_env_txn_checkpoint $DB_ENV;
2932 3743
2933 # 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
2934 3745
2935 warn "cancelling all WF_AUTOCANCEL watchers";
2936 for (Event::all_watchers) {
2937 $_->cancel if $_->data & WF_AUTOCANCEL;
2938 }
2939
2940 warn "flushing outstanding aio requests"; 3746 warn "flushing outstanding aio requests";
2941 for (;;) {
2942 BDB::flush;
2943 IO::AIO::flush;
2944 Coro::cede;
2945 last unless IO::AIO::nreqs || BDB::nreqs; 3747 while (IO::AIO::nreqs || BDB::nreqs) {
2946 warn "iterate..."; 3748 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2947 }
2948
2949 ++$RELOAD;
2950
2951 warn "cancelling all extension coros";
2952 $_->cancel for values %EXT_CORO;
2953 %EXT_CORO = ();
2954
2955 warn "removing commands";
2956 %COMMAND = ();
2957
2958 warn "removing ext/exti commands";
2959 %EXTCMD = ();
2960 %EXTICMD = ();
2961
2962 warn "unloading/nuking all extensions";
2963 for my $pkg (@EXTS) {
2964 warn "... unloading $pkg";
2965
2966 if (my $cb = $pkg->can ("unload")) {
2967 eval {
2968 $cb->($pkg);
2969 1
2970 } or warn "$pkg unloaded, but with errors: $@";
2971 } 3749 }
2972 3750
2973 warn "... nuking $pkg"; 3751 warn "cancelling all extension coros";
2974 Symbol::delete_package $pkg; 3752 $_->cancel for values %EXT_CORO;
2975 } 3753 %EXT_CORO = ();
2976 3754
2977 warn "unloading all perl modules loaded from $LIBDIR"; 3755 warn "removing commands";
2978 while (my ($k, $v) = each %INC) { 3756 %COMMAND = ();
2979 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2980 3757
3758 warn "removing ext/exti commands";
3759 %EXTCMD = ();
3760 %EXTICMD = ();
3761
3762 warn "unloading/nuking all extensions";
3763 for my $pkg (@EXTS) {
2981 warn "... unloading $k"; 3764 warn "... unloading $pkg";
2982 delete $INC{$k};
2983 3765
2984 $k =~ s/\.pm$//;
2985 $k =~ s/\//::/g;
2986
2987 if (my $cb = $k->can ("unload_module")) { 3766 if (my $cb = $pkg->can ("unload")) {
3767 eval {
2988 $cb->(); 3768 $cb->($pkg);
3769 1
3770 } or warn "$pkg unloaded, but with errors: $@";
3771 }
3772
3773 warn "... clearing $pkg";
3774 clear_package $pkg;
2989 } 3775 }
2990 3776
2991 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;
2992 } 3792 }
2993 3793
2994 warn "getting rid of safe::, as good as possible"; 3794 warn "getting rid of safe::, as good as possible";
2995 Symbol::delete_package "safe::$_" 3795 clear_package "safe::$_"
2996 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);
2997 3797
2998 warn "unloading cf.pm \"a bit\""; 3798 warn "unloading cf.pm \"a bit\"";
2999 delete $INC{"cf.pm"}; 3799 delete $INC{"cf.pm"};
3000 delete $INC{"cf/pod.pm"}; 3800 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3001 3801
3002 # don't, removes xs symbols, too, 3802 # don't, removes xs symbols, too,
3003 # and global variables created in xs 3803 # and global variables created in xs
3004 #Symbol::delete_package __PACKAGE__; 3804 #clear_package __PACKAGE__;
3005 3805
3006 warn "unload completed, starting to reload now"; 3806 warn "unload completed, starting to reload now";
3007 3807
3008 warn "reloading cf.pm"; 3808 warn "reloading cf.pm";
3009 require cf; 3809 require cf;
3010 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3810 cf::_connect_to_perl_1;
3011 3811
3012 warn "loading config and database again"; 3812 warn "loading config and database again";
3013 cf::cfg_load; 3813 cf::reload_config;
3014 3814
3015 warn "loading extensions"; 3815 warn "loading extensions";
3016 cf::load_extensions; 3816 cf::load_extensions;
3017 3817
3818 if ($REATTACH_ON_RELOAD) {
3018 warn "reattaching attachments to objects/players"; 3819 warn "reattaching attachments to objects/players";
3019 _global_reattach; # objects, sockets 3820 _global_reattach; # objects, sockets
3020 warn "reattaching attachments to maps"; 3821 warn "reattaching attachments to maps";
3021 reattach $_ for values %MAP; 3822 reattach $_ for values %MAP;
3022 warn "reattaching attachments to players"; 3823 warn "reattaching attachments to players";
3023 reattach $_ for values %PLAYER; 3824 reattach $_ for values %PLAYER;
3825 }
3024 3826
3827 warn "running post_init jobs";
3828 (pop @POST_INIT)->(1) while @POST_INIT;
3829
3025 warn "leaving sync_job"; 3830 warn "leaving sync_job";
3026 3831
3027 1 3832 1
3028 } or do { 3833 } or do {
3029 warn $@; 3834 warn $@;
3030 warn "error while reloading, exiting."; 3835 cf::cleanup "error while reloading, exiting.";
3031 exit 1;
3032 }; 3836 };
3033 3837
3034 warn "reloaded"; 3838 warn "reloaded";
3839 --$RELOAD;
3840 }
3841
3842 $t1 = EV::time - $t1;
3843 warn "reload completed in ${t1}s\n";
3035}; 3844};
3036 3845
3037our $RELOAD_WATCHER; # used only during reload 3846our $RELOAD_WATCHER; # used only during reload
3038 3847
3039sub reload_perl() { 3848sub reload_perl() {
3040 # doing reload synchronously and two reloads happen back-to-back, 3849 # doing reload synchronously and two reloads happen back-to-back,
3041 # coro crashes during coro_state_free->destroy here. 3850 # coro crashes during coro_state_free->destroy here.
3042 3851
3043 $RELOAD_WATCHER ||= Event->timer ( 3852 $RELOAD_WATCHER ||= cf::async {
3044 reentrant => 0, 3853 Coro::AIO::aio_wait cache_extensions;
3045 after => 0, 3854
3046 data => WF_AUTOCANCEL, 3855 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3047 cb => sub {
3048 do_reload_perl; 3856 do_reload_perl;
3049 undef $RELOAD_WATCHER; 3857 undef $RELOAD_WATCHER;
3050 }, 3858 };
3051 ); 3859 };
3052} 3860}
3053 3861
3054register_command "reload" => sub { 3862register_command "reload" => sub {
3055 my ($who, $arg) = @_; 3863 my ($who, $arg) = @_;
3056 3864
3057 if ($who->flag (FLAG_WIZ)) { 3865 if ($who->flag (FLAG_WIZ)) {
3058 $who->message ("reloading server."); 3866 $who->message ("reloading server.");
3867 async {
3868 $Coro::current->{desc} = "perl_reload";
3059 async { reload_perl }; 3869 reload_perl;
3870 };
3060 } 3871 }
3061}; 3872};
3062 3873
3063unshift @INC, $LIBDIR; 3874unshift @INC, $LIBDIR;
3064 3875
… …
3066 3877
3067our @WAIT_FOR_TICK; 3878our @WAIT_FOR_TICK;
3068our @WAIT_FOR_TICK_BEGIN; 3879our @WAIT_FOR_TICK_BEGIN;
3069 3880
3070sub wait_for_tick { 3881sub wait_for_tick {
3071 return unless $TICK_WATCHER->is_active;
3072 return if $Coro::current == $Coro::main; 3882 return if tick_inhibit || $Coro::current == $Coro::main;
3073 3883
3074 my $signal = new Coro::Signal; 3884 my $signal = new Coro::Signal;
3075 push @WAIT_FOR_TICK, $signal; 3885 push @WAIT_FOR_TICK, $signal;
3076 $signal->wait; 3886 $signal->wait;
3077} 3887}
3078 3888
3079sub wait_for_tick_begin { 3889sub wait_for_tick_begin {
3080 return unless $TICK_WATCHER->is_active;
3081 return if $Coro::current == $Coro::main; 3890 return if tick_inhibit || $Coro::current == $Coro::main;
3082 3891
3083 my $signal = new Coro::Signal; 3892 my $signal = new Coro::Signal;
3084 push @WAIT_FOR_TICK_BEGIN, $signal; 3893 push @WAIT_FOR_TICK_BEGIN, $signal;
3085 $signal->wait; 3894 $signal->wait;
3086} 3895}
3087 3896
3088 my $min = 1e6;#d# 3897sub tick {
3089 my $avg = 10;
3090$TICK_WATCHER = Event->timer (
3091 reentrant => 0,
3092 parked => 1,
3093 prio => 0,
3094 at => $NEXT_TICK || $TICK,
3095 data => WF_AUTOCANCEL,
3096 cb => sub {
3097 if ($Coro::current != $Coro::main) { 3898 if ($Coro::current != $Coro::main) {
3098 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"
3099 unless ++$bug_warning > 10; 3900 unless ++$bug_warning > 10;
3100 return; 3901 return;
3101 } 3902 }
3102 3903
3103 $NOW = $tick_start = Event::time;
3104
3105 cf::server_tick; # one server iteration 3904 cf::server_tick; # one server iteration
3106 3905
3107 0 && sync_job {#d# 3906 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3108 for(1..10) { 3907 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3109 my $t = Event::time; 3908 Coro::async_pool {
3110 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3909 $Coro::current->{desc} = "runtime saver";
3111 or die; 3910 write_runtime_sync
3112 3911 or warn "ERROR: unable to write runtime file: $!";
3113 $map->width (50);
3114 $map->height (50);
3115 $map->alloc;
3116 $map->_load_objects ("/tmp/x.map", 1);
3117 my $t = Event::time - $t;
3118
3119 #next unless $t < 0.0013;#d#
3120 if ($t < $min) {
3121 $min = $t;
3122 }
3123 $avg = $avg * 0.99 + $t * 0.01;
3124 }
3125 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3126 exit 0;
3127 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3128 }; 3912 };
3913 }
3129 3914
3130 $RUNTIME += $TICK;
3131 $NEXT_TICK += $TICK;
3132
3133 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3134 $NEXT_RUNTIME_WRITE = $NOW + 10;
3135 Coro::async_pool {
3136 write_runtime
3137 or warn "ERROR: unable to write runtime file: $!";
3138 };
3139 }
3140
3141# my $AFTER = Event::time;
3142# warn $AFTER - $NOW;#d#
3143
3144 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3915 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3145 $sig->send; 3916 $sig->send;
3146 } 3917 }
3147 while (my $sig = shift @WAIT_FOR_TICK) { 3918 while (my $sig = shift @WAIT_FOR_TICK) {
3148 $sig->send; 3919 $sig->send;
3149 } 3920 }
3150 3921
3151 $NOW = Event::time; 3922 $LOAD = ($NOW - $TICK_START) / $TICK;
3152
3153 # if we are delayed by four ticks or more, skip them all
3154 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3155
3156 $TICK_WATCHER->at ($NEXT_TICK);
3157 $TICK_WATCHER->start;
3158
3159 $LOAD = ($NOW - $tick_start) / $TICK;
3160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3923 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3161 3924
3162 _post_tick; 3925 if (0) {
3163 3926 if ($NEXT_TICK) {
3164 3927 my $jitter = $TICK_START - $NEXT_TICK;
3928 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3929 warn "jitter $JITTER\n";#d#
3930 }
3165 }, 3931 }
3166); 3932}
3167 3933
3168{ 3934{
3169 BDB::max_poll_time $TICK * 0.1; 3935 # configure BDB
3170 $BDB_POLL_WATCHER = Event->io ( 3936
3171 reentrant => 0,
3172 fd => BDB::poll_fileno,
3173 poll => 'r',
3174 prio => 0,
3175 data => WF_AUTOCANCEL,
3176 cb => \&BDB::poll_cb,
3177 );
3178 BDB::min_parallel 8; 3937 BDB::min_parallel 8;
3179 3938 BDB::max_poll_reqs $TICK * 0.1;
3180 BDB::set_sync_prepare { 3939 $AnyEvent::BDB::WATCHER->priority (1);
3181 my $status;
3182 my $current = $Coro::current;
3183 (
3184 sub {
3185 $status = $!;
3186 $current->ready; undef $current;
3187 },
3188 sub {
3189 Coro::schedule while defined $current;
3190 $! = $status;
3191 },
3192 )
3193 };
3194 3940
3195 unless ($DB_ENV) { 3941 unless ($DB_ENV) {
3196 $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);
3197 3948
3198 cf::sync_job { 3949 cf::sync_job {
3199 eval { 3950 eval {
3200 BDB::db_env_open 3951 BDB::db_env_open
3201 $DB_ENV, 3952 $DB_ENV,
… …
3203 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
3204 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3955 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3205 0666; 3956 0666;
3206 3957
3207 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3958 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3208
3209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3210 $DB_ENV->set_lk_detect;
3211 }; 3959 };
3212 3960
3213 cf::cleanup "db_env_open(db): $@" if $@; 3961 cf::cleanup "db_env_open(db): $@" if $@;
3214 }; 3962 };
3215 } 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 };
3216} 3974}
3217 3975
3218{ 3976{
3977 # configure IO::AIO
3978
3219 IO::AIO::min_parallel 8; 3979 IO::AIO::min_parallel 8;
3220
3221 undef $Coro::AIO::WATCHER;
3222 IO::AIO::max_poll_time $TICK * 0.1; 3980 IO::AIO::max_poll_time $TICK * 0.1;
3223 $AIO_POLL_WATCHER = Event->io ( 3981 undef $AnyEvent::AIO::WATCHER;
3224 reentrant => 0,
3225 data => WF_AUTOCANCEL,
3226 fd => IO::AIO::poll_fileno,
3227 poll => 'r',
3228 prio => 6,
3229 cb => \&IO::AIO::poll_cb,
3230 );
3231} 3982}
3232 3983
3233my $_log_backtrace; 3984my $_log_backtrace;
3234 3985
3235sub _log_backtrace { 3986sub _log_backtrace {
… …
3238 $msg =~ s/\n//; 3989 $msg =~ s/\n//;
3239 3990
3240 # limit the # of concurrent backtraces 3991 # limit the # of concurrent backtraces
3241 if ($_log_backtrace < 2) { 3992 if ($_log_backtrace < 2) {
3242 ++$_log_backtrace; 3993 ++$_log_backtrace;
3994 my $perl_bt = Carp::longmess $msg;
3243 async { 3995 async {
3996 $Coro::current->{desc} = "abt $msg";
3997
3244 my @bt = fork_call { 3998 my @bt = fork_call {
3245 @addr = map { sprintf "%x", $_ } @addr; 3999 @addr = map { sprintf "%x", $_ } @addr;
3246 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4000 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3247 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 |"
3248 or die "addr2line: $!"; 4002 or die "addr2line: $!";
… …
3256 } 4010 }
3257 4011
3258 @funcs 4012 @funcs
3259 }; 4013 };
3260 4014
3261 LOG llevInfo, "[ABT] $msg\n"; 4015 LOG llevInfo, "[ABT] $perl_bt\n";
4016 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3262 LOG llevInfo, "[ABT] $_\n" for @bt; 4017 LOG llevInfo, "[ABT] $_\n" for @bt;
3263 --$_log_backtrace; 4018 --$_log_backtrace;
3264 }; 4019 };
3265 } else { 4020 } else {
3266 LOG llevInfo, "[ABT] $msg\n"; 4021 LOG llevInfo, "[ABT] $msg\n";
3267 LOG llevInfo, "[ABT] [suppressed]\n"; 4022 LOG llevInfo, "[ABT] [suppressed]\n";
3268 } 4023 }
3269} 4024}
3270 4025
3271# load additional modules 4026# load additional modules
3272use cf::pod; 4027require "cf/$_.pm" for @EXTRA_MODULES;
4028cf::_connect_to_perl_2;
3273 4029
3274END { cf::emergency_save } 4030END { cf::emergency_save }
3275 4031
32761 40321
3277 4033

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines