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.301 by root, Tue Jul 10 07:01:51 2007 UTC vs.
Revision 1.487 by root, Fri Oct 16 01:56:41 2009 UTC

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

Diff Legend

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