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.403 by root, Mon Dec 17 07:09:18 2007 UTC vs.
Revision 1.596 by root, Fri Nov 9 20:37:57 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines