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.394 by root, Thu Nov 8 19:43:25 2007 UTC vs.
Revision 1.456 by root, Tue Sep 30 04:00:35 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
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
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 }
1095 1190
1096 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
1097 } else { 1195 } else {
1098 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
1099 } 1197 }
1100 } else { 1198 } else {
1101 aio_unlink $filename; 1199 aio_unlink $filename;
1263 1361
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1364
1267 $ext{source} = 1365 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1270 . $source 1368 . $source
1271 . "\n};\n1"; 1369 . "\n};\n1";
1272 1370
1273 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1291 1389
1292 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1391 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1393 }
1297 1394
1298 warn $msg; 1395 warn $msg;
1299 } 1396 }
1300 1397
1314 1411
1315=back 1412=back
1316 1413
1317=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1318 1415
1319Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1320 1417
1321=cut 1418=cut
1322 1419
1323package cf::player; 1420package cf::player;
1324 1421
1367 1464
1368sub exists($) { 1465sub exists($) {
1369 my ($login) = @_; 1466 my ($login) = @_;
1370 1467
1371 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1373} 1470}
1374 1471
1375sub find($) { 1472sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1474 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1486 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1487 or return;
1391 1488
1392 my $pl = cf::player::load_pl $f 1489 my $pl = cf::player::load_pl $f
1393 or return; 1490 or return;
1491
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1492 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1493 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1397 } 1495 }
1398 } 1496 }
1408 1506
1409 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1410 1508
1411 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1511
1512 cf::get_slot 0.01;
1413 1513
1414 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1515 cf::cede_to_tick;
1416} 1516}
1417 1517
1449 my ($pl) = @_; 1549 my ($pl) = @_;
1450 1550
1451 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1452 1552
1453 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1554 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1555
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1460 1562
1461 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1603
1502 for my $login (@$dirs) { 1604 for my $login (@$dirs) {
1503 my $path = path $login; 1605 my $path = path $login;
1504 1606
1505 # a .pst is a dead give-away for a valid player 1607 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1608 # if no pst file found, open and chekc for blocked users
1609 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1613 }
1511 1614
1542 } 1645 }
1543 1646
1544 \@paths 1647 \@paths
1545} 1648}
1546 1649
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1651
1549Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1653
1640=item $player->ext_reply ($msgid, @msg) 1654=item $player->ext_reply ($msgid, @msg)
1641 1655
1642Sends an ext reply to the player. 1656Sends an ext reply to the player.
1643 1657
1710our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1712 1726
1713sub generate_random_map { 1727sub generate_random_map {
1714 my ($self, $rmp) = @_; 1728 my ($self, $rmp) = @_;
1729
1730 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1731
1715 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1733 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1841 1858
1842# the temporary/swap location 1859# the temporary/swap location
1843sub save_path { 1860sub save_path {
1844 my ($self) = @_; 1861 my ($self) = @_;
1845 1862
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1848} 1865}
1849 1866
1850# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1851sub uniq_path { 1868sub uniq_path {
1852 my ($self) = @_; 1869 my ($self) = @_;
1853 1870
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1856} 1873}
1857 1874
1858# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1859# all maps in C++... 1876# all maps in C++...
1957 1974
1958 cf::lock_wait "map_data:$path";#d#remove 1975 cf::lock_wait "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1960 1977
1961 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1980 my $guard2 = cf::lock_acquire "map_find:$path";
1964 1981
1965 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1966 or return; 1983 or return;
1967 1984
1968 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1971 or return; 1988 or return;
1972 1989
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1976 undef $guard1; 1994 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 1995 $map->reset;
1979 return find $path; 1996 return find $path;
1980 } 1997 }
1981 1998
1982 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2027 $f->skip_block;
2011 $self->_load_objects ($f) 2028 $self->_load_objects ($f)
2012 or return; 2029 or return;
2013 2030
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
2015 if delete $self->{load_original}; 2032 if delete $self->{load_original};
2016 2033
2017 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2035 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2036 unless (aio_stat $uniq) {
2045 } 2062 }
2046 2063
2047 $self->{last_save} = $cf::RUNTIME; 2064 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2065 $self->last_access ($cf::RUNTIME);
2049 2066
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2068 }
2052 2069
2053 $self->post_load; 2070 $self->post_load;
2054} 2071}
2055 2072
2113 my ($path, $origin, $load) = @_; 2130 my ($path, $origin, $load) = @_;
2114 2131
2115 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
2116 2133
2117 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2136 }
2120 2137
2121 $MAP_PREFETCH{$path} |= $load; 2138 $MAP_PREFETCH{$path} |= $load;
2122 2139
2123 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2160 cf::async { 2177 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2178 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
2163 }; 2180 };
2164 2181
2182 cf::get_slot 0.02;
2183
2165 if ($uniq) { 2184 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2187 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2188 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 $self->save; 2196 $self->save;
2178 2197
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2199
2181 return if $self->players; 2200 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2202 return if $self->{deny_save};
2184 2203
2185 $self->in_memory (cf::MAP_SWAPPED); 2204 $self->in_memory (cf::MAP_SWAPPED);
2186 2205
2187 $self->deactivate; 2206 $self->deactivate;
2305 2324
2306sub unique_maps() { 2325sub unique_maps() {
2307 [ 2326 [
2308 map { 2327 map {
2309 utf8::decode $_; 2328 utf8::decode $_;
2310 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2311 ? normalise $_ 2332 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2334 ]
2315} 2335}
2316 2336
2317package cf;
2318
2319=back 2337=back
2320 2338
2321=head3 cf::object 2339=head3 cf::object
2322 2340
2323=cut 2341=cut
2326 2344
2327=over 4 2345=over 4
2328 2346
2329=item $ob->inv_recursive 2347=item $ob->inv_recursive
2330 2348
2331Returns the inventory of the object _and_ their inventories, recursively. 2349Returns the inventory of the object I<and> their inventories, recursively,
2350but I<not> the object itself.
2332 2351
2333=cut 2352=cut
2334 2353
2335sub inv_recursive_; 2354sub inv_recursive_;
2336sub inv_recursive_ { 2355sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2342} 2361}
2343 2362
2344=item $ref = $ob->ref 2363=item $ref = $ob->ref
2345 2364
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2365Creates and returns a persistent reference to an object that can be stored as a string.
2347 2366
2348=item $ob = cf::object::deref ($refstring) 2367=item $ob = cf::object::deref ($refstring)
2349 2368
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2369returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2370even if the object actually exists. May block.
2383can be C<undef>. Does the right thing when the player is currently in a 2402can be C<undef>. Does the right thing when the player is currently in a
2384dialogue with the given NPC character. 2403dialogue with the given NPC character.
2385 2404
2386=cut 2405=cut
2387 2406
2407our $SAY_CHANNEL = {
2408 id => "say",
2409 title => "Map",
2410 reply => "say ",
2411 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2412};
2413
2414our $CHAT_CHANNEL = {
2415 id => "chat",
2416 title => "Chat",
2417 reply => "chat ",
2418 tooltip => "Player chat and shouts, global to the server.",
2419};
2420
2388# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2422# with dialog boxes.
2390#TODO: the first argument must go, split into a $npc->reply_to ( method 2423#TODO: the first argument must go, split into a $npc->reply_to ( method
2391sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2425 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2404 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2405 2438
2406 } else { 2439 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2442 }
2410 } 2443 }
2411} 2444}
2412 2445
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2446=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2471
2439=item $player_object->enter_link 2472=item $player_object->enter_link
2440 2473
2441Freezes the player and moves him/her to a special map (C<{link}>). 2474Freezes the player and moves him/her to a special map (C<{link}>).
2442 2475
2443The player should be reasonably safe there for short amounts of time. You 2476The player should be reasonably safe there for short amounts of time (e.g.
2444I<MUST> call C<leave_link> as soon as possible, though. 2477for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2478though, as the palyer cannot control the character while it is on the link
2479map.
2445 2480
2446Will never block. 2481Will never block.
2447 2482
2448=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2449 2484
2507 2542
2508 $map->load; 2543 $map->load;
2509 $map->load_neighbours; 2544 $map->load_neighbours;
2510 2545
2511 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2512 $self->activate_recursive; 2548 $self->activate_recursive;
2513 2549
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2516} 2552}
2520Moves the player to the given map-path and coordinates by first freezing 2556Moves the player to the given map-path and coordinates by first freezing
2521her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2522that has to return the map if sucecssful, and then unfreezes the player on 2558that has to return the map if sucecssful, and then unfreezes the player on
2523the new (success) or old (failed) map position. In either case, $done will 2559the new (success) or old (failed) map position. In either case, $done will
2524be called at the end of this process. 2560be called at the end of this process.
2561
2562Note that $check will be called with a potentially non-loaded map, so if
2563it needs a loaded map it has to call C<< ->load >>.
2525 2564
2526=cut 2565=cut
2527 2566
2528our $GOTOGEN; 2567our $GOTOGEN;
2529 2568
2608} 2647}
2609 2648
2610sub prepare_random_map { 2649sub prepare_random_map {
2611 my ($exit) = @_; 2650 my ($exit) = @_;
2612 2651
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2654 # that depends on the exit object
2618 2655
2619 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2658 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2626 } 2665 }
2627 2666
2628 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2629 2668
2630 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2633 2672
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2675 undef $fh;
2637 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2638 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2641 } 2684 }
2642} 2685}
2643 2686
2644sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2646 2689
2647 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2648 2691
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2692 $self->enter_link;
2661 2693
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2694 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2695 $Coro::current->{desc} = "enter_exit";
2668 2696
2669 $self->deactivate_recursive; # just to be sure
2670 unless (eval { 2697 unless (eval {
2698 $self->deactivate_recursive; # just to be sure
2699
2700 # random map handling
2701 {
2702 my $guard = cf::lock_acquire "exit_prepare:$exit";
2703
2704 prepare_random_map $exit
2705 if $exit->slaying eq "/!";
2706 }
2707
2708 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2709 my $x = $exit->stats->hp;
2710 my $y = $exit->stats->sp;
2711
2671 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2672 2713
2714 # if exit is damned, update players death & WoR home-position
2715 $self->contr->savebed ($map, $x, $y)
2716 if $exit->flag (cf::FLAG_DAMNED);
2717
2673 1; 2718 1
2674 }) { 2719 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "I'll try to bring you back to the map you were before. " 2721 . "I'll try to bring you back to the map you were before. "
2677 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2724
2680 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2746 id => "infobox", 2791 id => "infobox",
2747 title => "Body Parts", 2792 title => "Body Parts",
2748 reply => undef, 2793 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2794 tooltip => "Shows which body parts you posess and are available",
2750 }, 2795 },
2796 "c/skills" => {
2797 id => "infobox",
2798 title => "Skills",
2799 reply => undef,
2800 tooltip => "Shows your experience per skill and item power",
2801 },
2751 "c/uptime" => { 2802 "c/uptime" => {
2752 id => "infobox", 2803 id => "infobox",
2753 title => "Uptime", 2804 title => "Uptime",
2754 reply => undef, 2805 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 2809 id => "infobox",
2759 title => "Map Info", 2810 title => "Map Info",
2760 reply => undef, 2811 reply => undef,
2761 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2762 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2763); 2820);
2764 2821
2765sub cf::client::send_msg { 2822sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2824
2768 $msg = $self->pl->expand_cfpod ($msg); 2825 $msg = $self->pl->expand_cfpod ($msg)
2826 unless $color & cf::NDI_VERBATIM;
2769 2827
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 2828 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 2829
2772 # check predefined channels, for the benefit of C 2830 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 2831 if ($CHANNEL{$channel}) {
2794 if ($self->can_msg) { 2852 if ($self->can_msg) {
2795 # default colour, mask it out 2853 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2798 2856
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2860 );
2861
2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2865
2866 # split very large packets
2867 if (8192 < length $pkt and $self->{can_lzf}) {
2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2869 $pkt = "frag";
2870 }
2871
2872 $self->send_packet ($pkt);
2801 } else { 2873 } else {
2802 if ($color >= 0) { 2874 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones 2875 # replace some tags by gcfclient-compatible ones
2804 for ($msg) { 2876 for ($msg) {
2805 1 while 2877 1 while
3004 3076
3005The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
3006 3078
3007 cf::object 3079 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3080 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3081 insert remove name archname title slaying race decrease split
3010 3082
3011 cf::object::player 3083 cf::object::player
3012 player 3084 player
3013 3085
3014 cf::player 3086 cf::player
3019 3091
3020=cut 3092=cut
3021 3093
3022for ( 3094for (
3023 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3024 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp)],
3026 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
3028 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3029) { 3101) {
3030 no strict 'refs'; 3102 no strict 'refs';
3135 { 3207 {
3136 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
3137 3209
3138 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
3140 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3217
3145 cf::cede_to_tick; 3218 cf::cede_to_tick;
3146 } 3219 }
3147 3220
3148 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
3150 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
3151 or next; 3225 or next;
3226
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3230 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
3174 { 3249 {
3175 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
3178 3253
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3257 my $data;
3184 3258
3185 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
3186 # prepend meta info 3260 # prepend meta info
3187 3261
3188 my $meta = $enc->encode ({ 3262 my $meta = $enc->encode ({
3189 name => $name, 3263 name => $name,
3190 %{ $info->{meta} || {} }, 3264 %{ $info->{meta} || {} },
3191 }); 3265 });
3192 3266
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3194 } else { 3274 } else {
3195 $data = $info->{data}; 3275 $RESOURCE{$name} = $info;
3196 } 3276 }
3197 3277
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3278 cf::cede_to_tick;
3202 } 3279 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3283
3223 1 3284 1
3224} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3225 3306
3226register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3228 3309
3229 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3231 } 3312 }
3232}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3233 3324
3234sub reload_regions { 3325sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3327 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3342}
3252 3343
3253sub reload_archetypes { 3344sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3347}
3262 3348
3263sub reload_treasures { 3349sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3266} 3352}
3267 3353
3268sub reload_resources { 3354sub reload_resources {
3269 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3270 3356
3357 reload_facedata;
3358 reload_archetypes;
3271 reload_regions; 3359 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3360 reload_treasures;
3276 3361
3277 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3363}
3283 3364
3284sub reload_config { 3365sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3367 or return;
3287 3368
3288 local $/; 3369 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3290 3371
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3373
3293 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3294 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3300 }; 3381 };
3301 warn $@ if $@; 3382 warn $@ if $@;
3302 } 3383 }
3303} 3384}
3304 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3305sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417 cf::init_block;
3418
3419 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3420
3306 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
3308 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3423 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3309 (async { 3424 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3426 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
3313 }; 3428 };
3314 3429
3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3315 reload_config; 3434 reload_config;
3316 db_init; 3435 db_init;
3436
3437 cf::load_settings;
3438 cf::load_materials;
3439 cf::init_uuid;
3440 cf::init_signals;
3441 cf::init_commands;
3442 cf::init_skills;
3443
3444 cf::init_beforeplay;
3445
3446 atomic;
3447
3317 load_extensions; 3448 load_extensions;
3318 3449
3319 $TICK_WATCHER->start; 3450 utime time, time, $RUNTIMEFILE;
3451
3452 # no (long-running) fork's whatsoever before this point(!)
3453 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3454
3455 (pop @POST_INIT)->(0) while @POST_INIT;
3456 };
3457
3320 Event::loop; 3458 EV::loop;
3321} 3459}
3322 3460
3323############################################################################# 3461#############################################################################
3324# initialisation and cleanup 3462# initialisation and cleanup
3325 3463
3326# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
3327BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
3336 },
3337 ); 3470 };
3338 } 3471 }
3339} 3472}
3340 3473
3341sub write_runtime { 3474sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
3346 3477
3347 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3479
3349 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
3350 3481
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352 or return; 3483 or return;
3353 3484
3354 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
3367 3498
3368 close $fh 3499 close $fh
3369 or return; 3500 or return;
3370 3501
3371 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3503 and return;
3373 3504
3374 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
3375 3506
3376 1 3507 1
3508}
3509
3510our $uuid_lock;
3511our $uuid_skip;
3512
3513sub write_uuid_sync($) {
3514 $uuid_skip ||= $_[0];
3515
3516 return if $uuid_lock;
3517 local $uuid_lock = 1;
3518
3519 my $uuid = "$LOCALDIR/uuid";
3520
3521 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3522 or return;
3523
3524 my $value = uuid_seq uuid_cur;
3525
3526 unless ($value) {
3527 warn "cowardly refusing to write zero uuid value!\n";
3528 return;
3529 }
3530
3531 my $value = uuid_str $value + $uuid_skip;
3532 $uuid_skip = 0;
3533
3534 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3535 and return;
3536
3537 # always fsync - this file is important
3538 aio_fsync $fh
3539 and return;
3540
3541 close $fh
3542 or return;
3543
3544 aio_rename "$uuid~", $uuid
3545 and return;
3546
3547 warn "uuid file written ($value).\n";
3548
3549 1
3550
3551}
3552
3553sub write_uuid($$) {
3554 my ($skip, $sync) = @_;
3555
3556 $sync ? write_uuid_sync $skip
3557 : async { write_uuid_sync $skip };
3377} 3558}
3378 3559
3379sub emergency_save() { 3560sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
3381 3562
3403 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
3404 3585
3405 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
3407 warn "end emergency database checkpoint\n"; 3588 warn "end emergency database checkpoint\n";
3589
3590 warn "begin write uuid\n";
3591 write_uuid_sync 1;
3592 warn "end write uuid\n";
3408 }; 3593 };
3409 3594
3410 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
3411} 3596}
3412 3597
3413sub post_cleanup { 3598sub post_cleanup {
3414 my ($make_core) = @_; 3599 my ($make_core) = @_;
3415 3600
3416 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
3417 if $make_core; 3602 if $make_core;
3603
3604 my $fh = pidfile;
3605 unlink $PIDFILE if <$fh> == $$;
3606}
3607
3608# a safer delete_package, copied from Symbol
3609sub clear_package($) {
3610 my $pkg = shift;
3611
3612 # expand to full symbol table name if needed
3613 unless ($pkg =~ /^main::.*::$/) {
3614 $pkg = "main$pkg" if $pkg =~ /^::/;
3615 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3616 $pkg .= '::' unless $pkg =~ /::$/;
3617 }
3618
3619 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3620 my $stem_symtab = *{$stem}{HASH};
3621
3622 defined $stem_symtab and exists $stem_symtab->{$leaf}
3623 or return;
3624
3625 # clear all symbols
3626 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3627 for my $name (keys %$leaf_symtab) {
3628 _gv_clear *{"$pkg$name"};
3629# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3630 }
3631 warn "cleared package $pkg\n";#d#
3418} 3632}
3419 3633
3420sub do_reload_perl() { 3634sub do_reload_perl() {
3421 # can/must only be called in main 3635 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
3424 return; 3638 return;
3425 } 3639 }
3426 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
3427 warn "reloading..."; 3644 warn "reloading...";
3428 3645
3429 warn "entering sync_job"; 3646 warn "entering sync_job";
3430 3647
3431 cf::sync_job { 3648 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3650 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
3435 3652
3436 warn "syncing database to disk"; 3653 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3655
3439 # if anything goes wrong in here, we should simply crash as we already saved 3656 # if anything goes wrong in here, we should simply crash as we already saved
3440 3657
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3661 }
3478 3662
3479 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
3481 } 3665 %EXT_CORO = ();
3482 3666
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3676 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3677
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
3494 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
3495 } 3687 }
3496 3688
3497 Symbol::delete_package $k; 3689 warn "unloading all perl modules loaded from $LIBDIR";
3690 while (my ($k, $v) = each %INC) {
3691 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3692
3693 warn "... unloading $k";
3694 delete $INC{$k};
3695
3696 $k =~ s/\.pm$//;
3697 $k =~ s/\//::/g;
3698
3699 if (my $cb = $k->can ("unload_module")) {
3700 $cb->();
3701 }
3702
3703 clear_package $k;
3498 } 3704 }
3499 3705
3500 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
3502 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3708 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3503 3709
3504 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
3507 3713
3508 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3715 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
3511 3717
3512 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
3513 3719
3514 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
3515 require cf; 3721 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3517 3723
3518 warn "loading config and database again"; 3724 warn "loading config and database again";
3519 cf::reload_config; 3725 cf::reload_config;
3520 3726
3521 warn "loading extensions"; 3727 warn "loading extensions";
3522 cf::load_extensions; 3728 cf::load_extensions;
3523 3729
3524 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3530 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3531 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3532 3741
3533 1 3742 1
3534 } or do { 3743 } or do {
3535 warn $@; 3744 warn $@;
3536 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3746 };
3539 3747
3540 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3541}; 3751};
3542 3752
3543our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3544 3754
3545sub reload_perl() { 3755sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3548 3758
3549 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3550 reentrant => 0,
3551 after => 0,
3552 data => WF_AUTOCANCEL,
3553 cb => sub {
3554 do_reload_perl; 3760 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3556 },
3557 ); 3762 };
3558} 3763}
3559 3764
3560register_command "reload" => sub { 3765register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3562 3767
3575 3780
3576our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3578 3783
3579sub wait_for_tick { 3784sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3786
3583 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3789 $signal->wait;
3586} 3790}
3587 3791
3588sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3794
3592 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3797 $signal->wait;
3595} 3798}
3596 3799
3597$TICK_WATCHER = Event->timer ( 3800sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3605 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3802 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3606 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3607 return; 3804 return;
3608 } 3805 }
3609 3806
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3613 3808
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3811 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3813 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3815 };
3816 }
3625 3817
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3819 $sig->send;
3628 } 3820 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3822 $sig->send;
3631 } 3823 }
3632 3824
3633 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3827
3644 _post_tick; 3828 if (0) {
3829 if ($NEXT_TICK) {
3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3645 }, 3834 }
3646); 3835}
3647 3836
3648{ 3837{
3838 # configure BDB
3839
3649 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3842 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3843
3675 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 3851
3682 cf::sync_job { 3852 cf::sync_job {
3683 eval { 3853 eval {
3693 3863
3694 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3865 };
3696 } 3866 }
3697 3867
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3870 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3873 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3876 };
3728} 3877}
3729 3878
3730{ 3879{
3880 # configure IO::AIO
3881
3731 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3885}
3744 3886
3745my $_log_backtrace; 3887my $_log_backtrace;
3746 3888
3747sub _log_backtrace { 3889sub _log_backtrace {
3750 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3751 3893
3752 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3755 async { 3898 async {
3756 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3757 3900
3758 my @bt = fork_call { 3901 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3770 } 3913 }
3771 3914
3772 @funcs 3915 @funcs
3773 }; 3916 };
3774 3917
3775 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 3921 --$_log_backtrace;
3778 }; 3922 };
3779 } else { 3923 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines