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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines