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.384 by root, Fri Oct 12 18:17:16 2007 UTC vs.
Revision 1.586 by root, Wed Oct 31 15:02:02 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines