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.398 by root, Wed Dec 5 11:08:34 2007 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines