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.270 by root, Sat May 26 15:44:06 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';
191@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 297@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
298@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
192@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 299@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
193 300
194# we bless all objects into (empty) derived classes to force a method lookup 301# we bless all objects into (empty) derived classes to force a method lookup
195# within the Safe compartment. 302# within the Safe compartment.
196for my $pkg (qw( 303for my $pkg (qw(
197 cf::global cf::attachable 304 cf::global cf::attachable
198 cf::object cf::object::player 305 cf::object cf::object::player
199 cf::client cf::player 306 cf::client cf::player
200 cf::arch cf::living 307 cf::arch cf::living
308 cf::map cf::mapspace
201 cf::map cf::party cf::region 309 cf::party cf::region
202)) { 310)) {
203 no strict 'refs';
204 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 311 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
205} 312}
206 313
207$Event::DIED = sub { 314$EV::DIED = sub {
208 warn "error in event callback: @_"; 315 Carp::cluck "error in event callback: @_";
209}; 316};
317
318#############################################################################
210 319
211=head2 UTILITY FUNCTIONS 320=head2 UTILITY FUNCTIONS
212 321
213=over 4 322=over 4
214 323
233 $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;
234 $d 343 $d
235 } || "[unable to dump $_[0]: '$@']"; 344 } || "[unable to dump $_[0]: '$@']";
236} 345}
237 346
238use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
239
240=item $ref = cf::from_json $json 347=item $ref = cf::decode_json $json
241 348
242Converts a JSON string into the corresponding perl data structure. 349Converts a JSON string into the corresponding perl data structure.
243 350
244=item $json = cf::to_json $ref 351=item $json = cf::encode_json $ref
245 352
246Converts a perl data structure into its JSON representation. 353Converts a perl data structure into its JSON representation.
247 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
248=item cf::lock_wait $string 376=item cf::lock_wait $string
249 377
250Wait until the given lock is available. See cf::lock_acquire. 378Wait until the given lock is available. See cf::lock_acquire.
251 379
252=item my $lock = cf::lock_acquire $string 380=item my $lock = cf::lock_acquire $string
253 381
254Wait 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
255a 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,
256for example when the coroutine gets canceled), the lock is automatically 384for example when the coroutine gets canceled), the lock is automatically
257returned. 385returned.
258 386
387Locks are *not* recursive, locking from the same coro twice results in a
388deadlocked coro.
389
259Lock 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
260uses map_find and cf::map::load uses map_load). 391uses map_find and cf::map::load uses map_load).
261 392
262=item $locked = cf::lock_active $string 393=item $locked = cf::lock_active $string
263 394
264Return 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.
265 396
266=cut 397=cut
267 398
268our %LOCK; 399our $LOCKS = new Coro::SemaphoreSet;
269 400
270sub lock_wait($) { 401sub lock_wait($) {
271 my ($key) = @_; 402 $LOCKS->wait ($_[0]);
272
273 # wait for lock, if any
274 while ($LOCK{$key}) {
275 push @{ $LOCK{$key} }, $Coro::current;
276 Coro::schedule;
277 }
278} 403}
279 404
280sub lock_acquire($) { 405sub lock_acquire($) {
281 my ($key) = @_; 406 $LOCKS->guard ($_[0])
282
283 # wait, to be sure we are not locked
284 lock_wait $key;
285
286 $LOCK{$key} = [];
287
288 Coro::guard {
289 # wake up all waiters, to be on the safe side
290 $_->ready for @{ delete $LOCK{$key} };
291 }
292} 407}
293 408
294sub lock_active($) { 409sub lock_active($) {
295 my ($key) = @_; 410 $LOCKS->count ($_[0]) < 1
296
297 ! ! $LOCK{$key}
298} 411}
299 412
300sub freeze_mainloop { 413sub freeze_mainloop {
301 return unless $TICK_WATCHER->is_active; 414 tick_inhibit_inc;
302 415
303 my $guard = Coro::guard { 416 &Guard::guard (\&tick_inhibit_dec);
304 $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 }
305 }; 483 }
306 $TICK_WATCHER->stop; 484};
307 $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;
308} 499}
309 500
310=item cf::async { BLOCK } 501=item cf::async { BLOCK }
311 502
312Currently the same as Coro::async_pool, meaning you cannot use 503Currently the same as Coro::async_pool, meaning you cannot use
317 508
318BEGIN { *async = \&Coro::async_pool } 509BEGIN { *async = \&Coro::async_pool }
319 510
320=item cf::sync_job { BLOCK } 511=item cf::sync_job { BLOCK }
321 512
322The design of crossfire+ requires that the main coro ($Coro::main) is 513The design of Deliantra requires that the main coroutine ($Coro::main)
323always able to handle events or runnable, as crossfire+ is only partly 514is always able to handle events or runnable, as Deliantra is only
324reentrant. 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.
325 517
326If 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
327the given BLOCK in another coroutine while waiting for the result. The 519the given BLOCK in another coroutine while waiting for the result. The
328server 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
329fast or be very important. 521fast or be very important.
331=cut 523=cut
332 524
333sub sync_job(&) { 525sub sync_job(&) {
334 my ($job) = @_; 526 my ($job) = @_;
335 527
336 if ($Coro::current == $Coro::main) { 528 if (in_main) {
337 my $time = Event::time; 529 my $time = AE::time;
338 530
339 # this is the main coro, too bad, we have to block 531 # this is the main coro, too bad, we have to block
340 # till the operation succeeds, freezing the server :/ 532 # till the operation succeeds, freezing the server :/
341 533
342 # TODO: use suspend/resume instead 534 #LOG llevError, Carp::longmess "sync job";#d#
343 # (but this is cancel-safe) 535
344 my $freeze_guard = freeze_mainloop; 536 my $freeze_guard = freeze_mainloop;
345 537
346 my $busy = 1; 538 my $busy = 1;
347 my @res; 539 my @res;
348 540
349 (async { 541 (async {
542 $Coro::current->desc ("sync job coro");
350 @res = eval { $job->() }; 543 @res = eval { $job->() };
351 warn $@ if $@; 544 error $@ if $@;
352 undef $busy; 545 undef $busy;
353 })->prio (Coro::PRIO_MAX); 546 })->prio (Coro::PRIO_MAX);
354 547
355 while ($busy) { 548 while ($busy) {
356 Coro::cede or Event::one_event; 549 if (Coro::nready) {
550 Coro::cede_notself;
551 } else {
552 EV::loop EV::LOOP_ONESHOT;
357 } 553 }
554 }
358 555
359 $time = Event::time - $time; 556 my $time = AE::time - $time;
360 557
361 LOG llevError | logBacktrace, Carp::longmess "long sync job"
362 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
363
364 $tick_start += $time; # do not account sync jobs to server load 558 $TICK_START += $time; # do not account sync jobs to server load
365 559
366 wantarray ? @res : $res[0] 560 wantarray ? @res : $res[0]
367 } else { 561 } else {
368 # we are in another coroutine, how wonderful, everything just works 562 # we are in another coroutine, how wonderful, everything just works
369 563
389 $EXT_CORO{$coro+0} = $coro; 583 $EXT_CORO{$coro+0} = $coro;
390 584
391 $coro 585 $coro
392} 586}
393 587
394sub write_runtime { 588=item fork_call { }, $args
395 my $runtime = "$LOCALDIR/runtime";
396 589
397 # first touch the runtime file to show we are still running: 590Executes the given code block with the given arguments in a seperate
398 # 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.
399 594
400 if (my $fh = aio_open $runtime, O_WRONLY, 0) { 595=cut
401 utime undef, undef, $fh; 596
597sub post_fork {
598 reset_signals;
599}
600
601sub fork_call(&@) {
602 my ($cb, @args) = @_;
603
604 # we seemingly have to make a local copy of the whole thing,
605 # otherwise perl prematurely frees the stuff :/
606 # TODO: investigate and fix (likely this will be rather laborious)
607
608 my @res = Coro::Util::fork_eval {
609 cf::post_fork;
610 &$cb
611 }, @args;
612
613 wantarray ? @res : $res[-1]
614}
615
616sub objinfo {
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 $!;
402 } 684 };
685 cf::cleanup "db_open(db): $@" if $@;
403 686
404 my $guard = cf::lock_acquire "write_runtime"; 687 $db
688}
405 689
406 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 690our $DB;
407 or return;
408 691
409 my $value = $cf::RUNTIME + 90 + 10; 692sub db_init {
410 # 10 is the runtime save interval, for a monotonic clock 693 $DB ||= db_table "db";
411 # 60 allows for the watchdog to kill the server. 694}
412 695
413 (aio_write $fh, 0, (length $value), $value, 0) <= 0 696sub db_get($$) {
414 and return; 697 my $key = "$_[0]/$_[1]";
415 698
416 # always fsync - this file is important 699 cf::error "db_get called from main context"
417 aio_fsync $fh 700 if $Coro::current == $Coro::main;
418 and return;
419 701
420 # touch it again to show we are up-to-date 702 BDB::db_get $DB, undef, $key, my $data;
421 utime undef, undef, $fh;
422 703
423 close $fh 704 $! ? ()
424 or return; 705 : $data
706}
425 707
426 aio_rename "$runtime~", $runtime 708sub db_put($$$) {
427 and return; 709 BDB::dbreq_pri 4;
710 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
711}
428 712
429 warn "runtime file written.\n";#d# 713=item cf::cache $id => [$paths...], $processversion => $process
430 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;
431 1 778 }
779
780 db_get cache => "$id/data"
432} 781}
433 782
434=item cf::datalog type => key => value, ... 783=item cf::datalog type => key => value, ...
435 784
436Log 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.
437 786
438=cut 787=cut
439 788
440sub datalog($@) { 789sub datalog($@) {
441 my ($type, %kv) = @_; 790 my ($type, %kv) = @_;
442 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 791 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
443} 792}
444 793
445=back 794=back
446 795
447=cut 796=cut
448 797
449############################################################################# 798#############################################################################
450 799
451=head2 ATTACHABLE OBJECTS 800=head2 ATTACHABLE OBJECTS
452 801
453Many 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
454attach callbacks/event handlers (a collection of which is called an "attachment") 803attach callbacks/event handlers (a collection of which is called an "attachment")
455to it. All such attachable objects support the following methods. 804to it. All such attachable objects support the following methods.
456 805
457In 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>
458C<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
459crossfire+). 808Deliantra).
460 809
461=over 4 810=over 4
462 811
463=item $attachable->attach ($attachment, key => $value...) 812=item $attachable->attach ($attachment, key => $value...)
464 813
508=item cf::CLASS::attachment $name, ... 857=item cf::CLASS::attachment $name, ...
509 858
510Register an attachment by C<$name> through which attachable objects of the 859Register an attachment by C<$name> through which attachable objects of the
511given CLASS can refer to this attachment. 860given CLASS can refer to this attachment.
512 861
513Some classes such as crossfire maps and objects can specify attachments 862Some classes such as deliantra maps and objects can specify attachments
514that 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.
515 864
516These calls expect any number of the following handler/hook descriptions: 865These calls expect any number of the following handler/hook descriptions:
517 866
518=over 4 867=over 4
642 991
643 } elsif (exists $cb_id{$type}) { 992 } elsif (exists $cb_id{$type}) {
644 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 993 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
645 994
646 } elsif (ref $type) { 995 } elsif (ref $type) {
647 warn "attaching objects not supported, ignoring.\n"; 996 error "attaching objects not supported, ignoring.\n";
648 997
649 } else { 998 } else {
650 shift @arg; 999 shift @arg;
651 warn "attach argument '$type' not supported, ignoring.\n"; 1000 error "attach argument '$type' not supported, ignoring.\n";
652 } 1001 }
653 } 1002 }
654} 1003}
655 1004
656sub _object_attach { 1005sub _object_attach {
666 _attach $registry, $klass, @attach; 1015 _attach $registry, $klass, @attach;
667 } 1016 }
668 1017
669 $obj->{$name} = \%arg; 1018 $obj->{$name} = \%arg;
670 } else { 1019 } else {
671 warn "object uses attachment '$name' that is not available, postponing.\n"; 1020 info "object uses attachment '$name' which is not available, postponing.\n";
672 } 1021 }
673 1022
674 $obj->{_attachment}{$name} = undef; 1023 $obj->{_attachment}{$name} = undef;
675} 1024}
676 1025
716 "; 1065 ";
717 die if $@; 1066 die if $@;
718} 1067}
719 1068
720our $override; 1069our $override;
721our @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?
722 1071
723sub override { 1072sub override {
724 $override = 1; 1073 $override = 1;
725 @invoke_results = (); 1074 @INVOKE_RESULTS = (@_);
726} 1075}
727 1076
728sub do_invoke { 1077sub do_invoke {
729 my $event = shift; 1078 my $event = shift;
730 my $callbacks = shift; 1079 my $callbacks = shift;
731 1080
732 @invoke_results = (); 1081 @INVOKE_RESULTS = ();
733 1082
734 local $override; 1083 local $override;
735 1084
736 for (@$callbacks) { 1085 for (@$callbacks) {
737 eval { &{$_->[1]} }; 1086 eval { &{$_->[1]} };
738 1087
739 if ($@) { 1088 if ($@) {
740 warn "$@";
741 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1089 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
742 override; 1090 override;
743 } 1091 }
744 1092
745 return 1 if $override; 1093 return 1 if $override;
746 } 1094 }
747 1095
748 0 1096 0
749} 1097}
750 1098
751=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1099=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
752 1100
753=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1101=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
754 1102
755Generate an object-specific event with the given arguments. 1103Generate an object-specific event with the given arguments.
756 1104
757This 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
758removed 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
759results (if you must, access C<@cf::invoke_results> directly). 1107results (if you must, access C<@cf::INVOKE_RESULTS> directly).
760 1108
761=back 1109=back
762 1110
763=cut 1111=cut
764 1112
765############################################################################# 1113#############################################################################
766# 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}
767 1157
768sub reattach { 1158sub reattach {
769 # basically do the same as instantiate, without calling instantiate 1159 # basically do the same as instantiate, without calling instantiate
770 my ($obj) = @_; 1160 my ($obj) = @_;
771 1161
1162 # no longer needed after getting rid of delete_package?
772 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
773 1164
774 my $registry = $obj->registry; 1165 my $registry = $obj->registry;
775 1166
776 @$registry = (); 1167 @$registry = ();
777 1168
782 for (@$attach) { 1173 for (@$attach) {
783 my ($klass, @attach) = @$_; 1174 my ($klass, @attach) = @$_;
784 _attach $registry, $klass, @attach; 1175 _attach $registry, $klass, @attach;
785 } 1176 }
786 } else { 1177 } else {
787 warn "object uses attachment '$name' that is not available, postponing.\n"; 1178 info "object uses attachment '$name' that is not available, postponing.\n";
788 } 1179 }
789 } 1180 }
790} 1181}
791 1182
792cf::attachable->attach ( 1183cf::attachable->attach (
793 prio => -1000000, 1184 prio => -1000000,
794 on_instantiate => sub { 1185 on_instantiate => sub {
795 my ($obj, $data) = @_; 1186 my ($obj, $data) = @_;
796 1187
797 $data = from_json $data; 1188 $data = decode_json $data;
798 1189
799 for (@$data) { 1190 for (@$data) {
800 my ($name, $args) = @$_; 1191 my ($name, $args) = @$_;
801 1192
802 $obj->attach ($name, %{$args || {} }); 1193 $obj->attach ($name, %{$args || {} });
818sub object_freezer_save { 1209sub object_freezer_save {
819 my ($filename, $rdata, $objs) = @_; 1210 my ($filename, $rdata, $objs) = @_;
820 1211
821 sync_job { 1212 sync_job {
822 if (length $$rdata) { 1213 if (length $$rdata) {
1214 utf8::decode (my $decname = $filename);
823 warn sprintf "saving %s (%d,%d)\n", 1215 trace sprintf "saving %s (%d,%d)\n",
824 $filename, length $$rdata, scalar @$objs; 1216 $decname, length $$rdata, scalar @$objs
1217 if $VERBOSE_IO;
825 1218
826 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1219 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
827 chmod SAVE_MODE, $fh; 1220 aio_chmod $fh, SAVE_MODE;
828 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1221 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
829 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 }
830 close $fh; 1226 aio_close $fh;
831 1227
832 if (@$objs) { 1228 if (@$objs) {
833 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) {
834 chmod SAVE_MODE, $fh; 1230 aio_chmod $fh, SAVE_MODE;
835 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1231 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
836 aio_write $fh, 0, (length $data), $data, 0; 1232 aio_write $fh, 0, (length $data), $data, 0;
837 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 }
838 close $fh; 1237 aio_close $fh;
839 aio_rename "$filename.pst~", "$filename.pst"; 1238 aio_rename "$filename.pst~", "$filename.pst";
840 } 1239 }
841 } else { 1240 } else {
842 aio_unlink "$filename.pst"; 1241 aio_unlink "$filename.pst";
843 } 1242 }
844 1243
845 aio_rename "$filename~", $filename; 1244 aio_rename "$filename~", $filename;
1245
1246 $filename =~ s%/[^/]+$%%;
1247 aio_pathsync $filename if $cf::USE_FSYNC;
846 } else { 1248 } else {
847 warn "FATAL: $filename~: $!\n"; 1249 error "unable to save objects: $filename~: $!\n";
848 } 1250 }
849 } else { 1251 } else {
850 aio_unlink $filename; 1252 aio_unlink $filename;
851 aio_unlink "$filename.pst"; 1253 aio_unlink "$filename.pst";
852 } 1254 }
853 } 1255 };
854} 1256}
855 1257
856sub object_freezer_as_string { 1258sub object_freezer_as_string {
857 my ($rdata, $objs) = @_; 1259 my ($rdata, $objs) = @_;
858 1260
870 or return; 1272 or return;
871 1273
872 unless (aio_stat "$filename.pst") { 1274 unless (aio_stat "$filename.pst") {
873 (aio_load "$filename.pst", $av) >= 0 1275 (aio_load "$filename.pst", $av) >= 0
874 or return; 1276 or return;
1277
875 $av = eval { (Storable::thaw $av)->{objs} }; 1278 my $st = eval { Coro::Storable::thaw $av };
1279 $av = $st->{objs};
876 } 1280 }
877 1281
1282 utf8::decode (my $decname = $filename);
878 warn sprintf "loading %s (%d)\n", 1283 trace sprintf "loading %s (%d,%d)\n",
879 $filename, length $data, scalar @{$av || []};#d# 1284 $decname, length $data, scalar @{$av || []}
1285 if $VERBOSE_IO;
1286
880 return ($data, $av); 1287 ($data, $av)
881} 1288}
1289
1290=head2 COMMAND CALLBACKS
1291
1292=over 4
1293
1294=cut
882 1295
883############################################################################# 1296#############################################################################
884# command handling &c 1297# command handling &c
885 1298
886=item cf::register_command $name => \&callback($ob,$args); 1299=item cf::register_command $name => \&callback($ob,$args);
899 push @{ $COMMAND{$name} }, [$caller, $cb]; 1312 push @{ $COMMAND{$name} }, [$caller, $cb];
900} 1313}
901 1314
902=item cf::register_extcmd $name => \&callback($pl,$packet); 1315=item cf::register_extcmd $name => \&callback($pl,$packet);
903 1316
904Register 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.
905 1322
906If 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
907called. 1324called.
908 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
909=cut 1337=cut
910 1338
911sub register_extcmd { 1339sub register_extcmd {
912 my ($name, $cb) = @_; 1340 my ($name, $cb) = @_;
913 1341
914 $EXTCMD{$name} = $cb; 1342 $EXTCMD{$name} = $cb;
915} 1343}
916 1344
1345sub register_exticmd {
1346 my ($name, $cb) = @_;
1347
1348 $EXTICMD{$name} = $cb;
1349}
1350
1351use File::Glob ();
1352
917cf::player->attach ( 1353cf::player->attach (
918 on_command => sub { 1354 on_unknown_command => sub {
919 my ($pl, $name, $params) = @_; 1355 my ($pl, $name, $params) = @_;
920 1356
921 my $cb = $COMMAND{$name} 1357 my $cb = $COMMAND{$name}
922 or return; 1358 or return;
923 1359
928 cf::override; 1364 cf::override;
929 }, 1365 },
930 on_extcmd => sub { 1366 on_extcmd => sub {
931 my ($pl, $buf) = @_; 1367 my ($pl, $buf) = @_;
932 1368
933 my $msg = eval { from_json $buf }; 1369 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
934 1370
935 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
936 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1379 if (my $cb = $EXTCMD{$type}) {
937 if (my %reply = $cb->($pl, $msg)) { 1380 @reply = $cb->($pl, @payload);
938 $pl->ext_reply ($msg->{msgid}, %reply);
939 }
940 } 1381 }
1382
1383 $pl->ext_reply ($reply, @reply)
1384 if $reply;
1385
941 } else { 1386 } else {
942 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1387 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
943 } 1388 }
944 1389
945 cf::override; 1390 cf::override;
946 }, 1391 },
947); 1392);
948 1393
1394# "readahead" all extensions
949sub load_extension { 1395sub cache_extensions {
950 my ($path) = @_; 1396 my $grp = IO::AIO::aio_group;
951 1397
952 $path =~ /([^\/\\]+)\.ext$/ or die "$path"; 1398 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
953 my $base = $1; 1399 for (grep /\.ext$/, @{$_[0]}) {
954 my $pkg = $1; 1400 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
955 $pkg =~ s/[^[:word:]]/_/g;
956 $pkg = "ext::$pkg";
957
958 warn "... loading '$path' into '$pkg'\n";
959
960 open my $fh, "<:utf8", $path
961 or die "$path: $!";
962
963 my $source =
964 "package $pkg; use strict; use utf8;\n"
965 . "#line 1 \"$path\"\n{\n"
966 . (do { local $/; <$fh> })
967 . "\n};\n1";
968
969 unless (eval $source) {
970 my $msg = $@ ? "$path: $@\n"
971 : "extension disabled.\n";
972 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
973 warn $@;
974 warn "mandatory extension failed to load, exiting.\n";
975 exit 1;
976 } 1401 }
977 die $@;
978 } 1402 };
979 1403
980 push @EXTS, $pkg; 1404 $grp
981} 1405}
982 1406
983sub load_extensions { 1407sub load_extensions {
1408 info "loading extensions...";
1409
1410 cf::sync_job {
1411 my %todo;
1412
984 for my $ext (<$LIBDIR/*.ext>) { 1413 for my $path (<$LIBDIR/*.ext>) {
985 next unless -r $ext; 1414 next unless -r $path;
986 eval { 1415
987 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 }
988 1 1479 }
989 } 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 }
990 } 1490 };
991} 1491}
992 1492
993############################################################################# 1493#############################################################################
994 1494
1495=back
1496
995=head2 CORE EXTENSIONS 1497=head2 CORE EXTENSIONS
996 1498
997Functions and methods that extend core crossfire objects. 1499Functions and methods that extend core deliantra objects.
998 1500
999=cut 1501=cut
1000 1502
1001package cf::player; 1503package cf::player;
1002 1504
1003use Coro::AIO; 1505use Coro::AIO;
1004 1506
1005=head3 cf::player 1507=head3 cf::player
1006 1508
1007=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}
1008 1524
1009=item cf::player::find $login 1525=item cf::player::find $login
1010 1526
1011Returns the given player object, loading it if necessary (might block). 1527Returns the given player object, loading it if necessary (might block).
1012 1528
1031 1547
1032sub exists($) { 1548sub exists($) {
1033 my ($login) = @_; 1549 my ($login) = @_;
1034 1550
1035 $cf::PLAYER{$login} 1551 $cf::PLAYER{$login}
1036 or cf::sync_job { !aio_stat path $login } 1552 or !aio_stat path $login
1037} 1553}
1038 1554
1039sub find($) { 1555sub find($) {
1040 return $cf::PLAYER{$_[0]} || do { 1556 return $cf::PLAYER{$_[0]} || do {
1041 my $login = $_[0]; 1557 my $login = $_[0];
1048 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1564 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1049 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1565 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1050 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1566 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1051 aio_unlink +(playerdir $login) . "/$login.pl"; 1567 aio_unlink +(playerdir $login) . "/$login.pl";
1052 1568
1053 my $pl = load_pl path $login 1569 my $f = new_from_file cf::object::thawer path $login
1054 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;
1055 $cf::PLAYER{$login} = $pl 1577 $cf::PLAYER{$login} = $pl
1056 } 1578 }
1057 } 1579 }
1058} 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);
1059 1594
1060sub save($) { 1595sub save($) {
1061 my ($pl) = @_; 1596 my ($pl) = @_;
1062 1597
1063 return if $pl->{deny_save}; 1598 return if $pl->{deny_save};
1068 return if $pl->{deny_save}; 1603 return if $pl->{deny_save};
1069 1604
1070 aio_mkdir playerdir $pl, 0770; 1605 aio_mkdir playerdir $pl, 0770;
1071 $pl->{last_save} = $cf::RUNTIME; 1606 $pl->{last_save} = $cf::RUNTIME;
1072 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
1073 $pl->save_pl ($path); 1613 $pl->save_pl ($path);
1074 Coro::cede; 1614 cf::cede_to_tick;
1075} 1615}
1076 1616
1077sub new($) { 1617sub new($) {
1078 my ($login) = @_; 1618 my ($login) = @_;
1079 1619
1085 $cf::PLAYER{$login} = $self; 1625 $cf::PLAYER{$login} = $self;
1086 1626
1087 $self 1627 $self
1088} 1628}
1089 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
1090=item $pl->quit_character 1640=item $pl->quit_character
1091 1641
1092Nukes the player without looking back. If logged in, the connection will 1642Nukes the player without looking back. If logged in, the connection will
1093be destroyed. May block for a long time. 1643be destroyed. May block for a long time.
1094 1644
1098 my ($pl) = @_; 1648 my ($pl) = @_;
1099 1649
1100 my $name = $pl->ob->name; 1650 my $name = $pl->ob->name;
1101 1651
1102 $pl->{deny_save} = 1; 1652 $pl->{deny_save} = 1;
1103 $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
1104 1654
1105 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1655 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1106 $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
1107 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1661 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1108 $pl->ns->destroy if $pl->ns; 1662 $pl->ns->destroy if $pl->ns;
1109 1663
1110 my $path = playerdir $pl; 1664 my $path = playerdir $pl;
1111 my $temp = "$path~$cf::RUNTIME~deleting~"; 1665 my $temp = "$path~$cf::RUNTIME~deleting~";
1147 or return []; 1701 or return [];
1148 1702
1149 my @logins; 1703 my @logins;
1150 1704
1151 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") {
1152 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1711 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1153 aio_read $fh, 0, 512, my $buf, 0 or next; 1712 aio_read $fh, 0, 512, my $buf, 0 or next;
1154 $buf !~ /^password -------------$/m or next; # official not-valid tag 1713 $buf !~ /^password -------------$/m or next; # official not-valid tag
1714 }
1155 1715
1156 utf8::decode $login; 1716 utf8::decode $login;
1157 push @logins, $login; 1717 push @logins, $login;
1158 } 1718 }
1159 1719
1160 \@logins 1720 \@logins
1161} 1721}
1162 1722
1163=item $player->maps 1723=item $player->maps
1724
1725=item cf::player::maps $login
1164 1726
1165Returns an arrayref of map paths that are private for this 1727Returns an arrayref of map paths that are private for this
1166player. May block. 1728player. May block.
1167 1729
1168=cut 1730=cut
1186 } 1748 }
1187 1749
1188 \@paths 1750 \@paths
1189} 1751}
1190 1752
1753=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754
1755Expand deliantra pod fragments into protocol xml.
1756
1191=item $player->ext_reply ($msgid, %msg) 1757=item $player->ext_reply ($msgid, @msg)
1192 1758
1193Sends an ext reply to the player. 1759Sends an ext reply to the player.
1194 1760
1195=cut 1761=cut
1196 1762
1197sub ext_reply($$%) { 1763sub ext_reply($$@) {
1198 my ($self, $id, %msg) = @_; 1764 my ($self, $id, @msg) = @_;
1199 1765
1200 $msg{msgid} = $id; 1766 $self->ns->ext_reply ($id, @msg)
1201
1202 $self->send ("ext " . cf::to_json \%msg);
1203} 1767}
1204 1768
1205=item $player->ext_event ($type, %msg) 1769=item $player->ext_msg ($type, @msg)
1206 1770
1207Sends an ext event to the client. 1771Sends an ext event to the client.
1208 1772
1209=cut 1773=cut
1210 1774
1211sub ext_event($$%) { 1775sub ext_msg($$@) {
1212 my ($self, $type, %msg) = @_; 1776 my ($self, $type, @msg) = @_;
1213 1777
1214 $self->ns->ext_event ($type, %msg); 1778 $self->ns->ext_msg ($type, @msg);
1215} 1779}
1216 1780
1217=head3 cf::region 1781=head3 cf::region
1218 1782
1219=over 4 1783=over 4
1222 1786
1223package cf::region; 1787package cf::region;
1224 1788
1225=item cf::region::find_by_path $path 1789=item cf::region::find_by_path $path
1226 1790
1227Tries 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.
1228 1792
1229=cut 1793=cut
1230 1794
1231sub find_by_path($) { 1795sub find_by_path($) {
1232 my ($path) = @_; 1796 my ($path) = @_;
1233 1797
1798 $path =~ s/^~[^\/]*//; # skip ~login
1799
1234 my ($match, $specificity); 1800 my ($match, $specificity);
1235 1801
1236 for my $region (list) { 1802 for my $region (list) {
1237 if ($region->match && $path =~ $region->match) { 1803 if ($region->{match} && $path =~ $region->{match}) {
1238 ($match, $specificity) = ($region, $region->specificity) 1804 ($match, $specificity) = ($region, $region->specificity)
1239 if $region->specificity > $specificity; 1805 if $region->specificity > $specificity;
1240 } 1806 }
1241 } 1807 }
1242 1808
1263our $MAX_RESET = 3600; 1829our $MAX_RESET = 3600;
1264our $DEFAULT_RESET = 3000; 1830our $DEFAULT_RESET = 3000;
1265 1831
1266sub generate_random_map { 1832sub generate_random_map {
1267 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
1268 # mit "rum" bekleckern, nicht 1837 # mit "rum" bekleckern, nicht
1269 $self->_create_random_map ( 1838 $self->_create_random_map (
1270 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1839 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1271 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1840 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1272 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1841 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1273 $rmp->{exit_on_final_map}, 1842 $rmp->{exit_on_final_map},
1274 $rmp->{xsize}, $rmp->{ysize}, 1843 $rmp->{xsize}, $rmp->{ysize},
1275 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1844 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1276 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1845 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1291 1860
1292sub register { 1861sub register {
1293 my (undef, $regex, $prio) = @_; 1862 my (undef, $regex, $prio) = @_;
1294 my $pkg = caller; 1863 my $pkg = caller;
1295 1864
1296 no strict;
1297 push @{"$pkg\::ISA"}, __PACKAGE__; 1865 push @{"$pkg\::ISA"}, __PACKAGE__;
1298 1866
1299 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1867 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1300} 1868}
1301 1869
1302# also paths starting with '/' 1870# also paths starting with '/'
1303$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1871$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1304 1872
1305sub thawer_merge { 1873sub thawer_merge {
1306 my ($self, $merge) = @_; 1874 my ($self, $merge) = @_;
1307 1875
1308 # we have to keep some variables in memory intact 1876 # we have to keep some variables in memory intact
1309 local $self->{path}; 1877 local $self->{path};
1310 local $self->{load_path}; 1878 local $self->{load_path};
1311 local $self->{deny_save};
1312 local $self->{deny_reset};
1313 1879
1314 $self->SUPER::thawer_merge ($merge); 1880 $self->SUPER::thawer_merge ($merge);
1315} 1881}
1316 1882
1317sub normalise { 1883sub normalise {
1318 my ($path, $base) = @_; 1884 my ($path, $base) = @_;
1319 1885
1320 $path = "$path"; # make sure its a string 1886 $path = "$path"; # make sure it's a string
1321 1887
1322 $path =~ s/\.map$//; 1888 $path =~ s/\.map$//;
1323 1889
1324 # map plan: 1890 # map plan:
1325 # 1891 #
1364 $self->init; # pass $1 etc. 1930 $self->init; # pass $1 etc.
1365 return $self; 1931 return $self;
1366 } 1932 }
1367 } 1933 }
1368 1934
1369 Carp::carp "unable to resolve path '$path' (base '$base')."; 1935 Carp::cluck "unable to resolve path '$path' (base '$base')";
1370 () 1936 ()
1371} 1937}
1372 1938
1373sub init { 1939sub init {
1374 my ($self) = @_; 1940 my ($self) = @_;
1396 1962
1397# the temporary/swap location 1963# the temporary/swap location
1398sub save_path { 1964sub save_path {
1399 my ($self) = @_; 1965 my ($self) = @_;
1400 1966
1401 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1967 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1402 "$TMPDIR/$path.map" 1968 "$TMPDIR/$path.map"
1403} 1969}
1404 1970
1405# the unique path, undef == no special unique path 1971# the unique path, undef == no special unique path
1406sub uniq_path { 1972sub uniq_path {
1407 my ($self) = @_; 1973 my ($self) = @_;
1408 1974
1409 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1975 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1410 "$UNIQUEDIR/$path" 1976 "$UNIQUEDIR/$path"
1411} 1977}
1412 1978
1413# and all this just because we cannot iterate over 1979sub decay_objects {
1414# all maps in C++...
1415sub change_all_map_light {
1416 my ($change) = @_; 1980 my ($self) = @_;
1417 1981
1418 $_->change_map_light ($change) 1982 return if $self->{deny_reset};
1419 for grep $_->outdoor, values %cf::MAP; 1983
1984 $self->do_decay_objects;
1420} 1985}
1421 1986
1422sub unlink_save { 1987sub unlink_save {
1423 my ($self) = @_; 1988 my ($self) = @_;
1424 1989
1429 1994
1430sub load_header_from($) { 1995sub load_header_from($) {
1431 my ($self, $path) = @_; 1996 my ($self, $path) = @_;
1432 1997
1433 utf8::encode $path; 1998 utf8::encode $path;
1434 #aio_open $path, O_RDONLY, 0 1999 my $f = new_from_file cf::object::thawer $path
1435 # or return;
1436
1437 $self->_load_header ($path)
1438 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;
1439 2007
1440 $self->{load_path} = $path; 2008 $self->{load_path} = $path;
1441 2009
1442 1 2010 1
1443} 2011}
1482 $self->load_header_orig 2050 $self->load_header_orig
1483 or return; 2051 or return;
1484 $self->prepare_orig; 2052 $self->prepare_orig;
1485 } 2053 }
1486 2054
2055 $self->{deny_reset} = 1
2056 if $self->no_reset;
2057
1487 $self->default_region (cf::region::find_by_path $self->{path}) 2058 $self->default_region (cf::region::find_by_path $self->{path})
1488 unless $self->default_region; 2059 unless $self->default_region;
1489 2060
1490 1 2061 1
1491} 2062}
1492 2063
1493sub find; 2064sub find;
1494sub find { 2065sub find {
1495 my ($path, $origin) = @_; 2066 my ($path, $origin) = @_;
1496 2067
2068 cf::cede_to_tick;
2069
1497 $path = normalise $path, $origin && $origin->path; 2070 $path = normalise $path, $origin && $origin->path;
1498 2071
2072 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1499 cf::lock_wait "map_find:$path"; 2073 my $guard2 = cf::lock_acquire "map_find:$path";
1500 2074
1501 $cf::MAP{$path} || do { 2075 $cf::MAP{$path} || do {
1502 my $guard = cf::lock_acquire "map_find:$path";
1503 my $map = new_from_path cf::map $path 2076 my $map = new_from_path cf::map $path
1504 or return; 2077 or return;
1505 2078
1506 $map->{last_save} = $cf::RUNTIME; 2079 $map->{last_save} = $cf::RUNTIME;
1507 2080
1508 $map->load_header 2081 $map->load_header
1509 or return; 2082 or return;
1510 2083
1511 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2084 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1512 # doing this can freeze the server in a sync job, obviously 2085 # doing this can freeze the server in a sync job, obviously
1513 #$cf::WAIT_FOR_TICK->wait; 2086 #$cf::WAIT_FOR_TICK->wait;
2087 undef $guard2;
2088 undef $guard1;
1514 $map->reset; 2089 $map->reset;
1515 undef $guard;
1516 return find $path; 2090 return find $path;
1517 } 2091 }
1518 2092
1519 $cf::MAP{$path} = $map 2093 $cf::MAP{$path} = $map
1520 } 2094 }
1521} 2095}
1522 2096
1523sub pre_load { } 2097sub pre_load { }
1524sub post_load { } 2098#sub post_load { } # XS
1525 2099
1526sub load { 2100sub load {
1527 my ($self) = @_; 2101 my ($self) = @_;
1528 2102
1529 local $self->{deny_reset} = 1; # loading can take a long time 2103 local $self->{deny_reset} = 1; # loading can take a long time
1530 2104
1531 my $path = $self->{path}; 2105 my $path = $self->{path};
1532 2106
1533 { 2107 {
1534 my $guard = cf::lock_acquire "map_load:$path"; 2108 my $guard = cf::lock_acquire "map_data:$path";
1535 2109
2110 return unless $self->valid;
1536 return if $self->in_memory != cf::MAP_SWAPPED; 2111 return unless $self->in_memory == cf::MAP_SWAPPED;
1537 2112
1538 $self->in_memory (cf::MAP_LOADING); 2113 $self->in_memory (cf::MAP_LOADING);
1539 2114
1540 $self->alloc; 2115 $self->alloc;
1541 2116
1542 $self->pre_load; 2117 $self->pre_load;
1543 Coro::cede; 2118 cf::cede_to_tick;
1544 2119
2120 my $f = new_from_file cf::object::thawer $self->{load_path};
2121 $f->skip_block;
1545 $self->_load_objects ($self->{load_path}, 1) 2122 $self->_load_objects ($f)
1546 or return; 2123 or return;
1547 2124
1548 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2125 $self->post_load_original
1549 if delete $self->{load_original}; 2126 if delete $self->{load_original};
1550 2127
1551 if (my $uniq = $self->uniq_path) { 2128 if (my $uniq = $self->uniq_path) {
1552 utf8::encode $uniq; 2129 utf8::encode $uniq;
1553 if (aio_open $uniq, O_RDONLY, 0) { 2130 unless (aio_stat $uniq) {
2131 if (my $f = new_from_file cf::object::thawer $uniq) {
1554 $self->clear_unique_items; 2132 $self->clear_unique_items;
1555 $self->_load_objects ($uniq, 0); 2133 $self->_load_objects ($f);
2134 $f->resolve_delayed_derefs;
2135 }
1556 } 2136 }
1557 } 2137 }
1558 2138
1559 Coro::cede; 2139 $f->resolve_delayed_derefs;
2140
2141 cf::cede_to_tick;
1560 # now do the right thing for maps 2142 # now do the right thing for maps
1561 $self->link_multipart_objects; 2143 $self->link_multipart_objects;
1562 $self->difficulty ($self->estimate_difficulty) 2144 $self->difficulty ($self->estimate_difficulty)
1563 unless $self->difficulty; 2145 unless $self->difficulty;
1564 Coro::cede; 2146 cf::cede_to_tick;
1565 2147
1566 unless ($self->{deny_activate}) { 2148 unless ($self->{deny_activate}) {
1567 $self->decay_objects; 2149 $self->decay_objects;
1568 $self->fix_auto_apply; 2150 $self->fix_auto_apply;
1569 $self->update_buttons; 2151 $self->update_buttons;
1570 Coro::cede; 2152 cf::cede_to_tick;
1571 $self->set_darkness_map;
1572 Coro::cede;
1573 $self->activate; 2153 $self->activate;
1574 } 2154 }
1575 2155
2156 $self->{last_save} = $cf::RUNTIME;
2157 $self->last_access ($cf::RUNTIME);
2158
1576 $self->in_memory (cf::MAP_IN_MEMORY); 2159 $self->in_memory (cf::MAP_ACTIVE);
1577 } 2160 }
1578 2161
1579 $self->post_load; 2162 $self->post_load;
1580} 2163}
1581 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
1582sub customise_for { 2168sub customise_for {
1583 my ($self, $ob) = @_; 2169 my ($self, $ob) = @_;
1584 2170
1585 return find "~" . $ob->name . "/" . $self->{path} 2171 return find "~" . $ob->name . "/" . $self->{path}
1586 if $self->per_player; 2172 if $self->per_player;
1587 2173
2174# return find "?party/" . $ob->name . "/" . $self->{path}
2175# if $self->per_party;
2176
1588 $self 2177 $self
1589} 2178}
1590 2179
1591# 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
1592sub load_diag { 2181sub load_neighbours {
1593 my ($map) = @_; 2182 my ($map) = @_;
1594 2183
1595 my @diag; # diagonal neighbours 2184 my @neigh; # diagonal neighbours
1596 2185
1597 for (0 .. 3) { 2186 for (0 .. 3) {
1598 my $neigh = $map->tile_path ($_) 2187 my $neigh = $map->tile_path ($_)
1599 or next; 2188 or next;
1600 $neigh = find $neigh, $map 2189 $neigh = find $neigh, $map
1601 or next; 2190 or next;
1602 $neigh->load; 2191 $neigh->load;
1603 2192
2193 # now find the diagonal neighbours
2194 push @neigh,
1604 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2195 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1605 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2196 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1606 } 2197 }
1607 2198
1608 for (@diag) { 2199 for (grep defined $_->[0], @neigh) {
2200 my ($path, $origin) = @$_;
1609 my $neigh = find @$_ 2201 my $neigh = find $path, $origin
1610 or next; 2202 or next;
1611 $neigh->load; 2203 $neigh->load;
1612 } 2204 }
1613} 2205}
1614 2206
1615sub find_sync { 2207sub find_sync {
1616 my ($path, $origin) = @_; 2208 my ($path, $origin) = @_;
1617 2209
1618 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
1619} 2214}
1620 2215
1621sub do_load_sync { 2216sub do_load_sync {
1622 my ($map) = @_; 2217 my ($map) = @_;
1623 2218
1624 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;
1625} 2223}
1626 2224
1627our %MAP_PREFETCH; 2225our %MAP_PREFETCH;
1628our $MAP_PREFETCHER = undef; 2226our $MAP_PREFETCHER = undef;
1629 2227
1630sub find_async { 2228sub find_async {
1631 my ($path, $origin) = @_; 2229 my ($path, $origin, $load) = @_;
1632 2230
1633 $path = normalise $path, $origin && $origin->{path}; 2231 $path = normalise $path, $origin && $origin->{path};
1634 2232
1635 if (my $map = $cf::MAP{$path}) { 2233 if (my $map = $cf::MAP{$path}) {
1636 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2234 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1637 } 2235 }
1638 2236
1639 undef $MAP_PREFETCH{$path}; 2237 $MAP_PREFETCH{$path} |= $load;
2238
1640 $MAP_PREFETCHER ||= cf::async { 2239 $MAP_PREFETCHER ||= cf::async {
2240 $Coro::current->{desc} = "map prefetcher";
2241
1641 while (%MAP_PREFETCH) { 2242 while (%MAP_PREFETCH) {
1642 for my $path (keys %MAP_PREFETCH) { 2243 while (my ($k, $v) = each %MAP_PREFETCH) {
1643 my $map = find $path 2244 if (my $map = find $k) {
1644 or next;
1645 $map->load; 2245 $map->load if $v;
2246 }
1646 2247
1647 delete $MAP_PREFETCH{$path}; 2248 delete $MAP_PREFETCH{$k};
1648 } 2249 }
1649 } 2250 }
1650 undef $MAP_PREFETCHER; 2251 undef $MAP_PREFETCHER;
1651 }; 2252 };
1652 $MAP_PREFETCHER->prio (6); 2253 $MAP_PREFETCHER->prio (6);
1653 2254
1654 () 2255 ()
1655} 2256}
1656 2257
2258# common code, used by both ->save and ->swapout
1657sub save { 2259sub _save {
1658 my ($self) = @_; 2260 my ($self) = @_;
1659
1660 my $lock = cf::lock_acquire "map_data:" . $self->path;
1661 2261
1662 $self->{last_save} = $cf::RUNTIME; 2262 $self->{last_save} = $cf::RUNTIME;
1663 2263
1664 return unless $self->dirty; 2264 return unless $self->dirty;
1665 2265
1671 return if $self->{deny_save}; 2271 return if $self->{deny_save};
1672 2272
1673 local $self->{last_access} = $self->last_access;#d# 2273 local $self->{last_access} = $self->last_access;#d#
1674 2274
1675 cf::async { 2275 cf::async {
2276 $Coro::current->{desc} = "map player save";
1676 $_->contr->save for $self->players; 2277 $_->contr->save for $self->players;
1677 }; 2278 };
2279
2280 cf::get_slot 0.02;
1678 2281
1679 if ($uniq) { 2282 if ($uniq) {
1680 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2283 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1681 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2284 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1682 } else { 2285 } else {
1683 $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);
1684 } 2287 }
1685} 2288}
1686 2289
2290sub save {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 $self->_save;
2296}
2297
1687sub swap_out { 2298sub swap_out {
1688 my ($self) = @_; 2299 my ($self) = @_;
1689 2300
1690 # save first because save cedes
1691 $self->save;
1692
1693 my $lock = cf::lock_acquire "map_data:" . $self->path; 2301 my $lock = cf::lock_acquire "map_data:$self->{path}";
1694 2302
2303 return if $self->in_memory != cf::MAP_ACTIVE;
2304 return if $self->{deny_save};
1695 return if $self->players; 2305 return if $self->players;
1696 return if $self->in_memory != cf::MAP_IN_MEMORY;
1697 return if $self->{deny_save};
1698 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
1699 $self->clear; 2316 $self->clear;
1700 $self->in_memory (cf::MAP_SWAPPED);
1701} 2317}
1702 2318
1703sub reset_at { 2319sub reset_at {
1704 my ($self) = @_; 2320 my ($self) = @_;
1705 2321
1706 # TODO: safety, remove and allow resettable per-player maps 2322 # TODO: safety, remove and allow resettable per-player maps
1707 return 1e99 if $self->isa ("ext::map_per_player");#d#
1708 return 1e99 if $self->{deny_reset}; 2323 return 1e99 if $self->{deny_reset};
1709 2324
1710 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2325 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1711 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;
1712 2327
1723 my ($self) = @_; 2338 my ($self) = @_;
1724 2339
1725 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2340 my $lock = cf::lock_acquire "map_data:$self->{path}";
1726 2341
1727 return if $self->players; 2342 return if $self->players;
1728 return if $self->isa ("ext::map_per_player");#d#
1729 2343
1730 warn "resetting map ", $self->path;#d# 2344 cf::trace "resetting map ", $self->path, "\n";
1731 2345
1732 $self->in_memory (cf::MAP_SWAPPED); 2346 $self->in_memory (cf::MAP_SWAPPED);
1733 2347
1734 # need to save uniques path 2348 # need to save uniques path
1735 unless ($self->{deny_save}) { 2349 unless ($self->{deny_save}) {
1739 if $uniq; 2353 if $uniq;
1740 } 2354 }
1741 2355
1742 delete $cf::MAP{$self->path}; 2356 delete $cf::MAP{$self->path};
1743 2357
2358 $self->deactivate;
2359 $_->clear_links_to ($self) for values %cf::MAP;
1744 $self->clear; 2360 $self->clear;
1745
1746 $_->clear_links_to ($self) for values %cf::MAP;
1747 2361
1748 $self->unlink_save; 2362 $self->unlink_save;
1749 $self->destroy; 2363 $self->destroy;
1750} 2364}
1751 2365
1752my $nuke_counter = "aaaa"; 2366my $nuke_counter = "aaaa";
1753 2367
1754sub nuke { 2368sub nuke {
1755 my ($self) = @_; 2369 my ($self) = @_;
1756 2370
2371 {
2372 my $lock = cf::lock_acquire "map_data:$self->{path}";
2373
1757 delete $cf::MAP{$self->path}; 2374 delete $cf::MAP{$self->path};
1758 2375
1759 $self->unlink_save; 2376 $self->unlink_save;
1760 2377
1761 bless $self, "cf::map"; 2378 bless $self, "cf::map::wrap";
1762 delete $self->{deny_reset}; 2379 delete $self->{deny_reset};
1763 $self->{deny_save} = 1; 2380 $self->{deny_save} = 1;
1764 $self->reset_timeout (1); 2381 $self->reset_timeout (1);
1765 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2382 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1766 2383
1767 $cf::MAP{$self->path} = $self; 2384 $cf::MAP{$self->path} = $self;
2385 }
1768 2386
1769 $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 ]
1770} 2424}
1771 2425
1772=item cf::map::unique_maps 2426=item cf::map::unique_maps
1773 2427
1774Returns an arrayref of paths of all shared maps that have 2428Returns an arrayref of paths of all shared maps that have
1775instantiated unique items. May block. 2429instantiated unique items. May block.
1776 2430
1777=cut 2431=cut
1778 2432
1779sub unique_maps() { 2433sub unique_maps() {
1780 my $files = aio_readdir $UNIQUEDIR 2434 [
1781 or return; 2435 map {
1782
1783 my @paths;
1784
1785 for (@$files) {
1786 utf8::decode $_; 2436 utf8::decode $_;
1787 next if /\.pst$/; 2437 s/\.map$//; # TODO future compatibility hack
1788 next unless /^$PATH_SEP/o; 2438 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1789 2439 ? ()
1790 push @paths, cf::map::normalise $_; 2440 : normalise $_
2441 } @{ aio_readdir $UNIQUEDIR or [] }
1791 } 2442 ]
1792
1793 \@paths
1794} 2443}
1795 2444
1796package 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}
1797 2476
1798=back 2477=back
1799 2478
1800=head3 cf::object 2479=head3 cf::object
1801 2480
1805 2484
1806=over 4 2485=over 4
1807 2486
1808=item $ob->inv_recursive 2487=item $ob->inv_recursive
1809 2488
1810Returns 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.
1811 2491
1812=cut 2492=cut
1813 2493
1814sub inv_recursive_; 2494sub inv_recursive_;
1815sub inv_recursive_ { 2495sub inv_recursive_ {
1818 2498
1819sub inv_recursive { 2499sub inv_recursive {
1820 inv_recursive_ inv $_[0] 2500 inv_recursive_ inv $_[0]
1821} 2501}
1822 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
1823package cf; 2531package cf;
1824 2532
1825=back 2533=back
1826 2534
1827=head3 cf::object::player 2535=head3 cf::object::player
1833Sends 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>
1834can 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
1835dialogue with the given NPC character. 2543dialogue with the given NPC character.
1836 2544
1837=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};
1838 2560
1839# rough implementation of a future "reply" method that works 2561# rough implementation of a future "reply" method that works
1840# with dialog boxes. 2562# with dialog boxes.
1841#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
1842sub cf::object::player::reply($$$;$) { 2564sub cf::object::player::reply($$$;$) {
1844 2566
1845 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2567 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1846 2568
1847 if ($self->{record_replies}) { 2569 if ($self->{record_replies}) {
1848 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2570 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2571
1849 } 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 {
1850 $msg = $npc->name . " says: $msg" if $npc; 2580 $msg = $npc->name . " says: $msg" if $npc;
1851 $self->message ($msg, $flags); 2581 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2582 }
1852 } 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 (@_);
1853} 2594}
1854 2595
1855=item $player_object->may ("access") 2596=item $player_object->may ("access")
1856 2597
1857Returns wether the given player is authorized to access resource "access" 2598Returns wether the given player is authorized to access resource "access"
1870 2611
1871=item $player_object->enter_link 2612=item $player_object->enter_link
1872 2613
1873Freezes 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}>).
1874 2615
1875The 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.
1876I<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.
1877 2620
1878Will never block. 2621Will never block.
1879 2622
1880=item $player_object->leave_link ($map, $x, $y) 2623=item $player_object->leave_link ($map, $x, $y)
1881 2624
1901sub cf::object::player::enter_link { 2644sub cf::object::player::enter_link {
1902 my ($self) = @_; 2645 my ($self) = @_;
1903 2646
1904 $self->deactivate_recursive; 2647 $self->deactivate_recursive;
1905 2648
2649 ++$self->{_link_recursion};
2650
1906 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2651 return if UNIVERSAL::isa $self->map, "ext::map_link";
1907 2652
1908 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2653 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1909 if $self->map && $self->map->{path} ne "{link}"; 2654 if $self->map && $self->map->{path} ne "{link}";
1910 2655
1911 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2656 $self->enter_map ($LINK_MAP || link_map, 3, 3);
1912} 2657}
1913 2658
1914sub cf::object::player::leave_link { 2659sub cf::object::player::leave_link {
1915 my ($self, $map, $x, $y) = @_; 2660 my ($self, $map, $x, $y) = @_;
1916 2661
1933 ($x, $y) = (-1, -1) 2678 ($x, $y) = (-1, -1)
1934 unless (defined $x) && (defined $y); 2679 unless (defined $x) && (defined $y);
1935 2680
1936 # use -1 or undef as default coordinates, not 0, 0 2681 # use -1 or undef as default coordinates, not 0, 0
1937 ($x, $y) = ($map->enter_x, $map->enter_y) 2682 ($x, $y) = ($map->enter_x, $map->enter_y)
1938 if $x <=0 && $y <= 0; 2683 if $x <= 0 && $y <= 0;
1939 2684
1940 $map->load; 2685 $map->load;
1941 $map->load_diag; 2686 $map->load_neighbours;
1942 2687
1943 return unless $self->contr->active; 2688 return unless $self->contr->active;
1944 $self->activate_recursive;
1945 2689
1946 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2690 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1947 $self->enter_map ($map, $x, $y); 2691 if ($self->enter_map ($map, $x, $y)) {
1948} 2692 # entering was successful
2693 delete $self->{_link_recursion};
2694 # only activate afterwards, to support waiting in hooks
2695 $self->activate_recursive;
2696 }
1949 2697
2698}
2699
1950=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2700=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
1951 2701
1952Moves 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
1953her, loading and preparing them map, calling the provided $check callback 2703her, loading and preparing them map, calling the provided $check callback
1954that 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
1955the 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 >>.
1956 2710
1957=cut 2711=cut
1958 2712
1959our $GOTOGEN; 2713our $GOTOGEN;
1960 2714
1961sub cf::object::player::goto { 2715sub cf::object::player::goto {
1962 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 }
1963 2723
1964 # 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
1965 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2725 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1966 2726
1967 $self->enter_link; 2727 $self->enter_link;
1968 2728
1969 (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
1970 my $map = eval { 2751 my $map = eval {
1971 my $map = cf::map::find $path; 2752 my $map = defined $path ? cf::map::find $path : undef;
1972 2753
1973 if ($map) { 2754 if ($map) {
1974 $map = $map->customise_for ($self); 2755 $map = $map->customise_for ($self);
1975 $map = $check->($map) if $check && $map; 2756 $map = $check->($map, $x, $y, $self) if $check && $map;
1976 } else { 2757 } else {
1977 $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);
1978 } 2759 }
1979 2760
1980 $map 2761 $map
1981 }; 2762 };
1982 2763
1987 2768
1988 if ($gen == $self->{_goto_generation}) { 2769 if ($gen == $self->{_goto_generation}) {
1989 delete $self->{_goto_generation}; 2770 delete $self->{_goto_generation};
1990 $self->leave_link ($map, $x, $y); 2771 $self->leave_link ($map, $x, $y);
1991 } 2772 }
2773
2774 $done->($self) if $done;
1992 })->prio (1); 2775 })->prio (1);
1993} 2776}
1994 2777
1995=item $player_object->enter_exit ($exit_object) 2778=item $player_object->enter_exit ($exit_object)
1996 2779
2016} 2799}
2017 2800
2018sub prepare_random_map { 2801sub prepare_random_map {
2019 my ($exit) = @_; 2802 my ($exit) = @_;
2020 2803
2021 my $guard = cf::lock_acquire "exit_prepare:$exit";
2022
2023 # all this does is basically replace the /! path by 2804 # all this does is basically replace the /! path by
2024 # a new random map path (?random/...) with a seed 2805 # a new random map path (?random/...) with a seed
2025 # that depends on the exit object 2806 # that depends on the exit object
2026 2807
2027 my $rmp = parse_random_map_params $exit->msg; 2808 my $rmp = parse_random_map_params $exit->msg;
2029 if ($exit->map) { 2810 if ($exit->map) {
2030 $rmp->{region} = $exit->region->name; 2811 $rmp->{region} = $exit->region->name;
2031 $rmp->{origin_map} = $exit->map->path; 2812 $rmp->{origin_map} = $exit->map->path;
2032 $rmp->{origin_x} = $exit->x; 2813 $rmp->{origin_x} = $exit->x;
2033 $rmp->{origin_y} = $exit->y; 2814 $rmp->{origin_y} = $exit->y;
2815
2816 $exit->map->touch;
2034 } 2817 }
2035 2818
2036 $rmp->{random_seed} ||= $exit->random_seed; 2819 $rmp->{random_seed} ||= $exit->random_seed;
2037 2820
2038 my $data = cf::to_json $rmp; 2821 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2039 my $md5 = Digest::MD5::md5_hex $data; 2822 my $md5 = Digest::MD5::md5_hex $data;
2040 my $meta = "$RANDOMDIR/$md5.meta"; 2823 my $meta = "$RANDOMDIR/$md5.meta";
2041 2824
2042 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2825 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2043 aio_write $fh, 0, (length $data), $data, 0; 2826 aio_write $fh, 0, (length $data), $data, 0;
2044 undef $fh; 2827 undef $fh;
2045 aio_rename "$meta~", $meta; 2828 aio_rename "$meta~", $meta;
2046 2829
2830 my $slaying = "?random/$md5";
2831
2832 if ($exit->valid) {
2047 $exit->slaying ("?random/$md5"); 2833 $exit->slaying ("?random/$md5");
2048 $exit->msg (undef); 2834 $exit->msg (undef);
2835 }
2049 } 2836 }
2050} 2837}
2051 2838
2052sub cf::object::player::enter_exit { 2839sub cf::object::player::enter_exit {
2053 my ($self, $exit) = @_; 2840 my ($self, $exit) = @_;
2054 2841
2055 return unless $self->type == cf::PLAYER; 2842 return unless $self->type == cf::PLAYER;
2056 2843
2057 if ($exit->slaying eq "/!") {
2058 #TODO: this should de-fi-ni-te-ly not be a sync-job
2059 # the problem is that $exit might not survive long enough
2060 # so it needs to be done right now, right here
2061 cf::sync_job { prepare_random_map $exit };
2062 }
2063
2064 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2065 my $hp = $exit->stats->hp;
2066 my $sp = $exit->stats->sp;
2067
2068 $self->enter_link; 2844 $self->enter_link;
2069 2845
2070 (async { 2846 (async {
2071 $self->deactivate_recursive; # just to be sure 2847 $Coro::current->{desc} = "enter_exit";
2848
2072 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
2073 $self->goto ($slaying, $hp, $sp); 2864 $self->goto ($map, $x, $y);
2074 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
2075 1; 2870 1
2076 }) { 2871 }) {
2077 $self->message ("Something went wrong deep within the crossfire server. " 2872 $self->message ("Something went wrong deep within the deliantra server. "
2078 . "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. "
2079 . "Please report this to the dungeon master!", 2874 . "Please report this to the dungeon master!",
2080 cf::NDI_UNIQUE | cf::NDI_RED); 2875 cf::NDI_UNIQUE | cf::NDI_RED);
2081 2876
2082 warn "ERROR in enter_exit: $@"; 2877 error "ERROR in enter_exit: $@";
2083 $self->leave_link; 2878 $self->leave_link;
2084 } 2879 }
2085 })->prio (1); 2880 })->prio (1);
2086} 2881}
2087 2882
2101 2896
2102 utf8::encode $text; 2897 utf8::encode $text;
2103 $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);
2104} 2899}
2105 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
2106=item $client->ext_event ($type, %msg) 3088=item $client->ext_msg ($type, @msg)
2107 3089
2108Sends an exti event to the client. 3090Sends an ext event to the client.
2109 3091
2110=cut 3092=cut
2111 3093
2112sub cf::client::ext_event($$%) { 3094sub cf::client::ext_msg($$@) {
2113 my ($self, $type, %msg) = @_; 3095 my ($self, $type, @msg) = @_;
2114 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
2115 $msg{msgtype} = "event_$type"; 3100 push @msg, msgtype => "event_$type";
2116 $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 }
2117} 3121}
2118 3122
2119=item $success = $client->query ($flags, "text", \&cb) 3123=item $success = $client->query ($flags, "text", \&cb)
2120 3124
2121Queues a query to the client, calling the given callback with 3125Queues a query to the client, calling the given callback with
2122the 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>,
2123C<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>.
2124 3128
2125Queries 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
2126reliable at some point in the future. 3130become reliable at some point in the future.
2127 3131
2128=cut 3132=cut
2129 3133
2130sub cf::client::query { 3134sub cf::client::query {
2131 my ($self, $flags, $text, $cb) = @_; 3135 my ($self, $flags, $text, $cb) = @_;
2139 utf8::encode $text; 3143 utf8::encode $text;
2140 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 3144 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2141 3145
2142 $self->send_packet ($self->{query_queue}[0][0]) 3146 $self->send_packet ($self->{query_queue}[0][0])
2143 if @{ $self->{query_queue} } == 1; 3147 if @{ $self->{query_queue} } == 1;
3148
3149 1
2144} 3150}
2145 3151
2146cf::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 },
2147 on_reply => sub { 3158 on_reply => sub {
2148 my ($ns, $msg) = @_; 3159 my ($ns, $msg) = @_;
2149 3160
2150 # this weird shuffling is so that direct followup queries 3161 # this weird shuffling is so that direct followup queries
2151 # get handled first 3162 # get handled first
2163 } else { 3174 } else {
2164 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3175 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2165 } 3176 }
2166 } 3177 }
2167 }, 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 },
2168); 3205);
2169 3206
2170=item $client->async (\&cb) 3207=item $client->async (\&cb)
2171 3208
2172Create a new coroutine, running the specified callback. The coroutine will 3209Create a new coroutine, running the specified callback. The coroutine will
2188 3225
2189 $coro 3226 $coro
2190} 3227}
2191 3228
2192cf::client->attach ( 3229cf::client->attach (
2193 on_destroy => sub { 3230 on_client_destroy => sub {
2194 my ($ns) = @_; 3231 my ($ns) = @_;
2195 3232
2196 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3233 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2197 }, 3234 },
2198); 3235);
2213our $safe = new Safe "safe"; 3250our $safe = new Safe "safe";
2214our $safe_hole = new Safe::Hole; 3251our $safe_hole = new Safe::Hole;
2215 3252
2216$SIG{FPE} = 'IGNORE'; 3253$SIG{FPE} = 'IGNORE';
2217 3254
2218$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));
2219 3260
2220# here we export the classes and methods available to script code 3261# here we export the classes and methods available to script code
2221 3262
2222=pod 3263=pod
2223 3264
2224The following functions and methods are available within a safe environment: 3265The following functions and methods are available within a safe environment:
2225 3266
2226 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
2227 cf::object::player player 3272 cf::object::player
2228 cf::player peaceful 3273 player
2229 cf::map trigger 3274
3275 cf::player
3276 peaceful
3277
3278 cf::map
3279 trigger
2230 3280
2231=cut 3281=cut
2232 3282
2233for ( 3283for (
2234 ["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)],
2235 ["cf::object::player" => qw(player)], 3287 ["cf::object::player" => qw(player)],
2236 ["cf::player" => qw(peaceful)], 3288 ["cf::player" => qw(peaceful send_msg)],
2237 ["cf::map" => qw(trigger)], 3289 ["cf::map" => qw(trigger)],
2238) { 3290) {
2239 no strict 'refs';
2240 my ($pkg, @funs) = @$_; 3291 my ($pkg, @funs) = @$_;
2241 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3292 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2242 for @funs; 3293 for @funs;
2243} 3294}
2244 3295
2259 3310
2260 my $qcode = $code; 3311 my $qcode = $code;
2261 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3312 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2262 $qcode =~ s/\n/\\n/g; 3313 $qcode =~ s/\n/\\n/g;
2263 3314
3315 %vars = (_dummy => 0) unless %vars;
3316
3317 my @res;
2264 local $_; 3318 local $_;
2265 local @safe::cf::_safe_eval_args = values %vars;
2266 3319
2267 my $eval = 3320 my $eval =
2268 "do {\n" 3321 "do {\n"
2269 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3322 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2270 . "#line 0 \"{$qcode}\"\n" 3323 . "#line 0 \"{$qcode}\"\n"
2271 . $code 3324 . $code
2272 . "\n}" 3325 . "\n}"
2273 ; 3326 ;
2274 3327
3328 if ($CFG{safe_eval}) {
2275 sub_generation_inc; 3329 sub_generation_inc;
3330 local @safe::cf::_safe_eval_args = values %vars;
2276 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3331 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2277 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 }
2278 3337
2279 if ($@) { 3338 if ($@) {
2280 warn "$@"; 3339 warn "$@",
2281 warn "while executing safe code '$code'\n"; 3340 "while executing safe code '$code'\n",
2282 warn "with arguments " . (join " ", %vars) . "\n"; 3341 "with arguments " . (join " ", %vars) . "\n";
2283 } 3342 }
2284 3343
2285 wantarray ? @res : $res[0] 3344 wantarray ? @res : $res[0]
2286} 3345}
2287 3346
2301=cut 3360=cut
2302 3361
2303sub register_script_function { 3362sub register_script_function {
2304 my ($fun, $cb) = @_; 3363 my ($fun, $cb) = @_;
2305 3364
2306 no strict 'refs'; 3365 $fun = "safe::$fun" if $CFG{safe_eval};
2307 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3366 *$fun = $safe_hole->wrap ($cb);
2308} 3367}
2309 3368
2310=back 3369=back
2311 3370
2312=cut 3371=cut
2313
2314#############################################################################
2315
2316=head2 EXTENSION DATABASE SUPPORT
2317
2318Crossfire maintains a very simple database for extension use. It can
2319currently store binary data only (use Compress::LZF::sfreeze_cr/sthaw to
2320convert to/from binary).
2321
2322The parameter C<$family> should best start with the name of the extension
2323using it, it should be unique.
2324
2325=over 4
2326
2327=item $value = cf::db_get $family => $key
2328
2329Returns a single value from the database.
2330
2331=item cf::db_put $family => $key => $value
2332
2333Stores the given C<$value> in the family.
2334
2335=cut
2336
2337our $DB;
2338
2339sub db_init {
2340 unless ($DB) {
2341 $DB = BDB::db_create $DB_ENV;
2342
2343 cf::sync_job {
2344 eval {
2345 $DB->set_flags (BDB::CHKSUM);
2346
2347 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2348 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2349 cf::cleanup "db_open(db): $!" if $!;
2350 };
2351 cf::cleanup "db_open(db): $@" if $@;
2352 };
2353 }
2354}
2355
2356sub db_get($$) {
2357 my $key = "$_[0]/$_[1]";
2358
2359 cf::sync_job {
2360 BDB::db_get $DB, undef, $key, my $data;
2361
2362 $! ? ()
2363 : $data
2364 }
2365}
2366
2367sub db_put($$$) {
2368 BDB::dbreq_pri 4;
2369 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
2370}
2371
2372=item cf::cache $id => [$paths...], $processversion => $process
2373
2374Generic caching function that returns the value of the resource $id,
2375caching and regenerating as required.
2376
2377This function can block.
2378
2379=cut
2380
2381sub cache {
2382 my ($id, $src, $processversion, $process) = @_;
2383
2384 my $meta =
2385 join "\x00",
2386 $processversion,
2387 map {
2388 aio_stat $_
2389 and Carp::croak "$_: $!";
2390
2391 ($_, (stat _)[7,9])
2392 } @$src;
2393
2394 my $dbmeta = db_get cache => "$id/meta";
2395 if ($dbmeta ne $meta) {
2396 # changed, we may need to process
2397
2398 my @data;
2399 my $md5;
2400
2401 for (0 .. $#$src) {
2402 0 <= aio_load $src->[$_], $data[$_]
2403 or Carp::croak "$src->[$_]: $!";
2404 }
2405
2406 # if processing is expensive, check
2407 # checksum first
2408 if (1) {
2409 $md5 =
2410 join "\x00",
2411 $processversion,
2412 map {
2413 Coro::cede;
2414 ($src->[$_], Digest::MD5::md5_hex $data[$_])
2415 } 0.. $#$src;
2416
2417
2418 my $dbmd5 = db_get cache => "$id/md5";
2419 if ($dbmd5 eq $md5) {
2420 db_put cache => "$id/meta", $meta;
2421
2422 return db_get cache => "$id/data";
2423 }
2424 }
2425
2426 my $t1 = Time::HiRes::time;
2427 my $data = $process->(\@data);
2428 my $t2 = Time::HiRes::time;
2429
2430 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
2431
2432 db_put cache => "$id/data", $data;
2433 db_put cache => "$id/md5" , $md5;
2434 db_put cache => "$id/meta", $meta;
2435
2436 return $data;
2437 }
2438
2439 db_get cache => "$id/data"
2440}
2441
2442=item fork_call { }, $args
2443
2444Executes the given code block with the given arguments in a seperate
2445process, returning the results. Everything must be serialisable with
2446Coro::Storable. May, of course, block. Note that the executed sub may
2447never block itself or use any form of Event handling.
2448
2449=cut
2450
2451sub fork_call(&@) {
2452 my ($cb, @args) = @_;
2453
2454# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
2455# or die "socketpair: $!";
2456 pipe my $fh1, my $fh2
2457 or die "pipe: $!";
2458
2459 if (my $pid = fork) {
2460 close $fh2;
2461
2462 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
2463 $res = Coro::Storable::thaw $res;
2464
2465 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
2466
2467 die $$res unless "ARRAY" eq ref $res;
2468
2469 return wantarray ? @$res : $res->[-1];
2470 } else {
2471 reset_signals;
2472 local $SIG{__WARN__};
2473 local $SIG{__DIE__};
2474 eval {
2475 close $fh1;
2476
2477 my @res = eval { $cb->(@args) };
2478 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res);
2479 };
2480
2481 warn $@ if $@;
2482 _exit 0;
2483 }
2484}
2485
2486
2487 3372
2488############################################################################# 3373#############################################################################
2489# the server's init and main functions 3374# the server's init and main functions
2490 3375
2491sub load_facedata($) { 3376sub load_facedata($) {
2492 my ($path) = @_; 3377 my ($path) = @_;
2493 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
2494 warn "loading facedata from $path\n"; 3385 trace "loading facedata from $path\n";
2495 3386
2496 my $facedata;
2497 0 < aio_load $path, $facedata 3387 0 < aio_load $path, my $facedata
2498 or die "$path: $!"; 3388 or die "$path: $!";
2499 3389
2500 $facedata = Coro::Storable::thaw $facedata; 3390 $facedata = Coro::Storable::thaw $facedata;
2501 3391
2502 $facedata->{version} == 2 3392 $facedata->{version} == 2
2503 or cf::cleanup "$path: version mismatch, cannot proceed."; 3393 or cf::cleanup "$path: version mismatch, cannot proceed.";
2504 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
2505 { 3404 {
2506 my $faces = $facedata->{faceinfo}; 3405 my $faces = $facedata->{faceinfo};
2507 3406
2508 while (my ($face, $info) = each %$faces) { 3407 while (my ($face, $info) = each %$faces) {
2509 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3408 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409
2510 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3410 cf::face::set_visibility $idx, $info->{visibility};
3411 cf::face::set_magicmap $idx, $info->{magicmap};
2511 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3412 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2512 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3413 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2513 Coro::cede; 3414
3415 cf::cede_to_tick;
2514 } 3416 }
2515 3417
2516 while (my ($face, $info) = each %$faces) { 3418 while (my ($face, $info) = each %$faces) {
2517 next unless $info->{smooth}; 3419 next unless $info->{smooth};
3420
2518 my $idx = cf::face::find $face 3421 my $idx = cf::face::find $face
2519 or next; 3422 or next;
3423
2520 if (my $smooth = cf::face::find $info->{smooth}) { 3424 if (my $smooth = cf::face::find $info->{smooth}) {
3425 cf::face::set_smooth $idx, $smooth;
2521 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3426 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2522 } else { 3427 } else {
2523 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3428 error "smooth face '$info->{smooth}' not found for face '$face'";
2524 } 3429 }
2525 Coro::cede; 3430
3431 cf::cede_to_tick;
2526 } 3432 }
2527 } 3433 }
2528 3434
2529 { 3435 {
2530 my $anims = $facedata->{animinfo}; 3436 my $anims = $facedata->{animinfo};
2531 3437
2532 while (my ($anim, $info) = each %$anims) { 3438 while (my ($anim, $info) = each %$anims) {
2533 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3439 cf::anim::set $anim, $info->{frames}, $info->{facings};
2534 Coro::cede; 3440 cf::cede_to_tick;
2535 } 3441 }
2536 3442
2537 cf::anim::invalidate_all; # d'oh 3443 cf::anim::invalidate_all; # d'oh
2538 } 3444 }
2539 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
2540 1 3465 1
2541} 3466}
2542 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
2543sub 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
2544 load_resource_file "$MAPDIR/regions" 3491 load_resource_file "$MAPDIR/regions"
2545 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 }
2546} 3498}
2547 3499
2548sub reload_facedata { 3500sub reload_facedata {
2549 load_facedata "$DATADIR/facedata" 3501 load_facedata "$DATADIR/facedata"
2550 or die "unable to load facedata\n"; 3502 or die "unable to load facedata\n";
2558sub reload_treasures { 3510sub reload_treasures {
2559 load_resource_file "$DATADIR/treasures" 3511 load_resource_file "$DATADIR/treasures"
2560 or die "unable to load treasurelists\n"; 3512 or die "unable to load treasurelists\n";
2561} 3513}
2562 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
2563sub reload_resources { 3538sub reload_resources {
2564 warn "reloading resource files...\n"; 3539 trace "reloading resource files...\n";
2565 3540
3541 reload_exp_table;
3542 reload_materials;
3543 reload_facedata;
3544 reload_sound;
3545 reload_archetypes;
2566 reload_regions; 3546 reload_regions;
2567 reload_facedata;
2568 reload_archetypes;
2569 reload_treasures; 3547 reload_treasures;
2570 3548
2571 warn "finished reloading resource files\n"; 3549 trace "finished reloading resource files\n";
2572} 3550}
2573 3551
2574sub init { 3552sub reload_config {
2575 reload_resources; 3553 trace "reloading config file...\n";
2576}
2577 3554
2578sub cfg_load { 3555 0 < aio_load "$CONFDIR/config", my $config
2579 open my $fh, "<:utf8", "$CONFDIR/config" 3556 or die "$CONFDIR/config: $!";
2580 or return;
2581 3557
2582 local $/; 3558 utf8::decode $config;
3559
3560 cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
2583 *CFG = YAML::Syck::Load <$fh>; 3561 *CFG = YAML::XS::Load $config;
2584 3562
2585 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3563 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2586 3564
2587 $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};
2588 $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};
2589 3567
2590 if (exists $CFG{mlockall}) { 3568 if (exists $CFG{mlockall}) {
2594 }; 3572 };
2595 warn $@ if $@; 3573 warn $@ if $@;
2596 } 3574 }
2597} 3575}
2598 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
2599sub 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
2600 # we must not ever block the main coroutine 3615 # we must not ever block the main coroutine
2601 local $Coro::idle = sub { 3616 local $Coro::idle = sub {
2602 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#
2603 (async { 3618 (async {
2604 Event::one_event; 3619 $Coro::current->{desc} = "IDLE BUG HANDLER";
3620 EV::loop EV::LOOP_ONESHOT;
2605 })->prio (Coro::PRIO_MAX); 3621 })->prio (Coro::PRIO_MAX);
2606 }; 3622 };
2607 3623
2608 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;
2609 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
2610 load_extensions; 3647 load_extensions;
2611 3648
2612 $TICK_WATCHER->start; 3649 utime time, time, $RUNTIMEFILE;
2613 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;
2614} 3667}
2615 3668
2616############################################################################# 3669#############################################################################
2617# initialisation and cleanup 3670# initialisation and cleanup
2618 3671
2619# install some emergency cleanup handlers 3672# install some emergency cleanup handlers
2620BEGIN { 3673BEGIN {
3674 our %SIGWATCHER = ();
2621 for my $signal (qw(INT HUP TERM)) { 3675 for my $signal (qw(INT HUP TERM)) {
2622 Event->signal ( 3676 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2623 reentrant => 0,
2624 data => WF_AUTOCANCEL,
2625 signal => $signal,
2626 prio => 0,
2627 cb => sub {
2628 cf::cleanup "SIG$signal"; 3677 cf::cleanup "SIG$signal";
2629 },
2630 ); 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
2631 } 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 };
2632} 3768}
2633 3769
2634sub emergency_save() { 3770sub emergency_save() {
2635 my $freeze_guard = cf::freeze_mainloop; 3771 my $freeze_guard = cf::freeze_mainloop;
2636 3772
2637 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;
2638 3779
2639 cf::sync_job { 3780 cf::sync_job {
3781 cf::write_runtime_sync; # external watchdog should not bark
3782
2640 # use a peculiar iteration method to avoid tripping on perl 3783 # use a peculiar iteration method to avoid tripping on perl
2641 # refcount bugs in for. also avoids problems with players 3784 # refcount bugs in for. also avoids problems with players
2642 # and maps saved/destroyed asynchronously. 3785 # and maps saved/destroyed asynchronously.
2643 warn "begin emergency player save\n"; 3786 info "emergency_perl_save: begin player save\n";
2644 for my $login (keys %cf::PLAYER) { 3787 for my $login (keys %cf::PLAYER) {
2645 my $pl = $cf::PLAYER{$login} or next; 3788 my $pl = $cf::PLAYER{$login} or next;
2646 $pl->valid or next; 3789 $pl->valid or next;
3790 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2647 $pl->save; 3791 $pl->save;
2648 } 3792 }
2649 warn "end emergency player save\n"; 3793 info "emergency_perl_save: end player save\n";
2650 3794
2651 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";
2652 for my $path (keys %cf::MAP) { 3798 for my $path (keys %cf::MAP) {
2653 my $map = $cf::MAP{$path} or next; 3799 my $map = $cf::MAP{$path} or next;
2654 $map->valid or next; 3800 $map->valid or next;
2655 $map->save; 3801 $map->save;
2656 } 3802 }
2657 warn "end emergency map save\n"; 3803 info "emergency_perl_save: end map save\n";
2658 3804
2659 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";
2660 BDB::db_env_txn_checkpoint $DB_ENV; 3808 BDB::db_env_txn_checkpoint $DB_ENV;
2661 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
2662 }; 3833 };
2663 3834
2664 warn "leave emergency perl save\n"; 3835 info "emergency_perl_save: leave\n";
2665} 3836}
2666 3837
2667sub post_cleanup { 3838sub post_cleanup {
2668 my ($make_core) = @_; 3839 my ($make_core) = @_;
2669 3840
3841 IO::AIO::flush;
3842
2670 warn Carp::longmess "post_cleanup backtrace" 3843 error Carp::longmess "post_cleanup backtrace"
2671 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 }
2672} 3873}
2673 3874
2674sub do_reload_perl() { 3875sub do_reload_perl() {
2675 # can/must only be called in main 3876 # can/must only be called in main
2676 if ($Coro::current != $Coro::main) { 3877 unless (in_main) {
2677 warn "can only reload from main coroutine"; 3878 error "can only reload from main coroutine";
2678 return; 3879 return;
2679 } 3880 }
2680 3881
3882 return if $RELOAD++;
3883
3884 my $t1 = AE::time;
3885
3886 while ($RELOAD) {
3887 cf::get_slot 0.1, -1, "reload_perl";
2681 warn "reloading..."; 3888 info "reloading...";
2682 3889
2683 warn "entering sync_job"; 3890 trace "entering sync_job";
2684 3891
2685 cf::sync_job { 3892 cf::sync_job {
2686 cf::write_runtime; # external watchdog should not bark
2687 cf::emergency_save; 3893 #cf::emergency_save;
2688 cf::write_runtime; # external watchdog should not bark
2689 3894
2690 warn "syncing database to disk";
2691 BDB::db_env_txn_checkpoint $DB_ENV;
2692
2693 # if anything goes wrong in here, we should simply crash as we already saved
2694
2695 warn "cancelling all WF_AUTOCANCEL watchers";
2696 for (Event::all_watchers) {
2697 $_->cancel if $_->data & WF_AUTOCANCEL;
2698 }
2699
2700 warn "flushing outstanding aio requests";
2701 for (;;) {
2702 BDB::flush;
2703 IO::AIO::flush;
2704 Coro::cede;
2705 last unless IO::AIO::nreqs || BDB::nreqs;
2706 warn "iterate...";
2707 }
2708
2709 ++$RELOAD;
2710
2711 warn "cancelling all extension coros"; 3895 trace "cancelling all extension coros";
2712 $_->cancel for values %EXT_CORO; 3896 $_->cancel for values %EXT_CORO;
2713 %EXT_CORO = (); 3897 %EXT_CORO = ();
2714 3898
2715 warn "removing commands"; 3899 trace "removing commands";
2716 %COMMAND = (); 3900 %COMMAND = ();
2717 3901
2718 warn "removing ext commands"; 3902 trace "removing ext/exti commands";
2719 %EXTCMD = (); 3903 %EXTCMD = ();
3904 %EXTICMD = ();
2720 3905
2721 warn "unloading/nuking all extensions"; 3906 trace "unloading/nuking all extensions";
2722 for my $pkg (@EXTS) { 3907 for my $pkg (@EXTS) {
2723 warn "... unloading $pkg"; 3908 trace "... unloading $pkg";
2724 3909
2725 if (my $cb = $pkg->can ("unload")) { 3910 if (my $cb = $pkg->can ("unload")) {
2726 eval { 3911 eval {
2727 $cb->($pkg); 3912 $cb->($pkg);
2728 1 3913 1
2729 } 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;
2730 } 3919 }
2731 3920
2732 warn "... nuking $pkg";
2733 Symbol::delete_package $pkg;
2734 }
2735
2736 warn "unloading all perl modules loaded from $LIBDIR"; 3921 trace "unloading all perl modules loaded from $LIBDIR";
2737 while (my ($k, $v) = each %INC) { 3922 while (my ($k, $v) = each %INC) {
2738 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3923 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2739 3924
2740 warn "... unloading $k"; 3925 trace "... unloading $k";
2741 delete $INC{$k}; 3926 delete $INC{$k};
2742 3927
2743 $k =~ s/\.pm$//; 3928 $k =~ s/\.pm$//;
2744 $k =~ s/\//::/g; 3929 $k =~ s/\//::/g;
2745 3930
2746 if (my $cb = $k->can ("unload_module")) { 3931 if (my $cb = $k->can ("unload_module")) {
2747 $cb->(); 3932 $cb->();
3933 }
3934
3935 clear_package $k;
2748 } 3936 }
2749 3937
2750 Symbol::delete_package $k;
2751 }
2752
2753 warn "getting rid of safe::, as good as possible"; 3938 trace "getting rid of safe::, as good as possible";
2754 Symbol::delete_package "safe::$_" 3939 clear_package "safe::$_"
2755 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);
2756 3941
2757 warn "unloading cf.pm \"a bit\""; 3942 trace "unloading cf.pm \"a bit\"";
2758 delete $INC{"cf.pm"}; 3943 delete $INC{"cf.pm"};
2759 delete $INC{"cf/pod.pm"}; 3944 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2760 3945
2761 # don't, removes xs symbols, too, 3946 # don't, removes xs symbols, too,
2762 # and global variables created in xs 3947 # and global variables created in xs
2763 #Symbol::delete_package __PACKAGE__; 3948 #clear_package __PACKAGE__;
2764 3949
2765 warn "unload completed, starting to reload now"; 3950 info "unload completed, starting to reload now";
2766 3951
2767 warn "reloading cf.pm"; 3952 trace "reloading cf.pm";
2768 require cf; 3953 require cf;
2769 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3954 cf::_connect_to_perl_1;
2770 3955
2771 warn "loading config and database again"; 3956 trace "loading config and database again";
2772 cf::cfg_load; 3957 cf::reload_config;
2773 3958
2774 warn "loading extensions"; 3959 trace "loading extensions";
2775 cf::load_extensions; 3960 cf::load_extensions;
2776 3961
3962 if ($REATTACH_ON_RELOAD) {
2777 warn "reattaching attachments to objects/players"; 3963 trace "reattaching attachments to objects/players";
2778 _global_reattach; # objects, sockets 3964 _global_reattach; # objects, sockets
2779 warn "reattaching attachments to maps"; 3965 trace "reattaching attachments to maps";
2780 reattach $_ for values %MAP; 3966 reattach $_ for values %MAP;
2781 warn "reattaching attachments to players"; 3967 trace "reattaching attachments to players";
2782 reattach $_ for values %PLAYER; 3968 reattach $_ for values %PLAYER;
3969 }
2783 3970
3971 trace "running post_init jobs";
3972 (pop @POST_INIT)->(1) while @POST_INIT;
3973
2784 warn "leaving sync_job"; 3974 trace "leaving sync_job";
2785 3975
2786 1 3976 1
2787 } or do { 3977 } or do {
2788 warn $@; 3978 error $@;
2789 warn "error while reloading, exiting."; 3979 cf::cleanup "error while reloading, exiting.";
2790 exit 1; 3980 };
3981
3982 info "reloaded";
3983 --$RELOAD;
2791 }; 3984 }
2792 3985
2793 warn "reloaded"; 3986 $t1 = AE::time - $t1;
3987 info "reload completed in ${t1}s\n";
2794}; 3988};
2795 3989
2796our $RELOAD_WATCHER; # used only during reload 3990our $RELOAD_WATCHER; # used only during reload
2797 3991
2798sub reload_perl() { 3992sub reload_perl() {
2799 # doing reload synchronously and two reloads happen back-to-back, 3993 # doing reload synchronously and two reloads happen back-to-back,
2800 # coro crashes during coro_state_free->destroy here. 3994 # coro crashes during coro_state_free->destroy here.
2801 3995
2802 $RELOAD_WATCHER ||= Event->timer ( 3996 $RELOAD_WATCHER ||= cf::async {
2803 reentrant => 0, 3997 Coro::AIO::aio_wait cache_extensions;
2804 after => 0, 3998
2805 data => WF_AUTOCANCEL, 3999 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
2806 cb => sub {
2807 do_reload_perl; 4000 do_reload_perl;
2808 undef $RELOAD_WATCHER; 4001 undef $RELOAD_WATCHER;
2809 }, 4002 };
2810 ); 4003 };
2811} 4004}
2812 4005
2813register_command "reload" => sub { 4006register_command "reload" => sub {
2814 my ($who, $arg) = @_; 4007 my ($who, $arg) = @_;
2815 4008
2816 if ($who->flag (FLAG_WIZ)) { 4009 if ($who->flag (FLAG_WIZ)) {
2817 $who->message ("reloading server."); 4010 $who->message ("reloading server.");
4011 async {
4012 $Coro::current->{desc} = "perl_reload";
2818 async { reload_perl }; 4013 reload_perl;
4014 };
2819 } 4015 }
2820}; 4016};
2821 4017
2822unshift @INC, $LIBDIR; 4018#############################################################################
2823 4019
2824my $bug_warning = 0; 4020my $bug_warning = 0;
2825 4021
2826our @WAIT_FOR_TICK; 4022our @WAIT_FOR_TICK;
2827our @WAIT_FOR_TICK_BEGIN; 4023our @WAIT_FOR_TICK_BEGIN;
2828 4024
2829sub wait_for_tick { 4025sub wait_for_tick() {
2830 return unless $TICK_WATCHER->is_active;
2831 return if $Coro::current == $Coro::main; 4026 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2832 4027
2833 my $signal = new Coro::Signal; 4028 my $signal = new Coro::Signal;
2834 push @WAIT_FOR_TICK, $signal; 4029 push @WAIT_FOR_TICK, $signal;
2835 $signal->wait; 4030 $signal->wait;
2836} 4031}
2837 4032
2838sub wait_for_tick_begin { 4033sub wait_for_tick_begin() {
2839 return unless $TICK_WATCHER->is_active;
2840 return if $Coro::current == $Coro::main; 4034 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
2841 4035
2842 my $signal = new Coro::Signal; 4036 my $signal = new Coro::Signal;
2843 push @WAIT_FOR_TICK_BEGIN, $signal; 4037 push @WAIT_FOR_TICK_BEGIN, $signal;
2844 $signal->wait; 4038 $signal->wait;
2845} 4039}
2846 4040
2847 my $min = 1e6;#d# 4041sub tick {
2848 my $avg = 10;
2849$TICK_WATCHER = Event->timer (
2850 reentrant => 0,
2851 parked => 1,
2852 prio => 0,
2853 at => $NEXT_TICK || $TICK,
2854 data => WF_AUTOCANCEL,
2855 cb => sub {
2856 if ($Coro::current != $Coro::main) { 4042 if ($Coro::current != $Coro::main) {
2857 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"
2858 unless ++$bug_warning > 10; 4044 unless ++$bug_warning > 10;
2859 return; 4045 return;
2860 } 4046 }
2861 4047
2862 $NOW = $tick_start = Event::time;
2863
2864 cf::server_tick; # one server iteration 4048 cf::server_tick; # one server iteration
2865 4049
2866 0 && sync_job {#d# 4050 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
2867 for(1..10) {
2868 my $t = Event::time;
2869 my $map = my $map = new_from_path cf::map "/tmp/x.map"
2870 or die;
2871 4051
2872 $map->width (50); 4052 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2873 $map->height (50); 4053 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2874 $map->alloc; 4054 Coro::async_pool {
2875 $map->_load_objects ("/tmp/x.map", 1); 4055 $Coro::current->{desc} = "runtime saver";
2876 my $t = Event::time - $t; 4056 write_runtime_sync
2877 4057 or error "ERROR: unable to write runtime file: $!";
2878 #next unless $t < 0.0013;#d#
2879 if ($t < $min) {
2880 $min = $t;
2881 }
2882 $avg = $avg * 0.99 + $t * 0.01;
2883 }
2884 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2885 exit 0;
2886 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2887 }; 4058 };
4059 }
2888 4060
2889 $RUNTIME += $TICK;
2890 $NEXT_TICK += $TICK;
2891
2892 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2893 $NEXT_RUNTIME_WRITE = $NOW + 10;
2894 Coro::async_pool {
2895 write_runtime
2896 or warn "ERROR: unable to write runtime file: $!";
2897 };
2898 }
2899
2900# my $AFTER = Event::time;
2901# warn $AFTER - $NOW;#d#
2902
2903 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4061 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2904 $sig->send; 4062 $sig->send;
2905 } 4063 }
2906 while (my $sig = shift @WAIT_FOR_TICK) { 4064 while (my $sig = shift @WAIT_FOR_TICK) {
2907 $sig->send; 4065 $sig->send;
2908 } 4066 }
2909 4067
2910 $NOW = Event::time; 4068 $LOAD = ($NOW - $TICK_START) / $TICK;
2911
2912 # if we are delayed by four ticks or more, skip them all
2913 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2914
2915 $TICK_WATCHER->at ($NEXT_TICK);
2916 $TICK_WATCHER->start;
2917
2918 $LOAD = ($NOW - $tick_start) / $TICK;
2919 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4069 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2920 4070
2921 _post_tick; 4071 if (0) {
2922 4072 if ($NEXT_TICK) {
2923 4073 my $jitter = $TICK_START - $NEXT_TICK;
4074 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4075 debug "jitter $JITTER\n";#d#
4076 }
2924 }, 4077 }
2925); 4078}
2926 4079
2927{ 4080{
2928 BDB::max_poll_time $TICK * 0.1; 4081 # configure BDB
2929 $BDB_POLL_WATCHER = Event->io ( 4082
2930 reentrant => 0,
2931 fd => BDB::poll_fileno,
2932 poll => 'r',
2933 prio => 0,
2934 data => WF_AUTOCANCEL,
2935 cb => \&BDB::poll_cb,
2936 );
2937 BDB::min_parallel 8; 4083 BDB::min_parallel 16;
2938 4084 BDB::max_poll_reqs $TICK * 0.1;
2939 BDB::set_sync_prepare { 4085 $AnyEvent::BDB::WATCHER->priority (1);
2940 my $status;
2941 my $current = $Coro::current;
2942 (
2943 sub {
2944 $status = $!;
2945 $current->ready; undef $current;
2946 },
2947 sub {
2948 Coro::schedule while defined $current;
2949 $! = $status;
2950 },
2951 )
2952 };
2953 4086
2954 unless ($DB_ENV) { 4087 unless ($DB_ENV) {
2955 $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);
2956 4094
2957 cf::sync_job { 4095 cf::sync_job {
2958 eval { 4096 eval {
2959 BDB::db_env_open 4097 BDB::db_env_open
2960 $DB_ENV, 4098 $DB_ENV,
2962 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
2963 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4101 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2964 0666; 4102 0666;
2965 4103
2966 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4104 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2967
2968 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2969 $DB_ENV->set_lk_detect;
2970 }; 4105 };
2971 4106
2972 cf::cleanup "db_env_open(db): $@" if $@; 4107 cf::cleanup "db_env_open(db): $@" if $@;
2973 }; 4108 };
2974 } 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 };
2975} 4120}
2976 4121
2977{ 4122{
4123 # configure IO::AIO
4124
2978 IO::AIO::min_parallel 8; 4125 IO::AIO::min_parallel 8;
2979
2980 undef $Coro::AIO::WATCHER;
2981 IO::AIO::max_poll_time $TICK * 0.1; 4126 IO::AIO::max_poll_time $TICK * 0.1;
2982 $AIO_POLL_WATCHER = Event->io ( 4127 undef $AnyEvent::AIO::WATCHER;
2983 reentrant => 0,
2984 data => WF_AUTOCANCEL,
2985 fd => IO::AIO::poll_fileno,
2986 poll => 'r',
2987 prio => 6,
2988 cb => \&IO::AIO::poll_cb,
2989 );
2990} 4128}
2991 4129
2992my $_log_backtrace; 4130my $_log_backtrace;
2993 4131
2994sub _log_backtrace { 4132sub _log_backtrace {
2997 $msg =~ s/\n//; 4135 $msg =~ s/\n//;
2998 4136
2999 # limit the # of concurrent backtraces 4137 # limit the # of concurrent backtraces
3000 if ($_log_backtrace < 2) { 4138 if ($_log_backtrace < 2) {
3001 ++$_log_backtrace; 4139 ++$_log_backtrace;
4140 my $perl_bt = Carp::longmess $msg;
3002 async { 4141 async {
4142 $Coro::current->{desc} = "abt $msg";
4143
3003 my @bt = fork_call { 4144 my @bt = fork_call {
3004 @addr = map { sprintf "%x", $_ } @addr; 4145 @addr = map { sprintf "%x", $_ } @addr;
3005 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4146 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3006 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 |"
3007 or die "addr2line: $!"; 4148 or die "addr2line: $!";
3015 } 4156 }
3016 4157
3017 @funcs 4158 @funcs
3018 }; 4159 };
3019 4160
3020 LOG llevInfo, "[ABT] $msg\n"; 4161 LOG llevInfo, "[ABT] $perl_bt\n";
4162 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3021 LOG llevInfo, "[ABT] $_\n" for @bt; 4163 LOG llevInfo, "[ABT] $_\n" for @bt;
3022 --$_log_backtrace; 4164 --$_log_backtrace;
3023 }; 4165 };
3024 } else { 4166 } else {
3025 LOG llevInfo, "[ABT] $msg\n"; 4167 LOG llevInfo, "[ABT] $msg\n";
3026 LOG llevInfo, "[ABT] [suppressed]\n"; 4168 LOG llevInfo, "[ABT] [suppressed]\n";
3027 } 4169 }
3028} 4170}
3029 4171
3030# load additional modules 4172# load additional modules
3031use cf::pod; 4173require "cf/$_.pm" for @EXTRA_MODULES;
4174cf::_connect_to_perl_2;
3032 4175
3033END { cf::emergency_save } 4176END { cf::emergency_save }
3034 4177
30351 41781
3036 4179

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines