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.308 by root, Mon Jul 16 14:09:40 2007 UTC vs.
Revision 1.568 by root, Tue May 3 17:12:14 2011 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
3use utf8; 25use common::sense;
4use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
35use Carp ();
14 36
37use Guard ();
15use Coro 3.61 (); 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;
51use Coro::Util ();
24 52
25use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
26use BDB (); 54use BDB ();
27use Data::Dumper; 55use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 56use Fcntl;
30use YAML::Syck (); 57use YAML::XS ();
31use IO::AIO 2.32 (); 58use IO::AIO ();
32use Time::HiRes; 59use Time::HiRes;
33use Compress::LZF; 60use Compress::LZF;
34use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
35 64
36# configure various modules to our taste 65# configure various modules to our taste
37# 66#
38$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 75
42$Event::Eval = 1; # no idea why this is required, but it is 76# strictly for debugging
43 77$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 78
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 79sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
80
81our @ORIG_INC;
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
53 85
54our @EXTS = (); # list of extension package names 86our @EXTS = (); # list of extension package names
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
98
64our $DATADIR = datadir; 99our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 100our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 101our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 102our $MAPDIR = "$DATADIR/" . mapdir;
103
68our $LOCALDIR = localdir; 104our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 105our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 106our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 107our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 108our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 109our $BDBDIR = "$LOCALDIR/db";
110our $PIDFILE = "$LOCALDIR/pid";
111our $RUNTIMEFILE = "$LOCALDIR/runtime";
112
113our %RESOURCE; # unused
114
115our $OUTPUT_RATE_MIN = 3000;
116our $OUTPUT_RATE_MAX = 1000000;
117
118our $MAX_LINKS = 32; # how many chained exits to follow
119our $VERBOSE_IO = 1;
74 120
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 121our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 122our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 123our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 124our $USE_FSYNC = 1; # use fsync to write maps - default on
82 125
126our $BDB_DEADLOCK_WATCHER;
127our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 128our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 129our $DB_ENV;
130
131our @EXTRA_MODULES = qw(pod match mapscript incloader);
85 132
86our %CFG; 133our %CFG;
87 134
88our $UPTIME; $UPTIME ||= time; 135our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 136our $RUNTIME;
137our $NOW;
90 138
91our %PLAYER; # all users 139our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 140our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 141our $LINK_MAP; # the special {link} map, which is always available
94 142
95# used to convert map paths into valid unix filenames by replacing / by ∕ 143# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 144our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 145
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 146our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 147our $LOADAVG; # same thing, but with alpha-smoothing
148our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 149our $TICK_START; # for load detecting purposes
150
151our @POST_INIT;
152
153our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154our $REALLY_UNLOOP; # never set to true, please :)
101 155
102binmode STDOUT; 156binmode STDOUT;
103binmode STDERR; 157binmode STDERR;
104 158
105# read virtual server time, if available 159# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 160unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 161 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 162 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 163 $RUNTIME = <$fh> + 0.;
110} 164}
165
166eval "sub TICK() { $TICK } 1" or die;
111 167
112mkdir $_ 168mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 169 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 170
115our $EMERGENCY_POSITION; 171our $EMERGENCY_POSITION;
116 172
117sub cf::map::normalise; 173sub cf::map::normalise;
174
175sub in_main() {
176 $Coro::current == $Coro::main
177}
178
179#############################################################################
180
181%REFLECT = ();
182for (@REFLECT) {
183 my $reflect = JSON::XS::decode_json $_;
184 $REFLECT{$reflect->{class}} = $reflect;
185}
186
187# this is decidedly evil
188$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 189
119############################################################################# 190#############################################################################
120 191
121=head2 GLOBAL VARIABLES 192=head2 GLOBAL VARIABLES
122 193
158 229
159The raw value load value from the last tick. 230The raw value load value from the last tick.
160 231
161=item %cf::CFG 232=item %cf::CFG
162 233
163Configuration for the server, loaded from C</etc/crossfire/config>, or 234Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 235from wherever your confdir points to.
165 236
166=item cf::wait_for_tick, cf::wait_for_tick_begin 237=item cf::wait_for_tick, cf::wait_for_tick_begin
167 238
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 239These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 240returns directly I<after> the tick processing (and consequently, can only wake one thread
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 241per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 242
243=cut
244
245sub wait_for_tick();
246sub wait_for_tick_begin();
247
248=item @cf::INVOKE_RESULTS
249
250This array contains the results of the last C<invoke ()> call. When
251C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252that call.
253
254=item %cf::REFLECT
255
256Contains, for each (C++) class name, a hash reference with information
257about object members (methods, scalars, arrays and flags) and other
258metadata, which is useful for introspection.
259
172=back 260=back
173 261
174=cut 262=cut
175 263
176BEGIN { 264sub error(@) { LOG llevError, join "", @_ }
177 *CORE::GLOBAL::warn = sub { 265sub warn (@) { LOG llevWarn , join "", @_ }
266sub info (@) { LOG llevInfo , join "", @_ }
267sub debug(@) { LOG llevDebug, join "", @_ }
268sub trace(@) { LOG llevTrace, join "", @_ }
269
270$Coro::State::WARNHOOK = sub {
178 my $msg = join "", @_; 271 my $msg = join "", @_;
179 272
180 $msg .= "\n" 273 $msg .= "\n"
181 unless $msg =~ /\n$/; 274 unless $msg =~ /\n$/;
182 275
183 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 276 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
184 277
185 utf8::encode $msg;
186 LOG llevError, $msg; 278 LOG llevWarn, $msg;
187 }; 279};
188} 280
281$Coro::State::DIEHOOK = sub {
282 return unless $^S eq 0; # "eq", not "=="
283
284 error Carp::longmess $_[0];
285
286 if (in_main) {#d#
287 error "DIEHOOK called in main context, Coro bug?\n";#d#
288 return;#d#
289 }#d#
290
291 # kill coroutine otherwise
292 Coro::terminate
293};
189 294
190@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 295@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
191@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 296@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
192@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 297@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
193@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 298@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
200for my $pkg (qw( 305for my $pkg (qw(
201 cf::global cf::attachable 306 cf::global cf::attachable
202 cf::object cf::object::player 307 cf::object cf::object::player
203 cf::client cf::player 308 cf::client cf::player
204 cf::arch cf::living 309 cf::arch cf::living
310 cf::map cf::mapspace
205 cf::map cf::party cf::region 311 cf::party cf::region
206)) { 312)) {
207 no strict 'refs';
208 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 313 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
209} 314}
210 315
211$Event::DIED = sub { 316$EV::DIED = sub {
212 warn "error in event callback: @_"; 317 Carp::cluck "error in event callback: @_";
213}; 318};
319
320#############################################################################
321
322sub fork_call(&@);
323sub get_slot($;$$);
214 324
215############################################################################# 325#############################################################################
216 326
217=head2 UTILITY FUNCTIONS 327=head2 UTILITY FUNCTIONS
218 328
239 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 349 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
240 $d 350 $d
241 } || "[unable to dump $_[0]: '$@']"; 351 } || "[unable to dump $_[0]: '$@']";
242} 352}
243 353
354=item $scalar = load_file $path
355
356Loads the given file from path and returns its contents. Croaks on error
357and can block.
358
359=cut
360
361sub load_file($) {
362 0 <= aio_load $_[0], my $data
363 or Carp::croak "$_[0]: $!";
364
365 $data
366}
367
244=item $ref = cf::from_json $json 368=item $ref = cf::decode_json $json
245 369
246Converts a JSON string into the corresponding perl data structure. 370Converts a JSON string into the corresponding perl data structure.
247 371
248=item $json = cf::to_json $ref 372=item $json = cf::encode_json $ref
249 373
250Converts a perl data structure into its JSON representation. 374Converts a perl data structure into its JSON representation.
251 375
252=cut 376=cut
253 377
254our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 378our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
255 379
256sub to_json ($) { $json_coder->encode ($_[0]) } 380sub encode_json($) { $json_coder->encode ($_[0]) }
257sub from_json ($) { $json_coder->decode ($_[0]) } 381sub decode_json($) { $json_coder->decode ($_[0]) }
382
383=item $ref = cf::decode_storable $scalar
384
385Same as Coro::Storable::thaw, so blocks.
386
387=cut
388
389BEGIN { *decode_storable = \&Coro::Storable::thaw }
390
391=item $ref = cf::decode_yaml $scalar
392
393Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
394
395=cut
396
397sub decode_yaml($) {
398 fork_call { YAML::XS::Load $_[0] } @_
399}
400
401=item $scalar = cf::unlzf $scalar
402
403Same as Compress::LZF::compress, but takes server ticks into account, so
404blocks.
405
406=cut
407
408sub unlzf($) {
409 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
410 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
411 Compress::LZF::decompress $_[0]
412}
413
414=item cf::post_init { BLOCK }
415
416Execute the given codeblock, I<after> all extensions have been (re-)loaded,
417but I<before> the server starts ticking again.
418
419The codeblock will have a single boolean argument to indicate whether this
420is a reload or not.
421
422=cut
423
424sub post_init(&) {
425 push @POST_INIT, shift;
426}
427
428sub _post_init {
429 trace "running post_init jobs";
430
431 # run them in parallel...
432
433 my @join;
434
435 while () {
436 push @join, map &Coro::async ($_, 0), @POST_INIT;
437 @POST_INIT = ();
438
439 @join or last;
440
441 (pop @join)->join;
442 }
443}
258 444
259=item cf::lock_wait $string 445=item cf::lock_wait $string
260 446
261Wait until the given lock is available. See cf::lock_acquire. 447Wait until the given lock is available. See cf::lock_acquire.
262 448
263=item my $lock = cf::lock_acquire $string 449=item my $lock = cf::lock_acquire $string
264 450
265Wait until the given lock is available and then acquires it and returns 451Wait until the given lock is available and then acquires it and returns
266a Coro::guard object. If the guard object gets destroyed (goes out of scope, 452a L<Guard> object. If the guard object gets destroyed (goes out of scope,
267for example when the coroutine gets canceled), the lock is automatically 453for example when the coroutine gets canceled), the lock is automatically
268returned. 454returned.
269 455
456Locks are *not* recursive, locking from the same coro twice results in a
457deadlocked coro.
458
270Lock names should begin with a unique identifier (for example, cf::map::find 459Lock names should begin with a unique identifier (for example, cf::map::find
271uses map_find and cf::map::load uses map_load). 460uses map_find and cf::map::load uses map_load).
272 461
273=item $locked = cf::lock_active $string 462=item $locked = cf::lock_active $string
274 463
275Return true if the lock is currently active, i.e. somebody has locked it. 464Return true if the lock is currently active, i.e. somebody has locked it.
276 465
277=cut 466=cut
278 467
279our %LOCK; 468our $LOCKS = new Coro::SemaphoreSet;
280 469
281sub lock_wait($) { 470sub lock_wait($) {
282 my ($key) = @_; 471 $LOCKS->wait ($_[0]);
283
284 # wait for lock, if any
285 while ($LOCK{$key}) {
286 push @{ $LOCK{$key} }, $Coro::current;
287 Coro::schedule;
288 }
289} 472}
290 473
291sub lock_acquire($) { 474sub lock_acquire($) {
292 my ($key) = @_; 475 $LOCKS->guard ($_[0])
293
294 # wait, to be sure we are not locked
295 lock_wait $key;
296
297 $LOCK{$key} = [];
298
299 Coro::guard {
300 # wake up all waiters, to be on the safe side
301 $_->ready for @{ delete $LOCK{$key} };
302 }
303} 476}
304 477
305sub lock_active($) { 478sub lock_active($) {
306 my ($key) = @_; 479 $LOCKS->count ($_[0]) < 1
307
308 ! ! $LOCK{$key}
309} 480}
310 481
311sub freeze_mainloop { 482sub freeze_mainloop {
312 return unless $TICK_WATCHER->is_active; 483 tick_inhibit_inc;
313 484
314 my $guard = Coro::guard { 485 &Guard::guard (\&tick_inhibit_dec);
315 $TICK_WATCHER->start; 486}
487
488=item cf::periodic $interval, $cb
489
490Like EV::periodic, but randomly selects a starting point so that the actions
491get spread over time.
492
493=cut
494
495sub periodic($$) {
496 my ($interval, $cb) = @_;
497
498 my $start = rand List::Util::min 180, $interval;
499
500 EV::periodic $start, $interval, 0, $cb
501}
502
503=item cf::get_slot $time[, $priority[, $name]]
504
505Allocate $time seconds of blocking CPU time at priority C<$priority>
506(default: 0): This call blocks and returns only when you have at least
507C<$time> seconds of cpu time till the next tick. The slot is only valid
508till the next cede.
509
510Background jobs should use a priority les than zero, interactive jobs
511should use 100 or more.
512
513The optional C<$name> can be used to identify the job to run. It might be
514used for statistical purposes and should identify the same time-class.
515
516Useful for short background jobs.
517
518=cut
519
520our @SLOT_QUEUE;
521our $SLOT_QUEUE;
522our $SLOT_DECAY = 0.9;
523
524$SLOT_QUEUE->cancel if $SLOT_QUEUE;
525$SLOT_QUEUE = Coro::async {
526 $Coro::current->desc ("timeslot manager");
527
528 my $signal = new Coro::Signal;
529 my $busy;
530
531 while () {
532 next_job:
533
534 my $avail = cf::till_tick;
535
536 for (0 .. $#SLOT_QUEUE) {
537 if ($SLOT_QUEUE[$_][0] <= $avail) {
538 $busy = 0;
539 my $job = splice @SLOT_QUEUE, $_, 1, ();
540 $job->[2]->send;
541 Coro::cede;
542 goto next_job;
543 } else {
544 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545 }
546 }
547
548 if (@SLOT_QUEUE) {
549 # we do not use wait_for_tick() as it returns immediately when tick is inactive
550 push @cf::WAIT_FOR_TICK, $signal;
551 $signal->wait;
552 } else {
553 $busy = 0;
554 Coro::schedule;
555 }
316 }; 556 }
317 $TICK_WATCHER->stop; 557};
318 $guard 558
559sub get_slot($;$$) {
560 return if tick_inhibit || $Coro::current == $Coro::main;
561
562 my ($time, $pri, $name) = @_;
563
564 $time = clamp $time, 0.01, $TICK * .6;
565
566 my $sig = new Coro::Signal;
567
568 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
569 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
570 $SLOT_QUEUE->ready;
571 $sig->wait;
319} 572}
320 573
321=item cf::async { BLOCK } 574=item cf::async { BLOCK }
322 575
323Currently the same as Coro::async_pool, meaning you cannot use 576Currently the same as Coro::async_pool, meaning you cannot use
328 581
329BEGIN { *async = \&Coro::async_pool } 582BEGIN { *async = \&Coro::async_pool }
330 583
331=item cf::sync_job { BLOCK } 584=item cf::sync_job { BLOCK }
332 585
333The design of Crossfire TRT requires that the main coroutine ($Coro::main) 586The design of Deliantra requires that the main coroutine ($Coro::main)
334is always able to handle events or runnable, as Crossfire TRT is only 587is always able to handle events or runnable, as Deliantra is only
335partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 588partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
336acceptable. 589acceptable.
337 590
338If it must be done, put the blocking parts into C<sync_job>. This will run 591If it must be done, put the blocking parts into C<sync_job>. This will run
339the given BLOCK in another coroutine while waiting for the result. The 592the given BLOCK in another coroutine while waiting for the result. The
343=cut 596=cut
344 597
345sub sync_job(&) { 598sub sync_job(&) {
346 my ($job) = @_; 599 my ($job) = @_;
347 600
348 if ($Coro::current == $Coro::main) { 601 if (in_main) {
349 my $time = Event::time; 602 my $time = AE::time;
350 603
351 # this is the main coro, too bad, we have to block 604 # this is the main coro, too bad, we have to block
352 # till the operation succeeds, freezing the server :/ 605 # till the operation succeeds, freezing the server :/
353 606
354 # TODO: use suspend/resume instead 607 #LOG llevError, Carp::longmess "sync job";#d#
355 # (but this is cancel-safe) 608
356 my $freeze_guard = freeze_mainloop; 609 my $freeze_guard = freeze_mainloop;
357 610
358 my $busy = 1; 611 my $busy = 1;
359 my @res; 612 my @res;
360 613
361 (async { 614 (async {
615 $Coro::current->desc ("sync job coro");
362 @res = eval { $job->() }; 616 @res = eval { $job->() };
363 warn $@ if $@; 617 error $@ if $@;
364 undef $busy; 618 undef $busy;
365 })->prio (Coro::PRIO_MAX); 619 })->prio (Coro::PRIO_MAX);
366 620
367 while ($busy) { 621 while ($busy) {
368 Coro::cede or Event::one_event; 622 if (Coro::nready) {
623 Coro::cede_notself;
624 } else {
625 EV::loop EV::LOOP_ONESHOT;
369 } 626 }
627 }
370 628
371 $time = Event::time - $time; 629 my $time = AE::time - $time;
372 630
373 LOG llevError | logBacktrace, Carp::longmess "long sync job"
374 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
375
376 $tick_start += $time; # do not account sync jobs to server load 631 $TICK_START += $time; # do not account sync jobs to server load
377 632
378 wantarray ? @res : $res[0] 633 wantarray ? @res : $res[0]
379 } else { 634 } else {
380 # we are in another coroutine, how wonderful, everything just works 635 # we are in another coroutine, how wonderful, everything just works
381 636
401 $EXT_CORO{$coro+0} = $coro; 656 $EXT_CORO{$coro+0} = $coro;
402 657
403 $coro 658 $coro
404} 659}
405 660
406=item fork_call { }, $args 661=item fork_call { }, @args
407 662
408Executes the given code block with the given arguments in a seperate 663Executes the given code block with the given arguments in a seperate
409process, returning the results. Everything must be serialisable with 664process, returning the results. Everything must be serialisable with
410Coro::Storable. May, of course, block. Note that the executed sub may 665Coro::Storable. May, of course, block. Note that the executed sub may
411never block itself or use any form of Event handling. 666never block itself or use any form of event handling.
412 667
413=cut 668=cut
414 669
415sub _store_scalar { 670sub post_fork {
416 open my $fh, ">", \my $buf 671 reset_signals;
417 or die "fork_call: cannot open fh-to-buf in child : $!";
418 Storable::store_fd $_[0], $fh;
419 close $fh;
420
421 $buf
422} 672}
423 673
424sub fork_call(&@) { 674sub fork_call(&@) {
425 my ($cb, @args) = @_; 675 my ($cb, @args) = @_;
426 676
427# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 677 # we seemingly have to make a local copy of the whole thing,
428# or die "socketpair: $!"; 678 # otherwise perl prematurely frees the stuff :/
429 pipe my $fh1, my $fh2 679 # TODO: investigate and fix (likely this will be rather laborious)
430 or die "pipe: $!";
431 680
432 if (my $pid = fork) { 681 my @res = Coro::Util::fork_eval {
433 close $fh2; 682 cf::post_fork;
683 &$cb
684 } @args;
434 685
435 my $res = (Coro::Handle::unblock $fh1)->readline (undef); 686 wantarray ? @res : $res[-1]
436 warn "pst<$res>" unless $res =~ /^pst/; 687}
437 $res = Coro::Storable::thaw $res;
438 688
439 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave 689sub objinfo {
440
441 Carp::confess $$res unless "ARRAY" eq ref $res;
442
443 return wantarray ? @$res : $res->[-1];
444 } else {
445 reset_signals;
446 local $SIG{__WARN__};
447 local $SIG{__DIE__};
448 # just in case, this hack effectively disables event
449 # in the child. cleaner and slower would be canceling all watchers,
450 # but this works for the time being.
451 local $Coro::idle;
452 $Coro::current->prio (Coro::PRIO_MAX);
453
454 eval {
455 close $fh1;
456
457 my @res = eval { $cb->(@args) };
458
459 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
460 close $fh2;
461 };
462
463 warn $@ if $@;
464 _exit 0;
465 } 690 (
691 "counter value" => cf::object::object_count,
692 "objects created" => cf::object::create_count,
693 "objects destroyed" => cf::object::destroy_count,
694 "freelist size" => cf::object::free_count,
695 "allocated objects" => cf::object::objects_size,
696 "active objects" => cf::object::actives_size,
697 )
698}
699
700=item $coin = coin_from_name $name
701
702=cut
703
704our %coin_alias = (
705 "silver" => "silvercoin",
706 "silvercoin" => "silvercoin",
707 "silvercoins" => "silvercoin",
708 "gold" => "goldcoin",
709 "goldcoin" => "goldcoin",
710 "goldcoins" => "goldcoin",
711 "platinum" => "platinacoin",
712 "platinumcoin" => "platinacoin",
713 "platinumcoins" => "platinacoin",
714 "platina" => "platinacoin",
715 "platinacoin" => "platinacoin",
716 "platinacoins" => "platinacoin",
717 "royalty" => "royalty",
718 "royalties" => "royalty",
719);
720
721sub coin_from_name($) {
722 $coin_alias{$_[0]}
723 ? cf::arch::find $coin_alias{$_[0]}
724 : undef
466} 725}
467 726
468=item $value = cf::db_get $family => $key 727=item $value = cf::db_get $family => $key
469 728
470Returns a single value from the environment database. 729Returns a single value from the environment database.
472=item cf::db_put $family => $key => $value 731=item cf::db_put $family => $key => $value
473 732
474Stores the given C<$value> in the family. It can currently store binary 733Stores the given C<$value> in the family. It can currently store binary
475data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 734data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
476 735
736=item $db = cf::db_table "name"
737
738Create and/or open a new database table. The string must not be "db" and must be unique
739within each server.
740
477=cut 741=cut
742
743sub db_table($) {
744 cf::error "db_get called from main context"
745 if $Coro::current == $Coro::main;
746
747 my ($name) = @_;
748 my $db = BDB::db_create $DB_ENV;
749
750 eval {
751 $db->set_flags (BDB::CHKSUM);
752
753 utf8::encode $name;
754 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
755 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
756 cf::cleanup "db_open(db): $!" if $!;
757 };
758 cf::cleanup "db_open(db): $@" if $@;
759
760 $db
761}
478 762
479our $DB; 763our $DB;
480 764
481sub db_init { 765sub db_init {
482 unless ($DB) { 766 $DB ||= db_table "db";
483 $DB = BDB::db_create $DB_ENV;
484
485 cf::sync_job {
486 eval {
487 $DB->set_flags (BDB::CHKSUM);
488
489 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
490 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
491 cf::cleanup "db_open(db): $!" if $!;
492 };
493 cf::cleanup "db_open(db): $@" if $@;
494 };
495 }
496} 767}
497 768
498sub db_get($$) { 769sub db_get($$) {
499 my $key = "$_[0]/$_[1]"; 770 my $key = "$_[0]/$_[1]";
500 771
501 cf::sync_job { 772 cf::error "db_get called from main context"
773 if $Coro::current == $Coro::main;
774
502 BDB::db_get $DB, undef, $key, my $data; 775 BDB::db_get $DB, undef, $key, my $data;
503 776
504 $! ? () 777 $! ? ()
505 : $data 778 : $data
506 }
507} 779}
508 780
509sub db_put($$$) { 781sub db_put($$$) {
510 BDB::dbreq_pri 4; 782 BDB::dbreq_pri 4;
511 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 783 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
539 811
540 my @data; 812 my @data;
541 my $md5; 813 my $md5;
542 814
543 for (0 .. $#$src) { 815 for (0 .. $#$src) {
544 0 <= aio_load $src->[$_], $data[$_] 816 $data[$_] = load_file $src->[$_];
545 or Carp::croak "$src->[$_]: $!";
546 } 817 }
547 818
548 # if processing is expensive, check 819 # if processing is expensive, check
549 # checksum first 820 # checksum first
550 if (1) { 821 if (1) {
551 $md5 = 822 $md5 =
552 join "\x00", 823 join "\x00",
553 $processversion, 824 $processversion,
554 map { 825 map {
555 Coro::cede; 826 cf::cede_to_tick;
556 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 827 ($src->[$_], Digest::MD5::md5_hex $data[$_])
557 } 0.. $#$src; 828 } 0.. $#$src;
558 829
559 830
560 my $dbmd5 = db_get cache => "$id/md5"; 831 my $dbmd5 = db_get cache => "$id/md5";
567 838
568 my $t1 = Time::HiRes::time; 839 my $t1 = Time::HiRes::time;
569 my $data = $process->(\@data); 840 my $data = $process->(\@data);
570 my $t2 = Time::HiRes::time; 841 my $t2 = Time::HiRes::time;
571 842
572 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 843 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
573 844
574 db_put cache => "$id/data", $data; 845 db_put cache => "$id/data", $data;
575 db_put cache => "$id/md5" , $md5; 846 db_put cache => "$id/md5" , $md5;
576 db_put cache => "$id/meta", $meta; 847 db_put cache => "$id/meta", $meta;
577 848
587 858
588=cut 859=cut
589 860
590sub datalog($@) { 861sub datalog($@) {
591 my ($type, %kv) = @_; 862 my ($type, %kv) = @_;
592 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 863 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
593} 864}
594 865
595=back 866=back
596 867
597=cut 868=cut
598 869
599############################################################################# 870#############################################################################
600 871
601=head2 ATTACHABLE OBJECTS 872=head2 ATTACHABLE OBJECTS
602 873
603Many objects in crossfire are so-called attachable objects. That means you can 874Many objects in deliantra are so-called attachable objects. That means you can
604attach callbacks/event handlers (a collection of which is called an "attachment") 875attach callbacks/event handlers (a collection of which is called an "attachment")
605to it. All such attachable objects support the following methods. 876to it. All such attachable objects support the following methods.
606 877
607In the following description, CLASS can be any of C<global>, C<object> 878In the following description, CLASS can be any of C<global>, C<object>
608C<player>, C<client> or C<map> (i.e. the attachable objects in 879C<player>, C<client> or C<map> (i.e. the attachable objects in
609Crossfire TRT). 880Deliantra).
610 881
611=over 4 882=over 4
612 883
613=item $attachable->attach ($attachment, key => $value...) 884=item $attachable->attach ($attachment, key => $value...)
614 885
658=item cf::CLASS::attachment $name, ... 929=item cf::CLASS::attachment $name, ...
659 930
660Register an attachment by C<$name> through which attachable objects of the 931Register an attachment by C<$name> through which attachable objects of the
661given CLASS can refer to this attachment. 932given CLASS can refer to this attachment.
662 933
663Some classes such as crossfire maps and objects can specify attachments 934Some classes such as deliantra maps and objects can specify attachments
664that are attached at load/instantiate time, thus the need for a name. 935that are attached at load/instantiate time, thus the need for a name.
665 936
666These calls expect any number of the following handler/hook descriptions: 937These calls expect any number of the following handler/hook descriptions:
667 938
668=over 4 939=over 4
792 1063
793 } elsif (exists $cb_id{$type}) { 1064 } elsif (exists $cb_id{$type}) {
794 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1065 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
795 1066
796 } elsif (ref $type) { 1067 } elsif (ref $type) {
797 warn "attaching objects not supported, ignoring.\n"; 1068 error "attaching objects not supported, ignoring.\n";
798 1069
799 } else { 1070 } else {
800 shift @arg; 1071 shift @arg;
801 warn "attach argument '$type' not supported, ignoring.\n"; 1072 error "attach argument '$type' not supported, ignoring.\n";
802 } 1073 }
803 } 1074 }
804} 1075}
805 1076
806sub _object_attach { 1077sub _object_attach {
816 _attach $registry, $klass, @attach; 1087 _attach $registry, $klass, @attach;
817 } 1088 }
818 1089
819 $obj->{$name} = \%arg; 1090 $obj->{$name} = \%arg;
820 } else { 1091 } else {
821 warn "object uses attachment '$name' which is not available, postponing.\n"; 1092 info "object uses attachment '$name' which is not available, postponing.\n";
822 } 1093 }
823 1094
824 $obj->{_attachment}{$name} = undef; 1095 $obj->{_attachment}{$name} = undef;
825} 1096}
826 1097
866 "; 1137 ";
867 die if $@; 1138 die if $@;
868} 1139}
869 1140
870our $override; 1141our $override;
871our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1142our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
872 1143
873sub override { 1144sub override {
874 $override = 1; 1145 $override = 1;
875 @invoke_results = (); 1146 @INVOKE_RESULTS = (@_);
876} 1147}
877 1148
878sub do_invoke { 1149sub do_invoke {
879 my $event = shift; 1150 my $event = shift;
880 my $callbacks = shift; 1151 my $callbacks = shift;
881 1152
882 @invoke_results = (); 1153 @INVOKE_RESULTS = ();
883 1154
884 local $override; 1155 local $override;
885 1156
886 for (@$callbacks) { 1157 for (@$callbacks) {
887 eval { &{$_->[1]} }; 1158 eval { &{$_->[1]} };
888 1159
889 if ($@) { 1160 if ($@) {
890 warn "$@";
891 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1161 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
892 override; 1162 override;
893 } 1163 }
894 1164
895 return 1 if $override; 1165 return 1 if $override;
896 } 1166 }
897 1167
898 0 1168 0
899} 1169}
900 1170
901=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1171=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
902 1172
903=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1173=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
904 1174
905Generate an object-specific event with the given arguments. 1175Generate an object-specific event with the given arguments.
906 1176
907This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1177This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
908removed in future versions), and there is no public API to access override 1178removed in future versions), and there is no public API to access override
909results (if you must, access C<@cf::invoke_results> directly). 1179results (if you must, access C<@cf::INVOKE_RESULTS> directly).
910 1180
911=back 1181=back
912 1182
913=cut 1183=cut
914 1184
915############################################################################# 1185#############################################################################
916# object support 1186# object support
1187
1188sub _object_equal($$);
1189sub _object_equal($$) {
1190 my ($a, $b) = @_;
1191
1192 return 0 unless (ref $a) eq (ref $b);
1193
1194 if ("HASH" eq ref $a) {
1195 my @ka = keys %$a;
1196 my @kb = keys %$b;
1197
1198 return 0 if @ka != @kb;
1199
1200 for (0 .. $#ka) {
1201 return 0 unless $ka[$_] eq $kb[$_];
1202 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1203 }
1204
1205 } elsif ("ARRAY" eq ref $a) {
1206
1207 return 0 if @$a != @$b;
1208
1209 for (0 .. $#$a) {
1210 return 0 unless _object_equal $a->[$_], $b->[$_];
1211 }
1212
1213 } elsif ($a ne $b) {
1214 return 0;
1215 }
1216
1217 1
1218}
1219
1220our $SLOW_MERGES;#d#
1221sub _can_merge {
1222 my ($ob1, $ob2) = @_;
1223
1224 ++$SLOW_MERGES;#d#
1225
1226 # we do the slow way here
1227 return _object_equal $ob1, $ob2
1228}
917 1229
918sub reattach { 1230sub reattach {
919 # basically do the same as instantiate, without calling instantiate 1231 # basically do the same as instantiate, without calling instantiate
920 my ($obj) = @_; 1232 my ($obj) = @_;
921 1233
1234 # no longer needed after getting rid of delete_package?
922 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1235 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
923 1236
924 my $registry = $obj->registry; 1237 my $registry = $obj->registry;
925 1238
926 @$registry = (); 1239 @$registry = ();
927 1240
932 for (@$attach) { 1245 for (@$attach) {
933 my ($klass, @attach) = @$_; 1246 my ($klass, @attach) = @$_;
934 _attach $registry, $klass, @attach; 1247 _attach $registry, $klass, @attach;
935 } 1248 }
936 } else { 1249 } else {
937 warn "object uses attachment '$name' that is not available, postponing.\n"; 1250 info "object uses attachment '$name' that is not available, postponing.\n";
938 } 1251 }
939 } 1252 }
940} 1253}
941 1254
942cf::attachable->attach ( 1255cf::attachable->attach (
943 prio => -1000000, 1256 prio => -1000000,
944 on_instantiate => sub { 1257 on_instantiate => sub {
945 my ($obj, $data) = @_; 1258 my ($obj, $data) = @_;
946 1259
947 $data = from_json $data; 1260 $data = decode_json $data;
948 1261
949 for (@$data) { 1262 for (@$data) {
950 my ($name, $args) = @$_; 1263 my ($name, $args) = @$_;
951 1264
952 $obj->attach ($name, %{$args || {} }); 1265 $obj->attach ($name, %{$args || {} });
968sub object_freezer_save { 1281sub object_freezer_save {
969 my ($filename, $rdata, $objs) = @_; 1282 my ($filename, $rdata, $objs) = @_;
970 1283
971 sync_job { 1284 sync_job {
972 if (length $$rdata) { 1285 if (length $$rdata) {
1286 utf8::decode (my $decname = $filename);
973 warn sprintf "saving %s (%d,%d)\n", 1287 trace sprintf "saving %s (%d,%d)\n",
974 $filename, length $$rdata, scalar @$objs; 1288 $decname, length $$rdata, scalar @$objs
1289 if $VERBOSE_IO;
975 1290
976 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1291 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
977 chmod SAVE_MODE, $fh; 1292 aio_chmod $fh, SAVE_MODE;
978 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1293 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
979 aio_fsync $fh if $cf::USE_FSYNC; 1294 if ($cf::USE_FSYNC) {
1295 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1296 aio_fsync $fh;
1297 }
980 close $fh; 1298 aio_close $fh;
981 1299
982 if (@$objs) { 1300 if (@$objs) {
983 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1301 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
984 chmod SAVE_MODE, $fh; 1302 aio_chmod $fh, SAVE_MODE;
985 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1303 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
986 aio_write $fh, 0, (length $data), $data, 0; 1304 aio_write $fh, 0, (length $data), $data, 0;
987 aio_fsync $fh if $cf::USE_FSYNC; 1305 if ($cf::USE_FSYNC) {
1306 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1307 aio_fsync $fh;
1308 }
988 close $fh; 1309 aio_close $fh;
989 aio_rename "$filename.pst~", "$filename.pst"; 1310 aio_rename "$filename.pst~", "$filename.pst";
990 } 1311 }
991 } else { 1312 } else {
992 aio_unlink "$filename.pst"; 1313 aio_unlink "$filename.pst";
993 } 1314 }
994 1315
995 aio_rename "$filename~", $filename; 1316 aio_rename "$filename~", $filename;
1317
1318 $filename =~ s%/[^/]+$%%;
1319 aio_pathsync $filename if $cf::USE_FSYNC;
996 } else { 1320 } else {
997 warn "FATAL: $filename~: $!\n"; 1321 error "unable to save objects: $filename~: $!\n";
998 } 1322 }
999 } else { 1323 } else {
1000 aio_unlink $filename; 1324 aio_unlink $filename;
1001 aio_unlink "$filename.pst"; 1325 aio_unlink "$filename.pst";
1002 } 1326 }
1003 } 1327 };
1004} 1328}
1005 1329
1006sub object_freezer_as_string { 1330sub object_freezer_as_string {
1007 my ($rdata, $objs) = @_; 1331 my ($rdata, $objs) = @_;
1008 1332
1020 or return; 1344 or return;
1021 1345
1022 unless (aio_stat "$filename.pst") { 1346 unless (aio_stat "$filename.pst") {
1023 (aio_load "$filename.pst", $av) >= 0 1347 (aio_load "$filename.pst", $av) >= 0
1024 or return; 1348 or return;
1349
1025 $av = eval { (Storable::thaw $av)->{objs} }; 1350 my $st = eval { Coro::Storable::thaw $av };
1351 $av = $st->{objs};
1026 } 1352 }
1027 1353
1354 utf8::decode (my $decname = $filename);
1028 warn sprintf "loading %s (%d)\n", 1355 trace sprintf "loading %s (%d,%d)\n",
1029 $filename, length $data, scalar @{$av || []}; 1356 $decname, length $data, scalar @{$av || []}
1357 if $VERBOSE_IO;
1358
1030 return ($data, $av); 1359 ($data, $av)
1031} 1360}
1032 1361
1033=head2 COMMAND CALLBACKS 1362=head2 COMMAND CALLBACKS
1034 1363
1035=over 4 1364=over 4
1089 my ($name, $cb) = @_; 1418 my ($name, $cb) = @_;
1090 1419
1091 $EXTICMD{$name} = $cb; 1420 $EXTICMD{$name} = $cb;
1092} 1421}
1093 1422
1423use File::Glob ();
1424
1094cf::player->attach ( 1425cf::player->attach (
1095 on_command => sub { 1426 on_unknown_command => sub {
1096 my ($pl, $name, $params) = @_; 1427 my ($pl, $name, $params) = @_;
1097 1428
1098 my $cb = $COMMAND{$name} 1429 my $cb = $COMMAND{$name}
1099 or return; 1430 or return;
1100 1431
1108 my ($pl, $buf) = @_; 1439 my ($pl, $buf) = @_;
1109 1440
1110 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1441 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1111 1442
1112 if (ref $msg) { 1443 if (ref $msg) {
1444 my ($type, $reply, @payload) =
1445 "ARRAY" eq ref $msg
1446 ? @$msg
1447 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448
1449 my @reply;
1450
1113 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1451 if (my $cb = $EXTCMD{$type}) {
1114 if (my %reply = $cb->($pl, $msg)) { 1452 @reply = $cb->($pl, @payload);
1115 $pl->ext_reply ($msg->{msgid}, %reply);
1116 }
1117 } 1453 }
1454
1455 $pl->ext_reply ($reply, @reply)
1456 if $reply;
1457
1118 } else { 1458 } else {
1119 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1459 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1120 } 1460 }
1121 1461
1122 cf::override; 1462 cf::override;
1123 }, 1463 },
1124); 1464);
1125 1465
1466# "readahead" all extensions
1467sub cache_extensions {
1468 my $grp = IO::AIO::aio_group;
1469
1470 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1471 for (grep /\.ext$/, @{$_[0]}) {
1472 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1473 }
1474 };
1475
1476 $grp
1477}
1478
1126sub load_extensions { 1479sub load_extensions {
1480 info "loading extensions...";
1481
1127 cf::sync_job { 1482 cf::sync_job {
1128 my %todo; 1483 my %todo;
1129 1484
1130 for my $path (<$LIBDIR/*.ext>) { 1485 for my $path (<$LIBDIR/*.ext>) {
1131 next unless -r $path; 1486 next unless -r $path;
1149 1504
1150 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1505 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1151 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1506 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1152 1507
1153 $ext{source} = 1508 $ext{source} =
1154 "package $pkg; use strict; use utf8;\n" 1509 "package $pkg; use common::sense;\n"
1155 . "#line 1 \"$path\"\n{\n" 1510 . "#line 1 \"$path\"\n{\n"
1156 . $source 1511 . $source
1157 . "\n};\n1"; 1512 . "\n};\n1";
1158 1513
1159 $todo{$base} = \%ext; 1514 $todo{$base} = \%ext;
1160 } 1515 }
1161 1516
1517 my $pass = 0;
1162 my %done; 1518 my %done;
1163 while (%todo) { 1519 while (%todo) {
1164 my $progress; 1520 my $progress;
1165 1521
1522 ++$pass;
1523
1524 ext:
1166 while (my ($k, $v) = each %todo) { 1525 while (my ($k, $v) = each %todo) {
1167 for (split /,\s*/, $v->{meta}{depends}) { 1526 for (split /,\s*/, $v->{meta}{depends}) {
1168 goto skip 1527 next ext
1169 unless exists $done{$_}; 1528 unless exists $done{$_};
1170 } 1529 }
1171 1530
1172 warn "... loading '$k' into '$v->{pkg}'\n"; 1531 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1173 1532
1174 unless (eval $v->{source}) { 1533 my $active = eval $v->{source};
1534
1535 if (length $@) {
1175 my $msg = $@ ? "$v->{path}: $@\n" 1536 error "$v->{path}: $@\n";
1176 : "$v->{base}: extension inactive.\n";
1177 1537
1538 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1178 if (exists $v->{meta}{mandatory}) { 1539 if exists $v->{meta}{mandatory};
1179 warn $msg; 1540
1180 warn "mandatory extension failed to load, exiting.\n"; 1541 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1181 exit 1; 1542 delete $todo{$k};
1182 } 1543 } else {
1183 1544 $done{$k} = delete $todo{$k};
1184 warn $msg; 1545 push @EXTS, $v->{pkg};
1546 $progress = 1;
1547
1548 info "$v->{base}: extension inactive.\n"
1549 unless $active;
1185 } 1550 }
1186
1187 $done{$k} = delete $todo{$k};
1188 push @EXTS, $v->{pkg};
1189 $progress = 1;
1190 } 1551 }
1191 1552
1192 skip: 1553 unless ($progress) {
1193 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1554 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1194 unless $progress; 1555
1556 while (my ($k, $v) = each %todo) {
1557 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558 if exists $v->{meta}{mandatory};
1559 }
1560
1561 last;
1562 }
1195 } 1563 }
1196 }; 1564 };
1197} 1565}
1198 1566
1199############################################################################# 1567#############################################################################
1200 1568
1201=back 1569=back
1202 1570
1203=head2 CORE EXTENSIONS 1571=head2 CORE EXTENSIONS
1204 1572
1205Functions and methods that extend core crossfire objects. 1573Functions and methods that extend core deliantra objects.
1206 1574
1207=cut 1575=cut
1208 1576
1209package cf::player; 1577package cf::player;
1210 1578
1211use Coro::AIO; 1579use Coro::AIO;
1212 1580
1213=head3 cf::player 1581=head3 cf::player
1214 1582
1215=over 4 1583=over 4
1584
1585=item cf::player::num_playing
1586
1587Returns the official number of playing players, as per the Crossfire metaserver rules.
1588
1589=cut
1590
1591sub num_playing {
1592 scalar grep
1593 $_->ob->map
1594 && !$_->hidden
1595 && !$_->ob->flag (cf::FLAG_WIZ),
1596 cf::player::list
1597}
1216 1598
1217=item cf::player::find $login 1599=item cf::player::find $login
1218 1600
1219Returns the given player object, loading it if necessary (might block). 1601Returns the given player object, loading it if necessary (might block).
1220 1602
1239 1621
1240sub exists($) { 1622sub exists($) {
1241 my ($login) = @_; 1623 my ($login) = @_;
1242 1624
1243 $cf::PLAYER{$login} 1625 $cf::PLAYER{$login}
1244 or cf::sync_job { !aio_stat path $login } 1626 or !aio_stat path $login
1245} 1627}
1246 1628
1247sub find($) { 1629sub find($) {
1248 return $cf::PLAYER{$_[0]} || do { 1630 return $cf::PLAYER{$_[0]} || do {
1249 my $login = $_[0]; 1631 my $login = $_[0];
1256 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1638 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1257 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1639 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1258 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1640 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1259 aio_unlink +(playerdir $login) . "/$login.pl"; 1641 aio_unlink +(playerdir $login) . "/$login.pl";
1260 1642
1261 my $pl = load_pl path $login 1643 my $f = new_from_file cf::object::thawer path $login
1262 or return; 1644 or return;
1645
1646 my $pl = cf::player::load_pl $f
1647 or return;
1648
1649 local $cf::PLAYER_LOADING{$login} = $pl;
1650 $f->resolve_delayed_derefs;
1263 $cf::PLAYER{$login} = $pl 1651 $cf::PLAYER{$login} = $pl
1264 } 1652 }
1265 } 1653 }
1266} 1654}
1655
1656cf::player->attach (
1657 on_load => sub {
1658 my ($pl, $path) = @_;
1659
1660 # restore slots saved in save, below
1661 my $slots = delete $pl->{_slots};
1662
1663 $pl->ob->current_weapon ($slots->[0]);
1664 $pl->combat_ob ($slots->[1]);
1665 $pl->ranged_ob ($slots->[2]);
1666 },
1667);
1267 1668
1268sub save($) { 1669sub save($) {
1269 my ($pl) = @_; 1670 my ($pl) = @_;
1270 1671
1271 return if $pl->{deny_save}; 1672 return if $pl->{deny_save};
1276 return if $pl->{deny_save}; 1677 return if $pl->{deny_save};
1277 1678
1278 aio_mkdir playerdir $pl, 0770; 1679 aio_mkdir playerdir $pl, 0770;
1279 $pl->{last_save} = $cf::RUNTIME; 1680 $pl->{last_save} = $cf::RUNTIME;
1280 1681
1682 cf::get_slot 0.01;
1683
1684 # save slots, to be restored later
1685 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1686
1281 $pl->save_pl ($path); 1687 $pl->save_pl ($path);
1282 Coro::cede; 1688 cf::cede_to_tick;
1283} 1689}
1284 1690
1285sub new($) { 1691sub new($) {
1286 my ($login) = @_; 1692 my ($login) = @_;
1287 1693
1293 $cf::PLAYER{$login} = $self; 1699 $cf::PLAYER{$login} = $self;
1294 1700
1295 $self 1701 $self
1296} 1702}
1297 1703
1704=item $player->send_msg ($channel, $msg, $color, [extra...])
1705
1706=cut
1707
1708sub send_msg {
1709 my $ns = shift->ns
1710 or return;
1711 $ns->send_msg (@_);
1712}
1713
1298=item $pl->quit_character 1714=item $pl->quit_character
1299 1715
1300Nukes the player without looking back. If logged in, the connection will 1716Nukes the player without looking back. If logged in, the connection will
1301be destroyed. May block for a long time. 1717be destroyed. May block for a long time.
1302 1718
1306 my ($pl) = @_; 1722 my ($pl) = @_;
1307 1723
1308 my $name = $pl->ob->name; 1724 my $name = $pl->ob->name;
1309 1725
1310 $pl->{deny_save} = 1; 1726 $pl->{deny_save} = 1;
1311 $pl->password ("*"); # this should lock out the player until we nuked the dir 1727 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1312 1728
1313 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1729 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1314 $pl->deactivate; 1730 $pl->deactivate;
1731
1732 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1315 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1733 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1734 ext::highscore::check ($pl->ob);
1735
1316 $pl->ns->destroy if $pl->ns; 1736 $pl->ns->destroy if $pl->ns;
1317 1737
1318 my $path = playerdir $pl; 1738 my $path = playerdir $pl;
1319 my $temp = "$path~$cf::RUNTIME~deleting~"; 1739 my $temp = "$path~$cf::RUNTIME~deleting~";
1320 aio_rename $path, $temp; 1740 aio_rename $path, $temp;
1355 or return []; 1775 or return [];
1356 1776
1357 my @logins; 1777 my @logins;
1358 1778
1359 for my $login (@$dirs) { 1779 for my $login (@$dirs) {
1780 my $path = path $login;
1781
1782 # a .pst is a dead give-away for a valid player
1783 # if no pst file found, open and chekc for blocked users
1784 if (aio_stat "$path.pst") {
1360 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1785 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1361 aio_read $fh, 0, 512, my $buf, 0 or next; 1786 aio_read $fh, 0, 512, my $buf, 0 or next;
1362 $buf !~ /^password -------------$/m or next; # official not-valid tag 1787 $buf !~ /^password -------------$/m or next; # official not-valid tag
1788 }
1363 1789
1364 utf8::decode $login; 1790 utf8::decode $login;
1365 push @logins, $login; 1791 push @logins, $login;
1366 } 1792 }
1367 1793
1368 \@logins 1794 \@logins
1369} 1795}
1370 1796
1371=item $player->maps 1797=item $player->maps
1798
1799=item cf::player::maps $login
1372 1800
1373Returns an arrayref of map paths that are private for this 1801Returns an arrayref of map paths that are private for this
1374player. May block. 1802player. May block.
1375 1803
1376=cut 1804=cut
1394 } 1822 }
1395 1823
1396 \@paths 1824 \@paths
1397} 1825}
1398 1826
1399=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1827=item $protocol_xml = $player->expand_cfpod ($cfpod)
1400 1828
1401Expand crossfire pod fragments into protocol xml. 1829Expand deliantra pod fragments into protocol xml.
1402 1830
1403=cut
1404
1405sub expand_cfpod {
1406 ((my $self), (local $_)) = @_;
1407
1408 # escape & and <
1409 s/&/&amp;/g;
1410 s/(?<![BIUGH])</&lt;/g;
1411
1412 # this is buggy, it needs to properly take care of nested <'s
1413
1414 1 while
1415 # replace B<>, I<>, U<> etc.
1416 s/B<([^\>]*)>/<b>$1<\/b>/
1417 || s/I<([^\>]*)>/<i>$1<\/i>/
1418 || s/U<([^\>]*)>/<u>$1<\/u>/
1419 # replace G<male|female> tags
1420 || s{G<([^>|]*)\|([^>]*)>}{
1421 $self->gender ? $2 : $1
1422 }ge
1423 # replace H<hint text>
1424 || s{H<([^\>]*)>}
1425 {
1426 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1427 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1428 "")
1429 [$self->{hintmode}]
1430 }ge;
1431
1432 # create single paragraphs (very hackish)
1433 s/(?<=\S)\n(?=\w)/ /g;
1434
1435 # compress some whitespace
1436 s/\s+\n/\n/g; # ws line-ends
1437 s/\n\n+/\n/g; # double lines
1438 s/^\n+//; # beginning lines
1439 s/\n+$//; # ending lines
1440
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1831=item $player->ext_reply ($msgid, @msg)
1450 1832
1451Sends an ext reply to the player. 1833Sends an ext reply to the player.
1452 1834
1453=cut 1835=cut
1454 1836
1455sub ext_reply($$%) { 1837sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1838 my ($self, $id, @msg) = @_;
1457 1839
1458 $msg{msgid} = $id; 1840 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1841}
1461 1842
1462=item $player->ext_event ($type, %msg) 1843=item $player->ext_msg ($type, @msg)
1463 1844
1464Sends an ext event to the client. 1845Sends an ext event to the client.
1465 1846
1466=cut 1847=cut
1467 1848
1468sub ext_event($$%) { 1849sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1850 my ($self, $type, @msg) = @_;
1470 1851
1471 $self->ns->ext_event ($type, %msg); 1852 $self->ns->ext_msg ($type, @msg);
1472} 1853}
1473 1854
1474=head3 cf::region 1855=head3 cf::region
1475 1856
1476=over 4 1857=over 4
1485 1866
1486=cut 1867=cut
1487 1868
1488sub find_by_path($) { 1869sub find_by_path($) {
1489 my ($path) = @_; 1870 my ($path) = @_;
1871
1872 $path =~ s/^~[^\/]*//; # skip ~login
1490 1873
1491 my ($match, $specificity); 1874 my ($match, $specificity);
1492 1875
1493 for my $region (list) { 1876 for my $region (list) {
1494 if ($region->{match} && $path =~ $region->{match}) { 1877 if ($region->{match} && $path =~ $region->{match}) {
1520our $MAX_RESET = 3600; 1903our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1904our $DEFAULT_RESET = 3000;
1522 1905
1523sub generate_random_map { 1906sub generate_random_map {
1524 my ($self, $rmp) = @_; 1907 my ($self, $rmp) = @_;
1525 # mit "rum" bekleckern, nicht 1908
1909 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1910
1526 $self->_create_random_map ( 1911 $self->_create_random_map ($rmp);
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1530 $rmp->{exit_on_final_map},
1531 $rmp->{xsize}, $rmp->{ysize},
1532 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1533 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1534 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1535 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1536 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1537 (cf::region::find $rmp->{region}), $rmp->{custom}
1538 )
1539} 1912}
1540 1913
1541=item cf::map->register ($regex, $prio) 1914=item cf::map->register ($regex, $prio)
1542 1915
1543Register a handler for the map path matching the given regex at the 1916Register a handler for the map path matching the given regex at the
1548 1921
1549sub register { 1922sub register {
1550 my (undef, $regex, $prio) = @_; 1923 my (undef, $regex, $prio) = @_;
1551 my $pkg = caller; 1924 my $pkg = caller;
1552 1925
1553 no strict;
1554 push @{"$pkg\::ISA"}, __PACKAGE__; 1926 push @{"$pkg\::ISA"}, __PACKAGE__;
1555 1927
1556 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1928 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1557} 1929}
1558 1930
1559# also paths starting with '/' 1931# also paths starting with '/'
1560$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1932$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1561 1933
1562sub thawer_merge { 1934sub thawer_merge {
1563 my ($self, $merge) = @_; 1935 my ($self, $merge) = @_;
1564 1936
1565 # we have to keep some variables in memory intact 1937 # we have to keep some variables in memory intact
1570} 1942}
1571 1943
1572sub normalise { 1944sub normalise {
1573 my ($path, $base) = @_; 1945 my ($path, $base) = @_;
1574 1946
1575 $path = "$path"; # make sure its a string 1947 $path = "$path"; # make sure it's a string
1576 1948
1577 $path =~ s/\.map$//; 1949 $path =~ s/\.map$//;
1578 1950
1579 # map plan: 1951 # map plan:
1580 # 1952 #
1595 $base =~ s{[^/]+/?$}{}; 1967 $base =~ s{[^/]+/?$}{};
1596 $path = "$base/$path"; 1968 $path = "$base/$path";
1597 } 1969 }
1598 1970
1599 for ($path) { 1971 for ($path) {
1600 redo if s{//}{/};
1601 redo if s{/\.?/}{/}; 1972 redo if s{/\.?/}{/};
1602 redo if s{/[^/]+/\.\./}{/}; 1973 redo if s{/[^/]+/\.\./}{/};
1603 } 1974 }
1604 1975
1605 $path 1976 $path
1619 $self->init; # pass $1 etc. 1990 $self->init; # pass $1 etc.
1620 return $self; 1991 return $self;
1621 } 1992 }
1622 } 1993 }
1623 1994
1624 Carp::cluck "unable to resolve path '$path' (base '$base')."; 1995 Carp::cluck "unable to resolve path '$path' (base '$base')";
1625 () 1996 ()
1626} 1997}
1627 1998
1999# may re-bless or do other evil things
1628sub init { 2000sub init {
1629 my ($self) = @_; 2001 my ($self) = @_;
1630 2002
1631 $self 2003 $self
1632} 2004}
1651 2023
1652# the temporary/swap location 2024# the temporary/swap location
1653sub save_path { 2025sub save_path {
1654 my ($self) = @_; 2026 my ($self) = @_;
1655 2027
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2028 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 2029 "$TMPDIR/$path.map"
1658} 2030}
1659 2031
1660# the unique path, undef == no special unique path 2032# the unique path, undef == no special unique path
1661sub uniq_path { 2033sub uniq_path {
1662 my ($self) = @_; 2034 my ($self) = @_;
1663 2035
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2036 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 2037 "$UNIQUEDIR/$path"
1666}
1667
1668# and all this just because we cannot iterate over
1669# all maps in C++...
1670sub change_all_map_light {
1671 my ($change) = @_;
1672
1673 $_->change_map_light ($change)
1674 for grep $_->outdoor, values %cf::MAP;
1675} 2038}
1676 2039
1677sub decay_objects { 2040sub decay_objects {
1678 my ($self) = @_; 2041 my ($self) = @_;
1679 2042
1692 2055
1693sub load_header_from($) { 2056sub load_header_from($) {
1694 my ($self, $path) = @_; 2057 my ($self, $path) = @_;
1695 2058
1696 utf8::encode $path; 2059 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 2060 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 or return; 2061 or return;
1702 2062
2063 $self->_load_header ($f)
2064 or return;
2065
2066 local $MAP_LOADING{$self->{path}} = $self;
2067 $f->resolve_delayed_derefs;
2068
1703 $self->{load_path} = $path; 2069 $self->{load_path} = $path;
1704 2070
1705 1 2071 1
1706} 2072}
1707 2073
2074# used to laod the header of an original map
1708sub load_header_orig { 2075sub load_header_orig {
1709 my ($self) = @_; 2076 my ($self) = @_;
1710 2077
1711 $self->load_header_from ($self->load_path) 2078 $self->load_header_from ($self->load_path)
1712} 2079}
1713 2080
2081# used to laod the header of an instantiated map
1714sub load_header_temp { 2082sub load_header_temp {
1715 my ($self) = @_; 2083 my ($self) = @_;
1716 2084
1717 $self->load_header_from ($self->save_path) 2085 $self->load_header_from ($self->save_path)
1718} 2086}
1719 2087
2088# called after loading the header from an instantiated map
1720sub prepare_temp { 2089sub prepare_temp {
1721 my ($self) = @_; 2090 my ($self) = @_;
1722 2091
1723 $self->last_access ((delete $self->{last_access}) 2092 $self->last_access ((delete $self->{last_access})
1724 || $cf::RUNTIME); #d# 2093 || $cf::RUNTIME); #d#
1725 # safety 2094 # safety
1726 $self->{instantiate_time} = $cf::RUNTIME 2095 $self->{instantiate_time} = $cf::RUNTIME
1727 if $self->{instantiate_time} > $cf::RUNTIME; 2096 if $self->{instantiate_time} > $cf::RUNTIME;
1728} 2097}
1729 2098
2099# called after loading the header from an original map
1730sub prepare_orig { 2100sub prepare_orig {
1731 my ($self) = @_; 2101 my ($self) = @_;
1732 2102
1733 $self->{load_original} = 1; 2103 $self->{load_original} = 1;
1734 $self->{instantiate_time} = $cf::RUNTIME; 2104 $self->{instantiate_time} = $cf::RUNTIME;
1758 2128
1759sub find; 2129sub find;
1760sub find { 2130sub find {
1761 my ($path, $origin) = @_; 2131 my ($path, $origin) = @_;
1762 2132
2133 cf::cede_to_tick;
2134
1763 $path = normalise $path, $origin && $origin->path; 2135 $path = normalise $path, $origin;
1764 2136
2137 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 2138 my $guard2 = cf::lock_acquire "map_find:$path";
1766 2139
1767 $cf::MAP{$path} || do { 2140 $cf::MAP{$path} || do {
1768 my $guard = cf::lock_acquire "map_find:$path";
1769 my $map = new_from_path cf::map $path 2141 my $map = new_from_path cf::map $path
1770 or return; 2142 or return;
1771 2143
1772 $map->{last_save} = $cf::RUNTIME; 2144 $map->{last_save} = $cf::RUNTIME;
1773 2145
1775 or return; 2147 or return;
1776 2148
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2149 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 2150 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 2151 #$cf::WAIT_FOR_TICK->wait;
2152 undef $guard2;
2153 undef $guard1;
1780 $map->reset; 2154 $map->reset;
1781 undef $guard;
1782 return find $path; 2155 return find $path;
1783 } 2156 }
1784 2157
1785 $cf::MAP{$path} = $map 2158 $cf::MAP{$path} = $map
1786 } 2159 }
1787} 2160}
1788 2161
1789sub pre_load { } 2162sub pre_load { }
1790sub post_load { } 2163#sub post_load { } # XS
1791 2164
1792sub load { 2165sub load {
1793 my ($self) = @_; 2166 my ($self) = @_;
1794 2167
1795 local $self->{deny_reset} = 1; # loading can take a long time 2168 local $self->{deny_reset} = 1; # loading can take a long time
1796 2169
1797 my $path = $self->{path}; 2170 my $path = $self->{path};
1798 2171
1799 { 2172 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 2173 my $guard = cf::lock_acquire "map_data:$path";
1801 2174
2175 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 2176 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 2177
1804 $self->in_memory (cf::MAP_LOADING); 2178 $self->in_memory (cf::MAP_LOADING);
1805 2179
1806 $self->alloc; 2180 $self->alloc;
1807 2181
1808 $self->pre_load; 2182 $self->pre_load;
1809 Coro::cede; 2183 cf::cede_to_tick;
1810 2184
1811 $self->_load_objects ($self->{load_path}, 1) 2185 if (exists $self->{load_path}) {
2186 my $f = new_from_file cf::object::thawer $self->{load_path};
2187 $f->skip_block;
2188 $self->_load_objects ($f)
1812 or return; 2189 or return;
1813 2190
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2191 $self->post_load_original
1815 if delete $self->{load_original}; 2192 if delete $self->{load_original};
1816 2193
1817 if (my $uniq = $self->uniq_path) { 2194 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2195 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2196 unless (aio_stat $uniq) {
2197 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2198 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2199 $self->_load_objects ($f);
2200 $f->resolve_delayed_derefs;
2201 }
2202 }
1822 } 2203 }
1823 }
1824 2204
1825 Coro::cede; 2205 $f->resolve_delayed_derefs;
2206 } else {
2207 $self->post_load_original
2208 if delete $self->{load_original};
2209 }
2210
2211 cf::cede_to_tick;
1826 # now do the right thing for maps 2212 # now do the right thing for maps
1827 $self->link_multipart_objects; 2213 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2214 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2215 unless $self->difficulty;
1830 Coro::cede; 2216 cf::cede_to_tick;
1831 2217
1832 unless ($self->{deny_activate}) { 2218 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2219 $self->decay_objects;
1834 $self->fix_auto_apply; 2220 $self->fix_auto_apply;
1835 $self->update_buttons; 2221 $self->update_buttons;
1836 Coro::cede; 2222 cf::cede_to_tick;
1837 $self->set_darkness_map; 2223 #$self->activate; # no longer activate maps automatically
1838 Coro::cede;
1839 $self->activate;
1840 } 2224 }
1841 2225
2226 $self->{last_save} = $cf::RUNTIME;
2227 $self->last_access ($cf::RUNTIME);
2228
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2229 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2230 }
1844 2231
1845 $self->post_load; 2232 $self->post_load;
1846}
1847 2233
2234 1
2235}
2236
2237# customize the map for a given player, i.e.
2238# return the _real_ map. used by e.g. per-player
2239# maps to change the path to ~playername/mappath
1848sub customise_for { 2240sub customise_for {
1849 my ($self, $ob) = @_; 2241 my ($self, $ob) = @_;
1850 2242
1851 return find "~" . $ob->name . "/" . $self->{path} 2243 return find "~" . $ob->name . "/" . $self->{path}
1852 if $self->per_player; 2244 if $self->per_player;
1856 2248
1857 $self 2249 $self
1858} 2250}
1859 2251
1860# find and load all maps in the 3x3 area around a map 2252# find and load all maps in the 3x3 area around a map
1861sub load_diag { 2253sub load_neighbours {
1862 my ($map) = @_; 2254 my ($map) = @_;
1863 2255
1864 my @diag; # diagonal neighbours 2256 my @neigh; # diagonal neighbours
1865 2257
1866 for (0 .. 3) { 2258 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2259 my $neigh = $map->tile_path ($_)
1868 or next; 2260 or next;
1869 $neigh = find $neigh, $map 2261 $neigh = find $neigh, $map
1870 or next; 2262 or next;
1871 $neigh->load; 2263 $neigh->load;
1872 2264
2265 # now find the diagonal neighbours
2266 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2267 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2268 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2269 }
1876 2270
1877 for (@diag) { 2271 for (grep defined $_->[0], @neigh) {
2272 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2273 my $neigh = find $path, $origin
1879 or next; 2274 or next;
1880 $neigh->load; 2275 $neigh->load;
1881 } 2276 }
1882} 2277}
1883 2278
1884sub find_sync { 2279sub find_sync {
1885 my ($path, $origin) = @_; 2280 my ($path, $origin) = @_;
1886 2281
1887 cf::sync_job { find $path, $origin } 2282 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2283 if $Coro::current == $Coro::main;
2284
2285 find $path, $origin
1888} 2286}
1889 2287
1890sub do_load_sync { 2288sub do_load_sync {
1891 my ($map) = @_; 2289 my ($map) = @_;
1892 2290
1893 cf::sync_job { $map->load }; 2291 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2292 if $Coro::current == $Coro::main;
2293
2294 $map->load;
1894} 2295}
1895 2296
1896our %MAP_PREFETCH; 2297our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2298our $MAP_PREFETCHER = undef;
1898 2299
1899sub find_async { 2300sub find_async {
1900 my ($path, $origin) = @_; 2301 my ($path, $origin, $load) = @_;
1901 2302
1902 $path = normalise $path, $origin && $origin->{path}; 2303 $path = normalise $path, $origin;
1903 2304
1904 if (my $map = $cf::MAP{$path}) { 2305 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2306 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2307 }
1907 2308
1908 undef $MAP_PREFETCH{$path}; 2309 $MAP_PREFETCH{$path} |= $load;
2310
1909 $MAP_PREFETCHER ||= cf::async { 2311 $MAP_PREFETCHER ||= cf::async {
2312 $Coro::current->{desc} = "map prefetcher";
2313
1910 while (%MAP_PREFETCH) { 2314 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2315 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 if (my $map = find $path) { 2316 if (my $map = find $k) {
1913 $map->load; 2317 $map->load if $v;
1914 } 2318 }
1915 2319
1916 delete $MAP_PREFETCH{$path}; 2320 delete $MAP_PREFETCH{$k};
1917 } 2321 }
1918 } 2322 }
1919 undef $MAP_PREFETCHER; 2323 undef $MAP_PREFETCHER;
1920 }; 2324 };
1921 $MAP_PREFETCHER->prio (6); 2325 $MAP_PREFETCHER->prio (6);
1922 2326
1923 () 2327 ()
1924} 2328}
1925 2329
2330# common code, used by both ->save and ->swapout
1926sub save { 2331sub _save {
1927 my ($self) = @_; 2332 my ($self) = @_;
1928
1929 my $lock = cf::lock_acquire "map_data:" . $self->path;
1930 2333
1931 $self->{last_save} = $cf::RUNTIME; 2334 $self->{last_save} = $cf::RUNTIME;
1932 2335
1933 return unless $self->dirty; 2336 return unless $self->dirty;
1934 2337
1940 return if $self->{deny_save}; 2343 return if $self->{deny_save};
1941 2344
1942 local $self->{last_access} = $self->last_access;#d# 2345 local $self->{last_access} = $self->last_access;#d#
1943 2346
1944 cf::async { 2347 cf::async {
2348 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2349 $_->contr->save for $self->players;
1946 }; 2350 };
2351
2352 cf::get_slot 0.02;
1947 2353
1948 if ($uniq) { 2354 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2355 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2356 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2357 } else {
1952 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2358 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
1953 } 2359 }
1954} 2360}
1955 2361
2362sub save {
2363 my ($self) = @_;
2364
2365 my $lock = cf::lock_acquire "map_data:$self->{path}";
2366
2367 $self->_save;
2368}
2369
1956sub swap_out { 2370sub swap_out {
1957 my ($self) = @_; 2371 my ($self) = @_;
1958 2372
1959 # save first because save cedes
1960 $self->save;
1961
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2373 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2374
2375 return if $self->in_memory != cf::MAP_ACTIVE;
2376 return if $self->{deny_save};
1964 return if $self->players; 2377 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY;
1966 return if $self->{deny_save};
1967 2378
2379 # first deactivate the map and "unlink" it from the core
2380 $self->deactivate;
2381 $_->clear_links_to ($self) for values %cf::MAP;
2382 $self->in_memory (cf::MAP_SWAPPED);
2383
2384 # then atomically save
2385 $self->_save;
2386
2387 # then free the map
1968 $self->clear; 2388 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2389}
1971 2390
1972sub reset_at { 2391sub reset_at {
1973 my ($self) = @_; 2392 my ($self) = @_;
1974 2393
1992 2411
1993 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2412 my $lock = cf::lock_acquire "map_data:$self->{path}";
1994 2413
1995 return if $self->players; 2414 return if $self->players;
1996 2415
1997 warn "resetting map ", $self->path; 2416 cf::trace "resetting map ", $self->path, "\n";
1998 2417
1999 $self->in_memory (cf::MAP_SWAPPED); 2418 $self->in_memory (cf::MAP_SWAPPED);
2000 2419
2001 # need to save uniques path 2420 # need to save uniques path
2002 unless ($self->{deny_save}) { 2421 unless ($self->{deny_save}) {
2006 if $uniq; 2425 if $uniq;
2007 } 2426 }
2008 2427
2009 delete $cf::MAP{$self->path}; 2428 delete $cf::MAP{$self->path};
2010 2429
2430 $self->deactivate;
2431 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2432 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2433
2015 $self->unlink_save; 2434 $self->unlink_save;
2016 $self->destroy; 2435 $self->destroy;
2017} 2436}
2018 2437
2019my $nuke_counter = "aaaa"; 2438my $nuke_counter = "aaaa";
2020 2439
2021sub nuke { 2440sub nuke {
2022 my ($self) = @_; 2441 my ($self) = @_;
2023 2442
2443 {
2444 my $lock = cf::lock_acquire "map_data:$self->{path}";
2445
2024 delete $cf::MAP{$self->path}; 2446 delete $cf::MAP{$self->path};
2025 2447
2026 $self->unlink_save; 2448 $self->unlink_save;
2027 2449
2028 bless $self, "cf::map"; 2450 bless $self, "cf::map::wrap";
2029 delete $self->{deny_reset}; 2451 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2452 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2453 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2454 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2455
2034 $cf::MAP{$self->path} = $self; 2456 $cf::MAP{$self->path} = $self;
2457 }
2035 2458
2036 $self->reset; # polite request, might not happen 2459 $self->reset; # polite request, might not happen
2037} 2460}
2038 2461
2039=item $maps = cf::map::tmp_maps 2462=item $maps = cf::map::tmp_maps
2081 2504
2082sub unique_maps() { 2505sub unique_maps() {
2083 [ 2506 [
2084 map { 2507 map {
2085 utf8::decode $_; 2508 utf8::decode $_;
2086 /\.map$/ 2509 s/\.map$//; # TODO future compatibility hack
2510 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2511 ? ()
2087 ? normalise $_ 2512 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2513 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2514 ]
2091} 2515}
2092 2516
2093package cf; 2517=item cf::map::static_maps
2518
2519Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2520file in the shared directory excluding F</styles> and F</editor>). May
2521block.
2522
2523=cut
2524
2525sub static_maps() {
2526 my @dirs = "";
2527 my @maps;
2528
2529 while (@dirs) {
2530 my $dir = shift @dirs;
2531
2532 next if $dir eq "/styles" || $dir eq "/editor";
2533
2534 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2535 or return;
2536
2537 for (@$files) {
2538 s/\.map$// or next;
2539 utf8::decode $_;
2540 push @maps, "$dir/$_";
2541 }
2542
2543 push @dirs, map "$dir/$_", @$dirs;
2544 }
2545
2546 \@maps
2547}
2094 2548
2095=back 2549=back
2096 2550
2097=head3 cf::object 2551=head3 cf::object
2098 2552
2102 2556
2103=over 4 2557=over 4
2104 2558
2105=item $ob->inv_recursive 2559=item $ob->inv_recursive
2106 2560
2107Returns the inventory of the object _and_ their inventories, recursively. 2561Returns the inventory of the object I<and> their inventories, recursively,
2562but I<not> the object itself.
2108 2563
2109=cut 2564=cut
2110 2565
2111sub inv_recursive_; 2566sub inv_recursive_;
2112sub inv_recursive_ { 2567sub inv_recursive_ {
2115 2570
2116sub inv_recursive { 2571sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2572 inv_recursive_ inv $_[0]
2118} 2573}
2119 2574
2575=item $ref = $ob->ref
2576
2577Creates and returns a persistent reference to an object that can be stored as a string.
2578
2579=item $ob = cf::object::deref ($refstring)
2580
2581returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2582even if the object actually exists. May block.
2583
2584=cut
2585
2586sub deref {
2587 my ($ref) = @_;
2588
2589 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2590 my ($uuid, $name) = ($1, $2);
2591 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2592 or return;
2593 $pl->ob->uuid eq $uuid
2594 or return;
2595
2596 $pl->ob
2597 } else {
2598 warn "$ref: cannot resolve object reference\n";
2599 undef
2600 }
2601}
2602
2120package cf; 2603package cf;
2121 2604
2122=back 2605=back
2123 2606
2124=head3 cf::object::player 2607=head3 cf::object::player
2130Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2613Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2131can be C<undef>. Does the right thing when the player is currently in a 2614can be C<undef>. Does the right thing when the player is currently in a
2132dialogue with the given NPC character. 2615dialogue with the given NPC character.
2133 2616
2134=cut 2617=cut
2618
2619our $SAY_CHANNEL = {
2620 id => "say",
2621 title => "Map",
2622 reply => "say ",
2623 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2624};
2625
2626our $CHAT_CHANNEL = {
2627 id => "chat",
2628 title => "Chat",
2629 reply => "chat ",
2630 tooltip => "Player chat and shouts, global to the server.",
2631};
2135 2632
2136# rough implementation of a future "reply" method that works 2633# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2634# with dialog boxes.
2138#TODO: the first argument must go, split into a $npc->reply_to ( method 2635#TODO: the first argument must go, split into a $npc->reply_to ( method
2139sub cf::object::player::reply($$$;$) { 2636sub cf::object::player::reply($$$;$) {
2146 2643
2147 } else { 2644 } else {
2148 my $pl = $self->contr; 2645 my $pl = $self->contr;
2149 2646
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2647 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2648 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2649 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2650
2159 } else { 2651 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2652 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2653 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2654 }
2163 } 2655 }
2656}
2657
2658=item $object->send_msg ($channel, $msg, $color, [extra...])
2659
2660=cut
2661
2662sub cf::object::send_msg {
2663 my $pl = shift->contr
2664 or return;
2665 $pl->send_msg (@_);
2164} 2666}
2165 2667
2166=item $player_object->may ("access") 2668=item $player_object->may ("access")
2167 2669
2168Returns wether the given player is authorized to access resource "access" 2670Returns wether the given player is authorized to access resource "access"
2181 2683
2182=item $player_object->enter_link 2684=item $player_object->enter_link
2183 2685
2184Freezes the player and moves him/her to a special map (C<{link}>). 2686Freezes the player and moves him/her to a special map (C<{link}>).
2185 2687
2186The player should be reasonably safe there for short amounts of time. You 2688The player should be reasonably safe there for short amounts of time (e.g.
2187I<MUST> call C<leave_link> as soon as possible, though. 2689for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2690though, as the player cannot control the character while it is on the link
2691map.
2188 2692
2189Will never block. 2693Will never block.
2190 2694
2191=item $player_object->leave_link ($map, $x, $y) 2695=item $player_object->leave_link ($map, $x, $y)
2192 2696
2212sub cf::object::player::enter_link { 2716sub cf::object::player::enter_link {
2213 my ($self) = @_; 2717 my ($self) = @_;
2214 2718
2215 $self->deactivate_recursive; 2719 $self->deactivate_recursive;
2216 2720
2721 ++$self->{_link_recursion};
2722
2217 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2723 return if UNIVERSAL::isa $self->map, "ext::map_link";
2218 2724
2219 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2725 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2220 if $self->map && $self->map->{path} ne "{link}"; 2726 if $self->map && $self->map->{path} ne "{link}";
2221 2727
2222 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2728 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2223} 2729}
2224 2730
2225sub cf::object::player::leave_link { 2731sub cf::object::player::leave_link {
2226 my ($self, $map, $x, $y) = @_; 2732 my ($self, $map, $x, $y) = @_;
2227 2733
2244 ($x, $y) = (-1, -1) 2750 ($x, $y) = (-1, -1)
2245 unless (defined $x) && (defined $y); 2751 unless (defined $x) && (defined $y);
2246 2752
2247 # use -1 or undef as default coordinates, not 0, 0 2753 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2754 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2755 if $x <= 0 && $y <= 0;
2250 2756
2251 $map->load; 2757 $map->load;
2252 $map->load_diag; 2758 $map->load_neighbours;
2253 2759
2254 return unless $self->contr->active; 2760 return unless $self->contr->active;
2255 $self->activate_recursive;
2256 2761
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2762 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2763 if ($self->enter_map ($map, $x, $y)) {
2259} 2764 # entering was successful
2765 delete $self->{_link_recursion};
2766 # only activate afterwards, to support waiting in hooks
2767 $self->activate_recursive;
2768 }
2260 2769
2770}
2771
2261=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2772=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2262 2773
2263Moves the player to the given map-path and coordinates by first freezing 2774Moves the player to the given map-path and coordinates by first freezing
2264her, loading and preparing them map, calling the provided $check callback 2775her, loading and preparing them map, calling the provided $check callback
2265that has to return the map if sucecssful, and then unfreezes the player on 2776that has to return the map if sucecssful, and then unfreezes the player on
2266the new (success) or old (failed) map position. In either case, $done will 2777the new (success) or old (failed) map position. In either case, $done will
2267be called at the end of this process. 2778be called at the end of this process.
2268 2779
2780Note that $check will be called with a potentially non-loaded map, so if
2781it needs a loaded map it has to call C<< ->load >>.
2782
2269=cut 2783=cut
2270 2784
2271our $GOTOGEN; 2785our $GOTOGEN;
2272 2786
2273sub cf::object::player::goto { 2787sub cf::object::player::goto {
2274 my ($self, $path, $x, $y, $check, $done) = @_; 2788 my ($self, $path, $x, $y, $check, $done) = @_;
2275 2789
2790 if ($self->{_link_recursion} >= $MAX_LINKS) {
2791 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2792 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2793 ($path, $x, $y) = @$EMERGENCY_POSITION;
2794 }
2795
2276 # do generation counting so two concurrent goto's will be executed in-order 2796 # do generation counting so two concurrent goto's will be executed in-order
2277 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2797 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2278 2798
2279 $self->enter_link; 2799 $self->enter_link;
2280 2800
2281 (async { 2801 (async {
2802 $Coro::current->{desc} = "player::goto $path $x $y";
2803
2804 # *tag paths override both path and x|y
2805 if ($path =~ /^\*(.*)$/) {
2806 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2807 my $ob = $obs[rand @obs];
2808
2809 # see if we actually can go there
2810 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2811 $ob = $obs[rand @obs];
2812 } else {
2813 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2814 }
2815 # else put us there anyways for now #d#
2816
2817 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2818 } else {
2819 ($path, $x, $y) = (undef, undef, undef);
2820 }
2821 }
2822
2282 my $map = eval { 2823 my $map = eval {
2283 my $map = cf::map::find $path; 2824 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2284 2825
2285 if ($map) { 2826 if ($map) {
2286 $map = $map->customise_for ($self); 2827 $map = $map->customise_for ($self);
2287 $map = $check->($map) if $check && $map; 2828 $map = $check->($map, $x, $y, $self) if $check && $map;
2288 } else { 2829 } else {
2289 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2830 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2290 } 2831 }
2291 2832
2292 $map 2833 $map
2293 }; 2834 };
2294 2835
2300 if ($gen == $self->{_goto_generation}) { 2841 if ($gen == $self->{_goto_generation}) {
2301 delete $self->{_goto_generation}; 2842 delete $self->{_goto_generation};
2302 $self->leave_link ($map, $x, $y); 2843 $self->leave_link ($map, $x, $y);
2303 } 2844 }
2304 2845
2305 $done->() if $done; 2846 $done->($self) if $done;
2306 })->prio (1); 2847 })->prio (1);
2307} 2848}
2308 2849
2309=item $player_object->enter_exit ($exit_object) 2850=item $player_object->enter_exit ($exit_object)
2310 2851
2330} 2871}
2331 2872
2332sub prepare_random_map { 2873sub prepare_random_map {
2333 my ($exit) = @_; 2874 my ($exit) = @_;
2334 2875
2335 my $guard = cf::lock_acquire "exit_prepare:$exit";
2336
2337 # all this does is basically replace the /! path by 2876 # all this does is basically replace the /! path by
2338 # a new random map path (?random/...) with a seed 2877 # a new random map path (?random/...) with a seed
2339 # that depends on the exit object 2878 # that depends on the exit object
2340 2879
2341 my $rmp = parse_random_map_params $exit->msg; 2880 my $rmp = parse_random_map_params $exit->msg;
2343 if ($exit->map) { 2882 if ($exit->map) {
2344 $rmp->{region} = $exit->region->name; 2883 $rmp->{region} = $exit->region->name;
2345 $rmp->{origin_map} = $exit->map->path; 2884 $rmp->{origin_map} = $exit->map->path;
2346 $rmp->{origin_x} = $exit->x; 2885 $rmp->{origin_x} = $exit->x;
2347 $rmp->{origin_y} = $exit->y; 2886 $rmp->{origin_y} = $exit->y;
2887
2888 $exit->map->touch;
2348 } 2889 }
2349 2890
2350 $rmp->{random_seed} ||= $exit->random_seed; 2891 $rmp->{random_seed} ||= $exit->random_seed;
2351 2892
2352 my $data = cf::to_json $rmp; 2893 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2353 my $md5 = Digest::MD5::md5_hex $data; 2894 my $md5 = Digest::MD5::md5_hex $data;
2354 my $meta = "$RANDOMDIR/$md5.meta"; 2895 my $meta = "$RANDOMDIR/$md5.meta";
2355 2896
2356 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2897 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2357 aio_write $fh, 0, (length $data), $data, 0; 2898 aio_write $fh, 0, (length $data), $data, 0;
2358 undef $fh; 2899 undef $fh;
2359 aio_rename "$meta~", $meta; 2900 aio_rename "$meta~", $meta;
2360 2901
2902 my $slaying = "?random/$md5";
2903
2904 if ($exit->valid) {
2361 $exit->slaying ("?random/$md5"); 2905 $exit->slaying ("?random/$md5");
2362 $exit->msg (undef); 2906 $exit->msg (undef);
2907 }
2363 } 2908 }
2364} 2909}
2365 2910
2366sub cf::object::player::enter_exit { 2911sub cf::object::player::enter_exit {
2367 my ($self, $exit) = @_; 2912 my ($self, $exit) = @_;
2368 2913
2369 return unless $self->type == cf::PLAYER; 2914 return unless $self->type == cf::PLAYER;
2370 2915
2371 if ($exit->slaying eq "/!") {
2372 #TODO: this should de-fi-ni-te-ly not be a sync-job
2373 # the problem is that $exit might not survive long enough
2374 # so it needs to be done right now, right here
2375 cf::sync_job { prepare_random_map $exit };
2376 }
2377
2378 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2379 my $hp = $exit->stats->hp;
2380 my $sp = $exit->stats->sp;
2381
2382 $self->enter_link; 2916 $self->enter_link;
2383 2917
2384 # if exit is damned, update players death & WoR home-position
2385 $self->contr->savebed ($slaying, $hp, $sp)
2386 if $exit->flag (FLAG_DAMNED);
2387
2388 (async { 2918 (async {
2389 $self->deactivate_recursive; # just to be sure 2919 $Coro::current->{desc} = "enter_exit";
2920
2390 unless (eval { 2921 unless (eval {
2922 $self->deactivate_recursive; # just to be sure
2923
2924 my $map = cf::map::normalise $exit->slaying, $exit->map;
2925 my $x = $exit->stats->hp;
2926 my $y = $exit->stats->sp;
2927
2928 # special map handling
2929 my $slaying = $exit->slaying;
2930
2931 # special map handling
2932 if ($slaying eq "/!") {
2933 my $guard = cf::lock_acquire "exit_prepare:$exit";
2934
2935 prepare_random_map $exit
2936 if $slaying eq "/!"; # need to re-check after getting the lock
2937
2938 } elsif ($slaying eq '!up') {
2939 $map = $exit->map->tile_path (cf::TILE_UP);
2940 $x = $exit->x;
2941 $y = $exit->y;
2942
2943 } elsif ($slaying eq '!down') {
2944 $map = $exit->map->tile_path (cf::TILE_DOWN);
2945 $x = $exit->x;
2946 $y = $exit->y;
2947 }
2948
2391 $self->goto ($slaying, $hp, $sp); 2949 $self->goto ($map, $x, $y);
2392 2950
2951 # if exit is damned, update players death & WoR home-position
2952 $self->contr->savebed ($map, $x, $y)
2953 if $exit->flag (cf::FLAG_DAMNED);
2954
2393 1; 2955 1
2394 }) { 2956 }) {
2395 $self->message ("Something went wrong deep within the crossfire server. " 2957 $self->message ("Something went wrong deep within the deliantra server. "
2396 . "I'll try to bring you back to the map you were before. " 2958 . "I'll try to bring you back to the map you were before. "
2397 . "Please report this to the dungeon master!", 2959 . "Please report this to the dungeon master!",
2398 cf::NDI_UNIQUE | cf::NDI_RED); 2960 cf::NDI_UNIQUE | cf::NDI_RED);
2399 2961
2400 warn "ERROR in enter_exit: $@"; 2962 error "ERROR in enter_exit: $@";
2401 $self->leave_link; 2963 $self->leave_link;
2402 } 2964 }
2403 })->prio (1); 2965 })->prio (1);
2404} 2966}
2405 2967
2419 2981
2420 utf8::encode $text; 2982 utf8::encode $text;
2421 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2983 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2422} 2984}
2423 2985
2986=item $client->send_big_packet ($pkt)
2987
2988Like C<send_packet>, but tries to compress large packets, and fragments
2989them as required.
2990
2991=cut
2992
2993our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2994
2995sub cf::client::send_big_packet {
2996 my ($self, $pkt) = @_;
2997
2998 # try lzf for large packets
2999 $pkt = "lzf " . Compress::LZF::compress $pkt
3000 if 1024 <= length $pkt and $self->{can_lzf};
3001
3002 # split very large packets
3003 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3004 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3005 $pkt = "frag";
3006 }
3007
3008 $self->send_packet ($pkt);
3009}
3010
2424=item $client->send_msg ($color, $type, $msg, [extra...]) 3011=item $client->send_msg ($channel, $msg, $color, [extra...])
2425 3012
2426Send a drawinfo or msg packet to the client, formatting the msg for the 3013Send a drawinfo or msg packet to the client, formatting the msg for the
2427client if neccessary. C<$type> should be a string identifying the type of 3014client if neccessary. C<$type> should be a string identifying the type of
2428the message, with C<log> being the default. If C<$color> is negative, suppress 3015the message, with C<log> being the default. If C<$color> is negative, suppress
2429the message unless the client supports the msg packet. 3016the message unless the client supports the msg packet.
2430 3017
2431=cut 3018=cut
2432 3019
3020# non-persistent channels (usually the info channel)
3021our %CHANNEL = (
3022 "c/motd" => {
3023 id => "infobox",
3024 title => "MOTD",
3025 reply => undef,
3026 tooltip => "The message of the day",
3027 },
3028 "c/identify" => {
3029 id => "infobox",
3030 title => "Identify",
3031 reply => undef,
3032 tooltip => "Items recently identified",
3033 },
3034 "c/examine" => {
3035 id => "infobox",
3036 title => "Examine",
3037 reply => undef,
3038 tooltip => "Signs and other items you examined",
3039 },
3040 "c/shopinfo" => {
3041 id => "infobox",
3042 title => "Shop Info",
3043 reply => undef,
3044 tooltip => "What your bargaining skill tells you about the shop",
3045 },
3046 "c/book" => {
3047 id => "infobox",
3048 title => "Book",
3049 reply => undef,
3050 tooltip => "The contents of a note or book",
3051 },
3052 "c/lookat" => {
3053 id => "infobox",
3054 title => "Look",
3055 reply => undef,
3056 tooltip => "What you saw there",
3057 },
3058 "c/who" => {
3059 id => "infobox",
3060 title => "Players",
3061 reply => undef,
3062 tooltip => "Shows players who are currently online",
3063 },
3064 "c/body" => {
3065 id => "infobox",
3066 title => "Body Parts",
3067 reply => undef,
3068 tooltip => "Shows which body parts you posess and are available",
3069 },
3070 "c/statistics" => {
3071 id => "infobox",
3072 title => "Statistics",
3073 reply => undef,
3074 tooltip => "Shows your primary statistics",
3075 },
3076 "c/skills" => {
3077 id => "infobox",
3078 title => "Skills",
3079 reply => undef,
3080 tooltip => "Shows your experience per skill and item power",
3081 },
3082 "c/shopitems" => {
3083 id => "infobox",
3084 title => "Shop Items",
3085 reply => undef,
3086 tooltip => "Shows the items currently for sale in this shop",
3087 },
3088 "c/resistances" => {
3089 id => "infobox",
3090 title => "Resistances",
3091 reply => undef,
3092 tooltip => "Shows your resistances",
3093 },
3094 "c/pets" => {
3095 id => "infobox",
3096 title => "Pets",
3097 reply => undef,
3098 tooltip => "Shows information abotu your pets/a specific pet",
3099 },
3100 "c/perceiveself" => {
3101 id => "infobox",
3102 title => "Perceive Self",
3103 reply => undef,
3104 tooltip => "You gained detailed knowledge about yourself",
3105 },
3106 "c/uptime" => {
3107 id => "infobox",
3108 title => "Uptime",
3109 reply => undef,
3110 tooltip => "How long the server has been running since last restart",
3111 },
3112 "c/mapinfo" => {
3113 id => "infobox",
3114 title => "Map Info",
3115 reply => undef,
3116 tooltip => "Information related to the maps",
3117 },
3118 "c/party" => {
3119 id => "party",
3120 title => "Party",
3121 reply => "gsay ",
3122 tooltip => "Messages and chat related to your party",
3123 },
3124 "c/death" => {
3125 id => "death",
3126 title => "Death",
3127 reply => undef,
3128 tooltip => "Reason for and more info about your most recent death",
3129 },
3130 "c/say" => $SAY_CHANNEL,
3131 "c/chat" => $CHAT_CHANNEL,
3132);
3133
2433sub cf::client::send_msg { 3134sub cf::client::send_msg {
2434 my ($self, $color, $type, $msg, @extra) = @_; 3135 my ($self, $channel, $msg, $color, @extra) = @_;
2435 3136
2436 $msg = $self->pl->expand_cfpod ($msg); 3137 $msg = $self->pl->expand_cfpod ($msg)
3138 unless $color & cf::NDI_VERBATIM;
3139
3140 $color &= cf::NDI_CLIENT_MASK; # just in case...
3141
3142 # check predefined channels, for the benefit of C
3143 if ($CHANNEL{$channel}) {
3144 $channel = $CHANNEL{$channel};
3145
3146 $self->ext_msg (channel_info => $channel);
3147 $channel = $channel->{id};
3148
3149 } elsif (ref $channel) {
3150 # send meta info to client, if not yet sent
3151 unless (exists $self->{channel}{$channel->{id}}) {
3152 $self->{channel}{$channel->{id}} = $channel;
3153 $self->ext_msg (channel_info => $channel);
3154 }
3155
3156 $channel = $channel->{id};
3157 }
2437 3158
2438 return unless @extra || length $msg; 3159 return unless @extra || length $msg;
2439 3160
2440 if ($self->can_msg) { 3161 # default colour, mask it out
2441 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 3162 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2442 } else { 3163 if $color & cf::NDI_DEF;
2443 # replace some tags by gcfclient-compatible ones
2444 for ($msg) {
2445 1 while
2446 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2447 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2448 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2449 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2450 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2451 }
2452 3164
2453 if ($color >= 0) { 3165 my $pkt = "msg "
2454 if (0 && $msg =~ /\[/) { 3166 . $self->{json_coder}->encode (
2455 $self->send_packet ("drawextinfo $color 4 0 $msg") 3167 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2456 } else { 3168 );
2457 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2458 $self->send_packet ("drawinfo $color $msg")
2459 }
2460 }
2461 }
2462}
2463 3169
3170 $self->send_big_packet ($pkt);
3171}
3172
2464=item $client->ext_event ($type, %msg) 3173=item $client->ext_msg ($type, @msg)
2465 3174
2466Sends an ext event to the client. 3175Sends an ext event to the client.
2467 3176
2468=cut 3177=cut
2469 3178
2470sub cf::client::ext_event($$%) { 3179sub cf::client::ext_msg($$@) {
2471 my ($self, $type, %msg) = @_; 3180 my ($self, $type, @msg) = @_;
2472 3181
2473 return unless $self->extcmd; 3182 if ($self->extcmd == 2) {
2474 3183 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3184 } elsif ($self->extcmd == 1) { # TODO: remove
2475 $msg{msgtype} = "event_$type"; 3185 push @msg, msgtype => "event_$type";
2476 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3186 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3187 }
3188}
3189
3190=item $client->ext_reply ($msgid, @msg)
3191
3192Sends an ext reply to the client.
3193
3194=cut
3195
3196sub cf::client::ext_reply($$@) {
3197 my ($self, $id, @msg) = @_;
3198
3199 if ($self->extcmd == 2) {
3200 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3201 } elsif ($self->extcmd == 1) {
3202 #TODO: version 1, remove
3203 unshift @msg, msgtype => "reply", msgid => $id;
3204 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3205 }
2477} 3206}
2478 3207
2479=item $success = $client->query ($flags, "text", \&cb) 3208=item $success = $client->query ($flags, "text", \&cb)
2480 3209
2481Queues a query to the client, calling the given callback with 3210Queues a query to the client, calling the given callback with
2536 my ($ns, $buf) = @_; 3265 my ($ns, $buf) = @_;
2537 3266
2538 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3267 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2539 3268
2540 if (ref $msg) { 3269 if (ref $msg) {
3270 my ($type, $reply, @payload) =
3271 "ARRAY" eq ref $msg
3272 ? @$msg
3273 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3274
3275 my @reply;
3276
2541 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3277 if (my $cb = $EXTICMD{$type}) {
2542 if (my %reply = $cb->($ns, $msg)) { 3278 @reply = $cb->($ns, @payload);
2543 $reply{msgid} = $msg->{msgid};
2544 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2545 }
2546 } 3279 }
3280
3281 $ns->ext_reply ($reply, @reply)
3282 if $reply;
3283
2547 } else { 3284 } else {
2548 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3285 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2549 } 3286 }
2550 3287
2551 cf::override; 3288 cf::override;
2552 }, 3289 },
2553); 3290);
2573 3310
2574 $coro 3311 $coro
2575} 3312}
2576 3313
2577cf::client->attach ( 3314cf::client->attach (
2578 on_destroy => sub { 3315 on_client_destroy => sub {
2579 my ($ns) = @_; 3316 my ($ns) = @_;
2580 3317
2581 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3318 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2582 }, 3319 },
2583); 3320);
2598our $safe = new Safe "safe"; 3335our $safe = new Safe "safe";
2599our $safe_hole = new Safe::Hole; 3336our $safe_hole = new Safe::Hole;
2600 3337
2601$SIG{FPE} = 'IGNORE'; 3338$SIG{FPE} = 'IGNORE';
2602 3339
2603$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3340$safe->permit_only (Opcode::opset qw(
3341 :base_core :base_mem :base_orig :base_math :base_loop
3342 grepstart grepwhile mapstart mapwhile
3343 sort time
3344));
2604 3345
2605# here we export the classes and methods available to script code 3346# here we export the classes and methods available to script code
2606 3347
2607=pod 3348=pod
2608 3349
2609The following functions and methods are available within a safe environment: 3350The following functions and methods are available within a safe environment:
2610 3351
2611 cf::object 3352 cf::object
2612 contr pay_amount pay_player map x y force_find force_add 3353 contr pay_amount pay_player map x y force_find force_add destroy
2613 insert remove 3354 insert remove name archname title slaying race decrease split
3355 value
2614 3356
2615 cf::object::player 3357 cf::object::player
2616 player 3358 player
2617 3359
2618 cf::player 3360 cf::player
2623 3365
2624=cut 3366=cut
2625 3367
2626for ( 3368for (
2627 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3369 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2628 insert remove)], 3370 insert remove inv nrof name archname title slaying race
3371 decrease split destroy change_exp value msg lore send_msg)],
2629 ["cf::object::player" => qw(player)], 3372 ["cf::object::player" => qw(player)],
2630 ["cf::player" => qw(peaceful)], 3373 ["cf::player" => qw(peaceful send_msg)],
2631 ["cf::map" => qw(trigger)], 3374 ["cf::map" => qw(trigger)],
2632) { 3375) {
2633 no strict 'refs';
2634 my ($pkg, @funs) = @$_; 3376 my ($pkg, @funs) = @$_;
2635 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3377 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2636 for @funs; 3378 for @funs;
2637} 3379}
2638 3380
2653 3395
2654 my $qcode = $code; 3396 my $qcode = $code;
2655 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3397 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2656 $qcode =~ s/\n/\\n/g; 3398 $qcode =~ s/\n/\\n/g;
2657 3399
3400 %vars = (_dummy => 0) unless %vars;
3401
3402 my @res;
2658 local $_; 3403 local $_;
2659 local @safe::cf::_safe_eval_args = values %vars;
2660 3404
2661 my $eval = 3405 my $eval =
2662 "do {\n" 3406 "do {\n"
2663 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3407 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2664 . "#line 0 \"{$qcode}\"\n" 3408 . "#line 0 \"{$qcode}\"\n"
2665 . $code 3409 . $code
2666 . "\n}" 3410 . "\n}"
2667 ; 3411 ;
2668 3412
3413 if ($CFG{safe_eval}) {
2669 sub_generation_inc; 3414 sub_generation_inc;
3415 local @safe::cf::_safe_eval_args = values %vars;
2670 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3416 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2671 sub_generation_inc; 3417 sub_generation_inc;
3418 } else {
3419 local @cf::_safe_eval_args = values %vars;
3420 @res = wantarray ? eval eval : scalar eval $eval;
3421 }
2672 3422
2673 if ($@) { 3423 if ($@) {
2674 warn "$@"; 3424 warn "$@",
2675 warn "while executing safe code '$code'\n"; 3425 "while executing safe code '$code'\n",
2676 warn "with arguments " . (join " ", %vars) . "\n"; 3426 "with arguments " . (join " ", %vars) . "\n";
2677 } 3427 }
2678 3428
2679 wantarray ? @res : $res[0] 3429 wantarray ? @res : $res[0]
2680} 3430}
2681 3431
2695=cut 3445=cut
2696 3446
2697sub register_script_function { 3447sub register_script_function {
2698 my ($fun, $cb) = @_; 3448 my ($fun, $cb) = @_;
2699 3449
2700 no strict 'refs'; 3450 $fun = "safe::$fun" if $CFG{safe_eval};
2701 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3451 *$fun = $safe_hole->wrap ($cb);
2702} 3452}
2703 3453
2704=back 3454=back
2705 3455
2706=cut 3456=cut
2709# the server's init and main functions 3459# the server's init and main functions
2710 3460
2711sub load_facedata($) { 3461sub load_facedata($) {
2712 my ($path) = @_; 3462 my ($path) = @_;
2713 3463
3464 # HACK to clear player env face cache, we need some signal framework
3465 # for this (global event?)
3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3467
3468 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3469
2714 warn "loading facedata from $path\n"; 3470 trace "loading facedata from $path\n";
2715 3471
2716 my $facedata; 3472 my $facedata = decode_storable load_file $path;
2717 0 < aio_load $path, $facedata
2718 or die "$path: $!";
2719
2720 $facedata = Coro::Storable::thaw $facedata;
2721 3473
2722 $facedata->{version} == 2 3474 $facedata->{version} == 2
2723 or cf::cleanup "$path: version mismatch, cannot proceed."; 3475 or cf::cleanup "$path: version mismatch, cannot proceed.";
2724 3476
3477 # patch in the exptable
3478 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3479 $facedata->{resource}{"res/exp_table"} = {
3480 type => FT_RSRC,
3481 data => $exp_table,
3482 hash => (Digest::MD5::md5 $exp_table),
3483 };
3484 cf::cede_to_tick;
3485
2725 { 3486 {
2726 my $faces = $facedata->{faceinfo}; 3487 my $faces = $facedata->{faceinfo};
2727 3488
2728 while (my ($face, $info) = each %$faces) { 3489 while (my ($face, $info) = each %$faces) {
2729 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3490 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3491
2730 cf::face::set_visibility $idx, $info->{visibility}; 3492 cf::face::set_visibility $idx, $info->{visibility};
2731 cf::face::set_magicmap $idx, $info->{magicmap}; 3493 cf::face::set_magicmap $idx, $info->{magicmap};
2732 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3494 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2733 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3495 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3496 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
2734 3497
2735 cf::cede_to_tick; 3498 cf::cede_to_tick;
2736 } 3499 }
2737 3500
2738 while (my ($face, $info) = each %$faces) { 3501 while (my ($face, $info) = each %$faces) {
2739 next unless $info->{smooth}; 3502 next unless $info->{smooth};
3503
2740 my $idx = cf::face::find $face 3504 my $idx = cf::face::find $face
2741 or next; 3505 or next;
3506
2742 if (my $smooth = cf::face::find $info->{smooth}) { 3507 if (my $smooth = cf::face::find $info->{smooth}) {
2743 cf::face::set_smooth $idx, $smooth; 3508 cf::face::set_smooth $idx, $smooth;
2744 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3509 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2745 } else { 3510 } else {
2746 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3511 error "smooth face '$info->{smooth}' not found for face '$face'";
2747 } 3512 }
2748 3513
2749 cf::cede_to_tick; 3514 cf::cede_to_tick;
2750 } 3515 }
2751 } 3516 }
2760 3525
2761 cf::anim::invalidate_all; # d'oh 3526 cf::anim::invalidate_all; # d'oh
2762 } 3527 }
2763 3528
2764 { 3529 {
2765 # TODO: for gcfclient pleasure, we should give resources
2766 # that gcfclient doesn't grok a >10000 face index.
2767 my $res = $facedata->{resource}; 3530 my $res = $facedata->{resource};
2768 my $enc = JSON::XS->new->utf8->canonical;
2769 3531
2770 while (my ($name, $info) = each %$res) { 3532 while (my ($name, $info) = each %$res) {
2771 my $meta = $enc->encode ({ 3533 if (defined $info->{type}) {
2772 name => $name,
2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO#
2775 });
2776
2777 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3534 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778 3535
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3536 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3537 cf::face::set_type $idx, $info->{type};
2782 } else { 3538 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data}; 3539 $RESOURCE{$name} = $info; # unused
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2786 cf::face::set_type $idx, 1;
2787 cf::face::set_data $idx, 0, $data, $chk;
2788 } 3540 }
2789 3541
2790 cf::cede_to_tick; 3542 cf::cede_to_tick;
2791 } 3543 }
2792 } 3544 }
2793 3545
3546 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3547
2794 1 3548 1
2795} 3549}
2796 3550
3551register_exticmd fx_want => sub {
3552 my ($ns, $want) = @_;
3553
3554 while (my ($k, $v) = each %$want) {
3555 $ns->fx_want ($k, $v);
3556 }
3557};
3558
3559sub load_resource_file($) {
3560 my $guard = lock_acquire "load_resource_file";
3561
3562 my $status = load_resource_file_ $_[0];
3563 get_slot 0.1, 100;
3564 cf::arch::commit_load;
3565
3566 $status
3567}
3568
2797sub reload_regions { 3569sub reload_regions {
3570 # HACK to clear player env face cache, we need some signal framework
3571 # for this (global event?)
3572 %ext::player_env::MUSIC_FACE_CACHE = ();
3573
2798 load_resource_file "$MAPDIR/regions" 3574 load_resource_file "$MAPDIR/regions"
2799 or die "unable to load regions file\n"; 3575 or die "unable to load regions file\n";
2800 3576
2801 for (cf::region::list) { 3577 for (cf::region::list) {
2802 $_->{match} = qr/$_->{match}/ 3578 $_->{match} = qr/$_->{match}/
2810} 3586}
2811 3587
2812sub reload_archetypes { 3588sub reload_archetypes {
2813 load_resource_file "$DATADIR/archetypes" 3589 load_resource_file "$DATADIR/archetypes"
2814 or die "unable to load archetypes\n"; 3590 or die "unable to load archetypes\n";
2815 #d# NEED to laod twice to resolve forward references
2816 # this really needs to be done in an extra post-pass
2817 # (which needs to be synchronous, so solve it differently)
2818 load_resource_file "$DATADIR/archetypes"
2819 or die "unable to load archetypes\n";
2820} 3591}
2821 3592
2822sub reload_treasures { 3593sub reload_treasures {
2823 load_resource_file "$DATADIR/treasures" 3594 load_resource_file "$DATADIR/treasures"
2824 or die "unable to load treasurelists\n"; 3595 or die "unable to load treasurelists\n";
2825} 3596}
2826 3597
3598sub reload_sound {
3599 trace "loading sound config from $DATADIR/sound\n";
3600
3601 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3602
3603 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3604 my $sound = $soundconf->{compat}[$_]
3605 or next;
3606
3607 my $face = cf::face::find "sound/$sound->[1]";
3608 cf::sound::set $sound->[0] => $face;
3609 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3610 }
3611
3612 while (my ($k, $v) = each %{$soundconf->{event}}) {
3613 my $face = cf::face::find "sound/$v";
3614 cf::sound::set $k => $face;
3615 }
3616}
3617
2827sub reload_resources { 3618sub reload_resources {
2828 warn "reloading resource files...\n"; 3619 trace "reloading resource files...\n";
2829 3620
3621 reload_exp_table;
3622 reload_materials;
3623 reload_facedata;
3624 reload_sound;
3625 reload_archetypes;
2830 reload_regions; 3626 reload_regions;
2831 reload_facedata;
2832 #reload_archetypes;#d#
2833 reload_archetypes;
2834 reload_treasures; 3627 reload_treasures;
2835 3628
2836 warn "finished reloading resource files\n"; 3629 trace "finished reloading resource files\n";
2837} 3630}
2838 3631
2839sub init { 3632sub reload_config {
2840 reload_resources; 3633 trace "reloading config file...\n";
2841}
2842 3634
2843sub cfg_load { 3635 my $config = load_file "$CONFDIR/config";
2844 open my $fh, "<:utf8", "$CONFDIR/config" 3636 utf8::decode $config;
2845 or return; 3637 *CFG = decode_yaml $config;
2846 3638
2847 local $/;
2848 *CFG = YAML::Syck::Load <$fh>;
2849
2850 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3639 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
2851 3640
2852 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3641 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2853 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3642 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2854 3643
2855 if (exists $CFG{mlockall}) { 3644 if (exists $CFG{mlockall}) {
2859 }; 3648 };
2860 warn $@ if $@; 3649 warn $@ if $@;
2861 } 3650 }
2862} 3651}
2863 3652
3653sub pidfile() {
3654 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3655 or die "$PIDFILE: $!";
3656 flock $fh, &Fcntl::LOCK_EX
3657 or die "$PIDFILE: flock: $!";
3658 $fh
3659}
3660
3661# make sure only one server instance is running at any one time
3662sub atomic {
3663 my $fh = pidfile;
3664
3665 my $pid = <$fh>;
3666 kill 9, $pid if $pid > 0;
3667
3668 seek $fh, 0, 0;
3669 print $fh $$;
3670}
3671
3672sub main_loop {
3673 trace "EV::loop starting\n";
3674 if (1) {
3675 EV::loop;
3676 }
3677 trace "EV::loop returned\n";
3678 goto &main_loop unless $REALLY_UNLOOP;
3679}
3680
2864sub main { 3681sub main {
3682 cf::init_globals; # initialise logging
3683
3684 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685 LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688
3689 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3690
2865 # we must not ever block the main coroutine 3691 # we must not ever block the main coroutine
2866 local $Coro::idle = sub { 3692 local $Coro::idle = sub {
2867 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3693 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2868 (async { 3694 (async {
2869 Event::one_event; 3695 $Coro::current->{desc} = "IDLE BUG HANDLER";
3696 EV::loop EV::LOOP_ONESHOT;
2870 })->prio (Coro::PRIO_MAX); 3697 })->prio (Coro::PRIO_MAX);
2871 }; 3698 };
2872 3699
2873 cfg_load; 3700 evthread_start IO::AIO::poll_fileno;
3701
3702 cf::sync_job {
3703 cf::incloader::init ();
3704
3705 cf::init_anim;
3706 cf::init_attackmess;
3707 cf::init_dynamic;
3708
3709 cf::load_settings;
3710
3711 reload_resources;
3712 reload_config;
2874 db_init; 3713 db_init;
3714
3715 cf::init_uuid;
3716 cf::init_signals;
3717 cf::init_skills;
3718
3719 cf::init_beforeplay;
3720
3721 atomic;
3722
2875 load_extensions; 3723 load_extensions;
2876 3724
2877 $TICK_WATCHER->start; 3725 utime time, time, $RUNTIMEFILE;
2878 Event::loop; 3726
3727 # no (long-running) fork's whatsoever before this point(!)
3728 use POSIX ();
3729 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3730
3731 cf::_post_init 0;
3732 };
3733
3734 cf::object::thawer::errors_are_fatal 0;
3735 info "parse errors in files are no longer fatal from this point on.\n";
3736
3737 my $free_main; $free_main = EV::idle sub {
3738 undef $free_main;
3739 undef &main; # free gobs of memory :)
3740 };
3741
3742 goto &main_loop;
2879} 3743}
2880 3744
2881############################################################################# 3745#############################################################################
2882# initialisation and cleanup 3746# initialisation and cleanup
2883 3747
2884# install some emergency cleanup handlers 3748# install some emergency cleanup handlers
2885BEGIN { 3749BEGIN {
3750 our %SIGWATCHER = ();
2886 for my $signal (qw(INT HUP TERM)) { 3751 for my $signal (qw(INT HUP TERM)) {
2887 Event->signal ( 3752 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2888 reentrant => 0,
2889 data => WF_AUTOCANCEL,
2890 signal => $signal,
2891 prio => 0,
2892 cb => sub {
2893 cf::cleanup "SIG$signal"; 3753 cf::cleanup "SIG$signal";
2894 },
2895 ); 3754 };
2896 } 3755 }
2897} 3756}
2898 3757
2899sub write_runtime { 3758sub write_runtime_sync {
2900 my $runtime = "$LOCALDIR/runtime"; 3759 my $t0 = AE::time;
2901 3760
2902 # first touch the runtime file to show we are still running: 3761 # first touch the runtime file to show we are still running:
2903 # the fsync below can take a very very long time. 3762 # the fsync below can take a very very long time.
2904 3763
2905 IO::AIO::aio_utime $runtime, undef, undef; 3764 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2906 3765
2907 my $guard = cf::lock_acquire "write_runtime"; 3766 my $guard = cf::lock_acquire "write_runtime";
2908 3767
2909 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3768 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2910 or return; 3769 or return;
2911 3770
2912 my $value = $cf::RUNTIME + 90 + 10; 3771 my $value = $cf::RUNTIME + 90 + 10;
2913 # 10 is the runtime save interval, for a monotonic clock 3772 # 10 is the runtime save interval, for a monotonic clock
2914 # 60 allows for the watchdog to kill the server. 3773 # 60 allows for the watchdog to kill the server.
2924 aio_utime $fh, undef, undef; 3783 aio_utime $fh, undef, undef;
2925 3784
2926 close $fh 3785 close $fh
2927 or return; 3786 or return;
2928 3787
2929 aio_rename "$runtime~", $runtime 3788 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2930 and return; 3789 and return;
2931 3790
2932 warn "runtime file written.\n"; 3791 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
2933 3792
2934 1 3793 1
3794}
3795
3796our $uuid_lock;
3797our $uuid_skip;
3798
3799sub write_uuid_sync($) {
3800 $uuid_skip ||= $_[0];
3801
3802 return if $uuid_lock;
3803 local $uuid_lock = 1;
3804
3805 my $uuid = "$LOCALDIR/uuid";
3806
3807 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3808 or return;
3809
3810 my $value = uuid_seq uuid_cur;
3811
3812 unless ($value) {
3813 info "cowardly refusing to write zero uuid value!\n";
3814 return;
3815 }
3816
3817 my $value = uuid_str $value + $uuid_skip;
3818 $uuid_skip = 0;
3819
3820 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3821 and return;
3822
3823 # always fsync - this file is important
3824 aio_fsync $fh
3825 and return;
3826
3827 close $fh
3828 or return;
3829
3830 aio_rename "$uuid~", $uuid
3831 and return;
3832
3833 trace "uuid file written ($value).\n";
3834
3835 1
3836
3837}
3838
3839sub write_uuid($$) {
3840 my ($skip, $sync) = @_;
3841
3842 $sync ? write_uuid_sync $skip
3843 : async { write_uuid_sync $skip };
2935} 3844}
2936 3845
2937sub emergency_save() { 3846sub emergency_save() {
2938 my $freeze_guard = cf::freeze_mainloop; 3847 my $freeze_guard = cf::freeze_mainloop;
2939 3848
2940 warn "enter emergency perl save\n"; 3849 info "emergency_perl_save: enter\n";
3850
3851 # this is a trade-off: we want to be very quick here, so
3852 # save all maps without fsync, and later call a global sync
3853 # (which in turn might be very very slow)
3854 local $USE_FSYNC = 0;
2941 3855
2942 cf::sync_job { 3856 cf::sync_job {
3857 cf::write_runtime_sync; # external watchdog should not bark
3858
2943 # use a peculiar iteration method to avoid tripping on perl 3859 # use a peculiar iteration method to avoid tripping on perl
2944 # refcount bugs in for. also avoids problems with players 3860 # refcount bugs in for. also avoids problems with players
2945 # and maps saved/destroyed asynchronously. 3861 # and maps saved/destroyed asynchronously.
2946 warn "begin emergency player save\n"; 3862 info "emergency_perl_save: begin player save\n";
2947 for my $login (keys %cf::PLAYER) { 3863 for my $login (keys %cf::PLAYER) {
2948 my $pl = $cf::PLAYER{$login} or next; 3864 my $pl = $cf::PLAYER{$login} or next;
2949 $pl->valid or next; 3865 $pl->valid or next;
3866 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2950 $pl->save; 3867 $pl->save;
2951 } 3868 }
2952 warn "end emergency player save\n"; 3869 info "emergency_perl_save: end player save\n";
2953 3870
2954 warn "begin emergency map save\n"; 3871 cf::write_runtime_sync; # external watchdog should not bark
3872
3873 info "emergency_perl_save: begin map save\n";
2955 for my $path (keys %cf::MAP) { 3874 for my $path (keys %cf::MAP) {
2956 my $map = $cf::MAP{$path} or next; 3875 my $map = $cf::MAP{$path} or next;
2957 $map->valid or next; 3876 $map->valid or next;
2958 $map->save; 3877 $map->save;
2959 } 3878 }
2960 warn "end emergency map save\n"; 3879 info "emergency_perl_save: end map save\n";
2961 3880
2962 warn "begin emergency database checkpoint\n"; 3881 cf::write_runtime_sync; # external watchdog should not bark
3882
3883 info "emergency_perl_save: begin database checkpoint\n";
2963 BDB::db_env_txn_checkpoint $DB_ENV; 3884 BDB::db_env_txn_checkpoint $DB_ENV;
2964 warn "end emergency database checkpoint\n"; 3885 info "emergency_perl_save: end database checkpoint\n";
3886
3887 info "emergency_perl_save: begin write uuid\n";
3888 write_uuid_sync 1;
3889 info "emergency_perl_save: end write uuid\n";
3890
3891 cf::write_runtime_sync; # external watchdog should not bark
3892
3893 trace "emergency_perl_save: syncing database to disk";
3894 BDB::db_env_txn_checkpoint $DB_ENV;
3895
3896 info "emergency_perl_save: starting sync\n";
3897 IO::AIO::aio_sync sub {
3898 info "emergency_perl_save: finished sync\n";
3899 };
3900
3901 cf::write_runtime_sync; # external watchdog should not bark
3902
3903 trace "emergency_perl_save: flushing outstanding aio requests";
3904 while (IO::AIO::nreqs || BDB::nreqs) {
3905 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3906 }
3907
3908 cf::write_runtime_sync; # external watchdog should not bark
2965 }; 3909 };
2966 3910
2967 warn "leave emergency perl save\n"; 3911 info "emergency_perl_save: leave\n";
2968} 3912}
2969 3913
2970sub post_cleanup { 3914sub post_cleanup {
2971 my ($make_core) = @_; 3915 my ($make_core) = @_;
2972 3916
3917 IO::AIO::flush;
3918
2973 warn Carp::longmess "post_cleanup backtrace" 3919 error Carp::longmess "post_cleanup backtrace"
2974 if $make_core; 3920 if $make_core;
3921
3922 my $fh = pidfile;
3923 unlink $PIDFILE if <$fh> == $$;
3924}
3925
3926# a safer delete_package, copied from Symbol
3927sub clear_package($) {
3928 my $pkg = shift;
3929
3930 # expand to full symbol table name if needed
3931 unless ($pkg =~ /^main::.*::$/) {
3932 $pkg = "main$pkg" if $pkg =~ /^::/;
3933 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3934 $pkg .= '::' unless $pkg =~ /::$/;
3935 }
3936
3937 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3938 my $stem_symtab = *{$stem}{HASH};
3939
3940 defined $stem_symtab and exists $stem_symtab->{$leaf}
3941 or return;
3942
3943 # clear all symbols
3944 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3945 for my $name (keys %$leaf_symtab) {
3946 _gv_clear *{"$pkg$name"};
3947# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3948 }
2975} 3949}
2976 3950
2977sub do_reload_perl() { 3951sub do_reload_perl() {
2978 # can/must only be called in main 3952 # can/must only be called in main
2979 if ($Coro::current != $Coro::main) { 3953 unless (in_main) {
2980 warn "can only reload from main coroutine"; 3954 error "can only reload from main coroutine";
2981 return; 3955 return;
2982 } 3956 }
2983 3957
2984 warn "reloading..."; 3958 return if $RELOAD++;
2985 3959
2986 warn "entering sync_job"; 3960 my $t1 = AE::time;
2987 3961
3962 while ($RELOAD) {
3963 cf::get_slot 0.1, -1, "reload_perl";
3964 info "perl_reload: reloading...";
3965
3966 trace "perl_reload: entering sync_job";
3967
2988 cf::sync_job { 3968 cf::sync_job {
2989 cf::write_runtime; # external watchdog should not bark
2990 cf::emergency_save; 3969 #cf::emergency_save;
2991 cf::write_runtime; # external watchdog should not bark
2992 3970
2993 warn "syncing database to disk";
2994 BDB::db_env_txn_checkpoint $DB_ENV;
2995
2996 # if anything goes wrong in here, we should simply crash as we already saved
2997
2998 warn "cancelling all WF_AUTOCANCEL watchers";
2999 for (Event::all_watchers) {
3000 $_->cancel if $_->data & WF_AUTOCANCEL;
3001 }
3002
3003 warn "flushing outstanding aio requests";
3004 for (;;) {
3005 BDB::flush;
3006 IO::AIO::flush;
3007 Coro::cede;
3008 last unless IO::AIO::nreqs || BDB::nreqs;
3009 warn "iterate...";
3010 }
3011
3012 ++$RELOAD;
3013
3014 warn "cancelling all extension coros"; 3971 trace "perl_reload: cancelling all extension coros";
3015 $_->cancel for values %EXT_CORO; 3972 $_->cancel for values %EXT_CORO;
3016 %EXT_CORO = (); 3973 %EXT_CORO = ();
3017 3974
3018 warn "removing commands"; 3975 trace "perl_reload: removing commands";
3019 %COMMAND = (); 3976 %COMMAND = ();
3020 3977
3021 warn "removing ext/exti commands"; 3978 trace "perl_reload: removing ext/exti commands";
3022 %EXTCMD = (); 3979 %EXTCMD = ();
3023 %EXTICMD = (); 3980 %EXTICMD = ();
3024 3981
3025 warn "unloading/nuking all extensions"; 3982 trace "perl_reload: unloading/nuking all extensions";
3026 for my $pkg (@EXTS) { 3983 for my $pkg (@EXTS) {
3027 warn "... unloading $pkg"; 3984 trace "... unloading $pkg";
3028 3985
3029 if (my $cb = $pkg->can ("unload")) { 3986 if (my $cb = $pkg->can ("unload")) {
3030 eval { 3987 eval {
3031 $cb->($pkg); 3988 $cb->($pkg);
3032 1 3989 1
3033 } or warn "$pkg unloaded, but with errors: $@"; 3990 } or error "$pkg unloaded, but with errors: $@";
3991 }
3992
3993 trace "... clearing $pkg";
3994 clear_package $pkg;
3034 } 3995 }
3035 3996
3036 warn "... nuking $pkg";
3037 Symbol::delete_package $pkg;
3038 }
3039
3040 warn "unloading all perl modules loaded from $LIBDIR"; 3997 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3041 while (my ($k, $v) = each %INC) { 3998 while (my ($k, $v) = each %INC) {
3042 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 3999 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3043 4000
3044 warn "... unloading $k"; 4001 trace "... unloading $k";
3045 delete $INC{$k}; 4002 delete $INC{$k};
3046 4003
3047 $k =~ s/\.pm$//; 4004 $k =~ s/\.pm$//;
3048 $k =~ s/\//::/g; 4005 $k =~ s/\//::/g;
3049 4006
3050 if (my $cb = $k->can ("unload_module")) { 4007 if (my $cb = $k->can ("unload_module")) {
3051 $cb->(); 4008 $cb->();
4009 }
4010
4011 clear_package $k;
3052 } 4012 }
3053 4013
3054 Symbol::delete_package $k;
3055 }
3056
3057 warn "getting rid of safe::, as good as possible"; 4014 trace "perl_reload: getting rid of safe::, as good as possible";
3058 Symbol::delete_package "safe::$_" 4015 clear_package "safe::$_"
3059 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4016 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3060 4017
3061 warn "unloading cf.pm \"a bit\""; 4018 trace "perl_reload: unloading cf.pm \"a bit\"";
3062 delete $INC{"cf.pm"}; 4019 delete $INC{"cf.pm"};
3063 delete $INC{"cf/pod.pm"}; 4020 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3064 4021
3065 # don't, removes xs symbols, too, 4022 # don't, removes xs symbols, too,
3066 # and global variables created in xs 4023 # and global variables created in xs
3067 #Symbol::delete_package __PACKAGE__; 4024 #clear_package __PACKAGE__;
3068 4025
3069 warn "unload completed, starting to reload now"; 4026 info "perl_reload: unload completed, starting to reload now";
3070 4027
3071 warn "reloading cf.pm"; 4028 trace "perl_reload: reloading cf.pm";
3072 require cf; 4029 require cf;
3073 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4030 cf::_connect_to_perl_1;
3074 4031
3075 warn "loading config and database again"; 4032 trace "perl_reload: loading config and database again";
3076 cf::cfg_load; 4033 cf::reload_config;
3077 4034
3078 warn "loading extensions"; 4035 trace "perl_reload: loading extensions";
3079 cf::load_extensions; 4036 cf::load_extensions;
3080 4037
4038 if ($REATTACH_ON_RELOAD) {
3081 warn "reattaching attachments to objects/players"; 4039 trace "perl_reload: reattaching attachments to objects/players";
3082 _global_reattach; # objects, sockets 4040 _global_reattach; # objects, sockets
3083 warn "reattaching attachments to maps"; 4041 trace "perl_reload: reattaching attachments to maps";
3084 reattach $_ for values %MAP; 4042 reattach $_ for values %MAP;
3085 warn "reattaching attachments to players"; 4043 trace "perl_reload: reattaching attachments to players";
3086 reattach $_ for values %PLAYER; 4044 reattach $_ for values %PLAYER;
4045 }
3087 4046
3088 warn "leaving sync_job"; 4047 cf::_post_init 1;
3089 4048
4049 trace "perl_reload: leaving sync_job";
4050
3090 1 4051 1
3091 } or do { 4052 } or do {
3092 warn $@; 4053 error $@;
3093 warn "error while reloading, exiting."; 4054 cf::cleanup "perl_reload: error, exiting.";
3094 exit 1; 4055 };
4056
4057 --$RELOAD;
3095 }; 4058 }
3096 4059
3097 warn "reloaded"; 4060 $t1 = AE::time - $t1;
4061 info "perl_reload: completed in ${t1}s\n";
3098}; 4062};
3099 4063
3100our $RELOAD_WATCHER; # used only during reload 4064our $RELOAD_WATCHER; # used only during reload
3101 4065
3102sub reload_perl() { 4066sub reload_perl() {
3103 # doing reload synchronously and two reloads happen back-to-back, 4067 # doing reload synchronously and two reloads happen back-to-back,
3104 # coro crashes during coro_state_free->destroy here. 4068 # coro crashes during coro_state_free->destroy here.
3105 4069
3106 $RELOAD_WATCHER ||= Event->timer ( 4070 $RELOAD_WATCHER ||= cf::async {
3107 reentrant => 0, 4071 Coro::AIO::aio_wait cache_extensions;
3108 after => 0, 4072
3109 data => WF_AUTOCANCEL, 4073 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3110 cb => sub {
3111 do_reload_perl; 4074 do_reload_perl;
3112 undef $RELOAD_WATCHER; 4075 undef $RELOAD_WATCHER;
3113 }, 4076 };
3114 ); 4077 };
3115} 4078}
3116 4079
3117register_command "reload" => sub { 4080register_command "reload" => sub {
3118 my ($who, $arg) = @_; 4081 my ($who, $arg) = @_;
3119 4082
3120 if ($who->flag (FLAG_WIZ)) { 4083 if ($who->flag (FLAG_WIZ)) {
3121 $who->message ("reloading server."); 4084 $who->message ("reloading server.");
4085 async {
4086 $Coro::current->{desc} = "perl_reload";
3122 async { reload_perl }; 4087 reload_perl;
4088 };
3123 } 4089 }
3124}; 4090};
3125 4091
3126unshift @INC, $LIBDIR; 4092#############################################################################
3127 4093
3128my $bug_warning = 0; 4094my $bug_warning = 0;
3129 4095
3130our @WAIT_FOR_TICK; 4096our @WAIT_FOR_TICK;
3131our @WAIT_FOR_TICK_BEGIN; 4097our @WAIT_FOR_TICK_BEGIN;
3132 4098
3133sub wait_for_tick { 4099sub wait_for_tick() {
3134 return unless $TICK_WATCHER->is_active;
3135 return if $Coro::current == $Coro::main; 4100 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3136 4101
3137 my $signal = new Coro::Signal; 4102 my $signal = new Coro::Signal;
3138 push @WAIT_FOR_TICK, $signal; 4103 push @WAIT_FOR_TICK, $signal;
3139 $signal->wait; 4104 $signal->wait;
3140} 4105}
3141 4106
3142sub wait_for_tick_begin { 4107sub wait_for_tick_begin() {
3143 return unless $TICK_WATCHER->is_active;
3144 return if $Coro::current == $Coro::main; 4108 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3145 4109
3146 my $signal = new Coro::Signal; 4110 my $signal = new Coro::Signal;
3147 push @WAIT_FOR_TICK_BEGIN, $signal; 4111 push @WAIT_FOR_TICK_BEGIN, $signal;
3148 $signal->wait; 4112 $signal->wait;
3149} 4113}
3150 4114
3151 my $min = 1e6;#d# 4115sub tick {
3152 my $avg = 10;
3153$TICK_WATCHER = Event->timer (
3154 reentrant => 0,
3155 parked => 1,
3156 prio => 0,
3157 at => $NEXT_TICK || $TICK,
3158 data => WF_AUTOCANCEL,
3159 cb => sub {
3160 if ($Coro::current != $Coro::main) { 4116 if ($Coro::current != $Coro::main) {
3161 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3162 unless ++$bug_warning > 10; 4118 unless ++$bug_warning > 10;
3163 return; 4119 return;
3164 } 4120 }
3165 4121
3166 $NOW = $tick_start = Event::time;
3167
3168 cf::server_tick; # one server iteration 4122 cf::server_tick; # one server iteration
3169 4123
3170 0 && sync_job {#d# 4124 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3171 for(1..10) {
3172 my $t = Event::time;
3173 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3174 or die;
3175 4125
3176 $map->width (50); 4126 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3177 $map->height (50); 4127 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3178 $map->alloc; 4128 Coro::async_pool {
3179 $map->_load_objects ("/tmp/x.map", 1); 4129 $Coro::current->{desc} = "runtime saver";
3180 my $t = Event::time - $t; 4130 write_runtime_sync
3181 4131 or error "ERROR: unable to write runtime file: $!";
3182 #next unless $t < 0.0013;#d#
3183 if ($t < $min) {
3184 $min = $t;
3185 }
3186 $avg = $avg * 0.99 + $t * 0.01;
3187 }
3188 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3189 exit 0;
3190 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3191 }; 4132 };
4133 }
3192 4134
3193 $RUNTIME += $TICK;
3194 $NEXT_TICK += $TICK;
3195
3196 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3197 $NEXT_RUNTIME_WRITE = $NOW + 10;
3198 Coro::async_pool {
3199 write_runtime
3200 or warn "ERROR: unable to write runtime file: $!";
3201 };
3202 }
3203
3204# my $AFTER = Event::time;
3205# warn $AFTER - $NOW;#d#
3206
3207 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4135 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3208 $sig->send; 4136 $sig->send;
3209 } 4137 }
3210 while (my $sig = shift @WAIT_FOR_TICK) { 4138 while (my $sig = shift @WAIT_FOR_TICK) {
3211 $sig->send; 4139 $sig->send;
3212 } 4140 }
3213 4141
3214 $NOW = Event::time; 4142 $LOAD = ($NOW - $TICK_START) / $TICK;
3215
3216 # if we are delayed by four ticks or more, skip them all
3217 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3218
3219 $TICK_WATCHER->at ($NEXT_TICK);
3220 $TICK_WATCHER->start;
3221
3222 $LOAD = ($NOW - $tick_start) / $TICK;
3223 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4143 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3224 4144
3225 _post_tick; 4145 if (0) {
3226 4146 if ($NEXT_TICK) {
3227 4147 my $jitter = $TICK_START - $NEXT_TICK;
4148 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4149 debug "jitter $JITTER\n";#d#
4150 }
3228 }, 4151 }
3229); 4152}
3230 4153
3231{ 4154{
3232 BDB::max_poll_time $TICK * 0.1; 4155 # configure BDB
3233 $BDB_POLL_WATCHER = Event->io ( 4156
3234 reentrant => 0,
3235 fd => BDB::poll_fileno,
3236 poll => 'r',
3237 prio => 0,
3238 data => WF_AUTOCANCEL,
3239 cb => \&BDB::poll_cb,
3240 );
3241 BDB::min_parallel 8; 4157 BDB::min_parallel 16;
3242 4158 BDB::max_poll_reqs $TICK * 0.1;
3243 BDB::set_sync_prepare { 4159 $AnyEvent::BDB::WATCHER->priority (1);
3244 my $status;
3245 my $current = $Coro::current;
3246 (
3247 sub {
3248 $status = $!;
3249 $current->ready; undef $current;
3250 },
3251 sub {
3252 Coro::schedule while defined $current;
3253 $! = $status;
3254 },
3255 )
3256 };
3257 4160
3258 unless ($DB_ENV) { 4161 unless ($DB_ENV) {
3259 $DB_ENV = BDB::db_env_create; 4162 $DB_ENV = BDB::db_env_create;
4163 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4164 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4165 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4166 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4167 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3260 4168
3261 cf::sync_job { 4169 cf::sync_job {
3262 eval { 4170 eval {
3263 BDB::db_env_open 4171 BDB::db_env_open
3264 $DB_ENV, 4172 $DB_ENV,
3266 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4174 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3267 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4175 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3268 0666; 4176 0666;
3269 4177
3270 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4178 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3271
3272 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3273 $DB_ENV->set_lk_detect;
3274 }; 4179 };
3275 4180
3276 cf::cleanup "db_env_open(db): $@" if $@; 4181 cf::cleanup "db_env_open(db): $@" if $@;
3277 }; 4182 };
3278 } 4183 }
4184
4185 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4186 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4187 };
4188 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4189 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4190 };
4191 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4192 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4193 };
3279} 4194}
3280 4195
3281{ 4196{
4197 # configure IO::AIO
4198
3282 IO::AIO::min_parallel 8; 4199 IO::AIO::min_parallel 8;
3283
3284 undef $Coro::AIO::WATCHER;
3285 IO::AIO::max_poll_time $TICK * 0.1; 4200 IO::AIO::max_poll_time $TICK * 0.1;
3286 $AIO_POLL_WATCHER = Event->io ( 4201 undef $AnyEvent::AIO::WATCHER;
3287 reentrant => 0,
3288 data => WF_AUTOCANCEL,
3289 fd => IO::AIO::poll_fileno,
3290 poll => 'r',
3291 prio => 6,
3292 cb => \&IO::AIO::poll_cb,
3293 );
3294} 4202}
3295 4203
3296my $_log_backtrace; 4204our $_log_backtrace;
4205our $_log_backtrace_last;
3297 4206
3298sub _log_backtrace { 4207sub _log_backtrace {
3299 my ($msg, @addr) = @_; 4208 my ($msg, @addr) = @_;
3300 4209
3301 $msg =~ s/\n//; 4210 $msg =~ s/\n$//;
3302 4211
4212 if ($_log_backtrace_last eq $msg) {
4213 LOG llevInfo, "[ABT] $msg\n";
4214 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3303 # limit the # of concurrent backtraces 4215 # limit the # of concurrent backtraces
3304 if ($_log_backtrace < 2) { 4216 } elsif ($_log_backtrace < 2) {
4217 $_log_backtrace_last = $msg;
3305 ++$_log_backtrace; 4218 ++$_log_backtrace;
4219 my $perl_bt = Carp::longmess $msg;
3306 async { 4220 async {
4221 $Coro::current->{desc} = "abt $msg";
4222
3307 my @bt = fork_call { 4223 my @bt = fork_call {
3308 @addr = map { sprintf "%x", $_ } @addr; 4224 @addr = map { sprintf "%x", $_ } @addr;
3309 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4225 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3310 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4226 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3311 or die "addr2line: $!"; 4227 or die "addr2line: $!";
3319 } 4235 }
3320 4236
3321 @funcs 4237 @funcs
3322 }; 4238 };
3323 4239
3324 LOG llevInfo, "[ABT] $msg\n"; 4240 LOG llevInfo, "[ABT] $perl_bt\n";
4241 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3325 LOG llevInfo, "[ABT] $_\n" for @bt; 4242 LOG llevInfo, "[ABT] $_\n" for @bt;
3326 --$_log_backtrace; 4243 --$_log_backtrace;
3327 }; 4244 };
3328 } else { 4245 } else {
3329 LOG llevInfo, "[ABT] $msg\n"; 4246 LOG llevInfo, "[ABT] $msg\n";
3330 LOG llevInfo, "[ABT] [suppressed]\n"; 4247 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3331 } 4248 }
3332} 4249}
3333 4250
3334# load additional modules 4251# load additional modules
3335use cf::pod; 4252require "cf/$_.pm" for @EXTRA_MODULES;
4253cf::_connect_to_perl_2;
3336 4254
3337END { cf::emergency_save } 4255END { cf::emergency_save }
3338 4256
33391 42571
3340 4258

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines