ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines