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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines