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.438 by elmex, Sun Jul 13 20:15:51 2008 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use utf8; 25use common::sense;
25use strict;
26 26
27use Symbol; 27use Symbol;
28use List::Util; 28use List::Util;
29use Socket; 29use Socket;
30use EV; 30use EV;
31use Opcode; 31use Opcode;
32use Safe; 32use Safe;
33use Safe::Hole; 33use Safe::Hole;
34use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
35 40
36use Coro (); 41use Coro ();
37use Coro::State; 42use Coro::State;
38use Coro::Handle; 43use Coro::Handle;
44use Coro::EV;
39use Coro::AnyEvent; 45use Coro::AnyEvent;
40use Coro::Timer; 46use Coro::Timer;
41use Coro::Signal; 47use Coro::Signal;
42use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
43use Coro::AnyEvent; 50use Coro::AnyEvent;
44use Coro::AIO; 51use Coro::AIO;
45use Coro::BDB 1.6; 52use Coro::BDB 1.6;
46use Coro::Storable; 53use Coro::Storable;
47use Coro::Util (); 54use Coro::Util ();
48 55
56use Guard ();
49use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
50use BDB (); 58use BDB ();
51use Data::Dumper; 59use Data::Dumper;
52use Digest::MD5;
53use Fcntl; 60use Fcntl;
54use YAML (); 61use YAML::XS ();
62use CBOR::XS ();
55use IO::AIO (); 63use IO::AIO ();
56use Time::HiRes;
57use Compress::LZF; 64use Compress::LZF;
58use Digest::MD5 (); 65use Digest::MD5 ();
59 66
60AnyEvent::detect; 67AnyEvent::detect;
61 68
62# configure various modules to our taste 69# configure various modules to our taste
63# 70#
64$Storable::canonical = 1; # reduce rsync transfers 71$Storable::canonical = 1; # reduce rsync transfers
65Coro::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";
66Compress::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
67 79
68$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
69 82
70sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
71 86
72our %COMMAND = (); 87our %COMMAND = ();
73our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
74 89
75our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
76our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
77our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
78our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
79our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
80 97
81our $RELOAD; # number of reloads so far 98our $RELOAD; # number of reloads so far, non-zero while in reload
82our @EVENT; 99our @EVENT;
100our @REFLECT; # set by XS
101our %REFLECT; # set by us
83 102
84our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
85our $DATADIR = datadir; 105our $DATADIR = datadir;
86our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
87our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
88our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
89our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
90our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
91our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
92our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
93our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
94our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
95our %RESOURCE; 116our $PIDFILE = "$LOCALDIR/pid";
117our $RUNTIMEFILE = "$LOCALDIR/runtime";
118
119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
96 126
97our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
98our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
99our $NEXT_TICK; 129our $NEXT_TICK;
100our $USE_FSYNC = 1; # use fsync to write maps - default off 130our $USE_FSYNC = 1; # use fsync to write maps - default on
101 131
102our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
103our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
104our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
105our $DB_ENV; 135our $DB_ENV;
106 136
137our @EXTRA_MODULES = qw(pod match mapscript incloader);
138
107our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
108 141
109our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
110our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
111our $NOW; 145our $NOW;
112 146
113our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
114our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
115our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
120our $LOAD; # a number between 0 (idle) and 1 (too many objects) 154our $LOAD; # a number between 0 (idle) and 1 (too many objects)
121our $LOADAVG; # same thing, but with alpha-smoothing 155our $LOADAVG; # same thing, but with alpha-smoothing
122our $JITTER; # average jitter 156our $JITTER; # average jitter
123our $TICK_START; # for load detecting purposes 157our $TICK_START; # for load detecting purposes
124 158
159our @POST_INIT;
160
161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
166
125binmode STDOUT; 167binmode STDOUT;
126binmode STDERR; 168binmode STDERR;
127 169
128# read virtual server time, if available 170# read virtual server time, if available
129unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 171unless ($RUNTIME || !-e $RUNTIMEFILE) {
130 open my $fh, "<", "$LOCALDIR/runtime" 172 open my $fh, "<", $RUNTIMEFILE
131 or die "unable to read runtime file: $!"; 173 or die "unable to read $RUNTIMEFILE file: $!";
132 $RUNTIME = <$fh> + 0.; 174 $RUNTIME = <$fh> + 0.;
133} 175}
176
177eval "sub TICK() { $TICK } 1" or die;
134 178
135mkdir $_ 179mkdir $_
136 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 180 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
137 181
138our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
139 183
140sub cf::map::normalise; 184sub cf::map::normalise;
141 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
142############################################################################# 190#############################################################################
143 191
192%REFLECT = ();
193for (@REFLECT) {
194 my $reflect = JSON::XS::decode_json $_;
195 $REFLECT{$reflect->{class}} = $reflect;
196}
197
198# this is decidedly evil
199$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
200
201#############################################################################
202
144=head2 GLOBAL VARIABLES 203=head2 GLOBAL VARIABLES
145 204
146=over 4 205=over 4
147 206
148=item $cf::UPTIME 207=item $cf::UPTIME
149 208
150The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
151 225
152=item $cf::RUNTIME 226=item $cf::RUNTIME
153 227
154The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
155every server tick. 229every server tick.
156 230
157=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
158$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
159$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
160 234
161Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
162directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
163unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
164database environment. 238database environment.
165 239
166=item $cf::NOW
167
168The time of the last (current) server tick.
169
170=item $cf::TICK
171
172The interval between server ticks, in seconds.
173
174=item $cf::LOADAVG 240=item $cf::LOADAVG
175 241
176The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
177(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
178objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
186Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
187from wherever your confdir points to. 253from wherever your confdir points to.
188 254
189=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
190 256
191These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
192returns directly I<after> the tick processing (and consequently, can only wake one process 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
193per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
273
274=cut
275
276sub wait_for_tick();
277sub wait_for_tick_begin();
194 278
195=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
196 280
197This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
198C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 282C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
199that call. 283that call.
200 284
285=item %cf::REFLECT
286
287Contains, for each (C++) class name, a hash reference with information
288about object members (methods, scalars, arrays and flags) and other
289metadata, which is useful for introspection.
290
201=back 291=back
202 292
203=cut 293=cut
204 294
205BEGIN { 295sub error(@) { LOG llevError, join "", @_ }
206 *CORE::GLOBAL::warn = sub { 296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
301$Coro::State::WARNHOOK = sub {
207 my $msg = join "", @_; 302 my $msg = join "", @_;
208 303
209 $msg .= "\n" 304 $msg .= "\n"
210 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
211 306
212 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 307 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
213 308
214 LOG llevError, $msg; 309 LOG llevWarn, $msg;
215 }; 310};
216}
217 311
218$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
219 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
220 314
221 if ($Coro::current == $Coro::main) {#d# 315 error Carp::longmess $_[0];
316
317 if (in_main) {#d#
222 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
223 return;#d# 319 return;#d#
224 }#d# 320 }#d#
225 321
226 # kill coroutine otherwise 322 # kill coroutine otherwise
227 warn Carp::longmess $_[0];
228 Coro::terminate 323 Coro::terminate
229}; 324};
230
231$SIG{__DIE__} = sub { }; #d#?
232 325
233@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 326@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
234@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 327@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
235@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 328@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
236@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 329@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
243for my $pkg (qw( 336for my $pkg (qw(
244 cf::global cf::attachable 337 cf::global cf::attachable
245 cf::object cf::object::player 338 cf::object cf::object::player
246 cf::client cf::player 339 cf::client cf::player
247 cf::arch cf::living 340 cf::arch cf::living
341 cf::map cf::mapspace
248 cf::map cf::party cf::region 342 cf::party cf::region
249)) { 343)) {
250 no strict 'refs';
251 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
252} 345}
253 346
254$EV::DIED = sub { 347$EV::DIED = sub {
255 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
256}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
257 355
258############################################################################# 356#############################################################################
259 357
260=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
261 359
282 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
283 $d 381 $d
284 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
285} 383}
286 384
385=item $scalar = cf::load_file $path
386
387Loads the given file from path and returns its contents. Croaks on error
388and can block.
389
390=cut
391
392sub load_file($) {
393 0 <= aio_load $_[0], my $data
394 or Carp::croak "$_[0]: $!";
395
396 $data
397}
398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
287=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
288 438
289Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
290 440
291=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
297our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 447our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
298 448
299sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
300sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
301 451
452=item $ref = cf::decode_storable $scalar
453
454Same as Coro::Storable::thaw, so blocks.
455
456=cut
457
458BEGIN { *decode_storable = \&Coro::Storable::thaw }
459
460=item $ref = cf::decode_yaml $scalar
461
462Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
463
464=cut
465
466sub decode_yaml($) {
467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
482}
483
484=item $scalar = cf::unlzf $scalar
485
486Same as Compress::LZF::compress, but takes server ticks into account, so
487blocks.
488
489=cut
490
491sub unlzf($) {
492 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
493 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
494 Compress::LZF::decompress $_[0]
495}
496
497=item cf::post_init { BLOCK }
498
499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
500but I<before> the server starts ticking again.
501
502The codeblock will have a single boolean argument to indicate whether this
503is a reload or not.
504
505=cut
506
507sub post_init(&) {
508 push @POST_INIT, shift;
509}
510
511sub _post_init {
512 trace "running post_init jobs";
513
514 # run them in parallel...
515
516 my @join;
517
518 while () {
519 push @join, map &Coro::async ($_, 0), @POST_INIT;
520 @POST_INIT = ();
521
522 @join or last;
523
524 (pop @join)->join;
525 }
526}
527
302=item cf::lock_wait $string 528=item cf::lock_wait $string
303 529
304Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
305 531
306=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
307 533
308Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
309a Coro::guard object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
310for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
311returned. 537returned.
312 538
313Locks are *not* recursive, locking from the same coro twice results in a 539Locks are *not* recursive, locking from the same coro twice results in a
314deadlocked coro. 540deadlocked coro.
320 546
321Return true if the lock is currently active, i.e. somebody has locked it. 547Return true if the lock is currently active, i.e. somebody has locked it.
322 548
323=cut 549=cut
324 550
325our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
326our %LOCKER;#d#
327 552
328sub lock_wait($) { 553sub lock_wait($) {
329 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
330
331 if ($LOCKER{$key} == $Coro::current) {#d#
332 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
333 return;#d#
334 }#d#
335
336 # wait for lock, if any
337 while ($LOCK{$key}) {
338 push @{ $LOCK{$key} }, $Coro::current;
339 Coro::schedule;
340 }
341} 555}
342 556
343sub lock_acquire($) { 557sub lock_acquire($) {
344 my ($key) = @_; 558 $LOCKS->guard ($_[0])
345
346 # wait, to be sure we are not locked
347 lock_wait $key;
348
349 $LOCK{$key} = [];
350 $LOCKER{$key} = $Coro::current;#d#
351
352 Coro::guard {
353 delete $LOCKER{$key};#d#
354 # wake up all waiters, to be on the safe side
355 $_->ready for @{ delete $LOCK{$key} };
356 }
357} 559}
358 560
359sub lock_active($) { 561sub lock_active($) {
360 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
361
362 ! ! $LOCK{$key}
363} 563}
364 564
365sub freeze_mainloop { 565sub freeze_mainloop {
366 tick_inhibit_inc; 566 tick_inhibit_inc;
367 567
368 Coro::guard \&tick_inhibit_dec; 568 &Guard::guard (\&tick_inhibit_dec);
369} 569}
370 570
371=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
372 572
373Like EV::periodic, but randomly selects a starting point so that the actions 573Like EV::periodic, but randomly selects a starting point so that the actions
374get spread over timer. 574get spread over time.
375 575
376=cut 576=cut
377 577
378sub periodic($$) { 578sub periodic($$) {
379 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
383 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
384} 584}
385 585
386=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
387 587
388Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
389This call blocks and returns only when you have at least C<$time> seconds 589(default: 0): This call blocks and returns only when you have at least
390of cpu time till the next tick. The slot is only valid till the next cede. 590C<$time> seconds of cpu time till the next tick. The slot is only valid
591till the next cede.
592
593Background jobs should use a priority less than zero, interactive jobs
594should use 100 or more.
391 595
392The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
393used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
394 598
395Useful for short background jobs. 599Useful for short background jobs.
396 600
397=cut 601=cut
398 602
399our @SLOT_QUEUE; 603our @SLOT_QUEUE;
400our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
401 606
402$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
403$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
404 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
405 610
406 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
407 613
408 while () { 614 while () {
409 next_job: 615 next_job:
616
617 Coro::cede;
618
410 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
411 if ($avail > 0.01) { 620
412 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
413 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
414 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
415 $job->[2]->send; 625 $job->[2]->send;
416 Coro::cede;
417 goto next_job; 626 goto next_job;
418 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
419 } 629 }
420 } 630 }
421 631
422 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
423 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
424 push @cf::WAIT_FOR_TICK, $signal;
425 $signal->wait;
426 } else { 634 } else {
635 $busy = 0;
427 Coro::schedule; 636 Coro::schedule;
428 } 637 }
429 } 638 }
430}; 639};
431 640
432sub get_slot($;$$) { 641sub get_slot($;$$) {
433 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
434 643
435 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
436 645
437 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
438 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
439 649
440 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
441 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
442 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
454BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
455 665
456=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
457 667
458The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
459is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
460partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
461acceptable. 671acceptable.
462 672
463If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
464the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
468=cut 678=cut
469 679
470sub sync_job(&) { 680sub sync_job(&) {
471 my ($job) = @_; 681 my ($job) = @_;
472 682
473 if ($Coro::current == $Coro::main) { 683 if (in_main) {
474 my $time = EV::time; 684 my $time = AE::time;
475 685
476 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
477 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
478 688
479 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
480 690
481 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
482 692
483 my $busy = 1; 693 my $busy = 1;
484 my @res; 694 my @res;
485 695
486 (async { 696 (async {
487 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
488 @res = eval { $job->() }; 698 @res = eval { $job->() };
489 warn $@ if $@; 699 error $@ if $@;
490 undef $busy; 700 undef $busy;
491 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
492 702
493 while ($busy) { 703 while ($busy) {
494 if (Coro::nready) { 704 if (Coro::nready) {
495 Coro::cede_notself; 705 Coro::cede_notself;
496 } else { 706 } else {
497 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
498 } 708 }
499 } 709 }
500 710
501 my $time = EV::time - $time; 711 my $time = AE::time - $time;
502 712
503 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
504 714
505 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
506 } else { 716 } else {
528 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
529 739
530 $coro 740 $coro
531} 741}
532 742
533=item fork_call { }, $args 743=item fork_call { }, @args
534 744
535Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
536process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
537Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
538never block itself or use any form of event handling. 748never block itself or use any form of event handling.
539 749
540=cut 750=cut
541 751
752sub post_fork {
753 reset_signals;
754}
755
542sub fork_call(&@) { 756sub fork_call(&@) {
543 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
544 758
545 # we seemingly have to make a local copy of the whole thing,
546 # otherwise perl prematurely frees the stuff :/
547 # TODO: investigate and fix (likely this will be rather laborious)
548
549 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
550 reset_signals; 760 cf::post_fork;
551 &$cb 761 &$cb
552 }, @args; 762 } @args;
553 763
554 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
765}
766
767sub objinfo {
768 (
769 "counter value" => cf::object::object_count,
770 "objects created" => cf::object::create_count,
771 "objects destroyed" => cf::object::destroy_count,
772 "freelist size" => cf::object::free_count,
773 "allocated objects" => cf::object::objects_size,
774 "active objects" => cf::object::actives_size,
775 )
555} 776}
556 777
557=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
558 779
559=cut 780=cut
596within each server. 817within each server.
597 818
598=cut 819=cut
599 820
600sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
601 my ($name) = @_; 825 my ($name) = @_;
602 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
603 827
604 eval { 828 eval {
605 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
615} 839}
616 840
617our $DB; 841our $DB;
618 842
619sub db_init { 843sub db_init {
620 cf::sync_job {
621 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
622 };
623} 845}
624 846
625sub db_get($$) { 847sub db_get($$) {
626 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
627 849
628 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
629 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
630 854
631 $! ? () 855 $! ? ()
632 : $data 856 : $data
633 }
634} 857}
635 858
636sub db_put($$$) { 859sub db_put($$$) {
637 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
638 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
666 889
667 my @data; 890 my @data;
668 my $md5; 891 my $md5;
669 892
670 for (0 .. $#$src) { 893 for (0 .. $#$src) {
671 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
672 or Carp::croak "$src->[$_]: $!";
673 } 895 }
674 896
675 # if processing is expensive, check 897 # if processing is expensive, check
676 # checksum first 898 # checksum first
677 if (1) { 899 if (1) {
690 912
691 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
692 } 914 }
693 } 915 }
694 916
695 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
696 my $data = $process->(\@data); 918 my $data = $process->(\@data);
697 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
698 920
699 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
700 922
701 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
702 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
703 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
704 926
714 936
715=cut 937=cut
716 938
717sub datalog($@) { 939sub datalog($@) {
718 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
719 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
720} 942}
721 943
722=back 944=back
723 945
724=cut 946=cut
725 947
726############################################################################# 948#############################################################################
727 949
728=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
729 951
730Many objects in crossfire are so-called attachable objects. That means you can 952Many objects in deliantra are so-called attachable objects. That means you can
731attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
732to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
733 955
734In the following description, CLASS can be any of C<global>, C<object> 956In the following description, CLASS can be any of C<global>, C<object>
735C<player>, C<client> or C<map> (i.e. the attachable objects in 957C<player>, C<client> or C<map> (i.e. the attachable objects in
785=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
786 1008
787Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
788given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
789 1011
790Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
791that are attached at load/instantiate time, thus the need for a name. 1013that are attached at load/instantiate time, thus the need for a name.
792 1014
793These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
794 1016
795=over 4 1017=over 4
919 1141
920 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
921 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
922 1144
923 } elsif (ref $type) { 1145 } elsif (ref $type) {
924 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
925 1147
926 } else { 1148 } else {
927 shift @arg; 1149 shift @arg;
928 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
929 } 1151 }
930 } 1152 }
931} 1153}
932 1154
933sub _object_attach { 1155sub _object_attach {
943 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
944 } 1166 }
945 1167
946 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
947 } else { 1169 } else {
948 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
949 } 1171 }
950 1172
951 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
952} 1174}
953 1175
1012 1234
1013 for (@$callbacks) { 1235 for (@$callbacks) {
1014 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1015 1237
1016 if ($@) { 1238 if ($@) {
1017 warn "$@";
1018 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1019 override; 1240 override;
1020 } 1241 }
1021 1242
1022 return 1 if $override; 1243 return 1 if $override;
1023 } 1244 }
1086 1307
1087sub reattach { 1308sub reattach {
1088 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
1089 my ($obj) = @_; 1310 my ($obj) = @_;
1090 1311
1312 # no longer needed after getting rid of delete_package?
1091 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1313 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1092 1314
1093 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
1094 1316
1095 @$registry = (); 1317 @$registry = ();
1096 1318
1101 for (@$attach) { 1323 for (@$attach) {
1102 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1103 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1104 } 1326 }
1105 } else { 1327 } else {
1106 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1107 } 1329 }
1108 } 1330 }
1109} 1331}
1110 1332
1111cf::attachable->attach ( 1333cf::attachable->attach (
1138 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1139 1361
1140 sync_job { 1362 sync_job {
1141 if (length $$rdata) { 1363 if (length $$rdata) {
1142 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1143 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1144 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1145 1368
1146 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1147 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1148 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1149 aio_fsync $fh if $cf::USE_FSYNC; 1372 if ($cf::USE_FSYNC) {
1373 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1374 aio_fsync $fh;
1375 }
1150 aio_close $fh; 1376 aio_close $fh;
1151 1377
1152 if (@$objs) { 1378 if (@$objs) {
1153 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1379 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1154 aio_chmod $fh, SAVE_MODE; 1380 aio_chmod $fh, SAVE_MODE;
1155 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1156 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1157 aio_fsync $fh if $cf::USE_FSYNC; 1383 if ($cf::USE_FSYNC) {
1384 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;
1385 aio_fsync $fh;
1386 }
1158 aio_close $fh; 1387 aio_close $fh;
1159 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1160 } 1389 }
1161 } else { 1390 } else {
1162 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1163 } 1392 }
1164 1393
1165 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1166 } else { 1398 } else {
1167 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1168 } 1400 }
1169 } else { 1401 } else {
1170 aio_unlink $filename; 1402 aio_unlink $filename;
1171 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1172 } 1404 }
1196 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1197 $av = $st->{objs}; 1429 $av = $st->{objs};
1198 } 1430 }
1199 1431
1200 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1201 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1202 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1203 1436
1204 ($data, $av) 1437 ($data, $av)
1205} 1438}
1206 1439
1207=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1211=cut 1444=cut
1212 1445
1213############################################################################# 1446#############################################################################
1214# command handling &c 1447# command handling &c
1215 1448
1216=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1217 1450
1218Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1219$name. 1452$name.
1220 1453
1221=cut 1454=cut
1227 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1228 1461
1229 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1230} 1463}
1231 1464
1232=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1233 1466
1234Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1235extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1236received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1237the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1238has logged in successfully. 1471has logged in successfully.
1239 1472
1240If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1241called.
1242 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1243=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1244 1481
1245Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1246exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd packet. Exti commands are processed by the server as soon as they
1247are received, i.e. out of order w.r.t. other commands. The first argument 1484are received, i.e. out of order w.r.t. other commands. The first argument
1248is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1249log-in. 1486log-in.
1250 1487
1251If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1252called.
1253 1489
1254=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1255 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1256sub register_extcmd { 1497sub register_extcmd($$) {
1257 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1258 1499
1259 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1260} 1501}
1261 1502
1262sub register_exticmd { 1503sub register_async_extcmd($$) {
1263 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1264 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1265 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1266} 1513}
1267 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1268cf::player->attach ( 1523cf::player->attach (
1269 on_command => sub { 1524 on_unknown_command => sub {
1270 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1271 1526
1272 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1273 or return; 1528 or return;
1274 1529
1282 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1283 1538
1284 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1285 1540
1286 if (ref $msg) { 1541 if (ref $msg) {
1287 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1288 "ARRAY" eq ref $msg
1289 ? @$msg
1290 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1291 1543
1292 my @reply;
1293
1294 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1295 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1296 } 1562 }
1297 1563
1298 $pl->ext_reply ($reply, @reply)
1299 if $reply;
1300
1301 } else { 1564 } else {
1302 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1303 } 1566 }
1304 1567
1305 cf::override; 1568 cf::override;
1306 }, 1569 },
1307); 1570);
1308 1571
1572# "readahead" all extensions
1573sub cache_extensions {
1574 my $grp = IO::AIO::aio_group;
1575
1576 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1577 for (grep /\.ext$/, @{$_[0]}) {
1578 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1579 }
1580 };
1581
1582 $grp
1583}
1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1309sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1310 cf::sync_job { 1601 cf::sync_job {
1311 my %todo; 1602 my %todo;
1312 1603
1313 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1314 next unless -r $path; 1605 next unless -r $path;
1332 1623
1333 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1334 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1335 1626
1336 $ext{source} = 1627 $ext{source} =
1337 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1338 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1339 . $source 1630 . $source
1340 . "\n};\n1"; 1631 . "\n};\n1";
1341 1632
1342 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1343 } 1634 }
1344 1635
1636 my $pass = 0;
1345 my %done; 1637 my %done;
1346 while (%todo) { 1638 while (%todo) {
1347 my $progress; 1639 my $progress;
1348 1640
1641 ++$pass;
1642
1643 ext:
1349 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1350 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1351 goto skip 1646 next ext
1352 unless exists $done{$_}; 1647 unless exists $done{$_};
1353 } 1648 }
1354 1649
1355 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1356 1651
1357 unless (eval $v->{source}) { 1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1661 my $active = eval $source;
1662
1663 if (length $@) {
1358 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1359 : "$v->{base}: extension inactive.\n";
1360 1665
1361 if (exists $v->{meta}{mandatory}) {
1362 warn $msg;
1363 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1364 } 1667 if exists $v->{meta}{mandatory};
1365 1668
1366 warn $msg; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1670 delete $todo{$k};
1671 } else {
1672 $done{$k} = delete $todo{$k};
1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1367 } 1678 }
1368
1369 $done{$k} = delete $todo{$k};
1370 push @EXTS, $v->{pkg};
1371 $progress = 1;
1372 } 1679 }
1373 1680
1374 skip: 1681 unless ($progress) {
1375 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1376 unless $progress; 1683
1684 while (my ($k, $v) = each %todo) {
1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1686 if exists $v->{meta}{mandatory};
1687 }
1688
1689 last;
1690 }
1377 } 1691 }
1378 }; 1692 };
1379} 1693}
1380 1694
1381############################################################################# 1695#############################################################################
1382 1696
1383=back 1697=back
1384 1698
1385=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1386 1700
1387Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1388 1702
1389=cut 1703=cut
1390 1704
1391package cf::player; 1705package cf::player;
1392 1706
1435 1749
1436sub exists($) { 1750sub exists($) {
1437 my ($login) = @_; 1751 my ($login) = @_;
1438 1752
1439 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1440 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1441} 1755}
1442 1756
1443sub find($) { 1757sub find($) {
1444 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1445 my $login = $_[0]; 1759 my $login = $_[0];
1465 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1466 } 1780 }
1467 } 1781 }
1468} 1782}
1469 1783
1784cf::player->attach (
1785 on_load => sub {
1786 my ($pl, $path) = @_;
1787
1788 # restore slots saved in save, below
1789 my $slots = delete $pl->{_slots};
1790
1791 $pl->ob->current_weapon ($slots->[0]);
1792 $pl->combat_ob ($slots->[1]);
1793 $pl->ranged_ob ($slots->[2]);
1794 },
1795);
1796
1470sub save($) { 1797sub save($) {
1471 my ($pl) = @_; 1798 my ($pl) = @_;
1472 1799
1473 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1474 1801
1479 1806
1480 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1481 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1482 1809
1483 cf::get_slot 0.01; 1810 cf::get_slot 0.01;
1811
1812 # save slots, to be restored later
1813 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1484 1814
1485 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1486 cf::cede_to_tick; 1816 cf::cede_to_tick;
1487} 1817}
1488 1818
1520 my ($pl) = @_; 1850 my ($pl) = @_;
1521 1851
1522 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1523 1853
1524 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1525 $pl->password ("*"); # this should lock out the player until we nuked the dir 1855 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1526 1856
1527 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1528 $pl->deactivate; 1858 $pl->deactivate;
1859
1529 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1530 $pl->ob->check_score;
1531 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1532 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1533 1865
1534 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1535 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1536 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1590 \@logins 1922 \@logins
1591} 1923}
1592 1924
1593=item $player->maps 1925=item $player->maps
1594 1926
1927=item cf::player::maps $login
1928
1595Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1596player. May block. 1930player. May block.
1597 1931
1598=cut 1932=cut
1599 1933
1616 } 1950 }
1617 1951
1618 \@paths 1952 \@paths
1619} 1953}
1620 1954
1621=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1622 1956
1623Expand crossfire pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1624
1625=cut
1626
1627use re 'eval';
1628
1629my $group;
1630my $interior; $interior = qr{
1631 # match a pod interior sequence sans C<< >>
1632 (?:
1633 \ (.*?)\ (?{ $group = $^N })
1634 | < (??{$interior}) >
1635 )
1636}x;
1637
1638sub expand_cfpod {
1639 my ($self, $pod) = @_;
1640
1641 my $xml;
1642
1643 while () {
1644 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1645 $group = $1;
1646
1647 $group =~ s/&/&amp;/g;
1648 $group =~ s/</&lt;/g;
1649
1650 $xml .= $group;
1651 } elsif ($pod =~ m%\G
1652 ([BCGHITU])
1653 <
1654 (?:
1655 ([^<>]*) (?{ $group = $^N })
1656 | < $interior >
1657 )
1658 >
1659 %gcsx
1660 ) {
1661 my ($code, $data) = ($1, $group);
1662
1663 if ($code eq "B") {
1664 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1665 } elsif ($code eq "I") {
1666 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1667 } elsif ($code eq "U") {
1668 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1669 } elsif ($code eq "C") {
1670 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1671 } elsif ($code eq "T") {
1672 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1673 } elsif ($code eq "G") {
1674 my ($male, $female) = split /\|/, $data;
1675 $data = $self->gender ? $female : $male;
1676 $xml .= expand_cfpod ($self, $data);
1677 } elsif ($code eq "H") {
1678 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1679 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1680 "")
1681 [$self->{hintmode}];
1682 } else {
1683 $xml .= "error processing '$code($data)' directive";
1684 }
1685 } else {
1686 if ($pod =~ /\G(.+)/) {
1687 warn "parse error while expanding $pod (at $1)";
1688 }
1689 last;
1690 }
1691 }
1692
1693 for ($xml) {
1694 # create single paragraphs (very hackish)
1695 s/(?<=\S)\n(?=\w)/ /g;
1696
1697 # compress some whitespace
1698 s/\s+\n/\n/g; # ws line-ends
1699 s/\n\n+/\n/g; # double lines
1700 s/^\n+//; # beginning lines
1701 s/\n+$//; # ending lines
1702 }
1703
1704 $xml
1705}
1706
1707no re 'eval';
1708
1709sub hintmode {
1710 $_[0]{hintmode} = $_[1] if @_ > 1;
1711 $_[0]{hintmode}
1712}
1713
1714=item $player->ext_reply ($msgid, @msg)
1715
1716Sends an ext reply to the player.
1717
1718=cut
1719
1720sub ext_reply($$@) {
1721 my ($self, $id, @msg) = @_;
1722
1723 $self->ns->ext_reply ($id, @msg)
1724}
1725 1958
1726=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1727 1960
1728Sends an ext event to the client. 1961Sends an ext event to the client.
1729 1962
1749 1982
1750=cut 1983=cut
1751 1984
1752sub find_by_path($) { 1985sub find_by_path($) {
1753 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1754 1989
1755 my ($match, $specificity); 1990 my ($match, $specificity);
1756 1991
1757 for my $region (list) { 1992 for my $region (list) {
1758 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1787sub generate_random_map { 2022sub generate_random_map {
1788 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1789 2024
1790 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1791 2026
1792 # mit "rum" bekleckern, nicht
1793 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1794 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1795 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1796 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1797 $rmp->{exit_on_final_map},
1798 $rmp->{xsize}, $rmp->{ysize},
1799 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1800 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1801 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1802 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1803 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1804 (cf::region::find $rmp->{region}), $rmp->{custom}
1805 )
1806} 2028}
1807 2029
1808=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1809 2031
1810Register a handler for the map path matching the given regex at the 2032Register a handler for the map path matching the given regex at the
1815 2037
1816sub register { 2038sub register {
1817 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1818 my $pkg = caller; 2040 my $pkg = caller;
1819 2041
1820 no strict;
1821 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1822 2043
1823 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1824} 2045}
1825 2046
1826# also paths starting with '/' 2047# also paths starting with '/'
1827$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1828 2049
1829sub thawer_merge { 2050sub thawer_merge {
1830 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1831 2052
1832 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1837} 2058}
1838 2059
1839sub normalise { 2060sub normalise {
1840 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1841 2062
1842 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1843 2064
1844 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1845 2066
1846 # map plan: 2067 # map plan:
1847 # 2068 #
1862 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1863 $path = "$base/$path"; 2084 $path = "$base/$path";
1864 } 2085 }
1865 2086
1866 for ($path) { 2087 for ($path) {
1867 redo if s{//}{/};
1868 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1869 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1870 } 2090 }
1871 2091
1872 $path 2092 $path
1886 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1887 return $self; 2107 return $self;
1888 } 2108 }
1889 } 2109 }
1890 2110
1891 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1892 () 2112 ()
1893} 2113}
1894 2114
2115# may re-bless or do other evil things
1895sub init { 2116sub init {
1896 my ($self) = @_; 2117 my ($self) = @_;
1897 2118
1898 $self 2119 $self
1899} 2120}
1930 2151
1931 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1932 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1933} 2154}
1934 2155
1935# and all this just because we cannot iterate over
1936# all maps in C++...
1937sub change_all_map_light {
1938 my ($change) = @_;
1939
1940 $_->change_map_light ($change)
1941 for grep $_->outdoor, values %cf::MAP;
1942}
1943
1944sub decay_objects { 2156sub decay_objects {
1945 my ($self) = @_; 2157 my ($self) = @_;
1946 2158
1947 return if $self->{deny_reset}; 2159 return if $self->{deny_reset};
1948 2160
1973 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1974 2186
1975 1 2187 1
1976} 2188}
1977 2189
2190# used to laod the header of an original map
1978sub load_header_orig { 2191sub load_header_orig {
1979 my ($self) = @_; 2192 my ($self) = @_;
1980 2193
1981 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1982} 2195}
1983 2196
2197# used to laod the header of an instantiated map
1984sub load_header_temp { 2198sub load_header_temp {
1985 my ($self) = @_; 2199 my ($self) = @_;
1986 2200
1987 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1988} 2202}
1989 2203
2204# called after loading the header from an instantiated map
1990sub prepare_temp { 2205sub prepare_temp {
1991 my ($self) = @_; 2206 my ($self) = @_;
1992 2207
1993 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1994 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1995 # safety 2210 # safety
1996 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1997 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1998} 2213}
1999 2214
2215# called after loading the header from an original map
2000sub prepare_orig { 2216sub prepare_orig {
2001 my ($self) = @_; 2217 my ($self) = @_;
2002 2218
2003 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2004 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2028 2244
2029sub find; 2245sub find;
2030sub find { 2246sub find {
2031 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2032 2248
2249 cf::cede_to_tick;
2250
2033 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2034 2252
2035 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2037 2255
2038 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2039 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2040 my $guard2 = cf::lock_acquire "map_find:$path";
2041
2042 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
2043 or return; 2258 or return;
2044 2259
2045 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
2046 2261
2058 2273
2059 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2060 } 2275 }
2061} 2276}
2062 2277
2063sub pre_load { } 2278sub pre_load { }
2064sub post_load { } 2279#sub post_load { } # XS
2065 2280
2066sub load { 2281sub load {
2067 my ($self) = @_; 2282 my ($self) = @_;
2068 2283
2069 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2072 2287
2073 { 2288 {
2074 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2075 2290
2076 return unless $self->valid; 2291 return unless $self->valid;
2077 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2078
2079 $self->in_memory (cf::MAP_LOADING);
2080 2293
2081 $self->alloc; 2294 $self->alloc;
2082 2295
2083 $self->pre_load; 2296 $self->pre_load;
2084 cf::cede_to_tick; 2297 cf::cede_to_tick;
2085 2298
2299 if (exists $self->{load_path}) {
2086 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2087 $f->skip_block; 2301 $f->skip_block;
2088 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2089 or return; 2303 or return;
2090 2304
2091 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2305 $self->post_load_original
2092 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2093 2307
2094 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2095 utf8::encode $uniq; 2309 utf8::encode $uniq;
2096 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2097 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2098 $self->clear_unique_items; 2312 $self->clear_unique_items;
2099 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2100 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2101 } 2316 }
2102 } 2317 }
2103 }
2104 2318
2105 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2106 2326
2107 cf::cede_to_tick; 2327 cf::cede_to_tick;
2108 # now do the right thing for maps 2328 # now do the right thing for maps
2109 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2110 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2114 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2115 $self->decay_objects; 2335 $self->decay_objects;
2116 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2117 $self->update_buttons; 2337 $self->update_buttons;
2118 cf::cede_to_tick; 2338 cf::cede_to_tick;
2119 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2120 cf::cede_to_tick;
2121 $self->activate;
2122 } 2340 }
2123 2341
2124 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2125 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2126
2127 $self->in_memory (cf::MAP_ACTIVE);
2128 } 2344 }
2129 2345
2130 $self->post_load; 2346 $self->post_load;
2131}
2132 2347
2348 1
2349}
2350
2351# customize the map for a given player, i.e.
2352# return the _real_ map. used by e.g. per-player
2353# maps to change the path to ~playername/mappath
2133sub customise_for { 2354sub customise_for {
2134 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2135 2356
2136 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2137 if $self->per_player; 2358 if $self->per_player;
2140# if $self->per_party; 2361# if $self->per_party;
2141 2362
2142 $self 2363 $self
2143} 2364}
2144 2365
2145# find and load all maps in the 3x3 area around a map
2146sub load_neighbours {
2147 my ($map) = @_;
2148
2149 my @neigh; # diagonal neighbours
2150
2151 for (0 .. 3) {
2152 my $neigh = $map->tile_path ($_)
2153 or next;
2154 $neigh = find $neigh, $map
2155 or next;
2156 $neigh->load;
2157
2158 push @neigh,
2159 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2160 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2161 }
2162
2163 for (grep defined $_->[0], @neigh) {
2164 my ($path, $origin) = @$_;
2165 my $neigh = find $path, $origin
2166 or next;
2167 $neigh->load;
2168 }
2169}
2170
2171sub find_sync { 2366sub find_sync {
2172 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2173 2368
2174 cf::sync_job { find $path, $origin } 2369 # it's a bug to call this from the main context
2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2371 if $Coro::current == $Coro::main;
2372
2373 find $path, $origin
2175} 2374}
2176 2375
2177sub do_load_sync { 2376sub do_load_sync {
2178 my ($map) = @_; 2377 my ($map) = @_;
2179 2378
2379 # it's a bug to call this from the main context
2180 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2181 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2182 2382
2183 cf::sync_job { $map->load }; 2383 $map->load;
2184} 2384}
2185 2385
2186our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2187our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2188 2388
2189sub find_async { 2389sub find_async {
2190 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2191 2391
2192 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2193 2393
2194 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2195 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2196 } 2396 }
2197 2397
2198 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2199 2399
2200 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2201 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2202 2402
2203 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2204 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2205 if (my $map = find $k) { 2405 if (my $map = find $k) {
2206 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2207 } 2407 }
2208 2408
2209 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2210 } 2410 }
2211 } 2411 }
2214 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2215 2415
2216 () 2416 ()
2217} 2417}
2218 2418
2419# common code, used by both ->save and ->swapout
2219sub save { 2420sub _save {
2220 my ($self) = @_; 2421 my ($self) = @_;
2221
2222 my $lock = cf::lock_acquire "map_data:$self->{path}";
2223 2422
2224 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2225 2424
2226 return unless $self->dirty; 2425 return unless $self->dirty;
2227 2426
2247 } else { 2446 } else {
2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2447 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2249 } 2448 }
2250} 2449}
2251 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2252sub swap_out { 2459sub swap_out {
2253 my ($self) = @_; 2460 my ($self) = @_;
2254 2461
2255 # save first because save cedes
2256 $self->save;
2257
2258 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2259 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2260 return if $self->players; 2466 return if $self->players;
2261 return if $self->in_memory != cf::MAP_ACTIVE; 2467
2468 # first deactivate the map and "unlink" it from the core
2469 $self->deactivate;
2470 $_->clear_links_to ($self) for values %cf::MAP;
2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # then atomically save
2474 $self->_save;
2475
2476 # then free the map
2477 $self->clear;
2478}
2479
2480sub reset_at {
2481 my ($self) = @_;
2482
2483 # TODO: safety, remove and allow resettable per-player maps
2262 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2263 2485
2486 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2487 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2488
2489 $time + $to
2490}
2491
2492sub should_reset {
2493 my ($self) = @_;
2494
2495 $self->reset_at <= $cf::RUNTIME
2496}
2497
2498sub reset {
2499 my ($self) = @_;
2500
2501 my $lock = cf::lock_acquire "map_data:$self->{path}";
2502
2503 return if $self->players;
2504
2505 cf::trace "resetting map ", $self->path, "\n";
2506
2264 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2508
2509 # need to save uniques path
2510 unless ($self->{deny_save}) {
2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2512
2513 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2514 if $uniq;
2515 }
2516
2517 delete $cf::MAP{$self->path};
2265 2518
2266 $self->deactivate; 2519 $self->deactivate;
2267 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2268 $self->clear; 2521 $self->clear;
2269}
2270
2271sub reset_at {
2272 my ($self) = @_;
2273
2274 # TODO: safety, remove and allow resettable per-player maps
2275 return 1e99 if $self->{deny_reset};
2276
2277 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2278 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2279
2280 $time + $to
2281}
2282
2283sub should_reset {
2284 my ($self) = @_;
2285
2286 $self->reset_at <= $cf::RUNTIME
2287}
2288
2289sub reset {
2290 my ($self) = @_;
2291
2292 my $lock = cf::lock_acquire "map_data:$self->{path}";
2293
2294 return if $self->players;
2295
2296 warn "resetting map ", $self->path;
2297
2298 $self->in_memory (cf::MAP_SWAPPED);
2299
2300 # need to save uniques path
2301 unless ($self->{deny_save}) {
2302 my $uniq = $self->uniq_path; utf8::encode $uniq;
2303
2304 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2305 if $uniq;
2306 }
2307
2308 delete $cf::MAP{$self->path};
2309
2310 $self->deactivate;
2311 $_->clear_links_to ($self) for values %cf::MAP;
2312 $self->clear;
2313 2522
2314 $self->unlink_save; 2523 $self->unlink_save;
2315 $self->destroy; 2524 $self->destroy;
2316} 2525}
2317 2526
2325 2534
2326 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2327 2536
2328 $self->unlink_save; 2537 $self->unlink_save;
2329 2538
2330 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2331 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2332 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2333 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2334 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2335 2544
2392 : normalise $_ 2601 : normalise $_
2393 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2394 ] 2603 ]
2395} 2604}
2396 2605
2606=item cf::map::static_maps
2607
2608Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2609file in the shared directory excluding F</styles> and F</editor>). May
2610block.
2611
2612=cut
2613
2614sub static_maps() {
2615 my @dirs = "";
2616 my @maps;
2617
2618 while (@dirs) {
2619 my $dir = shift @dirs;
2620
2621 next if $dir eq "/styles" || $dir eq "/editor";
2622
2623 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2624 or return;
2625
2626 for (@$files) {
2627 s/\.map$// or next;
2628 utf8::decode $_;
2629 push @maps, "$dir/$_";
2630 }
2631
2632 push @dirs, map "$dir/$_", @$dirs;
2633 }
2634
2635 \@maps
2636}
2637
2397=back 2638=back
2398 2639
2399=head3 cf::object 2640=head3 cf::object
2400 2641
2401=cut 2642=cut
2424 2665
2425Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2426 2667
2427=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2428 2669
2429returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2430even if the object actually exists. May block. 2671even if the object actually exists. May block.
2431 2672
2432=cut 2673=cut
2433 2674
2434sub deref { 2675sub deref {
2466 2707
2467our $SAY_CHANNEL = { 2708our $SAY_CHANNEL = {
2468 id => "say", 2709 id => "say",
2469 title => "Map", 2710 title => "Map",
2470 reply => "say ", 2711 reply => "say ",
2471 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2712 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2472}; 2713};
2473 2714
2474our $CHAT_CHANNEL = { 2715our $CHAT_CHANNEL = {
2475 id => "chat", 2716 id => "chat",
2476 title => "Chat", 2717 title => "Chat",
2516=item $player_object->may ("access") 2757=item $player_object->may ("access")
2517 2758
2518Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2519(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2520 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2521=cut 2787=cut
2522 2788
2523sub cf::object::player::may { 2789sub cf::object::player::may {
2524 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2525 2791
2526 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2527 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2528 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2529 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2530} 2796}
2531 2797
2532=item $player_object->enter_link 2798=item $player_object->enter_link
2533 2799
2534Freezes the player and moves him/her to a special map (C<{link}>). 2800Freezes the player and moves him/her to a special map (C<{link}>).
2535 2801
2536The player should be reasonably safe there for short amounts of time. You 2802The player should be reasonably safe there for short amounts of time (e.g.
2537I<MUST> call C<leave_link> as soon as possible, though. 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2804though, as the player cannot control the character while it is on the link
2805map.
2538 2806
2539Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2540 2814
2541=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2542 2816
2543Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2544map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2562sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2563 my ($self) = @_; 2837 my ($self) = @_;
2564 2838
2565 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2566 2840
2841 ++$self->{_link_recursion};
2842
2567 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2568 2844
2569 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2570 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2571 2847
2572 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2573} 2849}
2574 2850
2575sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2576 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2577 2853
2594 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2595 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2596 2872
2597 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2598 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2599 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2600 2876
2601 $map->load; 2877 $map->load;
2602 $map->load_neighbours;
2603 2878
2604 return unless $self->contr->active; 2879 return unless $self->contr->active;
2605 $self->activate_recursive;
2606 2880
2607 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2608 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2609} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2610 2888
2889}
2890
2611=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2891=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2612 2892
2613Moves the player to the given map-path and coordinates by first freezing 2893Moves the player to the given map-path and coordinates by first freezing
2614her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2615that has to return the map if sucecssful, and then unfreezes the player on 2895that has to return the map if sucecssful, and then unfreezes the player on
2616the new (success) or old (failed) map position. In either case, $done will 2896the new (success) or old (failed) map position. In either case, $done will
2623 2903
2624our $GOTOGEN; 2904our $GOTOGEN;
2625 2905
2626sub cf::object::player::goto { 2906sub cf::object::player::goto {
2627 my ($self, $path, $x, $y, $check, $done) = @_; 2907 my ($self, $path, $x, $y, $check, $done) = @_;
2908
2909 if ($self->{_link_recursion} >= $MAX_LINKS) {
2910 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2911 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2912 ($path, $x, $y) = @$EMERGENCY_POSITION;
2913 }
2628 2914
2629 # do generation counting so two concurrent goto's will be executed in-order 2915 # do generation counting so two concurrent goto's will be executed in-order
2630 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2631 2917
2632 $self->enter_link; 2918 $self->enter_link;
2652 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2653 } 2939 }
2654 } 2940 }
2655 2941
2656 my $map = eval { 2942 my $map = eval {
2657 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2658 2944
2659 if ($map) { 2945 if ($map) {
2660 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2661 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2662 } else { 2948 } else {
2663 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2949 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2664 } 2950 }
2665 2951
2666 $map 2952 $map
2674 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2675 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2676 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2677 } 2963 }
2678 2964
2679 $done->() if $done; 2965 $done->($self) if $done;
2680 })->prio (1); 2966 })->prio (1);
2681} 2967}
2682 2968
2683=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2684 2970
2752 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2753 3039
2754 unless (eval { 3040 unless (eval {
2755 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2756 3042
2757 # random map handling
2758 {
2759 my $guard = cf::lock_acquire "exit_prepare:$exit";
2760
2761 prepare_random_map $exit
2762 if $exit->slaying eq "/!";
2763 }
2764
2765 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2766 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2767 my $y = $exit->stats->sp; 3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
2768 3069
2769 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2770 3071
2771 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2772 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2773 if $exit->flag (cf::FLAG_DAMNED); 3074 if $exit->flag (cf::FLAG_DAMNED);
2774 3075
2775 1 3076 1
2776 }) { 3077 }) {
2777 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2778 . "I'll try to bring you back to the map you were before. " 3079 . "I'll try to bring you back to the map you were before. "
2779 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2780 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2781 3082
2782 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2783 $self->leave_link; 3084 $self->leave_link;
2784 } 3085 }
2785 })->prio (1); 3086 })->prio (1);
2786} 3087}
2787 3088
2788=head3 cf::client 3089=head3 cf::client
2789 3090
2790=over 4 3091=over 4
2791 3092
2792=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2793 3094
2794Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2795should not be used under normal circumstances. 3096them as required.
2796 3097
2797=cut 3098=cut
2798 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2799sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2800 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2801 3104
2802 utf8::encode $text; 3105 # try lzf for large packets
2803 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3106 $pkt = "lzf " . Compress::LZF::compress $pkt
3107 if 1024 <= length $pkt and $self->{can_lzf};
3108
3109 # split very large packets
3110 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3111 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3112 $pkt = "frag";
3113 }
3114
3115 $self->send_packet ($pkt);
2804} 3116}
2805 3117
2806=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2807 3119
2808Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
2809client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2810the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
2811the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2812 3124
2813=cut 3125=cut
2814 3126
2815# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2816our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2817 "c/identify" => { 3135 "c/identify" => {
2818 id => "infobox", 3136 id => "infobox",
2819 title => "Identify", 3137 title => "Identify",
2820 reply => undef, 3138 reply => undef,
2821 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2823 "c/examine" => { 3141 "c/examine" => {
2824 id => "infobox", 3142 id => "infobox",
2825 title => "Examine", 3143 title => "Examine",
2826 reply => undef, 3144 reply => undef,
2827 tooltip => "Signs and other items you examined", 3145 tooltip => "Signs and other items you examined",
3146 },
3147 "c/shopinfo" => {
3148 id => "infobox",
3149 title => "Shop Info",
3150 reply => undef,
3151 tooltip => "What your bargaining skill tells you about the shop",
2828 }, 3152 },
2829 "c/book" => { 3153 "c/book" => {
2830 id => "infobox", 3154 id => "infobox",
2831 title => "Book", 3155 title => "Book",
2832 reply => undef, 3156 reply => undef,
2848 id => "infobox", 3172 id => "infobox",
2849 title => "Body Parts", 3173 title => "Body Parts",
2850 reply => undef, 3174 reply => undef,
2851 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2852 }, 3176 },
3177 "c/statistics" => {
3178 id => "infobox",
3179 title => "Statistics",
3180 reply => undef,
3181 tooltip => "Shows your primary statistics",
3182 },
3183 "c/skills" => {
3184 id => "infobox",
3185 title => "Skills",
3186 reply => undef,
3187 tooltip => "Shows your experience per skill and item power",
3188 },
3189 "c/shopitems" => {
3190 id => "infobox",
3191 title => "Shop Items",
3192 reply => undef,
3193 tooltip => "Shows the items currently for sale in this shop",
3194 },
3195 "c/resistances" => {
3196 id => "infobox",
3197 title => "Resistances",
3198 reply => undef,
3199 tooltip => "Shows your resistances",
3200 },
3201 "c/pets" => {
3202 id => "infobox",
3203 title => "Pets",
3204 reply => undef,
3205 tooltip => "Shows information abotu your pets/a specific pet",
3206 },
3207 "c/perceiveself" => {
3208 id => "infobox",
3209 title => "Perceive Self",
3210 reply => undef,
3211 tooltip => "You gained detailed knowledge about yourself",
3212 },
2853 "c/uptime" => { 3213 "c/uptime" => {
2854 id => "infobox", 3214 id => "infobox",
2855 title => "Uptime", 3215 title => "Uptime",
2856 reply => undef, 3216 reply => undef,
2857 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2866 id => "party", 3226 id => "party",
2867 title => "Party", 3227 title => "Party",
2868 reply => "gsay ", 3228 reply => "gsay ",
2869 tooltip => "Messages and chat related to your party", 3229 tooltip => "Messages and chat related to your party",
2870 }, 3230 },
3231 "c/death" => {
3232 id => "death",
3233 title => "Death",
3234 reply => undef,
3235 tooltip => "Reason for and more info about your most recent death",
3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3243 "c/say" => $SAY_CHANNEL,
3244 "c/chat" => $CHAT_CHANNEL,
2871); 3245);
2872 3246
2873sub cf::client::send_msg { 3247sub cf::client::send_msg {
2874 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2875 3249
2876 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2877 3252
2878 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2879 3254
2880 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2881 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2882 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2883 3258
2884 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2885 if $self->can_msg;
2886
2887 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2888 3261
2889 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2890 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2891 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2892 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2893 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2894 if $self->can_msg;
2895 } 3267 }
2896 3268
2897 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2898 } 3270 }
2899 3271
2900 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2901 3273
2902 if ($self->can_msg) {
2903 # default colour, mask it out 3274 # default colour, mask it out
2904 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2905 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2906 3277
2907 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2908 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2909 } else { 3281 );
2910 if ($color >= 0) {
2911 # replace some tags by gcfclient-compatible ones
2912 for ($msg) {
2913 1 while
2914 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2915 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2916 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2917 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2918 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2919 }
2920 3282
2921 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2922
2923 utf8::encode $msg;
2924
2925 if (0 && $msg =~ /\[/) {
2926 # COMMAND/INFO
2927 $self->send_packet ("drawextinfo $color 10 8 $msg")
2928 } else {
2929 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2930 $self->send_packet ("drawinfo $color $msg")
2931 }
2932 }
2933 }
2934} 3284}
2935 3285
2936=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2937 3287
2938Sends an ext event to the client. 3288Sends an ext event to the client.
2940=cut 3290=cut
2941 3291
2942sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2943 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2944 3294
2945 if ($self->extcmd == 2) {
2946 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2947 } elsif ($self->extcmd == 1) { # TODO: remove
2948 push @msg, msgtype => "event_$type";
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950 }
2951}
2952
2953=item $client->ext_reply ($msgid, @msg)
2954
2955Sends an ext reply to the client.
2956
2957=cut
2958
2959sub cf::client::ext_reply($$@) {
2960 my ($self, $id, @msg) = @_;
2961
2962 if ($self->extcmd == 2) {
2963 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2964 } elsif ($self->extcmd == 1) {
2965 #TODO: version 1, remove
2966 unshift @msg, msgtype => "reply", msgid => $id;
2967 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2968 }
2969} 3296}
2970 3297
2971=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2972 3299
2973Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2993 3320
2994 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2995 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2996 3323
2997 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
2998} 3364}
2999 3365
3000cf::client->attach ( 3366cf::client->attach (
3001 on_connect => sub { 3367 on_connect => sub {
3002 my ($ns) = @_; 3368 my ($ns) = @_;
3028 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3029 3395
3030 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3031 3397
3032 if (ref $msg) { 3398 if (ref $msg) {
3033 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3034 "ARRAY" eq ref $msg
3035 ? @$msg
3036 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3037 3400
3038 my @reply;
3039
3040 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3041 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3042 } 3419 }
3043
3044 $ns->ext_reply ($reply, @reply)
3045 if $reply;
3046
3047 } else { 3420 } else {
3048 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3049 } 3422 }
3050 3423
3051 cf::override; 3424 cf::override;
3052 }, 3425 },
3053); 3426);
3073 3446
3074 $coro 3447 $coro
3075} 3448}
3076 3449
3077cf::client->attach ( 3450cf::client->attach (
3078 on_destroy => sub { 3451 on_client_destroy => sub {
3079 my ($ns) = @_; 3452 my ($ns) = @_;
3080 3453
3081 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3082 }, 3455 },
3083); 3456);
3099our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3100 3473
3101$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3102 3475
3103$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3104 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3105 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3106 sort time 3479 sort time
3107)); 3480));
3108 3481
3109# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3113The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3114 3487
3115 cf::object 3488 cf::object
3116 contr pay_amount pay_player map x y force_find force_add destroy 3489 contr pay_amount pay_player map x y force_find force_add destroy
3117 insert remove name archname title slaying race decrease split 3490 insert remove name archname title slaying race decrease split
3491 value
3118 3492
3119 cf::object::player 3493 cf::object::player
3120 player 3494 player
3121 3495
3122 cf::player 3496 cf::player
3128=cut 3502=cut
3129 3503
3130for ( 3504for (
3131 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3505 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3132 insert remove inv nrof name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3133 decrease split destroy change_exp)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3134 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3135 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3136 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3137) { 3511) {
3138 no strict 'refs';
3139 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3140 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3141 for @funs; 3514 for @funs;
3142} 3515}
3143 3516
3158 3531
3159 my $qcode = $code; 3532 my $qcode = $code;
3160 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3161 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3162 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3163 local $_; 3539 local $_;
3164 local @safe::cf::_safe_eval_args = values %vars;
3165 3540
3166 my $eval = 3541 my $eval =
3167 "do {\n" 3542 "do {\n"
3168 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3169 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3170 . $code 3545 . $code
3171 . "\n}" 3546 . "\n}"
3172 ; 3547 ;
3173 3548
3549 if ($CFG{safe_eval}) {
3174 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3175 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3176 sub_generation_inc; 3553 sub_generation_inc;
3554 } else {
3555 local @cf::_safe_eval_args = values %vars;
3556 @res = wantarray ? eval eval : scalar eval $eval;
3557 }
3177 3558
3178 if ($@) { 3559 if ($@) {
3179 warn "$@"; 3560 warn "$@",
3180 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3181 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3182 } 3563 }
3183 3564
3184 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3185} 3566}
3186 3567
3200=cut 3581=cut
3201 3582
3202sub register_script_function { 3583sub register_script_function {
3203 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3204 3585
3205 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3206 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3207} 3588}
3208 3589
3209=back 3590=back
3210 3591
3211=cut 3592=cut
3212 3593
3213############################################################################# 3594#############################################################################
3214# the server's init and main functions 3595# the server's init and main functions
3215 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3216sub load_facedata($) { 3674sub load_facedata($) {
3217 my ($path) = @_; 3675 my ($path) = @_;
3218 3676
3219 # HACK to clear player env face cache, we need some signal framework
3220 # for this (global event?)
3221 %ext::player_env::MUSIC_FACE_CACHE = ();
3222
3223 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3224 3678
3225 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3226 3680
3227 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3228 0 < aio_load $path, $facedata
3229 or die "$path: $!";
3230
3231 $facedata = Coro::Storable::thaw $facedata;
3232 3682
3233 $facedata->{version} == 2 3683 $facedata->{version} == 2
3234 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3235 3685
3236 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3237 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3238 type => FT_RSRC, 3688
3239 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3240 }; 3690
3241 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3242 3694
3243 { 3695 {
3244 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3245 3697
3246 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3247 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3248 3701
3249 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3250 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3251 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3252 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3253 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3254 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3255 } 3709 }
3256 3710
3257 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3258 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3259 3713
3262 3716
3263 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3264 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3265 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3266 } else { 3720 } else {
3267 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3268 } 3722 }
3269
3270 cf::cede_to_tick;
3271 } 3723 }
3272 } 3724 }
3273 3725
3274 { 3726 {
3275 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3276 3728
3277 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3278 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3279 cf::cede_to_tick;
3280 } 3731 }
3281 3732
3282 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3283 } 3734 }
3284 3735
3285 { 3736 {
3286 # TODO: for gcfclient pleasure, we should give resources
3287 # that gcfclient doesn't grok a >10000 face index.
3288 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3289 3738
3290 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3291 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # TODO: different hash - must free and use new index, or cache ixface data queue
3292 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3293 my $data;
3294 3743
3295 if ($info->{type} & 1) {
3296 # prepend meta info
3297
3298 my $meta = $enc->encode ({
3299 name => $name,
3300 %{ $info->{meta} || {} },
3301 });
3302
3303 $data = pack "(w/a*)*", $meta, $info->{data};
3304 } else {
3305 $data = $info->{data};
3306 }
3307
3308 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3309 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3310 } else { 3750 } else {
3311 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3312 } 3752 }
3313
3314 cf::cede_to_tick;
3315 } 3753 }
3316 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3317 3765
3318 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3319 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3320 1 3770 1
3321} 3771}
3322
3323cf::global->attach (on_resource_update => sub {
3324 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3325 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3326
3327 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3328 my $sound = $soundconf->{compat}[$_]
3329 or next;
3330
3331 my $face = cf::face::find "sound/$sound->[1]";
3332 cf::sound::set $sound->[0] => $face;
3333 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3334 }
3335
3336 while (my ($k, $v) = each %{$soundconf->{event}}) {
3337 my $face = cf::face::find "sound/$v";
3338 cf::sound::set $k => $face;
3339 }
3340 }
3341});
3342 3772
3343register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3344 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3345 3775
3346 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3354 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3355 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3356 cf::arch::commit_load; 3786 cf::arch::commit_load;
3357 3787
3358 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3359} 3803}
3360 3804
3361sub reload_regions { 3805sub reload_regions {
3362 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3363 # for this (global event?) 3807 # for this (global event?)
3371 if exists $_->{match}; 3815 if exists $_->{match};
3372 } 3816 }
3373} 3817}
3374 3818
3375sub reload_facedata { 3819sub reload_facedata {
3376 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3377 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3378} 3822}
3379 3823
3380sub reload_archetypes { 3824sub reload_archetypes {
3381 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3382 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3383} 3853}
3384 3854
3385sub reload_treasures { 3855sub reload_treasures {
3386 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3387 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3388} 3858}
3389 3859
3860sub reload_sound {
3861 trace "loading sound config from $DATADIR/sound\n";
3862
3863 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3864
3865 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3866 my $sound = $soundconf->{compat}[$_]
3867 or next;
3868
3869 my $face = cf::face::find "sound/$sound->[1]";
3870 cf::sound::set $sound->[0] => $face;
3871 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3872 }
3873
3874 while (my ($k, $v) = each %{$soundconf->{event}}) {
3875 my $face = cf::face::find "sound/$v";
3876 cf::sound::set $k => $face;
3877 }
3878}
3879
3390sub reload_resources { 3880sub reload_resources {
3391 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3392 3882
3883 reload_materials;
3393 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3394 reload_archetypes; 3887 reload_archetypes;
3395 reload_regions; 3888 reload_regions;
3396 reload_treasures; 3889 reload_treasures;
3397 3890
3398 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3399}
3400
3401sub init {
3402 my $guard = freeze_mainloop;
3403
3404 evthread_start IO::AIO::poll_fileno;
3405
3406 reload_resources;
3407} 3892}
3408 3893
3409sub reload_config { 3894sub reload_config {
3410 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3411 or return;
3412 3896
3413 local $/; 3897 my $config = load_file "$CONFDIR/config";
3414 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3415 3900
3416 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3417 3902
3418 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3903 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3419 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3904 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3420 3905
3421 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3425 }; 3910 };
3426 warn $@ if $@; 3911 warn $@ if $@;
3427 } 3912 }
3428} 3913}
3429 3914
3915sub pidfile() {
3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3917 or die "$PIDFILE: $!";
3918 flock $fh, &Fcntl::LOCK_EX
3919 or die "$PIDFILE: flock: $!";
3920 $fh
3921}
3922
3923# make sure only one server instance is running at any one time
3924sub atomic {
3925 my $fh = pidfile;
3926
3927 my $pid = <$fh>;
3928 kill 9, $pid if $pid > 0;
3929
3930 seek $fh, 0, 0;
3931 print $fh $$;
3932}
3933
3934sub main_loop {
3935 trace "EV::run starting\n";
3936 if (1) {
3937 EV::run;
3938 }
3939 trace "EV::run returned\n";
3940 goto &main_loop unless $REALLY_UNLOOP;
3941}
3942
3430sub main { 3943sub main {
3944 cf::init_globals; # initialise logging
3945
3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3950
3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3952
3431 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3432 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3433 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3434 (async { 3956 (async {
3435 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3436 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3437 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3438 }; 3960 };
3439 3961
3440 { 3962 evthread_start IO::AIO::poll_fileno;
3441 my $guard = freeze_mainloop; 3963
3964 cf::sync_job {
3965 cf::incloader::init ();
3966
3967 db_init;
3968
3969 cf::init_anim;
3970 cf::init_attackmess;
3971 cf::init_dynamic;
3972
3973 cf::load_settings;
3974
3975 reload_resources;
3442 reload_config; 3976 reload_config;
3443 db_init; 3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3444 load_extensions; 3986 load_extensions;
3445 3987
3446 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3988 utime time, time, $RUNTIMEFILE;
3989
3990 # no (long-running) fork's whatsoever before this point(!)
3991 use POSIX ();
3992 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3993
3994 cf::_post_init 0;
3447 } 3995 };
3448 3996
3449 EV::loop; 3997 cf::object::thawer::errors_are_fatal 0;
3998 info "parse errors in files are no longer fatal from this point on.\n";
3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
4004 goto &main_loop;
3450} 4005}
3451 4006
3452############################################################################# 4007#############################################################################
3453# initialisation and cleanup 4008# initialisation and cleanup
3454 4009
3455# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3456BEGIN { 4011BEGIN {
3457 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3458 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3459 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3460 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3461 }; 4016 };
3462 } 4017 }
3463} 4018}
3464 4019
3465sub write_runtime_sync { 4020sub write_runtime_sync {
3466 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3467 4022
3468 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3469 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3470 4025
3471 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3472 4027
3473 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3474 4029
3475 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3476 or return; 4031 or return;
3477 4032
3478 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3479 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3480 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3490 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3491 4046
3492 close $fh 4047 close $fh
3493 or return; 4048 or return;
3494 4049
3495 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3496 and return; 4051 and return;
3497 4052
3498 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3499 4054
3500 1 4055 1
3501} 4056}
3502 4057
3503our $uuid_lock; 4058our $uuid_lock;
3512 my $uuid = "$LOCALDIR/uuid"; 4067 my $uuid = "$LOCALDIR/uuid";
3513 4068
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return; 4070 or return;
3516 4071
3517 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
4073
4074 unless ($value) {
4075 info "cowardly refusing to write zero uuid value!\n";
4076 return;
4077 }
4078
4079 my $value = uuid_str $value + $uuid_skip;
3518 $uuid_skip = 0; 4080 $uuid_skip = 0;
3519 4081
3520 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3521 and return; 4083 and return;
3522 4084
3528 or return; 4090 or return;
3529 4091
3530 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3531 and return; 4093 and return;
3532 4094
3533 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3534 4096
3535 1 4097 1
3536 4098
3537} 4099}
3538 4100
3544} 4106}
3545 4107
3546sub emergency_save() { 4108sub emergency_save() {
3547 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3548 4110
3549 warn "enter emergency perl save\n"; 4111 info "emergency_perl_save: enter\n";
4112
4113 # this is a trade-off: we want to be very quick here, so
4114 # save all maps without fsync, and later call a global sync
4115 # (which in turn might be very very slow)
4116 local $USE_FSYNC = 0;
3550 4117
3551 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3552 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3553 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3554 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3555 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3556 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3557 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3558 $pl->valid or next; 4127 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3560 $pl->save; 4129 $pl->save;
3561 } 4130 }
3562 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3563 4132
3564 warn "begin emergency map save\n"; 4133 cf::write_runtime_sync; # external watchdog should not bark
4134
4135 info "emergency_perl_save: begin map save\n";
3565 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3566 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3567 $map->valid or next; 4138 $map->valid or next;
3568 $map->save; 4139 $map->save;
3569 } 4140 }
3570 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3571 4142
3572 warn "begin emergency database checkpoint\n"; 4143 cf::write_runtime_sync; # external watchdog should not bark
4144
4145 info "emergency_perl_save: begin database checkpoint\n";
3573 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3574 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3575 4148
3576 warn "begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1; 4150 write_uuid_sync 1;
3578 warn "end write uuid\n"; 4151 info "emergency_perl_save: end write uuid\n";
4152
4153 cf::write_runtime_sync; # external watchdog should not bark
4154
4155 trace "emergency_perl_save: syncing database to disk";
4156 BDB::db_env_txn_checkpoint $DB_ENV;
4157
4158 info "emergency_perl_save: starting sync\n";
4159 IO::AIO::aio_sync sub {
4160 info "emergency_perl_save: finished sync\n";
4161 };
4162
4163 cf::write_runtime_sync; # external watchdog should not bark
4164
4165 trace "emergency_perl_save: flushing outstanding aio requests";
4166 while (IO::AIO::nreqs || BDB::nreqs) {
4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4168 }
4169
4170 cf::write_runtime_sync; # external watchdog should not bark
3579 }; 4171 };
3580 4172
3581 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3582} 4174}
3583 4175
3584sub post_cleanup { 4176sub post_cleanup {
3585 my ($make_core) = @_; 4177 my ($make_core) = @_;
3586 4178
4179 IO::AIO::flush;
4180
3587 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3588 if $make_core; 4182 if $make_core;
4183
4184 my $fh = pidfile;
4185 unlink $PIDFILE if <$fh> == $$;
4186}
4187
4188# a safer delete_package, copied from Symbol
4189sub clear_package($) {
4190 my $pkg = shift;
4191
4192 # expand to full symbol table name if needed
4193 unless ($pkg =~ /^main::.*::$/) {
4194 $pkg = "main$pkg" if $pkg =~ /^::/;
4195 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
4196 $pkg .= '::' unless $pkg =~ /::$/;
4197 }
4198
4199 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
4200 my $stem_symtab = *{$stem}{HASH};
4201
4202 defined $stem_symtab and exists $stem_symtab->{$leaf}
4203 or return;
4204
4205 # clear all symbols
4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
4207 for my $name (keys %$leaf_symtab) {
4208 _gv_clear *{"$pkg$name"};
4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
4210 }
3589} 4211}
3590 4212
3591sub do_reload_perl() { 4213sub do_reload_perl() {
3592 # can/must only be called in main 4214 # can/must only be called in main
3593 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3594 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3595 return; 4217 return;
3596 } 4218 }
3597 4219
3598 warn "reloading..."; 4220 return if $RELOAD++;
3599 4221
3600 warn "entering sync_job"; 4222 my $t1 = AE::time;
3601 4223
4224 while ($RELOAD) {
4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
4227
4228 trace "perl_reload: entering sync_job";
4229
3602 cf::sync_job { 4230 cf::sync_job {
3603 cf::write_runtime_sync; # external watchdog should not bark
3604 cf::emergency_save; 4231 #cf::emergency_save;
3605 cf::write_runtime_sync; # external watchdog should not bark
3606 4232
3607 warn "syncing database to disk";
3608 BDB::db_env_txn_checkpoint $DB_ENV;
3609
3610 # if anything goes wrong in here, we should simply crash as we already saved
3611
3612 warn "flushing outstanding aio requests";
3613 for (;;) {
3614 BDB::flush;
3615 IO::AIO::flush;
3616 Coro::cede_notself;
3617 last unless IO::AIO::nreqs || BDB::nreqs;
3618 warn "iterate...";
3619 }
3620
3621 ++$RELOAD;
3622
3623 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3624 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3625 %EXT_CORO = (); 4235 %EXT_CORO = ();
3626 4236
3627 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3628 %COMMAND = (); 4238 %COMMAND = ();
3629 4239
3630 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3631 %EXTCMD = (); 4241 %EXTCMD = ();
3632 %EXTICMD = (); 4242 %EXTICMD = ();
3633 4243
3634 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3635 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3636 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3637 4247
3638 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3639 eval { 4249 eval {
3640 $cb->($pkg); 4250 $cb->($pkg);
3641 1 4251 1
3642 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
4253 }
4254
4255 trace "... clearing $pkg";
4256 clear_package $pkg;
3643 } 4257 }
3644 4258
3645 warn "... nuking $pkg";
3646 Symbol::delete_package $pkg;
3647 }
3648
3649 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3650 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3651 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3652 4262
3653 warn "... unloading $k"; 4263 trace "... unloading $k";
3654 delete $INC{$k}; 4264 delete $INC{$k};
3655 4265
3656 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3657 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3658 4268
3659 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3660 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3661 } 4274 }
3662 4275
3663 Symbol::delete_package $k;
3664 }
3665
3666 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3667 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3668 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4278 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3669 4279
3670 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3671 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3672 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3673 4283
3674 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3675 # and global variables created in xs 4285 # and global variables created in xs
3676 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3677 4287
3678 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3679 4289
3680 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3681 require cf; 4291 require cf;
3682 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3683 4293
3684 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3685 cf::reload_config; 4295 cf::reload_config;
3686 4296
3687 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3688 cf::load_extensions; 4298 cf::load_extensions;
3689 4299
4300 if ($REATTACH_ON_RELOAD) {
3690 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3691 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3692 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3693 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3694 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3695 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3696 4308
3697 warn "leaving sync_job"; 4309 cf::_post_init 1;
3698 4310
4311 trace "perl_reload: leaving sync_job";
4312
3699 1 4313 1
3700 } or do { 4314 } or do {
3701 warn $@; 4315 error $@;
3702 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
4317 };
4318
4319 --$RELOAD;
3703 }; 4320 }
3704 4321
3705 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3706}; 4324};
3707 4325
3708our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3709 4327
3710sub reload_perl() { 4328sub reload_perl() {
3711 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3712 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3713 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3714 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3715 do_reload_perl; 4336 do_reload_perl;
3716 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
4338 };
3717 }; 4339 };
3718} 4340}
3719 4341
3720register_command "reload" => sub { 4342register_command "reload" => sub {
3721 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3727 reload_perl; 4349 reload_perl;
3728 }; 4350 };
3729 } 4351 }
3730}; 4352};
3731 4353
3732unshift @INC, $LIBDIR; 4354#############################################################################
3733 4355
3734my $bug_warning = 0; 4356my $bug_warning = 0;
3735 4357
3736our @WAIT_FOR_TICK;
3737our @WAIT_FOR_TICK_BEGIN;
3738
3739sub wait_for_tick { 4358sub wait_for_tick() {
3740 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3741 4360
3742 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3743 push @WAIT_FOR_TICK, $signal;
3744 $signal->wait;
3745} 4362}
3746 4363
3747sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3748 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3749 4366
3750 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3751 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3752 $signal->wait; 4369 $signal->wait;
3753} 4370}
3757 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3758 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3759 return; 4376 return;
3760 } 4377 }
3761 4378
3762 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4380
4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3763 4382
3764 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3765 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3766 Coro::async_pool { 4385 Coro::async_pool {
3767 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3768 write_runtime_sync 4387 write_runtime_sync
3769 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3770 }; 4389 };
3771 } 4390 }
3772 4391
3773 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3774 $sig->send; 4393 $sig->send;
3775 } 4394 }
3776 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3777 $sig->send;
3778 }
3779 4396
3780 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3781 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3782 4399
3783 if (0) { 4400 if (0) {
3784 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3785 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3786 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3787 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3788 } 4405 }
3789 } 4406 }
3790} 4407}
3791 4408
3792{ 4409{
3793 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3794 4412
3795 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3796 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3797 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3798 4416
3799 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3800 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3801 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3802 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4420 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3827 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3828 }; 4446 };
3829 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3830 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3831 }; 4449 };
4450
4451 info "database initialised";
3832} 4452}
3833 4453
3834{ 4454{
3835 # configure IO::AIO 4455 # configure IO::AIO
3836 4456
4457 info "initialising aio";
3837 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3838 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3839 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3840} 4462}
3841 4463
3842my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3843 4466
3844sub _log_backtrace { 4467sub _log_backtrace {
3845 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3846 4469
3847 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3848 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3849 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3850 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3851 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3852 async { 4480 async {
3853 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3854 4482
3855 my @bt = fork_call { 4483 my @bt = fork_call {
3856 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3867 } 4495 }
3868 4496
3869 @funcs 4497 @funcs
3870 }; 4498 };
3871 4499
3872 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3873 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3874 --$_log_backtrace; 4503 --$_log_backtrace;
3875 }; 4504 };
3876 } else { 4505 } else {
3877 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3878 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3879 } 4508 }
3880} 4509}
3881 4510
3882# load additional modules 4511# load additional modules
3883use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3884 4514
3885END { cf::emergency_save } 4515END { cf::emergency_save }
3886 4516
38871 45171
3888 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines