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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines