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.273 by root, Mon Jun 4 12:19:08 2007 UTC vs.
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 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
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
51use Coro::Util ();
24 52
53use JSON::XS 2.01 ();
25use BDB (); 54use BDB ();
26use Data::Dumper; 55use Data::Dumper;
27use Digest::MD5;
28use Fcntl; 56use Fcntl;
29use YAML::Syck (); 57use YAML::XS ();
30use IO::AIO 2.32 (); 58use IO::AIO ();
31use Time::HiRes; 59use Time::HiRes;
32use Compress::LZF; 60use Compress::LZF;
61use Digest::MD5 ();
62
63AnyEvent::detect;
33 64
34# configure various modules to our taste 65# configure various modules to our taste
35# 66#
36$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
37Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
38Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
39 75
40$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
41 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 78
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
48 82
49our %COMMAND = (); 83our %COMMAND = ();
50our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
51 85
52our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 87our %EXTCMD = ();
88our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
56 91
57our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
59 96
60our $CONFDIR = confdir; 97our $CONFDIR = confdir;
61our $DATADIR = datadir; 98our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE; # unused
112
113our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000;
115
116our $MAX_LINKS = 32; # how many chained exits to follow
117our $VERBOSE_IO = 1;
71 118
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 119our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 120our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 121our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 122our $USE_FSYNC = 1; # use fsync to write maps - default on
79 123
124our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 126our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 127our $DB_ENV;
128
129our @EXTRA_MODULES = qw(pod match mapscript incloader);
82 130
83our %CFG; 131our %CFG;
84 132
85our $UPTIME; $UPTIME ||= time; 133our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 134our $RUNTIME;
135our $NOW;
87 136
88our %PLAYER; # all users 137our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 138our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 139our $LINK_MAP; # the special {link} map, which is always available
91 140
92# used to convert map paths into valid unix filenames by replacing / by ∕ 141# used to convert map paths into valid unix filenames by replacing / by ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 142our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 143
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 144our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 145our $LOADAVG; # same thing, but with alpha-smoothing
146our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 147our $TICK_START; # for load detecting purposes
148
149our @POST_INIT;
150
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :)
98 153
99binmode STDOUT; 154binmode STDOUT;
100binmode STDERR; 155binmode STDERR;
101 156
102# read virtual server time, if available 157# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 158unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 159 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 160 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 161 $RUNTIME = <$fh> + 0.;
107} 162}
163
164eval "sub TICK() { $TICK } 1" or die;
108 165
109mkdir $_ 166mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 167 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
111 168
112our $EMERGENCY_POSITION; 169our $EMERGENCY_POSITION;
113 170
114sub cf::map::normalise; 171sub cf::map::normalise;
172
173sub in_main() {
174 $Coro::current == $Coro::main
175}
176
177#############################################################################
178
179%REFLECT = ();
180for (@REFLECT) {
181 my $reflect = JSON::XS::decode_json $_;
182 $REFLECT{$reflect->{class}} = $reflect;
183}
184
185# this is decidedly evil
186$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
115 187
116############################################################################# 188#############################################################################
117 189
118=head2 GLOBAL VARIABLES 190=head2 GLOBAL VARIABLES
119 191
155 227
156The raw value load value from the last tick. 228The raw value load value from the last tick.
157 229
158=item %cf::CFG 230=item %cf::CFG
159 231
160Configuration for the server, loaded from C</etc/crossfire/config>, or 232Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 233from wherever your confdir points to.
162 234
163=item cf::wait_for_tick, cf::wait_for_tick_begin 235=item cf::wait_for_tick, cf::wait_for_tick_begin
164 236
165These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
166returns directly I<after> the tick processing (and consequently, can only wake one process 238returns directly I<after> the tick processing (and consequently, can only wake one thread
167per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 239per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
168 240
241=cut
242
243sub wait_for_tick();
244sub wait_for_tick_begin();
245
246=item @cf::INVOKE_RESULTS
247
248This array contains the results of the last C<invoke ()> call. When
249C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
250that call.
251
252=item %cf::REFLECT
253
254Contains, for each (C++) class name, a hash reference with information
255about object members (methods, scalars, arrays and flags) and other
256metadata, which is useful for introspection.
257
169=back 258=back
170 259
171=cut 260=cut
172 261
173BEGIN { 262sub error(@) { LOG llevError, join "", @_ }
174 *CORE::GLOBAL::warn = sub { 263sub warn (@) { LOG llevWarn , join "", @_ }
264sub info (@) { LOG llevInfo , join "", @_ }
265sub debug(@) { LOG llevDebug, join "", @_ }
266sub trace(@) { LOG llevTrace, join "", @_ }
267
268$Coro::State::WARNHOOK = sub {
175 my $msg = join "", @_; 269 my $msg = join "", @_;
176 270
177 $msg .= "\n" 271 $msg .= "\n"
178 unless $msg =~ /\n$/; 272 unless $msg =~ /\n$/;
179 273
180 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 274 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
181 275
182 utf8::encode $msg;
183 LOG llevError, $msg; 276 LOG llevWarn, $msg;
184 }; 277};
185} 278
279$Coro::State::DIEHOOK = sub {
280 return unless $^S eq 0; # "eq", not "=="
281
282 error Carp::longmess $_[0];
283
284 if (in_main) {#d#
285 error "DIEHOOK called in main context, Coro bug?\n";#d#
286 return;#d#
287 }#d#
288
289 # kill coroutine otherwise
290 Coro::terminate
291};
186 292
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 293@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 294@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 295@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 296@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
197for my $pkg (qw( 303for my $pkg (qw(
198 cf::global cf::attachable 304 cf::global cf::attachable
199 cf::object cf::object::player 305 cf::object cf::object::player
200 cf::client cf::player 306 cf::client cf::player
201 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
202 cf::map cf::party cf::region 309 cf::party cf::region
203)) { 310)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 312}
207 313
208$Event::DIED = sub { 314$EV::DIED = sub {
209 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
210}; 316};
317
318#############################################################################
211 319
212=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
213 321
214=over 4 322=over 4
215 323
234 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 342 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
235 $d 343 $d
236 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
237} 345}
238 346
239use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
240
241=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
242 348
243Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
244 350
245=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
246 352
247Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
248 354
355=cut
356
357our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358
359sub encode_json($) { $json_coder->encode ($_[0]) }
360sub decode_json($) { $json_coder->decode ($_[0]) }
361
362=item cf::post_init { BLOCK }
363
364Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365but I<before> the server starts ticking again.
366
367The cdoeblock will have a single boolean argument to indicate whether this
368is a reload or not.
369
370=cut
371
372sub post_init(&) {
373 push @POST_INIT, shift;
374}
375
249=item cf::lock_wait $string 376=item cf::lock_wait $string
250 377
251Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
252 379
253=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
254 381
255Wait until the given lock is available and then acquires it and returns 382Wait until the given lock is available and then acquires it and returns
256a Coro::guard object. If the guard object gets destroyed (goes out of scope, 383a L<Guard> object. If the guard object gets destroyed (goes out of scope,
257for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
258returned. 385returned.
259 386
387Locks are *not* recursive, locking from the same coro twice results in a
388deadlocked coro.
389
260Lock names should begin with a unique identifier (for example, cf::map::find 390Lock names should begin with a unique identifier (for example, cf::map::find
261uses map_find and cf::map::load uses map_load). 391uses map_find and cf::map::load uses map_load).
262 392
263=item $locked = cf::lock_active $string 393=item $locked = cf::lock_active $string
264 394
265Return true if the lock is currently active, i.e. somebody has locked it. 395Return true if the lock is currently active, i.e. somebody has locked it.
266 396
267=cut 397=cut
268 398
269our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
270 400
271sub lock_wait($) { 401sub lock_wait($) {
272 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
273
274 # wait for lock, if any
275 while ($LOCK{$key}) {
276 push @{ $LOCK{$key} }, $Coro::current;
277 Coro::schedule;
278 }
279} 403}
280 404
281sub lock_acquire($) { 405sub lock_acquire($) {
282 my ($key) = @_; 406 $LOCKS->guard ($_[0])
283
284 # wait, to be sure we are not locked
285 lock_wait $key;
286
287 $LOCK{$key} = [];
288
289 Coro::guard {
290 # wake up all waiters, to be on the safe side
291 $_->ready for @{ delete $LOCK{$key} };
292 }
293} 407}
294 408
295sub lock_active($) { 409sub lock_active($) {
296 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
297
298 ! ! $LOCK{$key}
299} 411}
300 412
301sub freeze_mainloop { 413sub freeze_mainloop {
302 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
303 415
304 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
305 $TICK_WATCHER->start; 417}
418
419=item cf::periodic $interval, $cb
420
421Like EV::periodic, but randomly selects a starting point so that the actions
422get spread over time.
423
424=cut
425
426sub periodic($$) {
427 my ($interval, $cb) = @_;
428
429 my $start = rand List::Util::min 180, $interval;
430
431 EV::periodic $start, $interval, 0, $cb
432}
433
434=item cf::get_slot $time[, $priority[, $name]]
435
436Allocate $time seconds of blocking CPU time at priority C<$priority>:
437This call blocks and returns only when you have at least C<$time> seconds
438of cpu time till the next tick. The slot is only valid till the next cede.
439
440The optional C<$name> can be used to identify the job to run. It might be
441used for statistical purposes and should identify the same time-class.
442
443Useful for short background jobs.
444
445=cut
446
447our @SLOT_QUEUE;
448our $SLOT_QUEUE;
449our $SLOT_DECAY = 0.9;
450
451$SLOT_QUEUE->cancel if $SLOT_QUEUE;
452$SLOT_QUEUE = Coro::async {
453 $Coro::current->desc ("timeslot manager");
454
455 my $signal = new Coro::Signal;
456 my $busy;
457
458 while () {
459 next_job:
460
461 my $avail = cf::till_tick;
462
463 for (0 .. $#SLOT_QUEUE) {
464 if ($SLOT_QUEUE[$_][0] <= $avail) {
465 $busy = 0;
466 my $job = splice @SLOT_QUEUE, $_, 1, ();
467 $job->[2]->send;
468 Coro::cede;
469 goto next_job;
470 } else {
471 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
472 }
473 }
474
475 if (@SLOT_QUEUE) {
476 # we do not use wait_for_tick() as it returns immediately when tick is inactive
477 push @cf::WAIT_FOR_TICK, $signal;
478 $signal->wait;
479 } else {
480 $busy = 0;
481 Coro::schedule;
482 }
306 }; 483 }
307 $TICK_WATCHER->stop; 484};
308 $guard 485
486sub get_slot($;$$) {
487 return if tick_inhibit || $Coro::current == $Coro::main;
488
489 my ($time, $pri, $name) = @_;
490
491 $time = clamp $time, 0.01, $TICK * .6;
492
493 my $sig = new Coro::Signal;
494
495 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
496 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
497 $SLOT_QUEUE->ready;
498 $sig->wait;
309} 499}
310 500
311=item cf::async { BLOCK } 501=item cf::async { BLOCK }
312 502
313Currently the same as Coro::async_pool, meaning you cannot use 503Currently the same as Coro::async_pool, meaning you cannot use
318 508
319BEGIN { *async = \&Coro::async_pool } 509BEGIN { *async = \&Coro::async_pool }
320 510
321=item cf::sync_job { BLOCK } 511=item cf::sync_job { BLOCK }
322 512
323The design of crossfire+ requires that the main coro ($Coro::main) is 513The design of Deliantra requires that the main coroutine ($Coro::main)
324always able to handle events or runnable, as crossfire+ is only partly 514is always able to handle events or runnable, as Deliantra is only
325reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 515partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
516acceptable.
326 517
327If it must be done, put the blocking parts into C<sync_job>. This will run 518If it must be done, put the blocking parts into C<sync_job>. This will run
328the given BLOCK in another coroutine while waiting for the result. The 519the given BLOCK in another coroutine while waiting for the result. The
329server will be frozen during this time, so the block should either finish 520server will be frozen during this time, so the block should either finish
330fast or be very important. 521fast or be very important.
332=cut 523=cut
333 524
334sub sync_job(&) { 525sub sync_job(&) {
335 my ($job) = @_; 526 my ($job) = @_;
336 527
337 if ($Coro::current == $Coro::main) { 528 if (in_main) {
338 my $time = Event::time; 529 my $time = AE::time;
339 530
340 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
341 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
342 533
343 # TODO: use suspend/resume instead 534 #LOG llevError, Carp::longmess "sync job";#d#
344 # (but this is cancel-safe) 535
345 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
346 537
347 my $busy = 1; 538 my $busy = 1;
348 my @res; 539 my @res;
349 540
350 (async { 541 (async {
542 $Coro::current->desc ("sync job coro");
351 @res = eval { $job->() }; 543 @res = eval { $job->() };
352 warn $@ if $@; 544 error $@ if $@;
353 undef $busy; 545 undef $busy;
354 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
355 547
356 while ($busy) { 548 while ($busy) {
357 Coro::cede or Event::one_event; 549 if (Coro::nready) {
550 Coro::cede_notself;
551 } else {
552 EV::loop EV::LOOP_ONESHOT;
358 } 553 }
554 }
359 555
360 $time = Event::time - $time; 556 my $time = AE::time - $time;
361 557
362 LOG llevError | logBacktrace, Carp::longmess "long sync job"
363 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
364
365 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
366 559
367 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
368 } else { 561 } else {
369 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
370 563
390 $EXT_CORO{$coro+0} = $coro; 583 $EXT_CORO{$coro+0} = $coro;
391 584
392 $coro 585 $coro
393} 586}
394 587
395sub write_runtime { 588=item fork_call { }, $args
396 my $runtime = "$LOCALDIR/runtime";
397 589
398 # first touch the runtime file to show we are still running: 590Executes the given code block with the given arguments in a seperate
399 # the fsync below can take a very very long time. 591process, returning the results. Everything must be serialisable with
592Coro::Storable. May, of course, block. Note that the executed sub may
593never block itself or use any form of event handling.
400 594
401 IO::AIO::aio_utime $runtime, undef, undef; 595=cut
402 596
403 my $guard = cf::lock_acquire "write_runtime"; 597sub post_fork {
598 reset_signals;
599}
404 600
405 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 601sub fork_call(&@) {
406 or return; 602 my ($cb, @args) = @_;
407 603
408 my $value = $cf::RUNTIME + 90 + 10; 604 # we seemingly have to make a local copy of the whole thing,
409 # 10 is the runtime save interval, for a monotonic clock 605 # otherwise perl prematurely frees the stuff :/
410 # 60 allows for the watchdog to kill the server. 606 # TODO: investigate and fix (likely this will be rather laborious)
411 607
412 (aio_write $fh, 0, (length $value), $value, 0) <= 0 608 my @res = Coro::Util::fork_eval {
413 and return; 609 cf::post_fork;
610 &$cb
611 }, @args;
414 612
415 # always fsync - this file is important 613 wantarray ? @res : $res[-1]
416 aio_fsync $fh 614}
417 and return;
418 615
419 # touch it again to show we are up-to-date 616sub objinfo {
420 aio_utime $fh, undef, undef;
421
422 close $fh
423 or return;
424
425 aio_rename "$runtime~", $runtime
426 and return;
427
428 warn "runtime file written.\n";#d#
429
430 1 617 (
618 "counter value" => cf::object::object_count,
619 "objects created" => cf::object::create_count,
620 "objects destroyed" => cf::object::destroy_count,
621 "freelist size" => cf::object::free_count,
622 "allocated objects" => cf::object::objects_size,
623 "active objects" => cf::object::actives_size,
624 )
625}
626
627=item $coin = coin_from_name $name
628
629=cut
630
631our %coin_alias = (
632 "silver" => "silvercoin",
633 "silvercoin" => "silvercoin",
634 "silvercoins" => "silvercoin",
635 "gold" => "goldcoin",
636 "goldcoin" => "goldcoin",
637 "goldcoins" => "goldcoin",
638 "platinum" => "platinacoin",
639 "platinumcoin" => "platinacoin",
640 "platinumcoins" => "platinacoin",
641 "platina" => "platinacoin",
642 "platinacoin" => "platinacoin",
643 "platinacoins" => "platinacoin",
644 "royalty" => "royalty",
645 "royalties" => "royalty",
646);
647
648sub coin_from_name($) {
649 $coin_alias{$_[0]}
650 ? cf::arch::find $coin_alias{$_[0]}
651 : undef
652}
653
654=item $value = cf::db_get $family => $key
655
656Returns a single value from the environment database.
657
658=item cf::db_put $family => $key => $value
659
660Stores the given C<$value> in the family. It can currently store binary
661data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
662
663=item $db = cf::db_table "name"
664
665Create and/or open a new database table. The string must not be "db" and must be unique
666within each server.
667
668=cut
669
670sub db_table($) {
671 cf::error "db_get called from main context"
672 if $Coro::current == $Coro::main;
673
674 my ($name) = @_;
675 my $db = BDB::db_create $DB_ENV;
676
677 eval {
678 $db->set_flags (BDB::CHKSUM);
679
680 utf8::encode $name;
681 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
682 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
683 cf::cleanup "db_open(db): $!" if $!;
684 };
685 cf::cleanup "db_open(db): $@" if $@;
686
687 $db
688}
689
690our $DB;
691
692sub db_init {
693 $DB ||= db_table "db";
694}
695
696sub db_get($$) {
697 my $key = "$_[0]/$_[1]";
698
699 cf::error "db_get called from main context"
700 if $Coro::current == $Coro::main;
701
702 BDB::db_get $DB, undef, $key, my $data;
703
704 $! ? ()
705 : $data
706}
707
708sub db_put($$$) {
709 BDB::dbreq_pri 4;
710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
711}
712
713=item cf::cache $id => [$paths...], $processversion => $process
714
715Generic caching function that returns the value of the resource $id,
716caching and regenerating as required.
717
718This function can block.
719
720=cut
721
722sub cache {
723 my ($id, $src, $processversion, $process) = @_;
724
725 my $meta =
726 join "\x00",
727 $processversion,
728 map {
729 aio_stat $_
730 and Carp::croak "$_: $!";
731
732 ($_, (stat _)[7,9])
733 } @$src;
734
735 my $dbmeta = db_get cache => "$id/meta";
736 if ($dbmeta ne $meta) {
737 # changed, we may need to process
738
739 my @data;
740 my $md5;
741
742 for (0 .. $#$src) {
743 0 <= aio_load $src->[$_], $data[$_]
744 or Carp::croak "$src->[$_]: $!";
745 }
746
747 # if processing is expensive, check
748 # checksum first
749 if (1) {
750 $md5 =
751 join "\x00",
752 $processversion,
753 map {
754 cf::cede_to_tick;
755 ($src->[$_], Digest::MD5::md5_hex $data[$_])
756 } 0.. $#$src;
757
758
759 my $dbmd5 = db_get cache => "$id/md5";
760 if ($dbmd5 eq $md5) {
761 db_put cache => "$id/meta", $meta;
762
763 return db_get cache => "$id/data";
764 }
765 }
766
767 my $t1 = Time::HiRes::time;
768 my $data = $process->(\@data);
769 my $t2 = Time::HiRes::time;
770
771 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
772
773 db_put cache => "$id/data", $data;
774 db_put cache => "$id/md5" , $md5;
775 db_put cache => "$id/meta", $meta;
776
777 return $data;
778 }
779
780 db_get cache => "$id/data"
431} 781}
432 782
433=item cf::datalog type => key => value, ... 783=item cf::datalog type => key => value, ...
434 784
435Log a datalog packet of the given type with the given key-value pairs. 785Log a datalog packet of the given type with the given key-value pairs.
436 786
437=cut 787=cut
438 788
439sub datalog($@) { 789sub datalog($@) {
440 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
441 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
442} 792}
443 793
444=back 794=back
445 795
446=cut 796=cut
447 797
448############################################################################# 798#############################################################################
449 799
450=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
451 801
452Many objects in crossfire are so-called attachable objects. That means you can 802Many objects in deliantra are so-called attachable objects. That means you can
453attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
454to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
455 805
456In the following description, CLASS can be any of C<global>, C<object> 806In the following description, CLASS can be any of C<global>, C<object>
457C<player>, C<client> or C<map> (i.e. the attachable objects in 807C<player>, C<client> or C<map> (i.e. the attachable objects in
458crossfire+). 808Deliantra).
459 809
460=over 4 810=over 4
461 811
462=item $attachable->attach ($attachment, key => $value...) 812=item $attachable->attach ($attachment, key => $value...)
463 813
507=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
508 858
509Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
510given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
511 861
512Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
513that are attached at load/instantiate time, thus the need for a name. 863that are attached at load/instantiate time, thus the need for a name.
514 864
515These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
516 866
517=over 4 867=over 4
641 991
642 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
643 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
644 994
645 } elsif (ref $type) { 995 } elsif (ref $type) {
646 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
647 997
648 } else { 998 } else {
649 shift @arg; 999 shift @arg;
650 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
651 } 1001 }
652 } 1002 }
653} 1003}
654 1004
655sub _object_attach { 1005sub _object_attach {
665 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
666 } 1016 }
667 1017
668 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
669 } else { 1019 } else {
670 warn "object uses attachment '$name' that is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
671 } 1021 }
672 1022
673 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
674} 1024}
675 1025
715 "; 1065 ";
716 die if $@; 1066 die if $@;
717} 1067}
718 1068
719our $override; 1069our $override;
720our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1070our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
721 1071
722sub override { 1072sub override {
723 $override = 1; 1073 $override = 1;
724 @invoke_results = (); 1074 @INVOKE_RESULTS = (@_);
725} 1075}
726 1076
727sub do_invoke { 1077sub do_invoke {
728 my $event = shift; 1078 my $event = shift;
729 my $callbacks = shift; 1079 my $callbacks = shift;
730 1080
731 @invoke_results = (); 1081 @INVOKE_RESULTS = ();
732 1082
733 local $override; 1083 local $override;
734 1084
735 for (@$callbacks) { 1085 for (@$callbacks) {
736 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
737 1087
738 if ($@) { 1088 if ($@) {
739 warn "$@";
740 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
741 override; 1090 override;
742 } 1091 }
743 1092
744 return 1 if $override; 1093 return 1 if $override;
745 } 1094 }
746 1095
747 0 1096 0
748} 1097}
749 1098
750=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1099=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
751 1100
752=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1101=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
753 1102
754Generate an object-specific event with the given arguments. 1103Generate an object-specific event with the given arguments.
755 1104
756This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1105This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
757removed in future versions), and there is no public API to access override 1106removed in future versions), and there is no public API to access override
758results (if you must, access C<@cf::invoke_results> directly). 1107results (if you must, access C<@cf::INVOKE_RESULTS> directly).
759 1108
760=back 1109=back
761 1110
762=cut 1111=cut
763 1112
764############################################################################# 1113#############################################################################
765# object support 1114# object support
1115
1116sub _object_equal($$);
1117sub _object_equal($$) {
1118 my ($a, $b) = @_;
1119
1120 return 0 unless (ref $a) eq (ref $b);
1121
1122 if ("HASH" eq ref $a) {
1123 my @ka = keys %$a;
1124 my @kb = keys %$b;
1125
1126 return 0 if @ka != @kb;
1127
1128 for (0 .. $#ka) {
1129 return 0 unless $ka[$_] eq $kb[$_];
1130 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1131 }
1132
1133 } elsif ("ARRAY" eq ref $a) {
1134
1135 return 0 if @$a != @$b;
1136
1137 for (0 .. $#$a) {
1138 return 0 unless _object_equal $a->[$_], $b->[$_];
1139 }
1140
1141 } elsif ($a ne $b) {
1142 return 0;
1143 }
1144
1145 1
1146}
1147
1148our $SLOW_MERGES;#d#
1149sub _can_merge {
1150 my ($ob1, $ob2) = @_;
1151
1152 ++$SLOW_MERGES;#d#
1153
1154 # we do the slow way here
1155 return _object_equal $ob1, $ob2
1156}
766 1157
767sub reattach { 1158sub reattach {
768 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
769 my ($obj) = @_; 1160 my ($obj) = @_;
770 1161
1162 # no longer needed after getting rid of delete_package?
771 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1163 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
772 1164
773 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
774 1166
775 @$registry = (); 1167 @$registry = ();
776 1168
781 for (@$attach) { 1173 for (@$attach) {
782 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
783 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
784 } 1176 }
785 } else { 1177 } else {
786 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
787 } 1179 }
788 } 1180 }
789} 1181}
790 1182
791cf::attachable->attach ( 1183cf::attachable->attach (
792 prio => -1000000, 1184 prio => -1000000,
793 on_instantiate => sub { 1185 on_instantiate => sub {
794 my ($obj, $data) = @_; 1186 my ($obj, $data) = @_;
795 1187
796 $data = from_json $data; 1188 $data = decode_json $data;
797 1189
798 for (@$data) { 1190 for (@$data) {
799 my ($name, $args) = @$_; 1191 my ($name, $args) = @$_;
800 1192
801 $obj->attach ($name, %{$args || {} }); 1193 $obj->attach ($name, %{$args || {} });
817sub object_freezer_save { 1209sub object_freezer_save {
818 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
819 1211
820 sync_job { 1212 sync_job {
821 if (length $$rdata) { 1213 if (length $$rdata) {
1214 utf8::decode (my $decname = $filename);
822 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
823 $filename, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
824 1218
825 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
826 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
827 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
828 aio_fsync $fh if $cf::USE_FSYNC; 1222 if ($cf::USE_FSYNC) {
1223 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;
1224 aio_fsync $fh;
1225 }
829 close $fh; 1226 aio_close $fh;
830 1227
831 if (@$objs) { 1228 if (@$objs) {
832 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1229 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
833 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
834 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
835 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
836 aio_fsync $fh if $cf::USE_FSYNC; 1233 if ($cf::USE_FSYNC) {
1234 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;
1235 aio_fsync $fh;
1236 }
837 close $fh; 1237 aio_close $fh;
838 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
839 } 1239 }
840 } else { 1240 } else {
841 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
842 } 1242 }
843 1243
844 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
845 } else { 1248 } else {
846 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
847 } 1250 }
848 } else { 1251 } else {
849 aio_unlink $filename; 1252 aio_unlink $filename;
850 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
851 } 1254 }
852 } 1255 };
853} 1256}
854 1257
855sub object_freezer_as_string { 1258sub object_freezer_as_string {
856 my ($rdata, $objs) = @_; 1259 my ($rdata, $objs) = @_;
857 1260
869 or return; 1272 or return;
870 1273
871 unless (aio_stat "$filename.pst") { 1274 unless (aio_stat "$filename.pst") {
872 (aio_load "$filename.pst", $av) >= 0 1275 (aio_load "$filename.pst", $av) >= 0
873 or return; 1276 or return;
1277
874 $av = eval { (Storable::thaw $av)->{objs} }; 1278 my $st = eval { Coro::Storable::thaw $av };
1279 $av = $st->{objs};
875 } 1280 }
876 1281
1282 utf8::decode (my $decname = $filename);
877 warn sprintf "loading %s (%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
878 $filename, length $data, scalar @{$av || []};#d# 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1286
879 return ($data, $av); 1287 ($data, $av)
880} 1288}
1289
1290=head2 COMMAND CALLBACKS
1291
1292=over 4
1293
1294=cut
881 1295
882############################################################################# 1296#############################################################################
883# command handling &c 1297# command handling &c
884 1298
885=item cf::register_command $name => \&callback($ob,$args); 1299=item cf::register_command $name => \&callback($ob,$args);
898 push @{ $COMMAND{$name} }, [$caller, $cb]; 1312 push @{ $COMMAND{$name} }, [$caller, $cb];
899} 1313}
900 1314
901=item cf::register_extcmd $name => \&callback($pl,$packet); 1315=item cf::register_extcmd $name => \&callback($pl,$packet);
902 1316
903Register a callbackf ro execution when the client sends an extcmd packet. 1317Register a callback for execution when the client sends an (synchronous)
1318extcmd packet. Ext commands will be processed in the order they are
1319received by the server, like other user commands. The first argument is
1320the logged-in player. Ext commands can only be processed after a player
1321has logged in successfully.
904 1322
905If the callback returns something, it is sent back as if reply was being 1323If the callback returns something, it is sent back as if reply was being
906called. 1324called.
907 1325
1326=item cf::register_exticmd $name => \&callback($ns,$packet);
1327
1328Register a callback for execution when the client sends an (asynchronous)
1329exticmd packet. Exti commands are processed by the server as soon as they
1330are received, i.e. out of order w.r.t. other commands. The first argument
1331is a client socket. Exti commands can be received anytime, even before
1332log-in.
1333
1334If the callback returns something, it is sent back as if reply was being
1335called.
1336
908=cut 1337=cut
909 1338
910sub register_extcmd { 1339sub register_extcmd {
911 my ($name, $cb) = @_; 1340 my ($name, $cb) = @_;
912 1341
913 $EXTCMD{$name} = $cb; 1342 $EXTCMD{$name} = $cb;
914} 1343}
915 1344
1345sub register_exticmd {
1346 my ($name, $cb) = @_;
1347
1348 $EXTICMD{$name} = $cb;
1349}
1350
1351use File::Glob ();
1352
916cf::player->attach ( 1353cf::player->attach (
917 on_command => sub { 1354 on_unknown_command => sub {
918 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
919 1356
920 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
921 or return; 1358 or return;
922 1359
927 cf::override; 1364 cf::override;
928 }, 1365 },
929 on_extcmd => sub { 1366 on_extcmd => sub {
930 my ($pl, $buf) = @_; 1367 my ($pl, $buf) = @_;
931 1368
932 my $msg = eval { from_json $buf }; 1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
933 1370
934 if (ref $msg) { 1371 if (ref $msg) {
1372 my ($type, $reply, @payload) =
1373 "ARRAY" eq ref $msg
1374 ? @$msg
1375 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376
1377 my @reply;
1378
935 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1379 if (my $cb = $EXTCMD{$type}) {
936 if (my %reply = $cb->($pl, $msg)) { 1380 @reply = $cb->($pl, @payload);
937 $pl->ext_reply ($msg->{msgid}, %reply);
938 }
939 } 1381 }
1382
1383 $pl->ext_reply ($reply, @reply)
1384 if $reply;
1385
940 } else { 1386 } else {
941 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
942 } 1388 }
943 1389
944 cf::override; 1390 cf::override;
945 }, 1391 },
946); 1392);
947 1393
1394# "readahead" all extensions
948sub load_extension { 1395sub cache_extensions {
949 my ($path) = @_; 1396 my $grp = IO::AIO::aio_group;
950 1397
951 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
952 my $base = $1; 1399 for (grep /\.ext$/, @{$_[0]}) {
953 my $pkg = $1; 1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
954 $pkg =~ s/[^[:word:]]/_/g;
955 $pkg = "ext::$pkg";
956
957 warn "... loading '$path' into '$pkg'\n";
958
959 open my $fh, "<:utf8", $path
960 or die "$path: $!";
961
962 my $source =
963 "package $pkg; use strict; use utf8;\n"
964 . "#line 1 \"$path\"\n{\n"
965 . (do { local $/; <$fh> })
966 . "\n};\n1";
967
968 unless (eval $source) {
969 my $msg = $@ ? "$path: $@\n"
970 : "extension disabled.\n";
971 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
972 warn $@;
973 warn "mandatory extension failed to load, exiting.\n";
974 exit 1;
975 } 1401 }
976 die $@;
977 } 1402 };
978 1403
979 push @EXTS, $pkg; 1404 $grp
980} 1405}
981 1406
982sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1410 cf::sync_job {
1411 my %todo;
1412
983 for my $ext (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
984 next unless -r $ext; 1414 next unless -r $path;
985 eval { 1415
986 load_extension $ext; 1416 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1417 my $base = $1;
1418 my $pkg = $1;
1419 $pkg =~ s/[^[:word:]]/_/g;
1420 $pkg = "ext::$pkg";
1421
1422 open my $fh, "<:utf8", $path
1423 or die "$path: $!";
1424
1425 my $source = do { local $/; <$fh> };
1426
1427 my %ext = (
1428 path => $path,
1429 base => $base,
1430 pkg => $pkg,
1431 );
1432
1433 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1434 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1435
1436 $ext{source} =
1437 "package $pkg; use common::sense;\n"
1438 . "#line 1 \"$path\"\n{\n"
1439 . $source
1440 . "\n};\n1";
1441
1442 $todo{$base} = \%ext;
1443 }
1444
1445 my $pass = 0;
1446 my %done;
1447 while (%todo) {
1448 my $progress;
1449
1450 ++$pass;
1451
1452 ext:
1453 while (my ($k, $v) = each %todo) {
1454 for (split /,\s*/, $v->{meta}{depends}) {
1455 next ext
1456 unless exists $done{$_};
1457 }
1458
1459 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460
1461 my $active = eval $v->{source};
1462
1463 if (length $@) {
1464 error "$v->{path}: $@\n";
1465
1466 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1467 if exists $v->{meta}{mandatory};
1468
1469 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1470 delete $todo{$k};
1471 } else {
1472 $done{$k} = delete $todo{$k};
1473 push @EXTS, $v->{pkg};
1474 $progress = 1;
1475
1476 info "$v->{base}: extension inactive.\n"
1477 unless $active;
1478 }
987 1 1479 }
988 } or warn "$ext not loaded: $@"; 1480
1481 unless ($progress) {
1482 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1483
1484 while (my ($k, $v) = each %todo) {
1485 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486 if exists $v->{meta}{mandatory};
1487 }
1488 }
1489 }
989 } 1490 };
990} 1491}
991 1492
992############################################################################# 1493#############################################################################
993 1494
1495=back
1496
994=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
995 1498
996Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
997 1500
998=cut 1501=cut
999 1502
1000package cf::player; 1503package cf::player;
1001 1504
1002use Coro::AIO; 1505use Coro::AIO;
1003 1506
1004=head3 cf::player 1507=head3 cf::player
1005 1508
1006=over 4 1509=over 4
1510
1511=item cf::player::num_playing
1512
1513Returns the official number of playing players, as per the Crossfire metaserver rules.
1514
1515=cut
1516
1517sub num_playing {
1518 scalar grep
1519 $_->ob->map
1520 && !$_->hidden
1521 && !$_->ob->flag (cf::FLAG_WIZ),
1522 cf::player::list
1523}
1007 1524
1008=item cf::player::find $login 1525=item cf::player::find $login
1009 1526
1010Returns the given player object, loading it if necessary (might block). 1527Returns the given player object, loading it if necessary (might block).
1011 1528
1030 1547
1031sub exists($) { 1548sub exists($) {
1032 my ($login) = @_; 1549 my ($login) = @_;
1033 1550
1034 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1035 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1036} 1553}
1037 1554
1038sub find($) { 1555sub find($) {
1039 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1040 my $login = $_[0]; 1557 my $login = $_[0];
1047 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1564 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1048 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1565 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1049 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1566 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1050 aio_unlink +(playerdir $login) . "/$login.pl"; 1567 aio_unlink +(playerdir $login) . "/$login.pl";
1051 1568
1052 my $pl = load_pl path $login 1569 my $f = new_from_file cf::object::thawer path $login
1053 or return; 1570 or return;
1571
1572 my $pl = cf::player::load_pl $f
1573 or return;
1574
1575 local $cf::PLAYER_LOADING{$login} = $pl;
1576 $f->resolve_delayed_derefs;
1054 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1055 } 1578 }
1056 } 1579 }
1057} 1580}
1581
1582cf::player->attach (
1583 on_load => sub {
1584 my ($pl, $path) = @_;
1585
1586 # restore slots saved in save, below
1587 my $slots = delete $pl->{_slots};
1588
1589 $pl->ob->current_weapon ($slots->[0]);
1590 $pl->combat_ob ($slots->[1]);
1591 $pl->ranged_ob ($slots->[2]);
1592 },
1593);
1058 1594
1059sub save($) { 1595sub save($) {
1060 my ($pl) = @_; 1596 my ($pl) = @_;
1061 1597
1062 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1067 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1068 1604
1069 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1070 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1071 1607
1608 cf::get_slot 0.01;
1609
1610 # save slots, to be restored later
1611 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1612
1072 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1073 Coro::cede; 1614 cf::cede_to_tick;
1074} 1615}
1075 1616
1076sub new($) { 1617sub new($) {
1077 my ($login) = @_; 1618 my ($login) = @_;
1078 1619
1084 $cf::PLAYER{$login} = $self; 1625 $cf::PLAYER{$login} = $self;
1085 1626
1086 $self 1627 $self
1087} 1628}
1088 1629
1630=item $player->send_msg ($channel, $msg, $color, [extra...])
1631
1632=cut
1633
1634sub send_msg {
1635 my $ns = shift->ns
1636 or return;
1637 $ns->send_msg (@_);
1638}
1639
1089=item $pl->quit_character 1640=item $pl->quit_character
1090 1641
1091Nukes the player without looking back. If logged in, the connection will 1642Nukes the player without looking back. If logged in, the connection will
1092be destroyed. May block for a long time. 1643be destroyed. May block for a long time.
1093 1644
1097 my ($pl) = @_; 1648 my ($pl) = @_;
1098 1649
1099 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1100 1651
1101 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1102 $pl->password ("*"); # this should lock out the player until we nuked the dir 1653 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1103 1654
1104 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1105 $pl->deactivate; 1656 $pl->deactivate;
1657
1658 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1659 ext::highscore::check ($pl->ob);
1660
1106 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1107 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1108 1663
1109 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1110 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1146 or return []; 1701 or return [];
1147 1702
1148 my @logins; 1703 my @logins;
1149 1704
1150 for my $login (@$dirs) { 1705 for my $login (@$dirs) {
1706 my $path = path $login;
1707
1708 # a .pst is a dead give-away for a valid player
1709 # if no pst file found, open and chekc for blocked users
1710 if (aio_stat "$path.pst") {
1151 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1152 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1153 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1714 }
1154 1715
1155 utf8::decode $login; 1716 utf8::decode $login;
1156 push @logins, $login; 1717 push @logins, $login;
1157 } 1718 }
1158 1719
1159 \@logins 1720 \@logins
1160} 1721}
1161 1722
1162=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1163 1726
1164Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1165player. May block. 1728player. May block.
1166 1729
1167=cut 1730=cut
1185 } 1748 }
1186 1749
1187 \@paths 1750 \@paths
1188} 1751}
1189 1752
1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754
1755Expand deliantra pod fragments into protocol xml.
1756
1190=item $player->ext_reply ($msgid, %msg) 1757=item $player->ext_reply ($msgid, @msg)
1191 1758
1192Sends an ext reply to the player. 1759Sends an ext reply to the player.
1193 1760
1194=cut 1761=cut
1195 1762
1196sub ext_reply($$%) { 1763sub ext_reply($$@) {
1197 my ($self, $id, %msg) = @_; 1764 my ($self, $id, @msg) = @_;
1198 1765
1199 $msg{msgid} = $id; 1766 $self->ns->ext_reply ($id, @msg)
1200
1201 $self->send ("ext " . cf::to_json \%msg);
1202} 1767}
1203 1768
1204=item $player->ext_event ($type, %msg) 1769=item $player->ext_msg ($type, @msg)
1205 1770
1206Sends an ext event to the client. 1771Sends an ext event to the client.
1207 1772
1208=cut 1773=cut
1209 1774
1210sub ext_event($$%) { 1775sub ext_msg($$@) {
1211 my ($self, $type, %msg) = @_; 1776 my ($self, $type, @msg) = @_;
1212 1777
1213 $self->ns->ext_event ($type, %msg); 1778 $self->ns->ext_msg ($type, @msg);
1214} 1779}
1215 1780
1216=head3 cf::region 1781=head3 cf::region
1217 1782
1218=over 4 1783=over 4
1221 1786
1222package cf::region; 1787package cf::region;
1223 1788
1224=item cf::region::find_by_path $path 1789=item cf::region::find_by_path $path
1225 1790
1226Tries to decuce the probable region for a map knowing only its path. 1791Tries to decuce the likely region for a map knowing only its path.
1227 1792
1228=cut 1793=cut
1229 1794
1230sub find_by_path($) { 1795sub find_by_path($) {
1231 my ($path) = @_; 1796 my ($path) = @_;
1232 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1233 my ($match, $specificity); 1800 my ($match, $specificity);
1234 1801
1235 for my $region (list) { 1802 for my $region (list) {
1236 if ($region->match && $path =~ $region->match) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1237 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1238 if $region->specificity > $specificity; 1805 if $region->specificity > $specificity;
1239 } 1806 }
1240 } 1807 }
1241 1808
1262our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1263our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1264 1831
1265sub generate_random_map { 1832sub generate_random_map {
1266 my ($self, $rmp) = @_; 1833 my ($self, $rmp) = @_;
1834
1835 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836
1267 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1268 $self->_create_random_map ( 1838 $self->_create_random_map (
1269 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1270 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1271 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1272 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1273 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1274 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1275 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1290 1860
1291sub register { 1861sub register {
1292 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1293 my $pkg = caller; 1863 my $pkg = caller;
1294 1864
1295 no strict;
1296 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1297 1866
1298 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1299} 1868}
1300 1869
1301# also paths starting with '/' 1870# also paths starting with '/'
1302$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1303 1872
1304sub thawer_merge { 1873sub thawer_merge {
1305 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1306 1875
1307 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1308 local $self->{path}; 1877 local $self->{path};
1309 local $self->{load_path}; 1878 local $self->{load_path};
1310 local $self->{deny_save};
1311 local $self->{deny_reset};
1312 1879
1313 $self->SUPER::thawer_merge ($merge); 1880 $self->SUPER::thawer_merge ($merge);
1314} 1881}
1315 1882
1316sub normalise { 1883sub normalise {
1317 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1318 1885
1319 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1320 1887
1321 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1322 1889
1323 # map plan: 1890 # map plan:
1324 # 1891 #
1363 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1364 return $self; 1931 return $self;
1365 } 1932 }
1366 } 1933 }
1367 1934
1368 Carp::carp "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1369 () 1936 ()
1370} 1937}
1371 1938
1372sub init { 1939sub init {
1373 my ($self) = @_; 1940 my ($self) = @_;
1395 1962
1396# the temporary/swap location 1963# the temporary/swap location
1397sub save_path { 1964sub save_path {
1398 my ($self) = @_; 1965 my ($self) = @_;
1399 1966
1400 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1401 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1402} 1969}
1403 1970
1404# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1405sub uniq_path { 1972sub uniq_path {
1406 my ($self) = @_; 1973 my ($self) = @_;
1407 1974
1408 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1409 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1410} 1977}
1411 1978
1412# and all this just because we cannot iterate over 1979sub decay_objects {
1413# all maps in C++...
1414sub change_all_map_light {
1415 my ($change) = @_; 1980 my ($self) = @_;
1416 1981
1417 $_->change_map_light ($change) 1982 return if $self->{deny_reset};
1418 for grep $_->outdoor, values %cf::MAP; 1983
1984 $self->do_decay_objects;
1419} 1985}
1420 1986
1421sub unlink_save { 1987sub unlink_save {
1422 my ($self) = @_; 1988 my ($self) = @_;
1423 1989
1428 1994
1429sub load_header_from($) { 1995sub load_header_from($) {
1430 my ($self, $path) = @_; 1996 my ($self, $path) = @_;
1431 1997
1432 utf8::encode $path; 1998 utf8::encode $path;
1433 #aio_open $path, O_RDONLY, 0 1999 my $f = new_from_file cf::object::thawer $path
1434 # or return;
1435
1436 $self->_load_header ($path)
1437 or return; 2000 or return;
2001
2002 $self->_load_header ($f)
2003 or return;
2004
2005 local $MAP_LOADING{$self->{path}} = $self;
2006 $f->resolve_delayed_derefs;
1438 2007
1439 $self->{load_path} = $path; 2008 $self->{load_path} = $path;
1440 2009
1441 1 2010 1
1442} 2011}
1481 $self->load_header_orig 2050 $self->load_header_orig
1482 or return; 2051 or return;
1483 $self->prepare_orig; 2052 $self->prepare_orig;
1484 } 2053 }
1485 2054
2055 $self->{deny_reset} = 1
2056 if $self->no_reset;
2057
1486 $self->default_region (cf::region::find_by_path $self->{path}) 2058 $self->default_region (cf::region::find_by_path $self->{path})
1487 unless $self->default_region; 2059 unless $self->default_region;
1488 2060
1489 1 2061 1
1490} 2062}
1491 2063
1492sub find; 2064sub find;
1493sub find { 2065sub find {
1494 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1495 2067
2068 cf::cede_to_tick;
2069
1496 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1497 2071
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1498 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1499 2074
1500 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1501 my $guard = cf::lock_acquire "map_find:$path";
1502 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1503 or return; 2077 or return;
1504 2078
1505 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1506 2080
1507 $map->load_header 2081 $map->load_header
1508 or return; 2082 or return;
1509 2083
1510 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1511 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1512 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2088 undef $guard1;
1513 $map->reset; 2089 $map->reset;
1514 undef $guard;
1515 return find $path; 2090 return find $path;
1516 } 2091 }
1517 2092
1518 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1519 } 2094 }
1520} 2095}
1521 2096
1522sub pre_load { } 2097sub pre_load { }
1523sub post_load { } 2098#sub post_load { } # XS
1524 2099
1525sub load { 2100sub load {
1526 my ($self) = @_; 2101 my ($self) = @_;
1527 2102
1528 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
1529 2104
1530 my $path = $self->{path}; 2105 my $path = $self->{path};
1531 2106
1532 { 2107 {
1533 my $guard = cf::lock_acquire "map_load:$path"; 2108 my $guard = cf::lock_acquire "map_data:$path";
1534 2109
2110 return unless $self->valid;
1535 return if $self->in_memory != cf::MAP_SWAPPED; 2111 return unless $self->in_memory == cf::MAP_SWAPPED;
1536 2112
1537 $self->in_memory (cf::MAP_LOADING); 2113 $self->in_memory (cf::MAP_LOADING);
1538 2114
1539 $self->alloc; 2115 $self->alloc;
1540 2116
1541 $self->pre_load; 2117 $self->pre_load;
1542 Coro::cede; 2118 cf::cede_to_tick;
1543 2119
2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block;
1544 $self->_load_objects ($self->{load_path}, 1) 2122 $self->_load_objects ($f)
1545 or return; 2123 or return;
1546 2124
1547 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
1548 if delete $self->{load_original}; 2126 if delete $self->{load_original};
1549 2127
1550 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
1551 utf8::encode $uniq; 2129 utf8::encode $uniq;
1552 if (aio_open $uniq, O_RDONLY, 0) { 2130 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) {
1553 $self->clear_unique_items; 2132 $self->clear_unique_items;
1554 $self->_load_objects ($uniq, 0); 2133 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs;
2135 }
1555 } 2136 }
1556 } 2137 }
1557 2138
1558 Coro::cede; 2139 $f->resolve_delayed_derefs;
2140
2141 cf::cede_to_tick;
1559 # now do the right thing for maps 2142 # now do the right thing for maps
1560 $self->link_multipart_objects; 2143 $self->link_multipart_objects;
1561 $self->difficulty ($self->estimate_difficulty) 2144 $self->difficulty ($self->estimate_difficulty)
1562 unless $self->difficulty; 2145 unless $self->difficulty;
1563 Coro::cede; 2146 cf::cede_to_tick;
1564 2147
1565 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
1566 $self->decay_objects; 2149 $self->decay_objects;
1567 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
1568 $self->update_buttons; 2151 $self->update_buttons;
1569 Coro::cede; 2152 cf::cede_to_tick;
1570 $self->set_darkness_map;
1571 Coro::cede;
1572 $self->activate; 2153 $self->activate;
1573 } 2154 }
1574 2155
2156 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME);
2158
1575 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
1576 } 2160 }
1577 2161
1578 $self->post_load; 2162 $self->post_load;
1579} 2163}
1580 2164
2165# customize the map for a given player, i.e.
2166# return the _real_ map. used by e.g. per-player
2167# maps to change the path to ~playername/mappath
1581sub customise_for { 2168sub customise_for {
1582 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
1583 2170
1584 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
1585 if $self->per_player; 2172 if $self->per_player;
1586 2173
2174# return find "?party/" . $ob->name . "/" . $self->{path}
2175# if $self->per_party;
2176
1587 $self 2177 $self
1588} 2178}
1589 2179
1590# find and load all maps in the 3x3 area around a map 2180# find and load all maps in the 3x3 area around a map
1591sub load_diag { 2181sub load_neighbours {
1592 my ($map) = @_; 2182 my ($map) = @_;
1593 2183
1594 my @diag; # diagonal neighbours 2184 my @neigh; # diagonal neighbours
1595 2185
1596 for (0 .. 3) { 2186 for (0 .. 3) {
1597 my $neigh = $map->tile_path ($_) 2187 my $neigh = $map->tile_path ($_)
1598 or next; 2188 or next;
1599 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
1600 or next; 2190 or next;
1601 $neigh->load; 2191 $neigh->load;
1602 2192
2193 # now find the diagonal neighbours
2194 push @neigh,
1603 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1604 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1605 } 2197 }
1606 2198
1607 for (@diag) { 2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
1608 my $neigh = find @$_ 2201 my $neigh = find $path, $origin
1609 or next; 2202 or next;
1610 $neigh->load; 2203 $neigh->load;
1611 } 2204 }
1612} 2205}
1613 2206
1614sub find_sync { 2207sub find_sync {
1615 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
1616 2209
1617 cf::sync_job { find $path, $origin } 2210 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211 if $Coro::current == $Coro::main;
2212
2213 find $path, $origin
1618} 2214}
1619 2215
1620sub do_load_sync { 2216sub do_load_sync {
1621 my ($map) = @_; 2217 my ($map) = @_;
1622 2218
1623 cf::sync_job { $map->load }; 2219 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220 if $Coro::current == $Coro::main;
2221
2222 $map->load;
1624} 2223}
1625 2224
1626our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
1627our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
1628 2227
1629sub find_async { 2228sub find_async {
1630 my ($path, $origin) = @_; 2229 my ($path, $origin, $load) = @_;
1631 2230
1632 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
1633 2232
1634 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
1635 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1636 } 2235 }
1637 2236
1638 undef $MAP_PREFETCH{$path}; 2237 $MAP_PREFETCH{$path} |= $load;
2238
1639 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2240 $Coro::current->{desc} = "map prefetcher";
2241
1640 while (%MAP_PREFETCH) { 2242 while (%MAP_PREFETCH) {
1641 for my $path (keys %MAP_PREFETCH) { 2243 while (my ($k, $v) = each %MAP_PREFETCH) {
1642 my $map = find $path 2244 if (my $map = find $k) {
1643 or next;
1644 $map->load; 2245 $map->load if $v;
2246 }
1645 2247
1646 delete $MAP_PREFETCH{$path}; 2248 delete $MAP_PREFETCH{$k};
1647 } 2249 }
1648 } 2250 }
1649 undef $MAP_PREFETCHER; 2251 undef $MAP_PREFETCHER;
1650 }; 2252 };
1651 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
1652 2254
1653 () 2255 ()
1654} 2256}
1655 2257
2258# common code, used by both ->save and ->swapout
1656sub save { 2259sub _save {
1657 my ($self) = @_; 2260 my ($self) = @_;
1658
1659 my $lock = cf::lock_acquire "map_data:" . $self->path;
1660 2261
1661 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
1662 2263
1663 return unless $self->dirty; 2264 return unless $self->dirty;
1664 2265
1670 return if $self->{deny_save}; 2271 return if $self->{deny_save};
1671 2272
1672 local $self->{last_access} = $self->last_access;#d# 2273 local $self->{last_access} = $self->last_access;#d#
1673 2274
1674 cf::async { 2275 cf::async {
2276 $Coro::current->{desc} = "map player save";
1675 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
1676 }; 2278 };
2279
2280 cf::get_slot 0.02;
1677 2281
1678 if ($uniq) { 2282 if ($uniq) {
1679 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1680 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1681 } else { 2285 } else {
1682 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2286 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1683 } 2287 }
1684} 2288}
1685 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
1686sub swap_out { 2298sub swap_out {
1687 my ($self) = @_; 2299 my ($self) = @_;
1688 2300
1689 # save first because save cedes
1690 $self->save;
1691
1692 my $lock = cf::lock_acquire "map_data:" . $self->path; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
1693 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
1694 return if $self->players; 2305 return if $self->players;
1695 return if $self->in_memory != cf::MAP_IN_MEMORY;
1696 return if $self->{deny_save};
1697 2306
2307 # first deactivate the map and "unlink" it from the core
2308 $self->deactivate;
2309 $_->clear_links_to ($self) for values %cf::MAP;
2310 $self->in_memory (cf::MAP_SWAPPED);
2311
2312 # then atomically save
2313 $self->_save;
2314
2315 # then free the map
1698 $self->clear; 2316 $self->clear;
1699 $self->in_memory (cf::MAP_SWAPPED);
1700} 2317}
1701 2318
1702sub reset_at { 2319sub reset_at {
1703 my ($self) = @_; 2320 my ($self) = @_;
1704 2321
1705 # TODO: safety, remove and allow resettable per-player maps 2322 # TODO: safety, remove and allow resettable per-player maps
1706 return 1e99 if $self->isa ("ext::map_per_player");#d#
1707 return 1e99 if $self->{deny_reset}; 2323 return 1e99 if $self->{deny_reset};
1708 2324
1709 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1710 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2326 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1711 2327
1722 my ($self) = @_; 2338 my ($self) = @_;
1723 2339
1724 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
1725 2341
1726 return if $self->players; 2342 return if $self->players;
1727 return if $self->isa ("ext::map_per_player");#d#
1728 2343
1729 warn "resetting map ", $self->path;#d# 2344 cf::trace "resetting map ", $self->path, "\n";
1730 2345
1731 $self->in_memory (cf::MAP_SWAPPED); 2346 $self->in_memory (cf::MAP_SWAPPED);
1732 2347
1733 # need to save uniques path 2348 # need to save uniques path
1734 unless ($self->{deny_save}) { 2349 unless ($self->{deny_save}) {
1738 if $uniq; 2353 if $uniq;
1739 } 2354 }
1740 2355
1741 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
1742 2357
2358 $self->deactivate;
2359 $_->clear_links_to ($self) for values %cf::MAP;
1743 $self->clear; 2360 $self->clear;
1744
1745 $_->clear_links_to ($self) for values %cf::MAP;
1746 2361
1747 $self->unlink_save; 2362 $self->unlink_save;
1748 $self->destroy; 2363 $self->destroy;
1749} 2364}
1750 2365
1751my $nuke_counter = "aaaa"; 2366my $nuke_counter = "aaaa";
1752 2367
1753sub nuke { 2368sub nuke {
1754 my ($self) = @_; 2369 my ($self) = @_;
1755 2370
2371 {
2372 my $lock = cf::lock_acquire "map_data:$self->{path}";
2373
1756 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
1757 2375
1758 $self->unlink_save; 2376 $self->unlink_save;
1759 2377
1760 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
1761 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
1762 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
1763 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
1764 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1765 2383
1766 $cf::MAP{$self->path} = $self; 2384 $cf::MAP{$self->path} = $self;
2385 }
1767 2386
1768 $self->reset; # polite request, might not happen 2387 $self->reset; # polite request, might not happen
2388}
2389
2390=item $maps = cf::map::tmp_maps
2391
2392Returns an arrayref with all map paths of currently instantiated and saved
2393maps. May block.
2394
2395=cut
2396
2397sub tmp_maps() {
2398 [
2399 map {
2400 utf8::decode $_;
2401 /\.map$/
2402 ? normalise $_
2403 : ()
2404 } @{ aio_readdir $TMPDIR or [] }
2405 ]
2406}
2407
2408=item $maps = cf::map::random_maps
2409
2410Returns an arrayref with all map paths of currently instantiated and saved
2411random maps. May block.
2412
2413=cut
2414
2415sub random_maps() {
2416 [
2417 map {
2418 utf8::decode $_;
2419 /\.map$/
2420 ? normalise "?random/$_"
2421 : ()
2422 } @{ aio_readdir $RANDOMDIR or [] }
2423 ]
1769} 2424}
1770 2425
1771=item cf::map::unique_maps 2426=item cf::map::unique_maps
1772 2427
1773Returns an arrayref of paths of all shared maps that have 2428Returns an arrayref of paths of all shared maps that have
1774instantiated unique items. May block. 2429instantiated unique items. May block.
1775 2430
1776=cut 2431=cut
1777 2432
1778sub unique_maps() { 2433sub unique_maps() {
1779 my $files = aio_readdir $UNIQUEDIR 2434 [
1780 or return; 2435 map {
1781
1782 my @paths;
1783
1784 for (@$files) {
1785 utf8::decode $_; 2436 utf8::decode $_;
1786 next if /\.pst$/; 2437 s/\.map$//; # TODO future compatibility hack
1787 next unless /^$PATH_SEP/o; 2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1788 2439 ? ()
1789 push @paths, cf::map::normalise $_; 2440 : normalise $_
2441 } @{ aio_readdir $UNIQUEDIR or [] }
1790 } 2442 ]
1791
1792 \@paths
1793} 2443}
1794 2444
1795package cf; 2445=item cf::map::static_maps
2446
2447Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2448file in the shared directory excluding F</styles> and F</editor>). May
2449block.
2450
2451=cut
2452
2453sub static_maps() {
2454 my @dirs = "";
2455 my @maps;
2456
2457 while (@dirs) {
2458 my $dir = shift @dirs;
2459
2460 next if $dir eq "/styles" || $dir eq "/editor";
2461
2462 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2463 or return;
2464
2465 for (@$files) {
2466 s/\.map$// or next;
2467 utf8::decode $_;
2468 push @maps, "$dir/$_";
2469 }
2470
2471 push @dirs, map "$dir/$_", @$dirs;
2472 }
2473
2474 \@maps
2475}
1796 2476
1797=back 2477=back
1798 2478
1799=head3 cf::object 2479=head3 cf::object
1800 2480
1804 2484
1805=over 4 2485=over 4
1806 2486
1807=item $ob->inv_recursive 2487=item $ob->inv_recursive
1808 2488
1809Returns the inventory of the object _and_ their inventories, recursively. 2489Returns the inventory of the object I<and> their inventories, recursively,
2490but I<not> the object itself.
1810 2491
1811=cut 2492=cut
1812 2493
1813sub inv_recursive_; 2494sub inv_recursive_;
1814sub inv_recursive_ { 2495sub inv_recursive_ {
1817 2498
1818sub inv_recursive { 2499sub inv_recursive {
1819 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
1820} 2501}
1821 2502
2503=item $ref = $ob->ref
2504
2505Creates and returns a persistent reference to an object that can be stored as a string.
2506
2507=item $ob = cf::object::deref ($refstring)
2508
2509returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2510even if the object actually exists. May block.
2511
2512=cut
2513
2514sub deref {
2515 my ($ref) = @_;
2516
2517 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2518 my ($uuid, $name) = ($1, $2);
2519 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2520 or return;
2521 $pl->ob->uuid eq $uuid
2522 or return;
2523
2524 $pl->ob
2525 } else {
2526 warn "$ref: cannot resolve object reference\n";
2527 undef
2528 }
2529}
2530
1822package cf; 2531package cf;
1823 2532
1824=back 2533=back
1825 2534
1826=head3 cf::object::player 2535=head3 cf::object::player
1832Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2541Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1833can be C<undef>. Does the right thing when the player is currently in a 2542can be C<undef>. Does the right thing when the player is currently in a
1834dialogue with the given NPC character. 2543dialogue with the given NPC character.
1835 2544
1836=cut 2545=cut
2546
2547our $SAY_CHANNEL = {
2548 id => "say",
2549 title => "Map",
2550 reply => "say ",
2551 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2552};
2553
2554our $CHAT_CHANNEL = {
2555 id => "chat",
2556 title => "Chat",
2557 reply => "chat ",
2558 tooltip => "Player chat and shouts, global to the server.",
2559};
1837 2560
1838# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
1839# with dialog boxes. 2562# with dialog boxes.
1840#TODO: the first argument must go, split into a $npc->reply_to ( method 2563#TODO: the first argument must go, split into a $npc->reply_to ( method
1841sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
1843 2566
1844 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2567 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1845 2568
1846 if ($self->{record_replies}) { 2569 if ($self->{record_replies}) {
1847 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2570 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2571
1848 } else { 2572 } else {
2573 my $pl = $self->contr;
2574
2575 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2576 my $dialog = $pl->{npc_dialog};
2577 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2578
2579 } else {
1849 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
1850 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2582 }
1851 } 2583 }
2584}
2585
2586=item $object->send_msg ($channel, $msg, $color, [extra...])
2587
2588=cut
2589
2590sub cf::object::send_msg {
2591 my $pl = shift->contr
2592 or return;
2593 $pl->send_msg (@_);
1852} 2594}
1853 2595
1854=item $player_object->may ("access") 2596=item $player_object->may ("access")
1855 2597
1856Returns wether the given player is authorized to access resource "access" 2598Returns wether the given player is authorized to access resource "access"
1869 2611
1870=item $player_object->enter_link 2612=item $player_object->enter_link
1871 2613
1872Freezes the player and moves him/her to a special map (C<{link}>). 2614Freezes the player and moves him/her to a special map (C<{link}>).
1873 2615
1874The player should be reasonably safe there for short amounts of time. You 2616The player should be reasonably safe there for short amounts of time (e.g.
1875I<MUST> call C<leave_link> as soon as possible, though. 2617for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2618though, as the player cannot control the character while it is on the link
2619map.
1876 2620
1877Will never block. 2621Will never block.
1878 2622
1879=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
1880 2624
1900sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
1901 my ($self) = @_; 2645 my ($self) = @_;
1902 2646
1903 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
1904 2648
2649 ++$self->{_link_recursion};
2650
1905 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
1906 2652
1907 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1908 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
1909 2655
1910 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1911} 2657}
1912 2658
1913sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
1914 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
1915 2661
1932 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
1933 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
1934 2680
1935 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
1936 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
1937 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
1938 2684
1939 $map->load; 2685 $map->load;
1940 $map->load_diag; 2686 $map->load_neighbours;
1941 2687
1942 return unless $self->contr->active; 2688 return unless $self->contr->active;
1943 $self->activate_recursive;
1944 2689
1945 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1946 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
1947} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
1948 2697
2698}
2699
1949=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1950 2701
1951Moves the player to the given map-path and coordinates by first freezing 2702Moves the player to the given map-path and coordinates by first freezing
1952her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
1953that has to return the map if sucecssful, and then unfreezes the player on 2704that has to return the map if sucecssful, and then unfreezes the player on
1954the new (success) or old (failed) map position. 2705the new (success) or old (failed) map position. In either case, $done will
2706be called at the end of this process.
2707
2708Note that $check will be called with a potentially non-loaded map, so if
2709it needs a loaded map it has to call C<< ->load >>.
1955 2710
1956=cut 2711=cut
1957 2712
1958our $GOTOGEN; 2713our $GOTOGEN;
1959 2714
1960sub cf::object::player::goto { 2715sub cf::object::player::goto {
1961 my ($self, $path, $x, $y, $check) = @_; 2716 my ($self, $path, $x, $y, $check, $done) = @_;
2717
2718 if ($self->{_link_recursion} >= $MAX_LINKS) {
2719 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2720 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2721 ($path, $x, $y) = @$EMERGENCY_POSITION;
2722 }
1962 2723
1963 # do generation counting so two concurrent goto's will be executed in-order 2724 # do generation counting so two concurrent goto's will be executed in-order
1964 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1965 2726
1966 $self->enter_link; 2727 $self->enter_link;
1967 2728
1968 (async { 2729 (async {
2730 $Coro::current->{desc} = "player::goto $path $x $y";
2731
2732 # *tag paths override both path and x|y
2733 if ($path =~ /^\*(.*)$/) {
2734 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2735 my $ob = $obs[rand @obs];
2736
2737 # see if we actually can go there
2738 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2739 $ob = $obs[rand @obs];
2740 } else {
2741 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2742 }
2743 # else put us there anyways for now #d#
2744
2745 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2746 } else {
2747 ($path, $x, $y) = (undef, undef, undef);
2748 }
2749 }
2750
1969 my $map = eval { 2751 my $map = eval {
1970 my $map = cf::map::find $path; 2752 my $map = defined $path ? cf::map::find $path : undef;
1971 2753
1972 if ($map) { 2754 if ($map) {
1973 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
1974 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
1975 } else { 2757 } else {
1976 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2758 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
1977 } 2759 }
1978 2760
1979 $map 2761 $map
1980 }; 2762 };
1981 2763
1986 2768
1987 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
1988 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
1989 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
1990 } 2772 }
2773
2774 $done->($self) if $done;
1991 })->prio (1); 2775 })->prio (1);
1992} 2776}
1993 2777
1994=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
1995 2779
2015} 2799}
2016 2800
2017sub prepare_random_map { 2801sub prepare_random_map {
2018 my ($exit) = @_; 2802 my ($exit) = @_;
2019 2803
2020 my $guard = cf::lock_acquire "exit_prepare:$exit";
2021
2022 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2023 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2024 # that depends on the exit object 2806 # that depends on the exit object
2025 2807
2026 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2028 if ($exit->map) { 2810 if ($exit->map) {
2029 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2030 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2031 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2032 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2033 } 2817 }
2034 2818
2035 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2036 2820
2037 my $data = cf::to_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2038 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2039 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2040 2824
2041 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2042 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2043 undef $fh; 2827 undef $fh;
2044 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2045 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2046 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2047 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2048 } 2836 }
2049} 2837}
2050 2838
2051sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2052 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2053 2841
2054 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2055 2843
2056 if ($exit->slaying eq "/!") {
2057 #TODO: this should de-fi-ni-te-ly not be a sync-job
2058 # the problem is that $exit might not survive long enough
2059 # so it needs to be done right now, right here
2060 cf::sync_job { prepare_random_map $exit };
2061 }
2062
2063 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2064 my $hp = $exit->stats->hp;
2065 my $sp = $exit->stats->sp;
2066
2067 $self->enter_link; 2844 $self->enter_link;
2068 2845
2069 (async { 2846 (async {
2070 $self->deactivate_recursive; # just to be sure 2847 $Coro::current->{desc} = "enter_exit";
2848
2071 unless (eval { 2849 unless (eval {
2850 $self->deactivate_recursive; # just to be sure
2851
2852 # random map handling
2853 {
2854 my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856 prepare_random_map $exit
2857 if $exit->slaying eq "/!";
2858 }
2859
2860 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2861 my $x = $exit->stats->hp;
2862 my $y = $exit->stats->sp;
2863
2072 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2073 2865
2866 # if exit is damned, update players death & WoR home-position
2867 $self->contr->savebed ($map, $x, $y)
2868 if $exit->flag (cf::FLAG_DAMNED);
2869
2074 1; 2870 1
2075 }) { 2871 }) {
2076 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2077 . "I'll try to bring you back to the map you were before. " 2873 . "I'll try to bring you back to the map you were before. "
2078 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2079 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2080 2876
2081 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2082 $self->leave_link; 2878 $self->leave_link;
2083 } 2879 }
2084 })->prio (1); 2880 })->prio (1);
2085} 2881}
2086 2882
2100 2896
2101 utf8::encode $text; 2897 utf8::encode $text;
2102 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2898 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2103} 2899}
2104 2900
2901=item $client->send_big_packet ($pkt)
2902
2903Like C<send_packet>, but tries to compress large packets, and fragments
2904them as required.
2905
2906=cut
2907
2908our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2909
2910sub cf::client::send_big_packet {
2911 my ($self, $pkt) = @_;
2912
2913 # try lzf for large packets
2914 $pkt = "lzf " . Compress::LZF::compress $pkt
2915 if 1024 <= length $pkt and $self->{can_lzf};
2916
2917 # split very large packets
2918 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2919 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2920 $pkt = "frag";
2921 }
2922
2923 $self->send_packet ($pkt);
2924}
2925
2926=item $client->send_msg ($channel, $msg, $color, [extra...])
2927
2928Send a drawinfo or msg packet to the client, formatting the msg for the
2929client if neccessary. C<$type> should be a string identifying the type of
2930the message, with C<log> being the default. If C<$color> is negative, suppress
2931the message unless the client supports the msg packet.
2932
2933=cut
2934
2935# non-persistent channels (usually the info channel)
2936our %CHANNEL = (
2937 "c/motd" => {
2938 id => "infobox",
2939 title => "MOTD",
2940 reply => undef,
2941 tooltip => "The message of the day",
2942 },
2943 "c/identify" => {
2944 id => "infobox",
2945 title => "Identify",
2946 reply => undef,
2947 tooltip => "Items recently identified",
2948 },
2949 "c/examine" => {
2950 id => "infobox",
2951 title => "Examine",
2952 reply => undef,
2953 tooltip => "Signs and other items you examined",
2954 },
2955 "c/shopinfo" => {
2956 id => "infobox",
2957 title => "Shop Info",
2958 reply => undef,
2959 tooltip => "What your bargaining skill tells you about the shop",
2960 },
2961 "c/book" => {
2962 id => "infobox",
2963 title => "Book",
2964 reply => undef,
2965 tooltip => "The contents of a note or book",
2966 },
2967 "c/lookat" => {
2968 id => "infobox",
2969 title => "Look",
2970 reply => undef,
2971 tooltip => "What you saw there",
2972 },
2973 "c/who" => {
2974 id => "infobox",
2975 title => "Players",
2976 reply => undef,
2977 tooltip => "Shows players who are currently online",
2978 },
2979 "c/body" => {
2980 id => "infobox",
2981 title => "Body Parts",
2982 reply => undef,
2983 tooltip => "Shows which body parts you posess and are available",
2984 },
2985 "c/statistics" => {
2986 id => "infobox",
2987 title => "Statistics",
2988 reply => undef,
2989 tooltip => "Shows your primary statistics",
2990 },
2991 "c/skills" => {
2992 id => "infobox",
2993 title => "Skills",
2994 reply => undef,
2995 tooltip => "Shows your experience per skill and item power",
2996 },
2997 "c/shopitems" => {
2998 id => "infobox",
2999 title => "Shop Items",
3000 reply => undef,
3001 tooltip => "Shows the items currently for sale in this shop",
3002 },
3003 "c/resistances" => {
3004 id => "infobox",
3005 title => "Resistances",
3006 reply => undef,
3007 tooltip => "Shows your resistances",
3008 },
3009 "c/pets" => {
3010 id => "infobox",
3011 title => "Pets",
3012 reply => undef,
3013 tooltip => "Shows information abotu your pets/a specific pet",
3014 },
3015 "c/perceiveself" => {
3016 id => "infobox",
3017 title => "Perceive Self",
3018 reply => undef,
3019 tooltip => "You gained detailed knowledge about yourself",
3020 },
3021 "c/uptime" => {
3022 id => "infobox",
3023 title => "Uptime",
3024 reply => undef,
3025 tooltip => "How long the server has been running since last restart",
3026 },
3027 "c/mapinfo" => {
3028 id => "infobox",
3029 title => "Map Info",
3030 reply => undef,
3031 tooltip => "Information related to the maps",
3032 },
3033 "c/party" => {
3034 id => "party",
3035 title => "Party",
3036 reply => "gsay ",
3037 tooltip => "Messages and chat related to your party",
3038 },
3039 "c/death" => {
3040 id => "death",
3041 title => "Death",
3042 reply => undef,
3043 tooltip => "Reason for and more info about your most recent death",
3044 },
3045 "c/say" => $SAY_CHANNEL,
3046 "c/chat" => $CHAT_CHANNEL,
3047);
3048
3049sub cf::client::send_msg {
3050 my ($self, $channel, $msg, $color, @extra) = @_;
3051
3052 $msg = $self->pl->expand_cfpod ($msg)
3053 unless $color & cf::NDI_VERBATIM;
3054
3055 $color &= cf::NDI_CLIENT_MASK; # just in case...
3056
3057 # check predefined channels, for the benefit of C
3058 if ($CHANNEL{$channel}) {
3059 $channel = $CHANNEL{$channel};
3060
3061 $self->ext_msg (channel_info => $channel);
3062 $channel = $channel->{id};
3063
3064 } elsif (ref $channel) {
3065 # send meta info to client, if not yet sent
3066 unless (exists $self->{channel}{$channel->{id}}) {
3067 $self->{channel}{$channel->{id}} = $channel;
3068 $self->ext_msg (channel_info => $channel);
3069 }
3070
3071 $channel = $channel->{id};
3072 }
3073
3074 return unless @extra || length $msg;
3075
3076 # default colour, mask it out
3077 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
3078 if $color & cf::NDI_DEF;
3079
3080 my $pkt = "msg "
3081 . $self->{json_coder}->encode (
3082 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
3083 );
3084
3085 $self->send_big_packet ($pkt);
3086}
3087
2105=item $client->ext_event ($type, %msg) 3088=item $client->ext_msg ($type, @msg)
2106 3089
2107Sends an exti event to the client. 3090Sends an ext event to the client.
2108 3091
2109=cut 3092=cut
2110 3093
2111sub cf::client::ext_event($$%) { 3094sub cf::client::ext_msg($$@) {
2112 my ($self, $type, %msg) = @_; 3095 my ($self, $type, @msg) = @_;
2113 3096
3097 if ($self->extcmd == 2) {
3098 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099 } elsif ($self->extcmd == 1) { # TODO: remove
2114 $msg{msgtype} = "event_$type"; 3100 push @msg, msgtype => "event_$type";
2115 $self->send_packet ("ext " . cf::to_json \%msg); 3101 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102 }
3103}
3104
3105=item $client->ext_reply ($msgid, @msg)
3106
3107Sends an ext reply to the client.
3108
3109=cut
3110
3111sub cf::client::ext_reply($$@) {
3112 my ($self, $id, @msg) = @_;
3113
3114 if ($self->extcmd == 2) {
3115 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116 } elsif ($self->extcmd == 1) {
3117 #TODO: version 1, remove
3118 unshift @msg, msgtype => "reply", msgid => $id;
3119 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120 }
2116} 3121}
2117 3122
2118=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2119 3124
2120Queues a query to the client, calling the given callback with 3125Queues a query to the client, calling the given callback with
2121the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 3126the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2122C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 3127C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2123 3128
2124Queries can fail, so check the return code. Or don't, as queries will become 3129Queries can fail, so check the return code. Or don't, as queries will
2125reliable at some point in the future. 3130become reliable at some point in the future.
2126 3131
2127=cut 3132=cut
2128 3133
2129sub cf::client::query { 3134sub cf::client::query {
2130 my ($self, $flags, $text, $cb) = @_; 3135 my ($self, $flags, $text, $cb) = @_;
2138 utf8::encode $text; 3143 utf8::encode $text;
2139 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2140 3145
2141 $self->send_packet ($self->{query_queue}[0][0]) 3146 $self->send_packet ($self->{query_queue}[0][0])
2142 if @{ $self->{query_queue} } == 1; 3147 if @{ $self->{query_queue} } == 1;
3148
3149 1
2143} 3150}
2144 3151
2145cf::client->attach ( 3152cf::client->attach (
3153 on_connect => sub {
3154 my ($ns) = @_;
3155
3156 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3157 },
2146 on_reply => sub { 3158 on_reply => sub {
2147 my ($ns, $msg) = @_; 3159 my ($ns, $msg) = @_;
2148 3160
2149 # this weird shuffling is so that direct followup queries 3161 # this weird shuffling is so that direct followup queries
2150 # get handled first 3162 # get handled first
2162 } else { 3174 } else {
2163 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3175 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2164 } 3176 }
2165 } 3177 }
2166 }, 3178 },
3179 on_exticmd => sub {
3180 my ($ns, $buf) = @_;
3181
3182 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183
3184 if (ref $msg) {
3185 my ($type, $reply, @payload) =
3186 "ARRAY" eq ref $msg
3187 ? @$msg
3188 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189
3190 my @reply;
3191
3192 if (my $cb = $EXTICMD{$type}) {
3193 @reply = $cb->($ns, @payload);
3194 }
3195
3196 $ns->ext_reply ($reply, @reply)
3197 if $reply;
3198
3199 } else {
3200 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3201 }
3202
3203 cf::override;
3204 },
2167); 3205);
2168 3206
2169=item $client->async (\&cb) 3207=item $client->async (\&cb)
2170 3208
2171Create a new coroutine, running the specified callback. The coroutine will 3209Create a new coroutine, running the specified callback. The coroutine will
2187 3225
2188 $coro 3226 $coro
2189} 3227}
2190 3228
2191cf::client->attach ( 3229cf::client->attach (
2192 on_destroy => sub { 3230 on_client_destroy => sub {
2193 my ($ns) = @_; 3231 my ($ns) = @_;
2194 3232
2195 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2196 }, 3234 },
2197); 3235);
2212our $safe = new Safe "safe"; 3250our $safe = new Safe "safe";
2213our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
2214 3252
2215$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
2216 3254
2217$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3255$safe->permit_only (Opcode::opset qw(
3256 :base_core :base_mem :base_orig :base_math :base_loop
3257 grepstart grepwhile mapstart mapwhile
3258 sort time
3259));
2218 3260
2219# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
2220 3262
2221=pod 3263=pod
2222 3264
2223The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
2224 3266
2225 cf::object contr pay_amount pay_player map 3267 cf::object
3268 contr pay_amount pay_player map x y force_find force_add destroy
3269 insert remove name archname title slaying race decrease split
3270 value
3271
2226 cf::object::player player 3272 cf::object::player
2227 cf::player peaceful 3273 player
2228 cf::map trigger 3274
3275 cf::player
3276 peaceful
3277
3278 cf::map
3279 trigger
2229 3280
2230=cut 3281=cut
2231 3282
2232for ( 3283for (
2233 ["cf::object" => qw(contr pay_amount pay_player map)], 3284 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3285 insert remove inv nrof name archname title slaying race
3286 decrease split destroy change_exp value msg lore send_msg)],
2234 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
2235 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
2236 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
2237) { 3290) {
2238 no strict 'refs';
2239 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
2240 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2241 for @funs; 3293 for @funs;
2242} 3294}
2243 3295
2258 3310
2259 my $qcode = $code; 3311 my $qcode = $code;
2260 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2261 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
2262 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
2263 local $_; 3318 local $_;
2264 local @safe::cf::_safe_eval_args = values %vars;
2265 3319
2266 my $eval = 3320 my $eval =
2267 "do {\n" 3321 "do {\n"
2268 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2269 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
2270 . $code 3324 . $code
2271 . "\n}" 3325 . "\n}"
2272 ; 3326 ;
2273 3327
3328 if ($CFG{safe_eval}) {
2274 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
2275 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2276 sub_generation_inc; 3332 sub_generation_inc;
3333 } else {
3334 local @cf::_safe_eval_args = values %vars;
3335 @res = wantarray ? eval eval : scalar eval $eval;
3336 }
2277 3337
2278 if ($@) { 3338 if ($@) {
2279 warn "$@"; 3339 warn "$@",
2280 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
2281 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
2282 } 3342 }
2283 3343
2284 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
2285} 3345}
2286 3346
2300=cut 3360=cut
2301 3361
2302sub register_script_function { 3362sub register_script_function {
2303 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
2304 3364
2305 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
2306 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
2307} 3367}
2308 3368
2309=back 3369=back
2310 3370
2311=cut 3371=cut
2312
2313#############################################################################
2314
2315=head2 EXTENSION DATABASE SUPPORT
2316
2317Crossfire maintains a very simple database for extension use. It can
2318currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2319convert to/from binary).
2320
2321The parameter C<$family> should best start with the name of the extension
2322using it, it should be unique.
2323
2324=over 4
2325
2326=item $value = cf::db_get $family => $key
2327
2328Returns a single value from the database.
2329
2330=item cf::db_put $family => $key => $value
2331
2332Stores the given C<$value> in the family.
2333
2334=cut
2335
2336our $DB;
2337
2338sub db_init {
2339 unless ($DB) {
2340 $DB = BDB::db_create $DB_ENV;
2341
2342 cf::sync_job {
2343 eval {
2344 $DB->set_flags (BDB::CHKSUM);
2345
2346 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2347 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2348 cf::cleanup "db_open(db): $!" if $!;
2349 };
2350 cf::cleanup "db_open(db): $@" if $@;
2351 };
2352 }
2353}
2354
2355sub db_get($$) {
2356 my $key = "$_[0]/$_[1]";
2357
2358 cf::sync_job {
2359 BDB::db_get $DB, undef, $key, my $data;
2360
2361 $! ? ()
2362 : $data
2363 }
2364}
2365
2366sub db_put($$$) {
2367 BDB::dbreq_pri 4;
2368 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2369}
2370
2371=item cf::cache $id => [$paths...], $processversion => $process
2372
2373Generic caching function that returns the value of the resource $id,
2374caching and regenerating as required.
2375
2376This function can block.
2377
2378=cut
2379
2380sub cache {
2381 my ($id, $src, $processversion, $process) = @_;
2382
2383 my $meta =
2384 join "\x00",
2385 $processversion,
2386 map {
2387 aio_stat $_
2388 and Carp::croak "$_: $!";
2389
2390 ($_, (stat _)[7,9])
2391 } @$src;
2392
2393 my $dbmeta = db_get cache => "$id/meta";
2394 if ($dbmeta ne $meta) {
2395 # changed, we may need to process
2396
2397 my @data;
2398 my $md5;
2399
2400 for (0 .. $#$src) {
2401 0 <= aio_load $src->[$_], $data[$_]
2402 or Carp::croak "$src->[$_]: $!";
2403 }
2404
2405 # if processing is expensive, check
2406 # checksum first
2407 if (1) {
2408 $md5 =
2409 join "\x00",
2410 $processversion,
2411 map {
2412 Coro::cede;
2413 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2414 } 0.. $#$src;
2415
2416
2417 my $dbmd5 = db_get cache => "$id/md5";
2418 if ($dbmd5 eq $md5) {
2419 db_put cache => "$id/meta", $meta;
2420
2421 return db_get cache => "$id/data";
2422 }
2423 }
2424
2425 my $t1 = Time::HiRes::time;
2426 my $data = $process->(\@data);
2427 my $t2 = Time::HiRes::time;
2428
2429 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2430
2431 db_put cache => "$id/data", $data;
2432 db_put cache => "$id/md5" , $md5;
2433 db_put cache => "$id/meta", $meta;
2434
2435 return $data;
2436 }
2437
2438 db_get cache => "$id/data"
2439}
2440
2441=item fork_call { }, $args
2442
2443Executes the given code block with the given arguments in a seperate
2444process, returning the results. Everything must be serialisable with
2445Coro::Storable. May, of course, block. Note that the executed sub may
2446never block itself or use any form of Event handling.
2447
2448=cut
2449
2450sub fork_call(&@) {
2451 my ($cb, @args) = @_;
2452
2453# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2454# or die "socketpair: $!";
2455 pipe my $fh1, my $fh2
2456 or die "pipe: $!";
2457
2458 if (my $pid = fork) {
2459 close $fh2;
2460
2461 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2462 $res = Coro::Storable::thaw $res;
2463
2464 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2465
2466 die $$res unless "ARRAY" eq ref $res;
2467
2468 return wantarray ? @$res : $res->[-1];
2469 } else {
2470 reset_signals;
2471 local $SIG{__WARN__};
2472 local $SIG{__DIE__};
2473 eval {
2474 close $fh1;
2475
2476 my @res = eval { $cb->(@args) };
2477 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2478 };
2479
2480 warn $@ if $@;
2481 _exit 0;
2482 }
2483}
2484 3372
2485############################################################################# 3373#############################################################################
2486# the server's init and main functions 3374# the server's init and main functions
2487 3375
2488sub load_facedata($) { 3376sub load_facedata($) {
2489 my ($path) = @_; 3377 my ($path) = @_;
2490 3378
3379 # HACK to clear player env face cache, we need some signal framework
3380 # for this (global event?)
3381 %ext::player_env::MUSIC_FACE_CACHE = ();
3382
3383 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384
2491 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
2492 3386
2493 my $facedata;
2494 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
2495 or die "$path: $!"; 3388 or die "$path: $!";
2496 3389
2497 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
2498 3391
2499 $facedata->{version} == 2 3392 $facedata->{version} == 2
2500 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
2501 3394
3395 # patch in the exptable
3396 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3397 $facedata->{resource}{"res/exp_table"} = {
3398 type => FT_RSRC,
3399 data => $exp_table,
3400 hash => (Digest::MD5::md5 $exp_table),
3401 };
3402 cf::cede_to_tick;
3403
2502 { 3404 {
2503 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
2504 3406
2505 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2506 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409
2507 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap};
2508 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2509 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2510 Coro::cede; 3414
3415 cf::cede_to_tick;
2511 } 3416 }
2512 3417
2513 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
2514 next unless $info->{smooth}; 3419 next unless $info->{smooth};
3420
2515 my $idx = cf::face::find $face 3421 my $idx = cf::face::find $face
2516 or next; 3422 or next;
3423
2517 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3425 cf::face::set_smooth $idx, $smooth;
2518 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2519 } else { 3427 } else {
2520 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
2521 } 3429 }
2522 Coro::cede; 3430
3431 cf::cede_to_tick;
2523 } 3432 }
2524 } 3433 }
2525 3434
2526 { 3435 {
2527 my $anims = $facedata->{animinfo}; 3436 my $anims = $facedata->{animinfo};
2528 3437
2529 while (my ($anim, $info) = each %$anims) { 3438 while (my ($anim, $info) = each %$anims) {
2530 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3439 cf::anim::set $anim, $info->{frames}, $info->{facings};
2531 Coro::cede; 3440 cf::cede_to_tick;
2532 } 3441 }
2533 3442
2534 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
2535 } 3444 }
2536 3445
3446 {
3447 my $res = $facedata->{resource};
3448
3449 while (my ($name, $info) = each %$res) {
3450 if (defined $info->{type}) {
3451 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452
3453 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454 cf::face::set_type $idx, $info->{type};
3455 } else {
3456 $RESOURCE{$name} = $info; # unused
3457 }
3458
3459 cf::cede_to_tick;
3460 }
3461 }
3462
3463 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3464
2537 1 3465 1
2538} 3466}
2539 3467
3468register_exticmd fx_want => sub {
3469 my ($ns, $want) = @_;
3470
3471 while (my ($k, $v) = each %$want) {
3472 $ns->fx_want ($k, $v);
3473 }
3474};
3475
3476sub load_resource_file($) {
3477 my $guard = lock_acquire "load_resource_file";
3478
3479 my $status = load_resource_file_ $_[0];
3480 get_slot 0.1, 100;
3481 cf::arch::commit_load;
3482
3483 $status
3484}
3485
2540sub reload_regions { 3486sub reload_regions {
3487 # HACK to clear player env face cache, we need some signal framework
3488 # for this (global event?)
3489 %ext::player_env::MUSIC_FACE_CACHE = ();
3490
2541 load_resource_file "$MAPDIR/regions" 3491 load_resource_file "$MAPDIR/regions"
2542 or die "unable to load regions file\n"; 3492 or die "unable to load regions file\n";
3493
3494 for (cf::region::list) {
3495 $_->{match} = qr/$_->{match}/
3496 if exists $_->{match};
3497 }
2543} 3498}
2544 3499
2545sub reload_facedata { 3500sub reload_facedata {
2546 load_facedata "$DATADIR/facedata" 3501 load_facedata "$DATADIR/facedata"
2547 or die "unable to load facedata\n"; 3502 or die "unable to load facedata\n";
2555sub reload_treasures { 3510sub reload_treasures {
2556 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
2557 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
2558} 3513}
2559 3514
3515sub reload_sound {
3516 trace "loading sound config from $DATADIR/sound\n";
3517
3518 0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519 or die "$DATADIR/sound $!";
3520
3521 my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);
3522
3523 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524 my $sound = $soundconf->{compat}[$_]
3525 or next;
3526
3527 my $face = cf::face::find "sound/$sound->[1]";
3528 cf::sound::set $sound->[0] => $face;
3529 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3530 }
3531
3532 while (my ($k, $v) = each %{$soundconf->{event}}) {
3533 my $face = cf::face::find "sound/$v";
3534 cf::sound::set $k => $face;
3535 }
3536}
3537
2560sub reload_resources { 3538sub reload_resources {
2561 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
2562 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
2563 reload_regions; 3546 reload_regions;
2564 reload_facedata;
2565 reload_archetypes;
2566 reload_treasures; 3547 reload_treasures;
2567 3548
2568 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
2569} 3550}
2570 3551
2571sub init { 3552sub reload_config {
2572 reload_resources; 3553 trace "reloading config file...\n";
2573}
2574 3554
2575sub cfg_load { 3555 0 < aio_load "$CONFDIR/config", my $config
2576 open my $fh, "<:utf8", "$CONFDIR/config" 3556 or die "$CONFDIR/config: $!";
2577 or return;
2578 3557
2579 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
2580 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
2581 3562
2582 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2583 3564
2584 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3565 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2585 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3566 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2586 3567
2587 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
2591 }; 3572 };
2592 warn $@ if $@; 3573 warn $@ if $@;
2593 } 3574 }
2594} 3575}
2595 3576
3577sub pidfile() {
3578 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3579 or die "$PIDFILE: $!";
3580 flock $fh, &Fcntl::LOCK_EX
3581 or die "$PIDFILE: flock: $!";
3582 $fh
3583}
3584
3585# make sure only one server instance is running at any one time
3586sub atomic {
3587 my $fh = pidfile;
3588
3589 my $pid = <$fh>;
3590 kill 9, $pid if $pid > 0;
3591
3592 seek $fh, 0, 0;
3593 print $fh $$;
3594}
3595
3596sub main_loop {
3597 trace "EV::loop starting\n";
3598 if (1) {
3599 EV::loop;
3600 }
3601 trace "EV::loop returned\n";
3602 goto &main_loop unless $REALLY_UNLOOP;
3603}
3604
2596sub main { 3605sub main {
3606 cf::init_globals; # initialise logging
3607
3608 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609 LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612
3613 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614
2597 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
2598 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
2599 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3617 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2600 (async { 3618 (async {
2601 Event::one_event; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3620 EV::loop EV::LOOP_ONESHOT;
2602 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
2603 }; 3622 };
2604 3623
2605 cfg_load; 3624 evthread_start IO::AIO::poll_fileno;
3625
3626 cf::sync_job {
3627 cf::incloader::init ();
3628
3629 cf::init_anim;
3630 cf::init_attackmess;
3631 cf::init_dynamic;
3632
3633 cf::load_settings;
3634
3635 reload_resources;
3636 reload_config;
2606 db_init; 3637 db_init;
3638
3639 cf::init_uuid;
3640 cf::init_signals;
3641 cf::init_skills;
3642
3643 cf::init_beforeplay;
3644
3645 atomic;
3646
2607 load_extensions; 3647 load_extensions;
2608 3648
2609 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
2610 Event::loop; 3650
3651 # no (long-running) fork's whatsoever before this point(!)
3652 use POSIX ();
3653 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654
3655 (pop @POST_INIT)->(0) while @POST_INIT;
3656 };
3657
3658 cf::object::thawer::errors_are_fatal 0;
3659 info "parse errors in files are no longer fatal from this point on.\n";
3660
3661 my $free_main; $free_main = EV::idle sub {
3662 undef $free_main;
3663 undef &main; # free gobs of memory :)
3664 };
3665
3666 goto &main_loop;
2611} 3667}
2612 3668
2613############################################################################# 3669#############################################################################
2614# initialisation and cleanup 3670# initialisation and cleanup
2615 3671
2616# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
2617BEGIN { 3673BEGIN {
3674 our %SIGWATCHER = ();
2618 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
2619 Event->signal ( 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2620 reentrant => 0,
2621 data => WF_AUTOCANCEL,
2622 signal => $signal,
2623 prio => 0,
2624 cb => sub {
2625 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
2626 },
2627 ); 3678 };
3679 }
3680}
3681
3682sub write_runtime_sync {
3683 my $t0 = AE::time;
3684
3685 # first touch the runtime file to show we are still running:
3686 # the fsync below can take a very very long time.
3687
3688 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3689
3690 my $guard = cf::lock_acquire "write_runtime";
3691
3692 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3693 or return;
3694
3695 my $value = $cf::RUNTIME + 90 + 10;
3696 # 10 is the runtime save interval, for a monotonic clock
3697 # 60 allows for the watchdog to kill the server.
3698
3699 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3700 and return;
3701
3702 # always fsync - this file is important
3703 aio_fsync $fh
3704 and return;
3705
3706 # touch it again to show we are up-to-date
3707 aio_utime $fh, undef, undef;
3708
3709 close $fh
3710 or return;
3711
3712 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3713 and return;
3714
3715 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3716
2628 } 3717 1
3718}
3719
3720our $uuid_lock;
3721our $uuid_skip;
3722
3723sub write_uuid_sync($) {
3724 $uuid_skip ||= $_[0];
3725
3726 return if $uuid_lock;
3727 local $uuid_lock = 1;
3728
3729 my $uuid = "$LOCALDIR/uuid";
3730
3731 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3732 or return;
3733
3734 my $value = uuid_seq uuid_cur;
3735
3736 unless ($value) {
3737 info "cowardly refusing to write zero uuid value!\n";
3738 return;
3739 }
3740
3741 my $value = uuid_str $value + $uuid_skip;
3742 $uuid_skip = 0;
3743
3744 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3745 and return;
3746
3747 # always fsync - this file is important
3748 aio_fsync $fh
3749 and return;
3750
3751 close $fh
3752 or return;
3753
3754 aio_rename "$uuid~", $uuid
3755 and return;
3756
3757 trace "uuid file written ($value).\n";
3758
3759 1
3760
3761}
3762
3763sub write_uuid($$) {
3764 my ($skip, $sync) = @_;
3765
3766 $sync ? write_uuid_sync $skip
3767 : async { write_uuid_sync $skip };
2629} 3768}
2630 3769
2631sub emergency_save() { 3770sub emergency_save() {
2632 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
2633 3772
2634 warn "enter emergency perl save\n"; 3773 info "emergency_perl_save: enter\n";
3774
3775 # this is a trade-off: we want to be very quick here, so
3776 # save all maps without fsync, and later call a global sync
3777 # (which in turn might be very very slow)
3778 local $USE_FSYNC = 0;
2635 3779
2636 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
2637 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
2638 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
2639 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
2640 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
2641 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
2642 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
2643 $pl->valid or next; 3789 $pl->valid or next;
3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2644 $pl->save; 3791 $pl->save;
2645 } 3792 }
2646 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
2647 3794
2648 warn "begin emergency map save\n"; 3795 cf::write_runtime_sync; # external watchdog should not bark
3796
3797 info "emergency_perl_save: begin map save\n";
2649 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
2650 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
2651 $map->valid or next; 3800 $map->valid or next;
2652 $map->save; 3801 $map->save;
2653 } 3802 }
2654 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
2655 3804
2656 warn "begin emergency database checkpoint\n"; 3805 cf::write_runtime_sync; # external watchdog should not bark
3806
3807 info "emergency_perl_save: begin database checkpoint\n";
2657 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
2658 warn "end emergency database checkpoint\n"; 3809 info "emergency_perl_save: end database checkpoint\n";
3810
3811 info "emergency_perl_save: begin write uuid\n";
3812 write_uuid_sync 1;
3813 info "emergency_perl_save: end write uuid\n";
3814
3815 cf::write_runtime_sync; # external watchdog should not bark
3816
3817 trace "emergency_perl_save: syncing database to disk";
3818 BDB::db_env_txn_checkpoint $DB_ENV;
3819
3820 info "emergency_perl_save: starting sync\n";
3821 IO::AIO::aio_sync sub {
3822 info "emergency_perl_save: finished sync\n";
3823 };
3824
3825 cf::write_runtime_sync; # external watchdog should not bark
3826
3827 trace "emergency_perl_save: flushing outstanding aio requests";
3828 while (IO::AIO::nreqs || BDB::nreqs) {
3829 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3830 }
3831
3832 cf::write_runtime_sync; # external watchdog should not bark
2659 }; 3833 };
2660 3834
2661 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
2662} 3836}
2663 3837
2664sub post_cleanup { 3838sub post_cleanup {
2665 my ($make_core) = @_; 3839 my ($make_core) = @_;
2666 3840
3841 IO::AIO::flush;
3842
2667 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
2668 if $make_core; 3844 if $make_core;
3845
3846 my $fh = pidfile;
3847 unlink $PIDFILE if <$fh> == $$;
3848}
3849
3850# a safer delete_package, copied from Symbol
3851sub clear_package($) {
3852 my $pkg = shift;
3853
3854 # expand to full symbol table name if needed
3855 unless ($pkg =~ /^main::.*::$/) {
3856 $pkg = "main$pkg" if $pkg =~ /^::/;
3857 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3858 $pkg .= '::' unless $pkg =~ /::$/;
3859 }
3860
3861 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3862 my $stem_symtab = *{$stem}{HASH};
3863
3864 defined $stem_symtab and exists $stem_symtab->{$leaf}
3865 or return;
3866
3867 # clear all symbols
3868 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3869 for my $name (keys %$leaf_symtab) {
3870 _gv_clear *{"$pkg$name"};
3871# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3872 }
2669} 3873}
2670 3874
2671sub do_reload_perl() { 3875sub do_reload_perl() {
2672 # can/must only be called in main 3876 # can/must only be called in main
2673 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
2674 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
2675 return; 3879 return;
2676 } 3880 }
2677 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
2678 warn "reloading..."; 3888 info "reloading...";
2679 3889
2680 warn "entering sync_job"; 3890 trace "entering sync_job";
2681 3891
2682 cf::sync_job { 3892 cf::sync_job {
2683 cf::write_runtime; # external watchdog should not bark
2684 cf::emergency_save; 3893 #cf::emergency_save;
2685 cf::write_runtime; # external watchdog should not bark
2686 3894
2687 warn "syncing database to disk";
2688 BDB::db_env_txn_checkpoint $DB_ENV;
2689
2690 # if anything goes wrong in here, we should simply crash as we already saved
2691
2692 warn "cancelling all WF_AUTOCANCEL watchers";
2693 for (Event::all_watchers) {
2694 $_->cancel if $_->data & WF_AUTOCANCEL;
2695 }
2696
2697 warn "flushing outstanding aio requests";
2698 for (;;) {
2699 BDB::flush;
2700 IO::AIO::flush;
2701 Coro::cede;
2702 last unless IO::AIO::nreqs || BDB::nreqs;
2703 warn "iterate...";
2704 }
2705
2706 ++$RELOAD;
2707
2708 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
2709 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
2710 %EXT_CORO = (); 3897 %EXT_CORO = ();
2711 3898
2712 warn "removing commands"; 3899 trace "removing commands";
2713 %COMMAND = (); 3900 %COMMAND = ();
2714 3901
2715 warn "removing ext commands"; 3902 trace "removing ext/exti commands";
2716 %EXTCMD = (); 3903 %EXTCMD = ();
3904 %EXTICMD = ();
2717 3905
2718 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
2719 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
2720 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
2721 3909
2722 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
2723 eval { 3911 eval {
2724 $cb->($pkg); 3912 $cb->($pkg);
2725 1 3913 1
2726 } or warn "$pkg unloaded, but with errors: $@"; 3914 } or error "$pkg unloaded, but with errors: $@";
3915 }
3916
3917 trace "... clearing $pkg";
3918 clear_package $pkg;
2727 } 3919 }
2728 3920
2729 warn "... nuking $pkg";
2730 Symbol::delete_package $pkg;
2731 }
2732
2733 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
2734 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
2735 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2736 3924
2737 warn "... unloading $k"; 3925 trace "... unloading $k";
2738 delete $INC{$k}; 3926 delete $INC{$k};
2739 3927
2740 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
2741 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
2742 3930
2743 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
2744 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
2745 } 3936 }
2746 3937
2747 Symbol::delete_package $k;
2748 }
2749
2750 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
2751 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
2752 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3940 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2753 3941
2754 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
2755 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
2756 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2757 3945
2758 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
2759 # and global variables created in xs 3947 # and global variables created in xs
2760 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
2761 3949
2762 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
2763 3951
2764 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
2765 require cf; 3953 require cf;
2766 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
2767 3955
2768 warn "loading config and database again"; 3956 trace "loading config and database again";
2769 cf::cfg_load; 3957 cf::reload_config;
2770 3958
2771 warn "loading extensions"; 3959 trace "loading extensions";
2772 cf::load_extensions; 3960 cf::load_extensions;
2773 3961
3962 if ($REATTACH_ON_RELOAD) {
2774 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
2775 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
2776 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
2777 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
2778 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
2779 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
2780 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
2781 warn "leaving sync_job"; 3974 trace "leaving sync_job";
2782 3975
2783 1 3976 1
2784 } or do { 3977 } or do {
2785 warn $@; 3978 error $@;
2786 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
2787 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
2788 }; 3984 }
2789 3985
2790 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
2791}; 3988};
2792 3989
2793our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
2794 3991
2795sub reload_perl() { 3992sub reload_perl() {
2796 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
2797 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
2798 3995
2799 $RELOAD_WATCHER ||= Event->timer ( 3996 $RELOAD_WATCHER ||= cf::async {
2800 reentrant => 0, 3997 Coro::AIO::aio_wait cache_extensions;
2801 after => 0, 3998
2802 data => WF_AUTOCANCEL, 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2803 cb => sub {
2804 do_reload_perl; 4000 do_reload_perl;
2805 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
2806 }, 4002 };
2807 ); 4003 };
2808} 4004}
2809 4005
2810register_command "reload" => sub { 4006register_command "reload" => sub {
2811 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
2812 4008
2813 if ($who->flag (FLAG_WIZ)) { 4009 if ($who->flag (FLAG_WIZ)) {
2814 $who->message ("reloading server."); 4010 $who->message ("reloading server.");
4011 async {
4012 $Coro::current->{desc} = "perl_reload";
2815 async { reload_perl }; 4013 reload_perl;
4014 };
2816 } 4015 }
2817}; 4016};
2818 4017
2819unshift @INC, $LIBDIR; 4018#############################################################################
2820 4019
2821my $bug_warning = 0; 4020my $bug_warning = 0;
2822 4021
2823our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
2824our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
2825 4024
2826sub wait_for_tick { 4025sub wait_for_tick() {
2827 return unless $TICK_WATCHER->is_active;
2828 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2829 4027
2830 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
2831 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
2832 $signal->wait; 4030 $signal->wait;
2833} 4031}
2834 4032
2835sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
2836 return unless $TICK_WATCHER->is_active;
2837 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2838 4035
2839 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
2840 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
2841 $signal->wait; 4038 $signal->wait;
2842} 4039}
2843 4040
2844 my $min = 1e6;#d# 4041sub tick {
2845 my $avg = 10;
2846$TICK_WATCHER = Event->timer (
2847 reentrant => 0,
2848 parked => 1,
2849 prio => 0,
2850 at => $NEXT_TICK || $TICK,
2851 data => WF_AUTOCANCEL,
2852 cb => sub {
2853 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
2854 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4043 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2855 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
2856 return; 4045 return;
2857 } 4046 }
2858 4047
2859 $NOW = $tick_start = Event::time;
2860
2861 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
2862 4049
2863 0 && sync_job {#d# 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2864 for(1..10) {
2865 my $t = Event::time;
2866 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2867 or die;
2868 4051
2869 $map->width (50); 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2870 $map->height (50); 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2871 $map->alloc; 4054 Coro::async_pool {
2872 $map->_load_objects ("/tmp/x.map", 1); 4055 $Coro::current->{desc} = "runtime saver";
2873 my $t = Event::time - $t; 4056 write_runtime_sync
2874 4057 or error "ERROR: unable to write runtime file: $!";
2875 #next unless $t < 0.0013;#d#
2876 if ($t < $min) {
2877 $min = $t;
2878 }
2879 $avg = $avg * 0.99 + $t * 0.01;
2880 }
2881 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2882 exit 0;
2883 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2884 }; 4058 };
4059 }
2885 4060
2886 $RUNTIME += $TICK;
2887 $NEXT_TICK += $TICK;
2888
2889 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2890 $NEXT_RUNTIME_WRITE = $NOW + 10;
2891 Coro::async_pool {
2892 write_runtime
2893 or warn "ERROR: unable to write runtime file: $!";
2894 };
2895 }
2896
2897# my $AFTER = Event::time;
2898# warn $AFTER - $NOW;#d#
2899
2900 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2901 $sig->send; 4062 $sig->send;
2902 } 4063 }
2903 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
2904 $sig->send; 4065 $sig->send;
2905 } 4066 }
2906 4067
2907 $NOW = Event::time; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
2908
2909 # if we are delayed by four ticks or more, skip them all
2910 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2911
2912 $TICK_WATCHER->at ($NEXT_TICK);
2913 $TICK_WATCHER->start;
2914
2915 $LOAD = ($NOW - $tick_start) / $TICK;
2916 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2917 4070
2918 _post_tick; 4071 if (0) {
2919 4072 if ($NEXT_TICK) {
2920 4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
2921 }, 4077 }
2922); 4078}
2923 4079
2924{ 4080{
2925 BDB::max_poll_time $TICK * 0.1; 4081 # configure BDB
2926 $BDB_POLL_WATCHER = Event->io ( 4082
2927 reentrant => 0,
2928 fd => BDB::poll_fileno,
2929 poll => 'r',
2930 prio => 0,
2931 data => WF_AUTOCANCEL,
2932 cb => \&BDB::poll_cb,
2933 );
2934 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
2935 4084 BDB::max_poll_reqs $TICK * 0.1;
2936 BDB::set_sync_prepare { 4085 $AnyEvent::BDB::WATCHER->priority (1);
2937 my $status;
2938 my $current = $Coro::current;
2939 (
2940 sub {
2941 $status = $!;
2942 $current->ready; undef $current;
2943 },
2944 sub {
2945 Coro::schedule while defined $current;
2946 $! = $status;
2947 },
2948 )
2949 };
2950 4086
2951 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
2952 $DB_ENV = BDB::db_env_create; 4088 $DB_ENV = BDB::db_env_create;
4089 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4091 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4092 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4093 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2953 4094
2954 cf::sync_job { 4095 cf::sync_job {
2955 eval { 4096 eval {
2956 BDB::db_env_open 4097 BDB::db_env_open
2957 $DB_ENV, 4098 $DB_ENV,
2959 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4100 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2960 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4101 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2961 0666; 4102 0666;
2962 4103
2963 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4104 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2964
2965 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2966 $DB_ENV->set_lk_detect;
2967 }; 4105 };
2968 4106
2969 cf::cleanup "db_env_open(db): $@" if $@; 4107 cf::cleanup "db_env_open(db): $@" if $@;
2970 }; 4108 };
2971 } 4109 }
4110
4111 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4112 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4113 };
4114 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4115 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116 };
4117 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119 };
2972} 4120}
2973 4121
2974{ 4122{
4123 # configure IO::AIO
4124
2975 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
2976
2977 undef $Coro::AIO::WATCHER;
2978 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
2979 $AIO_POLL_WATCHER = Event->io ( 4127 undef $AnyEvent::AIO::WATCHER;
2980 reentrant => 0,
2981 data => WF_AUTOCANCEL,
2982 fd => IO::AIO::poll_fileno,
2983 poll => 'r',
2984 prio => 6,
2985 cb => \&IO::AIO::poll_cb,
2986 );
2987} 4128}
2988 4129
2989my $_log_backtrace; 4130my $_log_backtrace;
2990 4131
2991sub _log_backtrace { 4132sub _log_backtrace {
2994 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
2995 4136
2996 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
2997 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
2998 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
2999 async { 4141 async {
4142 $Coro::current->{desc} = "abt $msg";
4143
3000 my @bt = fork_call { 4144 my @bt = fork_call {
3001 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3002 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4146 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3003 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4147 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3004 or die "addr2line: $!"; 4148 or die "addr2line: $!";
3012 } 4156 }
3013 4157
3014 @funcs 4158 @funcs
3015 }; 4159 };
3016 4160
3017 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3018 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3019 --$_log_backtrace; 4164 --$_log_backtrace;
3020 }; 4165 };
3021 } else { 4166 } else {
3022 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3023 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3024 } 4169 }
3025} 4170}
3026 4171
3027# load additional modules 4172# load additional modules
3028use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3029 4175
3030END { cf::emergency_save } 4176END { cf::emergency_save }
3031 4177
30321 41781
3033 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines