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.278 by root, Mon Jun 11 21:38:14 2007 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines