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.367 by root, Wed Sep 12 11:10:11 2007 UTC vs.
Revision 1.478 by root, Thu Sep 17 01:57:31 2009 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict qw(vars subs);
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 76
43$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
44 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 79
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 81
52our %COMMAND = (); 82our %COMMAND = ();
53our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
56our %EXTCMD = (); 86our %EXTCMD = ();
57our %EXTICMD = (); 87our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
60 90
61our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 92our @EVENT;
63 93
64our $CONFDIR = confdir; 94our $CONFDIR = confdir;
65our $DATADIR = datadir; 95our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
75 109
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 112our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
83 114
84our $BDB_POLL_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 118our $DB_ENV;
88 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
89our %CFG; 122our %CFG;
90 123
91our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 125our $RUNTIME;
126our $NOW;
93 127
94our (%PLAYER, %PLAYER_LOADING); # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 129our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
97 131
98# used to convert map paths into valid unix filenames by replacing / by ∕ 132# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 134
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
104 144
105binmode STDOUT; 145binmode STDOUT;
106binmode STDERR; 146binmode STDERR;
107 147
108# read virtual server time, if available 148# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
113} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
114 156
115mkdir $_ 157mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
117 159
118our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
161 203
162The raw value load value from the last tick. 204The raw value load value from the last tick.
163 205
164=item %cf::CFG 206=item %cf::CFG
165 207
166Configuration for the server, loaded from C</etc/crossfire/config>, or 208Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 209from wherever your confdir points to.
168 210
169=item cf::wait_for_tick, cf::wait_for_tick_begin 211=item cf::wait_for_tick, cf::wait_for_tick_begin
170 212
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
180 222
181=back 223=back
182 224
183=cut 225=cut
184 226
185BEGIN { 227$Coro::State::WARNHOOK = sub {
186 *CORE::GLOBAL::warn = sub {
187 my $msg = join "", @_; 228 my $msg = join "", @_;
188 229
189 $msg .= "\n" 230 $msg .= "\n"
190 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
191 232
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 234
194 LOG llevError, $msg; 235 LOG llevError, $msg;
195 }; 236};
196} 237
238$Coro::State::DIEHOOK = sub {
239 return unless $^S eq 0; # "eq", not "=="
240
241 warn Carp::longmess $_[0];
242
243 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d#
246 }#d#
247
248 # kill coroutine otherwise
249 Coro::terminate
250};
197 251
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 262for my $pkg (qw(
209 cf::global cf::attachable 263 cf::global cf::attachable
210 cf::object cf::object::player 264 cf::object cf::object::player
211 cf::client cf::player 265 cf::client cf::player
212 cf::arch cf::living 266 cf::arch cf::living
267 cf::map cf::mapspace
213 cf::map cf::party cf::region 268 cf::party cf::region
214)) { 269)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 271}
218 272
219$Event::DIED = sub { 273$EV::DIED = sub {
220 warn "error in event callback: @_"; 274 warn "error in event callback: @_";
221}; 275};
222 276
223############################################################################# 277#############################################################################
224 278
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 301 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 302 $d
249 } || "[unable to dump $_[0]: '$@']"; 303 } || "[unable to dump $_[0]: '$@']";
250} 304}
251 305
252=item $ref = cf::from_json $json 306=item $ref = cf::decode_json $json
253 307
254Converts a JSON string into the corresponding perl data structure. 308Converts a JSON string into the corresponding perl data structure.
255 309
256=item $json = cf::to_json $ref 310=item $json = cf::encode_json $ref
257 311
258Converts a perl data structure into its JSON representation. 312Converts a perl data structure into its JSON representation.
259 313
260=cut 314=cut
261 315
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 316our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 317
264sub to_json ($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 319sub decode_json($) { $json_coder->decode ($_[0]) }
320
321=item cf::post_init { BLOCK }
322
323Execute the given codeblock, I<after> all extensions have been (re-)loaded,
324but I<before> the server starts ticking again.
325
326The cdoeblock will have a single boolean argument to indicate whether this
327is a reload or not.
328
329=cut
330
331sub post_init(&) {
332 push @POST_INIT, shift;
333}
266 334
267=item cf::lock_wait $string 335=item cf::lock_wait $string
268 336
269Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
270 338
271=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
272 340
273Wait until the given lock is available and then acquires it and returns 341Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 342a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
276returned. 344returned.
277 345
278Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 347deadlocked coro.
285 353
286Return true if the lock is currently active, i.e. somebody has locked it. 354Return true if the lock is currently active, i.e. somebody has locked it.
287 355
288=cut 356=cut
289 357
290our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 359
293sub lock_wait($) { 360sub lock_wait($) {
294 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 362}
307 363
308sub lock_acquire($) { 364sub lock_acquire($) {
309 my ($key) = @_; 365 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 366}
323 367
324sub lock_active($) { 368sub lock_active($) {
325 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 370}
329 371
330sub freeze_mainloop { 372sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 373 tick_inhibit_inc;
332 374
333 my $guard = Coro::guard { 375 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 376}
335 }; 377
336 $TICK_WATCHER->stop; 378=item cf::periodic $interval, $cb
337 $guard 379
380Like EV::periodic, but randomly selects a starting point so that the actions
381get spread over timer.
382
383=cut
384
385sub periodic($$) {
386 my ($interval, $cb) = @_;
387
388 my $start = rand List::Util::min 180, $interval;
389
390 EV::periodic $start, $interval, 0, $cb
338} 391}
339 392
340=item cf::get_slot $time[, $priority[, $name]] 393=item cf::get_slot $time[, $priority[, $name]]
341 394
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 395Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 406our @SLOT_QUEUE;
354our $SLOT_QUEUE; 407our $SLOT_QUEUE;
355 408
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 409$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 410$SLOT_QUEUE = Coro::async {
411 $Coro::current->desc ("timeslot manager");
412
358 my $signal = new Coro::Signal; 413 my $signal = new Coro::Signal;
359 414
360 while () { 415 while () {
361 next_job: 416 next_job:
362 my $avail = cf::till_tick; 417 my $avail = cf::till_tick;
370 } 425 }
371 } 426 }
372 } 427 }
373 428
374 if (@SLOT_QUEUE) { 429 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 430 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 431 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 432 $signal->wait;
378 } else { 433 } else {
379 Coro::schedule; 434 Coro::schedule;
380 } 435 }
381 } 436 }
382}; 437};
383 438
384sub get_slot($;$$) { 439sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main;
441
385 my ($time, $pri, $name) = @_; 442 my ($time, $pri, $name) = @_;
386 443
387 $time = $TICK * .6 if $time > $TICK * .6; 444 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 445 my $sig = new Coro::Signal;
389 446
403 460
404BEGIN { *async = \&Coro::async_pool } 461BEGIN { *async = \&Coro::async_pool }
405 462
406=item cf::sync_job { BLOCK } 463=item cf::sync_job { BLOCK }
407 464
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 465The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 466is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 467partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 468acceptable.
412 469
413If it must be done, put the blocking parts into C<sync_job>. This will run 470If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 471the given BLOCK in another coroutine while waiting for the result. The
419 476
420sub sync_job(&) { 477sub sync_job(&) {
421 my ($job) = @_; 478 my ($job) = @_;
422 479
423 if ($Coro::current == $Coro::main) { 480 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 481 my $time = EV::time;
425 482
426 # this is the main coro, too bad, we have to block 483 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 484 # till the operation succeeds, freezing the server :/
428 485
429 # TODO: use suspend/resume instead 486 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 487
431 my $freeze_guard = freeze_mainloop; 488 my $freeze_guard = freeze_mainloop;
432 489
433 my $busy = 1; 490 my $busy = 1;
434 my @res; 491 my @res;
435 492
436 (async { 493 (async {
494 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 495 @res = eval { $job->() };
438 warn $@ if $@; 496 warn $@ if $@;
439 undef $busy; 497 undef $busy;
440 })->prio (Coro::PRIO_MAX); 498 })->prio (Coro::PRIO_MAX);
441 499
442 while ($busy) { 500 while ($busy) {
443 Coro::cede or Event::one_event; 501 if (Coro::nready) {
502 Coro::cede_notself;
503 } else {
504 EV::loop EV::LOOP_ONESHOT;
444 } 505 }
506 }
445 507
446 $time = Event::time - $time; 508 my $time = EV::time - $time;
447 509
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 510 $TICK_START += $time; # do not account sync jobs to server load
452 511
453 wantarray ? @res : $res[0] 512 wantarray ? @res : $res[0]
454 } else { 513 } else {
455 # we are in another coroutine, how wonderful, everything just works 514 # we are in another coroutine, how wonderful, everything just works
456 515
481=item fork_call { }, $args 540=item fork_call { }, $args
482 541
483Executes the given code block with the given arguments in a seperate 542Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 543process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 544Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 545never block itself or use any form of event handling.
487 546
488=cut 547=cut
489 548
490sub fork_call(&@) { 549sub fork_call(&@) {
491 my ($cb, @args) = @_; 550 my ($cb, @args) = @_;
498 reset_signals; 557 reset_signals;
499 &$cb 558 &$cb
500 }, @args; 559 }, @args;
501 560
502 wantarray ? @res : $res[-1] 561 wantarray ? @res : $res[-1]
562}
563
564=item $coin = coin_from_name $name
565
566=cut
567
568our %coin_alias = (
569 "silver" => "silvercoin",
570 "silvercoin" => "silvercoin",
571 "silvercoins" => "silvercoin",
572 "gold" => "goldcoin",
573 "goldcoin" => "goldcoin",
574 "goldcoins" => "goldcoin",
575 "platinum" => "platinacoin",
576 "platinumcoin" => "platinacoin",
577 "platinumcoins" => "platinacoin",
578 "platina" => "platinacoin",
579 "platinacoin" => "platinacoin",
580 "platinacoins" => "platinacoin",
581 "royalty" => "royalty",
582 "royalties" => "royalty",
583);
584
585sub coin_from_name($) {
586 $coin_alias{$_[0]}
587 ? cf::arch::find $coin_alias{$_[0]}
588 : undef
503} 589}
504 590
505=item $value = cf::db_get $family => $key 591=item $value = cf::db_get $family => $key
506 592
507Returns a single value from the environment database. 593Returns a single value from the environment database.
646 732
647############################################################################# 733#############################################################################
648 734
649=head2 ATTACHABLE OBJECTS 735=head2 ATTACHABLE OBJECTS
650 736
651Many objects in crossfire are so-called attachable objects. That means you can 737Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 738attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 739to it. All such attachable objects support the following methods.
654 740
655In the following description, CLASS can be any of C<global>, C<object> 741In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 742C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 743Deliantra).
658 744
659=over 4 745=over 4
660 746
661=item $attachable->attach ($attachment, key => $value...) 747=item $attachable->attach ($attachment, key => $value...)
662 748
706=item cf::CLASS::attachment $name, ... 792=item cf::CLASS::attachment $name, ...
707 793
708Register an attachment by C<$name> through which attachable objects of the 794Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 795given CLASS can refer to this attachment.
710 796
711Some classes such as crossfire maps and objects can specify attachments 797Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 798that are attached at load/instantiate time, thus the need for a name.
713 799
714These calls expect any number of the following handler/hook descriptions: 800These calls expect any number of the following handler/hook descriptions:
715 801
716=over 4 802=over 4
944 } 1030 }
945 1031
946 0 1032 0
947} 1033}
948 1034
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1036
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1037=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1038
953Generate an object-specific event with the given arguments. 1039Generate an object-specific event with the given arguments.
954 1040
960 1046
961=cut 1047=cut
962 1048
963############################################################################# 1049#############################################################################
964# object support 1050# object support
965#
966 1051
1052sub _object_equal($$);
1053sub _object_equal($$) {
1054 my ($a, $b) = @_;
1055
1056 return 0 unless (ref $a) eq (ref $b);
1057
1058 if ("HASH" eq ref $a) {
1059 my @ka = keys %$a;
1060 my @kb = keys %$b;
1061
1062 return 0 if @ka != @kb;
1063
1064 for (0 .. $#ka) {
1065 return 0 unless $ka[$_] eq $kb[$_];
1066 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1067 }
1068
1069 } elsif ("ARRAY" eq ref $a) {
1070
1071 return 0 if @$a != @$b;
1072
1073 for (0 .. $#$a) {
1074 return 0 unless _object_equal $a->[$_], $b->[$_];
1075 }
1076
1077 } elsif ($a ne $b) {
1078 return 0;
1079 }
1080
1081 1
1082}
1083
1084our $SLOW_MERGES;#d#
967sub _can_merge { 1085sub _can_merge {
968 my ($ob1, $ob2) = @_; 1086 my ($ob1, $ob2) = @_;
969 1087
970 local $Storable::canonical = 1; 1088 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1089
974 $fob1 eq $fob2 1090 # we do the slow way here
1091 return _object_equal $ob1, $ob2
975} 1092}
976 1093
977sub reattach { 1094sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1095 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1096 my ($obj) = @_;
980 1097
1098 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1099 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1100
983 my $registry = $obj->registry; 1101 my $registry = $obj->registry;
984 1102
985 @$registry = (); 1103 @$registry = ();
986 1104
1001cf::attachable->attach ( 1119cf::attachable->attach (
1002 prio => -1000000, 1120 prio => -1000000,
1003 on_instantiate => sub { 1121 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1122 my ($obj, $data) = @_;
1005 1123
1006 $data = from_json $data; 1124 $data = decode_json $data;
1007 1125
1008 for (@$data) { 1126 for (@$data) {
1009 my ($name, $args) = @$_; 1127 my ($name, $args) = @$_;
1010 1128
1011 $obj->attach ($name, %{$args || {} }); 1129 $obj->attach ($name, %{$args || {} });
1024 }, 1142 },
1025); 1143);
1026 1144
1027sub object_freezer_save { 1145sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1146 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1147
1032 sync_job { 1148 sync_job {
1033 if (length $$rdata) { 1149 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1150 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1151 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1037 1153
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1157 if ($cf::USE_FSYNC) {
1158 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1159 aio_fsync $fh;
1160 }
1042 close $fh; 1161 aio_close $fh;
1043 1162
1044 if (@$objs) { 1163 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1164 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1165 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1168 if ($cf::USE_FSYNC) {
1169 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1170 aio_fsync $fh;
1171 }
1050 close $fh; 1172 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1174 }
1053 } else { 1175 } else {
1054 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1055 } 1177 }
1056 1178
1057 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1183 } else {
1059 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1060 } 1185 }
1061 } else { 1186 } else {
1062 aio_unlink $filename; 1187 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1064 } 1189 }
1065 }; 1190 };
1066
1067 undef $guard;
1068} 1191}
1069 1192
1070sub object_freezer_as_string { 1193sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1194 my ($rdata, $objs) = @_;
1072 1195
1077 1200
1078sub object_thawer_load { 1201sub object_thawer_load {
1079 my ($filename) = @_; 1202 my ($filename) = @_;
1080 1203
1081 my ($data, $av); 1204 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1205
1085 (aio_load $filename, $data) >= 0 1206 (aio_load $filename, $data) >= 0
1086 or return; 1207 or return;
1087 1208
1088 unless (aio_stat "$filename.pst") { 1209 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1210 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1211 or return;
1091 1212
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1213 my $st = eval { Coro::Storable::thaw $av };
1214 $av = $st->{objs};
1094 } 1215 }
1095 1216
1096 utf8::decode (my $decname = $filename); 1217 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1218 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1219 $decname, length $data, scalar @{$av || []};
1159 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1160 1281
1161 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1162} 1283}
1163 1284
1285use File::Glob ();
1286
1164cf::player->attach ( 1287cf::player->attach (
1165 on_command => sub { 1288 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1167 1290
1168 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
1200 1323
1201 cf::override; 1324 cf::override;
1202 }, 1325 },
1203); 1326);
1204 1327
1328# "readahead" all extensions
1329sub cache_extensions {
1330 my $grp = IO::AIO::aio_group;
1331
1332 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1333 for (grep /\.ext$/, @{$_[0]}) {
1334 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1335 }
1336 };
1337
1338 $grp
1339}
1340
1205sub load_extensions { 1341sub load_extensions {
1206 cf::sync_job { 1342 cf::sync_job {
1207 my %todo; 1343 my %todo;
1208 1344
1209 for my $path (<$LIBDIR/*.ext>) { 1345 for my $path (<$LIBDIR/*.ext>) {
1228 1364
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1367
1232 $ext{source} = 1368 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1370 . "#line 1 \"$path\"\n{\n"
1235 . $source 1371 . $source
1236 . "\n};\n1"; 1372 . "\n};\n1";
1237 1373
1238 $todo{$base} = \%ext; 1374 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1390 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1391 : "$v->{base}: extension inactive.\n";
1256 1392
1257 if (exists $v->{meta}{mandatory}) { 1393 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1394 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1395 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1396 }
1262 1397
1263 warn $msg; 1398 warn $msg;
1264 } 1399 }
1265 1400
1279 1414
1280=back 1415=back
1281 1416
1282=head2 CORE EXTENSIONS 1417=head2 CORE EXTENSIONS
1283 1418
1284Functions and methods that extend core crossfire objects. 1419Functions and methods that extend core deliantra objects.
1285 1420
1286=cut 1421=cut
1287 1422
1288package cf::player; 1423package cf::player;
1289 1424
1332 1467
1333sub exists($) { 1468sub exists($) {
1334 my ($login) = @_; 1469 my ($login) = @_;
1335 1470
1336 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1338} 1473}
1339 1474
1340sub find($) { 1475sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1477 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1487 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1488
1354 my $f = new_from_file cf::object::thawer path $login 1489 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1490 or return;
1356 1491
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1492 my $pl = cf::player::load_pl $f
1359 or return; 1493 or return;
1494
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1495 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1496 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1497 $cf::PLAYER{$login} = $pl
1363 } 1498 }
1364 } 1499 }
1374 1509
1375 return if $pl->{deny_save}; 1510 return if $pl->{deny_save};
1376 1511
1377 aio_mkdir playerdir $pl, 0770; 1512 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1513 $pl->{last_save} = $cf::RUNTIME;
1514
1515 cf::get_slot 0.01;
1379 1516
1380 $pl->save_pl ($path); 1517 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1518 cf::cede_to_tick;
1382} 1519}
1383 1520
1415 my ($pl) = @_; 1552 my ($pl) = @_;
1416 1553
1417 my $name = $pl->ob->name; 1554 my $name = $pl->ob->name;
1418 1555
1419 $pl->{deny_save} = 1; 1556 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1557 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1558
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1560 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1563 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1564 $pl->ns->destroy if $pl->ns;
1426 1565
1427 my $path = playerdir $pl; 1566 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1567 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1606
1468 for my $login (@$dirs) { 1607 for my $login (@$dirs) {
1469 my $path = path $login; 1608 my $path = path $login;
1470 1609
1471 # a .pst is a dead give-away for a valid player 1610 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1611 # if no pst file found, open and chekc for blocked users
1612 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1613 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1614 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1615 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1616 }
1477 1617
1508 } 1648 }
1509 1649
1510 \@paths 1650 \@paths
1511} 1651}
1512 1652
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1653=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1654
1515Expand crossfire pod fragments into protocol xml. 1655Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1656
1564=item $player->ext_reply ($msgid, @msg) 1657=item $player->ext_reply ($msgid, @msg)
1565 1658
1566Sends an ext reply to the player. 1659Sends an ext reply to the player.
1567 1660
1634our $MAX_RESET = 3600; 1727our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1728our $DEFAULT_RESET = 3000;
1636 1729
1637sub generate_random_map { 1730sub generate_random_map {
1638 my ($self, $rmp) = @_; 1731 my ($self, $rmp) = @_;
1732
1733 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1734
1639 # mit "rum" bekleckern, nicht 1735 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1736 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1861
1766# the temporary/swap location 1862# the temporary/swap location
1767sub save_path { 1863sub save_path {
1768 my ($self) = @_; 1864 my ($self) = @_;
1769 1865
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1867 "$TMPDIR/$path.map"
1772} 1868}
1773 1869
1774# the unique path, undef == no special unique path 1870# the unique path, undef == no special unique path
1775sub uniq_path { 1871sub uniq_path {
1776 my ($self) = @_; 1872 my ($self) = @_;
1777 1873
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1780}
1781
1782# and all this just because we cannot iterate over
1783# all maps in C++...
1784sub change_all_map_light {
1785 my ($change) = @_;
1786
1787 $_->change_map_light ($change)
1788 for grep $_->outdoor, values %cf::MAP;
1789} 1876}
1790 1877
1791sub decay_objects { 1878sub decay_objects {
1792 my ($self) = @_; 1879 my ($self) = @_;
1793 1880
1877sub find { 1964sub find {
1878 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
1879 1966
1880 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
1881 1968
1882 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1971
1885 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
1890 or return; 1974 or return;
1891 1975
1892 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
1893 1977
1895 or return; 1979 or return;
1896 1980
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1981 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 1982 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 1983 #$cf::WAIT_FOR_TICK->wait;
1984 undef $guard2;
1900 undef $guard1; 1985 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 1986 $map->reset;
1903 return find $path; 1987 return find $path;
1904 } 1988 }
1905 1989
1906 $cf::MAP{$path} = $map 1990 $cf::MAP{$path} = $map
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2017 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2018 $f->skip_block;
1935 $self->_load_objects ($f) 2019 $self->_load_objects ($f)
1936 or return; 2020 or return;
1937 2021
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2022 $self->post_load_original
1939 if delete $self->{load_original}; 2023 if delete $self->{load_original};
1940 2024
1941 if (my $uniq = $self->uniq_path) { 2025 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2026 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2027 unless (aio_stat $uniq) {
1961 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
1962 $self->decay_objects; 2046 $self->decay_objects;
1963 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
1964 $self->update_buttons; 2048 $self->update_buttons;
1965 cf::cede_to_tick; 2049 cf::cede_to_tick;
1966 $self->set_darkness_map;
1967 cf::cede_to_tick;
1968 $self->activate; 2050 $self->activate;
1969 } 2051 }
1970 2052
1971 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
1973 2055
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2057 }
1976 2058
1977 $self->post_load; 2059 $self->post_load;
1978} 2060}
1979 2061
2037 my ($path, $origin, $load) = @_; 2119 my ($path, $origin, $load) = @_;
2038 2120
2039 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
2040 2122
2041 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2125 }
2044 2126
2045 $MAP_PREFETCH{$path} |= $load; 2127 $MAP_PREFETCH{$path} |= $load;
2046 2128
2047 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2130 $Coro::current->{desc} = "map prefetcher";
2131
2048 while (%MAP_PREFETCH) { 2132 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2133 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2134 if (my $map = find $k) {
2051 $map->load if $v; 2135 $map->load if $v;
2052 } 2136 }
2078 return if $self->{deny_save}; 2162 return if $self->{deny_save};
2079 2163
2080 local $self->{last_access} = $self->last_access;#d# 2164 local $self->{last_access} = $self->last_access;#d#
2081 2165
2082 cf::async { 2166 cf::async {
2167 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
2084 }; 2169 };
2170
2171 cf::get_slot 0.02;
2085 2172
2086 if ($uniq) { 2173 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2176 } else {
2098 $self->save; 2185 $self->save;
2099 2186
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2188
2102 return if $self->players; 2189 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2191 return if $self->{deny_save};
2105 2192
2106 $self->in_memory (cf::MAP_SWAPPED); 2193 $self->in_memory (cf::MAP_SWAPPED);
2107 2194
2108 $self->deactivate; 2195 $self->deactivate;
2133 2220
2134 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2135 2222
2136 return if $self->players; 2223 return if $self->players;
2137 2224
2138 warn "resetting map ", $self->path; 2225 warn "resetting map ", $self->path, "\n";
2139 2226
2140 $self->in_memory (cf::MAP_SWAPPED); 2227 $self->in_memory (cf::MAP_SWAPPED);
2141 2228
2142 # need to save uniques path 2229 # need to save uniques path
2143 unless ($self->{deny_save}) { 2230 unless ($self->{deny_save}) {
2226 2313
2227sub unique_maps() { 2314sub unique_maps() {
2228 [ 2315 [
2229 map { 2316 map {
2230 utf8::decode $_; 2317 utf8::decode $_;
2231 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2232 ? normalise $_ 2321 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2323 ]
2236} 2324}
2237 2325
2238package cf;
2239
2240=back 2326=back
2241 2327
2242=head3 cf::object 2328=head3 cf::object
2243 2329
2244=cut 2330=cut
2247 2333
2248=over 4 2334=over 4
2249 2335
2250=item $ob->inv_recursive 2336=item $ob->inv_recursive
2251 2337
2252Returns the inventory of the object _and_ their inventories, recursively. 2338Returns the inventory of the object I<and> their inventories, recursively,
2339but I<not> the object itself.
2253 2340
2254=cut 2341=cut
2255 2342
2256sub inv_recursive_; 2343sub inv_recursive_;
2257sub inv_recursive_ { 2344sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2263} 2350}
2264 2351
2265=item $ref = $ob->ref 2352=item $ref = $ob->ref
2266 2353
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2354Creates and returns a persistent reference to an object that can be stored as a string.
2268 2355
2269=item $ob = cf::object::deref ($refstring) 2356=item $ob = cf::object::deref ($refstring)
2270 2357
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2358returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2359even if the object actually exists. May block.
2274=cut 2361=cut
2275 2362
2276sub deref { 2363sub deref {
2277 my ($ref) = @_; 2364 my ($ref) = @_;
2278 2365
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2366 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2367 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2368 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2369 or return;
2286 $pl->ob->uuid eq $uuid 2370 $pl->ob->uuid eq $uuid
2287 or return; 2371 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2391can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2392dialogue with the given NPC character.
2309 2393
2310=cut 2394=cut
2311 2395
2396our $SAY_CHANNEL = {
2397 id => "say",
2398 title => "Map",
2399 reply => "say ",
2400 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2401};
2402
2403our $CHAT_CHANNEL = {
2404 id => "chat",
2405 title => "Chat",
2406 reply => "chat ",
2407 tooltip => "Player chat and shouts, global to the server.",
2408};
2409
2312# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2411# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2412#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2427
2330 } else { 2428 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2431 }
2334 } 2432 }
2335} 2433}
2336 2434
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2460
2363=item $player_object->enter_link 2461=item $player_object->enter_link
2364 2462
2365Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2366 2464
2367The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2369 2469
2370Will never block. 2470Will never block.
2371 2471
2372=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2373 2473
2431 2531
2432 $map->load; 2532 $map->load;
2433 $map->load_neighbours; 2533 $map->load_neighbours;
2434 2534
2435 return unless $self->contr->active; 2535 return unless $self->contr->active;
2436 $self->activate_recursive;
2437 2536
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2538 $self->enter_map ($map, $x, $y);
2539
2540 # only activate afterwards, to support waiting in hooks
2541 $self->activate_recursive;
2440} 2542}
2441 2543
2442=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2443 2545
2444Moves the player to the given map-path and coordinates by first freezing 2546Moves the player to the given map-path and coordinates by first freezing
2445her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2548that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2549the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2550be called at the end of this process.
2449 2551
2552Note that $check will be called with a potentially non-loaded map, so if
2553it needs a loaded map it has to call C<< ->load >>.
2554
2450=cut 2555=cut
2451 2556
2452our $GOTOGEN; 2557our $GOTOGEN;
2453 2558
2454sub cf::object::player::goto { 2559sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2563 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2564
2460 $self->enter_link; 2565 $self->enter_link;
2461 2566
2462 (async { 2567 (async {
2568 $Coro::current->{desc} = "player::goto $path $x $y";
2569
2463 # *tag paths override both path and x|y 2570 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2571 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2572 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2573 my $ob = $obs[rand @obs];
2467 2574
2468 # see if we actually can go there 2575 # see if we actually can go there
2469 # todo: use ob_blocked to check all tiles of the destination "object" 2576 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 # for suitability. 2577 $ob = $obs[rand @obs];
2578 } else {
2579 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2580 }
2581 # else put us there anyways for now #d#
2471 2582
2472 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2583 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2584 } else {
2585 ($path, $x, $y) = (undef, undef, undef);
2473 } 2586 }
2474 } 2587 }
2475 2588
2476 my $map = eval { 2589 my $map = eval {
2477 my $map = cf::map::find $path; 2590 my $map = defined $path ? cf::map::find $path : undef;
2478 2591
2479 if ($map) { 2592 if ($map) {
2480 $map = $map->customise_for ($self); 2593 $map = $map->customise_for ($self);
2481 $map = $check->($map) if $check && $map; 2594 $map = $check->($map) if $check && $map;
2482 } else { 2595 } else {
2483 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2596 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2484 } 2597 }
2485 2598
2486 $map 2599 $map
2487 }; 2600 };
2488 2601
2524} 2637}
2525 2638
2526sub prepare_random_map { 2639sub prepare_random_map {
2527 my ($exit) = @_; 2640 my ($exit) = @_;
2528 2641
2529 my $guard = cf::lock_acquire "exit_prepare:$exit";
2530
2531 # all this does is basically replace the /! path by 2642 # all this does is basically replace the /! path by
2532 # a new random map path (?random/...) with a seed 2643 # a new random map path (?random/...) with a seed
2533 # that depends on the exit object 2644 # that depends on the exit object
2534 2645
2535 my $rmp = parse_random_map_params $exit->msg; 2646 my $rmp = parse_random_map_params $exit->msg;
2537 if ($exit->map) { 2648 if ($exit->map) {
2538 $rmp->{region} = $exit->region->name; 2649 $rmp->{region} = $exit->region->name;
2539 $rmp->{origin_map} = $exit->map->path; 2650 $rmp->{origin_map} = $exit->map->path;
2540 $rmp->{origin_x} = $exit->x; 2651 $rmp->{origin_x} = $exit->x;
2541 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2653
2654 $exit->map->touch;
2542 } 2655 }
2543 2656
2544 $rmp->{random_seed} ||= $exit->random_seed; 2657 $rmp->{random_seed} ||= $exit->random_seed;
2545 2658
2546 my $data = cf::to_json $rmp; 2659 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2547 my $md5 = Digest::MD5::md5_hex $data; 2660 my $md5 = Digest::MD5::md5_hex $data;
2548 my $meta = "$RANDOMDIR/$md5.meta"; 2661 my $meta = "$RANDOMDIR/$md5.meta";
2549 2662
2550 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2663 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2551 aio_write $fh, 0, (length $data), $data, 0; 2664 aio_write $fh, 0, (length $data), $data, 0;
2552 undef $fh; 2665 undef $fh;
2553 aio_rename "$meta~", $meta; 2666 aio_rename "$meta~", $meta;
2554 2667
2668 my $slaying = "?random/$md5";
2669
2670 if ($exit->valid) {
2555 $exit->slaying ("?random/$md5"); 2671 $exit->slaying ("?random/$md5");
2556 $exit->msg (undef); 2672 $exit->msg (undef);
2673 }
2557 } 2674 }
2558} 2675}
2559 2676
2560sub cf::object::player::enter_exit { 2677sub cf::object::player::enter_exit {
2561 my ($self, $exit) = @_; 2678 my ($self, $exit) = @_;
2562 2679
2563 return unless $self->type == cf::PLAYER; 2680 return unless $self->type == cf::PLAYER;
2564 2681
2565 if ($exit->slaying eq "/!") {
2566 #TODO: this should de-fi-ni-te-ly not be a sync-job
2567 # the problem is that $exit might not survive long enough
2568 # so it needs to be done right now, right here
2569 cf::sync_job { prepare_random_map $exit };
2570 }
2571
2572 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2573 my $hp = $exit->stats->hp;
2574 my $sp = $exit->stats->sp;
2575
2576 $self->enter_link; 2682 $self->enter_link;
2577 2683
2578 # if exit is damned, update players death & WoR home-position
2579 $self->contr->savebed ($slaying, $hp, $sp)
2580 if $exit->flag (FLAG_DAMNED);
2581
2582 (async { 2684 (async {
2583 $self->deactivate_recursive; # just to be sure 2685 $Coro::current->{desc} = "enter_exit";
2686
2584 unless (eval { 2687 unless (eval {
2688 $self->deactivate_recursive; # just to be sure
2689
2690 # random map handling
2691 {
2692 my $guard = cf::lock_acquire "exit_prepare:$exit";
2693
2694 prepare_random_map $exit
2695 if $exit->slaying eq "/!";
2696 }
2697
2698 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2699 my $x = $exit->stats->hp;
2700 my $y = $exit->stats->sp;
2701
2585 $self->goto ($slaying, $hp, $sp); 2702 $self->goto ($map, $x, $y);
2586 2703
2704 # if exit is damned, update players death & WoR home-position
2705 $self->contr->savebed ($map, $x, $y)
2706 if $exit->flag (cf::FLAG_DAMNED);
2707
2587 1; 2708 1
2588 }) { 2709 }) {
2589 $self->message ("Something went wrong deep within the crossfire server. " 2710 $self->message ("Something went wrong deep within the deliantra server. "
2590 . "I'll try to bring you back to the map you were before. " 2711 . "I'll try to bring you back to the map you were before. "
2591 . "Please report this to the dungeon master!", 2712 . "Please report this to the dungeon master!",
2592 cf::NDI_UNIQUE | cf::NDI_RED); 2713 cf::NDI_UNIQUE | cf::NDI_RED);
2593 2714
2594 warn "ERROR in enter_exit: $@"; 2715 warn "ERROR in enter_exit: $@";
2622the message, with C<log> being the default. If C<$color> is negative, suppress 2743the message, with C<log> being the default. If C<$color> is negative, suppress
2623the message unless the client supports the msg packet. 2744the message unless the client supports the msg packet.
2624 2745
2625=cut 2746=cut
2626 2747
2748# non-persistent channels (usually the info channel)
2627our %CHANNEL = ( 2749our %CHANNEL = (
2628 "c/identify" => { 2750 "c/identify" => {
2629 id => "identify", 2751 id => "infobox",
2630 title => "Identify", 2752 title => "Identify",
2631 reply => undef, 2753 reply => undef,
2632 tooltip => "Items recently identified", 2754 tooltip => "Items recently identified",
2633 }, 2755 },
2634 "c/examine" => { 2756 "c/examine" => {
2635 id => "examine", 2757 id => "infobox",
2636 title => "Examine", 2758 title => "Examine",
2637 reply => undef, 2759 reply => undef,
2638 tooltip => "Signs and other items you examined", 2760 tooltip => "Signs and other items you examined",
2639 }, 2761 },
2762 "c/book" => {
2763 id => "infobox",
2764 title => "Book",
2765 reply => undef,
2766 tooltip => "The contents of a note or book",
2767 },
2768 "c/lookat" => {
2769 id => "infobox",
2770 title => "Look",
2771 reply => undef,
2772 tooltip => "What you saw there",
2773 },
2774 "c/who" => {
2775 id => "infobox",
2776 title => "Players",
2777 reply => undef,
2778 tooltip => "Shows players who are currently online",
2779 },
2780 "c/body" => {
2781 id => "infobox",
2782 title => "Body Parts",
2783 reply => undef,
2784 tooltip => "Shows which body parts you posess and are available",
2785 },
2786 "c/statistics" => {
2787 id => "infobox",
2788 title => "Statistics",
2789 reply => undef,
2790 tooltip => "Shows your primary statistics",
2791 },
2792 "c/skills" => {
2793 id => "infobox",
2794 title => "Skills",
2795 reply => undef,
2796 tooltip => "Shows your experience per skill and item power",
2797 },
2798 "c/shopitems" => {
2799 id => "infobox",
2800 title => "Shop Items",
2801 reply => undef,
2802 tooltip => "Shows the items currently for sale in this shop",
2803 },
2804 "c/resistances" => {
2805 id => "infobox",
2806 title => "Resistances",
2807 reply => undef,
2808 tooltip => "Shows your resistances",
2809 },
2810 "c/pets" => {
2811 id => "infobox",
2812 title => "Pets",
2813 reply => undef,
2814 tooltip => "Shows information abotu your pets/a specific pet",
2815 },
2816 "c/perceiveself" => {
2817 id => "infobox",
2818 title => "Perceive Self",
2819 reply => undef,
2820 tooltip => "You gained detailed knowledge about yourself",
2821 },
2822 "c/uptime" => {
2823 id => "infobox",
2824 title => "Uptime",
2825 reply => undef,
2826 tooltip => "How long the server has been running since last restart",
2827 },
2828 "c/mapinfo" => {
2829 id => "infobox",
2830 title => "Map Info",
2831 reply => undef,
2832 tooltip => "Information related to the maps",
2833 },
2834 "c/party" => {
2835 id => "party",
2836 title => "Party",
2837 reply => "gsay ",
2838 tooltip => "Messages and chat related to your party",
2839 },
2840 "c/death" => {
2841 id => "death",
2842 title => "Death",
2843 reply => undef,
2844 tooltip => "Reason for and more info about your most recent death",
2845 },
2846 "c/say" => $SAY_CHANNEL,
2847 "c/chat" => $CHAT_CHANNEL,
2640); 2848);
2641 2849
2642sub cf::client::send_msg { 2850sub cf::client::send_msg {
2643 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2644 2852
2645 $msg = $self->pl->expand_cfpod ($msg); 2853 $msg = $self->pl->expand_cfpod ($msg)
2854 unless $color & cf::NDI_VERBATIM;
2646 2855
2647 $color &= cf::NDI_CLIENT_MASK; # just in case... 2856 $color &= cf::NDI_CLIENT_MASK; # just in case...
2648 2857
2649 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2650 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2859 if ($CHANNEL{$channel}) {
2860 $channel = $CHANNEL{$channel};
2651 2861
2862 $self->ext_msg (channel_info => $channel);
2863 $channel = $channel->{id};
2864
2652 if (ref $channel) { 2865 } elsif (ref $channel) {
2653 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2654 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2655 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2656 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2657 if $self->can_msg;
2658 } 2870 }
2659 2871
2660 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2661 } 2873 }
2662 2874
2663 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2664 2876
2665 if ($self->can_msg) {
2666 # default colour, mask it out 2877 # default colour, mask it out
2667 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2668 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2669 2880
2670 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2881 my $pkt = "msg "
2882 . $self->{json_coder}->encode (
2671 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2672 } else { 2884 );
2673 if ($color >= 0) {
2674 # replace some tags by gcfclient-compatible ones
2675 for ($msg) {
2676 1 while
2677 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2678 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2679 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2680 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2681 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2682 }
2683 2885
2684 $color &= cf::NDI_COLOR_MASK; 2886 # try lzf for large packets
2887 $pkt = "lzf " . Compress::LZF::compress $pkt
2888 if 1024 <= length $pkt and $self->{can_lzf};
2685 2889
2686 utf8::encode $msg; 2890 # split very large packets
2687 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2688 if (0 && $msg =~ /\[/) { 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2689 # COMMAND/INFO 2893 $pkt = "frag";
2690 $self->send_packet ("drawextinfo $color 10 8 $msg")
2691 } else {
2692 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2693 $self->send_packet ("drawinfo $color $msg")
2694 }
2695 }
2696 } 2894 }
2895
2896 $self->send_packet ($pkt);
2697} 2897}
2698 2898
2699=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2700 2900
2701Sends an ext event to the client. 2901Sends an ext event to the client.
2874=pod 3074=pod
2875 3075
2876The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
2877 3077
2878 cf::object 3078 cf::object
2879 contr pay_amount pay_player map x y force_find force_add 3079 contr pay_amount pay_player map x y force_find force_add destroy
2880 insert remove name archname title slaying race decrease_ob_nr 3080 insert remove name archname title slaying race decrease split
3081 value
2881 3082
2882 cf::object::player 3083 cf::object::player
2883 player 3084 player
2884 3085
2885 cf::player 3086 cf::player
2890 3091
2891=cut 3092=cut
2892 3093
2893for ( 3094for (
2894 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3095 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2895 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
2896 decrease_ob_nr)], 3097 decrease split destroy change_exp value msg lore send_msg)],
2897 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2898 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
2899 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2900) { 3101) {
2901 no strict 'refs'; 3102 no strict 'refs';
2902 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
2903 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2920 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
2921 3122
2922 my $qcode = $code; 3123 my $qcode = $code;
2923 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2924 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
2925 3128
2926 local $_; 3129 local $_;
2927 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
2928 3131
2929 my $eval = 3132 my $eval =
3006 { 3209 {
3007 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3008 3211
3009 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3010 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3011 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3012 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3013 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3014 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3015 3219
3016 cf::cede_to_tick; 3220 cf::cede_to_tick;
3017 } 3221 }
3018 3222
3019 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3020 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3021 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3022 or next; 3227 or next;
3228
3023 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3024 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3025 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3026 } else { 3232 } else {
3027 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
3045 { 3251 {
3046 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3047 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3048 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3049 3255
3050 my $soundconf = delete $res->{"res/sound.conf"};
3051
3052 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3053 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3054 my $data; 3259 my $data;
3055 3260
3056 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3057 # prepend meta info 3262 # prepend meta info
3058 3263
3059 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3060 name => $name, 3265 name => $name,
3061 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3062 }); 3267 });
3063 3268
3064 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3065 } else { 3276 } else {
3066 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3067 } 3278 }
3068 3279
3069 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3070 cf::face::set_type $idx, $info->{type};
3071
3072 cf::cede_to_tick; 3280 cf::cede_to_tick;
3073 } 3281 }
3074
3075 if ($soundconf) {
3076 $soundconf = $enc->decode (delete $soundconf->{data});
3077
3078 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3079 my $sound = $soundconf->{compat}[$_]
3080 or next;
3081
3082 my $face = cf::face::find "sound/$sound->[1]";
3083 cf::sound::set $sound->[0] => $face;
3084 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3085 }
3086
3087 while (my ($k, $v) = each %{$soundconf->{event}}) {
3088 my $face = cf::face::find "sound/$v";
3089 cf::sound::set $k => $face;
3090 }
3091 }
3092 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3093 3285
3094 1 3286 1
3095} 3287}
3288
3289cf::global->attach (on_resource_update => sub {
3290 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3291 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3292
3293 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3294 my $sound = $soundconf->{compat}[$_]
3295 or next;
3296
3297 my $face = cf::face::find "sound/$sound->[1]";
3298 cf::sound::set $sound->[0] => $face;
3299 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3300 }
3301
3302 while (my ($k, $v) = each %{$soundconf->{event}}) {
3303 my $face = cf::face::find "sound/$v";
3304 cf::sound::set $k => $face;
3305 }
3306 }
3307});
3096 3308
3097register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3098 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3099 3311
3100 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3101 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3102 } 3314 }
3103}; 3315};
3316
3317sub load_resource_file($) {
3318 my $guard = lock_acquire "load_resource_file";
3319
3320 my $status = load_resource_file_ $_[0];
3321 get_slot 0.1, 100;
3322 cf::arch::commit_load;
3323
3324 $status
3325}
3104 3326
3105sub reload_regions { 3327sub reload_regions {
3106 # HACK to clear player env face cache, we need some signal framework 3328 # HACK to clear player env face cache, we need some signal framework
3107 # for this (global event?) 3329 # for this (global event?)
3108 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3122} 3344}
3123 3345
3124sub reload_archetypes { 3346sub reload_archetypes {
3125 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3126 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3127 #d# NEED to laod twice to resolve forward references
3128 # this really needs to be done in an extra post-pass
3129 # (which needs to be synchronous, so solve it differently)
3130 load_resource_file "$DATADIR/archetypes"
3131 or die "unable to load archetypes\n";
3132} 3349}
3133 3350
3134sub reload_treasures { 3351sub reload_treasures {
3135 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3136 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3137} 3354}
3138 3355
3139sub reload_resources { 3356sub reload_resources {
3140 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3141 3358
3359 reload_facedata;
3360 reload_archetypes;
3142 reload_regions; 3361 reload_regions;
3143 reload_facedata;
3144 #reload_archetypes;#d#
3145 reload_archetypes;
3146 reload_treasures; 3362 reload_treasures;
3147 3363
3148 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3149}
3150
3151sub init {
3152 reload_resources;
3153} 3365}
3154 3366
3155sub reload_config { 3367sub reload_config {
3156 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3157 or return; 3369 or return;
3158 3370
3159 local $/; 3371 local $/;
3160 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
3161 3373
3162 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3163 3375
3164 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3376 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3165 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3377 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3171 }; 3383 };
3172 warn $@ if $@; 3384 warn $@ if $@;
3173 } 3385 }
3174} 3386}
3175 3387
3388sub pidfile() {
3389 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3390 or die "$PIDFILE: $!";
3391 flock $fh, &Fcntl::LOCK_EX
3392 or die "$PIDFILE: flock: $!";
3393 $fh
3394}
3395
3396# make sure only one server instance is running at any one time
3397sub atomic {
3398 my $fh = pidfile;
3399
3400 my $pid = <$fh>;
3401 kill 9, $pid if $pid > 0;
3402
3403 seek $fh, 0, 0;
3404 print $fh $$;
3405}
3406
3407sub main_loop {
3408 warn "EV::loop starting\n";
3409 if (1) {
3410 EV::loop;
3411 }
3412 warn "EV::loop returned\n";
3413 goto &main_loop unless $REALLY_UNLOOP;
3414}
3415
3176sub main { 3416sub main {
3417 cf::init_globals; # initialise logging
3418
3419 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3420 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3421 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3422 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3423
3424 cf::init_experience;
3425 cf::init_anim;
3426 cf::init_attackmess;
3427 cf::init_dynamic;
3428
3429 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3430
3177 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3178 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3179 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3180 (async { 3434 (async {
3181 Event::one_event; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT;
3182 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3183 }; 3438 };
3184 3439
3440 evthread_start IO::AIO::poll_fileno;
3441
3442 cf::sync_job {
3443 reload_resources;
3185 reload_config; 3444 reload_config;
3186 db_init; 3445 db_init;
3446
3447 cf::load_settings;
3448 cf::load_materials;
3449 cf::init_uuid;
3450 cf::init_signals;
3451 cf::init_commands;
3452 cf::init_skills;
3453
3454 cf::init_beforeplay;
3455
3456 atomic;
3457
3187 load_extensions; 3458 load_extensions;
3188 3459
3189 $TICK_WATCHER->start; 3460 utime time, time, $RUNTIMEFILE;
3190 Event::loop; 3461
3462 # no (long-running) fork's whatsoever before this point(!)
3463 use POSIX ();
3464 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3465
3466 (pop @POST_INIT)->(0) while @POST_INIT;
3467 };
3468
3469 main_loop;
3191} 3470}
3192 3471
3193############################################################################# 3472#############################################################################
3194# initialisation and cleanup 3473# initialisation and cleanup
3195 3474
3196# install some emergency cleanup handlers 3475# install some emergency cleanup handlers
3197BEGIN { 3476BEGIN {
3477 our %SIGWATCHER = ();
3198 for my $signal (qw(INT HUP TERM)) { 3478 for my $signal (qw(INT HUP TERM)) {
3199 Event->signal ( 3479 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3200 reentrant => 0,
3201 data => WF_AUTOCANCEL,
3202 signal => $signal,
3203 prio => 0,
3204 cb => sub {
3205 cf::cleanup "SIG$signal"; 3480 cf::cleanup "SIG$signal";
3206 },
3207 ); 3481 };
3208 } 3482 }
3209} 3483}
3210 3484
3211sub write_runtime { 3485sub write_runtime_sync {
3212 my $runtime = "$LOCALDIR/runtime";
3213
3214 # first touch the runtime file to show we are still running: 3486 # first touch the runtime file to show we are still running:
3215 # the fsync below can take a very very long time. 3487 # the fsync below can take a very very long time.
3216 3488
3217 IO::AIO::aio_utime $runtime, undef, undef; 3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3218 3490
3219 my $guard = cf::lock_acquire "write_runtime"; 3491 my $guard = cf::lock_acquire "write_runtime";
3220 3492
3221 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3222 or return; 3494 or return;
3223 3495
3224 my $value = $cf::RUNTIME + 90 + 10; 3496 my $value = $cf::RUNTIME + 90 + 10;
3225 # 10 is the runtime save interval, for a monotonic clock 3497 # 10 is the runtime save interval, for a monotonic clock
3226 # 60 allows for the watchdog to kill the server. 3498 # 60 allows for the watchdog to kill the server.
3236 aio_utime $fh, undef, undef; 3508 aio_utime $fh, undef, undef;
3237 3509
3238 close $fh 3510 close $fh
3239 or return; 3511 or return;
3240 3512
3241 aio_rename "$runtime~", $runtime 3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3242 and return; 3514 and return;
3243 3515
3244 warn "runtime file written.\n"; 3516 warn "runtime file written.\n";
3245 3517
3246 1 3518 1
3519}
3520
3521our $uuid_lock;
3522our $uuid_skip;
3523
3524sub write_uuid_sync($) {
3525 $uuid_skip ||= $_[0];
3526
3527 return if $uuid_lock;
3528 local $uuid_lock = 1;
3529
3530 my $uuid = "$LOCALDIR/uuid";
3531
3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3533 or return;
3534
3535 my $value = uuid_seq uuid_cur;
3536
3537 unless ($value) {
3538 warn "cowardly refusing to write zero uuid value!\n";
3539 return;
3540 }
3541
3542 my $value = uuid_str $value + $uuid_skip;
3543 $uuid_skip = 0;
3544
3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3546 and return;
3547
3548 # always fsync - this file is important
3549 aio_fsync $fh
3550 and return;
3551
3552 close $fh
3553 or return;
3554
3555 aio_rename "$uuid~", $uuid
3556 and return;
3557
3558 warn "uuid file written ($value).\n";
3559
3560 1
3561
3562}
3563
3564sub write_uuid($$) {
3565 my ($skip, $sync) = @_;
3566
3567 $sync ? write_uuid_sync $skip
3568 : async { write_uuid_sync $skip };
3247} 3569}
3248 3570
3249sub emergency_save() { 3571sub emergency_save() {
3250 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3251 3573
3252 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3253 3575
3254 cf::sync_job { 3576 cf::sync_job {
3577 # this is a trade-off: we want to be very quick here, so
3578 # save all maps without fsync, and later call a global sync
3579 # (which in turn might be very very slow)
3580 local $USE_FSYNC = 0;
3581
3255 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3256 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3257 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3258 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3259 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3260 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3261 $pl->valid or next; 3588 $pl->valid or next;
3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3262 $pl->save; 3590 $pl->save;
3263 } 3591 }
3264 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3265 3593
3266 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3267 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3268 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3269 $map->valid or next; 3597 $map->valid or next;
3270 $map->save; 3598 $map->save;
3271 } 3599 }
3272 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3273 3601
3274 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3275 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3276 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3605
3606 warn "emergency_perl_save: begin write uuid\n";
3607 write_uuid_sync 1;
3608 warn "emergency_perl_save: end write uuid\n";
3277 }; 3609 };
3278 3610
3611 warn "emergency_perl_save: starting sync()\n";
3612 IO::AIO::aio_sync sub {
3613 warn "emergency_perl_save: finished sync()\n";
3614 };
3615
3279 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3280} 3617}
3281 3618
3282sub post_cleanup { 3619sub post_cleanup {
3283 my ($make_core) = @_; 3620 my ($make_core) = @_;
3284 3621
3285 warn Carp::longmess "post_cleanup backtrace" 3622 warn Carp::longmess "post_cleanup backtrace"
3286 if $make_core; 3623 if $make_core;
3624
3625 my $fh = pidfile;
3626 unlink $PIDFILE if <$fh> == $$;
3627}
3628
3629# a safer delete_package, copied from Symbol
3630sub clear_package($) {
3631 my $pkg = shift;
3632
3633 # expand to full symbol table name if needed
3634 unless ($pkg =~ /^main::.*::$/) {
3635 $pkg = "main$pkg" if $pkg =~ /^::/;
3636 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3637 $pkg .= '::' unless $pkg =~ /::$/;
3638 }
3639
3640 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3641 my $stem_symtab = *{$stem}{HASH};
3642
3643 defined $stem_symtab and exists $stem_symtab->{$leaf}
3644 or return;
3645
3646 # clear all symbols
3647 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3648 for my $name (keys %$leaf_symtab) {
3649 _gv_clear *{"$pkg$name"};
3650# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3651 }
3652 warn "cleared package $pkg\n";#d#
3287} 3653}
3288 3654
3289sub do_reload_perl() { 3655sub do_reload_perl() {
3290 # can/must only be called in main 3656 # can/must only be called in main
3291 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3292 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3293 return; 3659 return;
3294 } 3660 }
3295 3661
3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3665
3666 while ($RELOAD) {
3296 warn "reloading..."; 3667 warn "reloading...";
3297 3668
3298 warn "entering sync_job"; 3669 warn "entering sync_job";
3299 3670
3300 cf::sync_job { 3671 cf::sync_job {
3301 cf::write_runtime; # external watchdog should not bark 3672 cf::write_runtime_sync; # external watchdog should not bark
3302 cf::emergency_save; 3673 cf::emergency_save;
3303 cf::write_runtime; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3304 3675
3305 warn "syncing database to disk"; 3676 warn "syncing database to disk";
3306 BDB::db_env_txn_checkpoint $DB_ENV; 3677 BDB::db_env_txn_checkpoint $DB_ENV;
3307 3678
3308 # if anything goes wrong in here, we should simply crash as we already saved 3679 # if anything goes wrong in here, we should simply crash as we already saved
3309 3680
3310 warn "cancelling all WF_AUTOCANCEL watchers";
3311 for (Event::all_watchers) {
3312 $_->cancel if $_->data & WF_AUTOCANCEL;
3313 }
3314
3315 warn "flushing outstanding aio requests"; 3681 warn "flushing outstanding aio requests";
3316 for (;;) {
3317 BDB::flush;
3318 IO::AIO::flush;
3319 Coro::cede;
3320 last unless IO::AIO::nreqs || BDB::nreqs; 3682 while (IO::AIO::nreqs || BDB::nreqs) {
3321 warn "iterate..."; 3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3322 }
3323
3324 ++$RELOAD;
3325
3326 warn "cancelling all extension coros";
3327 $_->cancel for values %EXT_CORO;
3328 %EXT_CORO = ();
3329
3330 warn "removing commands";
3331 %COMMAND = ();
3332
3333 warn "removing ext/exti commands";
3334 %EXTCMD = ();
3335 %EXTICMD = ();
3336
3337 warn "unloading/nuking all extensions";
3338 for my $pkg (@EXTS) {
3339 warn "... unloading $pkg";
3340
3341 if (my $cb = $pkg->can ("unload")) {
3342 eval {
3343 $cb->($pkg);
3344 1
3345 } or warn "$pkg unloaded, but with errors: $@";
3346 } 3684 }
3347 3685
3348 warn "... nuking $pkg"; 3686 warn "cancelling all extension coros";
3349 Symbol::delete_package $pkg; 3687 $_->cancel for values %EXT_CORO;
3350 } 3688 %EXT_CORO = ();
3351 3689
3352 warn "unloading all perl modules loaded from $LIBDIR"; 3690 warn "removing commands";
3353 while (my ($k, $v) = each %INC) { 3691 %COMMAND = ();
3354 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3355 3692
3693 warn "removing ext/exti commands";
3694 %EXTCMD = ();
3695 %EXTICMD = ();
3696
3697 warn "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) {
3356 warn "... unloading $k"; 3699 warn "... unloading $pkg";
3357 delete $INC{$k};
3358 3700
3359 $k =~ s/\.pm$//;
3360 $k =~ s/\//::/g;
3361
3362 if (my $cb = $k->can ("unload_module")) { 3701 if (my $cb = $pkg->can ("unload")) {
3702 eval {
3363 $cb->(); 3703 $cb->($pkg);
3704 1
3705 } or warn "$pkg unloaded, but with errors: $@";
3706 }
3707
3708 warn "... clearing $pkg";
3709 clear_package $pkg;
3364 } 3710 }
3365 3711
3366 Symbol::delete_package $k; 3712 warn "unloading all perl modules loaded from $LIBDIR";
3713 while (my ($k, $v) = each %INC) {
3714 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3715
3716 warn "... unloading $k";
3717 delete $INC{$k};
3718
3719 $k =~ s/\.pm$//;
3720 $k =~ s/\//::/g;
3721
3722 if (my $cb = $k->can ("unload_module")) {
3723 $cb->();
3724 }
3725
3726 clear_package $k;
3367 } 3727 }
3368 3728
3369 warn "getting rid of safe::, as good as possible"; 3729 warn "getting rid of safe::, as good as possible";
3370 Symbol::delete_package "safe::$_" 3730 clear_package "safe::$_"
3371 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3731 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3372 3732
3373 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3374 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3375 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3376 3736
3377 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3378 # and global variables created in xs 3738 # and global variables created in xs
3379 #Symbol::delete_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3380 3740
3381 warn "unload completed, starting to reload now"; 3741 warn "unload completed, starting to reload now";
3382 3742
3383 warn "reloading cf.pm"; 3743 warn "reloading cf.pm";
3384 require cf; 3744 require cf;
3385 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3386 3746
3387 warn "loading config and database again"; 3747 warn "loading config and database again";
3388 cf::reload_config; 3748 cf::reload_config;
3389 3749
3390 warn "loading extensions"; 3750 warn "loading extensions";
3391 cf::load_extensions; 3751 cf::load_extensions;
3392 3752
3753 if ($REATTACH_ON_RELOAD) {
3393 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3394 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3395 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3396 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3397 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3398 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3399 3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764
3400 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3401 3766
3402 1 3767 1
3403 } or do { 3768 } or do {
3404 warn $@; 3769 warn $@;
3405 warn "error while reloading, exiting."; 3770 cf::cleanup "error while reloading, exiting.";
3406 exit 1;
3407 }; 3771 };
3408 3772
3409 warn "reloaded"; 3773 warn "reloaded";
3774 --$RELOAD;
3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3410}; 3779};
3411 3780
3412our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3413 3782
3414sub reload_perl() { 3783sub reload_perl() {
3415 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3416 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3417 3786
3418 $RELOAD_WATCHER ||= Event->timer ( 3787 $RELOAD_WATCHER ||= cf::async {
3419 reentrant => 0, 3788 Coro::AIO::aio_wait cache_extensions;
3420 after => 0, 3789
3421 data => WF_AUTOCANCEL, 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3422 cb => sub {
3423 do_reload_perl; 3791 do_reload_perl;
3424 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3425 }, 3793 };
3426 ); 3794 };
3427} 3795}
3428 3796
3429register_command "reload" => sub { 3797register_command "reload" => sub {
3430 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
3431 3799
3432 if ($who->flag (FLAG_WIZ)) { 3800 if ($who->flag (FLAG_WIZ)) {
3433 $who->message ("reloading server."); 3801 $who->message ("reloading server.");
3802 async {
3803 $Coro::current->{desc} = "perl_reload";
3434 async { reload_perl }; 3804 reload_perl;
3805 };
3435 } 3806 }
3436}; 3807};
3437 3808
3438unshift @INC, $LIBDIR; 3809unshift @INC, $LIBDIR;
3439 3810
3441 3812
3442our @WAIT_FOR_TICK; 3813our @WAIT_FOR_TICK;
3443our @WAIT_FOR_TICK_BEGIN; 3814our @WAIT_FOR_TICK_BEGIN;
3444 3815
3445sub wait_for_tick { 3816sub wait_for_tick {
3446 return unless $TICK_WATCHER->is_active;
3447 return if $Coro::current == $Coro::main; 3817 return if tick_inhibit || $Coro::current == $Coro::main;
3448 3818
3449 my $signal = new Coro::Signal; 3819 my $signal = new Coro::Signal;
3450 push @WAIT_FOR_TICK, $signal; 3820 push @WAIT_FOR_TICK, $signal;
3451 $signal->wait; 3821 $signal->wait;
3452} 3822}
3453 3823
3454sub wait_for_tick_begin { 3824sub wait_for_tick_begin {
3455 return unless $TICK_WATCHER->is_active;
3456 return if $Coro::current == $Coro::main; 3825 return if tick_inhibit || $Coro::current == $Coro::main;
3457 3826
3458 my $signal = new Coro::Signal; 3827 my $signal = new Coro::Signal;
3459 push @WAIT_FOR_TICK_BEGIN, $signal; 3828 push @WAIT_FOR_TICK_BEGIN, $signal;
3460 $signal->wait; 3829 $signal->wait;
3461} 3830}
3462 3831
3463our $stat_fh; 3832sub tick {
3464sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3465
3466$TICK_WATCHER = Event->timer (
3467 reentrant => 0,
3468 parked => 1,
3469 prio => 0,
3470 at => $NEXT_TICK || $TICK,
3471 data => WF_AUTOCANCEL,
3472 cb => sub {
3473 if ($Coro::current != $Coro::main) { 3833 if ($Coro::current != $Coro::main) {
3474 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3834 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3475 unless ++$bug_warning > 10; 3835 unless ++$bug_warning > 10;
3476 return; 3836 return;
3477 } 3837 }
3478 3838
3479 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3480
3481 $NOW = $tick_start = Event::time;
3482
3483 cf::server_tick; # one server iteration 3839 cf::server_tick; # one server iteration
3484 3840
3485 $RUNTIME += $TICK;
3486 $NEXT_TICK += $TICK;
3487
3488 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3841 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3489 $NEXT_RUNTIME_WRITE = $NOW + 10; 3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3490 Coro::async_pool { 3843 Coro::async_pool {
3844 $Coro::current->{desc} = "runtime saver";
3491 write_runtime 3845 write_runtime_sync
3492 or warn "ERROR: unable to write runtime file: $!"; 3846 or warn "ERROR: unable to write runtime file: $!";
3493 };
3494 } 3847 };
3848 }
3495 3849
3496# my $AFTER = Event::time;
3497# warn $AFTER - $NOW;#d#
3498
3499 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3500 $sig->send; 3851 $sig->send;
3501 } 3852 }
3502 while (my $sig = shift @WAIT_FOR_TICK) { 3853 while (my $sig = shift @WAIT_FOR_TICK) {
3503 $sig->send; 3854 $sig->send;
3504 } 3855 }
3505 3856
3506 $NOW = Event::time; 3857 $LOAD = ($NOW - $TICK_START) / $TICK;
3507
3508 # if we are delayed by four ticks or more, skip them all
3509 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3510
3511 $TICK_WATCHER->at ($NEXT_TICK);
3512 $TICK_WATCHER->start;
3513
3514 $LOAD = ($NOW - $tick_start) / $TICK;
3515 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3858 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3516 3859
3517 _post_tick; 3860 if (0) {
3518 3861 if ($NEXT_TICK) {
3519 # gather some statistics#d# 3862 my $jitter = $TICK_START - $NEXT_TICK;
3520 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3521 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3864 warn "jitter $JITTER\n";#d#
3865 }
3522 }, 3866 }
3523); 3867}
3524 3868
3525{ 3869{
3870 # configure BDB
3871
3526 BDB::min_parallel 8; 3872 BDB::min_parallel 8;
3527 BDB::max_poll_time $TICK * 0.1; 3873 BDB::max_poll_reqs $TICK * 0.1;
3528 $BDB_POLL_WATCHER = Event->io ( 3874 $AnyEvent::BDB::WATCHER->priority (1);
3529 reentrant => 0,
3530 fd => BDB::poll_fileno,
3531 poll => 'r',
3532 prio => 0,
3533 data => WF_AUTOCANCEL,
3534 cb => \&BDB::poll_cb,
3535 );
3536
3537 BDB::set_sync_prepare {
3538 my $status;
3539 my $current = $Coro::current;
3540 (
3541 sub {
3542 $status = $!;
3543 $current->ready; undef $current;
3544 },
3545 sub {
3546 Coro::schedule while defined $current;
3547 $! = $status;
3548 },
3549 )
3550 };
3551 3875
3552 unless ($DB_ENV) { 3876 unless ($DB_ENV) {
3553 $DB_ENV = BDB::db_env_create; 3877 $DB_ENV = BDB::db_env_create;
3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3879 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3880 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3881 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3882 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3554 3883
3555 cf::sync_job { 3884 cf::sync_job {
3556 eval { 3885 eval {
3557 BDB::db_env_open 3886 BDB::db_env_open
3558 $DB_ENV, 3887 $DB_ENV,
3560 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3889 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3561 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3890 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3562 0666; 3891 0666;
3563 3892
3564 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3893 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3565
3566 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3567 | BDB::LOG_AUTOREMOVE, 1);
3568 $DB_ENV->set_lk_detect;
3569 }; 3894 };
3570 3895
3571 cf::cleanup "db_env_open(db): $@" if $@; 3896 cf::cleanup "db_env_open(db): $@" if $@;
3572 }; 3897 };
3573 } 3898 }
3574 3899
3575 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3900 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3576 after => 11, 3901 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3577 interval => 60, 3902 };
3578 hard => 1, 3903 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3579 prio => 0,
3580 data => WF_AUTOCANCEL,
3581 cb => sub {
3582 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3904 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3583 },
3584 ); 3905 };
3585 $BDB_TRICKLE_WATCHER = Event->timer ( 3906 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3586 after => 5,
3587 interval => 10,
3588 hard => 1,
3589 prio => 0,
3590 data => WF_AUTOCANCEL,
3591 cb => sub {
3592 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3907 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3593 },
3594 ); 3908 };
3595} 3909}
3596 3910
3597{ 3911{
3912 # configure IO::AIO
3913
3598 IO::AIO::min_parallel 8; 3914 IO::AIO::min_parallel 8;
3599
3600 undef $Coro::AIO::WATCHER;
3601 IO::AIO::max_poll_time $TICK * 0.1; 3915 IO::AIO::max_poll_time $TICK * 0.1;
3602 $AIO_POLL_WATCHER = Event->io ( 3916 undef $AnyEvent::AIO::WATCHER;
3603 reentrant => 0,
3604 data => WF_AUTOCANCEL,
3605 fd => IO::AIO::poll_fileno,
3606 poll => 'r',
3607 prio => 6,
3608 cb => \&IO::AIO::poll_cb,
3609 );
3610} 3917}
3611 3918
3612my $_log_backtrace; 3919my $_log_backtrace;
3613 3920
3614sub _log_backtrace { 3921sub _log_backtrace {
3617 $msg =~ s/\n//; 3924 $msg =~ s/\n//;
3618 3925
3619 # limit the # of concurrent backtraces 3926 # limit the # of concurrent backtraces
3620 if ($_log_backtrace < 2) { 3927 if ($_log_backtrace < 2) {
3621 ++$_log_backtrace; 3928 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg;
3622 async { 3930 async {
3931 $Coro::current->{desc} = "abt $msg";
3932
3623 my @bt = fork_call { 3933 my @bt = fork_call {
3624 @addr = map { sprintf "%x", $_ } @addr; 3934 @addr = map { sprintf "%x", $_ } @addr;
3625 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3935 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3626 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3936 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3627 or die "addr2line: $!"; 3937 or die "addr2line: $!";
3635 } 3945 }
3636 3946
3637 @funcs 3947 @funcs
3638 }; 3948 };
3639 3949
3640 LOG llevInfo, "[ABT] $msg\n"; 3950 LOG llevInfo, "[ABT] $perl_bt\n";
3951 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3641 LOG llevInfo, "[ABT] $_\n" for @bt; 3952 LOG llevInfo, "[ABT] $_\n" for @bt;
3642 --$_log_backtrace; 3953 --$_log_backtrace;
3643 }; 3954 };
3644 } else { 3955 } else {
3645 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $msg\n";
3646 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3647 } 3958 }
3648} 3959}
3649 3960
3650# load additional modules 3961# load additional modules
3651use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3652 3963
3653END { cf::emergency_save } 3964END { cf::emergency_save }
3654 3965
36551 39661
3656 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines