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.294 by root, Tue Jul 3 06:00:48 2007 UTC vs.
Revision 1.491 by root, Sat Oct 24 09:18:44 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 1 while s/\s*\n\s*\n\s*/\n/;
1418
1419 s/^\s+//;
1420 s/\s+$//;
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 excluding F</styles> and F</editor>). May
2350block.
2351
2352=cut
2353
2354sub static_maps() {
2355 my @dirs = "";
2356 my @maps;
2357
2358 while (@dirs) {
2359 my $dir = shift @dirs;
2360
2361 next if $dir eq "/styles" || $dir eq "/editor";
2362
2363 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2364 or return;
2365
2366 for (@$files) {
2367 s/\.map$// or next;
2368 utf8::decode $_;
2369 push @maps, "$dir/$_";
2370 }
2371
2372 push @dirs, map "$dir/$_", @$dirs;
2373 }
2374
2375 \@maps
2376}
2075 2377
2076=back 2378=back
2077 2379
2078=head3 cf::object 2380=head3 cf::object
2079 2381
… …
2083 2385
2084=over 4 2386=over 4
2085 2387
2086=item $ob->inv_recursive 2388=item $ob->inv_recursive
2087 2389
2088Returns the inventory of the object _and_ their inventories, recursively. 2390Returns the inventory of the object I<and> their inventories, recursively,
2391but I<not> the object itself.
2089 2392
2090=cut 2393=cut
2091 2394
2092sub inv_recursive_; 2395sub inv_recursive_;
2093sub inv_recursive_ { 2396sub inv_recursive_ {
… …
2096 2399
2097sub inv_recursive { 2400sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2401 inv_recursive_ inv $_[0]
2099} 2402}
2100 2403
2404=item $ref = $ob->ref
2405
2406Creates and returns a persistent reference to an object that can be stored as a string.
2407
2408=item $ob = cf::object::deref ($refstring)
2409
2410returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2411even if the object actually exists. May block.
2412
2413=cut
2414
2415sub deref {
2416 my ($ref) = @_;
2417
2418 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2419 my ($uuid, $name) = ($1, $2);
2420 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2421 or return;
2422 $pl->ob->uuid eq $uuid
2423 or return;
2424
2425 $pl->ob
2426 } else {
2427 warn "$ref: cannot resolve object reference\n";
2428 undef
2429 }
2430}
2431
2101package cf; 2432package cf;
2102 2433
2103=back 2434=back
2104 2435
2105=head3 cf::object::player 2436=head3 cf::object::player
… …
2111Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2442Sends 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 2443can be C<undef>. Does the right thing when the player is currently in a
2113dialogue with the given NPC character. 2444dialogue with the given NPC character.
2114 2445
2115=cut 2446=cut
2447
2448our $SAY_CHANNEL = {
2449 id => "say",
2450 title => "Map",
2451 reply => "say ",
2452 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2453};
2454
2455our $CHAT_CHANNEL = {
2456 id => "chat",
2457 title => "Chat",
2458 reply => "chat ",
2459 tooltip => "Player chat and shouts, global to the server.",
2460};
2116 2461
2117# rough implementation of a future "reply" method that works 2462# rough implementation of a future "reply" method that works
2118# with dialog boxes. 2463# with dialog boxes.
2119#TODO: the first argument must go, split into a $npc->reply_to ( method 2464#TODO: the first argument must go, split into a $npc->reply_to ( method
2120sub cf::object::player::reply($$$;$) { 2465sub cf::object::player::reply($$$;$) {
… …
2127 2472
2128 } else { 2473 } else {
2129 my $pl = $self->contr; 2474 my $pl = $self->contr;
2130 2475
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2476 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2477 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2478 $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 2479
2140 } else { 2480 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2481 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2482 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2143 } 2483 }
2144 } 2484 }
2485}
2486
2487=item $object->send_msg ($channel, $msg, $color, [extra...])
2488
2489=cut
2490
2491sub cf::object::send_msg {
2492 my $pl = shift->contr
2493 or return;
2494 $pl->send_msg (@_);
2145} 2495}
2146 2496
2147=item $player_object->may ("access") 2497=item $player_object->may ("access")
2148 2498
2149Returns wether the given player is authorized to access resource "access" 2499Returns wether the given player is authorized to access resource "access"
… …
2162 2512
2163=item $player_object->enter_link 2513=item $player_object->enter_link
2164 2514
2165Freezes the player and moves him/her to a special map (C<{link}>). 2515Freezes the player and moves him/her to a special map (C<{link}>).
2166 2516
2167The player should be reasonably safe there for short amounts of time. You 2517The player should be reasonably safe there for short amounts of time (e.g.
2168I<MUST> call C<leave_link> as soon as possible, though. 2518for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519though, as the palyer cannot control the character while it is on the link
2520map.
2169 2521
2170Will never block. 2522Will never block.
2171 2523
2172=item $player_object->leave_link ($map, $x, $y) 2524=item $player_object->leave_link ($map, $x, $y)
2173 2525
… …
2228 # use -1 or undef as default coordinates, not 0, 0 2580 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2581 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2582 if $x <=0 && $y <= 0;
2231 2583
2232 $map->load; 2584 $map->load;
2233 $map->load_diag; 2585 $map->load_neighbours;
2234 2586
2235 return unless $self->contr->active; 2587 return unless $self->contr->active;
2236 $self->activate_recursive;
2237 2588
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2589 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2590 $self->enter_map ($map, $x, $y);
2240}
2241 2591
2592 # only activate afterwards, to support waiting in hooks
2593 $self->activate_recursive;
2594}
2595
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2596=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2597
2244Moves the player to the given map-path and coordinates by first freezing 2598Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2599her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2600that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2601the new (success) or old (failed) map position. In either case, $done will
2602be called at the end of this process.
2603
2604Note that $check will be called with a potentially non-loaded map, so if
2605it needs a loaded map it has to call C<< ->load >>.
2248 2606
2249=cut 2607=cut
2250 2608
2251our $GOTOGEN; 2609our $GOTOGEN;
2252 2610
2253sub cf::object::player::goto { 2611sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2612 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2613
2256 # do generation counting so two concurrent goto's will be executed in-order 2614 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2615 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2616
2259 $self->enter_link; 2617 $self->enter_link;
2260 2618
2261 (async { 2619 (async {
2620 $Coro::current->{desc} = "player::goto $path $x $y";
2621
2622 # *tag paths override both path and x|y
2623 if ($path =~ /^\*(.*)$/) {
2624 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2625 my $ob = $obs[rand @obs];
2626
2627 # see if we actually can go there
2628 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2629 $ob = $obs[rand @obs];
2630 } else {
2631 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2632 }
2633 # else put us there anyways for now #d#
2634
2635 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2636 } else {
2637 ($path, $x, $y) = (undef, undef, undef);
2638 }
2639 }
2640
2262 my $map = eval { 2641 my $map = eval {
2263 my $map = cf::map::find $path; 2642 my $map = defined $path ? cf::map::find $path : undef;
2264 2643
2265 if ($map) { 2644 if ($map) {
2266 $map = $map->customise_for ($self); 2645 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2646 $map = $check->($map) if $check && $map;
2268 } else { 2647 } else {
2269 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2648 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2270 } 2649 }
2271 2650
2272 $map 2651 $map
2273 }; 2652 };
2274 2653
… …
2279 2658
2280 if ($gen == $self->{_goto_generation}) { 2659 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2660 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2661 $self->leave_link ($map, $x, $y);
2283 } 2662 }
2663
2664 $done->() if $done;
2284 })->prio (1); 2665 })->prio (1);
2285} 2666}
2286 2667
2287=item $player_object->enter_exit ($exit_object) 2668=item $player_object->enter_exit ($exit_object)
2288 2669
… …
2308} 2689}
2309 2690
2310sub prepare_random_map { 2691sub prepare_random_map {
2311 my ($exit) = @_; 2692 my ($exit) = @_;
2312 2693
2313 my $guard = cf::lock_acquire "exit_prepare:$exit";
2314
2315 # all this does is basically replace the /! path by 2694 # all this does is basically replace the /! path by
2316 # a new random map path (?random/...) with a seed 2695 # a new random map path (?random/...) with a seed
2317 # that depends on the exit object 2696 # that depends on the exit object
2318 2697
2319 my $rmp = parse_random_map_params $exit->msg; 2698 my $rmp = parse_random_map_params $exit->msg;
… …
2321 if ($exit->map) { 2700 if ($exit->map) {
2322 $rmp->{region} = $exit->region->name; 2701 $rmp->{region} = $exit->region->name;
2323 $rmp->{origin_map} = $exit->map->path; 2702 $rmp->{origin_map} = $exit->map->path;
2324 $rmp->{origin_x} = $exit->x; 2703 $rmp->{origin_x} = $exit->x;
2325 $rmp->{origin_y} = $exit->y; 2704 $rmp->{origin_y} = $exit->y;
2705
2706 $exit->map->touch;
2326 } 2707 }
2327 2708
2328 $rmp->{random_seed} ||= $exit->random_seed; 2709 $rmp->{random_seed} ||= $exit->random_seed;
2329 2710
2330 my $data = cf::to_json $rmp; 2711 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2331 my $md5 = Digest::MD5::md5_hex $data; 2712 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2713 my $meta = "$RANDOMDIR/$md5.meta";
2333 2714
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2715 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2716 aio_write $fh, 0, (length $data), $data, 0;
2336 undef $fh; 2717 undef $fh;
2337 aio_rename "$meta~", $meta; 2718 aio_rename "$meta~", $meta;
2338 2719
2720 my $slaying = "?random/$md5";
2721
2722 if ($exit->valid) {
2339 $exit->slaying ("?random/$md5"); 2723 $exit->slaying ("?random/$md5");
2340 $exit->msg (undef); 2724 $exit->msg (undef);
2725 }
2341 } 2726 }
2342} 2727}
2343 2728
2344sub cf::object::player::enter_exit { 2729sub cf::object::player::enter_exit {
2345 my ($self, $exit) = @_; 2730 my ($self, $exit) = @_;
2346 2731
2347 return unless $self->type == cf::PLAYER; 2732 return unless $self->type == cf::PLAYER;
2348 2733
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; 2734 $self->enter_link;
2361 2735
2362 (async { 2736 (async {
2363 $self->deactivate_recursive; # just to be sure 2737 $Coro::current->{desc} = "enter_exit";
2738
2364 unless (eval { 2739 unless (eval {
2740 $self->deactivate_recursive; # just to be sure
2741
2742 # random map handling
2743 {
2744 my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746 prepare_random_map $exit
2747 if $exit->slaying eq "/!";
2748 }
2749
2750 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2751 my $x = $exit->stats->hp;
2752 my $y = $exit->stats->sp;
2753
2365 $self->goto ($slaying, $hp, $sp); 2754 $self->goto ($map, $x, $y);
2366 2755
2756 # if exit is damned, update players death & WoR home-position
2757 $self->contr->savebed ($map, $x, $y)
2758 if $exit->flag (cf::FLAG_DAMNED);
2759
2367 1; 2760 1
2368 }) { 2761 }) {
2369 $self->message ("Something went wrong deep within the crossfire server. " 2762 $self->message ("Something went wrong deep within the deliantra server. "
2370 . "I'll try to bring you back to the map you were before. " 2763 . "I'll try to bring you back to the map you were before. "
2371 . "Please report this to the dungeon master!", 2764 . "Please report this to the dungeon master!",
2372 cf::NDI_UNIQUE | cf::NDI_RED); 2765 cf::NDI_UNIQUE | cf::NDI_RED);
2373 2766
2374 warn "ERROR in enter_exit: $@"; 2767 warn "ERROR in enter_exit: $@";
… …
2393 2786
2394 utf8::encode $text; 2787 utf8::encode $text;
2395 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2788 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2396} 2789}
2397 2790
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2791=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2792
2400Send a drawinfo or msg packet to the client, formatting the msg for the 2793Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of 2794client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress 2795the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet. 2796the message unless the client supports the msg packet.
2404 2797
2405=cut 2798=cut
2406 2799
2800# non-persistent channels (usually the info channel)
2801our %CHANNEL = (
2802 "c/motd" => {
2803 id => "infobox",
2804 title => "MOTD",
2805 reply => undef,
2806 tooltip => "The message of the day",
2807 },
2808 "c/identify" => {
2809 id => "infobox",
2810 title => "Identify",
2811 reply => undef,
2812 tooltip => "Items recently identified",
2813 },
2814 "c/examine" => {
2815 id => "infobox",
2816 title => "Examine",
2817 reply => undef,
2818 tooltip => "Signs and other items you examined",
2819 },
2820 "c/shopinfo" => {
2821 id => "infobox",
2822 title => "Shop Info",
2823 reply => undef,
2824 tooltip => "What your bargaining skill tells you about the shop",
2825 },
2826 "c/book" => {
2827 id => "infobox",
2828 title => "Book",
2829 reply => undef,
2830 tooltip => "The contents of a note or book",
2831 },
2832 "c/lookat" => {
2833 id => "infobox",
2834 title => "Look",
2835 reply => undef,
2836 tooltip => "What you saw there",
2837 },
2838 "c/who" => {
2839 id => "infobox",
2840 title => "Players",
2841 reply => undef,
2842 tooltip => "Shows players who are currently online",
2843 },
2844 "c/body" => {
2845 id => "infobox",
2846 title => "Body Parts",
2847 reply => undef,
2848 tooltip => "Shows which body parts you posess and are available",
2849 },
2850 "c/statistics" => {
2851 id => "infobox",
2852 title => "Statistics",
2853 reply => undef,
2854 tooltip => "Shows your primary statistics",
2855 },
2856 "c/skills" => {
2857 id => "infobox",
2858 title => "Skills",
2859 reply => undef,
2860 tooltip => "Shows your experience per skill and item power",
2861 },
2862 "c/shopitems" => {
2863 id => "infobox",
2864 title => "Shop Items",
2865 reply => undef,
2866 tooltip => "Shows the items currently for sale in this shop",
2867 },
2868 "c/resistances" => {
2869 id => "infobox",
2870 title => "Resistances",
2871 reply => undef,
2872 tooltip => "Shows your resistances",
2873 },
2874 "c/pets" => {
2875 id => "infobox",
2876 title => "Pets",
2877 reply => undef,
2878 tooltip => "Shows information abotu your pets/a specific pet",
2879 },
2880 "c/perceiveself" => {
2881 id => "infobox",
2882 title => "Perceive Self",
2883 reply => undef,
2884 tooltip => "You gained detailed knowledge about yourself",
2885 },
2886 "c/uptime" => {
2887 id => "infobox",
2888 title => "Uptime",
2889 reply => undef,
2890 tooltip => "How long the server has been running since last restart",
2891 },
2892 "c/mapinfo" => {
2893 id => "infobox",
2894 title => "Map Info",
2895 reply => undef,
2896 tooltip => "Information related to the maps",
2897 },
2898 "c/party" => {
2899 id => "party",
2900 title => "Party",
2901 reply => "gsay ",
2902 tooltip => "Messages and chat related to your party",
2903 },
2904 "c/death" => {
2905 id => "death",
2906 title => "Death",
2907 reply => undef,
2908 tooltip => "Reason for and more info about your most recent death",
2909 },
2910 "c/say" => $SAY_CHANNEL,
2911 "c/chat" => $CHAT_CHANNEL,
2912);
2913
2407sub cf::client::send_msg { 2914sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2915 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2916
2410 $msg = $self->pl->expand_cfpod ($msg); 2917 $msg = $self->pl->expand_cfpod ($msg)
2918 unless $color & cf::NDI_VERBATIM;
2919
2920 $color &= cf::NDI_CLIENT_MASK; # just in case...
2921
2922 # check predefined channels, for the benefit of C
2923 if ($CHANNEL{$channel}) {
2924 $channel = $CHANNEL{$channel};
2925
2926 $self->ext_msg (channel_info => $channel);
2927 $channel = $channel->{id};
2928
2929 } elsif (ref $channel) {
2930 # send meta info to client, if not yet sent
2931 unless (exists $self->{channel}{$channel->{id}}) {
2932 $self->{channel}{$channel->{id}} = $channel;
2933 $self->ext_msg (channel_info => $channel);
2934 }
2935
2936 $channel = $channel->{id};
2937 }
2411 2938
2412 return unless @extra || length $msg; 2939 return unless @extra || length $msg;
2413 2940
2414 if ($self->can_msg) { 2941 # default colour, mask it out
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2942 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2416 } else { 2943 if $color & cf::NDI_DEF;
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426 2944
2427 if ($color >= 0) { 2945 my $pkt = "msg "
2428 if (0 && $msg =~ /\[/) { 2946 . $self->{json_coder}->encode (
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2947 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2430 } else { 2948 );
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg")
2433 }
2434 }
2435 }
2436}
2437 2949
2950 # try lzf for large packets
2951 $pkt = "lzf " . Compress::LZF::compress $pkt
2952 if 1024 <= length $pkt and $self->{can_lzf};
2953
2954 # split very large packets
2955 if (8192 < length $pkt and $self->{can_lzf}) {
2956 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2957 $pkt = "frag";
2958 }
2959
2960 $self->send_packet ($pkt);
2961}
2962
2438=item $client->ext_event ($type, %msg) 2963=item $client->ext_msg ($type, @msg)
2439 2964
2440Sends an ext event to the client. 2965Sends an ext event to the client.
2441 2966
2442=cut 2967=cut
2443 2968
2444sub cf::client::ext_event($$%) { 2969sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2970 my ($self, $type, @msg) = @_;
2446 2971
2972 if ($self->extcmd == 2) {
2973 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2974 } elsif ($self->extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2975 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2976 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2977 }
2978}
2979
2980=item $client->ext_reply ($msgid, @msg)
2981
2982Sends an ext reply to the client.
2983
2984=cut
2985
2986sub cf::client::ext_reply($$@) {
2987 my ($self, $id, @msg) = @_;
2988
2989 if ($self->extcmd == 2) {
2990 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2991 } elsif ($self->extcmd == 1) {
2992 #TODO: version 1, remove
2993 unshift @msg, msgtype => "reply", msgid => $id;
2994 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2995 }
2449} 2996}
2450 2997
2451=item $success = $client->query ($flags, "text", \&cb) 2998=item $success = $client->query ($flags, "text", \&cb)
2452 2999
2453Queues a query to the client, calling the given callback with 3000Queues a query to the client, calling the given callback with
… …
2508 my ($ns, $buf) = @_; 3055 my ($ns, $buf) = @_;
2509 3056
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3057 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 3058
2512 if (ref $msg) { 3059 if (ref $msg) {
3060 my ($type, $reply, @payload) =
3061 "ARRAY" eq ref $msg
3062 ? @$msg
3063 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3064
3065 my @reply;
3066
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3067 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 3068 @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 } 3069 }
3070
3071 $ns->ext_reply ($reply, @reply)
3072 if $reply;
3073
2519 } else { 3074 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3075 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 } 3076 }
2522 3077
2523 cf::override; 3078 cf::override;
… …
2570our $safe = new Safe "safe"; 3125our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 3126our $safe_hole = new Safe::Hole;
2572 3127
2573$SIG{FPE} = 'IGNORE'; 3128$SIG{FPE} = 'IGNORE';
2574 3129
2575$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3130$safe->permit_only (Opcode::opset qw(
3131 :base_core :base_mem :base_orig :base_math
3132 grepstart grepwhile mapstart mapwhile
3133 sort time
3134));
2576 3135
2577# here we export the classes and methods available to script code 3136# here we export the classes and methods available to script code
2578 3137
2579=pod 3138=pod
2580 3139
2581The following functions and methods are available within a safe environment: 3140The following functions and methods are available within a safe environment:
2582 3141
2583 cf::object contr pay_amount pay_player map 3142 cf::object
3143 contr pay_amount pay_player map x y force_find force_add destroy
3144 insert remove name archname title slaying race decrease split
3145 value
3146
2584 cf::object::player player 3147 cf::object::player
2585 cf::player peaceful 3148 player
2586 cf::map trigger 3149
3150 cf::player
3151 peaceful
3152
3153 cf::map
3154 trigger
2587 3155
2588=cut 3156=cut
2589 3157
2590for ( 3158for (
2591 ["cf::object" => qw(contr pay_amount pay_player map)], 3159 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3160 insert remove inv nrof name archname title slaying race
3161 decrease split destroy change_exp value msg lore send_msg)],
2592 ["cf::object::player" => qw(player)], 3162 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 3163 ["cf::player" => qw(peaceful send_msg)],
2594 ["cf::map" => qw(trigger)], 3164 ["cf::map" => qw(trigger)],
2595) { 3165) {
2596 no strict 'refs'; 3166 no strict 'refs';
2597 my ($pkg, @funs) = @$_; 3167 my ($pkg, @funs) = @$_;
2598 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3168 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2615 my ($code, %vars) = @_; 3185 my ($code, %vars) = @_;
2616 3186
2617 my $qcode = $code; 3187 my $qcode = $code;
2618 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3188 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2619 $qcode =~ s/\n/\\n/g; 3189 $qcode =~ s/\n/\\n/g;
3190
3191 %vars = (_dummy => 0) unless %vars;
2620 3192
2621 local $_; 3193 local $_;
2622 local @safe::cf::_safe_eval_args = values %vars; 3194 local @safe::cf::_safe_eval_args = values %vars;
2623 3195
2624 my $eval = 3196 my $eval =
… …
2672# the server's init and main functions 3244# the server's init and main functions
2673 3245
2674sub load_facedata($) { 3246sub load_facedata($) {
2675 my ($path) = @_; 3247 my ($path) = @_;
2676 3248
3249 # HACK to clear player env face cache, we need some signal framework
3250 # for this (global event?)
3251 %ext::player_env::MUSIC_FACE_CACHE = ();
3252
3253 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3254
2677 warn "loading facedata from $path\n"; 3255 warn "loading facedata from $path\n";
2678 3256
2679 my $facedata; 3257 my $facedata;
2680 0 < aio_load $path, $facedata 3258 0 < aio_load $path, $facedata
2681 or die "$path: $!"; 3259 or die "$path: $!";
… …
2683 $facedata = Coro::Storable::thaw $facedata; 3261 $facedata = Coro::Storable::thaw $facedata;
2684 3262
2685 $facedata->{version} == 2 3263 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed."; 3264 or cf::cleanup "$path: version mismatch, cannot proceed.";
2687 3265
3266 # patch in the exptable
3267 $facedata->{resource}{"res/exp_table"} = {
3268 type => FT_RSRC,
3269 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3270 };
3271 cf::cede_to_tick;
3272
2688 { 3273 {
2689 my $faces = $facedata->{faceinfo}; 3274 my $faces = $facedata->{faceinfo};
2690 3275
2691 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3277 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3278
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3279 cf::face::set_visibility $idx, $info->{visibility};
3280 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3281 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3282 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696 Coro::cede; 3283
3284 cf::cede_to_tick;
2697 } 3285 }
2698 3286
2699 while (my ($face, $info) = each %$faces) { 3287 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 3288 next unless $info->{smooth};
3289
2701 my $idx = cf::face::find $face 3290 my $idx = cf::face::find $face
2702 or next; 3291 or next;
3292
2703 if (my $smooth = cf::face::find $info->{smooth}) { 3293 if (my $smooth = cf::face::find $info->{smooth}) {
3294 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3295 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 3296 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3297 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 3298 }
2708 Coro::cede; 3299
3300 cf::cede_to_tick;
2709 } 3301 }
2710 } 3302 }
2711 3303
2712 { 3304 {
2713 my $anims = $facedata->{animinfo}; 3305 my $anims = $facedata->{animinfo};
2714 3306
2715 while (my ($anim, $info) = each %$anims) { 3307 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3308 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 3309 cf::cede_to_tick;
2718 } 3310 }
2719 3311
2720 cf::anim::invalidate_all; # d'oh 3312 cf::anim::invalidate_all; # d'oh
2721 } 3313 }
2722 3314
3315 {
3316 # TODO: for gcfclient pleasure, we should give resources
3317 # that gcfclient doesn't grok a >10000 face index.
3318 my $res = $facedata->{resource};
3319
3320 while (my ($name, $info) = each %$res) {
3321 if (defined $info->{type}) {
3322 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3323 my $data;
3324
3325 if ($info->{type} & 1) {
3326 # prepend meta info
3327
3328 my $meta = $enc->encode ({
3329 name => $name,
3330 %{ $info->{meta} || {} },
3331 });
3332
3333 $data = pack "(w/a*)*", $meta, $info->{data};
3334 } else {
3335 $data = $info->{data};
3336 }
3337
3338 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3339 cf::face::set_type $idx, $info->{type};
3340 } else {
3341 $RESOURCE{$name} = $info;
3342 }
3343
3344 cf::cede_to_tick;
3345 }
3346 }
3347
3348 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3349
2723 1 3350 1
2724} 3351}
2725 3352
3353cf::global->attach (on_resource_update => sub {
3354 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3355 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3356
3357 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3358 my $sound = $soundconf->{compat}[$_]
3359 or next;
3360
3361 my $face = cf::face::find "sound/$sound->[1]";
3362 cf::sound::set $sound->[0] => $face;
3363 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3364 }
3365
3366 while (my ($k, $v) = each %{$soundconf->{event}}) {
3367 my $face = cf::face::find "sound/$v";
3368 cf::sound::set $k => $face;
3369 }
3370 }
3371});
3372
3373register_exticmd fx_want => sub {
3374 my ($ns, $want) = @_;
3375
3376 while (my ($k, $v) = each %$want) {
3377 $ns->fx_want ($k, $v);
3378 }
3379};
3380
3381sub load_resource_file($) {
3382 my $guard = lock_acquire "load_resource_file";
3383
3384 my $status = load_resource_file_ $_[0];
3385 get_slot 0.1, 100;
3386 cf::arch::commit_load;
3387
3388 $status
3389}
3390
2726sub reload_regions { 3391sub reload_regions {
3392 # HACK to clear player env face cache, we need some signal framework
3393 # for this (global event?)
3394 %ext::player_env::MUSIC_FACE_CACHE = ();
3395
2727 load_resource_file "$MAPDIR/regions" 3396 load_resource_file "$MAPDIR/regions"
2728 or die "unable to load regions file\n"; 3397 or die "unable to load regions file\n";
3398
3399 for (cf::region::list) {
3400 $_->{match} = qr/$_->{match}/
3401 if exists $_->{match};
3402 }
2729} 3403}
2730 3404
2731sub reload_facedata { 3405sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 3406 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 3407 or die "unable to load facedata\n";
2734} 3408}
2735 3409
2736sub reload_archetypes { 3410sub reload_archetypes {
2737 load_resource_file "$DATADIR/archetypes" 3411 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n"; 3412 or die "unable to load archetypes\n";
2739 #d# NEED to laod twice to resolve forward references
2740 # this really needs to be done in an extra post-pass
2741 # (which needs to be synchronous, so solve it differently)
2742 load_resource_file "$DATADIR/archetypes"
2743 or die "unable to load archetypes\n";
2744} 3413}
2745 3414
2746sub reload_treasures { 3415sub reload_treasures {
2747 load_resource_file "$DATADIR/treasures" 3416 load_resource_file "$DATADIR/treasures"
2748 or die "unable to load treasurelists\n"; 3417 or die "unable to load treasurelists\n";
2749} 3418}
2750 3419
2751sub reload_resources { 3420sub reload_resources {
2752 warn "reloading resource files...\n"; 3421 warn "reloading resource files...\n";
2753 3422
3423 reload_facedata;
3424 reload_archetypes;
2754 reload_regions; 3425 reload_regions;
2755 reload_facedata;
2756 #reload_archetypes;#d#
2757 reload_archetypes;
2758 reload_treasures; 3426 reload_treasures;
2759 3427
2760 warn "finished reloading resource files\n"; 3428 warn "finished reloading resource files\n";
2761} 3429}
2762 3430
2763sub init { 3431sub reload_config {
2764 reload_resources; 3432 warn "reloading config file...\n";
2765}
2766 3433
2767sub cfg_load {
2768 open my $fh, "<:utf8", "$CONFDIR/config" 3434 open my $fh, "<:utf8", "$CONFDIR/config"
2769 or return; 3435 or return;
2770 3436
2771 local $/; 3437 local $/;
2772 *CFG = YAML::Syck::Load <$fh>; 3438 *CFG = YAML::XS::Load scalar <$fh>;
2773 3439
2774 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3440 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2775 3441
2776 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3442 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2777 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3443 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2781 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3447 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2782 and die "WARNING: m(un)lockall failed: $!\n"; 3448 and die "WARNING: m(un)lockall failed: $!\n";
2783 }; 3449 };
2784 warn $@ if $@; 3450 warn $@ if $@;
2785 } 3451 }
3452
3453 warn "finished reloading resource files\n";
3454}
3455
3456sub pidfile() {
3457 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3458 or die "$PIDFILE: $!";
3459 flock $fh, &Fcntl::LOCK_EX
3460 or die "$PIDFILE: flock: $!";
3461 $fh
3462}
3463
3464# make sure only one server instance is running at any one time
3465sub atomic {
3466 my $fh = pidfile;
3467
3468 my $pid = <$fh>;
3469 kill 9, $pid if $pid > 0;
3470
3471 seek $fh, 0, 0;
3472 print $fh $$;
3473}
3474
3475sub main_loop {
3476 warn "EV::loop starting\n";
3477 if (1) {
3478 EV::loop;
3479 }
3480 warn "EV::loop returned\n";
3481 goto &main_loop unless $REALLY_UNLOOP;
2786} 3482}
2787 3483
2788sub main { 3484sub main {
3485 cf::init_globals; # initialise logging
3486
3487 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3488 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3489 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3490 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3491
3492 cf::init_experience;
3493 cf::init_anim;
3494 cf::init_attackmess;
3495 cf::init_dynamic;
3496
3497 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3498
2789 # we must not ever block the main coroutine 3499 # we must not ever block the main coroutine
2790 local $Coro::idle = sub { 3500 local $Coro::idle = sub {
2791 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3501 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2792 (async { 3502 (async {
2793 Event::one_event; 3503 $Coro::current->{desc} = "IDLE BUG HANDLER";
3504 EV::loop EV::LOOP_ONESHOT;
2794 })->prio (Coro::PRIO_MAX); 3505 })->prio (Coro::PRIO_MAX);
2795 }; 3506 };
2796 3507
2797 cfg_load; 3508 evthread_start IO::AIO::poll_fileno;
3509
3510 cf::sync_job {
3511 reload_resources;
3512 reload_config;
2798 db_init; 3513 db_init;
3514
3515 cf::load_settings;
3516 cf::load_materials;
3517 cf::init_uuid;
3518 cf::init_signals;
3519 cf::init_commands;
3520 cf::init_skills;
3521
3522 cf::init_beforeplay;
3523
3524 atomic;
3525
2799 load_extensions; 3526 load_extensions;
2800 3527
2801 $TICK_WATCHER->start; 3528 utime time, time, $RUNTIMEFILE;
2802 Event::loop; 3529
3530 # no (long-running) fork's whatsoever before this point(!)
3531 use POSIX ();
3532 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3533
3534 (pop @POST_INIT)->(0) while @POST_INIT;
3535 };
3536
3537 main_loop;
2803} 3538}
2804 3539
2805############################################################################# 3540#############################################################################
2806# initialisation and cleanup 3541# initialisation and cleanup
2807 3542
2808# install some emergency cleanup handlers 3543# install some emergency cleanup handlers
2809BEGIN { 3544BEGIN {
3545 our %SIGWATCHER = ();
2810 for my $signal (qw(INT HUP TERM)) { 3546 for my $signal (qw(INT HUP TERM)) {
2811 Event->signal ( 3547 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2812 reentrant => 0,
2813 data => WF_AUTOCANCEL,
2814 signal => $signal,
2815 prio => 0,
2816 cb => sub {
2817 cf::cleanup "SIG$signal"; 3548 cf::cleanup "SIG$signal";
2818 },
2819 ); 3549 };
2820 } 3550 }
2821} 3551}
2822 3552
2823sub write_runtime { 3553sub write_runtime_sync {
2824 my $runtime = "$LOCALDIR/runtime";
2825
2826 # first touch the runtime file to show we are still running: 3554 # first touch the runtime file to show we are still running:
2827 # the fsync below can take a very very long time. 3555 # the fsync below can take a very very long time.
2828 3556
2829 IO::AIO::aio_utime $runtime, undef, undef; 3557 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2830 3558
2831 my $guard = cf::lock_acquire "write_runtime"; 3559 my $guard = cf::lock_acquire "write_runtime";
2832 3560
2833 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3561 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2834 or return; 3562 or return;
2835 3563
2836 my $value = $cf::RUNTIME + 90 + 10; 3564 my $value = $cf::RUNTIME + 90 + 10;
2837 # 10 is the runtime save interval, for a monotonic clock 3565 # 10 is the runtime save interval, for a monotonic clock
2838 # 60 allows for the watchdog to kill the server. 3566 # 60 allows for the watchdog to kill the server.
… …
2848 aio_utime $fh, undef, undef; 3576 aio_utime $fh, undef, undef;
2849 3577
2850 close $fh 3578 close $fh
2851 or return; 3579 or return;
2852 3580
2853 aio_rename "$runtime~", $runtime 3581 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2854 and return; 3582 and return;
2855 3583
2856 warn "runtime file written.\n"; 3584 warn "runtime file written.\n";
2857 3585
2858 1 3586 1
3587}
3588
3589our $uuid_lock;
3590our $uuid_skip;
3591
3592sub write_uuid_sync($) {
3593 $uuid_skip ||= $_[0];
3594
3595 return if $uuid_lock;
3596 local $uuid_lock = 1;
3597
3598 my $uuid = "$LOCALDIR/uuid";
3599
3600 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3601 or return;
3602
3603 my $value = uuid_seq uuid_cur;
3604
3605 unless ($value) {
3606 warn "cowardly refusing to write zero uuid value!\n";
3607 return;
3608 }
3609
3610 my $value = uuid_str $value + $uuid_skip;
3611 $uuid_skip = 0;
3612
3613 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3614 and return;
3615
3616 # always fsync - this file is important
3617 aio_fsync $fh
3618 and return;
3619
3620 close $fh
3621 or return;
3622
3623 aio_rename "$uuid~", $uuid
3624 and return;
3625
3626 warn "uuid file written ($value).\n";
3627
3628 1
3629
3630}
3631
3632sub write_uuid($$) {
3633 my ($skip, $sync) = @_;
3634
3635 $sync ? write_uuid_sync $skip
3636 : async { write_uuid_sync $skip };
2859} 3637}
2860 3638
2861sub emergency_save() { 3639sub emergency_save() {
2862 my $freeze_guard = cf::freeze_mainloop; 3640 my $freeze_guard = cf::freeze_mainloop;
2863 3641
2864 warn "enter emergency perl save\n"; 3642 warn "emergency_perl_save: enter\n";
2865 3643
2866 cf::sync_job { 3644 cf::sync_job {
3645 # this is a trade-off: we want to be very quick here, so
3646 # save all maps without fsync, and later call a global sync
3647 # (which in turn might be very very slow)
3648 local $USE_FSYNC = 0;
3649
2867 # use a peculiar iteration method to avoid tripping on perl 3650 # use a peculiar iteration method to avoid tripping on perl
2868 # refcount bugs in for. also avoids problems with players 3651 # refcount bugs in for. also avoids problems with players
2869 # and maps saved/destroyed asynchronously. 3652 # and maps saved/destroyed asynchronously.
2870 warn "begin emergency player save\n"; 3653 warn "emergency_perl_save: begin player save\n";
2871 for my $login (keys %cf::PLAYER) { 3654 for my $login (keys %cf::PLAYER) {
2872 my $pl = $cf::PLAYER{$login} or next; 3655 my $pl = $cf::PLAYER{$login} or next;
2873 $pl->valid or next; 3656 $pl->valid or next;
3657 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2874 $pl->save; 3658 $pl->save;
2875 } 3659 }
2876 warn "end emergency player save\n"; 3660 warn "emergency_perl_save: end player save\n";
2877 3661
2878 warn "begin emergency map save\n"; 3662 warn "emergency_perl_save: begin map save\n";
2879 for my $path (keys %cf::MAP) { 3663 for my $path (keys %cf::MAP) {
2880 my $map = $cf::MAP{$path} or next; 3664 my $map = $cf::MAP{$path} or next;
2881 $map->valid or next; 3665 $map->valid or next;
2882 $map->save; 3666 $map->save;
2883 } 3667 }
2884 warn "end emergency map save\n"; 3668 warn "emergency_perl_save: end map save\n";
2885 3669
2886 warn "begin emergency database checkpoint\n"; 3670 warn "emergency_perl_save: begin database checkpoint\n";
2887 BDB::db_env_txn_checkpoint $DB_ENV; 3671 BDB::db_env_txn_checkpoint $DB_ENV;
2888 warn "end emergency database checkpoint\n"; 3672 warn "emergency_perl_save: end database checkpoint\n";
3673
3674 warn "emergency_perl_save: begin write uuid\n";
3675 write_uuid_sync 1;
3676 warn "emergency_perl_save: end write uuid\n";
2889 }; 3677 };
2890 3678
3679 warn "emergency_perl_save: starting sync()\n";
3680 IO::AIO::aio_sync sub {
3681 warn "emergency_perl_save: finished sync()\n";
3682 };
3683
2891 warn "leave emergency perl save\n"; 3684 warn "emergency_perl_save: leave\n";
2892} 3685}
2893 3686
2894sub post_cleanup { 3687sub post_cleanup {
2895 my ($make_core) = @_; 3688 my ($make_core) = @_;
2896 3689
2897 warn Carp::longmess "post_cleanup backtrace" 3690 warn Carp::longmess "post_cleanup backtrace"
2898 if $make_core; 3691 if $make_core;
3692
3693 my $fh = pidfile;
3694 unlink $PIDFILE if <$fh> == $$;
3695}
3696
3697# a safer delete_package, copied from Symbol
3698sub clear_package($) {
3699 my $pkg = shift;
3700
3701 # expand to full symbol table name if needed
3702 unless ($pkg =~ /^main::.*::$/) {
3703 $pkg = "main$pkg" if $pkg =~ /^::/;
3704 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3705 $pkg .= '::' unless $pkg =~ /::$/;
3706 }
3707
3708 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3709 my $stem_symtab = *{$stem}{HASH};
3710
3711 defined $stem_symtab and exists $stem_symtab->{$leaf}
3712 or return;
3713
3714 # clear all symbols
3715 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3716 for my $name (keys %$leaf_symtab) {
3717 _gv_clear *{"$pkg$name"};
3718# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3719 }
3720 warn "cleared package $pkg\n";#d#
2899} 3721}
2900 3722
2901sub do_reload_perl() { 3723sub do_reload_perl() {
2902 # can/must only be called in main 3724 # can/must only be called in main
2903 if ($Coro::current != $Coro::main) { 3725 if ($Coro::current != $Coro::main) {
2904 warn "can only reload from main coroutine"; 3726 warn "can only reload from main coroutine";
2905 return; 3727 return;
2906 } 3728 }
2907 3729
3730 return if $RELOAD++;
3731
3732 my $t1 = EV::time;
3733
3734 while ($RELOAD) {
2908 warn "reloading..."; 3735 warn "reloading...";
2909 3736
2910 warn "entering sync_job"; 3737 warn "entering sync_job";
2911 3738
2912 cf::sync_job { 3739 cf::sync_job {
2913 cf::write_runtime; # external watchdog should not bark 3740 cf::write_runtime_sync; # external watchdog should not bark
2914 cf::emergency_save; 3741 cf::emergency_save;
2915 cf::write_runtime; # external watchdog should not bark 3742 cf::write_runtime_sync; # external watchdog should not bark
2916 3743
2917 warn "syncing database to disk"; 3744 warn "syncing database to disk";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3745 BDB::db_env_txn_checkpoint $DB_ENV;
2919 3746
2920 # if anything goes wrong in here, we should simply crash as we already saved 3747 # if anything goes wrong in here, we should simply crash as we already saved
2921 3748
2922 warn "cancelling all WF_AUTOCANCEL watchers";
2923 for (Event::all_watchers) {
2924 $_->cancel if $_->data & WF_AUTOCANCEL;
2925 }
2926
2927 warn "flushing outstanding aio requests"; 3749 warn "flushing outstanding aio requests";
2928 for (;;) {
2929 BDB::flush;
2930 IO::AIO::flush;
2931 Coro::cede;
2932 last unless IO::AIO::nreqs || BDB::nreqs; 3750 while (IO::AIO::nreqs || BDB::nreqs) {
2933 warn "iterate..."; 3751 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2934 }
2935
2936 ++$RELOAD;
2937
2938 warn "cancelling all extension coros";
2939 $_->cancel for values %EXT_CORO;
2940 %EXT_CORO = ();
2941
2942 warn "removing commands";
2943 %COMMAND = ();
2944
2945 warn "removing ext/exti commands";
2946 %EXTCMD = ();
2947 %EXTICMD = ();
2948
2949 warn "unloading/nuking all extensions";
2950 for my $pkg (@EXTS) {
2951 warn "... unloading $pkg";
2952
2953 if (my $cb = $pkg->can ("unload")) {
2954 eval {
2955 $cb->($pkg);
2956 1
2957 } or warn "$pkg unloaded, but with errors: $@";
2958 } 3752 }
2959 3753
2960 warn "... nuking $pkg"; 3754 warn "cancelling all extension coros";
2961 Symbol::delete_package $pkg; 3755 $_->cancel for values %EXT_CORO;
2962 } 3756 %EXT_CORO = ();
2963 3757
2964 warn "unloading all perl modules loaded from $LIBDIR"; 3758 warn "removing commands";
2965 while (my ($k, $v) = each %INC) { 3759 %COMMAND = ();
2966 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2967 3760
3761 warn "removing ext/exti commands";
3762 %EXTCMD = ();
3763 %EXTICMD = ();
3764
3765 warn "unloading/nuking all extensions";
3766 for my $pkg (@EXTS) {
2968 warn "... unloading $k"; 3767 warn "... unloading $pkg";
2969 delete $INC{$k};
2970 3768
2971 $k =~ s/\.pm$//;
2972 $k =~ s/\//::/g;
2973
2974 if (my $cb = $k->can ("unload_module")) { 3769 if (my $cb = $pkg->can ("unload")) {
3770 eval {
2975 $cb->(); 3771 $cb->($pkg);
3772 1
3773 } or warn "$pkg unloaded, but with errors: $@";
3774 }
3775
3776 warn "... clearing $pkg";
3777 clear_package $pkg;
2976 } 3778 }
2977 3779
2978 Symbol::delete_package $k; 3780 warn "unloading all perl modules loaded from $LIBDIR";
3781 while (my ($k, $v) = each %INC) {
3782 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3783
3784 warn "... unloading $k";
3785 delete $INC{$k};
3786
3787 $k =~ s/\.pm$//;
3788 $k =~ s/\//::/g;
3789
3790 if (my $cb = $k->can ("unload_module")) {
3791 $cb->();
3792 }
3793
3794 clear_package $k;
2979 } 3795 }
2980 3796
2981 warn "getting rid of safe::, as good as possible"; 3797 warn "getting rid of safe::, as good as possible";
2982 Symbol::delete_package "safe::$_" 3798 clear_package "safe::$_"
2983 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3799 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2984 3800
2985 warn "unloading cf.pm \"a bit\""; 3801 warn "unloading cf.pm \"a bit\"";
2986 delete $INC{"cf.pm"}; 3802 delete $INC{"cf.pm"};
2987 delete $INC{"cf/pod.pm"}; 3803 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2988 3804
2989 # don't, removes xs symbols, too, 3805 # don't, removes xs symbols, too,
2990 # and global variables created in xs 3806 # and global variables created in xs
2991 #Symbol::delete_package __PACKAGE__; 3807 #clear_package __PACKAGE__;
2992 3808
2993 warn "unload completed, starting to reload now"; 3809 warn "unload completed, starting to reload now";
2994 3810
2995 warn "reloading cf.pm"; 3811 warn "reloading cf.pm";
2996 require cf; 3812 require cf;
2997 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3813 cf::_connect_to_perl_1;
2998 3814
2999 warn "loading config and database again"; 3815 warn "loading config and database again";
3000 cf::cfg_load; 3816 cf::reload_config;
3001 3817
3002 warn "loading extensions"; 3818 warn "loading extensions";
3003 cf::load_extensions; 3819 cf::load_extensions;
3004 3820
3821 if ($REATTACH_ON_RELOAD) {
3005 warn "reattaching attachments to objects/players"; 3822 warn "reattaching attachments to objects/players";
3006 _global_reattach; # objects, sockets 3823 _global_reattach; # objects, sockets
3007 warn "reattaching attachments to maps"; 3824 warn "reattaching attachments to maps";
3008 reattach $_ for values %MAP; 3825 reattach $_ for values %MAP;
3009 warn "reattaching attachments to players"; 3826 warn "reattaching attachments to players";
3010 reattach $_ for values %PLAYER; 3827 reattach $_ for values %PLAYER;
3828 }
3011 3829
3830 warn "running post_init jobs";
3831 (pop @POST_INIT)->(1) while @POST_INIT;
3832
3012 warn "leaving sync_job"; 3833 warn "leaving sync_job";
3013 3834
3014 1 3835 1
3015 } or do { 3836 } or do {
3016 warn $@; 3837 warn $@;
3017 warn "error while reloading, exiting."; 3838 cf::cleanup "error while reloading, exiting.";
3018 exit 1;
3019 }; 3839 };
3020 3840
3021 warn "reloaded"; 3841 warn "reloaded";
3842 --$RELOAD;
3843 }
3844
3845 $t1 = EV::time - $t1;
3846 warn "reload completed in ${t1}s\n";
3022}; 3847};
3023 3848
3024our $RELOAD_WATCHER; # used only during reload 3849our $RELOAD_WATCHER; # used only during reload
3025 3850
3026sub reload_perl() { 3851sub reload_perl() {
3027 # doing reload synchronously and two reloads happen back-to-back, 3852 # doing reload synchronously and two reloads happen back-to-back,
3028 # coro crashes during coro_state_free->destroy here. 3853 # coro crashes during coro_state_free->destroy here.
3029 3854
3030 $RELOAD_WATCHER ||= Event->timer ( 3855 $RELOAD_WATCHER ||= cf::async {
3031 reentrant => 0, 3856 Coro::AIO::aio_wait cache_extensions;
3032 after => 0, 3857
3033 data => WF_AUTOCANCEL, 3858 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3034 cb => sub {
3035 do_reload_perl; 3859 do_reload_perl;
3036 undef $RELOAD_WATCHER; 3860 undef $RELOAD_WATCHER;
3037 }, 3861 };
3038 ); 3862 };
3039} 3863}
3040 3864
3041register_command "reload" => sub { 3865register_command "reload" => sub {
3042 my ($who, $arg) = @_; 3866 my ($who, $arg) = @_;
3043 3867
3044 if ($who->flag (FLAG_WIZ)) { 3868 if ($who->flag (FLAG_WIZ)) {
3045 $who->message ("reloading server."); 3869 $who->message ("reloading server.");
3870 async {
3871 $Coro::current->{desc} = "perl_reload";
3046 async { reload_perl }; 3872 reload_perl;
3873 };
3047 } 3874 }
3048}; 3875};
3049 3876
3050unshift @INC, $LIBDIR; 3877unshift @INC, $LIBDIR;
3051 3878
… …
3053 3880
3054our @WAIT_FOR_TICK; 3881our @WAIT_FOR_TICK;
3055our @WAIT_FOR_TICK_BEGIN; 3882our @WAIT_FOR_TICK_BEGIN;
3056 3883
3057sub wait_for_tick { 3884sub wait_for_tick {
3058 return unless $TICK_WATCHER->is_active;
3059 return if $Coro::current == $Coro::main; 3885 return if tick_inhibit || $Coro::current == $Coro::main;
3060 3886
3061 my $signal = new Coro::Signal; 3887 my $signal = new Coro::Signal;
3062 push @WAIT_FOR_TICK, $signal; 3888 push @WAIT_FOR_TICK, $signal;
3063 $signal->wait; 3889 $signal->wait;
3064} 3890}
3065 3891
3066sub wait_for_tick_begin { 3892sub wait_for_tick_begin {
3067 return unless $TICK_WATCHER->is_active;
3068 return if $Coro::current == $Coro::main; 3893 return if tick_inhibit || $Coro::current == $Coro::main;
3069 3894
3070 my $signal = new Coro::Signal; 3895 my $signal = new Coro::Signal;
3071 push @WAIT_FOR_TICK_BEGIN, $signal; 3896 push @WAIT_FOR_TICK_BEGIN, $signal;
3072 $signal->wait; 3897 $signal->wait;
3073} 3898}
3074 3899
3075 my $min = 1e6;#d# 3900sub tick {
3076 my $avg = 10;
3077$TICK_WATCHER = Event->timer (
3078 reentrant => 0,
3079 parked => 1,
3080 prio => 0,
3081 at => $NEXT_TICK || $TICK,
3082 data => WF_AUTOCANCEL,
3083 cb => sub {
3084 if ($Coro::current != $Coro::main) { 3901 if ($Coro::current != $Coro::main) {
3085 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3902 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3086 unless ++$bug_warning > 10; 3903 unless ++$bug_warning > 10;
3087 return; 3904 return;
3088 } 3905 }
3089 3906
3090 $NOW = $tick_start = Event::time;
3091
3092 cf::server_tick; # one server iteration 3907 cf::server_tick; # one server iteration
3093 3908
3094 0 && sync_job {#d# 3909 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3095 for(1..10) { 3910 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3096 my $t = Event::time; 3911 Coro::async_pool {
3097 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3912 $Coro::current->{desc} = "runtime saver";
3098 or die; 3913 write_runtime_sync
3099 3914 or warn "ERROR: unable to write runtime file: $!";
3100 $map->width (50);
3101 $map->height (50);
3102 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1);
3104 my $t = Event::time - $t;
3105
3106 #next unless $t < 0.0013;#d#
3107 if ($t < $min) {
3108 $min = $t;
3109 }
3110 $avg = $avg * 0.99 + $t * 0.01;
3111 }
3112 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113 exit 0;
3114 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115 }; 3915 };
3916 }
3116 3917
3117 $RUNTIME += $TICK;
3118 $NEXT_TICK += $TICK;
3119
3120 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 $NEXT_RUNTIME_WRITE = $NOW + 10;
3122 Coro::async_pool {
3123 write_runtime
3124 or warn "ERROR: unable to write runtime file: $!";
3125 };
3126 }
3127
3128# my $AFTER = Event::time;
3129# warn $AFTER - $NOW;#d#
3130
3131 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3918 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132 $sig->send; 3919 $sig->send;
3133 } 3920 }
3134 while (my $sig = shift @WAIT_FOR_TICK) { 3921 while (my $sig = shift @WAIT_FOR_TICK) {
3135 $sig->send; 3922 $sig->send;
3136 } 3923 }
3137 3924
3138 $NOW = Event::time; 3925 $LOAD = ($NOW - $TICK_START) / $TICK;
3139
3140 # if we are delayed by four ticks or more, skip them all
3141 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3142
3143 $TICK_WATCHER->at ($NEXT_TICK);
3144 $TICK_WATCHER->start;
3145
3146 $LOAD = ($NOW - $tick_start) / $TICK;
3147 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3926 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148 3927
3149 _post_tick; 3928 if (0) {
3150 3929 if ($NEXT_TICK) {
3151 3930 my $jitter = $TICK_START - $NEXT_TICK;
3931 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3932 warn "jitter $JITTER\n";#d#
3933 }
3152 }, 3934 }
3153); 3935}
3154 3936
3155{ 3937{
3156 BDB::max_poll_time $TICK * 0.1; 3938 # configure BDB
3157 $BDB_POLL_WATCHER = Event->io ( 3939
3158 reentrant => 0,
3159 fd => BDB::poll_fileno,
3160 poll => 'r',
3161 prio => 0,
3162 data => WF_AUTOCANCEL,
3163 cb => \&BDB::poll_cb,
3164 );
3165 BDB::min_parallel 8; 3940 BDB::min_parallel 8;
3166 3941 BDB::max_poll_reqs $TICK * 0.1;
3167 BDB::set_sync_prepare { 3942 $AnyEvent::BDB::WATCHER->priority (1);
3168 my $status;
3169 my $current = $Coro::current;
3170 (
3171 sub {
3172 $status = $!;
3173 $current->ready; undef $current;
3174 },
3175 sub {
3176 Coro::schedule while defined $current;
3177 $! = $status;
3178 },
3179 )
3180 };
3181 3943
3182 unless ($DB_ENV) { 3944 unless ($DB_ENV) {
3183 $DB_ENV = BDB::db_env_create; 3945 $DB_ENV = BDB::db_env_create;
3946 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3947 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3948 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3949 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3950 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3184 3951
3185 cf::sync_job { 3952 cf::sync_job {
3186 eval { 3953 eval {
3187 BDB::db_env_open 3954 BDB::db_env_open
3188 $DB_ENV, 3955 $DB_ENV,
… …
3190 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3957 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3191 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3958 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3192 0666; 3959 0666;
3193 3960
3194 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3961 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3195
3196 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3197 $DB_ENV->set_lk_detect;
3198 }; 3962 };
3199 3963
3200 cf::cleanup "db_env_open(db): $@" if $@; 3964 cf::cleanup "db_env_open(db): $@" if $@;
3201 }; 3965 };
3202 } 3966 }
3967
3968 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3969 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3970 };
3971 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3972 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3973 };
3974 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3975 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3976 };
3203} 3977}
3204 3978
3205{ 3979{
3980 # configure IO::AIO
3981
3206 IO::AIO::min_parallel 8; 3982 IO::AIO::min_parallel 8;
3207
3208 undef $Coro::AIO::WATCHER;
3209 IO::AIO::max_poll_time $TICK * 0.1; 3983 IO::AIO::max_poll_time $TICK * 0.1;
3210 $AIO_POLL_WATCHER = Event->io ( 3984 undef $AnyEvent::AIO::WATCHER;
3211 reentrant => 0,
3212 data => WF_AUTOCANCEL,
3213 fd => IO::AIO::poll_fileno,
3214 poll => 'r',
3215 prio => 6,
3216 cb => \&IO::AIO::poll_cb,
3217 );
3218} 3985}
3219 3986
3220my $_log_backtrace; 3987my $_log_backtrace;
3221 3988
3222sub _log_backtrace { 3989sub _log_backtrace {
… …
3225 $msg =~ s/\n//; 3992 $msg =~ s/\n//;
3226 3993
3227 # limit the # of concurrent backtraces 3994 # limit the # of concurrent backtraces
3228 if ($_log_backtrace < 2) { 3995 if ($_log_backtrace < 2) {
3229 ++$_log_backtrace; 3996 ++$_log_backtrace;
3997 my $perl_bt = Carp::longmess $msg;
3230 async { 3998 async {
3999 $Coro::current->{desc} = "abt $msg";
4000
3231 my @bt = fork_call { 4001 my @bt = fork_call {
3232 @addr = map { sprintf "%x", $_ } @addr; 4002 @addr = map { sprintf "%x", $_ } @addr;
3233 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4003 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4004 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3235 or die "addr2line: $!"; 4005 or die "addr2line: $!";
… …
3243 } 4013 }
3244 4014
3245 @funcs 4015 @funcs
3246 }; 4016 };
3247 4017
3248 LOG llevInfo, "[ABT] $msg\n"; 4018 LOG llevInfo, "[ABT] $perl_bt\n";
4019 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3249 LOG llevInfo, "[ABT] $_\n" for @bt; 4020 LOG llevInfo, "[ABT] $_\n" for @bt;
3250 --$_log_backtrace; 4021 --$_log_backtrace;
3251 }; 4022 };
3252 } else { 4023 } else {
3253 LOG llevInfo, "[ABT] $msg\n"; 4024 LOG llevInfo, "[ABT] $msg\n";
3254 LOG llevInfo, "[ABT] [suppressed]\n"; 4025 LOG llevInfo, "[ABT] [suppressed]\n";
3255 } 4026 }
3256} 4027}
3257 4028
3258# load additional modules 4029# load additional modules
3259use cf::pod; 4030require "cf/$_.pm" for @EXTRA_MODULES;
4031cf::_connect_to_perl_2;
3260 4032
3261END { cf::emergency_save } 4033END { cf::emergency_save }
3262 4034
32631 40351
3264 4036

Diff Legend

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