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.359 by root, Sat Sep 8 18:15:55 2007 UTC vs.
Revision 1.472 by root, Sat Jun 6 21:43:13 2009 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 qw(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 on
83 111
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
86 118
87our %CFG; 119our %CFG;
88 120
89our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 122our $RUNTIME;
123our $NOW;
91 124
92our (%PLAYER, %PLAYER_LOADING); # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 126our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
95 128
96# used to convert map paths into valid unix filenames by replacing / by ∕ 129# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 131
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
102 140
103binmode STDOUT; 141binmode STDOUT;
104binmode STDERR; 142binmode STDERR;
105 143
106# read virtual server time, if available 144# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
111} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
112 152
113mkdir $_ 153mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 155
116our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
159 199
160The raw value load value from the last tick. 200The raw value load value from the last tick.
161 201
162=item %cf::CFG 202=item %cf::CFG
163 203
164Configuration for the server, loaded from C</etc/crossfire/config>, or 204Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 205from wherever your confdir points to.
166 206
167=item cf::wait_for_tick, cf::wait_for_tick_begin 207=item cf::wait_for_tick, cf::wait_for_tick_begin
168 208
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 209These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 227 $msg .= "\n"
188 unless $msg =~ /\n$/; 228 unless $msg =~ /\n$/;
189 229
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 230 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 231
192 utf8::encode $msg;
193 LOG llevError, $msg; 232 LOG llevError, $msg;
194 }; 233 };
195} 234}
235
236$Coro::State::DIEHOOK = sub {
237 return unless $^S eq 0; # "eq", not "=="
238
239 if ($Coro::current == $Coro::main) {#d#
240 warn "DIEHOOK called in main context, Coro bug?\n";#d#
241 return;#d#
242 }#d#
243
244 # kill coroutine otherwise
245 warn Carp::longmess $_[0];
246 Coro::terminate
247};
248
249$SIG{__DIE__} = sub { }; #d#?
196 250
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 251@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 252@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 253@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 254@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 261for my $pkg (qw(
208 cf::global cf::attachable 262 cf::global cf::attachable
209 cf::object cf::object::player 263 cf::object cf::object::player
210 cf::client cf::player 264 cf::client cf::player
211 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
212 cf::map cf::party cf::region 267 cf::party cf::region
213)) { 268)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 270}
217 271
218$Event::DIED = sub { 272$EV::DIED = sub {
219 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
220}; 274};
221 275
222############################################################################# 276#############################################################################
223 277
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 300 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 301 $d
248 } || "[unable to dump $_[0]: '$@']"; 302 } || "[unable to dump $_[0]: '$@']";
249} 303}
250 304
251=item $ref = cf::from_json $json 305=item $ref = cf::decode_json $json
252 306
253Converts a JSON string into the corresponding perl data structure. 307Converts a JSON string into the corresponding perl data structure.
254 308
255=item $json = cf::to_json $ref 309=item $json = cf::encode_json $ref
256 310
257Converts a perl data structure into its JSON representation. 311Converts a perl data structure into its JSON representation.
258 312
259=cut 313=cut
260 314
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 316
263sub to_json ($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
265 333
266=item cf::lock_wait $string 334=item cf::lock_wait $string
267 335
268Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
269 337
270=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
271 339
272Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
275returned. 343returned.
276 344
277Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
278deadlocked coro. 346deadlocked coro.
284 352
285Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
286 354
287=cut 355=cut
288 356
289our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
290our %LOCKER;#d#
291 358
292sub lock_wait($) { 359sub lock_wait($) {
293 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
294
295 if ($LOCKER{$key} == $Coro::current) {#d#
296 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
297 return;#d#
298 }#d#
299
300 # wait for lock, if any
301 while ($LOCK{$key}) {
302 push @{ $LOCK{$key} }, $Coro::current;
303 Coro::schedule;
304 }
305} 361}
306 362
307sub lock_acquire($) { 363sub lock_acquire($) {
308 my ($key) = @_; 364 $LOCKS->guard ($_[0])
309
310 # wait, to be sure we are not locked
311 lock_wait $key;
312
313 $LOCK{$key} = [];
314 $LOCKER{$key} = $Coro::current;#d#
315
316 Coro::guard {
317 delete $LOCKER{$key};#d#
318 # wake up all waiters, to be on the safe side
319 $_->ready for @{ delete $LOCK{$key} };
320 }
321} 365}
322 366
323sub lock_active($) { 367sub lock_active($) {
324 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
325
326 ! ! $LOCK{$key}
327} 369}
328 370
329sub freeze_mainloop { 371sub freeze_mainloop {
330 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
331 373
332 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
333 $TICK_WATCHER->start; 375}
334 }; 376
335 $TICK_WATCHER->stop; 377=item cf::periodic $interval, $cb
336 $guard 378
379Like EV::periodic, but randomly selects a starting point so that the actions
380get spread over timer.
381
382=cut
383
384sub periodic($$) {
385 my ($interval, $cb) = @_;
386
387 my $start = rand List::Util::min 180, $interval;
388
389 EV::periodic $start, $interval, 0, $cb
337} 390}
338 391
339=item cf::get_slot $time[, $priority[, $name]] 392=item cf::get_slot $time[, $priority[, $name]]
340 393
341Allocate $time seconds of blocking CPU time at priority C<$priority>: 394Allocate $time seconds of blocking CPU time at priority C<$priority>:
352our @SLOT_QUEUE; 405our @SLOT_QUEUE;
353our $SLOT_QUEUE; 406our $SLOT_QUEUE;
354 407
355$SLOT_QUEUE->cancel if $SLOT_QUEUE; 408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
356$SLOT_QUEUE = Coro::async { 409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
357 my $signal = new Coro::Signal; 412 my $signal = new Coro::Signal;
358 413
359 while () { 414 while () {
360 next_job: 415 next_job:
361 my $avail = cf::till_tick; 416 my $avail = cf::till_tick;
369 } 424 }
370 } 425 }
371 } 426 }
372 427
373 if (@SLOT_QUEUE) { 428 if (@SLOT_QUEUE) {
374 # we do not use wait_For_tick() as it returns immediately when tick is inactive 429 # we do not use wait_for_tick() as it returns immediately when tick is inactive
375 push @cf::WAIT_FOR_TICK, $signal; 430 push @cf::WAIT_FOR_TICK, $signal;
376 $signal->wait; 431 $signal->wait;
377 } else { 432 } else {
378 Coro::schedule; 433 Coro::schedule;
379 } 434 }
380 } 435 }
381}; 436};
382 437
383sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
384 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
385 442
386 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
387 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
388 445
402 459
403BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
404 461
405=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
406 463
407The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
408is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
409partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
410acceptable. 467acceptable.
411 468
412If it must be done, put the blocking parts into C<sync_job>. This will run 469If it must be done, put the blocking parts into C<sync_job>. This will run
413the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
418 475
419sub sync_job(&) { 476sub sync_job(&) {
420 my ($job) = @_; 477 my ($job) = @_;
421 478
422 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
423 my $time = Event::time; 480 my $time = EV::time;
424 481
425 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
426 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
427 484
428 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
429 # (but this is cancel-safe) 486
430 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
431 488
432 my $busy = 1; 489 my $busy = 1;
433 my @res; 490 my @res;
434 491
435 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
436 @res = eval { $job->() }; 494 @res = eval { $job->() };
437 warn $@ if $@; 495 warn $@ if $@;
438 undef $busy; 496 undef $busy;
439 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
440 498
441 while ($busy) { 499 while ($busy) {
442 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
443 } 504 }
505 }
444 506
445 $time = Event::time - $time; 507 my $time = EV::time - $time;
446 508
447 LOG llevError | logBacktrace, Carp::longmess "long sync job"
448 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
449
450 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
451 510
452 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
453 } else { 512 } else {
454 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
455 514
480=item fork_call { }, $args 539=item fork_call { }, $args
481 540
482Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
483process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
484Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
485never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
486 545
487=cut 546=cut
488 547
489sub fork_call(&@) { 548sub fork_call(&@) {
490 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
499 }, @args; 558 }, @args;
500 559
501 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
502} 561}
503 562
563=item $coin = coin_from_name $name
564
565=cut
566
567our %coin_alias = (
568 "silver" => "silvercoin",
569 "silvercoin" => "silvercoin",
570 "silvercoins" => "silvercoin",
571 "gold" => "goldcoin",
572 "goldcoin" => "goldcoin",
573 "goldcoins" => "goldcoin",
574 "platinum" => "platinacoin",
575 "platinumcoin" => "platinacoin",
576 "platinumcoins" => "platinacoin",
577 "platina" => "platinacoin",
578 "platinacoin" => "platinacoin",
579 "platinacoins" => "platinacoin",
580 "royalty" => "royalty",
581 "royalties" => "royalty",
582);
583
584sub coin_from_name($) {
585 $coin_alias{$_[0]}
586 ? cf::arch::find $coin_alias{$_[0]}
587 : undef
588}
589
504=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
505 591
506Returns a single value from the environment database. 592Returns a single value from the environment database.
507 593
508=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
509 595
510Stores the given C<$value> in the family. It can currently store binary 596Stores the given C<$value> in the family. It can currently store binary
511data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 597data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
512 598
599=item $db = cf::db_table "name"
600
601Create and/or open a new database table. The string must not be "db" and must be unique
602within each server.
603
513=cut 604=cut
605
606sub db_table($) {
607 my ($name) = @_;
608 my $db = BDB::db_create $DB_ENV;
609
610 eval {
611 $db->set_flags (BDB::CHKSUM);
612
613 utf8::encode $name;
614 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
615 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
616 cf::cleanup "db_open(db): $!" if $!;
617 };
618 cf::cleanup "db_open(db): $@" if $@;
619
620 $db
621}
514 622
515our $DB; 623our $DB;
516 624
517sub db_init { 625sub db_init {
518 unless ($DB) {
519 $DB = BDB::db_create $DB_ENV;
520
521 cf::sync_job { 626 cf::sync_job {
522 eval { 627 $DB ||= db_table "db";
523 $DB->set_flags (BDB::CHKSUM);
524
525 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
526 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
527 cf::cleanup "db_open(db): $!" if $!;
528 };
529 cf::cleanup "db_open(db): $@" if $@;
530 };
531 } 628 };
532} 629}
533 630
534sub db_get($$) { 631sub db_get($$) {
535 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
536 633
634 731
635############################################################################# 732#############################################################################
636 733
637=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
638 735
639Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
640attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
641to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
642 739
643In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
644C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
645Crossfire TRT). 742Deliantra).
646 743
647=over 4 744=over 4
648 745
649=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
650 747
694=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
695 792
696Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
697given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
698 795
699Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
700that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
701 798
702These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
703 800
704=over 4 801=over 4
932 } 1029 }
933 1030
934 0 1031 0
935} 1032}
936 1033
937=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
938 1035
939=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
940 1037
941Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
942 1039
948 1045
949=cut 1046=cut
950 1047
951############################################################################# 1048#############################################################################
952# object support 1049# object support
953#
954 1050
1051sub _object_equal($$);
1052sub _object_equal($$) {
1053 my ($a, $b) = @_;
1054
1055 return 0 unless (ref $a) eq (ref $b);
1056
1057 if ("HASH" eq ref $a) {
1058 my @ka = keys %$a;
1059 my @kb = keys %$b;
1060
1061 return 0 if @ka != @kb;
1062
1063 for (0 .. $#ka) {
1064 return 0 unless $ka[$_] eq $kb[$_];
1065 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1066 }
1067
1068 } elsif ("ARRAY" eq ref $a) {
1069
1070 return 0 if @$a != @$b;
1071
1072 for (0 .. $#$a) {
1073 return 0 unless _object_equal $a->[$_], $b->[$_];
1074 }
1075
1076 } elsif ($a ne $b) {
1077 return 0;
1078 }
1079
1080 1
1081}
1082
1083our $SLOW_MERGES;#d#
955sub _can_merge { 1084sub _can_merge {
956 my ($ob1, $ob2) = @_; 1085 my ($ob1, $ob2) = @_;
957 1086
958 local $Storable::canonical = 1; 1087 ++$SLOW_MERGES;#d#
959 my $fob1 = Storable::freeze $ob1;
960 my $fob2 = Storable::freeze $ob2;
961 1088
962 $fob1 eq $fob2 1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
963} 1091}
964 1092
965sub reattach { 1093sub reattach {
966 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
967 my ($obj) = @_; 1095 my ($obj) = @_;
968 1096
1097 # no longer needed after getting rid of delete_package?
969 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
970 1099
971 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
972 1101
973 @$registry = (); 1102 @$registry = ();
974 1103
989cf::attachable->attach ( 1118cf::attachable->attach (
990 prio => -1000000, 1119 prio => -1000000,
991 on_instantiate => sub { 1120 on_instantiate => sub {
992 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
993 1122
994 $data = from_json $data; 1123 $data = decode_json $data;
995 1124
996 for (@$data) { 1125 for (@$data) {
997 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
998 1127
999 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
1013); 1142);
1014 1143
1015sub object_freezer_save { 1144sub object_freezer_save {
1016 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
1017 1146
1018 my $guard = cf::lock_acquire "io";
1019
1020 sync_job { 1147 sync_job {
1021 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
1022 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1023 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1024 1152
1025 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1026 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1027 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1029 close $fh; 1157 aio_close $fh;
1030 1158
1031 if (@$objs) { 1159 if (@$objs) {
1032 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1033 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1034 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1035 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1036 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1037 close $fh; 1165 aio_close $fh;
1038 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1039 } 1167 }
1040 } else { 1168 } else {
1041 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1042 } 1170 }
1043 1171
1044 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1045 } else { 1176 } else {
1046 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1047 } 1178 }
1048 } else { 1179 } else {
1049 aio_unlink $filename; 1180 aio_unlink $filename;
1050 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1051 } 1182 }
1052 }; 1183 };
1053
1054 undef $guard;
1055} 1184}
1056 1185
1057sub object_freezer_as_string { 1186sub object_freezer_as_string {
1058 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
1059 1188
1064 1193
1065sub object_thawer_load { 1194sub object_thawer_load {
1066 my ($filename) = @_; 1195 my ($filename) = @_;
1067 1196
1068 my ($data, $av); 1197 my ($data, $av);
1069
1070 my $guard = cf::lock_acquire "io";
1071 1198
1072 (aio_load $filename, $data) >= 0 1199 (aio_load $filename, $data) >= 0
1073 or return; 1200 or return;
1074 1201
1075 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
1076 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
1077 or return; 1204 or return;
1078 1205
1079 undef $guard;
1080 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1081 } 1208 }
1082 1209
1210 utf8::decode (my $decname = $filename);
1083 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1084 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1085 1213
1086 ($data, $av) 1214 ($data, $av)
1087} 1215}
1088 1216
1089=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1145 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1146 1274
1147 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1148} 1276}
1149 1277
1278use File::Glob ();
1279
1150cf::player->attach ( 1280cf::player->attach (
1151 on_command => sub { 1281 on_command => sub {
1152 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1153 1283
1154 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1186 1316
1187 cf::override; 1317 cf::override;
1188 }, 1318 },
1189); 1319);
1190 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1191sub load_extensions { 1334sub load_extensions {
1192 cf::sync_job { 1335 cf::sync_job {
1193 my %todo; 1336 my %todo;
1194 1337
1195 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1214 1357
1215 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1216 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1217 1360
1218 $ext{source} = 1361 $ext{source} =
1219 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1220 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1221 . $source 1364 . $source
1222 . "\n};\n1"; 1365 . "\n};\n1";
1223 1366
1224 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1240 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1241 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1242 1385
1243 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1244 warn $msg; 1387 warn $msg;
1245 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1246 exit 1;
1247 } 1389 }
1248 1390
1249 warn $msg; 1391 warn $msg;
1250 } 1392 }
1251 1393
1265 1407
1266=back 1408=back
1267 1409
1268=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1269 1411
1270Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1271 1413
1272=cut 1414=cut
1273 1415
1274package cf::player; 1416package cf::player;
1275 1417
1276use Coro::AIO; 1418use Coro::AIO;
1277 1419
1278=head3 cf::player 1420=head3 cf::player
1279 1421
1280=over 4 1422=over 4
1423
1424=item cf::player::num_playing
1425
1426Returns the official number of playing players, as per the Crossfire metaserver rules.
1427
1428=cut
1429
1430sub num_playing {
1431 scalar grep
1432 $_->ob->map
1433 && !$_->hidden
1434 && !$_->ob->flag (cf::FLAG_WIZ),
1435 cf::player::list
1436}
1281 1437
1282=item cf::player::find $login 1438=item cf::player::find $login
1283 1439
1284Returns the given player object, loading it if necessary (might block). 1440Returns the given player object, loading it if necessary (might block).
1285 1441
1304 1460
1305sub exists($) { 1461sub exists($) {
1306 my ($login) = @_; 1462 my ($login) = @_;
1307 1463
1308 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1309 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1310} 1466}
1311 1467
1312sub find($) { 1468sub find($) {
1313 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1314 my $login = $_[0]; 1470 my $login = $_[0];
1324 aio_unlink +(playerdir $login) . "/$login.pl"; 1480 aio_unlink +(playerdir $login) . "/$login.pl";
1325 1481
1326 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1327 or return; 1483 or return;
1328 1484
1329 $f->next;
1330 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1331 or return; 1486 or return;
1487
1332 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1333 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1334 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1335 } 1491 }
1336 } 1492 }
1346 1502
1347 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1348 1504
1349 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1350 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1351 1509
1352 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1353 cf::cede_to_tick; 1511 cf::cede_to_tick;
1354} 1512}
1355 1513
1387 my ($pl) = @_; 1545 my ($pl) = @_;
1388 1546
1389 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1390 1548
1391 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1392 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1393 1551
1394 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1395 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1396 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1397 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1398 1558
1399 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1400 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1439 1599
1440 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1441 my $path = path $login; 1601 my $path = path $login;
1442 1602
1443 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1444 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1445 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1446 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1447 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1448 } 1609 }
1449 1610
1480 } 1641 }
1481 1642
1482 \@paths 1643 \@paths
1483} 1644}
1484 1645
1485=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1486 1647
1487Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1488
1489=cut
1490
1491sub expand_cfpod {
1492 ((my $self), (local $_)) = @_;
1493
1494 # escape & and <
1495 s/&/&amp;/g;
1496 s/(?<![BIUGHT])</&lt;/g;
1497
1498 # this is buggy, it needs to properly take care of nested <'s
1499
1500 1 while
1501 # replace B<>, I<>, U<> etc.
1502 s/B<([^\>]*)>/<b>$1<\/b>/
1503 || s/I<([^\>]*)>/<i>$1<\/i>/
1504 || s/U<([^\>]*)>/<u>$1<\/u>/
1505 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1506 # replace G<male|female> tags
1507 || s{G<([^>|]*)\|([^>]*)>}{
1508 $self->gender ? $2 : $1
1509 }ge
1510 # replace H<hint text>
1511 || s{H<([^\>]*)>}
1512 {
1513 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1514 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1515 "")
1516 [$self->{hintmode}]
1517 }ge;
1518
1519 # create single paragraphs (very hackish)
1520 s/(?<=\S)\n(?=\w)/ /g;
1521
1522 # compress some whitespace
1523 s/\s+\n/\n/g; # ws line-ends
1524 s/\n\n+/\n/g; # double lines
1525 s/^\n+//; # beginning lines
1526 s/\n+$//; # ending lines
1527
1528 $_
1529}
1530
1531sub hintmode {
1532 $_[0]{hintmode} = $_[1] if @_ > 1;
1533 $_[0]{hintmode}
1534}
1535 1649
1536=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1537 1651
1538Sends an ext reply to the player. 1652Sends an ext reply to the player.
1539 1653
1606our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1607our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1608 1722
1609sub generate_random_map { 1723sub generate_random_map {
1610 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1611 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1612 $self->_create_random_map ( 1729 $self->_create_random_map (
1613 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1614 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1615 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1737 1854
1738# the temporary/swap location 1855# the temporary/swap location
1739sub save_path { 1856sub save_path {
1740 my ($self) = @_; 1857 my ($self) = @_;
1741 1858
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1744} 1861}
1745 1862
1746# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1747sub uniq_path { 1864sub uniq_path {
1748 my ($self) = @_; 1865 my ($self) = @_;
1749 1866
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1752}
1753
1754# and all this just because we cannot iterate over
1755# all maps in C++...
1756sub change_all_map_light {
1757 my ($change) = @_;
1758
1759 $_->change_map_light ($change)
1760 for grep $_->outdoor, values %cf::MAP;
1761} 1869}
1762 1870
1763sub decay_objects { 1871sub decay_objects {
1764 my ($self) = @_; 1872 my ($self) = @_;
1765 1873
1849sub find { 1957sub find {
1850 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1851 1959
1852 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1853 1961
1854 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1855 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1856 1964
1857 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1858 my $guard1 = cf::lock_acquire "map_find:$path";
1859 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1860
1861 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1862 or return; 1967 or return;
1863 1968
1864 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1865 1970
1867 or return; 1972 or return;
1868 1973
1869 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1870 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1871 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1872 undef $guard1; 1978 undef $guard1;
1873 undef $guard2;
1874 $map->reset; 1979 $map->reset;
1875 return find $path; 1980 return find $path;
1876 } 1981 }
1877 1982
1878 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1891 1996
1892 { 1997 {
1893 my $guard = cf::lock_acquire "map_data:$path"; 1998 my $guard = cf::lock_acquire "map_data:$path";
1894 1999
1895 return unless $self->valid; 2000 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2001 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2002
1898 $self->in_memory (cf::MAP_LOADING); 2003 $self->in_memory (cf::MAP_LOADING);
1899 2004
1900 $self->alloc; 2005 $self->alloc;
1901 2006
1905 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
1906 $f->skip_block; 2011 $f->skip_block;
1907 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
1908 or return; 2013 or return;
1909 2014
1910 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1911 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1912 2017
1913 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1914 utf8::encode $uniq; 2019 utf8::encode $uniq;
1915 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
1933 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1934 $self->decay_objects; 2039 $self->decay_objects;
1935 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1936 $self->update_buttons; 2041 $self->update_buttons;
1937 cf::cede_to_tick; 2042 cf::cede_to_tick;
1938 $self->set_darkness_map;
1939 cf::cede_to_tick;
1940 $self->activate; 2043 $self->activate;
1941 } 2044 }
1942 2045
1943 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
1944 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
1945 2048
1946 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1947 } 2050 }
1948 2051
1949 $self->post_load; 2052 $self->post_load;
1950} 2053}
1951 2054
2009 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2010 2113
2011 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2012 2115
2013 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2014 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2015 } 2118 }
2016 2119
2017 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2018 2121
2019 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher";
2124
2020 while (%MAP_PREFETCH) { 2125 while (%MAP_PREFETCH) {
2021 while (my ($k, $v) = each %MAP_PREFETCH) { 2126 while (my ($k, $v) = each %MAP_PREFETCH) {
2022 if (my $map = find $k) { 2127 if (my $map = find $k) {
2023 $map->load if $v; 2128 $map->load if $v;
2024 } 2129 }
2050 return if $self->{deny_save}; 2155 return if $self->{deny_save};
2051 2156
2052 local $self->{last_access} = $self->last_access;#d# 2157 local $self->{last_access} = $self->last_access;#d#
2053 2158
2054 cf::async { 2159 cf::async {
2160 $Coro::current->{desc} = "map player save";
2055 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2056 }; 2162 };
2163
2164 cf::get_slot 0.02;
2057 2165
2058 if ($uniq) { 2166 if ($uniq) {
2059 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2060 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2061 } else { 2169 } else {
2070 $self->save; 2178 $self->save;
2071 2179
2072 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2073 2181
2074 return if $self->players; 2182 return if $self->players;
2075 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2076 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2077 2185
2078 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2079 2187
2080 $self->deactivate; 2188 $self->deactivate;
2198 2306
2199sub unique_maps() { 2307sub unique_maps() {
2200 [ 2308 [
2201 map { 2309 map {
2202 utf8::decode $_; 2310 utf8::decode $_;
2203 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2204 ? normalise $_ 2314 : normalise $_
2205 : ()
2206 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2207 ] 2316 ]
2208} 2317}
2209 2318
2210package cf;
2211
2212=back 2319=back
2213 2320
2214=head3 cf::object 2321=head3 cf::object
2215 2322
2216=cut 2323=cut
2219 2326
2220=over 4 2327=over 4
2221 2328
2222=item $ob->inv_recursive 2329=item $ob->inv_recursive
2223 2330
2224Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2225 2333
2226=cut 2334=cut
2227 2335
2228sub inv_recursive_; 2336sub inv_recursive_;
2229sub inv_recursive_ { 2337sub inv_recursive_ {
2234 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2235} 2343}
2236 2344
2237=item $ref = $ob->ref 2345=item $ref = $ob->ref
2238 2346
2239creates and returns a persistent reference to an objetc that can be stored as a string. 2347Creates and returns a persistent reference to an object that can be stored as a string.
2240 2348
2241=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2242 2350
2243returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2244even if the object actually exists. May block. 2352even if the object actually exists. May block.
2246=cut 2354=cut
2247 2355
2248sub deref { 2356sub deref {
2249 my ($ref) = @_; 2357 my ($ref) = @_;
2250 2358
2251 # temporary compatibility#TODO#remove
2252 $ref =~ s{^<}{player/<};
2253
2254 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2359 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2255 my ($uuid, $name) = ($1, $2); 2360 my ($uuid, $name) = ($1, $2);
2256 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2361 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2257 or return; 2362 or return;
2258 $pl->ob->uuid eq $uuid 2363 $pl->ob->uuid eq $uuid
2259 or return; 2364 or return;
2279can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2280dialogue with the given NPC character. 2385dialogue with the given NPC character.
2281 2386
2282=cut 2387=cut
2283 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2284# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2285# with dialog boxes. 2404# with dialog boxes.
2286#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2287sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2288 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2299 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2300 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2301 2420
2302 } else { 2421 } else {
2303 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2304 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2305 } 2424 }
2306 } 2425 }
2307} 2426}
2308 2427
2309=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2334 2453
2335=item $player_object->enter_link 2454=item $player_object->enter_link
2336 2455
2337Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2338 2457
2339The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2340I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2341 2462
2342Will never block. 2463Will never block.
2343 2464
2344=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2345 2466
2403 2524
2404 $map->load; 2525 $map->load;
2405 $map->load_neighbours; 2526 $map->load_neighbours;
2406 2527
2407 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2408 $self->activate_recursive; 2530 $self->activate_recursive;
2409 2531
2410 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2411 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2412} 2534}
2417her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2418that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2419the new (success) or old (failed) map position. In either case, $done will 2541the new (success) or old (failed) map position. In either case, $done will
2420be called at the end of this process. 2542be called at the end of this process.
2421 2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2546
2422=cut 2547=cut
2423 2548
2424our $GOTOGEN; 2549our $GOTOGEN;
2425 2550
2426sub cf::object::player::goto { 2551sub cf::object::player::goto {
2430 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2431 2556
2432 $self->enter_link; 2557 $self->enter_link;
2433 2558
2434 (async { 2559 (async {
2560 $Coro::current->{desc} = "player::goto $path $x $y";
2561
2562 # *tag paths override both path and x|y
2563 if ($path =~ /^\*(.*)$/) {
2564 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2565 my $ob = $obs[rand @obs];
2566
2567 # see if we actually can go there
2568 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2569 $ob = $obs[rand @obs];
2570 } else {
2571 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2572 }
2573 # else put us there anyways for now #d#
2574
2575 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2576 } else {
2577 ($path, $x, $y) = (undef, undef, undef);
2578 }
2579 }
2580
2435 my $map = eval { 2581 my $map = eval {
2436 my $map = cf::map::find $path; 2582 my $map = defined $path ? cf::map::find $path : undef;
2437 2583
2438 if ($map) { 2584 if ($map) {
2439 $map = $map->customise_for ($self); 2585 $map = $map->customise_for ($self);
2440 $map = $check->($map) if $check && $map; 2586 $map = $check->($map) if $check && $map;
2441 } else { 2587 } else {
2442 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2443 } 2589 }
2444 2590
2445 $map 2591 $map
2446 }; 2592 };
2447 2593
2483} 2629}
2484 2630
2485sub prepare_random_map { 2631sub prepare_random_map {
2486 my ($exit) = @_; 2632 my ($exit) = @_;
2487 2633
2488 my $guard = cf::lock_acquire "exit_prepare:$exit";
2489
2490 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2491 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2492 # that depends on the exit object 2636 # that depends on the exit object
2493 2637
2494 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2496 if ($exit->map) { 2640 if ($exit->map) {
2497 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2498 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2499 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2500 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2501 } 2647 }
2502 2648
2503 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2504 2650
2505 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2506 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2507 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2508 2654
2509 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2510 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2511 undef $fh; 2657 undef $fh;
2512 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2513 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2514 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2515 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2516 } 2666 }
2517} 2667}
2518 2668
2519sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2520 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2521 2671
2522 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2523 2673
2524 if ($exit->slaying eq "/!") {
2525 #TODO: this should de-fi-ni-te-ly not be a sync-job
2526 # the problem is that $exit might not survive long enough
2527 # so it needs to be done right now, right here
2528 cf::sync_job { prepare_random_map $exit };
2529 }
2530
2531 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2532 my $hp = $exit->stats->hp;
2533 my $sp = $exit->stats->sp;
2534
2535 $self->enter_link; 2674 $self->enter_link;
2536 2675
2537 # if exit is damned, update players death & WoR home-position
2538 $self->contr->savebed ($slaying, $hp, $sp)
2539 if $exit->flag (FLAG_DAMNED);
2540
2541 (async { 2676 (async {
2542 $self->deactivate_recursive; # just to be sure 2677 $Coro::current->{desc} = "enter_exit";
2678
2543 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2544 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2545 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2546 1; 2700 1
2547 }) { 2701 }) {
2548 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2549 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2550 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2551 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2552 2706
2553 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2581the message, with C<log> being the default. If C<$color> is negative, suppress 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2582the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2583 2737
2584=cut 2738=cut
2585 2739
2740# non-persistent channels (usually the info channel)
2586our %CHANNEL = ( 2741our %CHANNEL = (
2587 "c/identify" => { 2742 "c/identify" => {
2588 id => "identify", 2743 id => "infobox",
2589 title => "Identify", 2744 title => "Identify",
2590 reply => undef, 2745 reply => undef,
2591 tooltip => "Items recently identified", 2746 tooltip => "Items recently identified",
2592 }, 2747 },
2593 "c/examine" => { 2748 "c/examine" => {
2594 id => "examine", 2749 id => "infobox",
2595 title => "Examine", 2750 title => "Examine",
2596 reply => undef, 2751 reply => undef,
2597 tooltip => "Signs and other items you examined", 2752 tooltip => "Signs and other items you examined",
2598 }, 2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2599); 2840);
2600 2841
2601sub cf::client::send_msg { 2842sub cf::client::send_msg {
2602 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2603 2844
2604 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2605 2847
2606 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2607 2849
2608 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2609 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2851 if ($CHANNEL{$channel}) {
2852 $channel = $CHANNEL{$channel};
2610 2853
2854 $self->ext_msg (channel_info => $channel);
2855 $channel = $channel->{id};
2856
2611 if (ref $channel) { 2857 } elsif (ref $channel) {
2612 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2613 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2614 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2615 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2616 if $self->can_msg;
2617 } 2862 }
2618 2863
2619 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2620 } 2865 }
2621 2866
2622 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2623 2868
2624 if ($self->can_msg) {
2625 # default colour, mask it out 2869 # default colour, mask it out
2626 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2627 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2628 2872
2629 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2630 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2631 } else { 2876 );
2632 if ($color >= 0) {
2633 # replace some tags by gcfclient-compatible ones
2634 for ($msg) {
2635 1 while
2636 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2637 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2638 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2639 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2640 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2641 }
2642 2877
2643 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2644 2881
2645 utf8::encode $msg; 2882 # split very large packets
2646 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2647 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2648 # COMMAND/INFO 2885 $pkt = "frag";
2649 $self->send_packet ("drawextinfo $color 10 8 $msg")
2650 } else {
2651 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2652 $self->send_packet ("drawinfo $color $msg")
2653 }
2654 }
2655 } 2886 }
2887
2888 $self->send_packet ($pkt);
2656} 2889}
2657 2890
2658=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2659 2892
2660Sends an ext event to the client. 2893Sends an ext event to the client.
2833=pod 3066=pod
2834 3067
2835The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2836 3069
2837 cf::object 3070 cf::object
2838 contr pay_amount pay_player map x y force_find force_add 3071 contr pay_amount pay_player map x y force_find force_add destroy
2839 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
2840 3074
2841 cf::object::player 3075 cf::object::player
2842 player 3076 player
2843 3077
2844 cf::player 3078 cf::player
2849 3083
2850=cut 3084=cut
2851 3085
2852for ( 3086for (
2853 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2854 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
2855 decrease_ob_nr)], 3089 decrease split destroy change_exp value msg lore send_msg)],
2856 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
2857 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
2858 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
2859) { 3093) {
2860 no strict 'refs'; 3094 no strict 'refs';
2861 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
2862 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2879 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
2880 3114
2881 my $qcode = $code; 3115 my $qcode = $code;
2882 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2883 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
2884 3120
2885 local $_; 3121 local $_;
2886 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
2887 3123
2888 my $eval = 3124 my $eval =
2965 { 3201 {
2966 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2967 3203
2968 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2969 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2970 cf::face::set_visibility $idx, $info->{visibility}; 3207 cf::face::set_visibility $idx, $info->{visibility};
2971 cf::face::set_magicmap $idx, $info->{magicmap}; 3208 cf::face::set_magicmap $idx, $info->{magicmap};
2972 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2973 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2974 3211
2975 cf::cede_to_tick; 3212 cf::cede_to_tick;
2976 } 3213 }
2977 3214
2978 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2979 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2980 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2981 or next; 3219 or next;
3220
2982 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
2983 cf::face::set_smooth $idx, $smooth; 3222 cf::face::set_smooth $idx, $smooth;
2984 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2985 } else { 3224 } else {
2986 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
3004 { 3243 {
3005 # TODO: for gcfclient pleasure, we should give resources 3244 # TODO: for gcfclient pleasure, we should give resources
3006 # that gcfclient doesn't grok a >10000 face index. 3245 # that gcfclient doesn't grok a >10000 face index.
3007 my $res = $facedata->{resource}; 3246 my $res = $facedata->{resource};
3008 3247
3009 my $soundconf = delete $res->{"res/sound.conf"};
3010
3011 while (my ($name, $info) = each %$res) { 3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3012 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3013 my $data; 3251 my $data;
3014 3252
3015 if ($info->{type} & 1) { 3253 if ($info->{type} & 1) {
3016 # prepend meta info 3254 # prepend meta info
3017 3255
3018 my $meta = $enc->encode ({ 3256 my $meta = $enc->encode ({
3019 name => $name, 3257 name => $name,
3020 %{ $info->{meta} || {} }, 3258 %{ $info->{meta} || {} },
3021 }); 3259 });
3022 3260
3023 $data = pack "(w/a*)*", $meta, $info->{data}; 3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3024 } else { 3268 } else {
3025 $data = $info->{data}; 3269 $RESOURCE{$name} = $info;
3026 } 3270 }
3027 3271
3028 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3029 cf::face::set_type $idx, $info->{type};
3030
3031 cf::cede_to_tick; 3272 cf::cede_to_tick;
3032 } 3273 }
3033
3034 if ($soundconf) {
3035 $soundconf = $enc->decode (delete $soundconf->{data});
3036
3037 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3038 my $sound = $soundconf->{compat}[$_]
3039 or next;
3040
3041 my $face = cf::face::find "sound/$sound->[1]";
3042 cf::sound::set $sound->[0] => $face;
3043 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3044 }
3045
3046 while (my ($k, $v) = each %{$soundconf->{event}}) {
3047 my $face = cf::face::find "sound/$v";
3048 cf::sound::set $k => $face;
3049 }
3050 }
3051 } 3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3052 3277
3053 1 3278 1
3054} 3279}
3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3055 3300
3056register_exticmd fx_want => sub { 3301register_exticmd fx_want => sub {
3057 my ($ns, $want) = @_; 3302 my ($ns, $want) = @_;
3058 3303
3059 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3060 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3061 } 3306 }
3062}; 3307};
3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3063 3318
3064sub reload_regions { 3319sub reload_regions {
3065 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3066 # for this (global event?) 3321 # for this (global event?)
3067 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3081} 3336}
3082 3337
3083sub reload_archetypes { 3338sub reload_archetypes {
3084 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3085 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3086 #d# NEED to laod twice to resolve forward references
3087 # this really needs to be done in an extra post-pass
3088 # (which needs to be synchronous, so solve it differently)
3089 load_resource_file "$DATADIR/archetypes"
3090 or die "unable to load archetypes\n";
3091} 3341}
3092 3342
3093sub reload_treasures { 3343sub reload_treasures {
3094 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3095 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3096} 3346}
3097 3347
3098sub reload_resources { 3348sub reload_resources {
3099 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3100 3350
3351 reload_facedata;
3352 reload_archetypes;
3101 reload_regions; 3353 reload_regions;
3102 reload_facedata;
3103 #reload_archetypes;#d#
3104 reload_archetypes;
3105 reload_treasures; 3354 reload_treasures;
3106 3355
3107 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3108}
3109
3110sub init {
3111 reload_resources;
3112} 3357}
3113 3358
3114sub reload_config { 3359sub reload_config {
3115 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3116 or return; 3361 or return;
3117 3362
3118 local $/; 3363 local $/;
3119 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
3120 3365
3121 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3122 3367
3123 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3124 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3130 }; 3375 };
3131 warn $@ if $@; 3376 warn $@ if $@;
3132 } 3377 }
3133} 3378}
3134 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3135sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3136 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3137 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3138 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3139 (async { 3417 (async {
3140 Event::one_event; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3419 EV::loop EV::LOOP_ONESHOT;
3141 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3142 }; 3421 };
3143 3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3144 reload_config; 3427 reload_config;
3145 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3146 load_extensions; 3441 load_extensions;
3147 3442
3148 $TICK_WATCHER->start; 3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3149 Event::loop; 3451 EV::loop;
3150} 3452}
3151 3453
3152############################################################################# 3454#############################################################################
3153# initialisation and cleanup 3455# initialisation and cleanup
3154 3456
3155# install some emergency cleanup handlers 3457# install some emergency cleanup handlers
3156BEGIN { 3458BEGIN {
3459 our %SIGWATCHER = ();
3157 for my $signal (qw(INT HUP TERM)) { 3460 for my $signal (qw(INT HUP TERM)) {
3158 Event->signal ( 3461 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3159 reentrant => 0,
3160 data => WF_AUTOCANCEL,
3161 signal => $signal,
3162 prio => 0,
3163 cb => sub {
3164 cf::cleanup "SIG$signal"; 3462 cf::cleanup "SIG$signal";
3165 },
3166 ); 3463 };
3167 } 3464 }
3168} 3465}
3169 3466
3170sub write_runtime { 3467sub write_runtime_sync {
3171 my $runtime = "$LOCALDIR/runtime";
3172
3173 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3174 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3175 3470
3176 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3177 3472
3178 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3179 3474
3180 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3181 or return; 3476 or return;
3182 3477
3183 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3184 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3185 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
3195 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3196 3491
3197 close $fh 3492 close $fh
3198 or return; 3493 or return;
3199 3494
3200 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3201 and return; 3496 and return;
3202 3497
3203 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3204 3499
3205 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0;
3526
3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3528 and return;
3529
3530 # always fsync - this file is important
3531 aio_fsync $fh
3532 and return;
3533
3534 close $fh
3535 or return;
3536
3537 aio_rename "$uuid~", $uuid
3538 and return;
3539
3540 warn "uuid file written ($value).\n";
3541
3542 1
3543
3544}
3545
3546sub write_uuid($$) {
3547 my ($skip, $sync) = @_;
3548
3549 $sync ? write_uuid_sync $skip
3550 : async { write_uuid_sync $skip };
3206} 3551}
3207 3552
3208sub emergency_save() { 3553sub emergency_save() {
3209 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3210 3555
3211 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3212 3557
3213 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3214 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3215 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3216 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3217 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3218 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3219 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3220 $pl->valid or next; 3570 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3221 $pl->save; 3572 $pl->save;
3222 } 3573 }
3223 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3224 3575
3225 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3226 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3227 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3228 $map->valid or next; 3579 $map->valid or next;
3229 $map->save; 3580 $map->save;
3230 } 3581 }
3231 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3232 3583
3233 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3234 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3235 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3587
3588 warn "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n";
3236 }; 3591 };
3237 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3238 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3239} 3599}
3240 3600
3241sub post_cleanup { 3601sub post_cleanup {
3242 my ($make_core) = @_; 3602 my ($make_core) = @_;
3243 3603
3244 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3245 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3246} 3635}
3247 3636
3248sub do_reload_perl() { 3637sub do_reload_perl() {
3249 # can/must only be called in main 3638 # can/must only be called in main
3250 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3251 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3252 return; 3641 return;
3253 } 3642 }
3254 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3255 warn "reloading..."; 3649 warn "reloading...";
3256 3650
3257 warn "entering sync_job"; 3651 warn "entering sync_job";
3258 3652
3259 cf::sync_job { 3653 cf::sync_job {
3260 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3261 cf::emergency_save; 3655 cf::emergency_save;
3262 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3263 3657
3264 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3265 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3266 3660
3267 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3268 3662
3269 warn "cancelling all WF_AUTOCANCEL watchers";
3270 for (Event::all_watchers) {
3271 $_->cancel if $_->data & WF_AUTOCANCEL;
3272 }
3273
3274 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3275 for (;;) {
3276 BDB::flush;
3277 IO::AIO::flush;
3278 Coro::cede;
3279 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3280 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3281 }
3282
3283 ++$RELOAD;
3284
3285 warn "cancelling all extension coros";
3286 $_->cancel for values %EXT_CORO;
3287 %EXT_CORO = ();
3288
3289 warn "removing commands";
3290 %COMMAND = ();
3291
3292 warn "removing ext/exti commands";
3293 %EXTCMD = ();
3294 %EXTICMD = ();
3295
3296 warn "unloading/nuking all extensions";
3297 for my $pkg (@EXTS) {
3298 warn "... unloading $pkg";
3299
3300 if (my $cb = $pkg->can ("unload")) {
3301 eval {
3302 $cb->($pkg);
3303 1
3304 } or warn "$pkg unloaded, but with errors: $@";
3305 } 3666 }
3306 3667
3307 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3308 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3309 } 3670 %EXT_CORO = ();
3310 3671
3311 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3312 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3313 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3314 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3315 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3316 delete $INC{$k};
3317 3682
3318 $k =~ s/\.pm$//;
3319 $k =~ s/\//::/g;
3320
3321 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3322 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3323 } 3692 }
3324 3693
3325 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3326 } 3709 }
3327 3710
3328 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3329 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3330 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3331 3714
3332 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3333 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3334 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3335 3718
3336 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3337 # and global variables created in xs 3720 # and global variables created in xs
3338 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3339 3722
3340 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3341 3724
3342 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3343 require cf; 3726 require cf;
3344 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3345 3728
3346 warn "loading config and database again"; 3729 warn "loading config and database again";
3347 cf::reload_config; 3730 cf::reload_config;
3348 3731
3349 warn "loading extensions"; 3732 warn "loading extensions";
3350 cf::load_extensions; 3733 cf::load_extensions;
3351 3734
3735 if ($REATTACH_ON_RELOAD) {
3352 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3353 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3354 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3355 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3356 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3357 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3358 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3359 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3360 3748
3361 1 3749 1
3362 } or do { 3750 } or do {
3363 warn $@; 3751 warn $@;
3364 warn "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3365 exit 1;
3366 }; 3753 };
3367 3754
3368 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3369}; 3761};
3370 3762
3371our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3372 3764
3373sub reload_perl() { 3765sub reload_perl() {
3374 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3375 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3376 3768
3377 $RELOAD_WATCHER ||= Event->timer ( 3769 $RELOAD_WATCHER ||= cf::async {
3378 reentrant => 0, 3770 Coro::AIO::aio_wait cache_extensions;
3379 after => 0, 3771
3380 data => WF_AUTOCANCEL, 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3381 cb => sub {
3382 do_reload_perl; 3773 do_reload_perl;
3383 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3384 }, 3775 };
3385 ); 3776 };
3386} 3777}
3387 3778
3388register_command "reload" => sub { 3779register_command "reload" => sub {
3389 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3390 3781
3391 if ($who->flag (FLAG_WIZ)) { 3782 if ($who->flag (FLAG_WIZ)) {
3392 $who->message ("reloading server."); 3783 $who->message ("reloading server.");
3784 async {
3785 $Coro::current->{desc} = "perl_reload";
3393 async { reload_perl }; 3786 reload_perl;
3787 };
3394 } 3788 }
3395}; 3789};
3396 3790
3397unshift @INC, $LIBDIR; 3791unshift @INC, $LIBDIR;
3398 3792
3400 3794
3401our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3402our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3403 3797
3404sub wait_for_tick { 3798sub wait_for_tick {
3405 return unless $TICK_WATCHER->is_active;
3406 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3407 3800
3408 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3409 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3410 $signal->wait; 3803 $signal->wait;
3411} 3804}
3412 3805
3413sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3414 return unless $TICK_WATCHER->is_active;
3415 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3416 3808
3417 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3418 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3419 $signal->wait; 3811 $signal->wait;
3420} 3812}
3421 3813
3422 my $min = 1e6;#d# 3814sub tick {
3423 my $avg = 10;
3424$TICK_WATCHER = Event->timer (
3425 reentrant => 0,
3426 parked => 1,
3427 prio => 0,
3428 at => $NEXT_TICK || $TICK,
3429 data => WF_AUTOCANCEL,
3430 cb => sub {
3431 if ($Coro::current != $Coro::main) { 3815 if ($Coro::current != $Coro::main) {
3432 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3433 unless ++$bug_warning > 10; 3817 unless ++$bug_warning > 10;
3434 return; 3818 return;
3435 } 3819 }
3436 3820
3437 $NOW = $tick_start = Event::time;
3438
3439 cf::server_tick; # one server iteration 3821 cf::server_tick; # one server iteration
3440 3822
3441 0 && sync_job {#d# 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3442 for(1..10) { 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3443 my $t = Event::time; 3825 Coro::async_pool {
3444 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3826 $Coro::current->{desc} = "runtime saver";
3445 or die; 3827 write_runtime_sync
3446 3828 or warn "ERROR: unable to write runtime file: $!";
3447 $map->width (50);
3448 $map->height (50);
3449 $map->alloc;
3450 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3451 my $t = Event::time - $t;
3452
3453 #next unless $t < 0.0013;#d#
3454 if ($t < $min) {
3455 $min = $t;
3456 }
3457 $avg = $avg * 0.99 + $t * 0.01;
3458 }
3459 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3460 exit 0;
3461 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3462 }; 3829 };
3830 }
3463 3831
3464 $RUNTIME += $TICK;
3465 $NEXT_TICK += $TICK;
3466
3467 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3468 $NEXT_RUNTIME_WRITE = $NOW + 10;
3469 Coro::async_pool {
3470 write_runtime
3471 or warn "ERROR: unable to write runtime file: $!";
3472 };
3473 }
3474
3475# my $AFTER = Event::time;
3476# warn $AFTER - $NOW;#d#
3477
3478 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3479 $sig->send; 3833 $sig->send;
3480 } 3834 }
3481 while (my $sig = shift @WAIT_FOR_TICK) { 3835 while (my $sig = shift @WAIT_FOR_TICK) {
3482 $sig->send; 3836 $sig->send;
3483 } 3837 }
3484 3838
3485 $NOW = Event::time; 3839 $LOAD = ($NOW - $TICK_START) / $TICK;
3486
3487 # if we are delayed by four ticks or more, skip them all
3488 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3489
3490 $TICK_WATCHER->at ($NEXT_TICK);
3491 $TICK_WATCHER->start;
3492
3493 $LOAD = ($NOW - $tick_start) / $TICK;
3494 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3495 3841
3496 _post_tick; 3842 if (0) {
3497 3843 if ($NEXT_TICK) {
3498 3844 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d#
3847 }
3499 }, 3848 }
3500); 3849}
3501 3850
3502{ 3851{
3503 BDB::max_poll_time $TICK * 0.1; 3852 # configure BDB
3504 $BDB_POLL_WATCHER = Event->io ( 3853
3505 reentrant => 0,
3506 fd => BDB::poll_fileno,
3507 poll => 'r',
3508 prio => 0,
3509 data => WF_AUTOCANCEL,
3510 cb => \&BDB::poll_cb,
3511 );
3512 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3513 3855 BDB::max_poll_reqs $TICK * 0.1;
3514 BDB::set_sync_prepare { 3856 $AnyEvent::BDB::WATCHER->priority (1);
3515 my $status;
3516 my $current = $Coro::current;
3517 (
3518 sub {
3519 $status = $!;
3520 $current->ready; undef $current;
3521 },
3522 sub {
3523 Coro::schedule while defined $current;
3524 $! = $status;
3525 },
3526 )
3527 };
3528 3857
3529 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3530 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3531 3865
3532 cf::sync_job { 3866 cf::sync_job {
3533 eval { 3867 eval {
3534 BDB::db_env_open 3868 BDB::db_env_open
3535 $DB_ENV, 3869 $DB_ENV,
3537 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3871 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3538 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3872 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3539 0666; 3873 0666;
3540 3874
3541 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3875 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3542
3543 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3544 $DB_ENV->set_lk_detect;
3545 }; 3876 };
3546 3877
3547 cf::cleanup "db_env_open(db): $@" if $@; 3878 cf::cleanup "db_env_open(db): $@" if $@;
3548 }; 3879 };
3549 } 3880 }
3881
3882 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3883 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3884 };
3885 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3886 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3887 };
3888 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3889 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3890 };
3550} 3891}
3551 3892
3552{ 3893{
3894 # configure IO::AIO
3895
3553 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3554
3555 undef $Coro::AIO::WATCHER;
3556 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3557 $AIO_POLL_WATCHER = Event->io ( 3898 undef $AnyEvent::AIO::WATCHER;
3558 reentrant => 0,
3559 data => WF_AUTOCANCEL,
3560 fd => IO::AIO::poll_fileno,
3561 poll => 'r',
3562 prio => 6,
3563 cb => \&IO::AIO::poll_cb,
3564 );
3565} 3899}
3566 3900
3567my $_log_backtrace; 3901my $_log_backtrace;
3568 3902
3569sub _log_backtrace { 3903sub _log_backtrace {
3572 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3573 3907
3574 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3575 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3576 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3577 async { 3912 async {
3913 $Coro::current->{desc} = "abt $msg";
3914
3578 my @bt = fork_call { 3915 my @bt = fork_call {
3579 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3580 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3917 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3581 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3918 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3582 or die "addr2line: $!"; 3919 or die "addr2line: $!";
3590 } 3927 }
3591 3928
3592 @funcs 3929 @funcs
3593 }; 3930 };
3594 3931
3595 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3596 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3597 --$_log_backtrace; 3935 --$_log_backtrace;
3598 }; 3936 };
3599 } else { 3937 } else {
3600 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3601 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3602 } 3940 }
3603} 3941}
3604 3942
3605# load additional modules 3943# load additional modules
3606use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3607 3945
3608END { cf::emergency_save } 3946END { cf::emergency_save }
3609 3947
36101 39481
3611 3949

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines