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.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines