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.353 by root, Sun Sep 2 08:43:46 2007 UTC vs.
Revision 1.463 by root, Sun Dec 28 06:59:27 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
277Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 342deadlocked coro.
284 348
285Return 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.
286 350
287=cut 351=cut
288 352
289our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
290 354
291sub lock_wait($) { 355sub lock_wait($) {
292 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 357}
300 358
301sub lock_acquire($) { 359sub lock_acquire($) {
302 my ($key) = @_; 360 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 361}
314 362
315sub lock_active($) { 363sub lock_active($) {
316 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 365}
320 366
321sub freeze_mainloop { 367sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
323 369
324 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 371}
326 }; 372
327 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
328 $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
329} 386}
330 387
331=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
332 389
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 401our @SLOT_QUEUE;
345our $SLOT_QUEUE; 402our $SLOT_QUEUE;
346 403
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
349 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
350 409
351 while () { 410 while () {
352 next_job: 411 next_job:
353 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
361 } 420 }
362 } 421 }
363 } 422 }
364 423
365 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 427 $signal->wait;
369 } else { 428 } else {
370 Coro::schedule; 429 Coro::schedule;
371 } 430 }
372 } 431 }
373}; 432};
374 433
375sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
376 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
377 438
378 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
380 441
394 455
395BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
396 457
397=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
398 459
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
401partly 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
402acceptable. 463acceptable.
403 464
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
410 471
411sub sync_job(&) { 472sub sync_job(&) {
412 my ($job) = @_; 473 my ($job) = @_;
413 474
414 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 476 my $time = EV::time;
416 477
417 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
419 480
420 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 482
422 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
423 484
424 my $busy = 1; 485 my $busy = 1;
425 my @res; 486 my @res;
426 487
427 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 490 @res = eval { $job->() };
429 warn $@ if $@; 491 warn $@ if $@;
430 undef $busy; 492 undef $busy;
431 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
432 494
433 while ($busy) { 495 while ($busy) {
434 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
435 } 500 }
501 }
436 502
437 $time = Event::time - $time; 503 my $time = EV::time - $time;
438 504
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
443 506
444 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
445 } else { 508 } else {
446 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
447 510
472=item fork_call { }, $args 535=item fork_call { }, $args
473 536
474Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
478 541
479=cut 542=cut
480 543
481sub fork_call(&@) { 544sub fork_call(&@) {
482 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
483 546
484 # 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,
485 # otherwise perl prematurely frees the stuff :/ 548 # otherwise perl prematurely frees the stuff :/
486 # TODO: investigate and fix (liekly this will be rather laborious) 549 # TODO: investigate and fix (likely this will be rather laborious)
487 550
488 my @res = Coro::Util::fork_eval { 551 my @res = Coro::Util::fork_eval {
489 reset_signals; 552 reset_signals;
490 &$cb 553 &$cb
491 }, @args; 554 }, @args;
492 555
493 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
494} 557}
495 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
496=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
497 587
498Returns a single value from the environment database. 588Returns a single value from the environment database.
499 589
500=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
501 591
502Stores 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
503data 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).
504 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
505=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}
506 618
507our $DB; 619our $DB;
508 620
509sub db_init { 621sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 622 cf::sync_job {
514 eval { 623 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 624 };
524} 625}
525 626
526sub db_get($$) { 627sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
528 629
626 727
627############################################################################# 728#############################################################################
628 729
629=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
630 731
631Many 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
632attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
634 735
635In 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>
636C<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
637Crossfire TRT). 738Deliantra).
638 739
639=over 4 740=over 4
640 741
641=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
642 743
686=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
687 788
688Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
690 791
691Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
692that 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.
693 794
694These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
695 796
696=over 4 797=over 4
924 } 1025 }
925 1026
926 0 1027 0
927} 1028}
928 1029
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1031
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1033
933Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
934 1035
940 1041
941=cut 1042=cut
942 1043
943############################################################################# 1044#############################################################################
944# object support 1045# object support
945#
946 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#
947sub _can_merge { 1080sub _can_merge {
948 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
949 1082
950 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1084
954 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
955} 1087}
956 1088
957sub reattach { 1089sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1091 my ($obj) = @_;
960 1092
1093 # no longer needed after getting rid of delete_package?
961 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
962 1095
963 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
964 1097
965 @$registry = (); 1098 @$registry = ();
966 1099
981cf::attachable->attach ( 1114cf::attachable->attach (
982 prio => -1000000, 1115 prio => -1000000,
983 on_instantiate => sub { 1116 on_instantiate => sub {
984 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
985 1118
986 $data = from_json $data; 1119 $data = decode_json $data;
987 1120
988 for (@$data) { 1121 for (@$data) {
989 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
990 1123
991 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1007sub object_freezer_save { 1140sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1009 1142
1010 sync_job { 1143 sync_job {
1011 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1012 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1013 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1014 1148
1015 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1016 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1017 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1018 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1019 close $fh; 1153 aio_close $fh;
1020 1154
1021 if (@$objs) { 1155 if (@$objs) {
1022 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) {
1023 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1024 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1025 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1026 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1027 close $fh; 1161 aio_close $fh;
1028 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1029 } 1163 }
1030 } else { 1164 } else {
1031 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1032 } 1166 }
1033 1167
1034 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1035 } else { 1172 } else {
1036 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1037 } 1174 }
1038 } else { 1175 } else {
1039 aio_unlink $filename; 1176 aio_unlink $filename;
1040 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1041 } 1178 }
1042 } 1179 };
1043} 1180}
1044 1181
1045sub object_freezer_as_string { 1182sub object_freezer_as_string {
1046 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1047 1184
1059 or return; 1196 or return;
1060 1197
1061 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1062 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1063 or return; 1200 or return;
1201
1064 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1065 } 1204 }
1066 1205
1206 utf8::decode (my $decname = $filename);
1067 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1068 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1069 return ($data, $av); 1210 ($data, $av)
1070} 1211}
1071 1212
1072=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1073 1214
1074=over 4 1215=over 4
1128 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1129 1270
1130 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1131} 1272}
1132 1273
1274use File::Glob ();
1275
1133cf::player->attach ( 1276cf::player->attach (
1134 on_command => sub { 1277 on_command => sub {
1135 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1136 1279
1137 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1169 1312
1170 cf::override; 1313 cf::override;
1171 }, 1314 },
1172); 1315);
1173 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
1174sub load_extensions { 1330sub load_extensions {
1175 cf::sync_job { 1331 cf::sync_job {
1176 my %todo; 1332 my %todo;
1177 1333
1178 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1197 1353
1198 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1199 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1200 1356
1201 $ext{source} = 1357 $ext{source} =
1202 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1203 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1204 . $source 1360 . $source
1205 . "\n};\n1"; 1361 . "\n};\n1";
1206 1362
1207 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1223 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1224 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1225 1381
1226 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1227 warn $msg; 1383 warn $msg;
1228 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1229 exit 1;
1230 } 1385 }
1231 1386
1232 warn $msg; 1387 warn $msg;
1233 } 1388 }
1234 1389
1248 1403
1249=back 1404=back
1250 1405
1251=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1252 1407
1253Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1254 1409
1255=cut 1410=cut
1256 1411
1257package cf::player; 1412package cf::player;
1258 1413
1259use Coro::AIO; 1414use Coro::AIO;
1260 1415
1261=head3 cf::player 1416=head3 cf::player
1262 1417
1263=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}
1264 1433
1265=item cf::player::find $login 1434=item cf::player::find $login
1266 1435
1267Returns the given player object, loading it if necessary (might block). 1436Returns the given player object, loading it if necessary (might block).
1268 1437
1287 1456
1288sub exists($) { 1457sub exists($) {
1289 my ($login) = @_; 1458 my ($login) = @_;
1290 1459
1291 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1292 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1293} 1462}
1294 1463
1295sub find($) { 1464sub find($) {
1296 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1297 my $login = $_[0]; 1466 my $login = $_[0];
1304 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1473 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1305 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1474 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1306 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1475 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1307 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1308 1477
1309 my $pl = load_pl path $login 1478 my $f = new_from_file cf::object::thawer path $login
1310 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;
1311 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1312 } 1487 }
1313 } 1488 }
1314} 1489}
1315 1490
1323 1498
1324 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1325 1500
1326 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1327 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1328 1505
1329 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1330 cf::cede_to_tick; 1507 cf::cede_to_tick;
1331} 1508}
1332 1509
1364 my ($pl) = @_; 1541 my ($pl) = @_;
1365 1542
1366 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1367 1544
1368 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1369 $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
1370 1547
1371 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1372 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1373 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1374 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1375 1554
1376 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1377 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1413 or return []; 1592 or return [];
1414 1593
1415 my @logins; 1594 my @logins;
1416 1595
1417 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") {
1418 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1419 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1420 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1605 }
1421 1606
1422 utf8::decode $login; 1607 utf8::decode $login;
1423 push @logins, $login; 1608 push @logins, $login;
1424 } 1609 }
1425 1610
1452 } 1637 }
1453 1638
1454 \@paths 1639 \@paths
1455} 1640}
1456 1641
1457=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1458 1643
1459Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1460
1461=cut
1462
1463sub expand_cfpod {
1464 ((my $self), (local $_)) = @_;
1465
1466 # escape & and <
1467 s/&/&amp;/g;
1468 s/(?<![BIUGHT])</&lt;/g;
1469
1470 # this is buggy, it needs to properly take care of nested <'s
1471
1472 1 while
1473 # replace B<>, I<>, U<> etc.
1474 s/B<([^\>]*)>/<b>$1<\/b>/
1475 || s/I<([^\>]*)>/<i>$1<\/i>/
1476 || s/U<([^\>]*)>/<u>$1<\/u>/
1477 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1478 # replace G<male|female> tags
1479 || s{G<([^>|]*)\|([^>]*)>}{
1480 $self->gender ? $2 : $1
1481 }ge
1482 # replace H<hint text>
1483 || s{H<([^\>]*)>}
1484 {
1485 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1486 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1487 "")
1488 [$self->{hintmode}]
1489 }ge;
1490
1491 # create single paragraphs (very hackish)
1492 s/(?<=\S)\n(?=\w)/ /g;
1493
1494 # compress some whitespace
1495 s/\s+\n/\n/g; # ws line-ends
1496 s/\n\n+/\n/g; # double lines
1497 s/^\n+//; # beginning lines
1498 s/\n+$//; # ending lines
1499
1500 $_
1501}
1502
1503sub hintmode {
1504 $_[0]{hintmode} = $_[1] if @_ > 1;
1505 $_[0]{hintmode}
1506}
1507 1645
1508=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1509 1647
1510Sends an ext reply to the player. 1648Sends an ext reply to the player.
1511 1649
1578our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1579our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1580 1718
1581sub generate_random_map { 1719sub generate_random_map {
1582 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
1583 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1584 $self->_create_random_map ( 1725 $self->_create_random_map (
1585 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1586 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1587 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1709 1850
1710# the temporary/swap location 1851# the temporary/swap location
1711sub save_path { 1852sub save_path {
1712 my ($self) = @_; 1853 my ($self) = @_;
1713 1854
1714 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1715 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1716} 1857}
1717 1858
1718# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1719sub uniq_path { 1860sub uniq_path {
1720 my ($self) = @_; 1861 my ($self) = @_;
1721 1862
1722 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1723 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1724}
1725
1726# and all this just because we cannot iterate over
1727# all maps in C++...
1728sub change_all_map_light {
1729 my ($change) = @_;
1730
1731 $_->change_map_light ($change)
1732 for grep $_->outdoor, values %cf::MAP;
1733} 1865}
1734 1866
1735sub decay_objects { 1867sub decay_objects {
1736 my ($self) = @_; 1868 my ($self) = @_;
1737 1869
1750 1882
1751sub load_header_from($) { 1883sub load_header_from($) {
1752 my ($self, $path) = @_; 1884 my ($self, $path) = @_;
1753 1885
1754 utf8::encode $path; 1886 utf8::encode $path;
1755 #aio_open $path, O_RDONLY, 0 1887 my $f = new_from_file cf::object::thawer $path
1756 # or return;
1757
1758 $self->_load_header ($path)
1759 or return; 1888 or return;
1889
1890 $self->_load_header ($f)
1891 or return;
1892
1893 local $MAP_LOADING{$self->{path}} = $self;
1894 $f->resolve_delayed_derefs;
1760 1895
1761 $self->{load_path} = $path; 1896 $self->{load_path} = $path;
1762 1897
1763 1 1898 1
1764} 1899}
1818sub find { 1953sub find {
1819 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
1820 1955
1821 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
1822 1957
1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1823 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
1824 1960
1825 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
1826 my $guard = cf::lock_acquire "map_find:$path";
1827 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1828 or return; 1963 or return;
1829 1964
1830 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1831 1966
1833 or return; 1968 or return;
1834 1969
1835 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1836 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1837 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1838 $map->reset; 1975 $map->reset;
1839 undef $guard;
1840 return find $path; 1976 return find $path;
1841 } 1977 }
1842 1978
1843 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1844 } 1980 }
1853 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1854 1990
1855 my $path = $self->{path}; 1991 my $path = $self->{path};
1856 1992
1857 { 1993 {
1858 my $guard1 = cf::lock_acquire "map_data:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1859 my $guard2 = cf::lock_acquire "map_load:$path";
1860 1995
1996 return unless $self->valid;
1861 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1862 1998
1863 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1864 2000
1865 $self->alloc; 2001 $self->alloc;
1866 2002
1867 $self->pre_load; 2003 $self->pre_load;
1868 cf::cede_to_tick; 2004 cf::cede_to_tick;
1869 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1870 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1871 or return; 2009 or return;
1872 2010
1873 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1874 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1875 2013
1876 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1877 utf8::encode $uniq; 2015 utf8::encode $uniq;
1878 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1879 $self->clear_unique_items; 2018 $self->clear_unique_items;
1880 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1881 } 2022 }
1882 } 2023 }
2024
2025 $f->resolve_delayed_derefs;
1883 2026
1884 cf::cede_to_tick; 2027 cf::cede_to_tick;
1885 # now do the right thing for maps 2028 # now do the right thing for maps
1886 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1887 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1891 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1892 $self->decay_objects; 2035 $self->decay_objects;
1893 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1894 $self->update_buttons; 2037 $self->update_buttons;
1895 cf::cede_to_tick; 2038 cf::cede_to_tick;
1896 $self->set_darkness_map;
1897 cf::cede_to_tick;
1898 $self->activate; 2039 $self->activate;
1899 } 2040 }
1900 2041
1901 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
1902 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
1903 2044
1904 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
1905 } 2046 }
1906 2047
1907 $self->post_load; 2048 $self->post_load;
1908} 2049}
1909 2050
1967 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
1968 2109
1969 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
1970 2111
1971 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
1972 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1973 } 2114 }
1974 2115
1975 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
1976 2117
1977 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2119 $Coro::current->{desc} = "map prefetcher";
2120
1978 while (%MAP_PREFETCH) { 2121 while (%MAP_PREFETCH) {
1979 while (my ($k, $v) = each %MAP_PREFETCH) { 2122 while (my ($k, $v) = each %MAP_PREFETCH) {
1980 if (my $map = find $k) { 2123 if (my $map = find $k) {
1981 $map->load if $v; 2124 $map->load if $v;
1982 } 2125 }
2008 return if $self->{deny_save}; 2151 return if $self->{deny_save};
2009 2152
2010 local $self->{last_access} = $self->last_access;#d# 2153 local $self->{last_access} = $self->last_access;#d#
2011 2154
2012 cf::async { 2155 cf::async {
2156 $Coro::current->{desc} = "map player save";
2013 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2014 }; 2158 };
2159
2160 cf::get_slot 0.02;
2015 2161
2016 if ($uniq) { 2162 if ($uniq) {
2017 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2018 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2019 } else { 2165 } else {
2028 $self->save; 2174 $self->save;
2029 2175
2030 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2031 2177
2032 return if $self->players; 2178 return if $self->players;
2033 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2034 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2035 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
2036 $self->clear; 2186 $self->clear;
2037 $self->in_memory (cf::MAP_SWAPPED);
2038} 2187}
2039 2188
2040sub reset_at { 2189sub reset_at {
2041 my ($self) = @_; 2190 my ($self) = @_;
2042 2191
2074 if $uniq; 2223 if $uniq;
2075 } 2224 }
2076 2225
2077 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
2078 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
2079 $self->clear; 2230 $self->clear;
2080
2081 $_->clear_links_to ($self) for values %cf::MAP;
2082 2231
2083 $self->unlink_save; 2232 $self->unlink_save;
2084 $self->destroy; 2233 $self->destroy;
2085} 2234}
2086 2235
2153 2302
2154sub unique_maps() { 2303sub unique_maps() {
2155 [ 2304 [
2156 map { 2305 map {
2157 utf8::decode $_; 2306 utf8::decode $_;
2158 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2159 ? normalise $_ 2310 : normalise $_
2160 : ()
2161 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2162 ] 2312 ]
2163} 2313}
2164 2314
2165package cf;
2166
2167=back 2315=back
2168 2316
2169=head3 cf::object 2317=head3 cf::object
2170 2318
2171=cut 2319=cut
2174 2322
2175=over 4 2323=over 4
2176 2324
2177=item $ob->inv_recursive 2325=item $ob->inv_recursive
2178 2326
2179Returns the inventory of the object _and_ their inventories, recursively. 2327Returns the inventory of the object I<and> their inventories, recursively,
2328but I<not> the object itself.
2180 2329
2181=cut 2330=cut
2182 2331
2183sub inv_recursive_; 2332sub inv_recursive_;
2184sub inv_recursive_ { 2333sub inv_recursive_ {
2187 2336
2188sub inv_recursive { 2337sub inv_recursive {
2189 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2190} 2339}
2191 2340
2341=item $ref = $ob->ref
2342
2343Creates and returns a persistent reference to an object that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
2367}
2368
2192package cf; 2369package cf;
2193 2370
2194=back 2371=back
2195 2372
2196=head3 cf::object::player 2373=head3 cf::object::player
2202Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2379Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2203can be C<undef>. Does the right thing when the player is currently in a 2380can be C<undef>. Does the right thing when the player is currently in a
2204dialogue with the given NPC character. 2381dialogue with the given NPC character.
2205 2382
2206=cut 2383=cut
2384
2385our $SAY_CHANNEL = {
2386 id => "say",
2387 title => "Map",
2388 reply => "say ",
2389 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2390};
2391
2392our $CHAT_CHANNEL = {
2393 id => "chat",
2394 title => "Chat",
2395 reply => "chat ",
2396 tooltip => "Player chat and shouts, global to the server.",
2397};
2207 2398
2208# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2209# with dialog boxes. 2400# with dialog boxes.
2210#TODO: the first argument must go, split into a $npc->reply_to ( method 2401#TODO: the first argument must go, split into a $npc->reply_to ( method
2211sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2223 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2224 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2415 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2225 2416
2226 } else { 2417 } else {
2227 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2228 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2229 } 2420 }
2230 } 2421 }
2231} 2422}
2232 2423
2233=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2258 2449
2259=item $player_object->enter_link 2450=item $player_object->enter_link
2260 2451
2261Freezes the player and moves him/her to a special map (C<{link}>). 2452Freezes the player and moves him/her to a special map (C<{link}>).
2262 2453
2263The player should be reasonably safe there for short amounts of time. You 2454The player should be reasonably safe there for short amounts of time (e.g.
2264I<MUST> call C<leave_link> as soon as possible, though. 2455for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2456though, as the palyer cannot control the character while it is on the link
2457map.
2265 2458
2266Will never block. 2459Will never block.
2267 2460
2268=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2269 2462
2327 2520
2328 $map->load; 2521 $map->load;
2329 $map->load_neighbours; 2522 $map->load_neighbours;
2330 2523
2331 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2332 $self->activate_recursive; 2526 $self->activate_recursive;
2333 2527
2334 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2335 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2336} 2530}
2341her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2342that has to return the map if sucecssful, and then unfreezes the player on 2536that has to return the map if sucecssful, and then unfreezes the player on
2343the new (success) or old (failed) map position. In either case, $done will 2537the new (success) or old (failed) map position. In either case, $done will
2344be called at the end of this process. 2538be called at the end of this process.
2345 2539
2540Note that $check will be called with a potentially non-loaded map, so if
2541it needs a loaded map it has to call C<< ->load >>.
2542
2346=cut 2543=cut
2347 2544
2348our $GOTOGEN; 2545our $GOTOGEN;
2349 2546
2350sub cf::object::player::goto { 2547sub cf::object::player::goto {
2354 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2551 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2355 2552
2356 $self->enter_link; 2553 $self->enter_link;
2357 2554
2358 (async { 2555 (async {
2556 $Coro::current->{desc} = "player::goto $path $x $y";
2557
2558 # *tag paths override both path and x|y
2559 if ($path =~ /^\*(.*)$/) {
2560 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2561 my $ob = $obs[rand @obs];
2562
2563 # see if we actually can go there
2564 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2565 $ob = $obs[rand @obs];
2566 } else {
2567 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2568 }
2569 # else put us there anyways for now #d#
2570
2571 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2572 } else {
2573 ($path, $x, $y) = (undef, undef, undef);
2574 }
2575 }
2576
2359 my $map = eval { 2577 my $map = eval {
2360 my $map = cf::map::find $path; 2578 my $map = defined $path ? cf::map::find $path : undef;
2361 2579
2362 if ($map) { 2580 if ($map) {
2363 $map = $map->customise_for ($self); 2581 $map = $map->customise_for ($self);
2364 $map = $check->($map) if $check && $map; 2582 $map = $check->($map) if $check && $map;
2365 } else { 2583 } else {
2366 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2584 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2367 } 2585 }
2368 2586
2369 $map 2587 $map
2370 }; 2588 };
2371 2589
2407} 2625}
2408 2626
2409sub prepare_random_map { 2627sub prepare_random_map {
2410 my ($exit) = @_; 2628 my ($exit) = @_;
2411 2629
2412 my $guard = cf::lock_acquire "exit_prepare:$exit";
2413
2414 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2415 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2416 # that depends on the exit object 2632 # that depends on the exit object
2417 2633
2418 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2420 if ($exit->map) { 2636 if ($exit->map) {
2421 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2422 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2423 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2424 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2425 } 2643 }
2426 2644
2427 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2428 2646
2429 my $data = cf::to_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2430 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2431 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2432 2650
2433 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2434 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2435 undef $fh; 2653 undef $fh;
2436 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2437 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2438 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2439 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2440 } 2662 }
2441} 2663}
2442 2664
2443sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2444 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2445 2667
2446 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2447 2669
2448 if ($exit->slaying eq "/!") {
2449 #TODO: this should de-fi-ni-te-ly not be a sync-job
2450 # the problem is that $exit might not survive long enough
2451 # so it needs to be done right now, right here
2452 cf::sync_job { prepare_random_map $exit };
2453 }
2454
2455 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2456 my $hp = $exit->stats->hp;
2457 my $sp = $exit->stats->sp;
2458
2459 $self->enter_link; 2670 $self->enter_link;
2460 2671
2461 # if exit is damned, update players death & WoR home-position
2462 $self->contr->savebed ($slaying, $hp, $sp)
2463 if $exit->flag (FLAG_DAMNED);
2464
2465 (async { 2672 (async {
2466 $self->deactivate_recursive; # just to be sure 2673 $Coro::current->{desc} = "enter_exit";
2674
2467 unless (eval { 2675 unless (eval {
2676 $self->deactivate_recursive; # just to be sure
2677
2678 # random map handling
2679 {
2680 my $guard = cf::lock_acquire "exit_prepare:$exit";
2681
2682 prepare_random_map $exit
2683 if $exit->slaying eq "/!";
2684 }
2685
2686 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2687 my $x = $exit->stats->hp;
2688 my $y = $exit->stats->sp;
2689
2468 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2469 2691
2692 # if exit is damned, update players death & WoR home-position
2693 $self->contr->savebed ($map, $x, $y)
2694 if $exit->flag (cf::FLAG_DAMNED);
2695
2470 1; 2696 1
2471 }) { 2697 }) {
2472 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2473 . "I'll try to bring you back to the map you were before. " 2699 . "I'll try to bring you back to the map you were before. "
2474 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2475 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2476 2702
2477 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2505the message, with C<log> being the default. If C<$color> is negative, suppress 2731the message, with C<log> being the default. If C<$color> is negative, suppress
2506the message unless the client supports the msg packet. 2732the message unless the client supports the msg packet.
2507 2733
2508=cut 2734=cut
2509 2735
2736# non-persistent channels (usually the info channel)
2510our %CHANNEL = ( 2737our %CHANNEL = (
2511 "c/identify" => { 2738 "c/identify" => {
2512 id => "identify", 2739 id => "infobox",
2513 title => "Identify", 2740 title => "Identify",
2514 reply => undef, 2741 reply => undef,
2515 tooltip => "Items recently identified", 2742 tooltip => "Items recently identified",
2516 }, 2743 },
2517 "c/examine" => { 2744 "c/examine" => {
2518 id => "examine", 2745 id => "infobox",
2519 title => "Examine", 2746 title => "Examine",
2520 reply => undef, 2747 reply => undef,
2521 tooltip => "Signs and other items you examined", 2748 tooltip => "Signs and other items you examined",
2522 }, 2749 },
2750 "c/book" => {
2751 id => "infobox",
2752 title => "Book",
2753 reply => undef,
2754 tooltip => "The contents of a note or book",
2755 },
2756 "c/lookat" => {
2757 id => "infobox",
2758 title => "Look",
2759 reply => undef,
2760 tooltip => "What you saw there",
2761 },
2762 "c/who" => {
2763 id => "infobox",
2764 title => "Players",
2765 reply => undef,
2766 tooltip => "Shows players who are currently online",
2767 },
2768 "c/body" => {
2769 id => "infobox",
2770 title => "Body Parts",
2771 reply => undef,
2772 tooltip => "Shows which body parts you posess and are available",
2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2780 "c/uptime" => {
2781 id => "infobox",
2782 title => "Uptime",
2783 reply => undef,
2784 tooltip => "How long the server has been running since last restart",
2785 },
2786 "c/mapinfo" => {
2787 id => "infobox",
2788 title => "Map Info",
2789 reply => undef,
2790 tooltip => "Information related to the maps",
2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2523); 2800);
2524 2801
2525sub cf::client::send_msg { 2802sub cf::client::send_msg {
2526 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2527 2804
2528 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2529 2807
2530 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2531 2809
2532 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2533 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2534 2813
2814 $self->ext_msg (channel_info => $channel);
2815 $channel = $channel->{id};
2816
2535 if (ref $channel) { 2817 } elsif (ref $channel) {
2536 # send meta info to client, if not yet sent 2818 # send meta info to client, if not yet sent
2537 unless (exists $self->{channel}{$channel->{id}}) { 2819 unless (exists $self->{channel}{$channel->{id}}) {
2538 $self->{channel}{$channel->{id}} = $channel; 2820 $self->{channel}{$channel->{id}} = $channel;
2539 $self->ext_msg (channel_info => $channel) 2821 $self->ext_msg (channel_info => $channel);
2540 if $self->can_msg;
2541 } 2822 }
2542 2823
2543 $channel = $channel->{id}; 2824 $channel = $channel->{id};
2544 } 2825 }
2545 2826
2546 return unless @extra || length $msg; 2827 return unless @extra || length $msg;
2547 2828
2548 if ($self->can_msg) {
2549 # default colour, mask it out 2829 # default colour, mask it out
2550 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2830 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2551 if $color & cf::NDI_DEF; 2831 if $color & cf::NDI_DEF;
2552 2832
2553 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2833 my $pkt = "msg "
2834 . $self->{json_coder}->encode (
2554 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2835 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2555 } else { 2836 );
2556 if ($color >= 0) {
2557 # replace some tags by gcfclient-compatible ones
2558 for ($msg) {
2559 1 while
2560 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2561 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2562 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2563 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2564 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2565 }
2566 2837
2567 $color &= cf::NDI_COLOR_MASK; 2838 # try lzf for large packets
2839 $pkt = "lzf " . Compress::LZF::compress $pkt
2840 if 1024 <= length $pkt and $self->{can_lzf};
2568 2841
2569 utf8::encode $msg; 2842 # split very large packets
2570 2843 if (8192 < length $pkt and $self->{can_lzf}) {
2571 if (0 && $msg =~ /\[/) { 2844 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2572 # COMMAND/INFO 2845 $pkt = "frag";
2573 $self->send_packet ("drawextinfo $color 10 8 $msg")
2574 } else {
2575 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2576 $self->send_packet ("drawinfo $color $msg")
2577 }
2578 }
2579 } 2846 }
2847
2848 $self->send_packet ($pkt);
2580} 2849}
2581 2850
2582=item $client->ext_msg ($type, @msg) 2851=item $client->ext_msg ($type, @msg)
2583 2852
2584Sends an ext event to the client. 2853Sends an ext event to the client.
2757=pod 3026=pod
2758 3027
2759The following functions and methods are available within a safe environment: 3028The following functions and methods are available within a safe environment:
2760 3029
2761 cf::object 3030 cf::object
2762 contr pay_amount pay_player map x y force_find force_add 3031 contr pay_amount pay_player map x y force_find force_add destroy
2763 insert remove name archname title slaying race decrease_ob_nr 3032 insert remove name archname title slaying race decrease split
2764 3033
2765 cf::object::player 3034 cf::object::player
2766 player 3035 player
2767 3036
2768 cf::player 3037 cf::player
2773 3042
2774=cut 3043=cut
2775 3044
2776for ( 3045for (
2777 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3046 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2778 insert remove inv name archname title slaying race 3047 insert remove inv nrof name archname title slaying race
2779 decrease_ob_nr)], 3048 decrease split destroy change_exp)],
2780 ["cf::object::player" => qw(player)], 3049 ["cf::object::player" => qw(player)],
2781 ["cf::player" => qw(peaceful)], 3050 ["cf::player" => qw(peaceful)],
2782 ["cf::map" => qw(trigger)], 3051 ["cf::map" => qw(trigger)],
2783) { 3052) {
2784 no strict 'refs'; 3053 no strict 'refs';
2889 { 3158 {
2890 my $faces = $facedata->{faceinfo}; 3159 my $faces = $facedata->{faceinfo};
2891 3160
2892 while (my ($face, $info) = each %$faces) { 3161 while (my ($face, $info) = each %$faces) {
2893 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3162 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3163
2894 cf::face::set_visibility $idx, $info->{visibility}; 3164 cf::face::set_visibility $idx, $info->{visibility};
2895 cf::face::set_magicmap $idx, $info->{magicmap}; 3165 cf::face::set_magicmap $idx, $info->{magicmap};
2896 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3166 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2897 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3167 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2898 3168
2899 cf::cede_to_tick; 3169 cf::cede_to_tick;
2900 } 3170 }
2901 3171
2902 while (my ($face, $info) = each %$faces) { 3172 while (my ($face, $info) = each %$faces) {
2903 next unless $info->{smooth}; 3173 next unless $info->{smooth};
3174
2904 my $idx = cf::face::find $face 3175 my $idx = cf::face::find $face
2905 or next; 3176 or next;
3177
2906 if (my $smooth = cf::face::find $info->{smooth}) { 3178 if (my $smooth = cf::face::find $info->{smooth}) {
2907 cf::face::set_smooth $idx, $smooth; 3179 cf::face::set_smooth $idx, $smooth;
2908 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3180 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2909 } else { 3181 } else {
2910 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3182 warn "smooth face '$info->{smooth}' not found for face '$face'";
2928 { 3200 {
2929 # TODO: for gcfclient pleasure, we should give resources 3201 # TODO: for gcfclient pleasure, we should give resources
2930 # that gcfclient doesn't grok a >10000 face index. 3202 # that gcfclient doesn't grok a >10000 face index.
2931 my $res = $facedata->{resource}; 3203 my $res = $facedata->{resource};
2932 3204
2933 my $soundconf = delete $res->{"res/sound.conf"};
2934
2935 while (my ($name, $info) = each %$res) { 3205 while (my ($name, $info) = each %$res) {
3206 if (defined $info->{type}) {
2936 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3207 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2937 my $data; 3208 my $data;
2938 3209
2939 if ($info->{type} & 1) { 3210 if ($info->{type} & 1) {
2940 # prepend meta info 3211 # prepend meta info
2941 3212
2942 my $meta = $enc->encode ({ 3213 my $meta = $enc->encode ({
2943 name => $name, 3214 name => $name,
2944 %{ $info->{meta} || {} }, 3215 %{ $info->{meta} || {} },
2945 }); 3216 });
2946 3217
2947 $data = pack "(w/a*)*", $meta, $info->{data}; 3218 $data = pack "(w/a*)*", $meta, $info->{data};
3219 } else {
3220 $data = $info->{data};
3221 }
3222
3223 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3224 cf::face::set_type $idx, $info->{type};
2948 } else { 3225 } else {
2949 $data = $info->{data}; 3226 $RESOURCE{$name} = $info;
2950 } 3227 }
2951 3228
2952 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2953 cf::face::set_type $idx, $info->{type};
2954
2955 cf::cede_to_tick; 3229 cf::cede_to_tick;
2956 } 3230 }
2957
2958 if ($soundconf) {
2959 $soundconf = $enc->decode (delete $soundconf->{data});
2960
2961 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2962 my $sound = $soundconf->{compat}[$_]
2963 or next;
2964
2965 my $face = cf::face::find "sound/$sound->[1]";
2966 cf::sound::set $sound->[0] => $face;
2967 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2968 }
2969
2970 while (my ($k, $v) = each %{$soundconf->{event}}) {
2971 my $face = cf::face::find "sound/$v";
2972 cf::sound::set $k => $face;
2973 }
2974 }
2975 } 3231 }
3232
3233 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2976 3234
2977 1 3235 1
2978} 3236}
3237
3238cf::global->attach (on_resource_update => sub {
3239 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3240 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3241
3242 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3243 my $sound = $soundconf->{compat}[$_]
3244 or next;
3245
3246 my $face = cf::face::find "sound/$sound->[1]";
3247 cf::sound::set $sound->[0] => $face;
3248 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3249 }
3250
3251 while (my ($k, $v) = each %{$soundconf->{event}}) {
3252 my $face = cf::face::find "sound/$v";
3253 cf::sound::set $k => $face;
3254 }
3255 }
3256});
2979 3257
2980register_exticmd fx_want => sub { 3258register_exticmd fx_want => sub {
2981 my ($ns, $want) = @_; 3259 my ($ns, $want) = @_;
2982 3260
2983 while (my ($k, $v) = each %$want) { 3261 while (my ($k, $v) = each %$want) {
2984 $ns->fx_want ($k, $v); 3262 $ns->fx_want ($k, $v);
2985 } 3263 }
2986}; 3264};
3265
3266sub load_resource_file($) {
3267 my $guard = lock_acquire "load_resource_file";
3268
3269 my $status = load_resource_file_ $_[0];
3270 get_slot 0.1, 100;
3271 cf::arch::commit_load;
3272
3273 $status
3274}
2987 3275
2988sub reload_regions { 3276sub reload_regions {
2989 # HACK to clear player env face cache, we need some signal framework 3277 # HACK to clear player env face cache, we need some signal framework
2990 # for this (global event?) 3278 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3279 %ext::player_env::MUSIC_FACE_CACHE = ();
3005} 3293}
3006 3294
3007sub reload_archetypes { 3295sub reload_archetypes {
3008 load_resource_file "$DATADIR/archetypes" 3296 load_resource_file "$DATADIR/archetypes"
3009 or die "unable to load archetypes\n"; 3297 or die "unable to load archetypes\n";
3010 #d# NEED to laod twice to resolve forward references
3011 # this really needs to be done in an extra post-pass
3012 # (which needs to be synchronous, so solve it differently)
3013 load_resource_file "$DATADIR/archetypes"
3014 or die "unable to load archetypes\n";
3015} 3298}
3016 3299
3017sub reload_treasures { 3300sub reload_treasures {
3018 load_resource_file "$DATADIR/treasures" 3301 load_resource_file "$DATADIR/treasures"
3019 or die "unable to load treasurelists\n"; 3302 or die "unable to load treasurelists\n";
3020} 3303}
3021 3304
3022sub reload_resources { 3305sub reload_resources {
3023 warn "reloading resource files...\n"; 3306 warn "reloading resource files...\n";
3024 3307
3308 reload_facedata;
3309 reload_archetypes;
3025 reload_regions; 3310 reload_regions;
3026 reload_facedata;
3027 #reload_archetypes;#d#
3028 reload_archetypes;
3029 reload_treasures; 3311 reload_treasures;
3030 3312
3031 warn "finished reloading resource files\n"; 3313 warn "finished reloading resource files\n";
3032}
3033
3034sub init {
3035 reload_resources;
3036} 3314}
3037 3315
3038sub reload_config { 3316sub reload_config {
3039 open my $fh, "<:utf8", "$CONFDIR/config" 3317 open my $fh, "<:utf8", "$CONFDIR/config"
3040 or return; 3318 or return;
3041 3319
3042 local $/; 3320 local $/;
3043 *CFG = YAML::Syck::Load <$fh>; 3321 *CFG = YAML::Load <$fh>;
3044 3322
3045 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3323 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3046 3324
3047 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3325 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3048 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3326 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3054 }; 3332 };
3055 warn $@ if $@; 3333 warn $@ if $@;
3056 } 3334 }
3057} 3335}
3058 3336
3337sub pidfile() {
3338 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3339 or die "$PIDFILE: $!";
3340 flock $fh, &Fcntl::LOCK_EX
3341 or die "$PIDFILE: flock: $!";
3342 $fh
3343}
3344
3345# make sure only one server instance is running at any one time
3346sub atomic {
3347 my $fh = pidfile;
3348
3349 my $pid = <$fh>;
3350 kill 9, $pid if $pid > 0;
3351
3352 seek $fh, 0, 0;
3353 print $fh $$;
3354}
3355
3059sub main { 3356sub main {
3357 cf::init_globals; # initialise logging
3358
3359 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3360 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3361 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3362 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3363
3364 cf::init_experience;
3365 cf::init_anim;
3366 cf::init_attackmess;
3367 cf::init_dynamic;
3368
3369 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3370
3060 # we must not ever block the main coroutine 3371 # we must not ever block the main coroutine
3061 local $Coro::idle = sub { 3372 local $Coro::idle = sub {
3062 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3373 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3063 (async { 3374 (async {
3064 Event::one_event; 3375 $Coro::current->{desc} = "IDLE BUG HANDLER";
3376 EV::loop EV::LOOP_ONESHOT;
3065 })->prio (Coro::PRIO_MAX); 3377 })->prio (Coro::PRIO_MAX);
3066 }; 3378 };
3067 3379
3380 evthread_start IO::AIO::poll_fileno;
3381
3382 cf::sync_job {
3383 reload_resources;
3068 reload_config; 3384 reload_config;
3069 db_init; 3385 db_init;
3386
3387 cf::load_settings;
3388 cf::load_materials;
3389 cf::init_uuid;
3390 cf::init_signals;
3391 cf::init_commands;
3392 cf::init_skills;
3393
3394 cf::init_beforeplay;
3395
3396 atomic;
3397
3070 load_extensions; 3398 load_extensions;
3071 3399
3072 $TICK_WATCHER->start; 3400 utime time, time, $RUNTIMEFILE;
3401
3402 # no (long-running) fork's whatsoever before this point(!)
3403 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3404
3405 (pop @POST_INIT)->(0) while @POST_INIT;
3406 };
3407
3073 Event::loop; 3408 EV::loop;
3074} 3409}
3075 3410
3076############################################################################# 3411#############################################################################
3077# initialisation and cleanup 3412# initialisation and cleanup
3078 3413
3079# install some emergency cleanup handlers 3414# install some emergency cleanup handlers
3080BEGIN { 3415BEGIN {
3416 our %SIGWATCHER = ();
3081 for my $signal (qw(INT HUP TERM)) { 3417 for my $signal (qw(INT HUP TERM)) {
3082 Event->signal ( 3418 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3083 reentrant => 0,
3084 data => WF_AUTOCANCEL,
3085 signal => $signal,
3086 prio => 0,
3087 cb => sub {
3088 cf::cleanup "SIG$signal"; 3419 cf::cleanup "SIG$signal";
3089 },
3090 ); 3420 };
3091 } 3421 }
3092} 3422}
3093 3423
3094sub write_runtime { 3424sub write_runtime_sync {
3095 my $runtime = "$LOCALDIR/runtime";
3096
3097 # first touch the runtime file to show we are still running: 3425 # first touch the runtime file to show we are still running:
3098 # the fsync below can take a very very long time. 3426 # the fsync below can take a very very long time.
3099 3427
3100 IO::AIO::aio_utime $runtime, undef, undef; 3428 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3101 3429
3102 my $guard = cf::lock_acquire "write_runtime"; 3430 my $guard = cf::lock_acquire "write_runtime";
3103 3431
3104 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3432 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3105 or return; 3433 or return;
3106 3434
3107 my $value = $cf::RUNTIME + 90 + 10; 3435 my $value = $cf::RUNTIME + 90 + 10;
3108 # 10 is the runtime save interval, for a monotonic clock 3436 # 10 is the runtime save interval, for a monotonic clock
3109 # 60 allows for the watchdog to kill the server. 3437 # 60 allows for the watchdog to kill the server.
3119 aio_utime $fh, undef, undef; 3447 aio_utime $fh, undef, undef;
3120 3448
3121 close $fh 3449 close $fh
3122 or return; 3450 or return;
3123 3451
3124 aio_rename "$runtime~", $runtime 3452 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3125 and return; 3453 and return;
3126 3454
3127 warn "runtime file written.\n"; 3455 warn "runtime file written.\n";
3128 3456
3129 1 3457 1
3458}
3459
3460our $uuid_lock;
3461our $uuid_skip;
3462
3463sub write_uuid_sync($) {
3464 $uuid_skip ||= $_[0];
3465
3466 return if $uuid_lock;
3467 local $uuid_lock = 1;
3468
3469 my $uuid = "$LOCALDIR/uuid";
3470
3471 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3472 or return;
3473
3474 my $value = uuid_seq uuid_cur;
3475
3476 unless ($value) {
3477 warn "cowardly refusing to write zero uuid value!\n";
3478 return;
3479 }
3480
3481 my $value = uuid_str $value + $uuid_skip;
3482 $uuid_skip = 0;
3483
3484 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3485 and return;
3486
3487 # always fsync - this file is important
3488 aio_fsync $fh
3489 and return;
3490
3491 close $fh
3492 or return;
3493
3494 aio_rename "$uuid~", $uuid
3495 and return;
3496
3497 warn "uuid file written ($value).\n";
3498
3499 1
3500
3501}
3502
3503sub write_uuid($$) {
3504 my ($skip, $sync) = @_;
3505
3506 $sync ? write_uuid_sync $skip
3507 : async { write_uuid_sync $skip };
3130} 3508}
3131 3509
3132sub emergency_save() { 3510sub emergency_save() {
3133 my $freeze_guard = cf::freeze_mainloop; 3511 my $freeze_guard = cf::freeze_mainloop;
3134 3512
3135 warn "enter emergency perl save\n"; 3513 warn "emergency_perl_save: enter\n";
3136 3514
3137 cf::sync_job { 3515 cf::sync_job {
3516 # this is a trade-off: we want to be very quick here, so
3517 # save all maps without fsync, and later call a global sync
3518 # (which in turn might be very very slow)
3519 local $USE_FSYNC = 0;
3520
3138 # use a peculiar iteration method to avoid tripping on perl 3521 # use a peculiar iteration method to avoid tripping on perl
3139 # refcount bugs in for. also avoids problems with players 3522 # refcount bugs in for. also avoids problems with players
3140 # and maps saved/destroyed asynchronously. 3523 # and maps saved/destroyed asynchronously.
3141 warn "begin emergency player save\n"; 3524 warn "emergency_perl_save: begin player save\n";
3142 for my $login (keys %cf::PLAYER) { 3525 for my $login (keys %cf::PLAYER) {
3143 my $pl = $cf::PLAYER{$login} or next; 3526 my $pl = $cf::PLAYER{$login} or next;
3144 $pl->valid or next; 3527 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3145 $pl->save; 3529 $pl->save;
3146 } 3530 }
3147 warn "end emergency player save\n"; 3531 warn "emergency_perl_save: end player save\n";
3148 3532
3149 warn "begin emergency map save\n"; 3533 warn "emergency_perl_save: begin map save\n";
3150 for my $path (keys %cf::MAP) { 3534 for my $path (keys %cf::MAP) {
3151 my $map = $cf::MAP{$path} or next; 3535 my $map = $cf::MAP{$path} or next;
3152 $map->valid or next; 3536 $map->valid or next;
3153 $map->save; 3537 $map->save;
3154 } 3538 }
3155 warn "end emergency map save\n"; 3539 warn "emergency_perl_save: end map save\n";
3156 3540
3157 warn "begin emergency database checkpoint\n"; 3541 warn "emergency_perl_save: begin database checkpoint\n";
3158 BDB::db_env_txn_checkpoint $DB_ENV; 3542 BDB::db_env_txn_checkpoint $DB_ENV;
3159 warn "end emergency database checkpoint\n"; 3543 warn "emergency_perl_save: end database checkpoint\n";
3544
3545 warn "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1;
3547 warn "emergency_perl_save: end write uuid\n";
3160 }; 3548 };
3161 3549
3550 warn "emergency_perl_save: starting sync()\n";
3551 IO::AIO::aio_sync sub {
3552 warn "emergency_perl_save: finished sync()\n";
3553 };
3554
3162 warn "leave emergency perl save\n"; 3555 warn "emergency_perl_save: leave\n";
3163} 3556}
3164 3557
3165sub post_cleanup { 3558sub post_cleanup {
3166 my ($make_core) = @_; 3559 my ($make_core) = @_;
3167 3560
3168 warn Carp::longmess "post_cleanup backtrace" 3561 warn Carp::longmess "post_cleanup backtrace"
3169 if $make_core; 3562 if $make_core;
3563
3564 my $fh = pidfile;
3565 unlink $PIDFILE if <$fh> == $$;
3566}
3567
3568# a safer delete_package, copied from Symbol
3569sub clear_package($) {
3570 my $pkg = shift;
3571
3572 # expand to full symbol table name if needed
3573 unless ($pkg =~ /^main::.*::$/) {
3574 $pkg = "main$pkg" if $pkg =~ /^::/;
3575 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3576 $pkg .= '::' unless $pkg =~ /::$/;
3577 }
3578
3579 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3580 my $stem_symtab = *{$stem}{HASH};
3581
3582 defined $stem_symtab and exists $stem_symtab->{$leaf}
3583 or return;
3584
3585 # clear all symbols
3586 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3587 for my $name (keys %$leaf_symtab) {
3588 _gv_clear *{"$pkg$name"};
3589# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3590 }
3591 warn "cleared package $pkg\n";#d#
3170} 3592}
3171 3593
3172sub do_reload_perl() { 3594sub do_reload_perl() {
3173 # can/must only be called in main 3595 # can/must only be called in main
3174 if ($Coro::current != $Coro::main) { 3596 if ($Coro::current != $Coro::main) {
3175 warn "can only reload from main coroutine"; 3597 warn "can only reload from main coroutine";
3176 return; 3598 return;
3177 } 3599 }
3178 3600
3601 return if $RELOAD++;
3602
3603 my $t1 = EV::time;
3604
3605 while ($RELOAD) {
3179 warn "reloading..."; 3606 warn "reloading...";
3180 3607
3181 warn "entering sync_job"; 3608 warn "entering sync_job";
3182 3609
3183 cf::sync_job { 3610 cf::sync_job {
3184 cf::write_runtime; # external watchdog should not bark 3611 cf::write_runtime_sync; # external watchdog should not bark
3185 cf::emergency_save; 3612 cf::emergency_save;
3186 cf::write_runtime; # external watchdog should not bark 3613 cf::write_runtime_sync; # external watchdog should not bark
3187 3614
3188 warn "syncing database to disk"; 3615 warn "syncing database to disk";
3189 BDB::db_env_txn_checkpoint $DB_ENV; 3616 BDB::db_env_txn_checkpoint $DB_ENV;
3190 3617
3191 # if anything goes wrong in here, we should simply crash as we already saved 3618 # if anything goes wrong in here, we should simply crash as we already saved
3192 3619
3193 warn "cancelling all WF_AUTOCANCEL watchers";
3194 for (Event::all_watchers) {
3195 $_->cancel if $_->data & WF_AUTOCANCEL;
3196 }
3197
3198 warn "flushing outstanding aio requests"; 3620 warn "flushing outstanding aio requests";
3199 for (;;) {
3200 BDB::flush;
3201 IO::AIO::flush;
3202 Coro::cede;
3203 last unless IO::AIO::nreqs || BDB::nreqs; 3621 while (IO::AIO::nreqs || BDB::nreqs) {
3204 warn "iterate..."; 3622 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3205 }
3206
3207 ++$RELOAD;
3208
3209 warn "cancelling all extension coros";
3210 $_->cancel for values %EXT_CORO;
3211 %EXT_CORO = ();
3212
3213 warn "removing commands";
3214 %COMMAND = ();
3215
3216 warn "removing ext/exti commands";
3217 %EXTCMD = ();
3218 %EXTICMD = ();
3219
3220 warn "unloading/nuking all extensions";
3221 for my $pkg (@EXTS) {
3222 warn "... unloading $pkg";
3223
3224 if (my $cb = $pkg->can ("unload")) {
3225 eval {
3226 $cb->($pkg);
3227 1
3228 } or warn "$pkg unloaded, but with errors: $@";
3229 } 3623 }
3230 3624
3231 warn "... nuking $pkg"; 3625 warn "cancelling all extension coros";
3232 Symbol::delete_package $pkg; 3626 $_->cancel for values %EXT_CORO;
3233 } 3627 %EXT_CORO = ();
3234 3628
3235 warn "unloading all perl modules loaded from $LIBDIR"; 3629 warn "removing commands";
3236 while (my ($k, $v) = each %INC) { 3630 %COMMAND = ();
3237 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3238 3631
3632 warn "removing ext/exti commands";
3633 %EXTCMD = ();
3634 %EXTICMD = ();
3635
3636 warn "unloading/nuking all extensions";
3637 for my $pkg (@EXTS) {
3239 warn "... unloading $k"; 3638 warn "... unloading $pkg";
3240 delete $INC{$k};
3241 3639
3242 $k =~ s/\.pm$//;
3243 $k =~ s/\//::/g;
3244
3245 if (my $cb = $k->can ("unload_module")) { 3640 if (my $cb = $pkg->can ("unload")) {
3641 eval {
3246 $cb->(); 3642 $cb->($pkg);
3643 1
3644 } or warn "$pkg unloaded, but with errors: $@";
3645 }
3646
3647 warn "... clearing $pkg";
3648 clear_package $pkg;
3247 } 3649 }
3248 3650
3249 Symbol::delete_package $k; 3651 warn "unloading all perl modules loaded from $LIBDIR";
3652 while (my ($k, $v) = each %INC) {
3653 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3654
3655 warn "... unloading $k";
3656 delete $INC{$k};
3657
3658 $k =~ s/\.pm$//;
3659 $k =~ s/\//::/g;
3660
3661 if (my $cb = $k->can ("unload_module")) {
3662 $cb->();
3663 }
3664
3665 clear_package $k;
3250 } 3666 }
3251 3667
3252 warn "getting rid of safe::, as good as possible"; 3668 warn "getting rid of safe::, as good as possible";
3253 Symbol::delete_package "safe::$_" 3669 clear_package "safe::$_"
3254 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3670 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3255 3671
3256 warn "unloading cf.pm \"a bit\""; 3672 warn "unloading cf.pm \"a bit\"";
3257 delete $INC{"cf.pm"}; 3673 delete $INC{"cf.pm"};
3258 delete $INC{"cf/pod.pm"}; 3674 delete $INC{"cf/pod.pm"};
3259 3675
3260 # don't, removes xs symbols, too, 3676 # don't, removes xs symbols, too,
3261 # and global variables created in xs 3677 # and global variables created in xs
3262 #Symbol::delete_package __PACKAGE__; 3678 #clear_package __PACKAGE__;
3263 3679
3264 warn "unload completed, starting to reload now"; 3680 warn "unload completed, starting to reload now";
3265 3681
3266 warn "reloading cf.pm"; 3682 warn "reloading cf.pm";
3267 require cf; 3683 require cf;
3268 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3684 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3269 3685
3270 warn "loading config and database again"; 3686 warn "loading config and database again";
3271 cf::reload_config; 3687 cf::reload_config;
3272 3688
3273 warn "loading extensions"; 3689 warn "loading extensions";
3274 cf::load_extensions; 3690 cf::load_extensions;
3275 3691
3692 if ($REATTACH_ON_RELOAD) {
3276 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3277 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3278 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3279 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3280 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3281 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3699 }
3282 3700
3701 warn "running post_init jobs";
3702 (pop @POST_INIT)->(1) while @POST_INIT;
3703
3283 warn "leaving sync_job"; 3704 warn "leaving sync_job";
3284 3705
3285 1 3706 1
3286 } or do { 3707 } or do {
3287 warn $@; 3708 warn $@;
3288 warn "error while reloading, exiting."; 3709 cf::cleanup "error while reloading, exiting.";
3289 exit 1;
3290 }; 3710 };
3291 3711
3292 warn "reloaded"; 3712 warn "reloaded";
3713 --$RELOAD;
3714 }
3715
3716 $t1 = EV::time - $t1;
3717 warn "reload completed in ${t1}s\n";
3293}; 3718};
3294 3719
3295our $RELOAD_WATCHER; # used only during reload 3720our $RELOAD_WATCHER; # used only during reload
3296 3721
3297sub reload_perl() { 3722sub reload_perl() {
3298 # doing reload synchronously and two reloads happen back-to-back, 3723 # doing reload synchronously and two reloads happen back-to-back,
3299 # coro crashes during coro_state_free->destroy here. 3724 # coro crashes during coro_state_free->destroy here.
3300 3725
3301 $RELOAD_WATCHER ||= Event->timer ( 3726 $RELOAD_WATCHER ||= cf::async {
3302 reentrant => 0, 3727 Coro::AIO::aio_wait cache_extensions;
3303 after => 0, 3728
3304 data => WF_AUTOCANCEL, 3729 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3305 cb => sub {
3306 do_reload_perl; 3730 do_reload_perl;
3307 undef $RELOAD_WATCHER; 3731 undef $RELOAD_WATCHER;
3308 }, 3732 };
3309 ); 3733 };
3310} 3734}
3311 3735
3312register_command "reload" => sub { 3736register_command "reload" => sub {
3313 my ($who, $arg) = @_; 3737 my ($who, $arg) = @_;
3314 3738
3315 if ($who->flag (FLAG_WIZ)) { 3739 if ($who->flag (FLAG_WIZ)) {
3316 $who->message ("reloading server."); 3740 $who->message ("reloading server.");
3741 async {
3742 $Coro::current->{desc} = "perl_reload";
3317 async { reload_perl }; 3743 reload_perl;
3744 };
3318 } 3745 }
3319}; 3746};
3320 3747
3321unshift @INC, $LIBDIR; 3748unshift @INC, $LIBDIR;
3322 3749
3324 3751
3325our @WAIT_FOR_TICK; 3752our @WAIT_FOR_TICK;
3326our @WAIT_FOR_TICK_BEGIN; 3753our @WAIT_FOR_TICK_BEGIN;
3327 3754
3328sub wait_for_tick { 3755sub wait_for_tick {
3329 return unless $TICK_WATCHER->is_active;
3330 return if $Coro::current == $Coro::main; 3756 return if tick_inhibit || $Coro::current == $Coro::main;
3331 3757
3332 my $signal = new Coro::Signal; 3758 my $signal = new Coro::Signal;
3333 push @WAIT_FOR_TICK, $signal; 3759 push @WAIT_FOR_TICK, $signal;
3334 $signal->wait; 3760 $signal->wait;
3335} 3761}
3336 3762
3337sub wait_for_tick_begin { 3763sub wait_for_tick_begin {
3338 return unless $TICK_WATCHER->is_active;
3339 return if $Coro::current == $Coro::main; 3764 return if tick_inhibit || $Coro::current == $Coro::main;
3340 3765
3341 my $signal = new Coro::Signal; 3766 my $signal = new Coro::Signal;
3342 push @WAIT_FOR_TICK_BEGIN, $signal; 3767 push @WAIT_FOR_TICK_BEGIN, $signal;
3343 $signal->wait; 3768 $signal->wait;
3344} 3769}
3345 3770
3346 my $min = 1e6;#d# 3771sub tick {
3347 my $avg = 10;
3348$TICK_WATCHER = Event->timer (
3349 reentrant => 0,
3350 parked => 1,
3351 prio => 0,
3352 at => $NEXT_TICK || $TICK,
3353 data => WF_AUTOCANCEL,
3354 cb => sub {
3355 if ($Coro::current != $Coro::main) { 3772 if ($Coro::current != $Coro::main) {
3356 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3773 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3357 unless ++$bug_warning > 10; 3774 unless ++$bug_warning > 10;
3358 return; 3775 return;
3359 } 3776 }
3360 3777
3361 $NOW = $tick_start = Event::time;
3362
3363 cf::server_tick; # one server iteration 3778 cf::server_tick; # one server iteration
3364 3779
3365 0 && sync_job {#d# 3780 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3366 for(1..10) { 3781 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3367 my $t = Event::time; 3782 Coro::async_pool {
3368 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3783 $Coro::current->{desc} = "runtime saver";
3369 or die; 3784 write_runtime_sync
3370 3785 or warn "ERROR: unable to write runtime file: $!";
3371 $map->width (50);
3372 $map->height (50);
3373 $map->alloc;
3374 $map->_load_objects ("/tmp/x.map", 1);
3375 my $t = Event::time - $t;
3376
3377 #next unless $t < 0.0013;#d#
3378 if ($t < $min) {
3379 $min = $t;
3380 }
3381 $avg = $avg * 0.99 + $t * 0.01;
3382 }
3383 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3384 exit 0;
3385 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3386 }; 3786 };
3787 }
3387 3788
3388 $RUNTIME += $TICK;
3389 $NEXT_TICK += $TICK;
3390
3391 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3392 $NEXT_RUNTIME_WRITE = $NOW + 10;
3393 Coro::async_pool {
3394 write_runtime
3395 or warn "ERROR: unable to write runtime file: $!";
3396 };
3397 }
3398
3399# my $AFTER = Event::time;
3400# warn $AFTER - $NOW;#d#
3401
3402 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3789 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3403 $sig->send; 3790 $sig->send;
3404 } 3791 }
3405 while (my $sig = shift @WAIT_FOR_TICK) { 3792 while (my $sig = shift @WAIT_FOR_TICK) {
3406 $sig->send; 3793 $sig->send;
3407 } 3794 }
3408 3795
3409 $NOW = Event::time; 3796 $LOAD = ($NOW - $TICK_START) / $TICK;
3410
3411 # if we are delayed by four ticks or more, skip them all
3412 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3413
3414 $TICK_WATCHER->at ($NEXT_TICK);
3415 $TICK_WATCHER->start;
3416
3417 $LOAD = ($NOW - $tick_start) / $TICK;
3418 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3797 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3419 3798
3420 _post_tick; 3799 if (0) {
3421 3800 if ($NEXT_TICK) {
3422 3801 my $jitter = $TICK_START - $NEXT_TICK;
3802 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3803 warn "jitter $JITTER\n";#d#
3804 }
3423 }, 3805 }
3424); 3806}
3425 3807
3426{ 3808{
3427 BDB::max_poll_time $TICK * 0.1; 3809 # configure BDB
3428 $BDB_POLL_WATCHER = Event->io ( 3810
3429 reentrant => 0,
3430 fd => BDB::poll_fileno,
3431 poll => 'r',
3432 prio => 0,
3433 data => WF_AUTOCANCEL,
3434 cb => \&BDB::poll_cb,
3435 );
3436 BDB::min_parallel 8; 3811 BDB::min_parallel 8;
3437 3812 BDB::max_poll_reqs $TICK * 0.1;
3438 BDB::set_sync_prepare { 3813 $AnyEvent::BDB::WATCHER->priority (1);
3439 my $status;
3440 my $current = $Coro::current;
3441 (
3442 sub {
3443 $status = $!;
3444 $current->ready; undef $current;
3445 },
3446 sub {
3447 Coro::schedule while defined $current;
3448 $! = $status;
3449 },
3450 )
3451 };
3452 3814
3453 unless ($DB_ENV) { 3815 unless ($DB_ENV) {
3454 $DB_ENV = BDB::db_env_create; 3816 $DB_ENV = BDB::db_env_create;
3817 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3818 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3819 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3820 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3821 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3455 3822
3456 cf::sync_job { 3823 cf::sync_job {
3457 eval { 3824 eval {
3458 BDB::db_env_open 3825 BDB::db_env_open
3459 $DB_ENV, 3826 $DB_ENV,
3461 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3828 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3462 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3829 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3463 0666; 3830 0666;
3464 3831
3465 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3832 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3466
3467 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3468 $DB_ENV->set_lk_detect;
3469 }; 3833 };
3470 3834
3471 cf::cleanup "db_env_open(db): $@" if $@; 3835 cf::cleanup "db_env_open(db): $@" if $@;
3472 }; 3836 };
3473 } 3837 }
3838
3839 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3840 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3841 };
3842 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3843 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3844 };
3845 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3846 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3847 };
3474} 3848}
3475 3849
3476{ 3850{
3851 # configure IO::AIO
3852
3477 IO::AIO::min_parallel 8; 3853 IO::AIO::min_parallel 8;
3478
3479 undef $Coro::AIO::WATCHER;
3480 IO::AIO::max_poll_time $TICK * 0.1; 3854 IO::AIO::max_poll_time $TICK * 0.1;
3481 $AIO_POLL_WATCHER = Event->io ( 3855 undef $AnyEvent::AIO::WATCHER;
3482 reentrant => 0,
3483 data => WF_AUTOCANCEL,
3484 fd => IO::AIO::poll_fileno,
3485 poll => 'r',
3486 prio => 6,
3487 cb => \&IO::AIO::poll_cb,
3488 );
3489} 3856}
3490 3857
3491my $_log_backtrace; 3858my $_log_backtrace;
3492 3859
3493sub _log_backtrace { 3860sub _log_backtrace {
3496 $msg =~ s/\n//; 3863 $msg =~ s/\n//;
3497 3864
3498 # limit the # of concurrent backtraces 3865 # limit the # of concurrent backtraces
3499 if ($_log_backtrace < 2) { 3866 if ($_log_backtrace < 2) {
3500 ++$_log_backtrace; 3867 ++$_log_backtrace;
3868 my $perl_bt = Carp::longmess $msg;
3501 async { 3869 async {
3870 $Coro::current->{desc} = "abt $msg";
3871
3502 my @bt = fork_call { 3872 my @bt = fork_call {
3503 @addr = map { sprintf "%x", $_ } @addr; 3873 @addr = map { sprintf "%x", $_ } @addr;
3504 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3874 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3505 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3875 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3506 or die "addr2line: $!"; 3876 or die "addr2line: $!";
3514 } 3884 }
3515 3885
3516 @funcs 3886 @funcs
3517 }; 3887 };
3518 3888
3519 LOG llevInfo, "[ABT] $msg\n"; 3889 LOG llevInfo, "[ABT] $perl_bt\n";
3890 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3520 LOG llevInfo, "[ABT] $_\n" for @bt; 3891 LOG llevInfo, "[ABT] $_\n" for @bt;
3521 --$_log_backtrace; 3892 --$_log_backtrace;
3522 }; 3893 };
3523 } else { 3894 } else {
3524 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines