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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 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
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 74
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 76
52our %COMMAND = (); 77our %COMMAND = ();
53our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
56our %EXTCMD = (); 81our %EXTCMD = ();
57our %EXTICMD = (); 82our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
60 85
61our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 87our @EVENT;
63 88
64our $CONFDIR = confdir; 89our $CONFDIR = confdir;
65our $DATADIR = datadir; 90our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
75 104
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 107our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
83 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 113our $DB_ENV;
86 114
87our %CFG; 115our %CFG;
88 116
89our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 118our $RUNTIME;
119our $NOW;
91 120
92our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
95 124
96# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 127
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
102 134
103binmode STDOUT; 135binmode STDOUT;
104binmode STDERR; 136binmode STDERR;
105 137
106# read virtual server time, if available 138# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
111} 143}
112 144
113mkdir $_ 145mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 191
160The raw value load value from the last tick. 192The raw value load value from the last tick.
161 193
162=item %cf::CFG 194=item %cf::CFG
163 195
164Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 197from wherever your confdir points to.
166 198
167=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
168 200
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 201These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 219 $msg .= "\n"
188 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
189 221
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 222 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 223
192 utf8::encode $msg;
193 LOG llevError, $msg; 224 LOG llevError, $msg;
194 }; 225 };
195} 226}
227
228$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "=="
230
231 if ($Coro::current == $Coro::main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d#
234 }#d#
235
236 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate
239};
240
241$SIG{__DIE__} = sub { }; #d#?
196 242
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 253for my $pkg (qw(
208 cf::global cf::attachable 254 cf::global cf::attachable
209 cf::object cf::object::player 255 cf::object cf::object::player
210 cf::client cf::player 256 cf::client cf::player
211 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
212 cf::map cf::party cf::region 259 cf::party cf::region
213)) { 260)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 262}
217 263
218$Event::DIED = sub { 264$EV::DIED = sub {
219 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
220}; 266};
221 267
222############################################################################# 268#############################################################################
223 269
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 292 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 293 $d
248 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
249} 295}
250 296
251=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
252 298
253Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
254 300
255=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
256 302
257Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
258 304
259=cut 305=cut
260 306
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 308
263sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 310sub decode_json($) { $json_coder->decode ($_[0]) }
311
312=item cf::post_init { BLOCK }
313
314Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again.
316
317The cdoeblock will have a single boolean argument to indicate whether this
318is a reload or not.
319
320=cut
321
322sub post_init(&) {
323 push @POST_INIT, shift;
324}
265 325
266=item cf::lock_wait $string 326=item cf::lock_wait $string
267 327
268Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
269 329
272Wait until the given lock is available and then acquires it and returns 332Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 333a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
275returned. 335returned.
276 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
277Lock names should begin with a unique identifier (for example, cf::map::find 340Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
279 342
280=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
281 344
282Return true if the lock is currently active, i.e. somebody has locked it. 345Return true if the lock is currently active, i.e. somebody has locked it.
283 346
284=cut 347=cut
285 348
286our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
287 351
288sub lock_wait($) { 352sub lock_wait($) {
289 my ($key) = @_; 353 my ($key) = @_;
290 354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
291 # wait for lock, if any 360 # wait for lock, if any
292 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
293 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 364 Coro::schedule;
295 } 365 }
296} 366}
297 367
300 370
301 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
302 lock_wait $key; 372 lock_wait $key;
303 373
304 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
305 376
306 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
309 } 381 }
310} 382}
311 383
314 386
315 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
316} 388}
317 389
318sub freeze_mainloop { 390sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
320 392
321 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 394}
323 }; 395
324 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
325 $guard 397
398Like EV::periodic, but randomly selects a starting point so that the actions
399get spread over timer.
400
401=cut
402
403sub periodic($$) {
404 my ($interval, $cb) = @_;
405
406 my $start = rand List::Util::min 180, $interval;
407
408 EV::periodic $start, $interval, 0, $cb
326} 409}
327 410
328=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
329 412
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 424our @SLOT_QUEUE;
342our $SLOT_QUEUE; 425our $SLOT_QUEUE;
343 426
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 427$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 428$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager");
430
346 my $signal = new Coro::Signal; 431 my $signal = new Coro::Signal;
347 432
348 while () { 433 while () {
349 next_job: 434 next_job:
350 my $avail = cf::till_tick; 435 my $avail = cf::till_tick;
358 } 443 }
359 } 444 }
360 } 445 }
361 446
362 if (@SLOT_QUEUE) { 447 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 448 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 449 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 450 $signal->wait;
366 } else { 451 } else {
367 Coro::schedule; 452 Coro::schedule;
368 } 453 }
369 } 454 }
370}; 455};
371 456
372sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
373 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
374 461
375 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
377 464
391 478
392BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
393 480
394=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
395 482
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 486acceptable.
400 487
401If it must be done, put the blocking parts into C<sync_job>. This will run 488If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
407 494
408sub sync_job(&) { 495sub sync_job(&) {
409 my ($job) = @_; 496 my ($job) = @_;
410 497
411 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 499 my $time = EV::time;
413 500
414 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
416 503
417 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 505
419 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
420 507
421 my $busy = 1; 508 my $busy = 1;
422 my @res; 509 my @res;
423 510
424 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 513 @res = eval { $job->() };
426 warn $@ if $@; 514 warn $@ if $@;
427 undef $busy; 515 undef $busy;
428 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
429 517
430 while ($busy) { 518 while ($busy) {
431 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
432 } 523 }
524 }
433 525
434 $time = Event::time - $time; 526 my $time = EV::time - $time;
435 527
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
440 529
441 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
442 } else { 531 } else {
443 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
444 533
469=item fork_call { }, $args 558=item fork_call { }, $args
470 559
471Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
475 564
476=cut 565=cut
477 566
478sub fork_call(&@) { 567sub fork_call(&@) {
479 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
480 569
481 # we seemingly have to make a local copy of the whole thing, 570 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 571 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 572 # TODO: investigate and fix (likely this will be rather laborious)
484 573
485 my @res = Coro::Util::fork_eval { 574 my @res = Coro::Util::fork_eval {
486 reset_signals; 575 reset_signals;
487 &$cb 576 &$cb
488 }, @args; 577 }, @args;
489 578
490 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
491} 580}
492 581
582=item $coin = coin_from_name $name
583
584=cut
585
586our %coin_alias = (
587 "silver" => "silvercoin",
588 "silvercoin" => "silvercoin",
589 "silvercoins" => "silvercoin",
590 "gold" => "goldcoin",
591 "goldcoin" => "goldcoin",
592 "goldcoins" => "goldcoin",
593 "platinum" => "platinacoin",
594 "platinumcoin" => "platinacoin",
595 "platinumcoins" => "platinacoin",
596 "platina" => "platinacoin",
597 "platinacoin" => "platinacoin",
598 "platinacoins" => "platinacoin",
599 "royalty" => "royalty",
600 "royalties" => "royalty",
601);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
607}
608
493=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
494 610
495Returns a single value from the environment database. 611Returns a single value from the environment database.
496 612
497=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
498 614
499Stores the given C<$value> in the family. It can currently store binary 615Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 617
618=item $db = cf::db_table "name"
619
620Create and/or open a new database table. The string must not be "db" and must be unique
621within each server.
622
502=cut 623=cut
624
625sub db_table($) {
626 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV;
628
629 eval {
630 $db->set_flags (BDB::CHKSUM);
631
632 utf8::encode $name;
633 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
634 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
635 cf::cleanup "db_open(db): $!" if $!;
636 };
637 cf::cleanup "db_open(db): $@" if $@;
638
639 $db
640}
503 641
504our $DB; 642our $DB;
505 643
506sub db_init { 644sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 645 cf::sync_job {
511 eval { 646 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 647 };
521} 648}
522 649
523sub db_get($$) { 650sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
525 652
575 if (1) { 702 if (1) {
576 $md5 = 703 $md5 =
577 join "\x00", 704 join "\x00",
578 $processversion, 705 $processversion,
579 map { 706 map {
580 Coro::cede; 707 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 709 } 0.. $#$src;
583 710
584 711
585 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
623 750
624############################################################################# 751#############################################################################
625 752
626=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
627 754
628Many objects in crossfire are so-called attachable objects. That means you can 755Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
631 758
632In the following description, CLASS can be any of C<global>, C<object> 759In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 760C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 761Deliantra).
635 762
636=over 4 763=over 4
637 764
638=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
639 766
683=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
684 811
685Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
687 814
688Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 816that are attached at load/instantiate time, thus the need for a name.
690 817
691These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
692 819
693=over 4 820=over 4
921 } 1048 }
922 1049
923 0 1050 0
924} 1051}
925 1052
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1054
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1056
930Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
931 1058
937 1064
938=cut 1065=cut
939 1066
940############################################################################# 1067#############################################################################
941# object support 1068# object support
942#
943 1069
1070sub _object_equal($$);
1071sub _object_equal($$) {
1072 my ($a, $b) = @_;
1073
1074 return 0 unless (ref $a) eq (ref $b);
1075
1076 if ("HASH" eq ref $a) {
1077 my @ka = keys %$a;
1078 my @kb = keys %$b;
1079
1080 return 0 if @ka != @kb;
1081
1082 for (0 .. $#ka) {
1083 return 0 unless $ka[$_] eq $kb[$_];
1084 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1085 }
1086
1087 } elsif ("ARRAY" eq ref $a) {
1088
1089 return 0 if @$a != @$b;
1090
1091 for (0 .. $#$a) {
1092 return 0 unless _object_equal $a->[$_], $b->[$_];
1093 }
1094
1095 } elsif ($a ne $b) {
1096 return 0;
1097 }
1098
1099 1
1100}
1101
1102our $SLOW_MERGES;#d#
944sub _can_merge { 1103sub _can_merge {
945 my ($ob1, $ob2) = @_; 1104 my ($ob1, $ob2) = @_;
946 1105
947 local $Storable::canonical = 1; 1106 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1107
951 $fob1 eq $fob2 1108 # we do the slow way here
1109 return _object_equal $ob1, $ob2
952} 1110}
953 1111
954sub reattach { 1112sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1114 my ($obj) = @_;
957 1115
1116 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1117 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1118
960 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
961 1120
962 @$registry = (); 1121 @$registry = ();
963 1122
978cf::attachable->attach ( 1137cf::attachable->attach (
979 prio => -1000000, 1138 prio => -1000000,
980 on_instantiate => sub { 1139 on_instantiate => sub {
981 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
982 1141
983 $data = from_json $data; 1142 $data = decode_json $data;
984 1143
985 for (@$data) { 1144 for (@$data) {
986 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
987 1146
988 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1163sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
1006 1165
1007 sync_job { 1166 sync_job {
1008 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1011 1171
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1176 aio_close $fh;
1017 1177
1018 if (@$objs) { 1178 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1179 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1184 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1186 }
1027 } else { 1187 } else {
1028 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1029 } 1189 }
1034 } 1194 }
1035 } else { 1195 } else {
1036 aio_unlink $filename; 1196 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
1038 } 1198 }
1039 } 1199 };
1040} 1200}
1041 1201
1042sub object_freezer_as_string { 1202sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
1044 1204
1056 or return; 1216 or return;
1057 1217
1058 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1220 or return;
1221
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
1062 } 1224 }
1063 1225
1226 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1228 $decname, length $data, scalar @{$av || []};
1229
1066 return ($data, $av); 1230 ($data, $av)
1067} 1231}
1068 1232
1069=head2 COMMAND CALLBACKS 1233=head2 COMMAND CALLBACKS
1070 1234
1071=over 4 1235=over 4
1194 1358
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1361
1198 $ext{source} = 1362 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1201 . $source 1365 . $source
1202 . "\n};\n1"; 1366 . "\n};\n1";
1203 1367
1204 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1220 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1222 1386
1223 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1388 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1390 }
1228 1391
1229 warn $msg; 1392 warn $msg;
1230 } 1393 }
1231 1394
1245 1408
1246=back 1409=back
1247 1410
1248=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1249 1412
1250Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1251 1414
1252=cut 1415=cut
1253 1416
1254package cf::player; 1417package cf::player;
1255 1418
1256use Coro::AIO; 1419use Coro::AIO;
1257 1420
1258=head3 cf::player 1421=head3 cf::player
1259 1422
1260=over 4 1423=over 4
1424
1425=item cf::player::num_playing
1426
1427Returns the official number of playing players, as per the Crossfire metaserver rules.
1428
1429=cut
1430
1431sub num_playing {
1432 scalar grep
1433 $_->ob->map
1434 && !$_->hidden
1435 && !$_->ob->flag (cf::FLAG_WIZ),
1436 cf::player::list
1437}
1261 1438
1262=item cf::player::find $login 1439=item cf::player::find $login
1263 1440
1264Returns the given player object, loading it if necessary (might block). 1441Returns the given player object, loading it if necessary (might block).
1265 1442
1284 1461
1285sub exists($) { 1462sub exists($) {
1286 my ($login) = @_; 1463 my ($login) = @_;
1287 1464
1288 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1289 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1290} 1467}
1291 1468
1292sub find($) { 1469sub find($) {
1293 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1294 my $login = $_[0]; 1471 my $login = $_[0];
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1478 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1479 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1480 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1482
1306 my $pl = load_pl path $login 1483 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1484 or return;
1485
1486 my $pl = cf::player::load_pl $f
1487 or return;
1488
1489 local $cf::PLAYER_LOADING{$login} = $pl;
1490 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1309 } 1492 }
1310 } 1493 }
1311} 1494}
1312 1495
1321 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1322 1505
1323 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1325 1508
1509 cf::get_slot 0.01;
1510
1326 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1327 Coro::cede; 1512 cf::cede_to_tick;
1328} 1513}
1329 1514
1330sub new($) { 1515sub new($) {
1331 my ($login) = @_; 1516 my ($login) = @_;
1332 1517
1361 my ($pl) = @_; 1546 my ($pl) = @_;
1362 1547
1363 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1364 1549
1365 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1366 $pl->password ("*"); # this should lock out the player until we nuked the dir 1551 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1367 1552
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1372 1559
1373 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1410 or return []; 1597 or return [];
1411 1598
1412 my @logins; 1599 my @logins;
1413 1600
1414 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1602 my $path = path $login;
1603
1604 # a .pst is a dead give-away for a valid player
1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1610 }
1418 1611
1419 utf8::decode $login; 1612 utf8::decode $login;
1420 push @logins, $login; 1613 push @logins, $login;
1421 } 1614 }
1422 1615
1449 } 1642 }
1450 1643
1451 \@paths 1644 \@paths
1452} 1645}
1453 1646
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1455 1648
1456Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503 1650
1504=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1505 1652
1506Sends an ext reply to the player. 1653Sends an ext reply to the player.
1507 1654
1574our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1576 1723
1577sub generate_random_map { 1724sub generate_random_map {
1578 my ($self, $rmp) = @_; 1725 my ($self, $rmp) = @_;
1726
1727 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1728
1579 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1730 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1705 1855
1706# the temporary/swap location 1856# the temporary/swap location
1707sub save_path { 1857sub save_path {
1708 my ($self) = @_; 1858 my ($self) = @_;
1709 1859
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1712} 1862}
1713 1863
1714# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1715sub uniq_path { 1865sub uniq_path {
1716 my ($self) = @_; 1866 my ($self) = @_;
1717 1867
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1720} 1870}
1721 1871
1722# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1723# all maps in C++... 1873# all maps in C++...
1746 1896
1747sub load_header_from($) { 1897sub load_header_from($) {
1748 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1749 1899
1750 utf8::encode $path; 1900 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1756 1909
1757 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1758 1911
1759 1 1912 1
1760} 1913}
1814sub find { 1967sub find {
1815 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1816 1969
1817 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1818 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1820 1974
1821 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1822 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1823 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1824 or return; 1980 or return;
1825 1981
1826 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1827 1983
1829 or return; 1985 or return;
1830 1986
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1991 undef $guard1;
1834 $map->reset; 1992 $map->reset;
1835 undef $guard;
1836 return find $path; 1993 return find $path;
1837 } 1994 }
1838 1995
1839 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1840 } 1997 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1850 2007
1851 my $path = $self->{path}; 2008 my $path = $self->{path};
1852 2009
1853 { 2010 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1855 2012
2013 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2015
1858 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1859 2017
1860 $self->alloc; 2018 $self->alloc;
1861 2019
1862 $self->pre_load; 2020 $self->pre_load;
1863 Coro::cede; 2021 cf::cede_to_tick;
1864 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1866 or return; 2026 or return;
1867 2027
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1869 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1870 2030
1871 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2032 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2035 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1876 } 2039 }
1877 } 2040 }
1878 2041
1879 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1880 # now do the right thing for maps 2045 # now do the right thing for maps
1881 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2048 unless $self->difficulty;
1884 Coro::cede; 2049 cf::cede_to_tick;
1885 2050
1886 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2052 $self->decay_objects;
1888 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1889 $self->update_buttons; 2054 $self->update_buttons;
1890 Coro::cede; 2055 cf::cede_to_tick;
1891 $self->set_darkness_map; 2056 $self->set_darkness_map;
1892 Coro::cede; 2057 cf::cede_to_tick;
1893 $self->activate; 2058 $self->activate;
1894 } 2059 }
1895 2060
1896 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
1898 2063
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2065 }
1901 2066
1902 $self->post_load; 2067 $self->post_load;
1903} 2068}
1904 2069
1962 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
1963 2128
1964 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1965 2130
1966 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2133 }
1969 2134
1970 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
1971 2136
1972 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1973 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2142 if (my $map = find $k) {
1976 $map->load if $v; 2143 $map->load if $v;
1977 } 2144 }
1987} 2154}
1988 2155
1989sub save { 2156sub save {
1990 my ($self) = @_; 2157 my ($self) = @_;
1991 2158
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2160
1994 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1995 2162
1996 return unless $self->dirty; 2163 return unless $self->dirty;
1997 2164
2003 return if $self->{deny_save}; 2170 return if $self->{deny_save};
2004 2171
2005 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
2006 2173
2007 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2009 }; 2177 };
2178
2179 cf::get_slot 0.02;
2010 2180
2011 if ($uniq) { 2181 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2184 } else {
2020 my ($self) = @_; 2190 my ($self) = @_;
2021 2191
2022 # save first because save cedes 2192 # save first because save cedes
2023 $self->save; 2193 $self->save;
2024 2194
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2196
2027 return if $self->players; 2197 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2029 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2030 2200
2201 $self->in_memory (cf::MAP_SWAPPED);
2202
2203 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2205 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2206}
2034 2207
2035sub reset_at { 2208sub reset_at {
2036 my ($self) = @_; 2209 my ($self) = @_;
2037 2210
2069 if $uniq; 2242 if $uniq;
2070 } 2243 }
2071 2244
2072 delete $cf::MAP{$self->path}; 2245 delete $cf::MAP{$self->path};
2073 2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2249 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2250
2078 $self->unlink_save; 2251 $self->unlink_save;
2079 $self->destroy; 2252 $self->destroy;
2080} 2253}
2081 2254
2082my $nuke_counter = "aaaa"; 2255my $nuke_counter = "aaaa";
2083 2256
2084sub nuke { 2257sub nuke {
2085 my ($self) = @_; 2258 my ($self) = @_;
2086 2259
2260 {
2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262
2087 delete $cf::MAP{$self->path}; 2263 delete $cf::MAP{$self->path};
2088 2264
2089 $self->unlink_save; 2265 $self->unlink_save;
2090 2266
2091 bless $self, "cf::map"; 2267 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2268 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2269 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2270 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2272
2097 $cf::MAP{$self->path} = $self; 2273 $cf::MAP{$self->path} = $self;
2274 }
2098 2275
2099 $self->reset; # polite request, might not happen 2276 $self->reset; # polite request, might not happen
2100} 2277}
2101 2278
2102=item $maps = cf::map::tmp_maps 2279=item $maps = cf::map::tmp_maps
2144 2321
2145sub unique_maps() { 2322sub unique_maps() {
2146 [ 2323 [
2147 map { 2324 map {
2148 utf8::decode $_; 2325 utf8::decode $_;
2149 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2150 ? normalise $_ 2329 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2331 ]
2154} 2332}
2155 2333
2156package cf;
2157
2158=back 2334=back
2159 2335
2160=head3 cf::object 2336=head3 cf::object
2161 2337
2162=cut 2338=cut
2165 2341
2166=over 4 2342=over 4
2167 2343
2168=item $ob->inv_recursive 2344=item $ob->inv_recursive
2169 2345
2170Returns the inventory of the object _and_ their inventories, recursively. 2346Returns the inventory of the object I<and> their inventories, recursively,
2347but I<not> the object itself.
2171 2348
2172=cut 2349=cut
2173 2350
2174sub inv_recursive_; 2351sub inv_recursive_;
2175sub inv_recursive_ { 2352sub inv_recursive_ {
2178 2355
2179sub inv_recursive { 2356sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2181} 2358}
2182 2359
2360=item $ref = $ob->ref
2361
2362Creates and returns a persistent reference to an object that can be stored as a string.
2363
2364=item $ob = cf::object::deref ($refstring)
2365
2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2367even if the object actually exists. May block.
2368
2369=cut
2370
2371sub deref {
2372 my ($ref) = @_;
2373
2374 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2375 my ($uuid, $name) = ($1, $2);
2376 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2377 or return;
2378 $pl->ob->uuid eq $uuid
2379 or return;
2380
2381 $pl->ob
2382 } else {
2383 warn "$ref: cannot resolve object reference\n";
2384 undef
2385 }
2386}
2387
2183package cf; 2388package cf;
2184 2389
2185=back 2390=back
2186 2391
2187=head3 cf::object::player 2392=head3 cf::object::player
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2398Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2399can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2400dialogue with the given NPC character.
2196 2401
2197=cut 2402=cut
2403
2404our $SAY_CHANNEL = {
2405 id => "say",
2406 title => "Map",
2407 reply => "say ",
2408 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2409};
2410
2411our $CHAT_CHANNEL = {
2412 id => "chat",
2413 title => "Chat",
2414 reply => "chat ",
2415 tooltip => "Player chat and shouts, global to the server.",
2416};
2198 2417
2199# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2419# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2420#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2214 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2435
2217 } else { 2436 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2439 }
2221 } 2440 }
2222} 2441}
2223 2442
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2249 2468
2250=item $player_object->enter_link 2469=item $player_object->enter_link
2251 2470
2252Freezes the player and moves him/her to a special map (C<{link}>). 2471Freezes the player and moves him/her to a special map (C<{link}>).
2253 2472
2254The player should be reasonably safe there for short amounts of time. You 2473The player should be reasonably safe there for short amounts of time (e.g.
2255I<MUST> call C<leave_link> as soon as possible, though. 2474for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2475though, as the palyer cannot control the character while it is on the link
2476map.
2256 2477
2257Will never block. 2478Will never block.
2258 2479
2259=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2260 2481
2318 2539
2319 $map->load; 2540 $map->load;
2320 $map->load_neighbours; 2541 $map->load_neighbours;
2321 2542
2322 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2323 $self->activate_recursive; 2545 $self->activate_recursive;
2324 2546
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2327} 2549}
2332her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2555that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2556the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2557be called at the end of this process.
2336 2558
2559Note that $check will be called with a potentially non-loaded map, so if
2560it needs a loaded map it has to call C<< ->load >>.
2561
2337=cut 2562=cut
2338 2563
2339our $GOTOGEN; 2564our $GOTOGEN;
2340 2565
2341sub cf::object::player::goto { 2566sub cf::object::player::goto {
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2571
2347 $self->enter_link; 2572 $self->enter_link;
2348 2573
2349 (async { 2574 (async {
2575 $Coro::current->{desc} = "player::goto $path $x $y";
2576
2577 # *tag paths override both path and x|y
2578 if ($path =~ /^\*(.*)$/) {
2579 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2580 my $ob = $obs[rand @obs];
2581
2582 # see if we actually can go there
2583 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2584 $ob = $obs[rand @obs];
2585 } else {
2586 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2587 }
2588 # else put us there anyways for now #d#
2589
2590 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2591 } else {
2592 ($path, $x, $y) = (undef, undef, undef);
2593 }
2594 }
2595
2350 my $map = eval { 2596 my $map = eval {
2351 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
2352 2598
2353 if ($map) { 2599 if ($map) {
2354 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
2356 } else { 2602 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2603 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2604 }
2359 2605
2360 $map 2606 $map
2361 }; 2607 };
2362 2608
2398} 2644}
2399 2645
2400sub prepare_random_map { 2646sub prepare_random_map {
2401 my ($exit) = @_; 2647 my ($exit) = @_;
2402 2648
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2651 # that depends on the exit object
2408 2652
2409 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2411 if ($exit->map) { 2655 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2416 } 2662 }
2417 2663
2418 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2419 2665
2420 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2423 2669
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2672 undef $fh;
2427 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2428 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2431 } 2681 }
2432} 2682}
2433 2683
2434sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2436 2686
2437 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2438 2688
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2689 $self->enter_link;
2451 2690
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2691 (async {
2457 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2458 unless (eval { 2694 unless (eval {
2695 $self->deactivate_recursive; # just to be sure
2696
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2706 my $x = $exit->stats->hp;
2707 my $y = $exit->stats->sp;
2708
2459 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2460 2710
2711 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y)
2713 if $exit->flag (cf::FLAG_DAMNED);
2714
2461 1; 2715 1
2462 }) { 2716 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "I'll try to bring you back to the map you were before. " 2718 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2721
2468 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2498 2752
2499=cut 2753=cut
2500 2754
2755# non-persistent channels (usually the info channel)
2756our %CHANNEL = (
2757 "c/identify" => {
2758 id => "infobox",
2759 title => "Identify",
2760 reply => undef,
2761 tooltip => "Items recently identified",
2762 },
2763 "c/examine" => {
2764 id => "infobox",
2765 title => "Examine",
2766 reply => undef,
2767 tooltip => "Signs and other items you examined",
2768 },
2769 "c/book" => {
2770 id => "infobox",
2771 title => "Book",
2772 reply => undef,
2773 tooltip => "The contents of a note or book",
2774 },
2775 "c/lookat" => {
2776 id => "infobox",
2777 title => "Look",
2778 reply => undef,
2779 tooltip => "What you saw there",
2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2817);
2818
2501sub cf::client::send_msg { 2819sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2821
2504 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2505 2824
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2826
2827 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel};
2830
2831 $self->ext_msg (channel_info => $channel)
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id};
2835
2508 if (ref $channel) { 2836 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2837 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2838 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2839 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2840 $self->ext_msg (channel_info => $channel)
2841 if $self->can_msg;
2513 } 2842 }
2514 2843
2515 $channel = $channel->{id}; 2844 $channel = $channel->{id};
2516 } 2845 }
2517 2846
2520 if ($self->can_msg) { 2849 if ($self->can_msg) {
2521 # default colour, mask it out 2850 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2524 2853
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 );
2858
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt);
2527 } else { 2870 } else {
2528 if ($color >= 0) { 2871 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2530 for ($msg) { 2873 for ($msg) {
2531 1 while 2874 1 while
2558=cut 2901=cut
2559 2902
2560sub cf::client::ext_msg($$@) { 2903sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2904 my ($self, $type, @msg) = @_;
2562 2905
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2906 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2908 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2909 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2911 }
2571} 2912}
2572 2913
2579sub cf::client::ext_reply($$@) { 2920sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2921 my ($self, $id, @msg) = @_;
2581 2922
2582 if ($self->extcmd == 2) { 2923 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2925 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2926 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2927 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2929 }
2589} 2930}
2731=pod 3072=pod
2732 3073
2733The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2734 3075
2735 cf::object 3076 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
2738 3079
2739 cf::object::player 3080 cf::object::player
2740 player 3081 player
2741 3082
2742 cf::player 3083 cf::player
2747 3088
2748=cut 3089=cut
2749 3090
2750for ( 3091for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3092 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
2753 decrease_ob_nr)], 3094 decrease split destroy change_exp)],
2754 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2757) { 3098) {
2758 no strict 'refs'; 3099 no strict 'refs';
2834# the server's init and main functions 3175# the server's init and main functions
2835 3176
2836sub load_facedata($) { 3177sub load_facedata($) {
2837 my ($path) = @_; 3178 my ($path) = @_;
2838 3179
3180 # HACK to clear player env face cache, we need some signal framework
3181 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = ();
3183
2839 my $enc = JSON::XS->new->utf8->canonical; 3184 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3185
2841 warn "loading facedata from $path\n"; 3186 warn "loading facedata from $path\n";
2842 3187
2843 my $facedata; 3188 my $facedata;
2844 0 < aio_load $path, $facedata 3189 0 < aio_load $path, $facedata
2859 { 3204 {
2860 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
2861 3206
2862 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
2863 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
2864 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
2865 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
2866 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2867 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2868 3214
2869 cf::cede_to_tick; 3215 cf::cede_to_tick;
2870 } 3216 }
2871 3217
2872 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2873 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
2874 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
2875 or next; 3222 or next;
3223
2876 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
2877 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
2878 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2879 } else { 3227 } else {
2880 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
2898 { 3246 {
2899 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
2900 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
2901 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
2902 3250
2903 my $soundconf = delete $res->{"res/sound.conf"};
2904
2905 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
2906 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data; 3254 my $data;
2908 3255
2909 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
2910 # prepend meta info 3257 # prepend meta info
2911 3258
2912 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
2913 name => $name, 3260 name => $name,
2914 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
2915 }); 3262 });
2916 3263
2917 $data = pack "(w/a*)*", $meta, $info->{data}; 3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 cf::face::set_type $idx, $info->{type};
2918 } else { 3271 } else {
2919 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
2920 } 3273 }
2921 3274
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2923 cf::face::set_type $idx, $info->{type};
2924
2925 cf::cede_to_tick; 3275 cf::cede_to_tick;
2926 } 3276 }
2927
2928 if ($soundconf) {
2929 $soundconf = $enc->decode (delete $soundconf->{data});
2930
2931 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2932 my $sound = $soundconf->{compat}[$_]
2933 or next;
2934
2935 my $face = cf::face::find "sound/$sound->[1]";
2936 cf::sound::set $sound->[0] => $face;
2937 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2938 }
2939
2940 while (my ($k, $v) = each %{$soundconf->{event}}) {
2941 my $face = cf::face::find "sound/$v";
2942 cf::sound::set $k => $face;
2943 }
2944 }
2945 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2946 3280
2947 1 3281 1
2948} 3282}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
2949 3303
2950register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
2951 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
2952 3306
2953 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
2954 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
2955 } 3309 }
2956}; 3310};
2957 3311
3312sub load_resource_file($) {
3313 my $guard = lock_acquire "load_resource_file";
3314
3315 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100;
3317 cf::arch::commit_load;
3318
3319 $status
3320}
3321
2958sub reload_regions { 3322sub reload_regions {
3323 # HACK to clear player env face cache, we need some signal framework
3324 # for this (global event?)
3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3326
2959 load_resource_file "$MAPDIR/regions" 3327 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3328 or die "unable to load regions file\n";
2961 3329
2962 for (cf::region::list) { 3330 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3331 $_->{match} = qr/$_->{match}/
2971} 3339}
2972 3340
2973sub reload_archetypes { 3341sub reload_archetypes {
2974 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
2975 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
2976 #d# NEED to laod twice to resolve forward references
2977 # this really needs to be done in an extra post-pass
2978 # (which needs to be synchronous, so solve it differently)
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981} 3344}
2982 3345
2983sub reload_treasures { 3346sub reload_treasures {
2984 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
2985 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
2986} 3349}
2987 3350
2988sub reload_resources { 3351sub reload_resources {
2989 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
2990 3353
3354 reload_facedata;
3355 reload_archetypes;
2991 reload_regions; 3356 reload_regions;
2992 reload_facedata;
2993 #reload_archetypes;#d#
2994 reload_archetypes;
2995 reload_treasures; 3357 reload_treasures;
2996 3358
2997 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
2998} 3360}
2999 3361
3000sub init { 3362sub reload_config {
3001 reload_resources;
3002}
3003
3004sub cfg_load {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3364 or return;
3007 3365
3008 local $/; 3366 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3010 3368
3011 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3012 3370
3013 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3371 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3014 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3372 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3020 }; 3378 };
3021 warn $@ if $@; 3379 warn $@ if $@;
3022 } 3380 }
3023} 3381}
3024 3382
3383sub pidfile() {
3384 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3385 or die "$PIDFILE: $!";
3386 flock $fh, &Fcntl::LOCK_EX
3387 or die "$PIDFILE: flock: $!";
3388 $fh
3389}
3390
3391# make sure only one server instance is running at any one time
3392sub atomic {
3393 my $fh = pidfile;
3394
3395 my $pid = <$fh>;
3396 kill 9, $pid if $pid > 0;
3397
3398 seek $fh, 0, 0;
3399 print $fh $$;
3400}
3401
3025sub main { 3402sub main {
3403 cf::init_globals; # initialise logging
3404
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417
3026 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3420 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3421 (async {
3030 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3032 }; 3425 };
3033 3426
3034 cfg_load; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
3035 db_init; 3432 db_init;
3433
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid;
3437 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills;
3440
3441 cf::init_beforeplay;
3442
3443 atomic;
3444
3036 load_extensions; 3445 load_extensions;
3037 3446
3038 $TICK_WATCHER->start; 3447 utime time, time, $RUNTIMEFILE;
3448
3449 # no (long-running) fork's whatsoever before this point(!)
3450 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3451
3452 (pop @POST_INIT)->(0) while @POST_INIT;
3453 };
3454
3039 Event::loop; 3455 EV::loop;
3040} 3456}
3041 3457
3042############################################################################# 3458#############################################################################
3043# initialisation and cleanup 3459# initialisation and cleanup
3044 3460
3045# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3046BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3055 },
3056 ); 3467 };
3057 } 3468 }
3058} 3469}
3059 3470
3060sub write_runtime { 3471sub write_runtime_sync {
3061 my $runtime = "$LOCALDIR/runtime";
3062
3063 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3064 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3065 3474
3066 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3067 3476
3068 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3069 3478
3070 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3071 or return; 3480 or return;
3072 3481
3073 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3074 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3075 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3085 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3086 3495
3087 close $fh 3496 close $fh
3088 or return; 3497 or return;
3089 3498
3090 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3091 and return; 3500 and return;
3092 3501
3093 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3094 3503
3095 1 3504 1
3505}
3506
3507our $uuid_lock;
3508our $uuid_skip;
3509
3510sub write_uuid_sync($) {
3511 $uuid_skip ||= $_[0];
3512
3513 return if $uuid_lock;
3514 local $uuid_lock = 1;
3515
3516 my $uuid = "$LOCALDIR/uuid";
3517
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return;
3520
3521 my $value = uuid_seq uuid_cur;
3522
3523 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($value)!\n";
3525 return;
3526 }
3527
3528 my $value = uuid_str $value + $uuid_skip;
3529 $uuid_skip = 0;
3530
3531 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3532 and return;
3533
3534 # always fsync - this file is important
3535 aio_fsync $fh
3536 and return;
3537
3538 close $fh
3539 or return;
3540
3541 aio_rename "$uuid~", $uuid
3542 and return;
3543
3544 warn "uuid file written ($value).\n";
3545
3546 1
3547
3548}
3549
3550sub write_uuid($$) {
3551 my ($skip, $sync) = @_;
3552
3553 $sync ? write_uuid_sync $skip
3554 : async { write_uuid_sync $skip };
3096} 3555}
3097 3556
3098sub emergency_save() { 3557sub emergency_save() {
3099 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3100 3559
3106 # and maps saved/destroyed asynchronously. 3565 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3566 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3567 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3568 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3569 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3571 $pl->save;
3112 } 3572 }
3113 warn "end emergency player save\n"; 3573 warn "end emergency player save\n";
3114 3574
3115 warn "begin emergency map save\n"; 3575 warn "begin emergency map save\n";
3121 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3122 3582
3123 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3124 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3125 warn "end emergency database checkpoint\n"; 3585 warn "end emergency database checkpoint\n";
3586
3587 warn "begin write uuid\n";
3588 write_uuid_sync 1;
3589 warn "end write uuid\n";
3126 }; 3590 };
3127 3591
3128 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3129} 3593}
3130 3594
3131sub post_cleanup { 3595sub post_cleanup {
3132 my ($make_core) = @_; 3596 my ($make_core) = @_;
3133 3597
3134 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3135 if $make_core; 3599 if $make_core;
3600
3601 my $fh = pidfile;
3602 unlink $PIDFILE if <$fh> == $$;
3603}
3604
3605# a safer delete_package, copied from Symbol
3606sub clear_package($) {
3607 my $pkg = shift;
3608
3609 # expand to full symbol table name if needed
3610 unless ($pkg =~ /^main::.*::$/) {
3611 $pkg = "main$pkg" if $pkg =~ /^::/;
3612 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3613 $pkg .= '::' unless $pkg =~ /::$/;
3614 }
3615
3616 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3617 my $stem_symtab = *{$stem}{HASH};
3618
3619 defined $stem_symtab and exists $stem_symtab->{$leaf}
3620 or return;
3621
3622 # clear all symbols
3623 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3624 for my $name (keys %$leaf_symtab) {
3625 _gv_clear *{"$pkg$name"};
3626# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3627 }
3628 warn "cleared package $pkg\n";#d#
3136} 3629}
3137 3630
3138sub do_reload_perl() { 3631sub do_reload_perl() {
3139 # can/must only be called in main 3632 # can/must only be called in main
3140 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3141 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3142 return; 3635 return;
3143 } 3636 }
3144 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3145 warn "reloading..."; 3641 warn "reloading...";
3146 3642
3147 warn "entering sync_job"; 3643 warn "entering sync_job";
3148 3644
3149 cf::sync_job { 3645 cf::sync_job {
3150 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3151 cf::emergency_save; 3647 cf::emergency_save;
3152 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3153 3649
3154 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3652
3157 # if anything goes wrong in here, we should simply crash as we already saved 3653 # if anything goes wrong in here, we should simply crash as we already saved
3158 3654
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3165 for (;;) {
3166 BDB::flush;
3167 IO::AIO::flush;
3168 Coro::cede;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3170 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3171 }
3172
3173 ++$RELOAD;
3174
3175 warn "cancelling all extension coros";
3176 $_->cancel for values %EXT_CORO;
3177 %EXT_CORO = ();
3178
3179 warn "removing commands";
3180 %COMMAND = ();
3181
3182 warn "removing ext/exti commands";
3183 %EXTCMD = ();
3184 %EXTICMD = ();
3185
3186 warn "unloading/nuking all extensions";
3187 for my $pkg (@EXTS) {
3188 warn "... unloading $pkg";
3189
3190 if (my $cb = $pkg->can ("unload")) {
3191 eval {
3192 $cb->($pkg);
3193 1
3194 } or warn "$pkg unloaded, but with errors: $@";
3195 } 3658 }
3196 3659
3197 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3198 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3199 } 3662 %EXT_CORO = ();
3200 3663
3201 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3202 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3203 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3204 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3205 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3206 delete $INC{$k};
3207 3674
3208 $k =~ s/\.pm$//;
3209 $k =~ s/\//::/g;
3210
3211 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3212 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3213 } 3684 }
3214 3685
3215 Symbol::delete_package $k; 3686 warn "unloading all perl modules loaded from $LIBDIR";
3687 while (my ($k, $v) = each %INC) {
3688 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3689
3690 warn "... unloading $k";
3691 delete $INC{$k};
3692
3693 $k =~ s/\.pm$//;
3694 $k =~ s/\//::/g;
3695
3696 if (my $cb = $k->can ("unload_module")) {
3697 $cb->();
3698 }
3699
3700 clear_package $k;
3216 } 3701 }
3217 3702
3218 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3219 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3220 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3705 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3221 3706
3222 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3223 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3224 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3225 3710
3226 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3227 # and global variables created in xs 3712 # and global variables created in xs
3228 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3229 3714
3230 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3231 3716
3232 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3233 require cf; 3718 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3720
3236 warn "loading config and database again"; 3721 warn "loading config and database again";
3237 cf::cfg_load; 3722 cf::reload_config;
3238 3723
3239 warn "loading extensions"; 3724 warn "loading extensions";
3240 cf::load_extensions; 3725 cf::load_extensions;
3241 3726
3242 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3243 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3244 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3245 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3246 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3247 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3248 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3249 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3250 3738
3251 1 3739 1
3252 } or do { 3740 } or do {
3253 warn $@; 3741 warn $@;
3254 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3255 exit 1;
3256 }; 3743 };
3257 3744
3258 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3259}; 3748};
3260 3749
3261our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3262 3751
3263sub reload_perl() { 3752sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3266 3755
3267 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3268 reentrant => 0,
3269 after => 0,
3270 data => WF_AUTOCANCEL,
3271 cb => sub {
3272 do_reload_perl; 3757 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3274 },
3275 ); 3759 };
3276} 3760}
3277 3761
3278register_command "reload" => sub { 3762register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3280 3764
3281 if ($who->flag (FLAG_WIZ)) { 3765 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3766 $who->message ("reloading server.");
3767 async {
3768 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3769 reload_perl;
3770 };
3284 } 3771 }
3285}; 3772};
3286 3773
3287unshift @INC, $LIBDIR; 3774unshift @INC, $LIBDIR;
3288 3775
3290 3777
3291our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3292our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3293 3780
3294sub wait_for_tick { 3781sub wait_for_tick {
3295 return unless $TICK_WATCHER->is_active;
3296 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3297 3783
3298 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3299 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3300 $signal->wait; 3786 $signal->wait;
3301} 3787}
3302 3788
3303sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3304 return unless $TICK_WATCHER->is_active;
3305 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3306 3791
3307 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3794 $signal->wait;
3310} 3795}
3311 3796
3312 my $min = 1e6;#d# 3797sub tick {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3322 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3799 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3323 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3324 return; 3801 return;
3325 } 3802 }
3326 3803
3327 $NOW = $tick_start = Event::time;
3328
3329 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3330 3805
3331 0 && sync_job {#d# 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3332 for(1..10) { 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3333 my $t = Event::time; 3808 Coro::async_pool {
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3809 $Coro::current->{desc} = "runtime saver";
3335 or die; 3810 write_runtime_sync
3336 3811 or warn "ERROR: unable to write runtime file: $!";
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3812 };
3813 }
3353 3814
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3816 $sig->send;
3370 } 3817 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3819 $sig->send;
3373 } 3820 }
3374 3821
3375 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3824
3386 _post_tick; 3825 if (0) {
3387 3826 if ($NEXT_TICK) {
3388 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3389 }, 3831 }
3390); 3832}
3391 3833
3392{ 3834{
3393 BDB::max_poll_time $TICK * 0.1; 3835 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 3836
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3403 3838 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 3839 $AnyEvent::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 3840
3419 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3844 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3845 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3848
3422 cf::sync_job { 3849 cf::sync_job {
3423 eval { 3850 eval {
3424 BDB::db_env_open 3851 BDB::db_env_open
3425 $DB_ENV, 3852 $DB_ENV,
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3854 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3855 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3856 0666;
3430 3857
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3858 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3859 };
3436 3860
3437 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3862 };
3439 } 3863 }
3864
3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3867 };
3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3870 };
3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3873 };
3440} 3874}
3441 3875
3442{ 3876{
3877 # configure IO::AIO
3878
3443 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3882}
3456 3883
3457my $_log_backtrace; 3884my $_log_backtrace;
3458 3885
3459sub _log_backtrace { 3886sub _log_backtrace {
3462 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3463 3890
3464 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3467 async { 3895 async {
3896 $Coro::current->{desc} = "abt $msg";
3897
3468 my @bt = fork_call { 3898 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3900 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3901 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3902 or die "addr2line: $!";
3480 } 3910 }
3481 3911
3482 @funcs 3912 @funcs
3483 }; 3913 };
3484 3914
3485 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3486 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3487 --$_log_backtrace; 3918 --$_log_backtrace;
3488 }; 3919 };
3489 } else { 3920 } else {
3490 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines