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.389 by root, Sat Oct 20 04:39:57 2007 UTC vs.
Revision 1.453 by root, Tue Sep 23 04:29:11 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
1553sub expand_cfpod {
1554 ((my $self), (local $_)) = @_;
1555
1556 # escape & and <
1557 s/&/&amp;/g;
1558 s/(?<![BIUGHT])</&lt;/g;
1559
1560 # this is buggy, it needs to properly take care of nested <'s
1561
1562 1 while
1563 # replace B<>, I<>, U<> etc.
1564 s/B<([^\>]*)>/<b>$1<\/b>/
1565 || s/I<([^\>]*)>/<i>$1<\/i>/
1566 || s/U<([^\>]*)>/<u>$1<\/u>/
1567 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1568 # replace G<male|female> tags
1569 || s{G<([^>|]*)\|([^>]*)>}{
1570 $self->gender ? $2 : $1
1571 }ge
1572 # replace H<hint text>
1573 || s{H<([^\>]*)>}
1574 {
1575 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1576 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1577 "")
1578 [$self->{hintmode}]
1579 }ge;
1580
1581 # create single paragraphs (very hackish)
1582 s/(?<=\S)\n(?=\w)/ /g;
1583
1584 # compress some whitespace
1585 s/\s+\n/\n/g; # ws line-ends
1586 s/\n\n+/\n/g; # double lines
1587 s/^\n+//; # beginning lines
1588 s/\n+$//; # ending lines
1589
1590 $_
1591}
1592
1593sub hintmode {
1594 $_[0]{hintmode} = $_[1] if @_ > 1;
1595 $_[0]{hintmode}
1596}
1597 1650
1598=item $player->ext_reply ($msgid, @msg) 1651=item $player->ext_reply ($msgid, @msg)
1599 1652
1600Sends an ext reply to the player. 1653Sends an ext reply to the player.
1601 1654
1668our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1669our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1670 1723
1671sub generate_random_map { 1724sub generate_random_map {
1672 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
1673 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1674 $self->_create_random_map ( 1730 $self->_create_random_map (
1675 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1676 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1677 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1799 1855
1800# the temporary/swap location 1856# the temporary/swap location
1801sub save_path { 1857sub save_path {
1802 my ($self) = @_; 1858 my ($self) = @_;
1803 1859
1804 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1805 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1806} 1862}
1807 1863
1808# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1809sub uniq_path { 1865sub uniq_path {
1810 my ($self) = @_; 1866 my ($self) = @_;
1811 1867
1812 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1813 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1814} 1870}
1815 1871
1816# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1817# all maps in C++... 1873# all maps in C++...
1915 1971
1916 cf::lock_wait "map_data:$path";#d#remove 1972 cf::lock_wait "map_data:$path";#d#remove
1917 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1918 1974
1919 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1920 my $guard1 = cf::lock_acquire "map_find:$path";
1921 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";
1922 1978
1923 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1924 or return; 1980 or return;
1925 1981
1926 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1929 or return; 1985 or return;
1930 1986
1931 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1932 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1933 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1934 undef $guard1; 1991 undef $guard1;
1935 undef $guard2;
1936 $map->reset; 1992 $map->reset;
1937 return find $path; 1993 return find $path;
1938 } 1994 }
1939 1995
1940 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1967 my $f = new_from_file cf::object::thawer $self->{load_path}; 2023 my $f = new_from_file cf::object::thawer $self->{load_path};
1968 $f->skip_block; 2024 $f->skip_block;
1969 $self->_load_objects ($f) 2025 $self->_load_objects ($f)
1970 or return; 2026 or return;
1971 2027
1972 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1973 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1974 2030
1975 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1976 utf8::encode $uniq; 2032 utf8::encode $uniq;
1977 unless (aio_stat $uniq) { 2033 unless (aio_stat $uniq) {
2003 } 2059 }
2004 2060
2005 $self->{last_save} = $cf::RUNTIME; 2061 $self->{last_save} = $cf::RUNTIME;
2006 $self->last_access ($cf::RUNTIME); 2062 $self->last_access ($cf::RUNTIME);
2007 2063
2008 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
2009 } 2065 }
2010 2066
2011 $self->post_load; 2067 $self->post_load;
2012} 2068}
2013 2069
2071 my ($path, $origin, $load) = @_; 2127 my ($path, $origin, $load) = @_;
2072 2128
2073 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
2074 2130
2075 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
2076 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2077 } 2133 }
2078 2134
2079 $MAP_PREFETCH{$path} |= $load; 2135 $MAP_PREFETCH{$path} |= $load;
2080 2136
2081 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2118 cf::async { 2174 cf::async {
2119 $Coro::current->{desc} = "map player save"; 2175 $Coro::current->{desc} = "map player save";
2120 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
2121 }; 2177 };
2122 2178
2179 cf::get_slot 0.02;
2180
2123 if ($uniq) { 2181 if ($uniq) {
2124 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2125 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2126 } else { 2184 } else {
2127 $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);
2135 $self->save; 2193 $self->save;
2136 2194
2137 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
2138 2196
2139 return if $self->players; 2197 return if $self->players;
2140 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
2141 return if $self->{deny_save}; 2199 return if $self->{deny_save};
2142 2200
2143 $self->in_memory (cf::MAP_SWAPPED); 2201 $self->in_memory (cf::MAP_SWAPPED);
2144 2202
2145 $self->deactivate; 2203 $self->deactivate;
2263 2321
2264sub unique_maps() { 2322sub unique_maps() {
2265 [ 2323 [
2266 map { 2324 map {
2267 utf8::decode $_; 2325 utf8::decode $_;
2268 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
2269 ? normalise $_ 2329 : normalise $_
2270 : ()
2271 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
2272 ] 2331 ]
2273} 2332}
2274 2333
2275package cf;
2276
2277=back 2334=back
2278 2335
2279=head3 cf::object 2336=head3 cf::object
2280 2337
2281=cut 2338=cut
2284 2341
2285=over 4 2342=over 4
2286 2343
2287=item $ob->inv_recursive 2344=item $ob->inv_recursive
2288 2345
2289Returns 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.
2290 2348
2291=cut 2349=cut
2292 2350
2293sub inv_recursive_; 2351sub inv_recursive_;
2294sub inv_recursive_ { 2352sub inv_recursive_ {
2299 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2300} 2358}
2301 2359
2302=item $ref = $ob->ref 2360=item $ref = $ob->ref
2303 2361
2304creates 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.
2305 2363
2306=item $ob = cf::object::deref ($refstring) 2364=item $ob = cf::object::deref ($refstring)
2307 2365
2308returns 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,
2309even if the object actually exists. May block. 2367even if the object actually exists. May block.
2341can 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
2342dialogue with the given NPC character. 2400dialogue with the given NPC character.
2343 2401
2344=cut 2402=cut
2345 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
2346# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2347# with dialog boxes. 2419# with dialog boxes.
2348#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
2349sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
2350 my ($self, $npc, $msg, $flags) = @_; 2422 my ($self, $npc, $msg, $flags) = @_;
2361 my $dialog = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2362 $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));
2363 2435
2364 } else { 2436 } else {
2365 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2366 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2367 } 2439 }
2368 } 2440 }
2369} 2441}
2370 2442
2371=item $object->send_msg ($channel, $msg, $color, [extra...]) 2443=item $object->send_msg ($channel, $msg, $color, [extra...])
2396 2468
2397=item $player_object->enter_link 2469=item $player_object->enter_link
2398 2470
2399Freezes 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}>).
2400 2472
2401The 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.
2402I<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.
2403 2477
2404Will never block. 2478Will never block.
2405 2479
2406=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2407 2481
2465 2539
2466 $map->load; 2540 $map->load;
2467 $map->load_neighbours; 2541 $map->load_neighbours;
2468 2542
2469 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2470 $self->activate_recursive; 2545 $self->activate_recursive;
2471 2546
2472 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2473 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2474} 2549}
2478Moves 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
2479her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2480that 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
2481the 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
2482be 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 >>.
2483 2561
2484=cut 2562=cut
2485 2563
2486our $GOTOGEN; 2564our $GOTOGEN;
2487 2565
2566} 2644}
2567 2645
2568sub prepare_random_map { 2646sub prepare_random_map {
2569 my ($exit) = @_; 2647 my ($exit) = @_;
2570 2648
2571 my $guard = cf::lock_acquire "exit_prepare:$exit";
2572
2573 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2574 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2575 # that depends on the exit object 2651 # that depends on the exit object
2576 2652
2577 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
2579 if ($exit->map) { 2655 if ($exit->map) {
2580 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2581 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2582 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2583 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2584 } 2662 }
2585 2663
2586 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2587 2665
2588 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2589 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2590 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2591 2669
2592 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2593 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2594 undef $fh; 2672 undef $fh;
2595 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2596 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2597 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2598 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2599 } 2681 }
2600} 2682}
2601 2683
2602sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2603 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2604 2686
2605 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2606 2688
2607 if ($exit->slaying eq "/!") {
2608 #TODO: this should de-fi-ni-te-ly not be a sync-job
2609 # the problem is that $exit might not survive long enough
2610 # so it needs to be done right now, right here
2611 cf::sync_job { prepare_random_map $exit };
2612 }
2613
2614 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2615 my $hp = $exit->stats->hp;
2616 my $sp = $exit->stats->sp;
2617
2618 $self->enter_link; 2689 $self->enter_link;
2619 2690
2620 # if exit is damned, update players death & WoR home-position
2621 $self->contr->savebed ($slaying, $hp, $sp)
2622 if $exit->flag (FLAG_DAMNED);
2623
2624 (async { 2691 (async {
2625 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2692 $Coro::current->{desc} = "enter_exit";
2626 2693
2627 $self->deactivate_recursive; # just to be sure
2628 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
2629 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2630 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
2631 1; 2715 1
2632 }) { 2716 }) {
2633 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2634 . "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. "
2635 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2636 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2637 2721
2638 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
2666the message, with C<log> being the default. If C<$color> is negative, suppress 2750the message, with C<log> being the default. If C<$color> is negative, suppress
2667the message unless the client supports the msg packet. 2751the message unless the client supports the msg packet.
2668 2752
2669=cut 2753=cut
2670 2754
2755# non-persistent channels (usually the info channel)
2671our %CHANNEL = ( 2756our %CHANNEL = (
2672 "c/identify" => { 2757 "c/identify" => {
2673 id => "infobox", 2758 id => "infobox",
2674 title => "Identify", 2759 title => "Identify",
2675 reply => undef, 2760 reply => undef,
2691 id => "infobox", 2776 id => "infobox",
2692 title => "Look", 2777 title => "Look",
2693 reply => undef, 2778 reply => undef,
2694 tooltip => "What you saw there", 2779 tooltip => "What you saw there",
2695 }, 2780 },
2781 "c/who" => {
2782 id => "infobox",
2783 title => "Players",
2784 reply => undef,
2785 tooltip => "Shows players who are currently online",
2786 },
2787 "c/body" => {
2788 id => "infobox",
2789 title => "Body Parts",
2790 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available",
2792 },
2793 "c/skills" => {
2794 id => "infobox",
2795 title => "Skills",
2796 reply => undef,
2797 tooltip => "Shows your experience per skill and item power",
2798 },
2799 "c/uptime" => {
2800 id => "infobox",
2801 title => "Uptime",
2802 reply => undef,
2803 tooltip => "How long the server has been running since last restart",
2804 },
2805 "c/mapinfo" => {
2806 id => "infobox",
2807 title => "Map Info",
2808 reply => undef,
2809 tooltip => "Information related to the maps",
2810 },
2811 "c/party" => {
2812 id => "party",
2813 title => "Party",
2814 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party",
2816 },
2696); 2817);
2697 2818
2698sub cf::client::send_msg { 2819sub cf::client::send_msg {
2699 my ($self, $channel, $msg, $color, @extra) = @_; 2820 my ($self, $channel, $msg, $color, @extra) = @_;
2700 2821
2701 $msg = $self->pl->expand_cfpod ($msg); 2822 $msg = $self->pl->expand_cfpod ($msg)
2823 unless $color & cf::NDI_VERBATIM;
2702 2824
2703 $color &= cf::NDI_CLIENT_MASK; # just in case... 2825 $color &= cf::NDI_CLIENT_MASK; # just in case...
2704 2826
2705 # check predefined channels, for the benefit of C 2827 # check predefined channels, for the benefit of C
2706 if ($CHANNEL{$channel}) { 2828 if ($CHANNEL{$channel}) {
2727 if ($self->can_msg) { 2849 if ($self->can_msg) {
2728 # default colour, mask it out 2850 # default colour, mask it out
2729 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2730 if $color & cf::NDI_DEF; 2852 if $color & cf::NDI_DEF;
2731 2853
2732 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2854 my $pkt = "msg "
2855 . $self->{json_coder}->encode (
2733 [$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);
2734 } else { 2870 } else {
2735 if ($color >= 0) { 2871 if ($color >= 0) {
2736 # replace some tags by gcfclient-compatible ones 2872 # replace some tags by gcfclient-compatible ones
2737 for ($msg) { 2873 for ($msg) {
2738 1 while 2874 1 while
2937 3073
2938The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2939 3075
2940 cf::object 3076 cf::object
2941 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
2942 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
2943 3079
2944 cf::object::player 3080 cf::object::player
2945 player 3081 player
2946 3082
2947 cf::player 3083 cf::player
2952 3088
2953=cut 3089=cut
2954 3090
2955for ( 3091for (
2956 ["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
2957 insert remove inv name archname title slaying race 3093 insert remove inv nrof name archname title slaying race
2958 decrease_ob_nr destroy)], 3094 decrease split destroy change_exp)],
2959 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2960 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2961 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2962) { 3098) {
2963 no strict 'refs'; 3099 no strict 'refs';
3068 { 3204 {
3069 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
3070 3206
3071 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
3072 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
3073 cf::face::set_visibility $idx, $info->{visibility}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3074 cf::face::set_magicmap $idx, $info->{magicmap}; 3211 cf::face::set_magicmap $idx, $info->{magicmap};
3075 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};
3076 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};
3077 3214
3078 cf::cede_to_tick; 3215 cf::cede_to_tick;
3079 } 3216 }
3080 3217
3081 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
3082 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
3083 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
3084 or next; 3222 or next;
3223
3085 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3086 cf::face::set_smooth $idx, $smooth; 3225 cf::face::set_smooth $idx, $smooth;
3087 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3088 } else { 3227 } else {
3089 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
3107 { 3246 {
3108 # TODO: for gcfclient pleasure, we should give resources 3247 # TODO: for gcfclient pleasure, we should give resources
3109 # that gcfclient doesn't grok a >10000 face index. 3248 # that gcfclient doesn't grok a >10000 face index.
3110 my $res = $facedata->{resource}; 3249 my $res = $facedata->{resource};
3111 3250
3112 my $soundconf = delete $res->{"res/sound.conf"};
3113
3114 while (my ($name, $info) = each %$res) { 3251 while (my ($name, $info) = each %$res) {
3252 if (defined $info->{type}) {
3115 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3253 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3116 my $data; 3254 my $data;
3117 3255
3118 if ($info->{type} & 1) { 3256 if ($info->{type} & 1) {
3119 # prepend meta info 3257 # prepend meta info
3120 3258
3121 my $meta = $enc->encode ({ 3259 my $meta = $enc->encode ({
3122 name => $name, 3260 name => $name,
3123 %{ $info->{meta} || {} }, 3261 %{ $info->{meta} || {} },
3124 }); 3262 });
3125 3263
3126 $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};
3127 } else { 3271 } else {
3128 $data = $info->{data}; 3272 $RESOURCE{$name} = $info;
3129 } 3273 }
3130 3274
3131 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3132 cf::face::set_type $idx, $info->{type};
3133
3134 cf::cede_to_tick; 3275 cf::cede_to_tick;
3135 } 3276 }
3136
3137 if ($soundconf) {
3138 $soundconf = $enc->decode (delete $soundconf->{data});
3139
3140 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3141 my $sound = $soundconf->{compat}[$_]
3142 or next;
3143
3144 my $face = cf::face::find "sound/$sound->[1]";
3145 cf::sound::set $sound->[0] => $face;
3146 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3147 }
3148
3149 while (my ($k, $v) = each %{$soundconf->{event}}) {
3150 my $face = cf::face::find "sound/$v";
3151 cf::sound::set $k => $face;
3152 }
3153 }
3154 } 3277 }
3278
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3155 3280
3156 1 3281 1
3157} 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});
3158 3303
3159register_exticmd fx_want => sub { 3304register_exticmd fx_want => sub {
3160 my ($ns, $want) = @_; 3305 my ($ns, $want) = @_;
3161 3306
3162 while (my ($k, $v) = each %$want) { 3307 while (my ($k, $v) = each %$want) {
3163 $ns->fx_want ($k, $v); 3308 $ns->fx_want ($k, $v);
3164 } 3309 }
3165}; 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}
3166 3321
3167sub reload_regions { 3322sub reload_regions {
3168 # 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
3169 # for this (global event?) 3324 # for this (global event?)
3170 %ext::player_env::MUSIC_FACE_CACHE = (); 3325 %ext::player_env::MUSIC_FACE_CACHE = ();
3184} 3339}
3185 3340
3186sub reload_archetypes { 3341sub reload_archetypes {
3187 load_resource_file "$DATADIR/archetypes" 3342 load_resource_file "$DATADIR/archetypes"
3188 or die "unable to load archetypes\n"; 3343 or die "unable to load archetypes\n";
3189 #d# NEED to laod twice to resolve forward references
3190 # this really needs to be done in an extra post-pass
3191 # (which needs to be synchronous, so solve it differently)
3192 load_resource_file "$DATADIR/archetypes"
3193 or die "unable to load archetypes\n";
3194} 3344}
3195 3345
3196sub reload_treasures { 3346sub reload_treasures {
3197 load_resource_file "$DATADIR/treasures" 3347 load_resource_file "$DATADIR/treasures"
3198 or die "unable to load treasurelists\n"; 3348 or die "unable to load treasurelists\n";
3199} 3349}
3200 3350
3201sub reload_resources { 3351sub reload_resources {
3202 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
3203 3353
3354 reload_facedata;
3355 reload_archetypes;
3204 reload_regions; 3356 reload_regions;
3205 reload_facedata;
3206 #reload_archetypes;#d#
3207 reload_archetypes;
3208 reload_treasures; 3357 reload_treasures;
3209 3358
3210 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
3211}
3212
3213sub init {
3214 reload_resources;
3215} 3360}
3216 3361
3217sub reload_config { 3362sub reload_config {
3218 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
3219 or return; 3364 or return;
3220 3365
3221 local $/; 3366 local $/;
3222 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
3223 3368
3224 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3225 3370
3226 $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};
3227 $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};
3233 }; 3378 };
3234 warn $@ if $@; 3379 warn $@ if $@;
3235 } 3380 }
3236} 3381}
3237 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
3238sub 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
3239 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
3240 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
3241 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#
3242 (async { 3421 (async {
3243 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3244 Event::one_event; 3423 EV::loop EV::LOOP_ONESHOT;
3245 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
3246 }; 3425 };
3247 3426
3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3248 reload_config; 3431 reload_config;
3249 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
3250 load_extensions; 3445 load_extensions;
3251 3446
3252 $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
3253 Event::loop; 3455 EV::loop;
3254} 3456}
3255 3457
3256############################################################################# 3458#############################################################################
3257# initialisation and cleanup 3459# initialisation and cleanup
3258 3460
3259# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
3260BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
3261 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
3262 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3263 reentrant => 0,
3264 data => WF_AUTOCANCEL,
3265 signal => $signal,
3266 prio => 0,
3267 cb => sub {
3268 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
3269 },
3270 ); 3467 };
3271 } 3468 }
3272} 3469}
3273 3470
3274sub write_runtime { 3471sub write_runtime_sync {
3275 my $runtime = "$LOCALDIR/runtime";
3276
3277 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
3278 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
3279 3474
3280 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3281 3476
3282 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
3283 3478
3284 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3285 or return; 3480 or return;
3286 3481
3287 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
3288 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
3289 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
3299 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
3300 3495
3301 close $fh 3496 close $fh
3302 or return; 3497 or return;
3303 3498
3304 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3305 and return; 3500 and return;
3306 3501
3307 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
3308 3503
3309 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_str $uuid_skip + uuid_seq uuid_cur;
3522 $uuid_skip = 0;
3523
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return;
3526
3527 # always fsync - this file is important
3528 aio_fsync $fh
3529 and return;
3530
3531 close $fh
3532 or return;
3533
3534 aio_rename "$uuid~", $uuid
3535 and return;
3536
3537 warn "uuid file written ($value).\n";
3538
3539 1
3540
3541}
3542
3543sub write_uuid($$) {
3544 my ($skip, $sync) = @_;
3545
3546 $sync ? write_uuid_sync $skip
3547 : async { write_uuid_sync $skip };
3310} 3548}
3311 3549
3312sub emergency_save() { 3550sub emergency_save() {
3313 my $freeze_guard = cf::freeze_mainloop; 3551 my $freeze_guard = cf::freeze_mainloop;
3314 3552
3336 warn "end emergency map save\n"; 3574 warn "end emergency map save\n";
3337 3575
3338 warn "begin emergency database checkpoint\n"; 3576 warn "begin emergency database checkpoint\n";
3339 BDB::db_env_txn_checkpoint $DB_ENV; 3577 BDB::db_env_txn_checkpoint $DB_ENV;
3340 warn "end emergency database checkpoint\n"; 3578 warn "end emergency database checkpoint\n";
3579
3580 warn "begin write uuid\n";
3581 write_uuid_sync 1;
3582 warn "end write uuid\n";
3341 }; 3583 };
3342 3584
3343 warn "leave emergency perl save\n"; 3585 warn "leave emergency perl save\n";
3344} 3586}
3345 3587
3346sub post_cleanup { 3588sub post_cleanup {
3347 my ($make_core) = @_; 3589 my ($make_core) = @_;
3348 3590
3349 warn Carp::longmess "post_cleanup backtrace" 3591 warn Carp::longmess "post_cleanup backtrace"
3350 if $make_core; 3592 if $make_core;
3593
3594 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$;
3596}
3597
3598# a safer delete_package, copied from Symbol
3599sub clear_package($) {
3600 my $pkg = shift;
3601
3602 # expand to full symbol table name if needed
3603 unless ($pkg =~ /^main::.*::$/) {
3604 $pkg = "main$pkg" if $pkg =~ /^::/;
3605 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3606 $pkg .= '::' unless $pkg =~ /::$/;
3607 }
3608
3609 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3610 my $stem_symtab = *{$stem}{HASH};
3611
3612 defined $stem_symtab and exists $stem_symtab->{$leaf}
3613 or return;
3614
3615 # clear all symbols
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 }
3621 warn "cleared package $pkg\n";#d#
3351} 3622}
3352 3623
3353sub do_reload_perl() { 3624sub do_reload_perl() {
3354 # can/must only be called in main 3625 # can/must only be called in main
3355 if ($Coro::current != $Coro::main) { 3626 if ($Coro::current != $Coro::main) {
3356 warn "can only reload from main coroutine"; 3627 warn "can only reload from main coroutine";
3357 return; 3628 return;
3358 } 3629 }
3359 3630
3631 return if $RELOAD++;
3632
3633 while ($RELOAD) {
3360 warn "reloading..."; 3634 warn "reloading...";
3361 3635
3362 warn "entering sync_job"; 3636 warn "entering sync_job";
3363 3637
3364 cf::sync_job { 3638 cf::sync_job {
3365 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3366 cf::emergency_save; 3640 cf::emergency_save;
3367 cf::write_runtime; # external watchdog should not bark 3641 cf::write_runtime_sync; # external watchdog should not bark
3368 3642
3369 warn "syncing database to disk"; 3643 warn "syncing database to disk";
3370 BDB::db_env_txn_checkpoint $DB_ENV; 3644 BDB::db_env_txn_checkpoint $DB_ENV;
3371 3645
3372 # if anything goes wrong in here, we should simply crash as we already saved 3646 # if anything goes wrong in here, we should simply crash as we already saved
3373 3647
3374 warn "cancelling all WF_AUTOCANCEL watchers";
3375 for (Event::all_watchers) {
3376 $_->cancel if $_->data & WF_AUTOCANCEL;
3377 }
3378
3379 warn "flushing outstanding aio requests"; 3648 warn "flushing outstanding aio requests";
3380 for (;;) {
3381 BDB::flush;
3382 IO::AIO::flush;
3383 Coro::cede_notself;
3384 last unless IO::AIO::nreqs || BDB::nreqs; 3649 while (IO::AIO::nreqs || BDB::nreqs) {
3385 warn "iterate..."; 3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3386 }
3387
3388 ++$RELOAD;
3389
3390 warn "cancelling all extension coros";
3391 $_->cancel for values %EXT_CORO;
3392 %EXT_CORO = ();
3393
3394 warn "removing commands";
3395 %COMMAND = ();
3396
3397 warn "removing ext/exti commands";
3398 %EXTCMD = ();
3399 %EXTICMD = ();
3400
3401 warn "unloading/nuking all extensions";
3402 for my $pkg (@EXTS) {
3403 warn "... unloading $pkg";
3404
3405 if (my $cb = $pkg->can ("unload")) {
3406 eval {
3407 $cb->($pkg);
3408 1
3409 } or warn "$pkg unloaded, but with errors: $@";
3410 } 3651 }
3411 3652
3412 warn "... nuking $pkg"; 3653 warn "cancelling all extension coros";
3413 Symbol::delete_package $pkg; 3654 $_->cancel for values %EXT_CORO;
3414 } 3655 %EXT_CORO = ();
3415 3656
3416 warn "unloading all perl modules loaded from $LIBDIR"; 3657 warn "removing commands";
3417 while (my ($k, $v) = each %INC) { 3658 %COMMAND = ();
3418 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3419 3659
3660 warn "removing ext/exti commands";
3661 %EXTCMD = ();
3662 %EXTICMD = ();
3663
3664 warn "unloading/nuking all extensions";
3665 for my $pkg (@EXTS) {
3420 warn "... unloading $k"; 3666 warn "... unloading $pkg";
3421 delete $INC{$k};
3422 3667
3423 $k =~ s/\.pm$//;
3424 $k =~ s/\//::/g;
3425
3426 if (my $cb = $k->can ("unload_module")) { 3668 if (my $cb = $pkg->can ("unload")) {
3669 eval {
3427 $cb->(); 3670 $cb->($pkg);
3671 1
3672 } or warn "$pkg unloaded, but with errors: $@";
3673 }
3674
3675 warn "... clearing $pkg";
3676 clear_package $pkg;
3428 } 3677 }
3429 3678
3430 Symbol::delete_package $k; 3679 warn "unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682
3683 warn "... unloading $k";
3684 delete $INC{$k};
3685
3686 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g;
3688
3689 if (my $cb = $k->can ("unload_module")) {
3690 $cb->();
3691 }
3692
3693 clear_package $k;
3431 } 3694 }
3432 3695
3433 warn "getting rid of safe::, as good as possible"; 3696 warn "getting rid of safe::, as good as possible";
3434 Symbol::delete_package "safe::$_" 3697 clear_package "safe::$_"
3435 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3436 3699
3437 warn "unloading cf.pm \"a bit\""; 3700 warn "unloading cf.pm \"a bit\"";
3438 delete $INC{"cf.pm"}; 3701 delete $INC{"cf.pm"};
3439 delete $INC{"cf/pod.pm"}; 3702 delete $INC{"cf/pod.pm"};
3440 3703
3441 # don't, removes xs symbols, too, 3704 # don't, removes xs symbols, too,
3442 # and global variables created in xs 3705 # and global variables created in xs
3443 #Symbol::delete_package __PACKAGE__; 3706 #clear_package __PACKAGE__;
3444 3707
3445 warn "unload completed, starting to reload now"; 3708 warn "unload completed, starting to reload now";
3446 3709
3447 warn "reloading cf.pm"; 3710 warn "reloading cf.pm";
3448 require cf; 3711 require cf;
3449 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3450 3713
3451 warn "loading config and database again"; 3714 warn "loading config and database again";
3452 cf::reload_config; 3715 cf::reload_config;
3453 3716
3454 warn "loading extensions"; 3717 warn "loading extensions";
3455 cf::load_extensions; 3718 cf::load_extensions;
3456 3719
3457 warn "reattaching attachments to objects/players"; 3720 warn "reattaching attachments to objects/players";
3458 _global_reattach; # objects, sockets 3721 _global_reattach; # objects, sockets
3459 warn "reattaching attachments to maps"; 3722 warn "reattaching attachments to maps";
3460 reattach $_ for values %MAP; 3723 reattach $_ for values %MAP;
3461 warn "reattaching attachments to players"; 3724 warn "reattaching attachments to players";
3462 reattach $_ for values %PLAYER; 3725 reattach $_ for values %PLAYER;
3463 3726
3727 warn "running post_load";
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729
3464 warn "leaving sync_job"; 3730 warn "leaving sync_job";
3465 3731
3466 1 3732 1
3467 } or do { 3733 } or do {
3468 warn $@; 3734 warn $@;
3469 warn "error while reloading, exiting."; 3735 cf::cleanup "error while reloading, exiting.";
3470 exit 1;
3471 }; 3736 };
3472 3737
3473 warn "reloaded"; 3738 warn "reloaded";
3739 --$RELOAD;
3740 }
3474}; 3741};
3475 3742
3476our $RELOAD_WATCHER; # used only during reload 3743our $RELOAD_WATCHER; # used only during reload
3477 3744
3478sub reload_perl() { 3745sub reload_perl() {
3479 # doing reload synchronously and two reloads happen back-to-back, 3746 # doing reload synchronously and two reloads happen back-to-back,
3480 # coro crashes during coro_state_free->destroy here. 3747 # coro crashes during coro_state_free->destroy here.
3481 3748
3482 $RELOAD_WATCHER ||= Event->timer ( 3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3483 reentrant => 0,
3484 after => 0,
3485 data => WF_AUTOCANCEL,
3486 cb => sub {
3487 do_reload_perl; 3750 do_reload_perl;
3488 undef $RELOAD_WATCHER; 3751 undef $RELOAD_WATCHER;
3489 },
3490 ); 3752 };
3491} 3753}
3492 3754
3493register_command "reload" => sub { 3755register_command "reload" => sub {
3494 my ($who, $arg) = @_; 3756 my ($who, $arg) = @_;
3495 3757
3508 3770
3509our @WAIT_FOR_TICK; 3771our @WAIT_FOR_TICK;
3510our @WAIT_FOR_TICK_BEGIN; 3772our @WAIT_FOR_TICK_BEGIN;
3511 3773
3512sub wait_for_tick { 3774sub wait_for_tick {
3513 return unless $TICK_WATCHER->is_active;
3514 return if $Coro::current == $Coro::main; 3775 return if tick_inhibit || $Coro::current == $Coro::main;
3515 3776
3516 my $signal = new Coro::Signal; 3777 my $signal = new Coro::Signal;
3517 push @WAIT_FOR_TICK, $signal; 3778 push @WAIT_FOR_TICK, $signal;
3518 $signal->wait; 3779 $signal->wait;
3519} 3780}
3520 3781
3521sub wait_for_tick_begin { 3782sub wait_for_tick_begin {
3522 return unless $TICK_WATCHER->is_active;
3523 return if $Coro::current == $Coro::main; 3783 return if tick_inhibit || $Coro::current == $Coro::main;
3524 3784
3525 my $signal = new Coro::Signal; 3785 my $signal = new Coro::Signal;
3526 push @WAIT_FOR_TICK_BEGIN, $signal; 3786 push @WAIT_FOR_TICK_BEGIN, $signal;
3527 $signal->wait; 3787 $signal->wait;
3528} 3788}
3529 3789
3530$TICK_WATCHER = Event->timer ( 3790sub tick {
3531 reentrant => 0,
3532 parked => 1,
3533 prio => 0,
3534 at => $NEXT_TICK || $TICK,
3535 data => WF_AUTOCANCEL,
3536 cb => sub {
3537 if ($Coro::current != $Coro::main) { 3791 if ($Coro::current != $Coro::main) {
3538 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3792 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3539 unless ++$bug_warning > 10; 3793 unless ++$bug_warning > 10;
3540 return; 3794 return;
3541 } 3795 }
3542 3796
3543 $NOW = $tick_start = Event::time;
3544
3545 cf::server_tick; # one server iteration 3797 cf::server_tick; # one server iteration
3546 3798
3547 $RUNTIME += $TICK;
3548 $NEXT_TICK += $TICK;
3549
3550 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3799 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3551 $NEXT_RUNTIME_WRITE = $NOW + 10; 3800 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3552 Coro::async_pool { 3801 Coro::async_pool {
3553 $Coro::current->{desc} = "runtime saver"; 3802 $Coro::current->{desc} = "runtime saver";
3554 write_runtime 3803 write_runtime_sync
3555 or warn "ERROR: unable to write runtime file: $!"; 3804 or warn "ERROR: unable to write runtime file: $!";
3556 };
3557 } 3805 };
3806 }
3558 3807
3559 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3560 $sig->send; 3809 $sig->send;
3561 } 3810 }
3562 while (my $sig = shift @WAIT_FOR_TICK) { 3811 while (my $sig = shift @WAIT_FOR_TICK) {
3563 $sig->send; 3812 $sig->send;
3564 } 3813 }
3565 3814
3566 $NOW = Event::time; 3815 $LOAD = ($NOW - $TICK_START) / $TICK;
3567
3568 # if we are delayed by four ticks or more, skip them all
3569 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3570
3571 $TICK_WATCHER->at ($NEXT_TICK);
3572 $TICK_WATCHER->start;
3573
3574 $LOAD = ($NOW - $tick_start) / $TICK;
3575 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3576 3817
3577 _post_tick; 3818 if (0) {
3819 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d#
3823 }
3578 }, 3824 }
3579); 3825}
3580 3826
3581{ 3827{
3828 # configure BDB
3829
3582 BDB::min_parallel 8; 3830 BDB::min_parallel 8;
3583 BDB::max_poll_time $TICK * 0.1; 3831 BDB::max_poll_reqs $TICK * 0.1;
3584 $BDB_POLL_WATCHER = Event->io ( 3832 $AnyEvent::BDB::WATCHER->priority (1);
3585 reentrant => 0,
3586 fd => BDB::poll_fileno,
3587 poll => 'r',
3588 prio => 0,
3589 data => WF_AUTOCANCEL,
3590 cb => \&BDB::poll_cb,
3591 );
3592
3593 BDB::set_sync_prepare {
3594 my $status;
3595 my $current = $Coro::current;
3596 (
3597 sub {
3598 $status = $!;
3599 $current->ready; undef $current;
3600 },
3601 sub {
3602 Coro::schedule while defined $current;
3603 $! = $status;
3604 },
3605 )
3606 };
3607 3833
3608 unless ($DB_ENV) { 3834 unless ($DB_ENV) {
3609 $DB_ENV = BDB::db_env_create; 3835 $DB_ENV = BDB::db_env_create;
3610 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3836 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3611 | BDB::LOG_AUTOREMOVE, 1); 3837 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3838 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3612 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3839 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3613 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3840 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3614 3841
3615 cf::sync_job { 3842 cf::sync_job {
3616 eval { 3843 eval {
3626 3853
3627 cf::cleanup "db_env_open(db): $@" if $@; 3854 cf::cleanup "db_env_open(db): $@" if $@;
3628 }; 3855 };
3629 } 3856 }
3630 3857
3631 $BDB_DEADLOCK_WATCHER = Event->timer ( 3858 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3632 after => 3,
3633 interval => 1,
3634 hard => 1,
3635 prio => 0,
3636 data => WF_AUTOCANCEL,
3637 cb => sub {
3638 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3859 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3639 },
3640 ); 3860 };
3641 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3861 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3642 after => 11,
3643 interval => 60,
3644 hard => 1,
3645 prio => 0,
3646 data => WF_AUTOCANCEL,
3647 cb => sub {
3648 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3862 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3649 },
3650 ); 3863 };
3651 $BDB_TRICKLE_WATCHER = Event->timer ( 3864 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3652 after => 5,
3653 interval => 10,
3654 hard => 1,
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => sub {
3658 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3865 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3659 },
3660 ); 3866 };
3661} 3867}
3662 3868
3663{ 3869{
3870 # configure IO::AIO
3871
3664 IO::AIO::min_parallel 8; 3872 IO::AIO::min_parallel 8;
3665
3666 undef $Coro::AIO::WATCHER;
3667 IO::AIO::max_poll_time $TICK * 0.1; 3873 IO::AIO::max_poll_time $TICK * 0.1;
3668 $AIO_POLL_WATCHER = Event->io ( 3874 undef $AnyEvent::AIO::WATCHER;
3669 reentrant => 0,
3670 data => WF_AUTOCANCEL,
3671 fd => IO::AIO::poll_fileno,
3672 poll => 'r',
3673 prio => 0,
3674 cb => \&IO::AIO::poll_cb,
3675 );
3676} 3875}
3677 3876
3678my $_log_backtrace; 3877my $_log_backtrace;
3679 3878
3680sub _log_backtrace { 3879sub _log_backtrace {
3683 $msg =~ s/\n//; 3882 $msg =~ s/\n//;
3684 3883
3685 # limit the # of concurrent backtraces 3884 # limit the # of concurrent backtraces
3686 if ($_log_backtrace < 2) { 3885 if ($_log_backtrace < 2) {
3687 ++$_log_backtrace; 3886 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg;
3688 async { 3888 async {
3689 $Coro::current->{desc} = "abt $msg"; 3889 $Coro::current->{desc} = "abt $msg";
3690 3890
3691 my @bt = fork_call { 3891 my @bt = fork_call {
3692 @addr = map { sprintf "%x", $_ } @addr; 3892 @addr = map { sprintf "%x", $_ } @addr;
3703 } 3903 }
3704 3904
3705 @funcs 3905 @funcs
3706 }; 3906 };
3707 3907
3708 LOG llevInfo, "[ABT] $msg\n"; 3908 LOG llevInfo, "[ABT] $perl_bt\n";
3909 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3709 LOG llevInfo, "[ABT] $_\n" for @bt; 3910 LOG llevInfo, "[ABT] $_\n" for @bt;
3710 --$_log_backtrace; 3911 --$_log_backtrace;
3711 }; 3912 };
3712 } else { 3913 } else {
3713 LOG llevInfo, "[ABT] $msg\n"; 3914 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines