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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.455 by root, Sat Sep 27 08:17:40 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 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 (); 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.51 (); 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
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 110our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 111our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 112our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 113our $DB_ENV;
89 114
90our %CFG; 115our %CFG;
91 116
92our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 118our $RUNTIME;
119our $NOW;
94 120
95our (%PLAYER, %PLAYER_LOADING); # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 122our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
98 124
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 127
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
105 134
106binmode STDOUT; 135binmode STDOUT;
107binmode STDERR; 136binmode STDERR;
108 137
109# read virtual server time, if available 138# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
114} 143}
115 144
116mkdir $_ 145mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 191
163The raw value load value from the last tick. 192The raw value load value from the last tick.
164 193
165=item %cf::CFG 194=item %cf::CFG
166 195
167Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 197from wherever your confdir points to.
169 198
170=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
171 200
172These 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
193 $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;
194 223
195 LOG llevError, $msg; 224 LOG llevError, $msg;
196 }; 225 };
197} 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#?
198 242
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 253for my $pkg (qw(
210 cf::global cf::attachable 254 cf::global cf::attachable
211 cf::object cf::object::player 255 cf::object cf::object::player
212 cf::client cf::player 256 cf::client cf::player
213 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
214 cf::map cf::party cf::region 259 cf::party cf::region
215)) { 260)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 262}
219 263
220$Event::DIED = sub { 264$EV::DIED = sub {
221 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
222}; 266};
223 267
224############################################################################# 268#############################################################################
225 269
248 $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;
249 $d 293 $d
250 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
251} 295}
252 296
253=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
254 298
255Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
256 300
257=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
258 302
259Converts a perl data structure into its JSON representation. 303Converts a perl data structure into its JSON representation.
260 304
261=cut 305=cut
262 306
263our $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
264 308
265sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
266sub 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}
267 325
268=item cf::lock_wait $string 326=item cf::lock_wait $string
269 327
270Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
271 329
299 return;#d# 357 return;#d#
300 }#d# 358 }#d#
301 359
302 # wait for lock, if any 360 # wait for lock, if any
303 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
304 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule; 364 Coro::schedule;
306 } 365 }
307} 366}
308 367
327 386
328 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
329} 388}
330 389
331sub freeze_mainloop { 390sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
333 392
334 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 394}
336 }; 395
337 $TICK_WATCHER->stop; 396=item cf::periodic $interval, $cb
338 $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
339} 409}
340 410
341=item cf::get_slot $time[, $priority[, $name]] 411=item cf::get_slot $time[, $priority[, $name]]
342 412
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 413Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 453 }
384 } 454 }
385}; 455};
386 456
387sub get_slot($;$$) { 457sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main;
459
388 my ($time, $pri, $name) = @_; 460 my ($time, $pri, $name) = @_;
389 461
390 $time = $TICK * .6 if $time > $TICK * .6; 462 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 463 my $sig = new Coro::Signal;
392 464
406 478
407BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
408 480
409=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
410 482
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
413partly 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
414acceptable. 486acceptable.
415 487
416If 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
417the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
422 494
423sub sync_job(&) { 495sub sync_job(&) {
424 my ($job) = @_; 496 my ($job) = @_;
425 497
426 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 499 my $time = EV::time;
428 500
429 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
431 503
432 LOG llevError, Carp::longmess "sync job";#d# 504 LOG llevError, Carp::longmess "sync job";#d#
433 505
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
437 507
438 my $busy = 1; 508 my $busy = 1;
439 my @res; 509 my @res;
440 510
447 517
448 while ($busy) { 518 while ($busy) {
449 if (Coro::nready) { 519 if (Coro::nready) {
450 Coro::cede_notself; 520 Coro::cede_notself;
451 } else { 521 } else {
452 Event::one_event; 522 EV::loop EV::LOOP_ONESHOT;
453 } 523 }
454 } 524 }
455 525
456 $time = Event::time - $time; 526 my $time = EV::time - $time;
457 527
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
462 529
463 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
464 } else { 531 } else {
465 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
466 533
491=item fork_call { }, $args 558=item fork_call { }, $args
492 559
493Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
497 564
498=cut 565=cut
499 566
500sub fork_call(&@) { 567sub fork_call(&@) {
501 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
508 reset_signals; 575 reset_signals;
509 &$cb 576 &$cb
510 }, @args; 577 }, @args;
511 578
512 wantarray ? @res : $res[-1] 579 wantarray ? @res : $res[-1]
580}
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
513} 607}
514 608
515=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
516 610
517Returns a single value from the environment database. 611Returns a single value from the environment database.
656 750
657############################################################################# 751#############################################################################
658 752
659=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
660 754
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
664 758
665In 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>
666C<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
667Crossfire TRT). 761Deliantra).
668 762
669=over 4 763=over 4
670 764
671=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
672 766
716=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
717 811
718Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
720 814
721Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 817
724These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
725 819
726=over 4 820=over 4
954 } 1048 }
955 1049
956 0 1050 0
957} 1051}
958 1052
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1054
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1056
963Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
964 1058
1017 1111
1018sub reattach { 1112sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1114 my ($obj) = @_;
1021 1115
1116 # no longer needed after getting rid of delete_package?
1022 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
1023 1118
1024 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
1025 1120
1026 @$registry = (); 1121 @$registry = ();
1027 1122
1042cf::attachable->attach ( 1137cf::attachable->attach (
1043 prio => -1000000, 1138 prio => -1000000,
1044 on_instantiate => sub { 1139 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
1046 1141
1047 $data = from_json $data; 1142 $data = decode_json $data;
1048 1143
1049 for (@$data) { 1144 for (@$data) {
1050 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
1051 1146
1052 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1168 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
1076 1171
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1176 aio_close $fh;
1082 1177
1083 if (@$objs) { 1178 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1184 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1186 }
1092 } else { 1187 } else {
1093 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1094 } 1189 }
1263 1358
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1361
1267 $ext{source} = 1362 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1270 . $source 1365 . $source
1271 . "\n};\n1"; 1366 . "\n};\n1";
1272 1367
1273 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1291 1386
1292 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1388 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1390 }
1297 1391
1298 warn $msg; 1392 warn $msg;
1299 } 1393 }
1300 1394
1314 1408
1315=back 1409=back
1316 1410
1317=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1318 1412
1319Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1320 1414
1321=cut 1415=cut
1322 1416
1323package cf::player; 1417package cf::player;
1324 1418
1367 1461
1368sub exists($) { 1462sub exists($) {
1369 my ($login) = @_; 1463 my ($login) = @_;
1370 1464
1371 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1373} 1467}
1374 1468
1375sub find($) { 1469sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1471 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1483 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1484 or return;
1391 1485
1392 my $pl = cf::player::load_pl $f 1486 my $pl = cf::player::load_pl $f
1393 or return; 1487 or return;
1488
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1489 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1490 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1397 } 1492 }
1398 } 1493 }
1408 1503
1409 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1410 1505
1411 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1508
1509 cf::get_slot 0.01;
1413 1510
1414 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1512 cf::cede_to_tick;
1416} 1513}
1417 1514
1449 my ($pl) = @_; 1546 my ($pl) = @_;
1450 1547
1451 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1452 1549
1453 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1454 $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
1455 1552
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1460 1559
1461 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1600
1502 for my $login (@$dirs) { 1601 for my $login (@$dirs) {
1503 my $path = path $login; 1602 my $path = path $login;
1504 1603
1505 # a .pst is a dead give-away for a valid player 1604 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1605 # if no pst file found, open and chekc for blocked users
1606 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1610 }
1511 1611
1542 } 1642 }
1543 1643
1544 \@paths 1644 \@paths
1545} 1645}
1546 1646
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1648
1549Expand crossfire pod fragments into protocol xml. 1649Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1650
1637=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1638 1652
1639Sends an ext reply to the player. 1653Sends an ext reply to the player.
1640 1654
1707our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1709 1723
1710sub generate_random_map { 1724sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1730 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1855
1839# the temporary/swap location 1856# the temporary/swap location
1840sub save_path { 1857sub save_path {
1841 my ($self) = @_; 1858 my ($self) = @_;
1842 1859
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1845} 1862}
1846 1863
1847# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1848sub uniq_path { 1865sub uniq_path {
1849 my ($self) = @_; 1866 my ($self) = @_;
1850 1867
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1853} 1870}
1854 1871
1855# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1856# all maps in C++... 1873# all maps in C++...
1954 1971
1955 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1957 1974
1958 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1961 1978
1962 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1963 or return; 1980 or return;
1964 1981
1965 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1968 or return; 1985 or return;
1969 1986
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1973 undef $guard1; 1991 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 1992 $map->reset;
1976 return find $path; 1993 return find $path;
1977 } 1994 }
1978 1995
1979 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2024 $f->skip_block;
2008 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
2009 or return; 2026 or return;
2010 2027
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
2012 if delete $self->{load_original}; 2029 if delete $self->{load_original};
2013 2030
2014 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2032 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2042 } 2059 }
2043 2060
2044 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2046 2063
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2065 }
2049 2066
2050 $self->post_load; 2067 $self->post_load;
2051} 2068}
2052 2069
2110 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2111 2128
2112 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2113 2130
2114 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2133 }
2117 2134
2118 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2119 2136
2120 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2174 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2160 }; 2177 };
2161 2178
2179 cf::get_slot 0.02;
2180
2162 if ($uniq) { 2181 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2184 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2174 $self->save; 2193 $self->save;
2175 2194
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2196
2178 return if $self->players; 2197 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2181 2200
2182 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2183 2202
2184 $self->deactivate; 2203 $self->deactivate;
2302 2321
2303sub unique_maps() { 2322sub unique_maps() {
2304 [ 2323 [
2305 map { 2324 map {
2306 utf8::decode $_; 2325 utf8::decode $_;
2307 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2308 ? normalise $_ 2329 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2331 ]
2312} 2332}
2313 2333
2314package cf;
2315
2316=back 2334=back
2317 2335
2318=head3 cf::object 2336=head3 cf::object
2319 2337
2320=cut 2338=cut
2323 2341
2324=over 4 2342=over 4
2325 2343
2326=item $ob->inv_recursive 2344=item $ob->inv_recursive
2327 2345
2328Returns 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.
2329 2348
2330=cut 2349=cut
2331 2350
2332sub inv_recursive_; 2351sub inv_recursive_;
2333sub inv_recursive_ { 2352sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2339} 2358}
2340 2359
2341=item $ref = $ob->ref 2360=item $ref = $ob->ref
2342 2361
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2362Creates and returns a persistent reference to an object that can be stored as a string.
2344 2363
2345=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2346 2365
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2366returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2367even if the object actually exists. May block.
2380can 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
2381dialogue with the given NPC character. 2400dialogue with the given NPC character.
2382 2401
2383=cut 2402=cut
2384 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};
2417
2385# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2419# with dialog boxes.
2387#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
2388sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2401 $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));
2402 2435
2403 } else { 2436 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2439 }
2407 } 2440 }
2408} 2441}
2409 2442
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2468
2436=item $player_object->enter_link 2469=item $player_object->enter_link
2437 2470
2438Freezes 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}>).
2439 2472
2440The 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.
2441I<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.
2442 2477
2443Will never block. 2478Will never block.
2444 2479
2445=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2446 2481
2504 2539
2505 $map->load; 2540 $map->load;
2506 $map->load_neighbours; 2541 $map->load_neighbours;
2507 2542
2508 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509 $self->activate_recursive; 2545 $self->activate_recursive;
2510 2546
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2513} 2549}
2517Moves the player to the given map-path and coordinates by first freezing 2553Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2519that 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
2520the 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
2521be called at the end of this process. 2557be called at the end of this process.
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 >>.
2522 2561
2523=cut 2562=cut
2524 2563
2525our $GOTOGEN; 2564our $GOTOGEN;
2526 2565
2605} 2644}
2606 2645
2607sub prepare_random_map { 2646sub prepare_random_map {
2608 my ($exit) = @_; 2647 my ($exit) = @_;
2609 2648
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2651 # that depends on the exit object
2615 2652
2616 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2655 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2623 } 2662 }
2624 2663
2625 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2626 2665
2627 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2630 2669
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2672 undef $fh;
2634 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2635 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2638 } 2681 }
2639} 2682}
2640 2683
2641sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2643 2686
2644 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2645 2688
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2689 $self->enter_link;
2658 2690
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2691 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2665 2693
2666 $self->deactivate_recursive; # just to be sure
2667 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
2668 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2669 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
2670 1; 2715 1
2671 }) { 2716 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "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. "
2674 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2721
2677 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2743 id => "infobox", 2788 id => "infobox",
2744 title => "Body Parts", 2789 title => "Body Parts",
2745 reply => undef, 2790 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2791 tooltip => "Shows which body parts you posess and are available",
2747 }, 2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2748 "c/uptime" => { 2799 "c/uptime" => {
2749 id => "infobox", 2800 id => "infobox",
2750 title => "Uptime", 2801 title => "Uptime",
2751 reply => undef, 2802 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 2803 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 2806 id => "infobox",
2756 title => "Map Info", 2807 title => "Map Info",
2757 reply => undef, 2808 reply => undef,
2758 tooltip => "Information related to the maps", 2809 tooltip => "Information related to the maps",
2759 }, 2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2760); 2817);
2761 2818
2762sub cf::client::send_msg { 2819sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2821
2765 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2766 2824
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 2826
2769 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2791 if ($self->can_msg) { 2849 if ($self->can_msg) {
2792 # default colour, mask it out 2850 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2795 2853
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2797 [$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);
2798 } else { 2870 } else {
2799 if ($color >= 0) { 2871 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2801 for ($msg) { 2873 for ($msg) {
2802 1 while 2874 1 while
3001 3073
3002The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
3003 3075
3004 cf::object 3076 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3077 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3007 3079
3008 cf::object::player 3080 cf::object::player
3009 player 3081 player
3010 3082
3011 cf::player 3083 cf::player
3016 3088
3017=cut 3089=cut
3018 3090
3019for ( 3091for (
3020 ["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
3021 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
3023 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
3026) { 3098) {
3027 no strict 'refs'; 3099 no strict 'refs';
3132 { 3204 {
3133 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3134 3206
3135 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3137 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3139 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};
3140 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};
3141 3214
3142 cf::cede_to_tick; 3215 cf::cede_to_tick;
3143 } 3216 }
3144 3217
3145 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3147 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3148 or next; 3222 or next;
3223
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3227 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3246 {
3172 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3175 3250
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3254 my $data;
3181 3255
3182 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3183 # prepend meta info 3257 # prepend meta info
3184 3258
3185 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3186 name => $name, 3260 name => $name,
3187 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3188 }); 3262 });
3189 3263
3190 $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};
3191 } else { 3271 } else {
3192 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3193 } 3273 }
3194 3274
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3275 cf::cede_to_tick;
3199 } 3276 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3280
3220 1 3281 1
3221} 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});
3222 3303
3223register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3225 3306
3226 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3228 } 3309 }
3229}; 3310};
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}
3230 3321
3231sub reload_regions { 3322sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3323 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3324 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3339}
3249 3340
3250sub reload_archetypes { 3341sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3344}
3259 3345
3260sub reload_treasures { 3346sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3263} 3349}
3264 3350
3265sub reload_resources { 3351sub reload_resources {
3266 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3267 3353
3354 reload_facedata;
3355 reload_archetypes;
3268 reload_regions; 3356 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3357 reload_treasures;
3273 3358
3274 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3360}
3280 3361
3281sub reload_config { 3362sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3364 or return;
3284 3365
3285 local $/; 3366 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3287 3368
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3370
3290 $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};
3291 $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};
3297 }; 3378 };
3298 warn $@ if $@; 3379 warn $@ if $@;
3299 } 3380 }
3300} 3381}
3301 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
3302sub 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
3303 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3305 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#
3306 (async { 3421 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3423 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3310 }; 3425 };
3311 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3312 reload_config; 3431 reload_config;
3313 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
3314 load_extensions; 3445 load_extensions;
3315 3446
3316 $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
3317 Event::loop; 3455 EV::loop;
3318} 3456}
3319 3457
3320############################################################################# 3458#############################################################################
3321# initialisation and cleanup 3459# initialisation and cleanup
3322 3460
3323# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3324BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3333 },
3334 ); 3467 };
3335 } 3468 }
3336} 3469}
3337 3470
3338sub write_runtime { 3471sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3343 3474
3344 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3476
3346 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3347 3478
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349 or return; 3480 or return;
3350 3481
3351 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3364 3495
3365 close $fh 3496 close $fh
3366 or return; 3497 or return;
3367 3498
3368 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3500 and return;
3370 3501
3371 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3372 3503
3373 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 unless ($value) {
3524 warn "cowardly refusing to write zero uuid 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 };
3374} 3555}
3375 3556
3376sub emergency_save() { 3557sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
3378 3559
3400 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
3401 3582
3402 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
3404 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";
3405 }; 3590 };
3406 3591
3407 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
3408} 3593}
3409 3594
3410sub post_cleanup { 3595sub post_cleanup {
3411 my ($make_core) = @_; 3596 my ($make_core) = @_;
3412 3597
3413 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
3414 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#
3415} 3629}
3416 3630
3417sub do_reload_perl() { 3631sub do_reload_perl() {
3418 # can/must only be called in main 3632 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
3421 return; 3635 return;
3422 } 3636 }
3423 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
3424 warn "reloading..."; 3641 warn "reloading...";
3425 3642
3426 warn "entering sync_job"; 3643 warn "entering sync_job";
3427 3644
3428 cf::sync_job { 3645 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3647 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
3432 3649
3433 warn "syncing database to disk"; 3650 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3652
3436 # 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
3437 3654
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3658 }
3475 3659
3476 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
3478 } 3662 %EXT_CORO = ();
3479 3663
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3673 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3674
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
3491 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
3492 } 3684 }
3493 3685
3494 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;
3495 } 3701 }
3496 3702
3497 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
3499 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);
3500 3706
3501 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
3504 3710
3505 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3712 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
3508 3714
3509 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
3510 3716
3511 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
3512 require cf; 3718 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3720
3515 warn "loading config and database again"; 3721 warn "loading config and database again";
3516 cf::reload_config; 3722 cf::reload_config;
3517 3723
3518 warn "loading extensions"; 3724 warn "loading extensions";
3519 cf::load_extensions; 3725 cf::load_extensions;
3520 3726
3521 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
3527 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
3528 warn "leaving sync_job"; 3737 warn "leaving sync_job";
3529 3738
3530 1 3739 1
3531 } or do { 3740 } or do {
3532 warn $@; 3741 warn $@;
3533 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3743 };
3536 3744
3537 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
3538}; 3748};
3539 3749
3540our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
3541 3751
3542sub reload_perl() { 3752sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
3545 3755
3546 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3757 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
3553 },
3554 ); 3759 };
3555} 3760}
3556 3761
3557register_command "reload" => sub { 3762register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
3559 3764
3572 3777
3573our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
3575 3780
3576sub wait_for_tick { 3781sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3783
3580 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3786 $signal->wait;
3583} 3787}
3584 3788
3585sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3791
3589 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3794 $signal->wait;
3592} 3795}
3593 3796
3594$TICK_WATCHER = Event->timer ( 3797sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
3602 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"
3603 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
3604 return; 3801 return;
3605 } 3802 }
3606 3803
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
3610 3805
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3808 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3809 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3810 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3811 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3812 };
3813 }
3622 3814
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3816 $sig->send;
3625 } 3817 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3819 $sig->send;
3628 } 3820 }
3629 3821
3630 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3824
3641 _post_tick; 3825 if (0) {
3826 if ($NEXT_TICK) {
3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3642 }, 3831 }
3643); 3832}
3644 3833
3645{ 3834{
3835 # configure BDB
3836
3646 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3838 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3839 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3840
3672 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3842 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3843 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 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;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3846 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3847 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3848
3679 cf::sync_job { 3849 cf::sync_job {
3680 eval { 3850 eval {
3690 3860
3691 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3862 };
3693 } 3863 }
3694 3864
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3865 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3866 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3867 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3868 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3869 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3870 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3871 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3872 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3873 };
3725} 3874}
3726 3875
3727{ 3876{
3877 # configure IO::AIO
3878
3728 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3882}
3741 3883
3742my $_log_backtrace; 3884my $_log_backtrace;
3743 3885
3744sub _log_backtrace { 3886sub _log_backtrace {
3747 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3748 3890
3749 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3752 async { 3895 async {
3753 $Coro::current->{desc} = "abt $msg"; 3896 $Coro::current->{desc} = "abt $msg";
3754 3897
3755 my @bt = fork_call { 3898 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3767 } 3910 }
3768 3911
3769 @funcs 3912 @funcs
3770 }; 3913 };
3771 3914
3772 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 3918 --$_log_backtrace;
3775 }; 3919 };
3776 } else { 3920 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines