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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines