ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.357 by root, Tue Sep 4 08:42:58 2007 UTC vs.
Revision 1.470 by root, Sun Apr 26 19:42:45 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines