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.346 by root, Tue Aug 28 19:38:40 2007 UTC vs.
Revision 1.459 by root, Sat Dec 13 21:46:12 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines