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.358 by root, Fri Sep 7 18:10:52 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines