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.410 by root, Tue Jan 15 12:02:24 2008 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 1.86; 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.32 (); 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;
23use Coro::BDB; 52use Coro::BDB 1.6;
24use Coro::Storable; 53use Coro::Storable;
25use Coro::Util (); 54use Coro::Util ();
26 55
56use Guard ();
27use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
28use BDB (); 58use BDB ();
29use Data::Dumper; 59use Data::Dumper;
30use Digest::MD5;
31use Fcntl; 60use Fcntl;
32use YAML (); 61use YAML::XS ();
33use IO::AIO 2.51 (); 62use IO::AIO ();
34use Time::HiRes; 63use Time::HiRes;
35use Compress::LZF; 64use Compress::LZF;
36use Digest::MD5 (); 65use Digest::MD5 ();
66
67AnyEvent::detect;
37 68
38# configure various modules to our taste 69# configure various modules to our taste
39# 70#
40$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43 79
44$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45 82
46sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
47 86
48our %COMMAND = (); 87our %COMMAND = ();
49our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
50 89
51our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
52our %EXTCMD = (); 91our %EXTCMD = ();
53our %EXTICMD = (); 92our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
56 95
57our $RELOAD; # number of reloads so far 96our $RELOAD; # number of reloads so far, non-zero while in reload
58our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
59 100
60our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
61our $DATADIR = datadir; 103our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
65our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
71our %RESOURCE; 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;
72 124
73our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
74our $TICK_WATCHER;
75our $AIO_POLL_WATCHER;
76our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
77our $NEXT_TICK; 127our $NEXT_TICK;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
79 129
80our $BDB_POLL_WATCHER;
81our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
82our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
83our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 133our $DB_ENV;
85 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
86our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
87 139
88our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
90our $NOW; 143our $NOW;
91 144
92our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
93our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 150our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 151
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
154our $JITTER; # average jitter
101our $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;
102 164
103binmode STDOUT; 165binmode STDOUT;
104binmode STDERR; 166binmode STDERR;
105 167
106# read virtual server time, if available 168# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 169unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 170 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
111} 173}
174
175eval "sub TICK() { $TICK } 1" or die;
112 176
113mkdir $_ 177mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 179
116our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
117 181
118sub cf::map::normalise; 182sub cf::map::normalise;
119 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
120############################################################################# 188#############################################################################
121 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
122=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
123 202
124=over 4 203=over 4
125 204
126=item $cf::UPTIME 205=item $cf::UPTIME
127 206
128The 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.
129 223
130=item $cf::RUNTIME 224=item $cf::RUNTIME
131 225
132The 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
133every server tick. 227every server tick.
134 228
135=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
136$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
137$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
138 232
139Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
140directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
141unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
142database environment. 236database environment.
143 237
144=item $cf::NOW
145
146The time of the last (current) server tick.
147
148=item $cf::TICK
149
150The interval between server ticks, in seconds.
151
152=item $cf::LOADAVG 238=item $cf::LOADAVG
153 239
154The 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
155(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
156objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
165from wherever your confdir points to. 251from wherever your confdir points to.
166 252
167=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
168 254
169These 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
170returns 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
171per 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.
172 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
173=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
174 277
175This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
176C<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
177that call. 280that call.
178 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
179=back 288=back
180 289
181=cut 290=cut
182 291
183BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
184 *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 {
185 my $msg = join "", @_; 299 my $msg = join "", @_;
186 300
187 $msg .= "\n" 301 $msg .= "\n"
188 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
189 303
190 $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;
191 305
192 LOG llevError, $msg; 306 LOG llevWarn, $msg;
193 }; 307};
194}
195 308
196$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
197 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
198 311
199 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
200 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
201 return;#d# 316 return;#d#
202 }#d# 317 }#d#
203 318
204 # kill coroutine otherwise 319 # kill coroutine otherwise
205 warn Carp::longmess $_[0];
206 Coro::terminate 320 Coro::terminate
207}; 321};
208
209$SIG{__DIE__} = sub { }; #d#?
210 322
211@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
212@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
213@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
214@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
221for my $pkg (qw( 333for my $pkg (qw(
222 cf::global cf::attachable 334 cf::global cf::attachable
223 cf::object cf::object::player 335 cf::object cf::object::player
224 cf::client cf::player 336 cf::client cf::player
225 cf::arch cf::living 337 cf::arch cf::living
338 cf::map cf::mapspace
226 cf::map cf::party cf::region 339 cf::party cf::region
227)) { 340)) {
228 no strict 'refs';
229 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
230} 342}
231 343
232$EV::DIED = sub { 344$EV::DIED = sub {
233 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
234}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
235 352
236############################################################################# 353#############################################################################
237 354
238=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
239 356
260 $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;
261 $d 378 $d
262 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
263} 380}
264 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
265=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
266 435
267Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
268 437
269=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
275our $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
276 445
277sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
278sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
279 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
280=item cf::lock_wait $string 511=item cf::lock_wait $string
281 512
282Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
283 514
284=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
285 516
286Wait 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
287a 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,
288for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
289returned. 520returned.
290 521
291Locks 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
292deadlocked coro. 523deadlocked coro.
298 529
299Return 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.
300 531
301=cut 532=cut
302 533
303our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
304our %LOCKER;#d#
305 535
306sub lock_wait($) { 536sub lock_wait($) {
307 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
308
309 if ($LOCKER{$key} == $Coro::current) {#d#
310 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
311 return;#d#
312 }#d#
313
314 # wait for lock, if any
315 while ($LOCK{$key}) {
316 push @{ $LOCK{$key} }, $Coro::current;
317 Coro::schedule;
318 }
319} 538}
320 539
321sub lock_acquire($) { 540sub lock_acquire($) {
322 my ($key) = @_; 541 $LOCKS->guard ($_[0])
323
324 # wait, to be sure we are not locked
325 lock_wait $key;
326
327 $LOCK{$key} = [];
328 $LOCKER{$key} = $Coro::current;#d#
329
330 Coro::guard {
331 delete $LOCKER{$key};#d#
332 # wake up all waiters, to be on the safe side
333 $_->ready for @{ delete $LOCK{$key} };
334 }
335} 542}
336 543
337sub lock_active($) { 544sub lock_active($) {
338 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
339
340 ! ! $LOCK{$key}
341} 546}
342 547
343sub freeze_mainloop { 548sub freeze_mainloop {
344 return unless $TICK_WATCHER->is_active; 549 tick_inhibit_inc;
345 550
346 my $guard = Coro::guard { 551 &Guard::guard (\&tick_inhibit_dec);
347 $TICK_WATCHER->start;
348 };
349 $TICK_WATCHER->stop;
350 $guard
351} 552}
352 553
353=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
354 555
355Like 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
356get spread over timer. 557get spread over time.
357 558
358=cut 559=cut
359 560
360sub periodic($$) { 561sub periodic($$) {
361 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
365 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
366} 567}
367 568
368=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
369 570
370Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
371This 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
372of 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.
373 578
374The 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
375used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
376 581
377Useful for short background jobs. 582Useful for short background jobs.
378 583
379=cut 584=cut
380 585
381our @SLOT_QUEUE; 586our @SLOT_QUEUE;
382our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
383 589
384$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
385$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
386 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
387 593
388 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
389 596
390 while () { 597 while () {
391 next_job: 598 next_job:
599
392 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
393 if ($avail > 0.01) { 601
394 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
395 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
396 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
397 $job->[2]->send; 606 $job->[2]->send;
398 Coro::cede; 607 Coro::cede;
399 goto next_job; 608 goto next_job;
400 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
401 } 611 }
402 } 612 }
403 613
404 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
405 # 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
406 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
407 $signal->wait;
408 } else { 617 } else {
618 $busy = 0;
409 Coro::schedule; 619 Coro::schedule;
410 } 620 }
411 } 621 }
412}; 622};
413 623
414sub get_slot($;$$) { 624sub get_slot($;$$) {
625 return if tick_inhibit || $Coro::current == $Coro::main;
626
415 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
416 628
417 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
418 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
419 632
420 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
421 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
422 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
448=cut 661=cut
449 662
450sub sync_job(&) { 663sub sync_job(&) {
451 my ($job) = @_; 664 my ($job) = @_;
452 665
453 if ($Coro::current == $Coro::main) { 666 if (in_main) {
454 my $time = EV::time; 667 my $time = AE::time;
455 668
456 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
457 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
458 671
459 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
460 673
461 # TODO: use suspend/resume instead
462 # (but this is cancel-safe)
463 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
464 675
465 my $busy = 1; 676 my $busy = 1;
466 my @res; 677 my @res;
467 678
468 (async { 679 (async {
469 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
470 @res = eval { $job->() }; 681 @res = eval { $job->() };
471 warn $@ if $@; 682 error $@ if $@;
472 undef $busy; 683 undef $busy;
473 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
474 685
475 while ($busy) { 686 while ($busy) {
476 if (Coro::nready) { 687 if (Coro::nready) {
478 } else { 689 } else {
479 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
480 } 691 }
481 } 692 }
482 693
483 $time = EV::time - $time; 694 my $time = AE::time - $time;
484 695
485 LOG llevError | logBacktrace, Carp::longmess "long sync job"
486 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
487
488 $tick_start += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
489 697
490 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
491 } else { 699 } else {
492 # we are in another coroutine, how wonderful, everything just works 700 # we are in another coroutine, how wonderful, everything just works
493 701
513 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
514 722
515 $coro 723 $coro
516} 724}
517 725
518=item fork_call { }, $args 726=item fork_call { }, @args
519 727
520Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
521process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
522Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
523never block itself or use any form of event handling. 731never block itself or use any form of event handling.
524 732
525=cut 733=cut
526 734
735sub post_fork {
736 reset_signals;
737}
738
527sub fork_call(&@) { 739sub fork_call(&@) {
528 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
529 741
530 # 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,
531 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
532 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
533 745
534 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
535 reset_signals; 747 cf::post_fork;
536 &$cb 748 &$cb
537 }, @args; 749 } @args;
538 750
539 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
540} 790}
541 791
542=item $value = cf::db_get $family => $key 792=item $value = cf::db_get $family => $key
543 793
544Returns a single value from the environment database. 794Returns a single value from the environment database.
554within each server. 804within each server.
555 805
556=cut 806=cut
557 807
558sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
559 my ($name) = @_; 812 my ($name) = @_;
560 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
561 814
562 eval { 815 eval {
563 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
573} 826}
574 827
575our $DB; 828our $DB;
576 829
577sub db_init { 830sub db_init {
578 cf::sync_job {
579 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
580 };
581} 832}
582 833
583sub db_get($$) { 834sub db_get($$) {
584 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
585 836
586 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
587 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
588 841
589 $! ? () 842 $! ? ()
590 : $data 843 : $data
591 }
592} 844}
593 845
594sub db_put($$$) { 846sub db_put($$$) {
595 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
596 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
624 876
625 my @data; 877 my @data;
626 my $md5; 878 my $md5;
627 879
628 for (0 .. $#$src) { 880 for (0 .. $#$src) {
629 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
630 or Carp::croak "$src->[$_]: $!";
631 } 882 }
632 883
633 # if processing is expensive, check 884 # if processing is expensive, check
634 # checksum first 885 # checksum first
635 if (1) { 886 if (1) {
652 903
653 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
654 my $data = $process->(\@data); 905 my $data = $process->(\@data);
655 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
656 907
657 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
658 909
659 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
660 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
661 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
662 913
672 923
673=cut 924=cut
674 925
675sub datalog($@) { 926sub datalog($@) {
676 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
677 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
678} 929}
679 930
680=back 931=back
681 932
682=cut 933=cut
683 934
684############################################################################# 935#############################################################################
685 936
686=head2 ATTACHABLE OBJECTS 937=head2 ATTACHABLE OBJECTS
687 938
688Many 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
689attach callbacks/event handlers (a collection of which is called an "attachment") 940attach callbacks/event handlers (a collection of which is called an "attachment")
690to it. All such attachable objects support the following methods. 941to it. All such attachable objects support the following methods.
691 942
692In 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>
693C<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
743=item cf::CLASS::attachment $name, ... 994=item cf::CLASS::attachment $name, ...
744 995
745Register an attachment by C<$name> through which attachable objects of the 996Register an attachment by C<$name> through which attachable objects of the
746given CLASS can refer to this attachment. 997given CLASS can refer to this attachment.
747 998
748Some classes such as crossfire maps and objects can specify attachments 999Some classes such as deliantra maps and objects can specify attachments
749that 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.
750 1001
751These calls expect any number of the following handler/hook descriptions: 1002These calls expect any number of the following handler/hook descriptions:
752 1003
753=over 4 1004=over 4
877 1128
878 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
879 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
880 1131
881 } elsif (ref $type) { 1132 } elsif (ref $type) {
882 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
883 1134
884 } else { 1135 } else {
885 shift @arg; 1136 shift @arg;
886 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
887 } 1138 }
888 } 1139 }
889} 1140}
890 1141
891sub _object_attach { 1142sub _object_attach {
901 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
902 } 1153 }
903 1154
904 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
905 } else { 1156 } else {
906 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
907 } 1158 }
908 1159
909 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
910} 1161}
911 1162
970 1221
971 for (@$callbacks) { 1222 for (@$callbacks) {
972 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
973 1224
974 if ($@) { 1225 if ($@) {
975 warn "$@";
976 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
977 override; 1227 override;
978 } 1228 }
979 1229
980 return 1 if $override; 1230 return 1 if $override;
981 } 1231 }
1044 1294
1045sub reattach { 1295sub reattach {
1046 # basically do the same as instantiate, without calling instantiate 1296 # basically do the same as instantiate, without calling instantiate
1047 my ($obj) = @_; 1297 my ($obj) = @_;
1048 1298
1299 # no longer needed after getting rid of delete_package?
1049 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
1050 1301
1051 my $registry = $obj->registry; 1302 my $registry = $obj->registry;
1052 1303
1053 @$registry = (); 1304 @$registry = ();
1054 1305
1059 for (@$attach) { 1310 for (@$attach) {
1060 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1061 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1062 } 1313 }
1063 } else { 1314 } else {
1064 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1065 } 1316 }
1066 } 1317 }
1067} 1318}
1068 1319
1069cf::attachable->attach ( 1320cf::attachable->attach (
1096 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1097 1348
1098 sync_job { 1349 sync_job {
1099 if (length $$rdata) { 1350 if (length $$rdata) {
1100 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1101 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1102 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1103 1355
1104 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1357 aio_chmod $fh, SAVE_MODE;
1106 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1107 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 }
1108 close $fh; 1363 aio_close $fh;
1109 1364
1110 if (@$objs) { 1365 if (@$objs) {
1111 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) {
1112 chmod SAVE_MODE, $fh; 1367 aio_chmod $fh, SAVE_MODE;
1113 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1114 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1115 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 }
1116 close $fh; 1374 aio_close $fh;
1117 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1118 } 1376 }
1119 } else { 1377 } else {
1120 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1121 } 1379 }
1122 1380
1123 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1124 } else { 1385 } else {
1125 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1126 } 1387 }
1127 } else { 1388 } else {
1128 aio_unlink $filename; 1389 aio_unlink $filename;
1129 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1130 } 1391 }
1154 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1155 $av = $st->{objs}; 1416 $av = $st->{objs};
1156 } 1417 }
1157 1418
1158 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1159 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1160 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1161 1423
1162 ($data, $av) 1424 ($data, $av)
1163} 1425}
1164 1426
1165=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1169=cut 1431=cut
1170 1432
1171############################################################################# 1433#############################################################################
1172# command handling &c 1434# command handling &c
1173 1435
1174=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1175 1437
1176Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1177$name. 1439$name.
1178 1440
1179=cut 1441=cut
1185 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1186 1448
1187 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1188} 1450}
1189 1451
1190=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1191 1453
1192Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1193extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1194received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1195the 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
1196has logged in successfully. 1458has logged in successfully.
1197 1459
1198If 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
1199called. 1461called.
1200 1462
1201=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1202 1464
1203Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1204exticmd 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
1205are 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
1206is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1221 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1222 1484
1223 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1224} 1486}
1225 1487
1488use File::Glob ();
1489
1226cf::player->attach ( 1490cf::player->attach (
1227 on_command => sub { 1491 on_unknown_command => sub {
1228 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1229 1493
1230 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1231 or return; 1495 or return;
1232 1496
1240 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1241 1505
1242 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1243 1507
1244 if (ref $msg) { 1508 if (ref $msg) {
1245 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1246 "ARRAY" eq ref $msg
1247 ? @$msg
1248 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1249 1510
1250 my @reply; 1511 my @reply;
1251 1512
1252 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1253 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1254 } 1515 }
1255 1516
1256 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1257 if $reply; 1518 if $reply;
1258 1519
1259 } else { 1520 } else {
1260 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1261 } 1522 }
1262 1523
1263 cf::override; 1524 cf::override;
1264 }, 1525 },
1265); 1526);
1266 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
1267sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1268 cf::sync_job { 1557 cf::sync_job {
1269 my %todo; 1558 my %todo;
1270 1559
1271 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1272 next unless -r $path; 1561 next unless -r $path;
1290 1579
1291 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1292 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1293 1582
1294 $ext{source} = 1583 $ext{source} =
1295 "package $pkg; use strict; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1296 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1297 . $source 1586 . $source
1298 . "\n};\n1"; 1587 . "\n};\n1";
1299 1588
1300 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1301 } 1590 }
1302 1591
1592 my $pass = 0;
1303 my %done; 1593 my %done;
1304 while (%todo) { 1594 while (%todo) {
1305 my $progress; 1595 my $progress;
1306 1596
1597 ++$pass;
1598
1599 ext:
1307 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1308 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1309 goto skip 1602 next ext
1310 unless exists $done{$_}; 1603 unless exists $done{$_};
1311 } 1604 }
1312 1605
1313 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1314 1607
1315 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 $@) {
1316 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1317 : "$v->{base}: extension inactive.\n";
1318 1621
1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1319 if (exists $v->{meta}{mandatory}) { 1623 if exists $v->{meta}{mandatory};
1320 warn $msg; 1624
1321 warn "mandatory extension failed to load, exiting.\n"; 1625 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1322 exit 1; 1626 delete $todo{$k};
1323 } 1627 } else {
1324 1628 $done{$k} = delete $todo{$k};
1325 warn $msg; 1629 push @EXTS, $v->{pkg};
1630 $progress = 1;
1631
1632 info "$v->{base}: extension inactive.\n"
1633 unless $active;
1326 } 1634 }
1327
1328 $done{$k} = delete $todo{$k};
1329 push @EXTS, $v->{pkg};
1330 $progress = 1;
1331 } 1635 }
1332 1636
1333 skip: 1637 unless ($progress) {
1334 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1335 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 }
1336 } 1647 }
1337 }; 1648 };
1338} 1649}
1339 1650
1340############################################################################# 1651#############################################################################
1341 1652
1342=back 1653=back
1343 1654
1344=head2 CORE EXTENSIONS 1655=head2 CORE EXTENSIONS
1345 1656
1346Functions and methods that extend core crossfire objects. 1657Functions and methods that extend core deliantra objects.
1347 1658
1348=cut 1659=cut
1349 1660
1350package cf::player; 1661package cf::player;
1351 1662
1394 1705
1395sub exists($) { 1706sub exists($) {
1396 my ($login) = @_; 1707 my ($login) = @_;
1397 1708
1398 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1399 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1400} 1711}
1401 1712
1402sub find($) { 1713sub find($) {
1403 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1404 my $login = $_[0]; 1715 my $login = $_[0];
1416 my $f = new_from_file cf::object::thawer path $login 1727 my $f = new_from_file cf::object::thawer path $login
1417 or return; 1728 or return;
1418 1729
1419 my $pl = cf::player::load_pl $f 1730 my $pl = cf::player::load_pl $f
1420 or return; 1731 or return;
1732
1421 local $cf::PLAYER_LOADING{$login} = $pl; 1733 local $cf::PLAYER_LOADING{$login} = $pl;
1422 $f->resolve_delayed_derefs; 1734 $f->resolve_delayed_derefs;
1423 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1424 } 1736 }
1425 } 1737 }
1426} 1738}
1427 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
1428sub save($) { 1753sub save($) {
1429 my ($pl) = @_; 1754 my ($pl) = @_;
1430 1755
1431 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1432 1757
1435 1760
1436 return if $pl->{deny_save}; 1761 return if $pl->{deny_save};
1437 1762
1438 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1439 $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];
1440 1770
1441 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1442 cf::cede_to_tick; 1772 cf::cede_to_tick;
1443} 1773}
1444 1774
1476 my ($pl) = @_; 1806 my ($pl) = @_;
1477 1807
1478 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1479 1809
1480 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1481 $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
1482 1812
1483 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1484 $pl->deactivate; 1814 $pl->deactivate;
1815
1816 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1485 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1486 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1487 1821
1488 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1489 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1490 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1528 1862
1529 for my $login (@$dirs) { 1863 for my $login (@$dirs) {
1530 my $path = path $login; 1864 my $path = path $login;
1531 1865
1532 # a .pst is a dead give-away for a valid player 1866 # a .pst is a dead give-away for a valid player
1533 unless (-e "$path.pst") { 1867 # if no pst file found, open and chekc for blocked users
1868 if (aio_stat "$path.pst") {
1534 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1869 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1535 aio_read $fh, 0, 512, my $buf, 0 or next; 1870 aio_read $fh, 0, 512, my $buf, 0 or next;
1536 $buf !~ /^password -------------$/m or next; # official not-valid tag 1871 $buf !~ /^password -------------$/m or next; # official not-valid tag
1537 } 1872 }
1538 1873
1542 1877
1543 \@logins 1878 \@logins
1544} 1879}
1545 1880
1546=item $player->maps 1881=item $player->maps
1882
1883=item cf::player::maps $login
1547 1884
1548Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1549player. May block. 1886player. May block.
1550 1887
1551=cut 1888=cut
1569 } 1906 }
1570 1907
1571 \@paths 1908 \@paths
1572} 1909}
1573 1910
1574=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1575 1912
1576Expand crossfire pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1577
1578=cut
1579
1580use re 'eval';
1581
1582my $group;
1583my $interior; $interior = qr{
1584 # match a pod interior sequence sans C<< >>
1585 (?:
1586 \ (.*?)\ (?{ $group = $^N })
1587 | < (??{$interior}) >
1588 )
1589}x;
1590
1591sub expand_cfpod {
1592 my ($self, $pod) = @_;
1593
1594 my $xml;
1595
1596 while () {
1597 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1598 $group = $1;
1599
1600 $group =~ s/&/&amp;/g;
1601 $group =~ s/</&lt;/g;
1602
1603 $xml .= $group;
1604 } elsif ($pod =~ m%\G
1605 ([BCGHITU])
1606 <
1607 (?:
1608 ([^<>]*) (?{ $group = $^N })
1609 | < $interior >
1610 )
1611 >
1612 %gcsx
1613 ) {
1614 my ($code, $data) = ($1, $group);
1615
1616 if ($code eq "B") {
1617 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1618 } elsif ($code eq "I") {
1619 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1620 } elsif ($code eq "U") {
1621 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1622 } elsif ($code eq "C") {
1623 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1624 } elsif ($code eq "T") {
1625 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1626 } elsif ($code eq "G") {
1627 my ($male, $female) = split /\|/, $data;
1628 $data = $self->gender ? $female : $male;
1629 $xml .= expand_cfpod ($self, $data);
1630 } elsif ($code eq "H") {
1631 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1632 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1633 "")
1634 [$self->{hintmode}];
1635 } else {
1636 $xml .= "error processing '$code($data)' directive";
1637 }
1638 } else {
1639 if ($pod =~ /\G(.+)/) {
1640 warn "parse error while expanding $pod (at $1)";
1641 }
1642 last;
1643 }
1644 }
1645
1646 for ($xml) {
1647 # create single paragraphs (very hackish)
1648 s/(?<=\S)\n(?=\w)/ /g;
1649
1650 # compress some whitespace
1651 s/\s+\n/\n/g; # ws line-ends
1652 s/\n\n+/\n/g; # double lines
1653 s/^\n+//; # beginning lines
1654 s/\n+$//; # ending lines
1655 }
1656
1657 $xml
1658}
1659
1660no re 'eval';
1661
1662sub hintmode {
1663 $_[0]{hintmode} = $_[1] if @_ > 1;
1664 $_[0]{hintmode}
1665}
1666
1667=item $player->ext_reply ($msgid, @msg)
1668
1669Sends an ext reply to the player.
1670
1671=cut
1672
1673sub ext_reply($$@) {
1674 my ($self, $id, @msg) = @_;
1675
1676 $self->ns->ext_reply ($id, @msg)
1677}
1678 1914
1679=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1680 1916
1681Sends an ext event to the client. 1917Sends an ext event to the client.
1682 1918
1702 1938
1703=cut 1939=cut
1704 1940
1705sub find_by_path($) { 1941sub find_by_path($) {
1706 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1707 1945
1708 my ($match, $specificity); 1946 my ($match, $specificity);
1709 1947
1710 for my $region (list) { 1948 for my $region (list) {
1711 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
1737our $MAX_RESET = 3600; 1975our $MAX_RESET = 3600;
1738our $DEFAULT_RESET = 3000; 1976our $DEFAULT_RESET = 3000;
1739 1977
1740sub generate_random_map { 1978sub generate_random_map {
1741 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1742 # mit "rum" bekleckern, nicht 1980
1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1982
1743 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1744 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1745 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1746 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1747 $rmp->{exit_on_final_map},
1748 $rmp->{xsize}, $rmp->{ysize},
1749 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1750 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1751 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1752 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1753 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1754 (cf::region::find $rmp->{region}), $rmp->{custom}
1755 )
1756} 1984}
1757 1985
1758=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1759 1987
1760Register 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
1765 1993
1766sub register { 1994sub register {
1767 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1768 my $pkg = caller; 1996 my $pkg = caller;
1769 1997
1770 no strict;
1771 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1772 1999
1773 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1774} 2001}
1775 2002
1776# also paths starting with '/' 2003# also paths starting with '/'
1777$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1778 2005
1779sub thawer_merge { 2006sub thawer_merge {
1780 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1781 2008
1782 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
1787} 2014}
1788 2015
1789sub normalise { 2016sub normalise {
1790 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1791 2018
1792 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1793 2020
1794 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1795 2022
1796 # map plan: 2023 # map plan:
1797 # 2024 #
1812 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1813 $path = "$base/$path"; 2040 $path = "$base/$path";
1814 } 2041 }
1815 2042
1816 for ($path) { 2043 for ($path) {
1817 redo if s{//}{/};
1818 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1819 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1820 } 2046 }
1821 2047
1822 $path 2048 $path
1836 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1837 return $self; 2063 return $self;
1838 } 2064 }
1839 } 2065 }
1840 2066
1841 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1842 () 2068 ()
1843} 2069}
1844 2070
2071# may re-bless or do other evil things
1845sub init { 2072sub init {
1846 my ($self) = @_; 2073 my ($self) = @_;
1847 2074
1848 $self 2075 $self
1849} 2076}
1868 2095
1869# the temporary/swap location 2096# the temporary/swap location
1870sub save_path { 2097sub save_path {
1871 my ($self) = @_; 2098 my ($self) = @_;
1872 2099
1873 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2100 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1874 "$TMPDIR/$path.map" 2101 "$TMPDIR/$path.map"
1875} 2102}
1876 2103
1877# the unique path, undef == no special unique path 2104# the unique path, undef == no special unique path
1878sub uniq_path { 2105sub uniq_path {
1879 my ($self) = @_; 2106 my ($self) = @_;
1880 2107
1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1882 "$UNIQUEDIR/$path" 2109 "$UNIQUEDIR/$path"
1883}
1884
1885# and all this just because we cannot iterate over
1886# all maps in C++...
1887sub change_all_map_light {
1888 my ($change) = @_;
1889
1890 $_->change_map_light ($change)
1891 for grep $_->outdoor, values %cf::MAP;
1892} 2110}
1893 2111
1894sub decay_objects { 2112sub decay_objects {
1895 my ($self) = @_; 2113 my ($self) = @_;
1896 2114
1923 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1924 2142
1925 1 2143 1
1926} 2144}
1927 2145
2146# used to laod the header of an original map
1928sub load_header_orig { 2147sub load_header_orig {
1929 my ($self) = @_; 2148 my ($self) = @_;
1930 2149
1931 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1932} 2151}
1933 2152
2153# used to laod the header of an instantiated map
1934sub load_header_temp { 2154sub load_header_temp {
1935 my ($self) = @_; 2155 my ($self) = @_;
1936 2156
1937 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1938} 2158}
1939 2159
2160# called after loading the header from an instantiated map
1940sub prepare_temp { 2161sub prepare_temp {
1941 my ($self) = @_; 2162 my ($self) = @_;
1942 2163
1943 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1944 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1945 # safety 2166 # safety
1946 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1947 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1948} 2169}
1949 2170
2171# called after loading the header from an original map
1950sub prepare_orig { 2172sub prepare_orig {
1951 my ($self) = @_; 2173 my ($self) = @_;
1952 2174
1953 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
1954 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
1978 2200
1979sub find; 2201sub find;
1980sub find { 2202sub find {
1981 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
1982 2204
2205 cf::cede_to_tick;
2206
1983 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
1984 2208
1985 cf::lock_wait "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1986 cf::lock_wait "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
1987 2211
1988 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
1989 my $guard1 = cf::lock_acquire "map_find:$path";
1990 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1991
1992 my $map = new_from_path cf::map $path 2213 my $map = new_from_path cf::map $path
1993 or return; 2214 or return;
1994 2215
1995 $map->{last_save} = $cf::RUNTIME; 2216 $map->{last_save} = $cf::RUNTIME;
1996 2217
1998 or return; 2219 or return;
1999 2220
2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2221 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2001 # doing this can freeze the server in a sync job, obviously 2222 # doing this can freeze the server in a sync job, obviously
2002 #$cf::WAIT_FOR_TICK->wait; 2223 #$cf::WAIT_FOR_TICK->wait;
2224 undef $guard2;
2003 undef $guard1; 2225 undef $guard1;
2004 undef $guard2;
2005 $map->reset; 2226 $map->reset;
2006 return find $path; 2227 return find $path;
2007 } 2228 }
2008 2229
2009 $cf::MAP{$path} = $map 2230 $cf::MAP{$path} = $map
2010 } 2231 }
2011} 2232}
2012 2233
2013sub pre_load { } 2234sub pre_load { }
2014sub post_load { } 2235#sub post_load { } # XS
2015 2236
2016sub load { 2237sub load {
2017 my ($self) = @_; 2238 my ($self) = @_;
2018 2239
2019 local $self->{deny_reset} = 1; # loading can take a long time 2240 local $self->{deny_reset} = 1; # loading can take a long time
2022 2243
2023 { 2244 {
2024 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2025 2246
2026 return unless $self->valid; 2247 return unless $self->valid;
2027 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2028
2029 $self->in_memory (cf::MAP_LOADING);
2030 2249
2031 $self->alloc; 2250 $self->alloc;
2032 2251
2033 $self->pre_load; 2252 $self->pre_load;
2034 cf::cede_to_tick; 2253 cf::cede_to_tick;
2035 2254
2255 if (exists $self->{load_path}) {
2036 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2037 $f->skip_block; 2257 $f->skip_block;
2038 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2039 or return; 2259 or return;
2040 2260
2041 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2261 $self->post_load_original
2042 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2043 2263
2044 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2045 utf8::encode $uniq; 2265 utf8::encode $uniq;
2046 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2047 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2048 $self->clear_unique_items; 2268 $self->clear_unique_items;
2049 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2050 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2051 } 2272 }
2052 } 2273 }
2053 }
2054 2274
2055 $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);
2056 2282
2057 cf::cede_to_tick; 2283 cf::cede_to_tick;
2058 # now do the right thing for maps 2284 # now do the right thing for maps
2059 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2060 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2064 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2065 $self->decay_objects; 2291 $self->decay_objects;
2066 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2067 $self->update_buttons; 2293 $self->update_buttons;
2068 cf::cede_to_tick; 2294 cf::cede_to_tick;
2069 $self->set_darkness_map; 2295 #$self->activate; # no longer activate maps automatically
2070 cf::cede_to_tick;
2071 $self->activate;
2072 } 2296 }
2073 2297
2074 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_IN_MEMORY);
2078 } 2300 }
2079 2301
2080 $self->post_load; 2302 $self->post_load;
2081}
2082 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
2083sub customise_for { 2310sub customise_for {
2084 my ($self, $ob) = @_; 2311 my ($self, $ob) = @_;
2085 2312
2086 return find "~" . $ob->name . "/" . $self->{path} 2313 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2314 if $self->per_player;
2090# if $self->per_party; 2317# if $self->per_party;
2091 2318
2092 $self 2319 $self
2093} 2320}
2094 2321
2095# find and load all maps in the 3x3 area around a map
2096sub load_neighbours {
2097 my ($map) = @_;
2098
2099 my @neigh; # diagonal neighbours
2100
2101 for (0 .. 3) {
2102 my $neigh = $map->tile_path ($_)
2103 or next;
2104 $neigh = find $neigh, $map
2105 or next;
2106 $neigh->load;
2107
2108 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 }
2112
2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
2115 my $neigh = find $path, $origin
2116 or next;
2117 $neigh->load;
2118 }
2119}
2120
2121sub find_sync { 2322sub find_sync {
2122 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2123 2324
2124 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
2125} 2330}
2126 2331
2127sub do_load_sync { 2332sub do_load_sync {
2128 my ($map) = @_; 2333 my ($map) = @_;
2129 2334
2335 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2132 2338
2133 cf::sync_job { $map->load }; 2339 $map->load;
2134} 2340}
2135 2341
2136our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2138 2344
2139sub find_async { 2345sub find_async {
2140 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2141 2347
2142 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2143 2349
2144 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2351 return $map if !$load || $map->linkable;
2146 } 2352 }
2147 2353
2148 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2149 2355
2150 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2164 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2165 2371
2166 () 2372 ()
2167} 2373}
2168 2374
2375# common code, used by both ->save and ->swapout
2169sub save { 2376sub _save {
2170 my ($self) = @_; 2377 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2378
2174 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2175 2380
2176 return unless $self->dirty; 2381 return unless $self->dirty;
2177 2382
2186 2391
2187 cf::async { 2392 cf::async {
2188 $Coro::current->{desc} = "map player save"; 2393 $Coro::current->{desc} = "map player save";
2189 $_->contr->save for $self->players; 2394 $_->contr->save for $self->players;
2190 }; 2395 };
2396
2397 cf::get_slot 0.02;
2191 2398
2192 if ($uniq) { 2399 if ($uniq) {
2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2400 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2194 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2401 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2195 } else { 2402 } else {
2196 $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);
2197 } 2404 }
2198} 2405}
2199 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2200sub swap_out { 2415sub swap_out {
2201 my ($self) = @_; 2416 my ($self) = @_;
2202 2417
2203 # save first because save cedes
2204 $self->save;
2205
2206 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2207 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2208 return if $self->players; 2422 return if $self->players;
2209 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
2210 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2211 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
2212 $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};
2213 2474
2214 $self->deactivate; 2475 $self->deactivate;
2215 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2216 $self->clear; 2477 $self->clear;
2217}
2218
2219sub reset_at {
2220 my ($self) = @_;
2221
2222 # TODO: safety, remove and allow resettable per-player maps
2223 return 1e99 if $self->{deny_reset};
2224
2225 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228 $time + $to
2229}
2230
2231sub should_reset {
2232 my ($self) = @_;
2233
2234 $self->reset_at <= $cf::RUNTIME
2235}
2236
2237sub reset {
2238 my ($self) = @_;
2239
2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242 return if $self->players;
2243
2244 warn "resetting map ", $self->path;
2245
2246 $self->in_memory (cf::MAP_SWAPPED);
2247
2248 # need to save uniques path
2249 unless ($self->{deny_save}) {
2250 my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2253 if $uniq;
2254 }
2255
2256 delete $cf::MAP{$self->path};
2257
2258 $self->deactivate;
2259 $_->clear_links_to ($self) for values %cf::MAP;
2260 $self->clear;
2261 2478
2262 $self->unlink_save; 2479 $self->unlink_save;
2263 $self->destroy; 2480 $self->destroy;
2264} 2481}
2265 2482
2273 2490
2274 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2275 2492
2276 $self->unlink_save; 2493 $self->unlink_save;
2277 2494
2278 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2279 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2280 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2281 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2282 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283 2500
2332 2549
2333sub unique_maps() { 2550sub unique_maps() {
2334 [ 2551 [
2335 map { 2552 map {
2336 utf8::decode $_; 2553 utf8::decode $_;
2337 /\.map$/ 2554 s/\.map$//; # TODO future compatibility hack
2555 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2556 ? ()
2338 ? normalise $_ 2557 : normalise $_
2339 : ()
2340 } @{ aio_readdir $UNIQUEDIR or [] } 2558 } @{ aio_readdir $UNIQUEDIR or [] }
2341 ] 2559 ]
2342} 2560}
2343 2561
2344package 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}
2345 2593
2346=back 2594=back
2347 2595
2348=head3 cf::object 2596=head3 cf::object
2349 2597
2353 2601
2354=over 4 2602=over 4
2355 2603
2356=item $ob->inv_recursive 2604=item $ob->inv_recursive
2357 2605
2358Returns 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.
2359 2608
2360=cut 2609=cut
2361 2610
2362sub inv_recursive_; 2611sub inv_recursive_;
2363sub inv_recursive_ { 2612sub inv_recursive_ {
2368 inv_recursive_ inv $_[0] 2617 inv_recursive_ inv $_[0]
2369} 2618}
2370 2619
2371=item $ref = $ob->ref 2620=item $ref = $ob->ref
2372 2621
2373creates 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.
2374 2623
2375=item $ob = cf::object::deref ($refstring) 2624=item $ob = cf::object::deref ($refstring)
2376 2625
2377returns 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,
2378even if the object actually exists. May block. 2627even if the object actually exists. May block.
2410can 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
2411dialogue with the given NPC character. 2660dialogue with the given NPC character.
2412 2661
2413=cut 2662=cut
2414 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
2415# rough implementation of a future "reply" method that works 2678# rough implementation of a future "reply" method that works
2416# with dialog boxes. 2679# with dialog boxes.
2417#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
2418sub cf::object::player::reply($$$;$) { 2681sub cf::object::player::reply($$$;$) {
2419 my ($self, $npc, $msg, $flags) = @_; 2682 my ($self, $npc, $msg, $flags) = @_;
2430 my $dialog = $pl->{npc_dialog}; 2693 my $dialog = $pl->{npc_dialog};
2431 $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));
2432 2695
2433 } else { 2696 } else {
2434 $msg = $npc->name . " says: $msg" if $npc; 2697 $msg = $npc->name . " says: $msg" if $npc;
2435 $self->message ($msg, $flags); 2698 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2436 } 2699 }
2437 } 2700 }
2438} 2701}
2439 2702
2440=item $object->send_msg ($channel, $msg, $color, [extra...]) 2703=item $object->send_msg ($channel, $msg, $color, [extra...])
2465 2728
2466=item $player_object->enter_link 2729=item $player_object->enter_link
2467 2730
2468Freezes 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}>).
2469 2732
2470The 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.
2471I<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.
2472 2737
2473Will never block. 2738Will never block.
2474 2739
2475=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2476 2741
2496sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2497 my ($self) = @_; 2762 my ($self) = @_;
2498 2763
2499 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2500 2765
2766 ++$self->{_link_recursion};
2767
2501 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2502 2769
2503 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2504 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2505 2772
2506 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2507} 2774}
2508 2775
2509sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2510 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2511 2778
2528 ($x, $y) = (-1, -1) 2795 ($x, $y) = (-1, -1)
2529 unless (defined $x) && (defined $y); 2796 unless (defined $x) && (defined $y);
2530 2797
2531 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2532 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2533 if $x <=0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2534 2801
2535 $map->load; 2802 $map->load;
2536 $map->load_neighbours;
2537 2803
2538 return unless $self->contr->active; 2804 return unless $self->contr->active;
2539 $self->activate_recursive;
2540 2805
2541 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2542 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2543} 2808 # entering was successful
2809 delete $self->{_link_recursion};
2810 # only activate afterwards, to support waiting in hooks
2811 $self->activate_recursive;
2812 }
2544 2813
2814}
2815
2545=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)]])
2546 2817
2547Moves 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
2548her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2549that 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
2550the 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
2551be called at the end of this process. 2822be called at the end of this process.
2552 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
2553=cut 2827=cut
2554 2828
2555our $GOTOGEN; 2829our $GOTOGEN;
2556 2830
2557sub cf::object::player::goto { 2831sub cf::object::player::goto {
2558 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 }
2559 2839
2560 # 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
2561 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2562 2842
2563 $self->enter_link; 2843 $self->enter_link;
2583 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2584 } 2864 }
2585 } 2865 }
2586 2866
2587 my $map = eval { 2867 my $map = eval {
2588 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2589 2869
2590 if ($map) { 2870 if ($map) {
2591 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2592 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2593 } else { 2873 } else {
2594 $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);
2595 } 2875 }
2596 2876
2597 $map 2877 $map
2605 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2606 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2607 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2608 } 2888 }
2609 2889
2610 $done->() if $done; 2890 $done->($self) if $done;
2611 })->prio (1); 2891 })->prio (1);
2612} 2892}
2613 2893
2614=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2615 2895
2635} 2915}
2636 2916
2637sub prepare_random_map { 2917sub prepare_random_map {
2638 my ($exit) = @_; 2918 my ($exit) = @_;
2639 2919
2640 my $guard = cf::lock_acquire "exit_prepare:$exit";
2641
2642 # all this does is basically replace the /! path by 2920 # all this does is basically replace the /! path by
2643 # a new random map path (?random/...) with a seed 2921 # a new random map path (?random/...) with a seed
2644 # that depends on the exit object 2922 # that depends on the exit object
2645 2923
2646 my $rmp = parse_random_map_params $exit->msg; 2924 my $rmp = parse_random_map_params $exit->msg;
2648 if ($exit->map) { 2926 if ($exit->map) {
2649 $rmp->{region} = $exit->region->name; 2927 $rmp->{region} = $exit->region->name;
2650 $rmp->{origin_map} = $exit->map->path; 2928 $rmp->{origin_map} = $exit->map->path;
2651 $rmp->{origin_x} = $exit->x; 2929 $rmp->{origin_x} = $exit->x;
2652 $rmp->{origin_y} = $exit->y; 2930 $rmp->{origin_y} = $exit->y;
2931
2932 $exit->map->touch;
2653 } 2933 }
2654 2934
2655 $rmp->{random_seed} ||= $exit->random_seed; 2935 $rmp->{random_seed} ||= $exit->random_seed;
2656 2936
2657 my $data = cf::encode_json $rmp; 2937 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2658 my $md5 = Digest::MD5::md5_hex $data; 2938 my $md5 = Digest::MD5::md5_hex $data;
2659 my $meta = "$RANDOMDIR/$md5.meta"; 2939 my $meta = "$RANDOMDIR/$md5.meta";
2660 2940
2661 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2662 aio_write $fh, 0, (length $data), $data, 0; 2942 aio_write $fh, 0, (length $data), $data, 0;
2663 undef $fh; 2943 undef $fh;
2664 aio_rename "$meta~", $meta; 2944 aio_rename "$meta~", $meta;
2665 2945
2946 my $slaying = "?random/$md5";
2947
2948 if ($exit->valid) {
2666 $exit->slaying ("?random/$md5"); 2949 $exit->slaying ("?random/$md5");
2667 $exit->msg (undef); 2950 $exit->msg (undef);
2951 }
2668 } 2952 }
2669} 2953}
2670 2954
2671sub cf::object::player::enter_exit { 2955sub cf::object::player::enter_exit {
2672 my ($self, $exit) = @_; 2956 my ($self, $exit) = @_;
2673 2957
2674 return unless $self->type == cf::PLAYER; 2958 return unless $self->type == cf::PLAYER;
2675 2959
2676 if ($exit->slaying eq "/!") {
2677 #TODO: this should de-fi-ni-te-ly not be a sync-job
2678 # the problem is that $exit might not survive long enough
2679 # so it needs to be done right now, right here
2680 cf::sync_job { prepare_random_map $exit };
2681 }
2682
2683 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2684 my $hp = $exit->stats->hp;
2685 my $sp = $exit->stats->sp;
2686
2687 $self->enter_link; 2960 $self->enter_link;
2688 2961
2689 # if exit is damned, update players death & WoR home-position
2690 $self->contr->savebed ($slaying, $hp, $sp)
2691 if $exit->flag (FLAG_DAMNED);
2692
2693 (async { 2962 (async {
2694 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2963 $Coro::current->{desc} = "enter_exit";
2695 2964
2696 $self->deactivate_recursive; # just to be sure
2697 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
2698 $self->goto ($slaying, $hp, $sp); 2995 $self->goto ($map, $x, $y);
2699 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
2700 1; 3001 1
2701 }) { 3002 }) {
2702 $self->message ("Something went wrong deep within the crossfire server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2703 . "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. "
2704 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2705 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2706 3007
2707 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2708 $self->leave_link; 3009 $self->leave_link;
2709 } 3010 }
2710 })->prio (1); 3011 })->prio (1);
2711} 3012}
2712 3013
2724sub cf::client::send_drawinfo { 3025sub cf::client::send_drawinfo {
2725 my ($self, $text, $flags) = @_; 3026 my ($self, $text, $flags) = @_;
2726 3027
2727 utf8::encode $text; 3028 utf8::encode $text;
2728 $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);
2729} 3055}
2730 3056
2731=item $client->send_msg ($channel, $msg, $color, [extra...]) 3057=item $client->send_msg ($channel, $msg, $color, [extra...])
2732 3058
2733Send 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
2737 3063
2738=cut 3064=cut
2739 3065
2740# non-persistent channels (usually the info channel) 3066# non-persistent channels (usually the info channel)
2741our %CHANNEL = ( 3067our %CHANNEL = (
3068 "c/motd" => {
3069 id => "infobox",
3070 title => "MOTD",
3071 reply => undef,
3072 tooltip => "The message of the day",
3073 },
2742 "c/identify" => { 3074 "c/identify" => {
2743 id => "infobox", 3075 id => "infobox",
2744 title => "Identify", 3076 title => "Identify",
2745 reply => undef, 3077 reply => undef,
2746 tooltip => "Items recently identified", 3078 tooltip => "Items recently identified",
2748 "c/examine" => { 3080 "c/examine" => {
2749 id => "infobox", 3081 id => "infobox",
2750 title => "Examine", 3082 title => "Examine",
2751 reply => undef, 3083 reply => undef,
2752 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",
2753 }, 3091 },
2754 "c/book" => { 3092 "c/book" => {
2755 id => "infobox", 3093 id => "infobox",
2756 title => "Book", 3094 title => "Book",
2757 reply => undef, 3095 reply => undef,
2773 id => "infobox", 3111 id => "infobox",
2774 title => "Body Parts", 3112 title => "Body Parts",
2775 reply => undef, 3113 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available", 3114 tooltip => "Shows which body parts you posess and are available",
2777 }, 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 },
2778 "c/uptime" => { 3152 "c/uptime" => {
2779 id => "infobox", 3153 id => "infobox",
2780 title => "Uptime", 3154 title => "Uptime",
2781 reply => undef, 3155 reply => undef,
2782 tooltip => "How long the server has been running since last restart", 3156 tooltip => "How long the server has been running since last restart",
2785 id => "infobox", 3159 id => "infobox",
2786 title => "Map Info", 3160 title => "Map Info",
2787 reply => undef, 3161 reply => undef,
2788 tooltip => "Information related to the maps", 3162 tooltip => "Information related to the maps",
2789 }, 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,
2790); 3178);
2791 3179
2792sub cf::client::send_msg { 3180sub cf::client::send_msg {
2793 my ($self, $channel, $msg, $color, @extra) = @_; 3181 my ($self, $channel, $msg, $color, @extra) = @_;
2794 3182
2795 $msg = $self->pl->expand_cfpod ($msg); 3183 $msg = $self->pl->expand_cfpod ($msg)
3184 unless $color & cf::NDI_VERBATIM;
2796 3185
2797 $color &= cf::NDI_CLIENT_MASK; # just in case... 3186 $color &= cf::NDI_CLIENT_MASK; # just in case...
2798 3187
2799 # check predefined channels, for the benefit of C 3188 # check predefined channels, for the benefit of C
2800 if ($CHANNEL{$channel}) { 3189 if ($CHANNEL{$channel}) {
2801 $channel = $CHANNEL{$channel}; 3190 $channel = $CHANNEL{$channel};
2802 3191
2803 $self->ext_msg (channel_info => $channel) 3192 $self->ext_msg (channel_info => $channel);
2804 if $self->can_msg;
2805
2806 $channel = $channel->{id}; 3193 $channel = $channel->{id};
2807 3194
2808 } elsif (ref $channel) { 3195 } elsif (ref $channel) {
2809 # send meta info to client, if not yet sent 3196 # send meta info to client, if not yet sent
2810 unless (exists $self->{channel}{$channel->{id}}) { 3197 unless (exists $self->{channel}{$channel->{id}}) {
2811 $self->{channel}{$channel->{id}} = $channel; 3198 $self->{channel}{$channel->{id}} = $channel;
2812 $self->ext_msg (channel_info => $channel) 3199 $self->ext_msg (channel_info => $channel);
2813 if $self->can_msg;
2814 } 3200 }
2815 3201
2816 $channel = $channel->{id}; 3202 $channel = $channel->{id};
2817 } 3203 }
2818 3204
2819 return unless @extra || length $msg; 3205 return unless @extra || length $msg;
2820 3206
2821 if ($self->can_msg) {
2822 # default colour, mask it out 3207 # default colour, mask it out
2823 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3208 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2824 if $color & cf::NDI_DEF; 3209 if $color & cf::NDI_DEF;
2825 3210
2826 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3211 my $pkt = "msg "
3212 . $self->{json_coder}->encode (
2827 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3213 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2828 } else { 3214 );
2829 if ($color >= 0) {
2830 # replace some tags by gcfclient-compatible ones
2831 for ($msg) {
2832 1 while
2833 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2834 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2835 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2836 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2837 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2838 }
2839 3215
2840 $color &= cf::NDI_COLOR_MASK; 3216 $self->send_big_packet ($pkt);
2841
2842 utf8::encode $msg;
2843
2844 if (0 && $msg =~ /\[/) {
2845 # COMMAND/INFO
2846 $self->send_packet ("drawextinfo $color 10 8 $msg")
2847 } else {
2848 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2849 $self->send_packet ("drawinfo $color $msg")
2850 }
2851 }
2852 }
2853} 3217}
2854 3218
2855=item $client->ext_msg ($type, @msg) 3219=item $client->ext_msg ($type, @msg)
2856 3220
2857Sends an ext event to the client. 3221Sends an ext event to the client.
2859=cut 3223=cut
2860 3224
2861sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
2862 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
2863 3227
2864 if ($self->extcmd == 2) {
2865 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2866 } elsif ($self->extcmd == 1) { # TODO: remove
2867 push @msg, msgtype => "event_$type";
2868 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2869 }
2870}
2871
2872=item $client->ext_reply ($msgid, @msg)
2873
2874Sends an ext reply to the client.
2875
2876=cut
2877
2878sub cf::client::ext_reply($$@) {
2879 my ($self, $id, @msg) = @_;
2880
2881 if ($self->extcmd == 2) {
2882 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2883 } elsif ($self->extcmd == 1) {
2884 #TODO: version 1, remove
2885 unshift @msg, msgtype => "reply", msgid => $id;
2886 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2887 }
2888} 3229}
2889 3230
2890=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
2891 3232
2892Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
2947 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
2948 3289
2949 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2950 3291
2951 if (ref $msg) { 3292 if (ref $msg) {
2952 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2953 "ARRAY" eq ref $msg
2954 ? @$msg
2955 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2956 3294
2957 my @reply; 3295 my @reply;
2958 3296
2959 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
2960 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
2961 } 3299 }
2962 3300
2963 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
2964 if $reply; 3302 if $reply;
2965 3303
2966 } else { 3304 } else {
2967 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";
2968 } 3306 }
2969 3307
2970 cf::override; 3308 cf::override;
2971 }, 3309 },
2972); 3310);
2992 3330
2993 $coro 3331 $coro
2994} 3332}
2995 3333
2996cf::client->attach ( 3334cf::client->attach (
2997 on_destroy => sub { 3335 on_client_destroy => sub {
2998 my ($ns) = @_; 3336 my ($ns) = @_;
2999 3337
3000 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3001 }, 3339 },
3002); 3340);
3018our $safe_hole = new Safe::Hole; 3356our $safe_hole = new Safe::Hole;
3019 3357
3020$SIG{FPE} = 'IGNORE'; 3358$SIG{FPE} = 'IGNORE';
3021 3359
3022$safe->permit_only (Opcode::opset qw( 3360$safe->permit_only (Opcode::opset qw(
3023 :base_core :base_mem :base_orig :base_math 3361 :base_core :base_mem :base_orig :base_math :base_loop
3024 grepstart grepwhile mapstart mapwhile 3362 grepstart grepwhile mapstart mapwhile
3025 sort time 3363 sort time
3026)); 3364));
3027 3365
3028# here we export the classes and methods available to script code 3366# here we export the classes and methods available to script code
3031 3369
3032The following functions and methods are available within a safe environment: 3370The following functions and methods are available within a safe environment:
3033 3371
3034 cf::object 3372 cf::object
3035 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
3036 insert remove name archname title slaying race decrease_ob_nr 3374 insert remove name archname title slaying race decrease split
3375 value
3037 3376
3038 cf::object::player 3377 cf::object::player
3039 player 3378 player
3040 3379
3041 cf::player 3380 cf::player
3046 3385
3047=cut 3386=cut
3048 3387
3049for ( 3388for (
3050 ["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
3051 insert remove inv name archname title slaying race 3390 insert remove inv nrof name archname title slaying race
3052 decrease_ob_nr destroy)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3053 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3054 ["cf::player" => qw(peaceful)], 3393 ["cf::player" => qw(peaceful send_msg)],
3055 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3056) { 3395) {
3057 no strict 'refs';
3058 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3059 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3060 for @funs; 3398 for @funs;
3061} 3399}
3062 3400
3077 3415
3078 my $qcode = $code; 3416 my $qcode = $code;
3079 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3417 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3080 $qcode =~ s/\n/\\n/g; 3418 $qcode =~ s/\n/\\n/g;
3081 3419
3420 %vars = (_dummy => 0) unless %vars;
3421
3422 my @res;
3082 local $_; 3423 local $_;
3083 local @safe::cf::_safe_eval_args = values %vars;
3084 3424
3085 my $eval = 3425 my $eval =
3086 "do {\n" 3426 "do {\n"
3087 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3427 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3088 . "#line 0 \"{$qcode}\"\n" 3428 . "#line 0 \"{$qcode}\"\n"
3089 . $code 3429 . $code
3090 . "\n}" 3430 . "\n}"
3091 ; 3431 ;
3092 3432
3433 if ($CFG{safe_eval}) {
3093 sub_generation_inc; 3434 sub_generation_inc;
3435 local @safe::cf::_safe_eval_args = values %vars;
3094 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3436 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3095 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 }
3096 3442
3097 if ($@) { 3443 if ($@) {
3098 warn "$@"; 3444 warn "$@",
3099 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3100 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3101 } 3447 }
3102 3448
3103 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3104} 3450}
3105 3451
3119=cut 3465=cut
3120 3466
3121sub register_script_function { 3467sub register_script_function {
3122 my ($fun, $cb) = @_; 3468 my ($fun, $cb) = @_;
3123 3469
3124 no strict 'refs'; 3470 $fun = "safe::$fun" if $CFG{safe_eval};
3125 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3471 *$fun = $safe_hole->wrap ($cb);
3126} 3472}
3127 3473
3128=back 3474=back
3129 3475
3130=cut 3476=cut
3131 3477
3132############################################################################# 3478#############################################################################
3133# 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}
3134 3504
3135sub load_facedata($) { 3505sub load_facedata($) {
3136 my ($path) = @_; 3506 my ($path) = @_;
3137 3507
3138 # 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
3139 # for this (global event?) 3509 # for this (global event?)
3140 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3141 3511
3142 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3143 3513
3144 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3145 3515
3146 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3147 0 < aio_load $path, $facedata
3148 or die "$path: $!";
3149
3150 $facedata = Coro::Storable::thaw $facedata;
3151 3517
3152 $facedata->{version} == 2 3518 $facedata->{version} == 2
3153 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3154 3520
3155 # patch in the exptable
3156 $facedata->{resource}{"res/exp_table"} = {
3157 type => FT_RSRC,
3158 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3159 };
3160 cf::cede_to_tick; 3521 cf::cede_to_tick;
3161 3522
3162 { 3523 {
3163 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3164 3525
3165 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3166 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3167 3529
3168 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3169 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3170 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3171 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#
3172 3536
3173 cf::cede_to_tick; 3537 cf::cede_to_tick;
3174 } 3538 }
3175 3539
3176 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3181 3545
3182 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3183 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3184 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3185 } else { 3549 } else {
3186 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3187 } 3551 }
3188 3552
3189 cf::cede_to_tick; 3553 cf::cede_to_tick;
3190 } 3554 }
3191 } 3555 }
3200 3564
3201 cf::anim::invalidate_all; # d'oh 3565 cf::anim::invalidate_all; # d'oh
3202 } 3566 }
3203 3567
3204 { 3568 {
3205 # TODO: for gcfclient pleasure, we should give resources
3206 # that gcfclient doesn't grok a >10000 face index.
3207 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3208 3570
3209 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3210 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3211 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3212 my $data;
3213 3575
3214 if ($info->{type} & 1) {
3215 # prepend meta info
3216
3217 my $meta = $enc->encode ({
3218 name => $name,
3219 %{ $info->{meta} || {} },
3220 });
3221
3222 $data = pack "(w/a*)*", $meta, $info->{data};
3223 } else {
3224 $data = $info->{data};
3225 }
3226
3227 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3228 cf::face::set_type $idx, $info->{type}; 3576 cf::face::set_type $idx, $type;
3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3229 } else { 3580 } else {
3230 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3231 } 3582 }
3232 3583
3233 cf::cede_to_tick; 3584 cf::cede_to_tick;
3234 } 3585 }
3235 } 3586 }
3236 3587
3237 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3238 3589
3239 1 3590 1
3240} 3591}
3241
3242cf::global->attach (on_resource_update => sub {
3243 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3244 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3245
3246 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3247 my $sound = $soundconf->{compat}[$_]
3248 or next;
3249
3250 my $face = cf::face::find "sound/$sound->[1]";
3251 cf::sound::set $sound->[0] => $face;
3252 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3253 }
3254
3255 while (my ($k, $v) = each %{$soundconf->{event}}) {
3256 my $face = cf::face::find "sound/$v";
3257 cf::sound::set $k => $face;
3258 }
3259 }
3260});
3261 3592
3262register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3263 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3264 3595
3265 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3266 $ns->fx_want ($k, $v); 3597 $ns->fx_want ($k, $v);
3267 } 3598 }
3268}; 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}
3269 3623
3270sub reload_regions { 3624sub reload_regions {
3271 # 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
3272 # for this (global event?) 3626 # for this (global event?)
3273 %ext::player_env::MUSIC_FACE_CACHE = (); 3627 %ext::player_env::MUSIC_FACE_CACHE = ();
3287} 3641}
3288 3642
3289sub reload_archetypes { 3643sub reload_archetypes {
3290 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3291 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3292 #d# NEED to laod twice to resolve forward references 3646
3293 # this really needs to be done in an extra post-pass 3647 add_face "res/skill_info" => FT_RSRC,
3294 # (which needs to be synchronous, so solve it differently) 3648 JSON::XS->new->utf8->canonical->encode (
3295 load_resource_file "$DATADIR/archetypes" 3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3296 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 );
3297} 3655}
3298 3656
3299sub reload_treasures { 3657sub reload_treasures {
3300 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3301 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3302} 3660}
3303 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
3304sub reload_resources { 3744sub reload_resources {
3305 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3306 3746
3747 reload_materials;
3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3751 reload_archetypes;
3307 reload_regions; 3752 reload_regions;
3308 reload_facedata;
3309 #reload_archetypes;#d#
3310 reload_archetypes;
3311 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3312 3755
3313 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3314}
3315
3316sub init {
3317 reload_resources;
3318} 3757}
3319 3758
3320sub reload_config { 3759sub reload_config {
3321 open my $fh, "<:utf8", "$CONFDIR/config" 3760 trace "reloading config file...\n";
3322 or return;
3323 3761
3324 local $/; 3762 my $config = load_file "$CONFDIR/config";
3325 *CFG = YAML::Load <$fh>; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3326 3765
3327 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3328 3767
3329 $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};
3330 $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};
3331 3770
3332 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3336 }; 3775 };
3337 warn $@ if $@; 3776 warn $@ if $@;
3338 } 3777 }
3339} 3778}
3340 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
3341sub 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
3342 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3343 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3344 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#
3345 (async { 3821 (async {
3346 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3347 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3348 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3349 }; 3825 };
3350 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;
3351 reload_config; 3841 reload_config;
3352 db_init; 3842
3843 cf::init_uuid;
3844 cf::init_signals;
3845 cf::init_skills;
3846
3847 cf::init_beforeplay;
3848
3849 atomic;
3850
3353 load_extensions; 3851 load_extensions;
3354 3852
3355 $TICK_WATCHER->start; 3853 utime time, time, $RUNTIMEFILE;
3356 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3854
3357 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;
3358} 3870}
3359 3871
3360############################################################################# 3872#############################################################################
3361# initialisation and cleanup 3873# initialisation and cleanup
3362 3874
3363# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3364BEGIN { 3876BEGIN {
3365 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3366 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3367 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3368 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3369 }; 3881 };
3370 } 3882 }
3371} 3883}
3372 3884
3373sub write_runtime { 3885sub write_runtime_sync {
3374 my $runtime = "$LOCALDIR/runtime"; 3886 my $t0 = AE::time;
3375 3887
3376 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3377 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3378 3890
3379 IO::AIO::aio_utime $runtime, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3380 3892
3381 my $guard = cf::lock_acquire "write_runtime"; 3893 my $guard = cf::lock_acquire "write_runtime";
3382 3894
3383 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3895 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3384 or return; 3896 or return;
3385 3897
3386 my $value = $cf::RUNTIME + 90 + 10; 3898 my $value = $cf::RUNTIME + 90 + 10;
3387 # 10 is the runtime save interval, for a monotonic clock 3899 # 10 is the runtime save interval, for a monotonic clock
3388 # 60 allows for the watchdog to kill the server. 3900 # 60 allows for the watchdog to kill the server.
3398 aio_utime $fh, undef, undef; 3910 aio_utime $fh, undef, undef;
3399 3911
3400 close $fh 3912 close $fh
3401 or return; 3913 or return;
3402 3914
3403 aio_rename "$runtime~", $runtime 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3404 and return; 3916 and return;
3405 3917
3406 warn "runtime file written.\n"; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3407 3919
3408 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 };
3409} 3971}
3410 3972
3411sub emergency_save() { 3973sub emergency_save() {
3412 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3413 3975
3414 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;
3415 3982
3416 cf::sync_job { 3983 cf::sync_job {
3984 cf::write_runtime_sync; # external watchdog should not bark
3985
3417 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3418 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3419 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3420 warn "begin emergency player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3421 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3422 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3423 $pl->valid or next; 3992 $pl->valid or next;
3424 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3425 $pl->save; 3994 $pl->save;
3426 } 3995 }
3427 warn "end emergency player save\n"; 3996 info "emergency_perl_save: end player save\n";
3428 3997
3429 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";
3430 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3431 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3432 $map->valid or next; 4003 $map->valid or next;
3433 $map->save; 4004 $map->save;
3434 } 4005 }
3435 warn "end emergency map save\n"; 4006 info "emergency_perl_save: end map save\n";
3436 4007
3437 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";
3438 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3439 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
3440 }; 4036 };
3441 4037
3442 warn "leave emergency perl save\n"; 4038 info "emergency_perl_save: leave\n";
3443} 4039}
3444 4040
3445sub post_cleanup { 4041sub post_cleanup {
3446 my ($make_core) = @_; 4042 my ($make_core) = @_;
3447 4043
4044 IO::AIO::flush;
4045
3448 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3449 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 }
3450} 4076}
3451 4077
3452sub do_reload_perl() { 4078sub do_reload_perl() {
3453 # can/must only be called in main 4079 # can/must only be called in main
3454 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3455 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3456 return; 4082 return;
3457 } 4083 }
3458 4084
3459 warn "reloading..."; 4085 return if $RELOAD++;
3460 4086
3461 warn "entering sync_job"; 4087 my $t1 = AE::time;
3462 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
3463 cf::sync_job { 4095 cf::sync_job {
3464 cf::write_runtime; # external watchdog should not bark
3465 cf::emergency_save; 4096 #cf::emergency_save;
3466 cf::write_runtime; # external watchdog should not bark
3467 4097
3468 warn "syncing database to disk";
3469 BDB::db_env_txn_checkpoint $DB_ENV;
3470
3471 # if anything goes wrong in here, we should simply crash as we already saved
3472
3473 warn "flushing outstanding aio requests";
3474 for (;;) {
3475 BDB::flush;
3476 IO::AIO::flush;
3477 Coro::cede_notself;
3478 last unless IO::AIO::nreqs || BDB::nreqs;
3479 warn "iterate...";
3480 }
3481
3482 ++$RELOAD;
3483
3484 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3485 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3486 %EXT_CORO = (); 4100 %EXT_CORO = ();
3487 4101
3488 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3489 %COMMAND = (); 4103 %COMMAND = ();
3490 4104
3491 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3492 %EXTCMD = (); 4106 %EXTCMD = ();
3493 %EXTICMD = (); 4107 %EXTICMD = ();
3494 4108
3495 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3496 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3497 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3498 4112
3499 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3500 eval { 4114 eval {
3501 $cb->($pkg); 4115 $cb->($pkg);
3502 1 4116 1
3503 } 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;
3504 } 4122 }
3505 4123
3506 warn "... nuking $pkg";
3507 Symbol::delete_package $pkg;
3508 }
3509
3510 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3511 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3512 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3513 4127
3514 warn "... unloading $k"; 4128 trace "... unloading $k";
3515 delete $INC{$k}; 4129 delete $INC{$k};
3516 4130
3517 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3518 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3519 4133
3520 if (my $cb = $k->can ("unload_module")) { 4134 if (my $cb = $k->can ("unload_module")) {
3521 $cb->(); 4135 $cb->();
4136 }
4137
4138 clear_package $k;
3522 } 4139 }
3523 4140
3524 Symbol::delete_package $k;
3525 }
3526
3527 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3528 Symbol::delete_package "safe::$_" 4142 clear_package "safe::$_"
3529 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);
3530 4144
3531 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3532 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3533 delete $INC{"cf/pod.pm"}; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3534 4148
3535 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3536 # and global variables created in xs 4150 # and global variables created in xs
3537 #Symbol::delete_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3538 4152
3539 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3540 4154
3541 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3542 require cf; 4156 require cf;
3543 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4157 cf::_connect_to_perl_1;
3544 4158
3545 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3546 cf::reload_config; 4160 cf::reload_config;
3547 4161
3548 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3549 cf::load_extensions; 4163 cf::load_extensions;
3550 4164
4165 if ($REATTACH_ON_RELOAD) {
3551 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3552 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3553 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3554 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3555 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3556 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
4172 }
3557 4173
3558 warn "leaving sync_job"; 4174 cf::_post_init 1;
3559 4175
4176 trace "perl_reload: leaving sync_job";
4177
3560 1 4178 1
3561 } or do { 4179 } or do {
3562 warn $@; 4180 error $@;
3563 warn "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3564 exit 1; 4182 };
4183
4184 --$RELOAD;
3565 }; 4185 }
3566 4186
3567 warn "reloaded"; 4187 $t1 = AE::time - $t1;
4188 info "perl_reload: completed in ${t1}s\n";
3568}; 4189};
3569 4190
3570our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3571 4192
3572sub reload_perl() { 4193sub reload_perl() {
3573 # doing reload synchronously and two reloads happen back-to-back, 4194 # doing reload synchronously and two reloads happen back-to-back,
3574 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3575 4196
4197 $RELOAD_WATCHER ||= cf::async {
4198 Coro::AIO::aio_wait cache_extensions;
4199
3576 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3577 do_reload_perl; 4201 do_reload_perl;
3578 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
4203 };
3579 }; 4204 };
3580} 4205}
3581 4206
3582register_command "reload" => sub { 4207register_command "reload" => sub {
3583 my ($who, $arg) = @_; 4208 my ($who, $arg) = @_;
3589 reload_perl; 4214 reload_perl;
3590 }; 4215 };
3591 } 4216 }
3592}; 4217};
3593 4218
3594unshift @INC, $LIBDIR; 4219#############################################################################
3595 4220
3596my $bug_warning = 0; 4221my $bug_warning = 0;
3597 4222
3598our @WAIT_FOR_TICK;
3599our @WAIT_FOR_TICK_BEGIN;
3600
3601sub wait_for_tick { 4223sub wait_for_tick() {
3602 return unless $TICK_WATCHER->is_active; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3603 return if $Coro::current == $Coro::main;
3604 4225
3605 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3606 push @WAIT_FOR_TICK, $signal;
3607 $signal->wait;
3608} 4227}
3609 4228
3610sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3611 return unless $TICK_WATCHER->is_active; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3612 return if $Coro::current == $Coro::main;
3613 4231
3614 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3615 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3616 $signal->wait; 4234 $signal->wait;
3617} 4235}
3618 4236
3619$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 4237sub tick {
3620 if ($Coro::current != $Coro::main) { 4238 if ($Coro::current != $Coro::main) {
3621 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"
3622 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3623 return; 4241 return;
3624 } 4242 }
3625 4243
3626 $NOW = $tick_start = EV::now; 4244 cf::one_tick; # one server iteration
3627 4245
3628 cf::server_tick; # one server iteration 4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3629
3630 $RUNTIME += $TICK;
3631 $NEXT_TICK = $_[0]->at;
3632 4247
3633 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3634 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3635 Coro::async_pool { 4250 Coro::async_pool {
3636 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3637 write_runtime 4252 write_runtime_sync
3638 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3639 }; 4254 };
3640 } 4255 }
3641 4256
3642 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3643 $sig->send; 4258 $sig->send;
3644 } 4259 }
3645 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3646 $sig->send;
3647 }
3648 4261
3649 $LOAD = ($NOW - $tick_start) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3650 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3651 4264
3652 _post_tick; 4265 if (0) {
3653}; 4266 if ($NEXT_TICK) {
3654$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}
3655 4273
3656{ 4274{
3657 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3658 4277
3659 BDB::min_parallel 8; 4278 BDB::min_parallel 16;
3660 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3661 $Coro::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3662 4281
3663 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3664 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3665 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3666 | 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;
3667 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4287 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3668 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4288 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3669 4289
3670 cf::sync_job { 4290 cf::sync_job {
3671 eval { 4291 eval {
3690 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3691 }; 4311 };
3692 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3693 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3694 }; 4314 };
4315
4316 info "database initialised";
3695} 4317}
3696 4318
3697{ 4319{
3698 # configure IO::AIO 4320 # configure IO::AIO
3699 4321
4322 info "initialising aio";
3700 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
3701 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
3702 $Coro::AIO::WATCHER->priority (1); 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
3703} 4327}
3704 4328
3705my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
3706 4331
3707sub _log_backtrace { 4332sub _log_backtrace {
3708 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
3709 4334
3710 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
3711 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3712 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
3713 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
3714 ++$_log_backtrace; 4343 ++$_log_backtrace;
4344 my $perl_bt = Carp::longmess $msg;
3715 async { 4345 async {
3716 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
3717 4347
3718 my @bt = fork_call { 4348 my @bt = fork_call {
3719 @addr = map { sprintf "%x", $_ } @addr; 4349 @addr = map { sprintf "%x", $_ } @addr;
3730 } 4360 }
3731 4361
3732 @funcs 4362 @funcs
3733 }; 4363 };
3734 4364
3735 LOG llevInfo, "[ABT] $msg\n"; 4365 LOG llevInfo, "[ABT] $perl_bt\n";
4366 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3736 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
3737 --$_log_backtrace; 4368 --$_log_backtrace;
3738 }; 4369 };
3739 } else { 4370 } else {
3740 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
3741 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3742 } 4373 }
3743} 4374}
3744 4375
3745# load additional modules 4376# load additional modules
3746use cf::pod; 4377require "cf/$_.pm" for @EXTRA_MODULES;
4378cf::_connect_to_perl_2;
3747 4379
3748END { cf::emergency_save } 4380END { cf::emergency_save }
3749 4381
37501 43821
3751 4383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines