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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines