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.408 by root, Mon Jan 14 10:12:12 2008 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines