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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines