ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.410 by root, Tue Jan 15 12:02:24 2008 UTC vs.
Revision 1.595 by root, Fri Nov 9 16:27:55 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines