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.357 by root, Tue Sep 4 08:42:58 2007 UTC vs.
Revision 1.473 by root, Fri Jun 26 16:32:10 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;
290 358
291sub lock_wait($) { 359sub lock_wait($) {
292 my ($key) = @_; 360 $LOCKS->wait ($_[0]);
293
294 # wait for lock, if any
295 while ($LOCK{$key}) {
296 push @{ $LOCK{$key} }, $Coro::current;
297 Coro::schedule;
298 }
299} 361}
300 362
301sub lock_acquire($) { 363sub lock_acquire($) {
302 my ($key) = @_; 364 $LOCKS->guard ($_[0])
303
304 # wait, to be sure we are not locked
305 lock_wait $key;
306
307 $LOCK{$key} = [];
308
309 Coro::guard {
310 # wake up all waiters, to be on the safe side
311 $_->ready for @{ delete $LOCK{$key} };
312 }
313} 365}
314 366
315sub lock_active($) { 367sub lock_active($) {
316 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
317
318 ! ! $LOCK{$key}
319} 369}
320 370
321sub freeze_mainloop { 371sub freeze_mainloop {
322 return unless $TICK_WATCHER->is_active; 372 tick_inhibit_inc;
323 373
324 my $guard = Coro::guard { 374 &Guard::guard (\&tick_inhibit_dec);
325 $TICK_WATCHER->start; 375}
326 }; 376
327 $TICK_WATCHER->stop; 377=item cf::periodic $interval, $cb
328 $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
329} 390}
330 391
331=item cf::get_slot $time[, $priority[, $name]] 392=item cf::get_slot $time[, $priority[, $name]]
332 393
333Allocate $time seconds of blocking CPU time at priority C<$priority>: 394Allocate $time seconds of blocking CPU time at priority C<$priority>:
344our @SLOT_QUEUE; 405our @SLOT_QUEUE;
345our $SLOT_QUEUE; 406our $SLOT_QUEUE;
346 407
347$SLOT_QUEUE->cancel if $SLOT_QUEUE; 408$SLOT_QUEUE->cancel if $SLOT_QUEUE;
348$SLOT_QUEUE = Coro::async { 409$SLOT_QUEUE = Coro::async {
410 $Coro::current->desc ("timeslot manager");
411
349 my $signal = new Coro::Signal; 412 my $signal = new Coro::Signal;
350 413
351 while () { 414 while () {
352 next_job: 415 next_job:
353 my $avail = cf::till_tick; 416 my $avail = cf::till_tick;
361 } 424 }
362 } 425 }
363 } 426 }
364 427
365 if (@SLOT_QUEUE) { 428 if (@SLOT_QUEUE) {
366 # 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
367 push @cf::WAIT_FOR_TICK, $signal; 430 push @cf::WAIT_FOR_TICK, $signal;
368 $signal->wait; 431 $signal->wait;
369 } else { 432 } else {
370 Coro::schedule; 433 Coro::schedule;
371 } 434 }
372 } 435 }
373}; 436};
374 437
375sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
376 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
377 442
378 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
379 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
380 445
394 459
395BEGIN { *async = \&Coro::async_pool } 460BEGIN { *async = \&Coro::async_pool }
396 461
397=item cf::sync_job { BLOCK } 462=item cf::sync_job { BLOCK }
398 463
399The design of Crossfire TRT requires that the main coroutine ($Coro::main) 464The design of Deliantra requires that the main coroutine ($Coro::main)
400is always able to handle events or runnable, as Crossfire TRT is only 465is always able to handle events or runnable, as Deliantra is only
401partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 466partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
402acceptable. 467acceptable.
403 468
404If 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
405the given BLOCK in another coroutine while waiting for the result. The 470the given BLOCK in another coroutine while waiting for the result. The
410 475
411sub sync_job(&) { 476sub sync_job(&) {
412 my ($job) = @_; 477 my ($job) = @_;
413 478
414 if ($Coro::current == $Coro::main) { 479 if ($Coro::current == $Coro::main) {
415 my $time = Event::time; 480 my $time = EV::time;
416 481
417 # this is the main coro, too bad, we have to block 482 # this is the main coro, too bad, we have to block
418 # till the operation succeeds, freezing the server :/ 483 # till the operation succeeds, freezing the server :/
419 484
420 # TODO: use suspend/resume instead 485 LOG llevError, Carp::longmess "sync job";#d#
421 # (but this is cancel-safe) 486
422 my $freeze_guard = freeze_mainloop; 487 my $freeze_guard = freeze_mainloop;
423 488
424 my $busy = 1; 489 my $busy = 1;
425 my @res; 490 my @res;
426 491
427 (async { 492 (async {
493 $Coro::current->desc ("sync job coro");
428 @res = eval { $job->() }; 494 @res = eval { $job->() };
429 warn $@ if $@; 495 warn $@ if $@;
430 undef $busy; 496 undef $busy;
431 })->prio (Coro::PRIO_MAX); 497 })->prio (Coro::PRIO_MAX);
432 498
433 while ($busy) { 499 while ($busy) {
434 Coro::cede or Event::one_event; 500 if (Coro::nready) {
501 Coro::cede_notself;
502 } else {
503 EV::loop EV::LOOP_ONESHOT;
435 } 504 }
505 }
436 506
437 $time = Event::time - $time; 507 my $time = EV::time - $time;
438 508
439 LOG llevError | logBacktrace, Carp::longmess "long sync job"
440 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
441
442 $tick_start += $time; # do not account sync jobs to server load 509 $TICK_START += $time; # do not account sync jobs to server load
443 510
444 wantarray ? @res : $res[0] 511 wantarray ? @res : $res[0]
445 } else { 512 } else {
446 # we are in another coroutine, how wonderful, everything just works 513 # we are in another coroutine, how wonderful, everything just works
447 514
472=item fork_call { }, $args 539=item fork_call { }, $args
473 540
474Executes the given code block with the given arguments in a seperate 541Executes the given code block with the given arguments in a seperate
475process, returning the results. Everything must be serialisable with 542process, returning the results. Everything must be serialisable with
476Coro::Storable. May, of course, block. Note that the executed sub may 543Coro::Storable. May, of course, block. Note that the executed sub may
477never block itself or use any form of Event handling. 544never block itself or use any form of event handling.
478 545
479=cut 546=cut
480 547
481sub fork_call(&@) { 548sub fork_call(&@) {
482 my ($cb, @args) = @_; 549 my ($cb, @args) = @_;
491 }, @args; 558 }, @args;
492 559
493 wantarray ? @res : $res[-1] 560 wantarray ? @res : $res[-1]
494} 561}
495 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
496=item $value = cf::db_get $family => $key 590=item $value = cf::db_get $family => $key
497 591
498Returns a single value from the environment database. 592Returns a single value from the environment database.
499 593
500=item cf::db_put $family => $key => $value 594=item cf::db_put $family => $key => $value
501 595
502Stores 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
503data 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).
504 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
505=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}
506 622
507our $DB; 623our $DB;
508 624
509sub db_init { 625sub db_init {
510 unless ($DB) {
511 $DB = BDB::db_create $DB_ENV;
512
513 cf::sync_job { 626 cf::sync_job {
514 eval { 627 $DB ||= db_table "db";
515 $DB->set_flags (BDB::CHKSUM);
516
517 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
518 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
519 cf::cleanup "db_open(db): $!" if $!;
520 };
521 cf::cleanup "db_open(db): $@" if $@;
522 };
523 } 628 };
524} 629}
525 630
526sub db_get($$) { 631sub db_get($$) {
527 my $key = "$_[0]/$_[1]"; 632 my $key = "$_[0]/$_[1]";
528 633
626 731
627############################################################################# 732#############################################################################
628 733
629=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
630 735
631Many 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
632attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
633to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
634 739
635In 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>
636C<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
637Crossfire TRT). 742Deliantra).
638 743
639=over 4 744=over 4
640 745
641=item $attachable->attach ($attachment, key => $value...) 746=item $attachable->attach ($attachment, key => $value...)
642 747
686=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
687 792
688Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
689given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
690 795
691Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
692that 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.
693 798
694These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
695 800
696=over 4 801=over 4
924 } 1029 }
925 1030
926 0 1031 0
927} 1032}
928 1033
929=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
930 1035
931=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
932 1037
933Generate an object-specific event with the given arguments. 1038Generate an object-specific event with the given arguments.
934 1039
940 1045
941=cut 1046=cut
942 1047
943############################################################################# 1048#############################################################################
944# object support 1049# object support
945#
946 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#
947sub _can_merge { 1084sub _can_merge {
948 my ($ob1, $ob2) = @_; 1085 my ($ob1, $ob2) = @_;
949 1086
950 local $Storable::canonical = 1; 1087 ++$SLOW_MERGES;#d#
951 my $fob1 = Storable::freeze $ob1;
952 my $fob2 = Storable::freeze $ob2;
953 1088
954 $fob1 eq $fob2 1089 # we do the slow way here
1090 return _object_equal $ob1, $ob2
955} 1091}
956 1092
957sub reattach { 1093sub reattach {
958 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
959 my ($obj) = @_; 1095 my ($obj) = @_;
960 1096
1097 # no longer needed after getting rid of delete_package?
961 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
962 1099
963 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
964 1101
965 @$registry = (); 1102 @$registry = ();
966 1103
981cf::attachable->attach ( 1118cf::attachable->attach (
982 prio => -1000000, 1119 prio => -1000000,
983 on_instantiate => sub { 1120 on_instantiate => sub {
984 my ($obj, $data) = @_; 1121 my ($obj, $data) = @_;
985 1122
986 $data = from_json $data; 1123 $data = decode_json $data;
987 1124
988 for (@$data) { 1125 for (@$data) {
989 my ($name, $args) = @$_; 1126 my ($name, $args) = @$_;
990 1127
991 $obj->attach ($name, %{$args || {} }); 1128 $obj->attach ($name, %{$args || {} });
1005); 1142);
1006 1143
1007sub object_freezer_save { 1144sub object_freezer_save {
1008 my ($filename, $rdata, $objs) = @_; 1145 my ($filename, $rdata, $objs) = @_;
1009 1146
1010 my $guard = cf::lock_acquire "io";
1011
1012 sync_job { 1147 sync_job {
1013 if (length $$rdata) { 1148 if (length $$rdata) {
1149 utf8::decode (my $decname = $filename);
1014 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1015 $filename, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1016 1152
1017 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1018 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1019 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1020 aio_fsync $fh if $cf::USE_FSYNC; 1156 if ($cf::USE_FSYNC) {
1157 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1158 aio_fsync $fh;
1159 }
1021 close $fh; 1160 aio_close $fh;
1022 1161
1023 if (@$objs) { 1162 if (@$objs) {
1024 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1163 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1025 chmod SAVE_MODE, $fh; 1164 aio_chmod $fh, SAVE_MODE;
1026 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1027 aio_write $fh, 0, (length $data), $data, 0; 1166 aio_write $fh, 0, (length $data), $data, 0;
1028 aio_fsync $fh if $cf::USE_FSYNC; 1167 if ($cf::USE_FSYNC) {
1168 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1169 aio_fsync $fh;
1170 }
1029 close $fh; 1171 aio_close $fh;
1030 aio_rename "$filename.pst~", "$filename.pst"; 1172 aio_rename "$filename.pst~", "$filename.pst";
1031 } 1173 }
1032 } else { 1174 } else {
1033 aio_unlink "$filename.pst"; 1175 aio_unlink "$filename.pst";
1034 } 1176 }
1035 1177
1036 aio_rename "$filename~", $filename; 1178 aio_rename "$filename~", $filename;
1179
1180 $filename =~ s%/[^/]+$%%;
1181 aio_pathsync $filename if $cf::USE_FSYNC;
1037 } else { 1182 } else {
1038 warn "FATAL: $filename~: $!\n"; 1183 warn "unable to save objects: $filename~: $!\n";
1039 } 1184 }
1040 } else { 1185 } else {
1041 aio_unlink $filename; 1186 aio_unlink $filename;
1042 aio_unlink "$filename.pst"; 1187 aio_unlink "$filename.pst";
1043 } 1188 }
1044 }; 1189 };
1045
1046 undef $guard;
1047} 1190}
1048 1191
1049sub object_freezer_as_string { 1192sub object_freezer_as_string {
1050 my ($rdata, $objs) = @_; 1193 my ($rdata, $objs) = @_;
1051 1194
1056 1199
1057sub object_thawer_load { 1200sub object_thawer_load {
1058 my ($filename) = @_; 1201 my ($filename) = @_;
1059 1202
1060 my ($data, $av); 1203 my ($data, $av);
1061
1062 my $guard = cf::lock_acquire "io";
1063 1204
1064 (aio_load $filename, $data) >= 0 1205 (aio_load $filename, $data) >= 0
1065 or return; 1206 or return;
1066 1207
1067 unless (aio_stat "$filename.pst") { 1208 unless (aio_stat "$filename.pst") {
1068 (aio_load "$filename.pst", $av) >= 0 1209 (aio_load "$filename.pst", $av) >= 0
1069 or return; 1210 or return;
1070 1211
1071 undef $guard;
1072 $av = eval { (Storable::thaw $av)->{objs} }; 1212 my $st = eval { Coro::Storable::thaw $av };
1213 $av = $st->{objs};
1073 } 1214 }
1074 1215
1216 utf8::decode (my $decname = $filename);
1075 warn sprintf "loading %s (%d)\n", 1217 warn sprintf "loading %s (%d,%d)\n",
1076 $filename, length $data, scalar @{$av || []}; 1218 $decname, length $data, scalar @{$av || []};
1077 1219
1078 ($data, $av) 1220 ($data, $av)
1079} 1221}
1080 1222
1081=head2 COMMAND CALLBACKS 1223=head2 COMMAND CALLBACKS
1137 my ($name, $cb) = @_; 1279 my ($name, $cb) = @_;
1138 1280
1139 $EXTICMD{$name} = $cb; 1281 $EXTICMD{$name} = $cb;
1140} 1282}
1141 1283
1284use File::Glob ();
1285
1142cf::player->attach ( 1286cf::player->attach (
1143 on_command => sub { 1287 on_command => sub {
1144 my ($pl, $name, $params) = @_; 1288 my ($pl, $name, $params) = @_;
1145 1289
1146 my $cb = $COMMAND{$name} 1290 my $cb = $COMMAND{$name}
1178 1322
1179 cf::override; 1323 cf::override;
1180 }, 1324 },
1181); 1325);
1182 1326
1327# "readahead" all extensions
1328sub cache_extensions {
1329 my $grp = IO::AIO::aio_group;
1330
1331 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1332 for (grep /\.ext$/, @{$_[0]}) {
1333 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1334 }
1335 };
1336
1337 $grp
1338}
1339
1183sub load_extensions { 1340sub load_extensions {
1184 cf::sync_job { 1341 cf::sync_job {
1185 my %todo; 1342 my %todo;
1186 1343
1187 for my $path (<$LIBDIR/*.ext>) { 1344 for my $path (<$LIBDIR/*.ext>) {
1206 1363
1207 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1364 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1208 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1365 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1209 1366
1210 $ext{source} = 1367 $ext{source} =
1211 "package $pkg; use strict; use utf8;\n" 1368 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1212 . "#line 1 \"$path\"\n{\n" 1369 . "#line 1 \"$path\"\n{\n"
1213 . $source 1370 . $source
1214 . "\n};\n1"; 1371 . "\n};\n1";
1215 1372
1216 $todo{$base} = \%ext; 1373 $todo{$base} = \%ext;
1232 my $msg = $@ ? "$v->{path}: $@\n" 1389 my $msg = $@ ? "$v->{path}: $@\n"
1233 : "$v->{base}: extension inactive.\n"; 1390 : "$v->{base}: extension inactive.\n";
1234 1391
1235 if (exists $v->{meta}{mandatory}) { 1392 if (exists $v->{meta}{mandatory}) {
1236 warn $msg; 1393 warn $msg;
1237 warn "mandatory extension failed to load, exiting.\n"; 1394 cf::cleanup "mandatory extension failed to load, exiting.";
1238 exit 1;
1239 } 1395 }
1240 1396
1241 warn $msg; 1397 warn $msg;
1242 } 1398 }
1243 1399
1257 1413
1258=back 1414=back
1259 1415
1260=head2 CORE EXTENSIONS 1416=head2 CORE EXTENSIONS
1261 1417
1262Functions and methods that extend core crossfire objects. 1418Functions and methods that extend core deliantra objects.
1263 1419
1264=cut 1420=cut
1265 1421
1266package cf::player; 1422package cf::player;
1267 1423
1268use Coro::AIO; 1424use Coro::AIO;
1269 1425
1270=head3 cf::player 1426=head3 cf::player
1271 1427
1272=over 4 1428=over 4
1429
1430=item cf::player::num_playing
1431
1432Returns the official number of playing players, as per the Crossfire metaserver rules.
1433
1434=cut
1435
1436sub num_playing {
1437 scalar grep
1438 $_->ob->map
1439 && !$_->hidden
1440 && !$_->ob->flag (cf::FLAG_WIZ),
1441 cf::player::list
1442}
1273 1443
1274=item cf::player::find $login 1444=item cf::player::find $login
1275 1445
1276Returns the given player object, loading it if necessary (might block). 1446Returns the given player object, loading it if necessary (might block).
1277 1447
1296 1466
1297sub exists($) { 1467sub exists($) {
1298 my ($login) = @_; 1468 my ($login) = @_;
1299 1469
1300 $cf::PLAYER{$login} 1470 $cf::PLAYER{$login}
1301 or cf::sync_job { !aio_stat path $login } 1471 or !aio_stat path $login
1302} 1472}
1303 1473
1304sub find($) { 1474sub find($) {
1305 return $cf::PLAYER{$_[0]} || do { 1475 return $cf::PLAYER{$_[0]} || do {
1306 my $login = $_[0]; 1476 my $login = $_[0];
1316 aio_unlink +(playerdir $login) . "/$login.pl"; 1486 aio_unlink +(playerdir $login) . "/$login.pl";
1317 1487
1318 my $f = new_from_file cf::object::thawer path $login 1488 my $f = new_from_file cf::object::thawer path $login
1319 or return; 1489 or return;
1320 1490
1321 $f->next;
1322 my $pl = cf::player::load_pl $f 1491 my $pl = cf::player::load_pl $f
1323 or return; 1492 or return;
1493
1324 local $cf::PLAYER_LOADING{$login} = $pl; 1494 local $cf::PLAYER_LOADING{$login} = $pl;
1325 $f->resolve_delayed_derefs; 1495 $f->resolve_delayed_derefs;
1326 $cf::PLAYER{$login} = $pl 1496 $cf::PLAYER{$login} = $pl
1327 } 1497 }
1328 } 1498 }
1338 1508
1339 return if $pl->{deny_save}; 1509 return if $pl->{deny_save};
1340 1510
1341 aio_mkdir playerdir $pl, 0770; 1511 aio_mkdir playerdir $pl, 0770;
1342 $pl->{last_save} = $cf::RUNTIME; 1512 $pl->{last_save} = $cf::RUNTIME;
1513
1514 cf::get_slot 0.01;
1343 1515
1344 $pl->save_pl ($path); 1516 $pl->save_pl ($path);
1345 cf::cede_to_tick; 1517 cf::cede_to_tick;
1346} 1518}
1347 1519
1379 my ($pl) = @_; 1551 my ($pl) = @_;
1380 1552
1381 my $name = $pl->ob->name; 1553 my $name = $pl->ob->name;
1382 1554
1383 $pl->{deny_save} = 1; 1555 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1556 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1385 1557
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1558 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1559 $pl->deactivate;
1560 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1561 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1562 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1563 $pl->ns->destroy if $pl->ns;
1390 1564
1391 my $path = playerdir $pl; 1565 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1566 my $temp = "$path~$cf::RUNTIME~deleting~";
1431 1605
1432 for my $login (@$dirs) { 1606 for my $login (@$dirs) {
1433 my $path = path $login; 1607 my $path = path $login;
1434 1608
1435 # a .pst is a dead give-away for a valid player 1609 # a .pst is a dead give-away for a valid player
1436 unless (-e "$path.pst") { 1610 # if no pst file found, open and chekc for blocked users
1611 if (aio_stat "$path.pst") {
1437 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1612 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1438 aio_read $fh, 0, 512, my $buf, 0 or next; 1613 aio_read $fh, 0, 512, my $buf, 0 or next;
1439 $buf !~ /^password -------------$/m or next; # official not-valid tag 1614 $buf !~ /^password -------------$/m or next; # official not-valid tag
1440 } 1615 }
1441 1616
1472 } 1647 }
1473 1648
1474 \@paths 1649 \@paths
1475} 1650}
1476 1651
1477=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1652=item $protocol_xml = $player->expand_cfpod ($cfpod)
1478 1653
1479Expand crossfire pod fragments into protocol xml. 1654Expand deliantra pod fragments into protocol xml.
1480
1481=cut
1482
1483sub expand_cfpod {
1484 ((my $self), (local $_)) = @_;
1485
1486 # escape & and <
1487 s/&/&amp;/g;
1488 s/(?<![BIUGHT])</&lt;/g;
1489
1490 # this is buggy, it needs to properly take care of nested <'s
1491
1492 1 while
1493 # replace B<>, I<>, U<> etc.
1494 s/B<([^\>]*)>/<b>$1<\/b>/
1495 || s/I<([^\>]*)>/<i>$1<\/i>/
1496 || s/U<([^\>]*)>/<u>$1<\/u>/
1497 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1655
1528=item $player->ext_reply ($msgid, @msg) 1656=item $player->ext_reply ($msgid, @msg)
1529 1657
1530Sends an ext reply to the player. 1658Sends an ext reply to the player.
1531 1659
1598our $MAX_RESET = 3600; 1726our $MAX_RESET = 3600;
1599our $DEFAULT_RESET = 3000; 1727our $DEFAULT_RESET = 3000;
1600 1728
1601sub generate_random_map { 1729sub generate_random_map {
1602 my ($self, $rmp) = @_; 1730 my ($self, $rmp) = @_;
1731
1732 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1733
1603 # mit "rum" bekleckern, nicht 1734 # mit "rum" bekleckern, nicht
1604 $self->_create_random_map ( 1735 $self->_create_random_map (
1605 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1736 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1606 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1737 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1607 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1738 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1729 1860
1730# the temporary/swap location 1861# the temporary/swap location
1731sub save_path { 1862sub save_path {
1732 my ($self) = @_; 1863 my ($self) = @_;
1733 1864
1734 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1735 "$TMPDIR/$path.map" 1866 "$TMPDIR/$path.map"
1736} 1867}
1737 1868
1738# the unique path, undef == no special unique path 1869# the unique path, undef == no special unique path
1739sub uniq_path { 1870sub uniq_path {
1740 my ($self) = @_; 1871 my ($self) = @_;
1741 1872
1742 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1743 "$UNIQUEDIR/$path" 1874 "$UNIQUEDIR/$path"
1744}
1745
1746# and all this just because we cannot iterate over
1747# all maps in C++...
1748sub change_all_map_light {
1749 my ($change) = @_;
1750
1751 $_->change_map_light ($change)
1752 for grep $_->outdoor, values %cf::MAP;
1753} 1875}
1754 1876
1755sub decay_objects { 1877sub decay_objects {
1756 my ($self) = @_; 1878 my ($self) = @_;
1757 1879
1841sub find { 1963sub find {
1842 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1843 1965
1844 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1845 1967
1968 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1846 cf::lock_wait "map_find:$path"; 1969 my $guard2 = cf::lock_acquire "map_find:$path";
1847 1970
1848 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1849 my $guard = cf::lock_acquire "map_find:$path";
1850 my $map = new_from_path cf::map $path 1972 my $map = new_from_path cf::map $path
1851 or return; 1973 or return;
1852 1974
1853 $map->{last_save} = $cf::RUNTIME; 1975 $map->{last_save} = $cf::RUNTIME;
1854 1976
1856 or return; 1978 or return;
1857 1979
1858 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1980 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1859 # doing this can freeze the server in a sync job, obviously 1981 # doing this can freeze the server in a sync job, obviously
1860 #$cf::WAIT_FOR_TICK->wait; 1982 #$cf::WAIT_FOR_TICK->wait;
1983 undef $guard2;
1984 undef $guard1;
1861 $map->reset; 1985 $map->reset;
1862 undef $guard;
1863 return find $path; 1986 return find $path;
1864 } 1987 }
1865 1988
1866 $cf::MAP{$path} = $map 1989 $cf::MAP{$path} = $map
1867 } 1990 }
1879 2002
1880 { 2003 {
1881 my $guard = cf::lock_acquire "map_data:$path"; 2004 my $guard = cf::lock_acquire "map_data:$path";
1882 2005
1883 return unless $self->valid; 2006 return unless $self->valid;
1884 return if $self->in_memory != cf::MAP_SWAPPED; 2007 return unless $self->in_memory == cf::MAP_SWAPPED;
1885 2008
1886 $self->in_memory (cf::MAP_LOADING); 2009 $self->in_memory (cf::MAP_LOADING);
1887 2010
1888 $self->alloc; 2011 $self->alloc;
1889 2012
1893 my $f = new_from_file cf::object::thawer $self->{load_path}; 2016 my $f = new_from_file cf::object::thawer $self->{load_path};
1894 $f->skip_block; 2017 $f->skip_block;
1895 $self->_load_objects ($f) 2018 $self->_load_objects ($f)
1896 or return; 2019 or return;
1897 2020
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2021 $self->post_load_original
1899 if delete $self->{load_original}; 2022 if delete $self->{load_original};
1900 2023
1901 if (my $uniq = $self->uniq_path) { 2024 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2025 utf8::encode $uniq;
1903 unless (aio_stat $uniq) { 2026 unless (aio_stat $uniq) {
1921 unless ($self->{deny_activate}) { 2044 unless ($self->{deny_activate}) {
1922 $self->decay_objects; 2045 $self->decay_objects;
1923 $self->fix_auto_apply; 2046 $self->fix_auto_apply;
1924 $self->update_buttons; 2047 $self->update_buttons;
1925 cf::cede_to_tick; 2048 cf::cede_to_tick;
1926 $self->set_darkness_map;
1927 cf::cede_to_tick;
1928 $self->activate; 2049 $self->activate;
1929 } 2050 }
1930 2051
1931 $self->{last_save} = $cf::RUNTIME; 2052 $self->{last_save} = $cf::RUNTIME;
1932 $self->last_access ($cf::RUNTIME); 2053 $self->last_access ($cf::RUNTIME);
1933 2054
1934 $self->in_memory (cf::MAP_IN_MEMORY); 2055 $self->in_memory (cf::MAP_ACTIVE);
1935 } 2056 }
1936 2057
1937 $self->post_load; 2058 $self->post_load;
1938} 2059}
1939 2060
1997 my ($path, $origin, $load) = @_; 2118 my ($path, $origin, $load) = @_;
1998 2119
1999 $path = normalise $path, $origin && $origin->{path}; 2120 $path = normalise $path, $origin && $origin->{path};
2000 2121
2001 if (my $map = $cf::MAP{$path}) { 2122 if (my $map = $cf::MAP{$path}) {
2002 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2123 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2124 }
2004 2125
2005 $MAP_PREFETCH{$path} |= $load; 2126 $MAP_PREFETCH{$path} |= $load;
2006 2127
2007 $MAP_PREFETCHER ||= cf::async { 2128 $MAP_PREFETCHER ||= cf::async {
2129 $Coro::current->{desc} = "map prefetcher";
2130
2008 while (%MAP_PREFETCH) { 2131 while (%MAP_PREFETCH) {
2009 while (my ($k, $v) = each %MAP_PREFETCH) { 2132 while (my ($k, $v) = each %MAP_PREFETCH) {
2010 if (my $map = find $k) { 2133 if (my $map = find $k) {
2011 $map->load if $v; 2134 $map->load if $v;
2012 } 2135 }
2038 return if $self->{deny_save}; 2161 return if $self->{deny_save};
2039 2162
2040 local $self->{last_access} = $self->last_access;#d# 2163 local $self->{last_access} = $self->last_access;#d#
2041 2164
2042 cf::async { 2165 cf::async {
2166 $Coro::current->{desc} = "map player save";
2043 $_->contr->save for $self->players; 2167 $_->contr->save for $self->players;
2044 }; 2168 };
2169
2170 cf::get_slot 0.02;
2045 2171
2046 if ($uniq) { 2172 if ($uniq) {
2047 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2173 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2048 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2174 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2049 } else { 2175 } else {
2058 $self->save; 2184 $self->save;
2059 2185
2060 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2186 my $lock = cf::lock_acquire "map_data:$self->{path}";
2061 2187
2062 return if $self->players; 2188 return if $self->players;
2063 return if $self->in_memory != cf::MAP_IN_MEMORY; 2189 return if $self->in_memory != cf::MAP_ACTIVE;
2064 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2065 2191
2192 $self->in_memory (cf::MAP_SWAPPED);
2193
2194 $self->deactivate;
2195 $_->clear_links_to ($self) for values %cf::MAP;
2066 $self->clear; 2196 $self->clear;
2067 $self->in_memory (cf::MAP_SWAPPED);
2068} 2197}
2069 2198
2070sub reset_at { 2199sub reset_at {
2071 my ($self) = @_; 2200 my ($self) = @_;
2072 2201
2104 if $uniq; 2233 if $uniq;
2105 } 2234 }
2106 2235
2107 delete $cf::MAP{$self->path}; 2236 delete $cf::MAP{$self->path};
2108 2237
2238 $self->deactivate;
2239 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2240 $self->clear;
2110
2111 $_->clear_links_to ($self) for values %cf::MAP;
2112 2241
2113 $self->unlink_save; 2242 $self->unlink_save;
2114 $self->destroy; 2243 $self->destroy;
2115} 2244}
2116 2245
2183 2312
2184sub unique_maps() { 2313sub unique_maps() {
2185 [ 2314 [
2186 map { 2315 map {
2187 utf8::decode $_; 2316 utf8::decode $_;
2188 /\.map$/ 2317 s/\.map$//; # TODO future compatibility hack
2318 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2319 ? ()
2189 ? normalise $_ 2320 : normalise $_
2190 : ()
2191 } @{ aio_readdir $UNIQUEDIR or [] } 2321 } @{ aio_readdir $UNIQUEDIR or [] }
2192 ] 2322 ]
2193} 2323}
2194 2324
2195package cf;
2196
2197=back 2325=back
2198 2326
2199=head3 cf::object 2327=head3 cf::object
2200 2328
2201=cut 2329=cut
2204 2332
2205=over 4 2333=over 4
2206 2334
2207=item $ob->inv_recursive 2335=item $ob->inv_recursive
2208 2336
2209Returns the inventory of the object _and_ their inventories, recursively. 2337Returns the inventory of the object I<and> their inventories, recursively,
2338but I<not> the object itself.
2210 2339
2211=cut 2340=cut
2212 2341
2213sub inv_recursive_; 2342sub inv_recursive_;
2214sub inv_recursive_ { 2343sub inv_recursive_ {
2219 inv_recursive_ inv $_[0] 2348 inv_recursive_ inv $_[0]
2220} 2349}
2221 2350
2222=item $ref = $ob->ref 2351=item $ref = $ob->ref
2223 2352
2224creates and returns a persistent reference to an objetc that can be stored as a string. 2353Creates and returns a persistent reference to an object that can be stored as a string.
2225 2354
2226=item $ob = cf::object::deref ($refstring) 2355=item $ob = cf::object::deref ($refstring)
2227 2356
2228returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2357returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2229even if the object actually exists. May block. 2358even if the object actually exists. May block.
2231=cut 2360=cut
2232 2361
2233sub deref { 2362sub deref {
2234 my ($ref) = @_; 2363 my ($ref) = @_;
2235 2364
2236 # temporary compatibility#TODO#remove
2237 $ref =~ s{^<}{player/<};
2238
2239 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2365 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2240 my ($uuid, $name) = ($1, $2); 2366 my ($uuid, $name) = ($1, $2);
2241 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2367 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2242 or return; 2368 or return;
2243 $pl->ob->uuid eq $uuid 2369 $pl->ob->uuid eq $uuid
2244 or return; 2370 or return;
2264can be C<undef>. Does the right thing when the player is currently in a 2390can be C<undef>. Does the right thing when the player is currently in a
2265dialogue with the given NPC character. 2391dialogue with the given NPC character.
2266 2392
2267=cut 2393=cut
2268 2394
2395our $SAY_CHANNEL = {
2396 id => "say",
2397 title => "Map",
2398 reply => "say ",
2399 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2400};
2401
2402our $CHAT_CHANNEL = {
2403 id => "chat",
2404 title => "Chat",
2405 reply => "chat ",
2406 tooltip => "Player chat and shouts, global to the server.",
2407};
2408
2269# rough implementation of a future "reply" method that works 2409# rough implementation of a future "reply" method that works
2270# with dialog boxes. 2410# with dialog boxes.
2271#TODO: the first argument must go, split into a $npc->reply_to ( method 2411#TODO: the first argument must go, split into a $npc->reply_to ( method
2272sub cf::object::player::reply($$$;$) { 2412sub cf::object::player::reply($$$;$) {
2273 my ($self, $npc, $msg, $flags) = @_; 2413 my ($self, $npc, $msg, $flags) = @_;
2284 my $dialog = $pl->{npc_dialog}; 2424 my $dialog = $pl->{npc_dialog};
2285 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2425 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2286 2426
2287 } else { 2427 } else {
2288 $msg = $npc->name . " says: $msg" if $npc; 2428 $msg = $npc->name . " says: $msg" if $npc;
2289 $self->message ($msg, $flags); 2429 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2290 } 2430 }
2291 } 2431 }
2292} 2432}
2293 2433
2294=item $object->send_msg ($channel, $msg, $color, [extra...]) 2434=item $object->send_msg ($channel, $msg, $color, [extra...])
2319 2459
2320=item $player_object->enter_link 2460=item $player_object->enter_link
2321 2461
2322Freezes the player and moves him/her to a special map (C<{link}>). 2462Freezes the player and moves him/her to a special map (C<{link}>).
2323 2463
2324The player should be reasonably safe there for short amounts of time. You 2464The player should be reasonably safe there for short amounts of time (e.g.
2325I<MUST> call C<leave_link> as soon as possible, though. 2465for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2466though, as the palyer cannot control the character while it is on the link
2467map.
2326 2468
2327Will never block. 2469Will never block.
2328 2470
2329=item $player_object->leave_link ($map, $x, $y) 2471=item $player_object->leave_link ($map, $x, $y)
2330 2472
2388 2530
2389 $map->load; 2531 $map->load;
2390 $map->load_neighbours; 2532 $map->load_neighbours;
2391 2533
2392 return unless $self->contr->active; 2534 return unless $self->contr->active;
2535 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2393 $self->activate_recursive; 2536 $self->activate_recursive;
2394 2537
2395 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2538 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2396 $self->enter_map ($map, $x, $y); 2539 $self->enter_map ($map, $x, $y);
2397} 2540}
2402her, loading and preparing them map, calling the provided $check callback 2545her, loading and preparing them map, calling the provided $check callback
2403that has to return the map if sucecssful, and then unfreezes the player on 2546that has to return the map if sucecssful, and then unfreezes the player on
2404the new (success) or old (failed) map position. In either case, $done will 2547the new (success) or old (failed) map position. In either case, $done will
2405be called at the end of this process. 2548be called at the end of this process.
2406 2549
2550Note that $check will be called with a potentially non-loaded map, so if
2551it needs a loaded map it has to call C<< ->load >>.
2552
2407=cut 2553=cut
2408 2554
2409our $GOTOGEN; 2555our $GOTOGEN;
2410 2556
2411sub cf::object::player::goto { 2557sub cf::object::player::goto {
2415 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2416 2562
2417 $self->enter_link; 2563 $self->enter_link;
2418 2564
2419 (async { 2565 (async {
2566 $Coro::current->{desc} = "player::goto $path $x $y";
2567
2568 # *tag paths override both path and x|y
2569 if ($path =~ /^\*(.*)$/) {
2570 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2571 my $ob = $obs[rand @obs];
2572
2573 # see if we actually can go there
2574 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2575 $ob = $obs[rand @obs];
2576 } else {
2577 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2578 }
2579 # else put us there anyways for now #d#
2580
2581 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2582 } else {
2583 ($path, $x, $y) = (undef, undef, undef);
2584 }
2585 }
2586
2420 my $map = eval { 2587 my $map = eval {
2421 my $map = cf::map::find $path; 2588 my $map = defined $path ? cf::map::find $path : undef;
2422 2589
2423 if ($map) { 2590 if ($map) {
2424 $map = $map->customise_for ($self); 2591 $map = $map->customise_for ($self);
2425 $map = $check->($map) if $check && $map; 2592 $map = $check->($map) if $check && $map;
2426 } else { 2593 } else {
2427 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2594 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2428 } 2595 }
2429 2596
2430 $map 2597 $map
2431 }; 2598 };
2432 2599
2468} 2635}
2469 2636
2470sub prepare_random_map { 2637sub prepare_random_map {
2471 my ($exit) = @_; 2638 my ($exit) = @_;
2472 2639
2473 my $guard = cf::lock_acquire "exit_prepare:$exit";
2474
2475 # all this does is basically replace the /! path by 2640 # all this does is basically replace the /! path by
2476 # a new random map path (?random/...) with a seed 2641 # a new random map path (?random/...) with a seed
2477 # that depends on the exit object 2642 # that depends on the exit object
2478 2643
2479 my $rmp = parse_random_map_params $exit->msg; 2644 my $rmp = parse_random_map_params $exit->msg;
2481 if ($exit->map) { 2646 if ($exit->map) {
2482 $rmp->{region} = $exit->region->name; 2647 $rmp->{region} = $exit->region->name;
2483 $rmp->{origin_map} = $exit->map->path; 2648 $rmp->{origin_map} = $exit->map->path;
2484 $rmp->{origin_x} = $exit->x; 2649 $rmp->{origin_x} = $exit->x;
2485 $rmp->{origin_y} = $exit->y; 2650 $rmp->{origin_y} = $exit->y;
2651
2652 $exit->map->touch;
2486 } 2653 }
2487 2654
2488 $rmp->{random_seed} ||= $exit->random_seed; 2655 $rmp->{random_seed} ||= $exit->random_seed;
2489 2656
2490 my $data = cf::to_json $rmp; 2657 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2491 my $md5 = Digest::MD5::md5_hex $data; 2658 my $md5 = Digest::MD5::md5_hex $data;
2492 my $meta = "$RANDOMDIR/$md5.meta"; 2659 my $meta = "$RANDOMDIR/$md5.meta";
2493 2660
2494 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2495 aio_write $fh, 0, (length $data), $data, 0; 2662 aio_write $fh, 0, (length $data), $data, 0;
2496 undef $fh; 2663 undef $fh;
2497 aio_rename "$meta~", $meta; 2664 aio_rename "$meta~", $meta;
2498 2665
2666 my $slaying = "?random/$md5";
2667
2668 if ($exit->valid) {
2499 $exit->slaying ("?random/$md5"); 2669 $exit->slaying ("?random/$md5");
2500 $exit->msg (undef); 2670 $exit->msg (undef);
2671 }
2501 } 2672 }
2502} 2673}
2503 2674
2504sub cf::object::player::enter_exit { 2675sub cf::object::player::enter_exit {
2505 my ($self, $exit) = @_; 2676 my ($self, $exit) = @_;
2506 2677
2507 return unless $self->type == cf::PLAYER; 2678 return unless $self->type == cf::PLAYER;
2508 2679
2509 if ($exit->slaying eq "/!") {
2510 #TODO: this should de-fi-ni-te-ly not be a sync-job
2511 # the problem is that $exit might not survive long enough
2512 # so it needs to be done right now, right here
2513 cf::sync_job { prepare_random_map $exit };
2514 }
2515
2516 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2517 my $hp = $exit->stats->hp;
2518 my $sp = $exit->stats->sp;
2519
2520 $self->enter_link; 2680 $self->enter_link;
2521 2681
2522 # if exit is damned, update players death & WoR home-position
2523 $self->contr->savebed ($slaying, $hp, $sp)
2524 if $exit->flag (FLAG_DAMNED);
2525
2526 (async { 2682 (async {
2527 $self->deactivate_recursive; # just to be sure 2683 $Coro::current->{desc} = "enter_exit";
2684
2528 unless (eval { 2685 unless (eval {
2686 $self->deactivate_recursive; # just to be sure
2687
2688 # random map handling
2689 {
2690 my $guard = cf::lock_acquire "exit_prepare:$exit";
2691
2692 prepare_random_map $exit
2693 if $exit->slaying eq "/!";
2694 }
2695
2696 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2697 my $x = $exit->stats->hp;
2698 my $y = $exit->stats->sp;
2699
2529 $self->goto ($slaying, $hp, $sp); 2700 $self->goto ($map, $x, $y);
2530 2701
2702 # if exit is damned, update players death & WoR home-position
2703 $self->contr->savebed ($map, $x, $y)
2704 if $exit->flag (cf::FLAG_DAMNED);
2705
2531 1; 2706 1
2532 }) { 2707 }) {
2533 $self->message ("Something went wrong deep within the crossfire server. " 2708 $self->message ("Something went wrong deep within the deliantra server. "
2534 . "I'll try to bring you back to the map you were before. " 2709 . "I'll try to bring you back to the map you were before. "
2535 . "Please report this to the dungeon master!", 2710 . "Please report this to the dungeon master!",
2536 cf::NDI_UNIQUE | cf::NDI_RED); 2711 cf::NDI_UNIQUE | cf::NDI_RED);
2537 2712
2538 warn "ERROR in enter_exit: $@"; 2713 warn "ERROR in enter_exit: $@";
2566the message, with C<log> being the default. If C<$color> is negative, suppress 2741the message, with C<log> being the default. If C<$color> is negative, suppress
2567the message unless the client supports the msg packet. 2742the message unless the client supports the msg packet.
2568 2743
2569=cut 2744=cut
2570 2745
2746# non-persistent channels (usually the info channel)
2571our %CHANNEL = ( 2747our %CHANNEL = (
2572 "c/identify" => { 2748 "c/identify" => {
2573 id => "identify", 2749 id => "infobox",
2574 title => "Identify", 2750 title => "Identify",
2575 reply => undef, 2751 reply => undef,
2576 tooltip => "Items recently identified", 2752 tooltip => "Items recently identified",
2577 }, 2753 },
2578 "c/examine" => { 2754 "c/examine" => {
2579 id => "examine", 2755 id => "infobox",
2580 title => "Examine", 2756 title => "Examine",
2581 reply => undef, 2757 reply => undef,
2582 tooltip => "Signs and other items you examined", 2758 tooltip => "Signs and other items you examined",
2583 }, 2759 },
2760 "c/book" => {
2761 id => "infobox",
2762 title => "Book",
2763 reply => undef,
2764 tooltip => "The contents of a note or book",
2765 },
2766 "c/lookat" => {
2767 id => "infobox",
2768 title => "Look",
2769 reply => undef,
2770 tooltip => "What you saw there",
2771 },
2772 "c/who" => {
2773 id => "infobox",
2774 title => "Players",
2775 reply => undef,
2776 tooltip => "Shows players who are currently online",
2777 },
2778 "c/body" => {
2779 id => "infobox",
2780 title => "Body Parts",
2781 reply => undef,
2782 tooltip => "Shows which body parts you posess and are available",
2783 },
2784 "c/statistics" => {
2785 id => "infobox",
2786 title => "Statistics",
2787 reply => undef,
2788 tooltip => "Shows your primary statistics",
2789 },
2790 "c/skills" => {
2791 id => "infobox",
2792 title => "Skills",
2793 reply => undef,
2794 tooltip => "Shows your experience per skill and item power",
2795 },
2796 "c/shopitems" => {
2797 id => "infobox",
2798 title => "Shop Items",
2799 reply => undef,
2800 tooltip => "Shows the items currently for sale in this shop",
2801 },
2802 "c/resistances" => {
2803 id => "infobox",
2804 title => "Resistances",
2805 reply => undef,
2806 tooltip => "Shows your resistances",
2807 },
2808 "c/pets" => {
2809 id => "infobox",
2810 title => "Pets",
2811 reply => undef,
2812 tooltip => "Shows information abotu your pets/a specific pet",
2813 },
2814 "c/perceiveself" => {
2815 id => "infobox",
2816 title => "Perceive Self",
2817 reply => undef,
2818 tooltip => "You gained detailed knowledge about yourself",
2819 },
2820 "c/uptime" => {
2821 id => "infobox",
2822 title => "Uptime",
2823 reply => undef,
2824 tooltip => "How long the server has been running since last restart",
2825 },
2826 "c/mapinfo" => {
2827 id => "infobox",
2828 title => "Map Info",
2829 reply => undef,
2830 tooltip => "Information related to the maps",
2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2838 "c/death" => {
2839 id => "death",
2840 title => "Death",
2841 reply => undef,
2842 tooltip => "Reason for and more info about your most recent death",
2843 },
2844 "c/say" => $SAY_CHANNEL,
2845 "c/chat" => $CHAT_CHANNEL,
2584); 2846);
2585 2847
2586sub cf::client::send_msg { 2848sub cf::client::send_msg {
2587 my ($self, $channel, $msg, $color, @extra) = @_; 2849 my ($self, $channel, $msg, $color, @extra) = @_;
2588 2850
2589 $msg = $self->pl->expand_cfpod ($msg); 2851 $msg = $self->pl->expand_cfpod ($msg)
2852 unless $color & cf::NDI_VERBATIM;
2590 2853
2591 $color &= cf::NDI_CLIENT_MASK; # just in case... 2854 $color &= cf::NDI_CLIENT_MASK; # just in case...
2592 2855
2593 # check predefined channels, for the benefit of C 2856 # check predefined channels, for the benefit of C
2594 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2857 if ($CHANNEL{$channel}) {
2858 $channel = $CHANNEL{$channel};
2595 2859
2860 $self->ext_msg (channel_info => $channel);
2861 $channel = $channel->{id};
2862
2596 if (ref $channel) { 2863 } elsif (ref $channel) {
2597 # send meta info to client, if not yet sent 2864 # send meta info to client, if not yet sent
2598 unless (exists $self->{channel}{$channel->{id}}) { 2865 unless (exists $self->{channel}{$channel->{id}}) {
2599 $self->{channel}{$channel->{id}} = $channel; 2866 $self->{channel}{$channel->{id}} = $channel;
2600 $self->ext_msg (channel_info => $channel) 2867 $self->ext_msg (channel_info => $channel);
2601 if $self->can_msg;
2602 } 2868 }
2603 2869
2604 $channel = $channel->{id}; 2870 $channel = $channel->{id};
2605 } 2871 }
2606 2872
2607 return unless @extra || length $msg; 2873 return unless @extra || length $msg;
2608 2874
2609 if ($self->can_msg) {
2610 # default colour, mask it out 2875 # default colour, mask it out
2611 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2876 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2612 if $color & cf::NDI_DEF; 2877 if $color & cf::NDI_DEF;
2613 2878
2614 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2879 my $pkt = "msg "
2880 . $self->{json_coder}->encode (
2615 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2881 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2616 } else { 2882 );
2617 if ($color >= 0) {
2618 # replace some tags by gcfclient-compatible ones
2619 for ($msg) {
2620 1 while
2621 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2622 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2623 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2624 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2625 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2626 }
2627 2883
2628 $color &= cf::NDI_COLOR_MASK; 2884 # try lzf for large packets
2885 $pkt = "lzf " . Compress::LZF::compress $pkt
2886 if 1024 <= length $pkt and $self->{can_lzf};
2629 2887
2630 utf8::encode $msg; 2888 # split very large packets
2631 2889 if (8192 < length $pkt and $self->{can_lzf}) {
2632 if (0 && $msg =~ /\[/) { 2890 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2633 # COMMAND/INFO 2891 $pkt = "frag";
2634 $self->send_packet ("drawextinfo $color 10 8 $msg")
2635 } else {
2636 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2637 $self->send_packet ("drawinfo $color $msg")
2638 }
2639 }
2640 } 2892 }
2893
2894 $self->send_packet ($pkt);
2641} 2895}
2642 2896
2643=item $client->ext_msg ($type, @msg) 2897=item $client->ext_msg ($type, @msg)
2644 2898
2645Sends an ext event to the client. 2899Sends an ext event to the client.
2818=pod 3072=pod
2819 3073
2820The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2821 3075
2822 cf::object 3076 cf::object
2823 contr pay_amount pay_player map x y force_find force_add 3077 contr pay_amount pay_player map x y force_find force_add destroy
2824 insert remove name archname title slaying race decrease_ob_nr 3078 insert remove name archname title slaying race decrease split
3079 value
2825 3080
2826 cf::object::player 3081 cf::object::player
2827 player 3082 player
2828 3083
2829 cf::player 3084 cf::player
2834 3089
2835=cut 3090=cut
2836 3091
2837for ( 3092for (
2838 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3093 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2839 insert remove inv name archname title slaying race 3094 insert remove inv nrof name archname title slaying race
2840 decrease_ob_nr)], 3095 decrease split destroy change_exp value msg lore send_msg)],
2841 ["cf::object::player" => qw(player)], 3096 ["cf::object::player" => qw(player)],
2842 ["cf::player" => qw(peaceful)], 3097 ["cf::player" => qw(peaceful send_msg)],
2843 ["cf::map" => qw(trigger)], 3098 ["cf::map" => qw(trigger)],
2844) { 3099) {
2845 no strict 'refs'; 3100 no strict 'refs';
2846 my ($pkg, @funs) = @$_; 3101 my ($pkg, @funs) = @$_;
2847 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3102 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2864 my ($code, %vars) = @_; 3119 my ($code, %vars) = @_;
2865 3120
2866 my $qcode = $code; 3121 my $qcode = $code;
2867 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3122 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2868 $qcode =~ s/\n/\\n/g; 3123 $qcode =~ s/\n/\\n/g;
3124
3125 %vars = (_dummy => 0) unless %vars;
2869 3126
2870 local $_; 3127 local $_;
2871 local @safe::cf::_safe_eval_args = values %vars; 3128 local @safe::cf::_safe_eval_args = values %vars;
2872 3129
2873 my $eval = 3130 my $eval =
2950 { 3207 {
2951 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2952 3209
2953 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2954 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2955 cf::face::set_visibility $idx, $info->{visibility}; 3213 cf::face::set_visibility $idx, $info->{visibility};
2956 cf::face::set_magicmap $idx, $info->{magicmap}; 3214 cf::face::set_magicmap $idx, $info->{magicmap};
2957 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2958 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2959 3217
2960 cf::cede_to_tick; 3218 cf::cede_to_tick;
2961 } 3219 }
2962 3220
2963 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2964 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2965 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2966 or next; 3225 or next;
3226
2967 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
2968 cf::face::set_smooth $idx, $smooth; 3228 cf::face::set_smooth $idx, $smooth;
2969 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2970 } else { 3230 } else {
2971 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2989 { 3249 {
2990 # TODO: for gcfclient pleasure, we should give resources 3250 # TODO: for gcfclient pleasure, we should give resources
2991 # that gcfclient doesn't grok a >10000 face index. 3251 # that gcfclient doesn't grok a >10000 face index.
2992 my $res = $facedata->{resource}; 3252 my $res = $facedata->{resource};
2993 3253
2994 my $soundconf = delete $res->{"res/sound.conf"};
2995
2996 while (my ($name, $info) = each %$res) { 3254 while (my ($name, $info) = each %$res) {
3255 if (defined $info->{type}) {
2997 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3256 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2998 my $data; 3257 my $data;
2999 3258
3000 if ($info->{type} & 1) { 3259 if ($info->{type} & 1) {
3001 # prepend meta info 3260 # prepend meta info
3002 3261
3003 my $meta = $enc->encode ({ 3262 my $meta = $enc->encode ({
3004 name => $name, 3263 name => $name,
3005 %{ $info->{meta} || {} }, 3264 %{ $info->{meta} || {} },
3006 }); 3265 });
3007 3266
3008 $data = pack "(w/a*)*", $meta, $info->{data}; 3267 $data = pack "(w/a*)*", $meta, $info->{data};
3268 } else {
3269 $data = $info->{data};
3270 }
3271
3272 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3273 cf::face::set_type $idx, $info->{type};
3009 } else { 3274 } else {
3010 $data = $info->{data}; 3275 $RESOURCE{$name} = $info;
3011 } 3276 }
3012 3277
3013 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3014 cf::face::set_type $idx, $info->{type};
3015
3016 cf::cede_to_tick; 3278 cf::cede_to_tick;
3017 } 3279 }
3018
3019 if ($soundconf) {
3020 $soundconf = $enc->decode (delete $soundconf->{data});
3021
3022 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3023 my $sound = $soundconf->{compat}[$_]
3024 or next;
3025
3026 my $face = cf::face::find "sound/$sound->[1]";
3027 cf::sound::set $sound->[0] => $face;
3028 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3029 }
3030
3031 while (my ($k, $v) = each %{$soundconf->{event}}) {
3032 my $face = cf::face::find "sound/$v";
3033 cf::sound::set $k => $face;
3034 }
3035 }
3036 } 3280 }
3281
3282 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3037 3283
3038 1 3284 1
3039} 3285}
3286
3287cf::global->attach (on_resource_update => sub {
3288 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3289 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3290
3291 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3292 my $sound = $soundconf->{compat}[$_]
3293 or next;
3294
3295 my $face = cf::face::find "sound/$sound->[1]";
3296 cf::sound::set $sound->[0] => $face;
3297 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3298 }
3299
3300 while (my ($k, $v) = each %{$soundconf->{event}}) {
3301 my $face = cf::face::find "sound/$v";
3302 cf::sound::set $k => $face;
3303 }
3304 }
3305});
3040 3306
3041register_exticmd fx_want => sub { 3307register_exticmd fx_want => sub {
3042 my ($ns, $want) = @_; 3308 my ($ns, $want) = @_;
3043 3309
3044 while (my ($k, $v) = each %$want) { 3310 while (my ($k, $v) = each %$want) {
3045 $ns->fx_want ($k, $v); 3311 $ns->fx_want ($k, $v);
3046 } 3312 }
3047}; 3313};
3314
3315sub load_resource_file($) {
3316 my $guard = lock_acquire "load_resource_file";
3317
3318 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100;
3320 cf::arch::commit_load;
3321
3322 $status
3323}
3048 3324
3049sub reload_regions { 3325sub reload_regions {
3050 # HACK to clear player env face cache, we need some signal framework 3326 # HACK to clear player env face cache, we need some signal framework
3051 # for this (global event?) 3327 # for this (global event?)
3052 %ext::player_env::MUSIC_FACE_CACHE = (); 3328 %ext::player_env::MUSIC_FACE_CACHE = ();
3066} 3342}
3067 3343
3068sub reload_archetypes { 3344sub reload_archetypes {
3069 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
3070 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
3071 #d# NEED to laod twice to resolve forward references
3072 # this really needs to be done in an extra post-pass
3073 # (which needs to be synchronous, so solve it differently)
3074 load_resource_file "$DATADIR/archetypes"
3075 or die "unable to load archetypes\n";
3076} 3347}
3077 3348
3078sub reload_treasures { 3349sub reload_treasures {
3079 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
3080 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
3081} 3352}
3082 3353
3083sub reload_resources { 3354sub reload_resources {
3084 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
3085 3356
3357 reload_facedata;
3358 reload_archetypes;
3086 reload_regions; 3359 reload_regions;
3087 reload_facedata;
3088 #reload_archetypes;#d#
3089 reload_archetypes;
3090 reload_treasures; 3360 reload_treasures;
3091 3361
3092 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
3093}
3094
3095sub init {
3096 reload_resources;
3097} 3363}
3098 3364
3099sub reload_config { 3365sub reload_config {
3100 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
3101 or return; 3367 or return;
3102 3368
3103 local $/; 3369 local $/;
3104 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
3105 3371
3106 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3107 3373
3108 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3374 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3109 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3375 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3115 }; 3381 };
3116 warn $@ if $@; 3382 warn $@ if $@;
3117 } 3383 }
3118} 3384}
3119 3385
3386sub pidfile() {
3387 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3388 or die "$PIDFILE: $!";
3389 flock $fh, &Fcntl::LOCK_EX
3390 or die "$PIDFILE: flock: $!";
3391 $fh
3392}
3393
3394# make sure only one server instance is running at any one time
3395sub atomic {
3396 my $fh = pidfile;
3397
3398 my $pid = <$fh>;
3399 kill 9, $pid if $pid > 0;
3400
3401 seek $fh, 0, 0;
3402 print $fh $$;
3403}
3404
3120sub main { 3405sub main {
3406 cf::init_globals; # initialise logging
3407
3408 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3409 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3410 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3411 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3412
3413 cf::init_experience;
3414 cf::init_anim;
3415 cf::init_attackmess;
3416 cf::init_dynamic;
3417
3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419
3121 # we must not ever block the main coroutine 3420 # we must not ever block the main coroutine
3122 local $Coro::idle = sub { 3421 local $Coro::idle = sub {
3123 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3422 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3124 (async { 3423 (async {
3125 Event::one_event; 3424 $Coro::current->{desc} = "IDLE BUG HANDLER";
3425 EV::loop EV::LOOP_ONESHOT;
3126 })->prio (Coro::PRIO_MAX); 3426 })->prio (Coro::PRIO_MAX);
3127 }; 3427 };
3128 3428
3429 evthread_start IO::AIO::poll_fileno;
3430
3431 cf::sync_job {
3432 reload_resources;
3129 reload_config; 3433 reload_config;
3130 db_init; 3434 db_init;
3435
3436 cf::load_settings;
3437 cf::load_materials;
3438 cf::init_uuid;
3439 cf::init_signals;
3440 cf::init_commands;
3441 cf::init_skills;
3442
3443 cf::init_beforeplay;
3444
3445 atomic;
3446
3131 load_extensions; 3447 load_extensions;
3132 3448
3133 $TICK_WATCHER->start; 3449 utime time, time, $RUNTIMEFILE;
3450
3451 # no (long-running) fork's whatsoever before this point(!)
3452 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3453
3454 (pop @POST_INIT)->(0) while @POST_INIT;
3455 };
3456
3134 Event::loop; 3457 EV::loop;
3135} 3458}
3136 3459
3137############################################################################# 3460#############################################################################
3138# initialisation and cleanup 3461# initialisation and cleanup
3139 3462
3140# install some emergency cleanup handlers 3463# install some emergency cleanup handlers
3141BEGIN { 3464BEGIN {
3465 our %SIGWATCHER = ();
3142 for my $signal (qw(INT HUP TERM)) { 3466 for my $signal (qw(INT HUP TERM)) {
3143 Event->signal ( 3467 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3144 reentrant => 0,
3145 data => WF_AUTOCANCEL,
3146 signal => $signal,
3147 prio => 0,
3148 cb => sub {
3149 cf::cleanup "SIG$signal"; 3468 cf::cleanup "SIG$signal";
3150 },
3151 ); 3469 };
3152 } 3470 }
3153} 3471}
3154 3472
3155sub write_runtime { 3473sub write_runtime_sync {
3156 my $runtime = "$LOCALDIR/runtime";
3157
3158 # first touch the runtime file to show we are still running: 3474 # first touch the runtime file to show we are still running:
3159 # the fsync below can take a very very long time. 3475 # the fsync below can take a very very long time.
3160 3476
3161 IO::AIO::aio_utime $runtime, undef, undef; 3477 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3162 3478
3163 my $guard = cf::lock_acquire "write_runtime"; 3479 my $guard = cf::lock_acquire "write_runtime";
3164 3480
3165 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3481 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3166 or return; 3482 or return;
3167 3483
3168 my $value = $cf::RUNTIME + 90 + 10; 3484 my $value = $cf::RUNTIME + 90 + 10;
3169 # 10 is the runtime save interval, for a monotonic clock 3485 # 10 is the runtime save interval, for a monotonic clock
3170 # 60 allows for the watchdog to kill the server. 3486 # 60 allows for the watchdog to kill the server.
3180 aio_utime $fh, undef, undef; 3496 aio_utime $fh, undef, undef;
3181 3497
3182 close $fh 3498 close $fh
3183 or return; 3499 or return;
3184 3500
3185 aio_rename "$runtime~", $runtime 3501 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3186 and return; 3502 and return;
3187 3503
3188 warn "runtime file written.\n"; 3504 warn "runtime file written.\n";
3189 3505
3190 1 3506 1
3507}
3508
3509our $uuid_lock;
3510our $uuid_skip;
3511
3512sub write_uuid_sync($) {
3513 $uuid_skip ||= $_[0];
3514
3515 return if $uuid_lock;
3516 local $uuid_lock = 1;
3517
3518 my $uuid = "$LOCALDIR/uuid";
3519
3520 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3521 or return;
3522
3523 my $value = uuid_seq uuid_cur;
3524
3525 unless ($value) {
3526 warn "cowardly refusing to write zero uuid value!\n";
3527 return;
3528 }
3529
3530 my $value = uuid_str $value + $uuid_skip;
3531 $uuid_skip = 0;
3532
3533 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3534 and return;
3535
3536 # always fsync - this file is important
3537 aio_fsync $fh
3538 and return;
3539
3540 close $fh
3541 or return;
3542
3543 aio_rename "$uuid~", $uuid
3544 and return;
3545
3546 warn "uuid file written ($value).\n";
3547
3548 1
3549
3550}
3551
3552sub write_uuid($$) {
3553 my ($skip, $sync) = @_;
3554
3555 $sync ? write_uuid_sync $skip
3556 : async { write_uuid_sync $skip };
3191} 3557}
3192 3558
3193sub emergency_save() { 3559sub emergency_save() {
3194 my $freeze_guard = cf::freeze_mainloop; 3560 my $freeze_guard = cf::freeze_mainloop;
3195 3561
3196 warn "enter emergency perl save\n"; 3562 warn "emergency_perl_save: enter\n";
3197 3563
3198 cf::sync_job { 3564 cf::sync_job {
3565 # this is a trade-off: we want to be very quick here, so
3566 # save all maps without fsync, and later call a global sync
3567 # (which in turn might be very very slow)
3568 local $USE_FSYNC = 0;
3569
3199 # use a peculiar iteration method to avoid tripping on perl 3570 # use a peculiar iteration method to avoid tripping on perl
3200 # refcount bugs in for. also avoids problems with players 3571 # refcount bugs in for. also avoids problems with players
3201 # and maps saved/destroyed asynchronously. 3572 # and maps saved/destroyed asynchronously.
3202 warn "begin emergency player save\n"; 3573 warn "emergency_perl_save: begin player save\n";
3203 for my $login (keys %cf::PLAYER) { 3574 for my $login (keys %cf::PLAYER) {
3204 my $pl = $cf::PLAYER{$login} or next; 3575 my $pl = $cf::PLAYER{$login} or next;
3205 $pl->valid or next; 3576 $pl->valid or next;
3577 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3206 $pl->save; 3578 $pl->save;
3207 } 3579 }
3208 warn "end emergency player save\n"; 3580 warn "emergency_perl_save: end player save\n";
3209 3581
3210 warn "begin emergency map save\n"; 3582 warn "emergency_perl_save: begin map save\n";
3211 for my $path (keys %cf::MAP) { 3583 for my $path (keys %cf::MAP) {
3212 my $map = $cf::MAP{$path} or next; 3584 my $map = $cf::MAP{$path} or next;
3213 $map->valid or next; 3585 $map->valid or next;
3214 $map->save; 3586 $map->save;
3215 } 3587 }
3216 warn "end emergency map save\n"; 3588 warn "emergency_perl_save: end map save\n";
3217 3589
3218 warn "begin emergency database checkpoint\n"; 3590 warn "emergency_perl_save: begin database checkpoint\n";
3219 BDB::db_env_txn_checkpoint $DB_ENV; 3591 BDB::db_env_txn_checkpoint $DB_ENV;
3220 warn "end emergency database checkpoint\n"; 3592 warn "emergency_perl_save: end database checkpoint\n";
3593
3594 warn "emergency_perl_save: begin write uuid\n";
3595 write_uuid_sync 1;
3596 warn "emergency_perl_save: end write uuid\n";
3221 }; 3597 };
3222 3598
3599 warn "emergency_perl_save: starting sync()\n";
3600 IO::AIO::aio_sync sub {
3601 warn "emergency_perl_save: finished sync()\n";
3602 };
3603
3223 warn "leave emergency perl save\n"; 3604 warn "emergency_perl_save: leave\n";
3224} 3605}
3225 3606
3226sub post_cleanup { 3607sub post_cleanup {
3227 my ($make_core) = @_; 3608 my ($make_core) = @_;
3228 3609
3229 warn Carp::longmess "post_cleanup backtrace" 3610 warn Carp::longmess "post_cleanup backtrace"
3230 if $make_core; 3611 if $make_core;
3612
3613 my $fh = pidfile;
3614 unlink $PIDFILE if <$fh> == $$;
3615}
3616
3617# a safer delete_package, copied from Symbol
3618sub clear_package($) {
3619 my $pkg = shift;
3620
3621 # expand to full symbol table name if needed
3622 unless ($pkg =~ /^main::.*::$/) {
3623 $pkg = "main$pkg" if $pkg =~ /^::/;
3624 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3625 $pkg .= '::' unless $pkg =~ /::$/;
3626 }
3627
3628 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3629 my $stem_symtab = *{$stem}{HASH};
3630
3631 defined $stem_symtab and exists $stem_symtab->{$leaf}
3632 or return;
3633
3634 # clear all symbols
3635 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3636 for my $name (keys %$leaf_symtab) {
3637 _gv_clear *{"$pkg$name"};
3638# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3639 }
3640 warn "cleared package $pkg\n";#d#
3231} 3641}
3232 3642
3233sub do_reload_perl() { 3643sub do_reload_perl() {
3234 # can/must only be called in main 3644 # can/must only be called in main
3235 if ($Coro::current != $Coro::main) { 3645 if ($Coro::current != $Coro::main) {
3236 warn "can only reload from main coroutine"; 3646 warn "can only reload from main coroutine";
3237 return; 3647 return;
3238 } 3648 }
3239 3649
3650 return if $RELOAD++;
3651
3652 my $t1 = EV::time;
3653
3654 while ($RELOAD) {
3240 warn "reloading..."; 3655 warn "reloading...";
3241 3656
3242 warn "entering sync_job"; 3657 warn "entering sync_job";
3243 3658
3244 cf::sync_job { 3659 cf::sync_job {
3245 cf::write_runtime; # external watchdog should not bark 3660 cf::write_runtime_sync; # external watchdog should not bark
3246 cf::emergency_save; 3661 cf::emergency_save;
3247 cf::write_runtime; # external watchdog should not bark 3662 cf::write_runtime_sync; # external watchdog should not bark
3248 3663
3249 warn "syncing database to disk"; 3664 warn "syncing database to disk";
3250 BDB::db_env_txn_checkpoint $DB_ENV; 3665 BDB::db_env_txn_checkpoint $DB_ENV;
3251 3666
3252 # if anything goes wrong in here, we should simply crash as we already saved 3667 # if anything goes wrong in here, we should simply crash as we already saved
3253 3668
3254 warn "cancelling all WF_AUTOCANCEL watchers";
3255 for (Event::all_watchers) {
3256 $_->cancel if $_->data & WF_AUTOCANCEL;
3257 }
3258
3259 warn "flushing outstanding aio requests"; 3669 warn "flushing outstanding aio requests";
3260 for (;;) {
3261 BDB::flush;
3262 IO::AIO::flush;
3263 Coro::cede;
3264 last unless IO::AIO::nreqs || BDB::nreqs; 3670 while (IO::AIO::nreqs || BDB::nreqs) {
3265 warn "iterate..."; 3671 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3266 }
3267
3268 ++$RELOAD;
3269
3270 warn "cancelling all extension coros";
3271 $_->cancel for values %EXT_CORO;
3272 %EXT_CORO = ();
3273
3274 warn "removing commands";
3275 %COMMAND = ();
3276
3277 warn "removing ext/exti commands";
3278 %EXTCMD = ();
3279 %EXTICMD = ();
3280
3281 warn "unloading/nuking all extensions";
3282 for my $pkg (@EXTS) {
3283 warn "... unloading $pkg";
3284
3285 if (my $cb = $pkg->can ("unload")) {
3286 eval {
3287 $cb->($pkg);
3288 1
3289 } or warn "$pkg unloaded, but with errors: $@";
3290 } 3672 }
3291 3673
3292 warn "... nuking $pkg"; 3674 warn "cancelling all extension coros";
3293 Symbol::delete_package $pkg; 3675 $_->cancel for values %EXT_CORO;
3294 } 3676 %EXT_CORO = ();
3295 3677
3296 warn "unloading all perl modules loaded from $LIBDIR"; 3678 warn "removing commands";
3297 while (my ($k, $v) = each %INC) { 3679 %COMMAND = ();
3298 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3299 3680
3681 warn "removing ext/exti commands";
3682 %EXTCMD = ();
3683 %EXTICMD = ();
3684
3685 warn "unloading/nuking all extensions";
3686 for my $pkg (@EXTS) {
3300 warn "... unloading $k"; 3687 warn "... unloading $pkg";
3301 delete $INC{$k};
3302 3688
3303 $k =~ s/\.pm$//;
3304 $k =~ s/\//::/g;
3305
3306 if (my $cb = $k->can ("unload_module")) { 3689 if (my $cb = $pkg->can ("unload")) {
3690 eval {
3307 $cb->(); 3691 $cb->($pkg);
3692 1
3693 } or warn "$pkg unloaded, but with errors: $@";
3694 }
3695
3696 warn "... clearing $pkg";
3697 clear_package $pkg;
3308 } 3698 }
3309 3699
3310 Symbol::delete_package $k; 3700 warn "unloading all perl modules loaded from $LIBDIR";
3701 while (my ($k, $v) = each %INC) {
3702 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3703
3704 warn "... unloading $k";
3705 delete $INC{$k};
3706
3707 $k =~ s/\.pm$//;
3708 $k =~ s/\//::/g;
3709
3710 if (my $cb = $k->can ("unload_module")) {
3711 $cb->();
3712 }
3713
3714 clear_package $k;
3311 } 3715 }
3312 3716
3313 warn "getting rid of safe::, as good as possible"; 3717 warn "getting rid of safe::, as good as possible";
3314 Symbol::delete_package "safe::$_" 3718 clear_package "safe::$_"
3315 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3719 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3316 3720
3317 warn "unloading cf.pm \"a bit\""; 3721 warn "unloading cf.pm \"a bit\"";
3318 delete $INC{"cf.pm"}; 3722 delete $INC{"cf.pm"};
3319 delete $INC{"cf/pod.pm"}; 3723 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3320 3724
3321 # don't, removes xs symbols, too, 3725 # don't, removes xs symbols, too,
3322 # and global variables created in xs 3726 # and global variables created in xs
3323 #Symbol::delete_package __PACKAGE__; 3727 #clear_package __PACKAGE__;
3324 3728
3325 warn "unload completed, starting to reload now"; 3729 warn "unload completed, starting to reload now";
3326 3730
3327 warn "reloading cf.pm"; 3731 warn "reloading cf.pm";
3328 require cf; 3732 require cf;
3329 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3733 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3330 3734
3331 warn "loading config and database again"; 3735 warn "loading config and database again";
3332 cf::reload_config; 3736 cf::reload_config;
3333 3737
3334 warn "loading extensions"; 3738 warn "loading extensions";
3335 cf::load_extensions; 3739 cf::load_extensions;
3336 3740
3741 if ($REATTACH_ON_RELOAD) {
3337 warn "reattaching attachments to objects/players"; 3742 warn "reattaching attachments to objects/players";
3338 _global_reattach; # objects, sockets 3743 _global_reattach; # objects, sockets
3339 warn "reattaching attachments to maps"; 3744 warn "reattaching attachments to maps";
3340 reattach $_ for values %MAP; 3745 reattach $_ for values %MAP;
3341 warn "reattaching attachments to players"; 3746 warn "reattaching attachments to players";
3342 reattach $_ for values %PLAYER; 3747 reattach $_ for values %PLAYER;
3748 }
3343 3749
3750 warn "running post_init jobs";
3751 (pop @POST_INIT)->(1) while @POST_INIT;
3752
3344 warn "leaving sync_job"; 3753 warn "leaving sync_job";
3345 3754
3346 1 3755 1
3347 } or do { 3756 } or do {
3348 warn $@; 3757 warn $@;
3349 warn "error while reloading, exiting."; 3758 cf::cleanup "error while reloading, exiting.";
3350 exit 1;
3351 }; 3759 };
3352 3760
3353 warn "reloaded"; 3761 warn "reloaded";
3762 --$RELOAD;
3763 }
3764
3765 $t1 = EV::time - $t1;
3766 warn "reload completed in ${t1}s\n";
3354}; 3767};
3355 3768
3356our $RELOAD_WATCHER; # used only during reload 3769our $RELOAD_WATCHER; # used only during reload
3357 3770
3358sub reload_perl() { 3771sub reload_perl() {
3359 # doing reload synchronously and two reloads happen back-to-back, 3772 # doing reload synchronously and two reloads happen back-to-back,
3360 # coro crashes during coro_state_free->destroy here. 3773 # coro crashes during coro_state_free->destroy here.
3361 3774
3362 $RELOAD_WATCHER ||= Event->timer ( 3775 $RELOAD_WATCHER ||= cf::async {
3363 reentrant => 0, 3776 Coro::AIO::aio_wait cache_extensions;
3364 after => 0, 3777
3365 data => WF_AUTOCANCEL, 3778 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3366 cb => sub {
3367 do_reload_perl; 3779 do_reload_perl;
3368 undef $RELOAD_WATCHER; 3780 undef $RELOAD_WATCHER;
3369 }, 3781 };
3370 ); 3782 };
3371} 3783}
3372 3784
3373register_command "reload" => sub { 3785register_command "reload" => sub {
3374 my ($who, $arg) = @_; 3786 my ($who, $arg) = @_;
3375 3787
3376 if ($who->flag (FLAG_WIZ)) { 3788 if ($who->flag (FLAG_WIZ)) {
3377 $who->message ("reloading server."); 3789 $who->message ("reloading server.");
3790 async {
3791 $Coro::current->{desc} = "perl_reload";
3378 async { reload_perl }; 3792 reload_perl;
3793 };
3379 } 3794 }
3380}; 3795};
3381 3796
3382unshift @INC, $LIBDIR; 3797unshift @INC, $LIBDIR;
3383 3798
3385 3800
3386our @WAIT_FOR_TICK; 3801our @WAIT_FOR_TICK;
3387our @WAIT_FOR_TICK_BEGIN; 3802our @WAIT_FOR_TICK_BEGIN;
3388 3803
3389sub wait_for_tick { 3804sub wait_for_tick {
3390 return unless $TICK_WATCHER->is_active;
3391 return if $Coro::current == $Coro::main; 3805 return if tick_inhibit || $Coro::current == $Coro::main;
3392 3806
3393 my $signal = new Coro::Signal; 3807 my $signal = new Coro::Signal;
3394 push @WAIT_FOR_TICK, $signal; 3808 push @WAIT_FOR_TICK, $signal;
3395 $signal->wait; 3809 $signal->wait;
3396} 3810}
3397 3811
3398sub wait_for_tick_begin { 3812sub wait_for_tick_begin {
3399 return unless $TICK_WATCHER->is_active;
3400 return if $Coro::current == $Coro::main; 3813 return if tick_inhibit || $Coro::current == $Coro::main;
3401 3814
3402 my $signal = new Coro::Signal; 3815 my $signal = new Coro::Signal;
3403 push @WAIT_FOR_TICK_BEGIN, $signal; 3816 push @WAIT_FOR_TICK_BEGIN, $signal;
3404 $signal->wait; 3817 $signal->wait;
3405} 3818}
3406 3819
3407 my $min = 1e6;#d# 3820sub tick {
3408 my $avg = 10;
3409$TICK_WATCHER = Event->timer (
3410 reentrant => 0,
3411 parked => 1,
3412 prio => 0,
3413 at => $NEXT_TICK || $TICK,
3414 data => WF_AUTOCANCEL,
3415 cb => sub {
3416 if ($Coro::current != $Coro::main) { 3821 if ($Coro::current != $Coro::main) {
3417 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3822 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3418 unless ++$bug_warning > 10; 3823 unless ++$bug_warning > 10;
3419 return; 3824 return;
3420 } 3825 }
3421 3826
3422 $NOW = $tick_start = Event::time;
3423
3424 cf::server_tick; # one server iteration 3827 cf::server_tick; # one server iteration
3425 3828
3426 0 && sync_job {#d# 3829 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3427 for(1..10) { 3830 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3428 my $t = Event::time; 3831 Coro::async_pool {
3429 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3832 $Coro::current->{desc} = "runtime saver";
3430 or die; 3833 write_runtime_sync
3431 3834 or warn "ERROR: unable to write runtime file: $!";
3432 $map->width (50);
3433 $map->height (50);
3434 $map->alloc;
3435 $map->_load_objects ("/tmp/x.map", 1); #TODO: does not work
3436 my $t = Event::time - $t;
3437
3438 #next unless $t < 0.0013;#d#
3439 if ($t < $min) {
3440 $min = $t;
3441 }
3442 $avg = $avg * 0.99 + $t * 0.01;
3443 }
3444 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3445 exit 0;
3446 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3447 }; 3835 };
3836 }
3448 3837
3449 $RUNTIME += $TICK;
3450 $NEXT_TICK += $TICK;
3451
3452 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3453 $NEXT_RUNTIME_WRITE = $NOW + 10;
3454 Coro::async_pool {
3455 write_runtime
3456 or warn "ERROR: unable to write runtime file: $!";
3457 };
3458 }
3459
3460# my $AFTER = Event::time;
3461# warn $AFTER - $NOW;#d#
3462
3463 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3838 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3464 $sig->send; 3839 $sig->send;
3465 } 3840 }
3466 while (my $sig = shift @WAIT_FOR_TICK) { 3841 while (my $sig = shift @WAIT_FOR_TICK) {
3467 $sig->send; 3842 $sig->send;
3468 } 3843 }
3469 3844
3470 $NOW = Event::time; 3845 $LOAD = ($NOW - $TICK_START) / $TICK;
3471
3472 # if we are delayed by four ticks or more, skip them all
3473 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3474
3475 $TICK_WATCHER->at ($NEXT_TICK);
3476 $TICK_WATCHER->start;
3477
3478 $LOAD = ($NOW - $tick_start) / $TICK;
3479 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3846 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3480 3847
3481 _post_tick; 3848 if (0) {
3482 3849 if ($NEXT_TICK) {
3483 3850 my $jitter = $TICK_START - $NEXT_TICK;
3851 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3852 warn "jitter $JITTER\n";#d#
3853 }
3484 }, 3854 }
3485); 3855}
3486 3856
3487{ 3857{
3488 BDB::max_poll_time $TICK * 0.1; 3858 # configure BDB
3489 $BDB_POLL_WATCHER = Event->io ( 3859
3490 reentrant => 0,
3491 fd => BDB::poll_fileno,
3492 poll => 'r',
3493 prio => 0,
3494 data => WF_AUTOCANCEL,
3495 cb => \&BDB::poll_cb,
3496 );
3497 BDB::min_parallel 8; 3860 BDB::min_parallel 8;
3498 3861 BDB::max_poll_reqs $TICK * 0.1;
3499 BDB::set_sync_prepare { 3862 $AnyEvent::BDB::WATCHER->priority (1);
3500 my $status;
3501 my $current = $Coro::current;
3502 (
3503 sub {
3504 $status = $!;
3505 $current->ready; undef $current;
3506 },
3507 sub {
3508 Coro::schedule while defined $current;
3509 $! = $status;
3510 },
3511 )
3512 };
3513 3863
3514 unless ($DB_ENV) { 3864 unless ($DB_ENV) {
3515 $DB_ENV = BDB::db_env_create; 3865 $DB_ENV = BDB::db_env_create;
3866 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3867 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3868 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3869 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3870 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3516 3871
3517 cf::sync_job { 3872 cf::sync_job {
3518 eval { 3873 eval {
3519 BDB::db_env_open 3874 BDB::db_env_open
3520 $DB_ENV, 3875 $DB_ENV,
3522 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3877 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3523 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3878 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3524 0666; 3879 0666;
3525 3880
3526 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3881 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3527
3528 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3529 $DB_ENV->set_lk_detect;
3530 }; 3882 };
3531 3883
3532 cf::cleanup "db_env_open(db): $@" if $@; 3884 cf::cleanup "db_env_open(db): $@" if $@;
3533 }; 3885 };
3534 } 3886 }
3887
3888 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3889 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3890 };
3891 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3892 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3893 };
3894 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3895 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3896 };
3535} 3897}
3536 3898
3537{ 3899{
3900 # configure IO::AIO
3901
3538 IO::AIO::min_parallel 8; 3902 IO::AIO::min_parallel 8;
3539
3540 undef $Coro::AIO::WATCHER;
3541 IO::AIO::max_poll_time $TICK * 0.1; 3903 IO::AIO::max_poll_time $TICK * 0.1;
3542 $AIO_POLL_WATCHER = Event->io ( 3904 undef $AnyEvent::AIO::WATCHER;
3543 reentrant => 0,
3544 data => WF_AUTOCANCEL,
3545 fd => IO::AIO::poll_fileno,
3546 poll => 'r',
3547 prio => 6,
3548 cb => \&IO::AIO::poll_cb,
3549 );
3550} 3905}
3551 3906
3552my $_log_backtrace; 3907my $_log_backtrace;
3553 3908
3554sub _log_backtrace { 3909sub _log_backtrace {
3557 $msg =~ s/\n//; 3912 $msg =~ s/\n//;
3558 3913
3559 # limit the # of concurrent backtraces 3914 # limit the # of concurrent backtraces
3560 if ($_log_backtrace < 2) { 3915 if ($_log_backtrace < 2) {
3561 ++$_log_backtrace; 3916 ++$_log_backtrace;
3917 my $perl_bt = Carp::longmess $msg;
3562 async { 3918 async {
3919 $Coro::current->{desc} = "abt $msg";
3920
3563 my @bt = fork_call { 3921 my @bt = fork_call {
3564 @addr = map { sprintf "%x", $_ } @addr; 3922 @addr = map { sprintf "%x", $_ } @addr;
3565 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3923 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3566 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3924 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3567 or die "addr2line: $!"; 3925 or die "addr2line: $!";
3575 } 3933 }
3576 3934
3577 @funcs 3935 @funcs
3578 }; 3936 };
3579 3937
3580 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $perl_bt\n";
3939 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3581 LOG llevInfo, "[ABT] $_\n" for @bt; 3940 LOG llevInfo, "[ABT] $_\n" for @bt;
3582 --$_log_backtrace; 3941 --$_log_backtrace;
3583 }; 3942 };
3584 } else { 3943 } else {
3585 LOG llevInfo, "[ABT] $msg\n"; 3944 LOG llevInfo, "[ABT] $msg\n";
3586 LOG llevInfo, "[ABT] [suppressed]\n"; 3945 LOG llevInfo, "[ABT] [suppressed]\n";
3587 } 3946 }
3588} 3947}
3589 3948
3590# load additional modules 3949# load additional modules
3591use cf::pod; 3950require "cf/$_.pm" for @EXTRA_MODULES;
3592 3951
3593END { cf::emergency_save } 3952END { cf::emergency_save }
3594 3953
35951 39541
3596 3955

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines