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.440 by root, Mon Aug 11 23:23:41 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';
246 cf::client cf::player 339 cf::client cf::player
247 cf::arch cf::living 340 cf::arch cf::living
248 cf::map cf::mapspace 341 cf::map cf::mapspace
249 cf::party cf::region 342 cf::party cf::region
250)) { 343)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 345}
254 346
255$EV::DIED = sub { 347$EV::DIED = sub {
256 warn "error in event callback: @_"; 348 warn "error in event callback: $@";
257}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
258 355
259############################################################################# 356#############################################################################
260 357
261=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
262 359
283 $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;
284 $d 381 $d
285 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
286} 383}
287 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
288=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
289 438
290Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
291 440
292=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
298our $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
299 448
300sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
302 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
303=item cf::lock_wait $string 528=item cf::lock_wait $string
304 529
305Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
306 531
307=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
308 533
309Wait 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
310a 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,
311for example when the coroutine gets canceled), the lock is automatically 536for example when the coroutine gets canceled), the lock is automatically
312returned. 537returned.
313 538
314Locks 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
315deadlocked coro. 540deadlocked coro.
321 546
322Return 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.
323 548
324=cut 549=cut
325 550
326our %LOCK; 551our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 552
329sub lock_wait($) { 553sub lock_wait($) {
330 my ($key) = @_; 554 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 555}
343 556
344sub lock_acquire($) { 557sub lock_acquire($) {
345 my ($key) = @_; 558 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 559}
359 560
360sub lock_active($) { 561sub lock_active($) {
361 my ($key) = @_; 562 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 563}
365 564
366sub freeze_mainloop { 565sub freeze_mainloop {
367 tick_inhibit_inc; 566 tick_inhibit_inc;
368 567
369 Coro::guard \&tick_inhibit_dec; 568 &Guard::guard (\&tick_inhibit_dec);
370} 569}
371 570
372=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
373 572
374Like 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
375get spread over timer. 574get spread over time.
376 575
377=cut 576=cut
378 577
379sub periodic($$) { 578sub periodic($$) {
380 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
384 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
385} 584}
386 585
387=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
388 587
389Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
390This 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
391of 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.
392 595
393The 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
394used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
395 598
396Useful for short background jobs. 599Useful for short background jobs.
397 600
398=cut 601=cut
399 602
400our @SLOT_QUEUE; 603our @SLOT_QUEUE;
401our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
402 606
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
406 610
407 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
408 613
409 while () { 614 while () {
410 next_job: 615 next_job:
616
617 Coro::cede;
618
411 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 620
413 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 625 $job->[2]->send;
417 Coro::cede;
418 goto next_job; 626 goto next_job;
419 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 629 }
421 } 630 }
422 631
423 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
424 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
425 push @cf::WAIT_FOR_TICK, $signal;
426 $signal->wait;
427 } else { 634 } else {
635 $busy = 0;
428 Coro::schedule; 636 Coro::schedule;
429 } 637 }
430 } 638 }
431}; 639};
432 640
433sub get_slot($;$$) { 641sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
435 643
436 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
437 645
438 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
439 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
440 649
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
455BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
456 665
457=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
458 667
459The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
460is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
461partly 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
462acceptable. 671acceptable.
463 672
464If 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
465the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
469=cut 678=cut
470 679
471sub sync_job(&) { 680sub sync_job(&) {
472 my ($job) = @_; 681 my ($job) = @_;
473 682
474 if ($Coro::current == $Coro::main) { 683 if (in_main) {
475 my $time = EV::time; 684 my $time = AE::time;
476 685
477 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
479 688
480 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
481 690
482 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
483 692
484 my $busy = 1; 693 my $busy = 1;
485 my @res; 694 my @res;
486 695
487 (async { 696 (async {
488 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
489 @res = eval { $job->() }; 698 @res = eval { $job->() };
490 warn $@ if $@; 699 error $@ if $@;
491 undef $busy; 700 undef $busy;
492 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
493 702
494 while ($busy) { 703 while ($busy) {
495 if (Coro::nready) { 704 if (Coro::nready) {
496 Coro::cede_notself; 705 Coro::cede_notself;
497 } else { 706 } else {
498 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
499 } 708 }
500 } 709 }
501 710
502 my $time = EV::time - $time; 711 my $time = AE::time - $time;
503 712
504 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
505 714
506 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
507 } else { 716 } else {
529 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
530 739
531 $coro 740 $coro
532} 741}
533 742
534=item fork_call { }, $args 743=item fork_call { }, @args
535 744
536Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling. 748never block itself or use any form of event handling.
540 749
541=cut 750=cut
542 751
752sub post_fork {
753 reset_signals;
754}
755
543sub fork_call(&@) { 756sub fork_call(&@) {
544 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
545 758
546 # we seemingly have to make a local copy of the whole thing,
547 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious)
549
550 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
551 reset_signals; 760 cf::post_fork;
552 &$cb 761 &$cb
553 }, @args; 762 } @args;
554 763
555 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 )
556} 776}
557 777
558=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
559 779
560=cut 780=cut
597within each server. 817within each server.
598 818
599=cut 819=cut
600 820
601sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
602 my ($name) = @_; 825 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
604 827
605 eval { 828 eval {
606 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
616} 839}
617 840
618our $DB; 841our $DB;
619 842
620sub db_init { 843sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
623 };
624} 845}
625 846
626sub db_get($$) { 847sub db_get($$) {
627 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
628 849
629 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
630 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
631 854
632 $! ? () 855 $! ? ()
633 : $data 856 : $data
634 }
635} 857}
636 858
637sub db_put($$$) { 859sub db_put($$$) {
638 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
667 889
668 my @data; 890 my @data;
669 my $md5; 891 my $md5;
670 892
671 for (0 .. $#$src) { 893 for (0 .. $#$src) {
672 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
673 or Carp::croak "$src->[$_]: $!";
674 } 895 }
675 896
676 # if processing is expensive, check 897 # if processing is expensive, check
677 # checksum first 898 # checksum first
678 if (1) { 899 if (1) {
691 912
692 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
693 } 914 }
694 } 915 }
695 916
696 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
697 my $data = $process->(\@data); 918 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
699 920
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
701 922
702 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
705 926
715 936
716=cut 937=cut
717 938
718sub datalog($@) { 939sub datalog($@) {
719 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
720 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
721} 942}
722 943
723=back 944=back
724 945
725=cut 946=cut
726 947
727############################################################################# 948#############################################################################
728 949
729=head2 ATTACHABLE OBJECTS 950=head2 ATTACHABLE OBJECTS
730 951
731Many 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
732attach callbacks/event handlers (a collection of which is called an "attachment") 953attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 954to it. All such attachable objects support the following methods.
734 955
735In 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>
736C<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
786=item cf::CLASS::attachment $name, ... 1007=item cf::CLASS::attachment $name, ...
787 1008
788Register an attachment by C<$name> through which attachable objects of the 1009Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 1010given CLASS can refer to this attachment.
790 1011
791Some classes such as crossfire maps and objects can specify attachments 1012Some classes such as deliantra maps and objects can specify attachments
792that 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.
793 1014
794These calls expect any number of the following handler/hook descriptions: 1015These calls expect any number of the following handler/hook descriptions:
795 1016
796=over 4 1017=over 4
920 1141
921 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
922 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
923 1144
924 } elsif (ref $type) { 1145 } elsif (ref $type) {
925 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
926 1147
927 } else { 1148 } else {
928 shift @arg; 1149 shift @arg;
929 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
930 } 1151 }
931 } 1152 }
932} 1153}
933 1154
934sub _object_attach { 1155sub _object_attach {
944 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
945 } 1166 }
946 1167
947 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
948 } else { 1169 } else {
949 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
950 } 1171 }
951 1172
952 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
953} 1174}
954 1175
1013 1234
1014 for (@$callbacks) { 1235 for (@$callbacks) {
1015 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1016 1237
1017 if ($@) { 1238 if ($@) {
1018 warn "$@";
1019 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1020 override; 1240 override;
1021 } 1241 }
1022 1242
1023 return 1 if $override; 1243 return 1 if $override;
1024 } 1244 }
1087 1307
1088sub reattach { 1308sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1309 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1310 my ($obj) = @_;
1091 1311
1312 # no longer needed after getting rid of delete_package?
1092 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
1093 1314
1094 my $registry = $obj->registry; 1315 my $registry = $obj->registry;
1095 1316
1096 @$registry = (); 1317 @$registry = ();
1097 1318
1102 for (@$attach) { 1323 for (@$attach) {
1103 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1104 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1105 } 1326 }
1106 } else { 1327 } else {
1107 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1108 } 1329 }
1109 } 1330 }
1110} 1331}
1111 1332
1112cf::attachable->attach ( 1333cf::attachable->attach (
1139 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1140 1361
1141 sync_job { 1362 sync_job {
1142 if (length $$rdata) { 1363 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1144 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1145 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1146 1368
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 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 }
1151 aio_close $fh; 1376 aio_close $fh;
1152 1377
1153 if (@$objs) { 1378 if (@$objs) {
1154 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) {
1155 aio_chmod $fh, SAVE_MODE; 1380 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1381 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1382 aio_write $fh, 0, (length $data), $data, 0;
1158 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 }
1159 aio_close $fh; 1387 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1388 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1389 }
1162 } else { 1390 } else {
1163 aio_unlink "$filename.pst"; 1391 aio_unlink "$filename.pst";
1164 } 1392 }
1165 1393
1166 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1395
1396 $filename =~ s%/[^/]+$%%;
1397 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1398 } else {
1168 warn "FATAL: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1169 } 1400 }
1170 } else { 1401 } else {
1171 aio_unlink $filename; 1402 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1173 } 1404 }
1197 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs}; 1429 $av = $st->{objs};
1199 } 1430 }
1200 1431
1201 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1202 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1203 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1204 1436
1205 ($data, $av) 1437 ($data, $av)
1206} 1438}
1207 1439
1208=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1212=cut 1444=cut
1213 1445
1214############################################################################# 1446#############################################################################
1215# command handling &c 1447# command handling &c
1216 1448
1217=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1218 1450
1219Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1220$name. 1452$name.
1221 1453
1222=cut 1454=cut
1228 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1229 1461
1230 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1231} 1463}
1232 1464
1233=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1234 1466
1235Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1236extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1237received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1238the 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
1239has logged in successfully. 1471has logged in successfully.
1240 1472
1241If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1242called.
1243 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
1244=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1245 1481
1246Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1247exticmd 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
1248are 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
1249is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1250log-in. 1486log-in.
1251 1487
1252If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1253called.
1254 1489
1255=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1256 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
1257sub register_extcmd { 1497sub register_extcmd($$) {
1258 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1259 1499
1260 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1261} 1501}
1262 1502
1263sub register_exticmd { 1503sub register_async_extcmd($$) {
1264 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1265 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1266 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1267} 1513}
1268 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1521use File::Glob ();
1522
1269cf::player->attach ( 1523cf::player->attach (
1270 on_command => sub { 1524 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1272 1526
1273 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1274 or return; 1528 or return;
1275 1529
1283 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1284 1538
1285 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1286 1540
1287 if (ref $msg) { 1541 if (ref $msg) {
1288 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1289 "ARRAY" eq ref $msg
1290 ? @$msg
1291 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1292 1543
1293 my @reply;
1294
1295 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}) {
1296 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1297 } 1562 }
1298 1563
1299 $pl->ext_reply ($reply, @reply)
1300 if $reply;
1301
1302 } else { 1564 } else {
1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1304 } 1566 }
1305 1567
1306 cf::override; 1568 cf::override;
1307 }, 1569 },
1308); 1570);
1309 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
1310sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1311 cf::sync_job { 1601 cf::sync_job {
1312 my %todo; 1602 my %todo;
1313 1603
1314 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1315 next unless -r $path; 1605 next unless -r $path;
1333 1623
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1626
1337 $ext{source} = 1627 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1339 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1340 . $source 1630 . $source
1341 . "\n};\n1"; 1631 . "\n};\n1";
1342 1632
1343 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1344 } 1634 }
1345 1635
1636 my $pass = 0;
1346 my %done; 1637 my %done;
1347 while (%todo) { 1638 while (%todo) {
1348 my $progress; 1639 my $progress;
1349 1640
1641 ++$pass;
1642
1643 ext:
1350 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1646 next ext
1353 unless exists $done{$_}; 1647 unless exists $done{$_};
1354 } 1648 }
1355 1649
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1651
1358 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 $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1665
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1667 if exists $v->{meta}{mandatory};
1366 1668
1367 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;
1368 } 1678 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1679 }
1374 1680
1375 skip: 1681 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 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 }
1378 } 1691 }
1379 }; 1692 };
1380} 1693}
1381 1694
1382############################################################################# 1695#############################################################################
1383 1696
1384=back 1697=back
1385 1698
1386=head2 CORE EXTENSIONS 1699=head2 CORE EXTENSIONS
1387 1700
1388Functions and methods that extend core crossfire objects. 1701Functions and methods that extend core deliantra objects.
1389 1702
1390=cut 1703=cut
1391 1704
1392package cf::player; 1705package cf::player;
1393 1706
1436 1749
1437sub exists($) { 1750sub exists($) {
1438 my ($login) = @_; 1751 my ($login) = @_;
1439 1752
1440 $cf::PLAYER{$login} 1753 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1754 or !aio_stat path $login
1442} 1755}
1443 1756
1444sub find($) { 1757sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1758 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1759 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1467 } 1780 }
1468 } 1781 }
1469} 1782}
1470 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
1471sub save($) { 1797sub save($) {
1472 my ($pl) = @_; 1798 my ($pl) = @_;
1473 1799
1474 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1475 1801
1480 1806
1481 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1483 1809
1484 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];
1485 1814
1486 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1816 cf::cede_to_tick;
1488} 1817}
1489 1818
1521 my ($pl) = @_; 1850 my ($pl) = @_;
1522 1851
1523 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1524 1853
1525 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1526 $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
1527 1856
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1529 $pl->deactivate; 1858 $pl->deactivate;
1859
1530 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;
1531 $pl->ob->check_score;
1532 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1533 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1534 1865
1535 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1536 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1537 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1591 \@logins 1922 \@logins
1592} 1923}
1593 1924
1594=item $player->maps 1925=item $player->maps
1595 1926
1927=item cf::player::maps $login
1928
1596Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1597player. May block. 1930player. May block.
1598 1931
1599=cut 1932=cut
1600 1933
1617 } 1950 }
1618 1951
1619 \@paths 1952 \@paths
1620} 1953}
1621 1954
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1956
1624Expand crossfire pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714
1715=item $player->ext_reply ($msgid, @msg)
1716
1717Sends an ext reply to the player.
1718
1719=cut
1720
1721sub ext_reply($$@) {
1722 my ($self, $id, @msg) = @_;
1723
1724 $self->ns->ext_reply ($id, @msg)
1725}
1726 1958
1727=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1728 1960
1729Sends an ext event to the client. 1961Sends an ext event to the client.
1730 1962
1750 1982
1751=cut 1983=cut
1752 1984
1753sub find_by_path($) { 1985sub find_by_path($) {
1754 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1755 1989
1756 my ($match, $specificity); 1990 my ($match, $specificity);
1757 1991
1758 for my $region (list) { 1992 for my $region (list) {
1759 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1788sub generate_random_map { 2022sub generate_random_map {
1789 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1790 2024
1791 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
1792 2026
1793 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1802 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1803 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1804 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1805 (cf::region::find $rmp->{region}), $rmp->{custom}
1806 )
1807} 2028}
1808 2029
1809=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1810 2031
1811Register 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
1816 2037
1817sub register { 2038sub register {
1818 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1819 my $pkg = caller; 2040 my $pkg = caller;
1820 2041
1821 no strict;
1822 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1823 2043
1824 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1825} 2045}
1826 2046
1827# also paths starting with '/' 2047# also paths starting with '/'
1828$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1829 2049
1830sub thawer_merge { 2050sub thawer_merge {
1831 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1832 2052
1833 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1838} 2058}
1839 2059
1840sub normalise { 2060sub normalise {
1841 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1842 2062
1843 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1844 2064
1845 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1846 2066
1847 # map plan: 2067 # map plan:
1848 # 2068 #
1863 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1864 $path = "$base/$path"; 2084 $path = "$base/$path";
1865 } 2085 }
1866 2086
1867 for ($path) { 2087 for ($path) {
1868 redo if s{//}{/};
1869 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1870 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1871 } 2090 }
1872 2091
1873 $path 2092 $path
1887 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1888 return $self; 2107 return $self;
1889 } 2108 }
1890 } 2109 }
1891 2110
1892 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1893 () 2112 ()
1894} 2113}
1895 2114
2115# may re-bless or do other evil things
1896sub init { 2116sub init {
1897 my ($self) = @_; 2117 my ($self) = @_;
1898 2118
1899 $self 2119 $self
1900} 2120}
1931 2151
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2152 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 2153 "$UNIQUEDIR/$path"
1934} 2154}
1935 2155
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 2156sub decay_objects {
1946 my ($self) = @_; 2157 my ($self) = @_;
1947 2158
1948 return if $self->{deny_reset}; 2159 return if $self->{deny_reset};
1949 2160
1974 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1975 2186
1976 1 2187 1
1977} 2188}
1978 2189
2190# used to laod the header of an original map
1979sub load_header_orig { 2191sub load_header_orig {
1980 my ($self) = @_; 2192 my ($self) = @_;
1981 2193
1982 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1983} 2195}
1984 2196
2197# used to laod the header of an instantiated map
1985sub load_header_temp { 2198sub load_header_temp {
1986 my ($self) = @_; 2199 my ($self) = @_;
1987 2200
1988 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1989} 2202}
1990 2203
2204# called after loading the header from an instantiated map
1991sub prepare_temp { 2205sub prepare_temp {
1992 my ($self) = @_; 2206 my ($self) = @_;
1993 2207
1994 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1995 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1996 # safety 2210 # safety
1997 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1998 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1999} 2213}
2000 2214
2215# called after loading the header from an original map
2001sub prepare_orig { 2216sub prepare_orig {
2002 my ($self) = @_; 2217 my ($self) = @_;
2003 2218
2004 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2005 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2029 2244
2030sub find; 2245sub find;
2031sub find { 2246sub find {
2032 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2033 2248
2249 cf::cede_to_tick;
2250
2034 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2035 2252
2036 cf::lock_wait "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2255
2039 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2257 my $map = new_from_path cf::map $path
2044 or return; 2258 or return;
2045 2259
2046 $map->{last_save} = $cf::RUNTIME; 2260 $map->{last_save} = $cf::RUNTIME;
2047 2261
2059 2273
2060 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2061 } 2275 }
2062} 2276}
2063 2277
2064sub pre_load { } 2278sub pre_load { }
2065sub post_load { } 2279#sub post_load { } # XS
2066 2280
2067sub load { 2281sub load {
2068 my ($self) = @_; 2282 my ($self) = @_;
2069 2283
2070 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2073 2287
2074 { 2288 {
2075 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2076 2290
2077 return unless $self->valid; 2291 return unless $self->valid;
2078 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2079
2080 $self->in_memory (cf::MAP_LOADING);
2081 2293
2082 $self->alloc; 2294 $self->alloc;
2083 2295
2084 $self->pre_load; 2296 $self->pre_load;
2085 cf::cede_to_tick; 2297 cf::cede_to_tick;
2086 2298
2299 if (exists $self->{load_path}) {
2087 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block; 2301 $f->skip_block;
2089 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2090 or return; 2303 or return;
2091 2304
2092 $self->post_load_original 2305 $self->post_load_original
2093 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2094 2307
2095 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2096 utf8::encode $uniq; 2309 utf8::encode $uniq;
2097 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2099 $self->clear_unique_items; 2312 $self->clear_unique_items;
2100 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2102 } 2316 }
2103 } 2317 }
2104 }
2105 2318
2106 $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);
2107 2326
2108 cf::cede_to_tick; 2327 cf::cede_to_tick;
2109 # now do the right thing for maps 2328 # now do the right thing for maps
2110 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2111 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2115 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2335 $self->decay_objects;
2117 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2118 $self->update_buttons; 2337 $self->update_buttons;
2119 cf::cede_to_tick; 2338 cf::cede_to_tick;
2120 $self->set_darkness_map; 2339 #$self->activate; # no longer activate maps automatically
2121 cf::cede_to_tick;
2122 $self->activate;
2123 } 2340 }
2124 2341
2125 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2127
2128 $self->in_memory (cf::MAP_ACTIVE);
2129 } 2344 }
2130 2345
2131 $self->post_load; 2346 $self->post_load;
2132}
2133 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
2134sub customise_for { 2354sub customise_for {
2135 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2136 2356
2137 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2358 if $self->per_player;
2141# if $self->per_party; 2361# if $self->per_party;
2142 2362
2143 $self 2363 $self
2144} 2364}
2145 2365
2146# find and load all maps in the 3x3 area around a map
2147sub load_neighbours {
2148 my ($map) = @_;
2149
2150 my @neigh; # diagonal neighbours
2151
2152 for (0 .. 3) {
2153 my $neigh = $map->tile_path ($_)
2154 or next;
2155 $neigh = find $neigh, $map
2156 or next;
2157 $neigh->load;
2158
2159 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 }
2163
2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
2166 my $neigh = find $path, $origin
2167 or next;
2168 $neigh->load;
2169 }
2170}
2171
2172sub find_sync { 2366sub find_sync {
2173 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2174 2368
2175 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
2176} 2374}
2177 2375
2178sub do_load_sync { 2376sub do_load_sync {
2179 my ($map) = @_; 2377 my ($map) = @_;
2180 2378
2379 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2183 2382
2184 cf::sync_job { $map->load }; 2383 $map->load;
2185} 2384}
2186 2385
2187our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2189 2388
2190sub find_async { 2389sub find_async {
2191 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2192 2391
2193 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2194 2393
2195 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2197 } 2396 }
2198 2397
2199 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2200 2399
2201 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2202 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2203 2402
2204 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2205 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2206 if (my $map = find $k) { 2405 if (my $map = find $k) {
2207 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2208 } 2407 }
2209 2408
2210 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2211 } 2410 }
2212 } 2411 }
2215 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2216 2415
2217 () 2416 ()
2218} 2417}
2219 2418
2419# common code, used by both ->save and ->swapout
2220sub save { 2420sub _save {
2221 my ($self) = @_; 2421 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2422
2225 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2226 2424
2227 return unless $self->dirty; 2425 return unless $self->dirty;
2228 2426
2248 } else { 2446 } else {
2249 $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);
2250 } 2448 }
2251} 2449}
2252 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2253sub swap_out { 2459sub swap_out {
2254 my ($self) = @_; 2460 my ($self) = @_;
2255 2461
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2261 return if $self->players; 2466 return if $self->players;
2262 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
2263 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2264 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
2265 $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};
2266 2518
2267 $self->deactivate; 2519 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear; 2521 $self->clear;
2270}
2271
2272sub reset_at {
2273 my ($self) = @_;
2274
2275 # TODO: safety, remove and allow resettable per-player maps
2276 return 1e99 if $self->{deny_reset};
2277
2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2280
2281 $time + $to
2282}
2283
2284sub should_reset {
2285 my ($self) = @_;
2286
2287 $self->reset_at <= $cf::RUNTIME
2288}
2289
2290sub reset {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 return if $self->players;
2296
2297 warn "resetting map ", $self->path;
2298
2299 $self->in_memory (cf::MAP_SWAPPED);
2300
2301 # need to save uniques path
2302 unless ($self->{deny_save}) {
2303 my $uniq = $self->uniq_path; utf8::encode $uniq;
2304
2305 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2306 if $uniq;
2307 }
2308
2309 delete $cf::MAP{$self->path};
2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2313 $self->clear;
2314 2522
2315 $self->unlink_save; 2523 $self->unlink_save;
2316 $self->destroy; 2524 $self->destroy;
2317} 2525}
2318 2526
2326 2534
2327 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2328 2536
2329 $self->unlink_save; 2537 $self->unlink_save;
2330 2538
2331 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2332 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2333 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2334 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2336 2544
2393 : normalise $_ 2601 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2602 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2603 ]
2396} 2604}
2397 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
2398=back 2638=back
2399 2639
2400=head3 cf::object 2640=head3 cf::object
2401 2641
2402=cut 2642=cut
2425 2665
2426Creates 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.
2427 2667
2428=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2429 2669
2430returns 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,
2431even if the object actually exists. May block. 2671even if the object actually exists. May block.
2432 2672
2433=cut 2673=cut
2434 2674
2435sub deref { 2675sub deref {
2467 2707
2468our $SAY_CHANNEL = { 2708our $SAY_CHANNEL = {
2469 id => "say", 2709 id => "say",
2470 title => "Map", 2710 title => "Map",
2471 reply => "say ", 2711 reply => "say ",
2472 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.",
2473}; 2713};
2474 2714
2475our $CHAT_CHANNEL = { 2715our $CHAT_CHANNEL = {
2476 id => "chat", 2716 id => "chat",
2477 title => "Chat", 2717 title => "Chat",
2517=item $player_object->may ("access") 2757=item $player_object->may ("access")
2518 2758
2519Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2520(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2521 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
2522=cut 2787=cut
2523 2788
2524sub cf::object::player::may { 2789sub cf::object::player::may {
2525 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2526 2791
2527 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2528 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2529 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2530 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2531} 2796}
2532 2797
2533=item $player_object->enter_link 2798=item $player_object->enter_link
2534 2799
2535Freezes 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}>).
2536 2801
2537The 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.
2538I<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.
2539 2806
2540Will 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.
2541 2814
2542=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2543 2816
2544Moves 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
2545map. 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
2563sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2564 my ($self) = @_; 2837 my ($self) = @_;
2565 2838
2566 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2567 2840
2841 ++$self->{_link_recursion};
2842
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2844
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2572 2847
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2849}
2575 2850
2576sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2578 2853
2595 ($x, $y) = (-1, -1) 2870 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2871 unless (defined $x) && (defined $y);
2597 2872
2598 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2601 2876
2602 $map->load; 2877 $map->load;
2603 $map->load_neighbours;
2604 2878
2605 return unless $self->contr->active; 2879 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2880
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2610} 2883 # entering was successful
2884 delete $self->{_link_recursion};
2885 # only activate afterwards, to support waiting in hooks
2886 $self->activate_recursive;
2887 }
2611 2888
2889}
2890
2612=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)]])
2613 2892
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
2624 2903
2625our $GOTOGEN; 2904our $GOTOGEN;
2626 2905
2627sub cf::object::player::goto { 2906sub cf::object::player::goto {
2628 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 }
2629 2914
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2917
2633 $self->enter_link; 2918 $self->enter_link;
2653 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2654 } 2939 }
2655 } 2940 }
2656 2941
2657 my $map = eval { 2942 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2944
2660 if ($map) { 2945 if ($map) {
2661 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2948 } else {
2664 $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);
2665 } 2950 }
2666 2951
2667 $map 2952 $map
2675 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2678 } 2963 }
2679 2964
2680 $done->() if $done; 2965 $done->($self) if $done;
2681 })->prio (1); 2966 })->prio (1);
2682} 2967}
2683 2968
2684=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2685 2970
2753 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2754 3039
2755 unless (eval { 3040 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2757 3042
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2768 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 }
2769 3069
2770 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2771 3071
2772 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 3074 if $exit->flag (cf::FLAG_DAMNED);
2775 3075
2776 1 3076 1
2777 }) { 3077 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2782 3082
2783 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 3084 $self->leave_link;
2785 } 3085 }
2786 })->prio (1); 3086 })->prio (1);
2787} 3087}
2788 3088
2789=head3 cf::client 3089=head3 cf::client
2790 3090
2791=over 4 3091=over 4
2792 3092
2793=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2794 3094
2795Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2796should not be used under normal circumstances. 3096them as required.
2797 3097
2798=cut 3098=cut
2799 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2800sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2801 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2802 3104
2803 utf8::encode $text; 3105 # try lzf for large packets
2804 $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);
2805} 3116}
2806 3117
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 3119
2809Send 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
2810client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2811the 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
2812the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2813 3124
2814=cut 3125=cut
2815 3126
2816# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 3128our %CHANNEL = (
3129 "c/motd" => {
3130 id => "infobox",
3131 title => "MOTD",
3132 reply => undef,
3133 tooltip => "The message of the day",
3134 },
2818 "c/identify" => { 3135 "c/identify" => {
2819 id => "infobox", 3136 id => "infobox",
2820 title => "Identify", 3137 title => "Identify",
2821 reply => undef, 3138 reply => undef,
2822 tooltip => "Items recently identified", 3139 tooltip => "Items recently identified",
2824 "c/examine" => { 3141 "c/examine" => {
2825 id => "infobox", 3142 id => "infobox",
2826 title => "Examine", 3143 title => "Examine",
2827 reply => undef, 3144 reply => undef,
2828 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",
2829 }, 3152 },
2830 "c/book" => { 3153 "c/book" => {
2831 id => "infobox", 3154 id => "infobox",
2832 title => "Book", 3155 title => "Book",
2833 reply => undef, 3156 reply => undef,
2849 id => "infobox", 3172 id => "infobox",
2850 title => "Body Parts", 3173 title => "Body Parts",
2851 reply => undef, 3174 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you posess and are available",
2853 }, 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 },
2854 "c/uptime" => { 3213 "c/uptime" => {
2855 id => "infobox", 3214 id => "infobox",
2856 title => "Uptime", 3215 title => "Uptime",
2857 reply => undef, 3216 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 3217 tooltip => "How long the server has been running since last restart",
2867 id => "party", 3226 id => "party",
2868 title => "Party", 3227 title => "Party",
2869 reply => "gsay ", 3228 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 3229 tooltip => "Messages and chat related to your party",
2871 }, 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,
2872); 3245);
2873 3246
2874sub cf::client::send_msg { 3247sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3248 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3249
2877 $msg = $self->pl->expand_cfpod ($msg); 3250 $msg = $self->pl->expand_cfpod ($msg)
3251 unless $color & cf::NDI_VERBATIM;
2878 3252
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3253 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3254
2881 # check predefined channels, for the benefit of C 3255 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3256 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3257 $channel = $CHANNEL{$channel};
2884 3258
2885 $self->ext_msg (channel_info => $channel) 3259 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3260 $channel = $channel->{id};
2889 3261
2890 } elsif (ref $channel) { 3262 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3263 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3264 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3265 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3266 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3267 }
2897 3268
2898 $channel = $channel->{id}; 3269 $channel = $channel->{id};
2899 } 3270 }
2900 3271
2901 return unless @extra || length $msg; 3272 return unless @extra || length $msg;
2902 3273
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3274 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3275 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3276 if $color & cf::NDI_DEF;
2907 3277
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3278 my $pkt = "msg "
3279 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3281 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3282
2922 $color &= cf::NDI_COLOR_MASK; 3283 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3284}
2936 3285
2937=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2938 3287
2939Sends an ext event to the client. 3288Sends an ext event to the client.
2941=cut 3290=cut
2942 3291
2943sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2945 3294
2946 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 }
2952}
2953
2954=item $client->ext_reply ($msgid, @msg)
2955
2956Sends an ext reply to the client.
2957
2958=cut
2959
2960sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_;
2962
2963 if ($self->extcmd == 2) {
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2970} 3296}
2971 3297
2972=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
2973 3299
2974Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
2994 3320
2995 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
2996 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
2997 3323
2998 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;
2999} 3364}
3000 3365
3001cf::client->attach ( 3366cf::client->attach (
3002 on_connect => sub { 3367 on_connect => sub {
3003 my ($ns) = @_; 3368 my ($ns) = @_;
3029 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3030 3395
3031 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3032 3397
3033 if (ref $msg) { 3398 if (ref $msg) {
3034 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3035 "ARRAY" eq ref $msg
3036 ? @$msg
3037 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3038 3400
3039 my @reply;
3040
3041 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}) {
3042 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3043 } 3419 }
3044
3045 $ns->ext_reply ($reply, @reply)
3046 if $reply;
3047
3048 } else { 3420 } else {
3049 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";
3050 } 3422 }
3051 3423
3052 cf::override; 3424 cf::override;
3053 }, 3425 },
3054); 3426);
3074 3446
3075 $coro 3447 $coro
3076} 3448}
3077 3449
3078cf::client->attach ( 3450cf::client->attach (
3079 on_destroy => sub { 3451 on_client_destroy => sub {
3080 my ($ns) = @_; 3452 my ($ns) = @_;
3081 3453
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3455 },
3084); 3456);
3100our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3101 3473
3102$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3103 3475
3104$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3107 sort time 3479 sort time
3108)); 3480));
3109 3481
3110# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3486The following functions and methods are available within a safe environment:
3115 3487
3116 cf::object 3488 cf::object
3117 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
3118 insert remove name archname title slaying race decrease split 3490 insert remove name archname title slaying race decrease split
3491 value
3119 3492
3120 cf::object::player 3493 cf::object::player
3121 player 3494 player
3122 3495
3123 cf::player 3496 cf::player
3129=cut 3502=cut
3130 3503
3131for ( 3504for (
3132 ["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
3133 insert remove inv nrof name archname title slaying race 3506 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3509 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3138) { 3511) {
3139 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3142 for @funs; 3514 for @funs;
3143} 3515}
3144 3516
3159 3531
3160 my $qcode = $code; 3532 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3163 3535
3536 %vars = (_dummy => 0) unless %vars;
3537
3538 my @res;
3164 local $_; 3539 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3540
3167 my $eval = 3541 my $eval =
3168 "do {\n" 3542 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3545 . $code
3172 . "\n}" 3546 . "\n}"
3173 ; 3547 ;
3174 3548
3549 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 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 }
3178 3558
3179 if ($@) { 3559 if ($@) {
3180 warn "$@"; 3560 warn "$@",
3181 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3183 } 3563 }
3184 3564
3185 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3186} 3566}
3187 3567
3201=cut 3581=cut
3202 3582
3203sub register_script_function { 3583sub register_script_function {
3204 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3205 3585
3206 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3208} 3588}
3209 3589
3210=back 3590=back
3211 3591
3212=cut 3592=cut
3213 3593
3214############################################################################# 3594#############################################################################
3215# the server's init and main functions 3595# the server's init and main functions
3216 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
3217sub load_facedata($) { 3674sub load_facedata($) {
3218 my ($path) = @_; 3675 my ($path) = @_;
3219 3676
3220 # HACK to clear player env face cache, we need some signal framework
3221 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = ();
3223
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225 3678
3226 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3227 3680
3228 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3229 0 < aio_load $path, $facedata
3230 or die "$path: $!";
3231
3232 $facedata = Coro::Storable::thaw $facedata;
3233 3682
3234 $facedata->{version} == 2 3683 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3236 3685
3237 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3238 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3239 type => FT_RSRC, 3688
3240 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
3241 }; 3690
3242 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3243 3694
3244 { 3695 {
3245 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3246 3697
3247 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3701
3250 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3252 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};
3253 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};
3254 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3255 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3256 } 3709 }
3257 3710
3258 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3259 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3260 3713
3263 3716
3264 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3267 } else { 3720 } else {
3268 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3269 } 3722 }
3270
3271 cf::cede_to_tick;
3272 } 3723 }
3273 } 3724 }
3274 3725
3275 { 3726 {
3276 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3277 3728
3278 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3279 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3280 cf::cede_to_tick;
3281 } 3731 }
3282 3732
3283 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3284 } 3734 }
3285 3735
3286 { 3736 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3290 3738
3291 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3292 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
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3743
3296 if ($info->{type} & 1) {
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 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;
3311 } else { 3750 } else {
3312 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3313 } 3752 }
3314
3315 cf::cede_to_tick;
3316 } 3753 }
3317 } 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;
3318 3765
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3321 1 3770 1
3322} 3771}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343 3772
3344register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3346 3775
3347 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3355 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3356 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3357 cf::arch::commit_load; 3786 cf::arch::commit_load;
3358 3787
3359 $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;
3360} 3803}
3361 3804
3362sub reload_regions { 3805sub reload_regions {
3363 # 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
3364 # for this (global event?) 3807 # for this (global event?)
3372 if exists $_->{match}; 3815 if exists $_->{match};
3373 } 3816 }
3374} 3817}
3375 3818
3376sub reload_facedata { 3819sub reload_facedata {
3377 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3378 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3379} 3822}
3380 3823
3381sub reload_archetypes { 3824sub reload_archetypes {
3382 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3383 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;
3384} 3853}
3385 3854
3386sub reload_treasures { 3855sub reload_treasures {
3387 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3388 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3389} 3858}
3390 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
3391sub reload_resources { 3880sub reload_resources {
3392 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3393 3882
3883 reload_materials;
3394 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3395 reload_archetypes; 3887 reload_archetypes;
3396 reload_regions; 3888 reload_regions;
3397 reload_treasures; 3889 reload_treasures;
3398 3890
3399 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3400}
3401
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408} 3892}
3409 3893
3410sub reload_config { 3894sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3895 trace "reloading config file...\n";
3412 or return;
3413 3896
3414 local $/; 3897 my $config = load_file "$CONFDIR/config";
3415 *CFG = YAML::Load <$fh>; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3416 3900
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3418 3902
3419 $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};
3420 $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};
3421 3905
3422 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3426 }; 3910 };
3427 warn $@ if $@; 3911 warn $@ if $@;
3428 } 3912 }
3429} 3913}
3430 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
3431sub 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
3432 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3434 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#
3435 (async { 3956 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3438 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3439 }; 3960 };
3440 3961
3441 { 3962 evthread_start IO::AIO::poll_fileno;
3442 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;
3443 reload_config; 3976 reload_config;
3444 db_init; 3977
3978 cf::init_uuid;
3979 cf::init_signals;
3980 cf::init_skills;
3981
3982 cf::init_beforeplay;
3983
3984 atomic;
3985
3445 load_extensions; 3986 load_extensions;
3446 3987
3447 $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;
3448 } 3995 };
3449 3996
3450 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;
3451} 4005}
3452 4006
3453############################################################################# 4007#############################################################################
3454# initialisation and cleanup 4008# initialisation and cleanup
3455 4009
3456# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3457BEGIN { 4011BEGIN {
3458 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3462 }; 4016 };
3463 } 4017 }
3464} 4018}
3465 4019
3466sub write_runtime_sync { 4020sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 4021 my $t0 = AE::time;
3468 4022
3469 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3471 4025
3472 IO::AIO::aio_utime $runtime, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 4027
3474 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3475 4029
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 4031 or return;
3478 4032
3479 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 4045 aio_utime $fh, undef, undef;
3492 4046
3493 close $fh 4047 close $fh
3494 or return; 4048 or return;
3495 4049
3496 aio_rename "$runtime~", $runtime 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 4051 and return;
3498 4052
3499 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 4054
3501 1 4055 1
3502} 4056}
3503 4057
3504our $uuid_lock; 4058our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 4067 my $uuid = "$LOCALDIR/uuid";
3514 4068
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 4069 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 4070 or return;
3517 4071
3518 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;
3519 $uuid_skip = 0; 4080 $uuid_skip = 0;
3520 4081
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 4082 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 4083 and return;
3523 4084
3529 or return; 4090 or return;
3530 4091
3531 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3532 and return; 4093 and return;
3533 4094
3534 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3535 4096
3536 1 4097 1
3537 4098
3538} 4099}
3539 4100
3545} 4106}
3546 4107
3547sub emergency_save() { 4108sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3549 4110
3550 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;
3551 4117
3552 cf::sync_job { 4118 cf::sync_job {
4119 cf::write_runtime_sync; # external watchdog should not bark
4120
3553 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 4127 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 4129 $pl->save;
3562 } 4130 }
3563 warn "end emergency player save\n"; 4131 info "emergency_perl_save: end player save\n";
3564 4132
3565 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";
3566 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 4138 $map->valid or next;
3569 $map->save; 4139 $map->save;
3570 } 4140 }
3571 warn "end emergency map save\n"; 4141 info "emergency_perl_save: end map save\n";
3572 4142
3573 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";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3576 4148
3577 warn "begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 4150 write_uuid_sync 1;
3579 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
3580 }; 4171 };
3581 4172
3582 warn "leave emergency perl save\n"; 4173 info "emergency_perl_save: leave\n";
3583} 4174}
3584 4175
3585sub post_cleanup { 4176sub post_cleanup {
3586 my ($make_core) = @_; 4177 my ($make_core) = @_;
3587 4178
4179 IO::AIO::flush;
4180
3588 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3589 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 }
3590} 4211}
3591 4212
3592sub do_reload_perl() { 4213sub do_reload_perl() {
3593 # can/must only be called in main 4214 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3595 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3596 return; 4217 return;
3597 } 4218 }
3598 4219
3599 warn "reloading..."; 4220 return if $RELOAD++;
3600 4221
3601 warn "entering sync_job"; 4222 my $t1 = AE::time;
3602 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
3603 cf::sync_job { 4230 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 4231 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 4232
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs;
3619 warn "iterate...";
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = (); 4235 %EXT_CORO = ();
3627 4236
3628 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3629 %COMMAND = (); 4238 %COMMAND = ();
3630 4239
3631 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3632 %EXTCMD = (); 4241 %EXTCMD = ();
3633 %EXTICMD = (); 4242 %EXTICMD = ();
3634 4243
3635 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3636 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3638 4247
3639 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3640 eval { 4249 eval {
3641 $cb->($pkg); 4250 $cb->($pkg);
3642 1 4251 1
3643 } 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;
3644 } 4257 }
3645 4258
3646 warn "... nuking $pkg";
3647 Symbol::delete_package $pkg;
3648 }
3649
3650 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3651 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 4262
3654 warn "... unloading $k"; 4263 trace "... unloading $k";
3655 delete $INC{$k}; 4264 delete $INC{$k};
3656 4265
3657 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3659 4268
3660 if (my $cb = $k->can ("unload_module")) { 4269 if (my $cb = $k->can ("unload_module")) {
3661 $cb->(); 4270 $cb->();
4271 }
4272
4273 clear_package $k;
3662 } 4274 }
3663 4275
3664 Symbol::delete_package $k;
3665 }
3666
3667 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 4277 clear_package "safe::$_"
3669 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);
3670 4279
3671 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 4283
3675 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3676 # and global variables created in xs 4285 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3678 4287
3679 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3680 4289
3681 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3682 require cf; 4291 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4292 cf::_connect_to_perl_1;
3684 4293
3685 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3686 cf::reload_config; 4295 cf::reload_config;
3687 4296
3688 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3689 cf::load_extensions; 4298 cf::load_extensions;
3690 4299
4300 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3694 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
4307 }
3697 4308
3698 warn "leaving sync_job"; 4309 cf::_post_init 1;
3699 4310
4311 trace "perl_reload: leaving sync_job";
4312
3700 1 4313 1
3701 } or do { 4314 } or do {
3702 warn $@; 4315 error $@;
3703 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
4317 };
4318
4319 --$RELOAD;
3704 }; 4320 }
3705 4321
3706 warn "reloaded"; 4322 $t1 = AE::time - $t1;
4323 info "perl_reload: completed in ${t1}s\n";
3707}; 4324};
3708 4325
3709our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3710 4327
3711sub reload_perl() { 4328sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 4329 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3714 4331
4332 $RELOAD_WATCHER ||= cf::async {
4333 Coro::AIO::aio_wait cache_extensions;
4334
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 4336 do_reload_perl;
3717 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
4338 };
3718 }; 4339 };
3719} 4340}
3720 4341
3721register_command "reload" => sub { 4342register_command "reload" => sub {
3722 my ($who, $arg) = @_; 4343 my ($who, $arg) = @_;
3728 reload_perl; 4349 reload_perl;
3729 }; 4350 };
3730 } 4351 }
3731}; 4352};
3732 4353
3733unshift @INC, $LIBDIR; 4354#############################################################################
3734 4355
3735my $bug_warning = 0; 4356my $bug_warning = 0;
3736 4357
3737our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN;
3739
3740sub wait_for_tick { 4358sub wait_for_tick() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3742 4360
3743 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3744 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait;
3746} 4362}
3747 4363
3748sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3750 4366
3751 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 4369 $signal->wait;
3754} 4370}
3758 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"
3759 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3760 return; 4376 return;
3761 } 4377 }
3762 4378
3763 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#
3764 4382
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $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.;
3767 Coro::async_pool { 4385 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3769 write_runtime_sync 4387 write_runtime_sync
3770 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3771 }; 4389 };
3772 } 4390 }
3773 4391
3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3775 $sig->send; 4393 $sig->send;
3776 } 4394 }
3777 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3778 $sig->send;
3779 }
3780 4396
3781 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3783 4399
3784 if (0) { 4400 if (0) {
3785 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3789 } 4405 }
3790 } 4406 }
3791} 4407}
3792 4408
3793{ 4409{
3794 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3795 4412
3796 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3799 4416
3800 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3803 $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;
3828 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3829 }; 4446 };
3830 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3831 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3832 }; 4449 };
4450
4451 info "database initialised";
3833} 4452}
3834 4453
3835{ 4454{
3836 # configure IO::AIO 4455 # configure IO::AIO
3837 4456
4457 info "initialising aio";
3838 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3839 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3840 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3841} 4462}
3842 4463
3843my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3844 4466
3845sub _log_backtrace { 4467sub _log_backtrace {
3846 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3847 4469
3848 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3849 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3850 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3852 ++$_log_backtrace; 4478 ++$_log_backtrace;
4479 my $perl_bt = Carp::longmess $msg;
3853 async { 4480 async {
3854 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
3855 4482
3856 my @bt = fork_call { 4483 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4484 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4495 }
3869 4496
3870 @funcs 4497 @funcs
3871 }; 4498 };
3872 4499
3873 LOG llevInfo, "[ABT] $msg\n"; 4500 LOG llevInfo, "[ABT] $perl_bt\n";
4501 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4503 --$_log_backtrace;
3876 }; 4504 };
3877 } else { 4505 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3880 } 4508 }
3881} 4509}
3882 4510
3883# load additional modules 4511# load additional modules
3884use cf::pod; 4512require "cf/$_.pm" for @EXTRA_MODULES;
4513cf::_connect_to_perl_2;
3885 4514
3886END { cf::emergency_save } 4515END { cf::emergency_save }
3887 4516
38881 45171
3889 4518

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines