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.375 by root, Sun Sep 30 20:22:21 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 3.64 (); 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.32 (); 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 # TODO: use suspend/resume instead 668 #LOG llevError, Carp::longmess "sync job";#d#
433 # (but this is cancel-safe) 669
434 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
435 671
436 my $busy = 1; 672 my $busy = 1;
437 my @res; 673 my @res;
438 674
439 (async { 675 (async {
440 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
441 @res = eval { $job->() }; 677 @res = eval { $job->() };
442 warn $@ if $@; 678 error $@ if $@;
443 undef $busy; 679 undef $busy;
444 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
445 681
446 while ($busy) { 682 while ($busy) {
447 Coro::cede or Event::one_event; 683 if (Coro::nready) {
684 Coro::cede_notself;
685 } else {
686 EV::loop EV::LOOP_ONESHOT;
448 } 687 }
688 }
449 689
450 $time = Event::time - $time; 690 my $time = AE::time - $time;
451 691
452 LOG llevError | logBacktrace, Carp::longmess "long sync job"
453 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
454
455 $tick_start += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
456 693
457 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
458 } else { 695 } else {
459 # we are in another coroutine, how wonderful, everything just works 696 # we are in another coroutine, how wonderful, everything just works
460 697
480 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
481 718
482 $coro 719 $coro
483} 720}
484 721
485=item fork_call { }, $args 722=item fork_call { }, @args
486 723
487Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
488process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
489Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
490never block itself or use any form of Event handling. 727never block itself or use any form of event handling.
491 728
492=cut 729=cut
730
731sub post_fork {
732 reset_signals;
733}
493 734
494sub fork_call(&@) { 735sub fork_call(&@) {
495 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
496 737
497 # 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,
498 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
499 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
500 741
501 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
502 reset_signals; 743 cf::post_fork;
503 &$cb 744 &$cb
504 }, @args; 745 } @args;
505 746
506 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
507} 786}
508 787
509=item $value = cf::db_get $family => $key 788=item $value = cf::db_get $family => $key
510 789
511Returns a single value from the environment database. 790Returns a single value from the environment database.
521within each server. 800within each server.
522 801
523=cut 802=cut
524 803
525sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
526 my ($name) = @_; 808 my ($name) = @_;
527 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
528 810
529 eval { 811 eval {
530 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
540} 822}
541 823
542our $DB; 824our $DB;
543 825
544sub db_init { 826sub db_init {
545 cf::sync_job {
546 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
547 };
548} 828}
549 829
550sub db_get($$) { 830sub db_get($$) {
551 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
552 832
553 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
554 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
555 837
556 $! ? () 838 $! ? ()
557 : $data 839 : $data
558 }
559} 840}
560 841
561sub db_put($$$) { 842sub db_put($$$) {
562 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
563 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
591 872
592 my @data; 873 my @data;
593 my $md5; 874 my $md5;
594 875
595 for (0 .. $#$src) { 876 for (0 .. $#$src) {
596 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
597 or Carp::croak "$src->[$_]: $!";
598 } 878 }
599 879
600 # if processing is expensive, check 880 # if processing is expensive, check
601 # checksum first 881 # checksum first
602 if (1) { 882 if (1) {
619 899
620 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
621 my $data = $process->(\@data); 901 my $data = $process->(\@data);
622 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
623 903
624 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
625 905
626 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
627 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
628 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
629 909
639 919
640=cut 920=cut
641 921
642sub datalog($@) { 922sub datalog($@) {
643 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
644 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
645} 925}
646 926
647=back 927=back
648 928
649=cut 929=cut
650 930
651############################################################################# 931#############################################################################
652 932
653=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
654 934
655Many 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
656attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
657to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
658 938
659In 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>
660C<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
661Crossfire TRT). 941Deliantra).
662 942
663=over 4 943=over 4
664 944
665=item $attachable->attach ($attachment, key => $value...) 945=item $attachable->attach ($attachment, key => $value...)
666 946
710=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
711 991
712Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
713given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
714 994
715Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
716that 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.
717 997
718These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
719 999
720=over 4 1000=over 4
844 1124
845 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
846 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
847 1127
848 } elsif (ref $type) { 1128 } elsif (ref $type) {
849 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
850 1130
851 } else { 1131 } else {
852 shift @arg; 1132 shift @arg;
853 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
854 } 1134 }
855 } 1135 }
856} 1136}
857 1137
858sub _object_attach { 1138sub _object_attach {
868 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
869 } 1149 }
870 1150
871 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
872 } else { 1152 } else {
873 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
874 } 1154 }
875 1155
876 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
877} 1157}
878 1158
937 1217
938 for (@$callbacks) { 1218 for (@$callbacks) {
939 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
940 1220
941 if ($@) { 1221 if ($@) {
942 warn "$@";
943 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
944 override; 1223 override;
945 } 1224 }
946 1225
947 return 1 if $override; 1226 return 1 if $override;
948 } 1227 }
949 1228
950 0 1229 0
951} 1230}
952 1231
953=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1232=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
954 1233
955=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1234=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
956 1235
957Generate an object-specific event with the given arguments. 1236Generate an object-specific event with the given arguments.
958 1237
964 1243
965=cut 1244=cut
966 1245
967############################################################################# 1246#############################################################################
968# object support 1247# object support
969#
970 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#
971sub _can_merge { 1282sub _can_merge {
972 my ($ob1, $ob2) = @_; 1283 my ($ob1, $ob2) = @_;
973 1284
974 local $Storable::canonical = 1; 1285 ++$SLOW_MERGES;#d#
975 my $fob1 = Storable::freeze $ob1;
976 my $fob2 = Storable::freeze $ob2;
977 1286
978 $fob1 eq $fob2 1287 # we do the slow way here
1288 return _object_equal $ob1, $ob2
979} 1289}
980 1290
981sub reattach { 1291sub reattach {
982 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
983 my ($obj) = @_; 1293 my ($obj) = @_;
984 1294
1295 # no longer needed after getting rid of delete_package?
985 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
986 1297
987 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
988 1299
989 @$registry = (); 1300 @$registry = ();
990 1301
995 for (@$attach) { 1306 for (@$attach) {
996 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
997 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
998 } 1309 }
999 } else { 1310 } else {
1000 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1001 } 1312 }
1002 } 1313 }
1003} 1314}
1004 1315
1005cf::attachable->attach ( 1316cf::attachable->attach (
1006 prio => -1000000, 1317 prio => -1000000,
1007 on_instantiate => sub { 1318 on_instantiate => sub {
1008 my ($obj, $data) = @_; 1319 my ($obj, $data) = @_;
1009 1320
1010 $data = from_json $data; 1321 $data = decode_json $data;
1011 1322
1012 for (@$data) { 1323 for (@$data) {
1013 my ($name, $args) = @$_; 1324 my ($name, $args) = @$_;
1014 1325
1015 $obj->attach ($name, %{$args || {} }); 1326 $obj->attach ($name, %{$args || {} });
1032 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1033 1344
1034 sync_job { 1345 sync_job {
1035 if (length $$rdata) { 1346 if (length $$rdata) {
1036 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1037 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1038 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1039 1351
1040 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1041 chmod SAVE_MODE, $fh; 1353 aio_chmod $fh, SAVE_MODE;
1042 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1043 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 }
1044 close $fh; 1359 aio_close $fh;
1045 1360
1046 if (@$objs) { 1361 if (@$objs) {
1047 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) {
1048 chmod SAVE_MODE, $fh; 1363 aio_chmod $fh, SAVE_MODE;
1049 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1050 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1051 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 }
1052 close $fh; 1370 aio_close $fh;
1053 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1054 } 1372 }
1055 } else { 1373 } else {
1056 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1057 } 1375 }
1058 1376
1059 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1060 } else { 1381 } else {
1061 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1062 } 1383 }
1063 } else { 1384 } else {
1064 aio_unlink $filename; 1385 aio_unlink $filename;
1065 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1066 } 1387 }
1085 1406
1086 unless (aio_stat "$filename.pst") { 1407 unless (aio_stat "$filename.pst") {
1087 (aio_load "$filename.pst", $av) >= 0 1408 (aio_load "$filename.pst", $av) >= 0
1088 or return; 1409 or return;
1089 1410
1090 $av = eval { (Storable::thaw $av)->{objs} }; 1411 my $st = eval { Coro::Storable::thaw $av };
1412 $av = $st->{objs};
1091 } 1413 }
1092 1414
1093 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1094 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1095 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1096 1419
1097 ($data, $av) 1420 ($data, $av)
1098} 1421}
1099 1422
1100=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1156 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1157 1480
1158 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1159} 1482}
1160 1483
1484use File::Glob ();
1485
1161cf::player->attach ( 1486cf::player->attach (
1162 on_command => sub { 1487 on_unknown_command => sub {
1163 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1164 1489
1165 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1166 or return; 1491 or return;
1167 1492
1175 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1176 1501
1177 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1178 1503
1179 if (ref $msg) { 1504 if (ref $msg) {
1180 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1181 "ARRAY" eq ref $msg
1182 ? @$msg
1183 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1184 1506
1185 my @reply; 1507 my @reply;
1186 1508
1187 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1188 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1190 1512
1191 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1192 if $reply; 1514 if $reply;
1193 1515
1194 } else { 1516 } else {
1195 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1196 } 1518 }
1197 1519
1198 cf::override; 1520 cf::override;
1199 }, 1521 },
1200); 1522);
1201 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
1202sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1203 cf::sync_job { 1553 cf::sync_job {
1204 my %todo; 1554 my %todo;
1205 1555
1206 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1207 next unless -r $path; 1557 next unless -r $path;
1225 1575
1226 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1227 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1228 1578
1229 $ext{source} = 1579 $ext{source} =
1230 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1231 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1232 . $source 1582 . $source
1233 . "\n};\n1"; 1583 . "\n};\n1";
1234 1584
1235 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1236 } 1586 }
1237 1587
1588 my $pass = 0;
1238 my %done; 1589 my %done;
1239 while (%todo) { 1590 while (%todo) {
1240 my $progress; 1591 my $progress;
1241 1592
1593 ++$pass;
1594
1595 ext:
1242 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1243 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1244 goto skip 1598 next ext
1245 unless exists $done{$_}; 1599 unless exists $done{$_};
1246 } 1600 }
1247 1601
1248 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1249 1603
1250 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 $@) {
1251 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1252 : "$v->{base}: extension inactive.\n";
1253 1617
1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1254 if (exists $v->{meta}{mandatory}) { 1619 if exists $v->{meta}{mandatory};
1255 warn $msg; 1620
1256 warn "mandatory extension failed to load, exiting.\n"; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1257 exit 1; 1622 delete $todo{$k};
1258 } 1623 } else {
1259 1624 $done{$k} = delete $todo{$k};
1260 warn $msg; 1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1261 } 1630 }
1262
1263 $done{$k} = delete $todo{$k};
1264 push @EXTS, $v->{pkg};
1265 $progress = 1;
1266 } 1631 }
1267 1632
1268 skip: 1633 unless ($progress) {
1269 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1270 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 }
1271 } 1643 }
1272 }; 1644 };
1273} 1645}
1274 1646
1275############################################################################# 1647#############################################################################
1276 1648
1277=back 1649=back
1278 1650
1279=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1280 1652
1281Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1282 1654
1283=cut 1655=cut
1284 1656
1285package cf::player; 1657package cf::player;
1286 1658
1329 1701
1330sub exists($) { 1702sub exists($) {
1331 my ($login) = @_; 1703 my ($login) = @_;
1332 1704
1333 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1334 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1335} 1707}
1336 1708
1337sub find($) { 1709sub find($) {
1338 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1339 my $login = $_[0]; 1711 my $login = $_[0];
1351 my $f = new_from_file cf::object::thawer path $login 1723 my $f = new_from_file cf::object::thawer path $login
1352 or return; 1724 or return;
1353 1725
1354 my $pl = cf::player::load_pl $f 1726 my $pl = cf::player::load_pl $f
1355 or return; 1727 or return;
1728
1356 local $cf::PLAYER_LOADING{$login} = $pl; 1729 local $cf::PLAYER_LOADING{$login} = $pl;
1357 $f->resolve_delayed_derefs; 1730 $f->resolve_delayed_derefs;
1358 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1359 } 1732 }
1360 } 1733 }
1361} 1734}
1362 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
1363sub save($) { 1749sub save($) {
1364 my ($pl) = @_; 1750 my ($pl) = @_;
1365 1751
1366 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1367 1753
1370 1756
1371 return if $pl->{deny_save}; 1757 return if $pl->{deny_save};
1372 1758
1373 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1374 $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];
1375 1766
1376 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1377 cf::cede_to_tick; 1768 cf::cede_to_tick;
1378} 1769}
1379 1770
1411 my ($pl) = @_; 1802 my ($pl) = @_;
1412 1803
1413 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1414 1805
1415 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1416 $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
1417 1808
1418 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1419 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1420 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1421 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1422 1817
1423 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1424 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1425 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1463 1858
1464 for my $login (@$dirs) { 1859 for my $login (@$dirs) {
1465 my $path = path $login; 1860 my $path = path $login;
1466 1861
1467 # a .pst is a dead give-away for a valid player 1862 # a .pst is a dead give-away for a valid player
1468 unless (-e "$path.pst") { 1863 # if no pst file found, open and chekc for blocked users
1864 if (aio_stat "$path.pst") {
1469 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1865 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1470 aio_read $fh, 0, 512, my $buf, 0 or next; 1866 aio_read $fh, 0, 512, my $buf, 0 or next;
1471 $buf !~ /^password -------------$/m or next; # official not-valid tag 1867 $buf !~ /^password -------------$/m or next; # official not-valid tag
1472 } 1868 }
1473 1869
1477 1873
1478 \@logins 1874 \@logins
1479} 1875}
1480 1876
1481=item $player->maps 1877=item $player->maps
1878
1879=item cf::player::maps $login
1482 1880
1483Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1484player. May block. 1882player. May block.
1485 1883
1486=cut 1884=cut
1504 } 1902 }
1505 1903
1506 \@paths 1904 \@paths
1507} 1905}
1508 1906
1509=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1510 1908
1511Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1512
1513=cut
1514
1515sub expand_cfpod {
1516 ((my $self), (local $_)) = @_;
1517
1518 # escape & and <
1519 s/&/&amp;/g;
1520 s/(?<![BIUGHT])</&lt;/g;
1521
1522 # this is buggy, it needs to properly take care of nested <'s
1523
1524 1 while
1525 # replace B<>, I<>, U<> etc.
1526 s/B<([^\>]*)>/<b>$1<\/b>/
1527 || s/I<([^\>]*)>/<i>$1<\/i>/
1528 || s/U<([^\>]*)>/<u>$1<\/u>/
1529 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1530 # replace G<male|female> tags
1531 || s{G<([^>|]*)\|([^>]*)>}{
1532 $self->gender ? $2 : $1
1533 }ge
1534 # replace H<hint text>
1535 || s{H<([^\>]*)>}
1536 {
1537 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1538 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1539 "")
1540 [$self->{hintmode}]
1541 }ge;
1542
1543 # create single paragraphs (very hackish)
1544 s/(?<=\S)\n(?=\w)/ /g;
1545
1546 # compress some whitespace
1547 s/\s+\n/\n/g; # ws line-ends
1548 s/\n\n+/\n/g; # double lines
1549 s/^\n+//; # beginning lines
1550 s/\n+$//; # ending lines
1551
1552 $_
1553}
1554
1555sub hintmode {
1556 $_[0]{hintmode} = $_[1] if @_ > 1;
1557 $_[0]{hintmode}
1558}
1559 1910
1560=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1561 1912
1562Sends an ext reply to the player. 1913Sends an ext reply to the player.
1563 1914
1595 1946
1596=cut 1947=cut
1597 1948
1598sub find_by_path($) { 1949sub find_by_path($) {
1599 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1600 1953
1601 my ($match, $specificity); 1954 my ($match, $specificity);
1602 1955
1603 for my $region (list) { 1956 for my $region (list) {
1604 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1630our $MAX_RESET = 3600; 1983our $MAX_RESET = 3600;
1631our $DEFAULT_RESET = 3000; 1984our $DEFAULT_RESET = 3000;
1632 1985
1633sub generate_random_map { 1986sub generate_random_map {
1634 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1635 # mit "rum" bekleckern, nicht 1988
1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1990
1636 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1637 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1638 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1639 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1640 $rmp->{exit_on_final_map},
1641 $rmp->{xsize}, $rmp->{ysize},
1642 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1643 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1644 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1645 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1646 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1647 (cf::region::find $rmp->{region}), $rmp->{custom}
1648 )
1649} 1992}
1650 1993
1651=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1652 1995
1653Register 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
1658 2001
1659sub register { 2002sub register {
1660 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1661 my $pkg = caller; 2004 my $pkg = caller;
1662 2005
1663 no strict;
1664 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1665 2007
1666 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1667} 2009}
1668 2010
1669# also paths starting with '/' 2011# also paths starting with '/'
1670$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1671 2013
1672sub thawer_merge { 2014sub thawer_merge {
1673 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1674 2016
1675 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1680} 2022}
1681 2023
1682sub normalise { 2024sub normalise {
1683 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1684 2026
1685 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1686 2028
1687 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1688 2030
1689 # map plan: 2031 # map plan:
1690 # 2032 #
1705 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1706 $path = "$base/$path"; 2048 $path = "$base/$path";
1707 } 2049 }
1708 2050
1709 for ($path) { 2051 for ($path) {
1710 redo if s{//}{/};
1711 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1712 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1713 } 2054 }
1714 2055
1715 $path 2056 $path
1729 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1730 return $self; 2071 return $self;
1731 } 2072 }
1732 } 2073 }
1733 2074
1734 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1735 () 2076 ()
1736} 2077}
1737 2078
2079# may re-bless or do other evil things
1738sub init { 2080sub init {
1739 my ($self) = @_; 2081 my ($self) = @_;
1740 2082
1741 $self 2083 $self
1742} 2084}
1761 2103
1762# the temporary/swap location 2104# the temporary/swap location
1763sub save_path { 2105sub save_path {
1764 my ($self) = @_; 2106 my ($self) = @_;
1765 2107
1766 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1767 "$TMPDIR/$path.map" 2109 "$TMPDIR/$path.map"
1768} 2110}
1769 2111
1770# the unique path, undef == no special unique path 2112# the unique path, undef == no special unique path
1771sub uniq_path { 2113sub uniq_path {
1772 my ($self) = @_; 2114 my ($self) = @_;
1773 2115
1774 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1775 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1776}
1777
1778# and all this just because we cannot iterate over
1779# all maps in C++...
1780sub change_all_map_light {
1781 my ($change) = @_;
1782
1783 $_->change_map_light ($change)
1784 for grep $_->outdoor, values %cf::MAP;
1785} 2118}
1786 2119
1787sub decay_objects { 2120sub decay_objects {
1788 my ($self) = @_; 2121 my ($self) = @_;
1789 2122
1816 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1817 2150
1818 1 2151 1
1819} 2152}
1820 2153
2154# used to laod the header of an original map
1821sub load_header_orig { 2155sub load_header_orig {
1822 my ($self) = @_; 2156 my ($self) = @_;
1823 2157
1824 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1825} 2159}
1826 2160
2161# used to laod the header of an instantiated map
1827sub load_header_temp { 2162sub load_header_temp {
1828 my ($self) = @_; 2163 my ($self) = @_;
1829 2164
1830 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1831} 2166}
1832 2167
2168# called after loading the header from an instantiated map
1833sub prepare_temp { 2169sub prepare_temp {
1834 my ($self) = @_; 2170 my ($self) = @_;
1835 2171
1836 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1837 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1838 # safety 2174 # safety
1839 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1840 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1841} 2177}
1842 2178
2179# called after loading the header from an original map
1843sub prepare_orig { 2180sub prepare_orig {
1844 my ($self) = @_; 2181 my ($self) = @_;
1845 2182
1846 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1847 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1871 2208
1872sub find; 2209sub find;
1873sub find { 2210sub find {
1874 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1875 2212
2213 cf::cede_to_tick;
2214
1876 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1877 2216
1878 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1879 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1880 2219
1881 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1882 my $guard1 = cf::lock_acquire "map_find:$path";
1883 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1884
1885 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
1886 or return; 2222 or return;
1887 2223
1888 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
1889 2225
1891 or return; 2227 or return;
1892 2228
1893 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1894 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
1895 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
1896 undef $guard1; 2233 undef $guard1;
1897 undef $guard2;
1898 $map->reset; 2234 $map->reset;
1899 return find $path; 2235 return find $path;
1900 } 2236 }
1901 2237
1902 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
1903 } 2239 }
1904} 2240}
1905 2241
1906sub pre_load { } 2242sub pre_load { }
1907sub post_load { } 2243#sub post_load { } # XS
1908 2244
1909sub load { 2245sub load {
1910 my ($self) = @_; 2246 my ($self) = @_;
1911 2247
1912 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
1915 2251
1916 { 2252 {
1917 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
1918 2254
1919 return unless $self->valid; 2255 return unless $self->valid;
1920 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
1921
1922 $self->in_memory (cf::MAP_LOADING);
1923 2257
1924 $self->alloc; 2258 $self->alloc;
1925 2259
1926 $self->pre_load; 2260 $self->pre_load;
1927 cf::cede_to_tick; 2261 cf::cede_to_tick;
1928 2262
2263 if (exists $self->{load_path}) {
1929 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
1930 $f->skip_block; 2265 $f->skip_block;
1931 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
1932 or return; 2267 or return;
1933 2268
1934 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
1935 if delete $self->{load_original}; 2270 if delete $self->{load_original};
1936 2271
1937 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
1938 utf8::encode $uniq; 2273 utf8::encode $uniq;
1939 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
1940 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
1941 $self->clear_unique_items; 2276 $self->clear_unique_items;
1942 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
1943 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
1944 } 2280 }
1945 } 2281 }
1946 }
1947 2282
1948 $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);
1949 2290
1950 cf::cede_to_tick; 2291 cf::cede_to_tick;
1951 # now do the right thing for maps 2292 # now do the right thing for maps
1952 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
1953 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
1957 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
1958 $self->decay_objects; 2299 $self->decay_objects;
1959 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
1960 $self->update_buttons; 2301 $self->update_buttons;
1961 cf::cede_to_tick; 2302 cf::cede_to_tick;
1962 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
1963 cf::cede_to_tick;
1964 $self->activate;
1965 } 2304 }
1966 2305
1967 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
1968 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
1969
1970 $self->in_memory (cf::MAP_IN_MEMORY);
1971 } 2308 }
1972 2309
1973 $self->post_load; 2310 $self->post_load;
1974}
1975 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
1976sub customise_for { 2318sub customise_for {
1977 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
1978 2320
1979 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
1980 if $self->per_player; 2322 if $self->per_player;
1983# if $self->per_party; 2325# if $self->per_party;
1984 2326
1985 $self 2327 $self
1986} 2328}
1987 2329
1988# find and load all maps in the 3x3 area around a map
1989sub load_neighbours {
1990 my ($map) = @_;
1991
1992 my @neigh; # diagonal neighbours
1993
1994 for (0 .. 3) {
1995 my $neigh = $map->tile_path ($_)
1996 or next;
1997 $neigh = find $neigh, $map
1998 or next;
1999 $neigh->load;
2000
2001 push @neigh,
2002 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2003 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2004 }
2005
2006 for (grep defined $_->[0], @neigh) {
2007 my ($path, $origin) = @$_;
2008 my $neigh = find $path, $origin
2009 or next;
2010 $neigh->load;
2011 }
2012}
2013
2014sub find_sync { 2330sub find_sync {
2015 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2016 2332
2017 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
2018} 2338}
2019 2339
2020sub do_load_sync { 2340sub do_load_sync {
2021 my ($map) = @_; 2341 my ($map) = @_;
2022 2342
2343 # it's a bug to call this from the main context
2023 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2024 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2025 2346
2026 cf::sync_job { $map->load }; 2347 $map->load;
2027} 2348}
2028 2349
2029our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2030our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2031 2352
2032sub find_async { 2353sub find_async {
2033 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2034 2355
2035 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2036 2357
2037 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2038 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2359 return $map if !$load || $map->linkable;
2039 } 2360 }
2040 2361
2041 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2042 2363
2043 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2057 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2058 2379
2059 () 2380 ()
2060} 2381}
2061 2382
2383# common code, used by both ->save and ->swapout
2062sub save { 2384sub _save {
2063 my ($self) = @_; 2385 my ($self) = @_;
2064
2065 my $lock = cf::lock_acquire "map_data:$self->{path}";
2066 2386
2067 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2068 2388
2069 return unless $self->dirty; 2389 return unless $self->dirty;
2070 2390
2079 2399
2080 cf::async { 2400 cf::async {
2081 $Coro::current->{desc} = "map player save"; 2401 $Coro::current->{desc} = "map player save";
2082 $_->contr->save for $self->players; 2402 $_->contr->save for $self->players;
2083 }; 2403 };
2404
2405 cf::get_slot 0.02;
2084 2406
2085 if ($uniq) { 2407 if ($uniq) {
2086 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2408 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2087 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2409 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2088 } else { 2410 } else {
2089 $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);
2090 } 2412 }
2091} 2413}
2092 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2093sub swap_out { 2423sub swap_out {
2094 my ($self) = @_; 2424 my ($self) = @_;
2095 2425
2096 # save first because save cedes
2097 $self->save;
2098
2099 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2100 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2101 return if $self->players; 2430 return if $self->players;
2102 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
2103 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2104 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
2105 $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};
2106 2482
2107 $self->deactivate; 2483 $self->deactivate;
2108 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2109 $self->clear; 2485 $self->clear;
2110}
2111
2112sub reset_at {
2113 my ($self) = @_;
2114
2115 # TODO: safety, remove and allow resettable per-player maps
2116 return 1e99 if $self->{deny_reset};
2117
2118 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2119 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2120
2121 $time + $to
2122}
2123
2124sub should_reset {
2125 my ($self) = @_;
2126
2127 $self->reset_at <= $cf::RUNTIME
2128}
2129
2130sub reset {
2131 my ($self) = @_;
2132
2133 my $lock = cf::lock_acquire "map_data:$self->{path}";
2134
2135 return if $self->players;
2136
2137 warn "resetting map ", $self->path;
2138
2139 $self->in_memory (cf::MAP_SWAPPED);
2140
2141 # need to save uniques path
2142 unless ($self->{deny_save}) {
2143 my $uniq = $self->uniq_path; utf8::encode $uniq;
2144
2145 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2146 if $uniq;
2147 }
2148
2149 delete $cf::MAP{$self->path};
2150
2151 $self->deactivate;
2152 $_->clear_links_to ($self) for values %cf::MAP;
2153 $self->clear;
2154 2486
2155 $self->unlink_save; 2487 $self->unlink_save;
2156 $self->destroy; 2488 $self->destroy;
2157} 2489}
2158 2490
2166 2498
2167 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2168 2500
2169 $self->unlink_save; 2501 $self->unlink_save;
2170 2502
2171 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2172 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2173 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2174 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2175 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2176 2508
2225 2557
2226sub unique_maps() { 2558sub unique_maps() {
2227 [ 2559 [
2228 map { 2560 map {
2229 utf8::decode $_; 2561 utf8::decode $_;
2230 /\.map$/ 2562 s/\.map$//; # TODO future compatibility hack
2563 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2564 ? ()
2231 ? normalise $_ 2565 : normalise $_
2232 : ()
2233 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2234 ] 2567 ]
2235} 2568}
2236 2569
2237package 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}
2238 2601
2239=back 2602=back
2240 2603
2241=head3 cf::object 2604=head3 cf::object
2242 2605
2246 2609
2247=over 4 2610=over 4
2248 2611
2249=item $ob->inv_recursive 2612=item $ob->inv_recursive
2250 2613
2251Returns 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.
2252 2616
2253=cut 2617=cut
2254 2618
2255sub inv_recursive_; 2619sub inv_recursive_;
2256sub inv_recursive_ { 2620sub inv_recursive_ {
2261 inv_recursive_ inv $_[0] 2625 inv_recursive_ inv $_[0]
2262} 2626}
2263 2627
2264=item $ref = $ob->ref 2628=item $ref = $ob->ref
2265 2629
2266creates 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.
2267 2631
2268=item $ob = cf::object::deref ($refstring) 2632=item $ob = cf::object::deref ($refstring)
2269 2633
2270returns 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,
2271even if the object actually exists. May block. 2635even if the object actually exists. May block.
2273=cut 2637=cut
2274 2638
2275sub deref { 2639sub deref {
2276 my ($ref) = @_; 2640 my ($ref) = @_;
2277 2641
2278 # temporary compatibility#TODO#remove
2279 $ref =~ s{^<}{player/<};
2280
2281 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2642 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2282 my ($uuid, $name) = ($1, $2); 2643 my ($uuid, $name) = ($1, $2);
2283 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2644 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2284 or return; 2645 or return;
2285 $pl->ob->uuid eq $uuid 2646 $pl->ob->uuid eq $uuid
2286 or return; 2647 or return;
2306can 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
2307dialogue with the given NPC character. 2668dialogue with the given NPC character.
2308 2669
2309=cut 2670=cut
2310 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
2311# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2312# with dialog boxes. 2687# with dialog boxes.
2313#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
2314sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2315 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2326 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2327 $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));
2328 2703
2329 } else { 2704 } else {
2330 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2331 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2332 } 2707 }
2333 } 2708 }
2334} 2709}
2335 2710
2336=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2361 2736
2362=item $player_object->enter_link 2737=item $player_object->enter_link
2363 2738
2364Freezes 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}>).
2365 2740
2366The 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.
2367I<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.
2368 2745
2369Will never block. 2746Will never block.
2370 2747
2371=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2372 2749
2392sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2393 my ($self) = @_; 2770 my ($self) = @_;
2394 2771
2395 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2396 2773
2774 ++$self->{_link_recursion};
2775
2397 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2398 2777
2399 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2400 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2401 2780
2402 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2403} 2782}
2404 2783
2405sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2406 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2407 2786
2424 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2425 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2426 2805
2427 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2428 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2429 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2430 2809
2431 $map->load; 2810 $map->load;
2432 $map->load_neighbours;
2433 2811
2434 return unless $self->contr->active; 2812 return unless $self->contr->active;
2435 $self->activate_recursive;
2436 2813
2437 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2438 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2439} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2440 2821
2822}
2823
2441=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)]])
2442 2825
2443Moves 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
2444her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2445that 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
2446the 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
2447be called at the end of this process. 2830be called at the end of this process.
2448 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
2449=cut 2835=cut
2450 2836
2451our $GOTOGEN; 2837our $GOTOGEN;
2452 2838
2453sub cf::object::player::goto { 2839sub cf::object::player::goto {
2454 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 }
2455 2847
2456 # 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
2457 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2458 2850
2459 $self->enter_link; 2851 $self->enter_link;
2479 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2480 } 2872 }
2481 } 2873 }
2482 2874
2483 my $map = eval { 2875 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2485 2877
2486 if ($map) { 2878 if ($map) {
2487 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2881 } else {
2490 $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);
2491 } 2883 }
2492 2884
2493 $map 2885 $map
2501 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2504 } 2896 }
2505 2897
2506 $done->() if $done; 2898 $done->($self) if $done;
2507 })->prio (1); 2899 })->prio (1);
2508} 2900}
2509 2901
2510=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2511 2903
2531} 2923}
2532 2924
2533sub prepare_random_map { 2925sub prepare_random_map {
2534 my ($exit) = @_; 2926 my ($exit) = @_;
2535 2927
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2930 # that depends on the exit object
2541 2931
2542 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2934 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2549 } 2941 }
2550 2942
2551 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2552 2944
2553 my $data = cf::to_json $rmp; 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2946 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2947 my $meta = "$RANDOMDIR/$md5.meta";
2556 2948
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2951 undef $fh;
2560 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2561 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2564 } 2960 }
2565} 2961}
2566 2962
2567sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2569 2965
2570 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2571 2967
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2968 $self->enter_link;
2584 2969
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2970 (async {
2590 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2971 $Coro::current->{desc} = "enter_exit";
2591 2972
2592 $self->deactivate_recursive; # just to be sure
2593 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
2594 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2595 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
2596 1; 3009 1
2597 }) { 3010 }) {
2598 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2599 . "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. "
2600 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2601 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2602 3015
2603 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2604 $self->leave_link; 3017 $self->leave_link;
2605 } 3018 }
2606 })->prio (1); 3019 })->prio (1);
2607} 3020}
2608 3021
2620sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2621 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2622 3035
2623 utf8::encode $text; 3036 utf8::encode $text;
2624 $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);
2625} 3063}
2626 3064
2627=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2628 3066
2629Send 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
2631the 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
2632the message unless the client supports the msg packet. 3070the message unless the client supports the msg packet.
2633 3071
2634=cut 3072=cut
2635 3073
3074# non-persistent channels (usually the info channel)
2636our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2637 "c/identify" => { 3082 "c/identify" => {
2638 id => "infobox", 3083 id => "infobox",
2639 title => "Identify", 3084 title => "Identify",
2640 reply => undef, 3085 reply => undef,
2641 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2644 id => "infobox", 3089 id => "infobox",
2645 title => "Examine", 3090 title => "Examine",
2646 reply => undef, 3091 reply => undef,
2647 tooltip => "Signs and other items you examined", 3092 tooltip => "Signs and other items you examined",
2648 }, 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 },
2649 "c/lookat" => { 3106 "c/lookat" => {
2650 id => "infobox", 3107 id => "infobox",
2651 title => "Look", 3108 title => "Look",
2652 reply => undef, 3109 reply => undef,
2653 tooltip => "What you saw there", 3110 tooltip => "What you saw there",
2654 }, 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,
2655); 3186);
2656 3187
2657sub cf::client::send_msg { 3188sub cf::client::send_msg {
2658 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2659 3190
2660 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2661 3193
2662 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2663 3195
2664 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2665 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2666 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2667 3199
2668 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2669 if $self->can_msg;
2670
2671 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2672 3202
2673 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2674 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2675 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2676 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2677 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2678 if $self->can_msg;
2679 } 3208 }
2680 3209
2681 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2682 } 3211 }
2683 3212
2684 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2685 3214
2686 if ($self->can_msg) {
2687 # default colour, mask it out 3215 # default colour, mask it out
2688 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2689 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2690 3218
2691 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2692 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2693 } else { 3222 );
2694 if ($color >= 0) {
2695 # replace some tags by gcfclient-compatible ones
2696 for ($msg) {
2697 1 while
2698 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2699 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2700 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2701 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2702 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2703 }
2704 3223
2705 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2706
2707 utf8::encode $msg;
2708
2709 if (0 && $msg =~ /\[/) {
2710 # COMMAND/INFO
2711 $self->send_packet ("drawextinfo $color 10 8 $msg")
2712 } else {
2713 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2714 $self->send_packet ("drawinfo $color $msg")
2715 }
2716 }
2717 }
2718} 3225}
2719 3226
2720=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2721 3228
2722Sends an ext event to the client. 3229Sends an ext event to the client.
2725 3232
2726sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2727 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2728 3235
2729 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2730 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2731 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2732 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2733 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2734 } 3241 }
2735} 3242}
2736 3243
2737=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2738 3245
2741=cut 3248=cut
2742 3249
2743sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2744 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2745 3252
2746 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2747 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2748 } elsif ($self->extcmd == 1) {
2749 #TODO: version 1, remove
2750 unshift @msg, msgtype => "reply", msgid => $id;
2751 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2752 }
2753} 3256}
2754 3257
2755=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2756 3259
2757Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2812 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2813 3316
2814 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2815 3318
2816 if (ref $msg) { 3319 if (ref $msg) {
2817 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2818 "ARRAY" eq ref $msg
2819 ? @$msg
2820 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2821 3321
2822 my @reply; 3322 my @reply;
2823 3323
2824 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
2825 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
2827 3327
2828 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
2829 if $reply; 3329 if $reply;
2830 3330
2831 } else { 3331 } else {
2832 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";
2833 } 3333 }
2834 3334
2835 cf::override; 3335 cf::override;
2836 }, 3336 },
2837); 3337);
2857 3357
2858 $coro 3358 $coro
2859} 3359}
2860 3360
2861cf::client->attach ( 3361cf::client->attach (
2862 on_destroy => sub { 3362 on_client_destroy => sub {
2863 my ($ns) = @_; 3363 my ($ns) = @_;
2864 3364
2865 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2866 }, 3366 },
2867); 3367);
2883our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
2884 3384
2885$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
2886 3386
2887$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
2888 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
2889 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
2890 sort time 3390 sort time
2891)); 3391));
2892 3392
2893# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
2895=pod 3395=pod
2896 3396
2897The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
2898 3398
2899 cf::object 3399 cf::object
2900 contr pay_amount pay_player map x y force_find force_add 3400 contr pay_amount pay_player map x y force_find force_add destroy
2901 insert remove name archname title slaying race decrease_ob_nr 3401 insert remove name archname title slaying race decrease split
3402 value
2902 3403
2903 cf::object::player 3404 cf::object::player
2904 player 3405 player
2905 3406
2906 cf::player 3407 cf::player
2911 3412
2912=cut 3413=cut
2913 3414
2914for ( 3415for (
2915 ["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
2916 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
2917 decrease_ob_nr)], 3418 decrease split destroy change_exp value msg lore send_msg)],
2918 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
2919 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
2920 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
2921) { 3422) {
2922 no strict 'refs';
2923 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
2924 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2925 for @funs; 3425 for @funs;
2926} 3426}
2927 3427
2942 3442
2943 my $qcode = $code; 3443 my $qcode = $code;
2944 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2945 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
2946 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
2947 local $_; 3450 local $_;
2948 local @safe::cf::_safe_eval_args = values %vars;
2949 3451
2950 my $eval = 3452 my $eval =
2951 "do {\n" 3453 "do {\n"
2952 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2953 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
2954 . $code 3456 . $code
2955 . "\n}" 3457 . "\n}"
2956 ; 3458 ;
2957 3459
3460 if ($CFG{safe_eval}) {
2958 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
2959 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2960 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 }
2961 3469
2962 if ($@) { 3470 if ($@) {
2963 warn "$@"; 3471 warn "$@",
2964 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
2965 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
2966 } 3474 }
2967 3475
2968 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
2969} 3477}
2970 3478
2984=cut 3492=cut
2985 3493
2986sub register_script_function { 3494sub register_script_function {
2987 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
2988 3496
2989 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
2990 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
2991} 3499}
2992 3500
2993=back 3501=back
2994 3502
2995=cut 3503=cut
2996 3504
2997############################################################################# 3505#############################################################################
2998# 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
2999 3509
3000sub load_facedata($) { 3510sub load_facedata($) {
3001 my ($path) = @_; 3511 my ($path) = @_;
3002 3512
3003 # 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
3004 # for this (global event?) 3514 # for this (global event?)
3005 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3006 3516
3007 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3008 3518
3009 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3010 3520
3011 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3012 0 < aio_load $path, $facedata
3013 or die "$path: $!";
3014
3015 $facedata = Coro::Storable::thaw $facedata;
3016 3522
3017 $facedata->{version} == 2 3523 $facedata->{version} == 2
3018 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3019 3525
3020 # 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]);
3021 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3022 type => FT_RSRC, 3529 type => FT_RSRC,
3023 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),
3024 }; 3532 };
3025 cf::cede_to_tick; 3533 cf::cede_to_tick;
3026 3534
3027 { 3535 {
3028 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3029 3537
3030 while (my ($face, $info) = each %$faces) { 3538 for my $face (sort keys %$faces) {
3539 my $info = $faces->{$face};
3031 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3540 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3541
3032 cf::face::set_visibility $idx, $info->{visibility}; 3542 cf::face::set_visibility $idx, $info->{visibility};
3033 cf::face::set_magicmap $idx, $info->{magicmap}; 3543 cf::face::set_magicmap $idx, $info->{magicmap};
3034 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3544 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3035 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#
3036 3548
3037 cf::cede_to_tick; 3549 cf::cede_to_tick;
3038 } 3550 }
3039 3551
3040 while (my ($face, $info) = each %$faces) { 3552 while (my ($face, $info) = each %$faces) {
3041 next unless $info->{smooth}; 3553 next unless $info->{smooth};
3554
3042 my $idx = cf::face::find $face 3555 my $idx = cf::face::find $face
3043 or next; 3556 or next;
3557
3044 if (my $smooth = cf::face::find $info->{smooth}) { 3558 if (my $smooth = cf::face::find $info->{smooth}) {
3045 cf::face::set_smooth $idx, $smooth; 3559 cf::face::set_smooth $idx, $smooth;
3046 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3560 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3047 } else { 3561 } else {
3048 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3562 error "smooth face '$info->{smooth}' not found for face '$face'";
3049 } 3563 }
3050 3564
3051 cf::cede_to_tick; 3565 cf::cede_to_tick;
3052 } 3566 }
3053 } 3567 }
3062 3576
3063 cf::anim::invalidate_all; # d'oh 3577 cf::anim::invalidate_all; # d'oh
3064 } 3578 }
3065 3579
3066 { 3580 {
3067 # TODO: for gcfclient pleasure, we should give resources
3068 # that gcfclient doesn't grok a >10000 face index.
3069 my $res = $facedata->{resource}; 3581 my $res = $facedata->{resource};
3070 3582
3071 my $soundconf = delete $res->{"res/sound.conf"};
3072
3073 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
3074 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3586 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3075 my $data;
3076 3587
3077 if ($info->{type} & 1) { 3588 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3078 # prepend meta info 3589 cf::face::set_type $idx, $type;
3079 3590 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3080 my $meta = $enc->encode ({ 3591 $FACEHASH{$info->{hash}} = $idx;#d#
3081 name => $name,
3082 %{ $info->{meta} || {} },
3083 });
3084
3085 $data = pack "(w/a*)*", $meta, $info->{data};
3086 } else { 3592 } else {
3087 $data = $info->{data}; 3593# $RESOURCE{$name} = $info; # unused
3088 } 3594 }
3089 3595
3090 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3091 cf::face::set_type $idx, $info->{type};
3092
3093 cf::cede_to_tick; 3596 cf::cede_to_tick;
3094 } 3597 }
3095
3096 if ($soundconf) {
3097 $soundconf = $enc->decode (delete $soundconf->{data});
3098
3099 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3100 my $sound = $soundconf->{compat}[$_]
3101 or next;
3102
3103 my $face = cf::face::find "sound/$sound->[1]";
3104 cf::sound::set $sound->[0] => $face;
3105 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3106 }
3107
3108 while (my ($k, $v) = each %{$soundconf->{event}}) {
3109 my $face = cf::face::find "sound/$v";
3110 cf::sound::set $k => $face;
3111 }
3112 }
3113 } 3598 }
3599
3600 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3114 3601
3115 1 3602 1
3116} 3603}
3117 3604
3118register_exticmd fx_want => sub { 3605register_exticmd fx_want => sub {
3120 3607
3121 while (my ($k, $v) = each %$want) { 3608 while (my ($k, $v) = each %$want) {
3122 $ns->fx_want ($k, $v); 3609 $ns->fx_want ($k, $v);
3123 } 3610 }
3124}; 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}
3125 3622
3126sub reload_regions { 3623sub reload_regions {
3127 # 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
3128 # for this (global event?) 3625 # for this (global event?)
3129 %ext::player_env::MUSIC_FACE_CACHE = (); 3626 %ext::player_env::MUSIC_FACE_CACHE = ();
3143} 3640}
3144 3641
3145sub reload_archetypes { 3642sub reload_archetypes {
3146 load_resource_file "$DATADIR/archetypes" 3643 load_resource_file "$DATADIR/archetypes"
3147 or die "unable to load archetypes\n"; 3644 or die "unable to load archetypes\n";
3148 #d# NEED to laod twice to resolve forward references
3149 # this really needs to be done in an extra post-pass
3150 # (which needs to be synchronous, so solve it differently)
3151 load_resource_file "$DATADIR/archetypes"
3152 or die "unable to load archetypes\n";
3153} 3645}
3154 3646
3155sub reload_treasures { 3647sub reload_treasures {
3156 load_resource_file "$DATADIR/treasures" 3648 load_resource_file "$DATADIR/treasures"
3157 or die "unable to load treasurelists\n"; 3649 or die "unable to load treasurelists\n";
3158} 3650}
3159 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
3160sub reload_resources { 3672sub reload_resources {
3161 warn "reloading resource files...\n"; 3673 trace "reloading resource files...\n";
3162 3674
3675 reload_exp_table;
3676 reload_materials;
3677 reload_facedata;
3678 reload_sound;
3679 reload_archetypes;
3163 reload_regions; 3680 reload_regions;
3164 reload_facedata;
3165 #reload_archetypes;#d#
3166 reload_archetypes;
3167 reload_treasures; 3681 reload_treasures;
3168 3682
3169 warn "finished reloading resource files\n"; 3683 trace "finished reloading resource files\n";
3170}
3171
3172sub init {
3173 reload_resources;
3174} 3684}
3175 3685
3176sub reload_config { 3686sub reload_config {
3177 open my $fh, "<:utf8", "$CONFDIR/config" 3687 trace "reloading config file...\n";
3178 or return;
3179 3688
3180 local $/; 3689 my $config = load_file "$CONFDIR/config";
3181 *CFG = YAML::Syck::Load <$fh>; 3690 utf8::decode $config;
3691 *CFG = decode_yaml $config;
3182 3692
3183 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3693 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3184 3694
3185 $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};
3186 $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};
3187 3697
3188 if (exists $CFG{mlockall}) { 3698 if (exists $CFG{mlockall}) {
3192 }; 3702 };
3193 warn $@ if $@; 3703 warn $@ if $@;
3194 } 3704 }
3195} 3705}
3196 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
3197sub 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
3198 # we must not ever block the main coroutine 3745 # we must not ever block the main coroutine
3199 local $Coro::idle = sub { 3746 local $Coro::idle = sub {
3200 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#
3201 (async { 3748 (async {
3202 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3749 $Coro::current->{desc} = "IDLE BUG HANDLER";
3203 Event::one_event; 3750 EV::loop EV::LOOP_ONESHOT;
3204 })->prio (Coro::PRIO_MAX); 3751 })->prio (Coro::PRIO_MAX);
3205 }; 3752 };
3206 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;
3207 reload_config; 3766 reload_config;
3208 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
3209 load_extensions; 3777 load_extensions;
3210 3778
3211 $TICK_WATCHER->start; 3779 utime time, time, $RUNTIMEFILE;
3212 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;
3213} 3796}
3214 3797
3215############################################################################# 3798#############################################################################
3216# initialisation and cleanup 3799# initialisation and cleanup
3217 3800
3218# install some emergency cleanup handlers 3801# install some emergency cleanup handlers
3219BEGIN { 3802BEGIN {
3803 our %SIGWATCHER = ();
3220 for my $signal (qw(INT HUP TERM)) { 3804 for my $signal (qw(INT HUP TERM)) {
3221 Event->signal ( 3805 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3222 reentrant => 0,
3223 data => WF_AUTOCANCEL,
3224 signal => $signal,
3225 prio => 0,
3226 cb => sub {
3227 cf::cleanup "SIG$signal"; 3806 cf::cleanup "SIG$signal";
3228 },
3229 ); 3807 };
3230 } 3808 }
3231} 3809}
3232 3810
3233sub write_runtime { 3811sub write_runtime_sync {
3234 my $runtime = "$LOCALDIR/runtime"; 3812 my $t0 = AE::time;
3235 3813
3236 # first touch the runtime file to show we are still running: 3814 # first touch the runtime file to show we are still running:
3237 # the fsync below can take a very very long time. 3815 # the fsync below can take a very very long time.
3238 3816
3239 IO::AIO::aio_utime $runtime, undef, undef; 3817 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3240 3818
3241 my $guard = cf::lock_acquire "write_runtime"; 3819 my $guard = cf::lock_acquire "write_runtime";
3242 3820
3243 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3821 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3244 or return; 3822 or return;
3245 3823
3246 my $value = $cf::RUNTIME + 90 + 10; 3824 my $value = $cf::RUNTIME + 90 + 10;
3247 # 10 is the runtime save interval, for a monotonic clock 3825 # 10 is the runtime save interval, for a monotonic clock
3248 # 60 allows for the watchdog to kill the server. 3826 # 60 allows for the watchdog to kill the server.
3258 aio_utime $fh, undef, undef; 3836 aio_utime $fh, undef, undef;
3259 3837
3260 close $fh 3838 close $fh
3261 or return; 3839 or return;
3262 3840
3263 aio_rename "$runtime~", $runtime 3841 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3264 and return; 3842 and return;
3265 3843
3266 warn "runtime file written.\n"; 3844 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3267 3845
3268 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 };
3269} 3897}
3270 3898
3271sub emergency_save() { 3899sub emergency_save() {
3272 my $freeze_guard = cf::freeze_mainloop; 3900 my $freeze_guard = cf::freeze_mainloop;
3273 3901
3274 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;
3275 3908
3276 cf::sync_job { 3909 cf::sync_job {
3910 cf::write_runtime_sync; # external watchdog should not bark
3911
3277 # use a peculiar iteration method to avoid tripping on perl 3912 # use a peculiar iteration method to avoid tripping on perl
3278 # refcount bugs in for. also avoids problems with players 3913 # refcount bugs in for. also avoids problems with players
3279 # and maps saved/destroyed asynchronously. 3914 # and maps saved/destroyed asynchronously.
3280 warn "begin emergency player save\n"; 3915 info "emergency_perl_save: begin player save\n";
3281 for my $login (keys %cf::PLAYER) { 3916 for my $login (keys %cf::PLAYER) {
3282 my $pl = $cf::PLAYER{$login} or next; 3917 my $pl = $cf::PLAYER{$login} or next;
3283 $pl->valid or next; 3918 $pl->valid or next;
3919 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3284 $pl->save; 3920 $pl->save;
3285 } 3921 }
3286 warn "end emergency player save\n"; 3922 info "emergency_perl_save: end player save\n";
3287 3923
3288 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";
3289 for my $path (keys %cf::MAP) { 3927 for my $path (keys %cf::MAP) {
3290 my $map = $cf::MAP{$path} or next; 3928 my $map = $cf::MAP{$path} or next;
3291 $map->valid or next; 3929 $map->valid or next;
3292 $map->save; 3930 $map->save;
3293 } 3931 }
3294 warn "end emergency map save\n"; 3932 info "emergency_perl_save: end map save\n";
3295 3933
3296 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";
3297 BDB::db_env_txn_checkpoint $DB_ENV; 3937 BDB::db_env_txn_checkpoint $DB_ENV;
3298 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
3299 }; 3962 };
3300 3963
3301 warn "leave emergency perl save\n"; 3964 info "emergency_perl_save: leave\n";
3302} 3965}
3303 3966
3304sub post_cleanup { 3967sub post_cleanup {
3305 my ($make_core) = @_; 3968 my ($make_core) = @_;
3306 3969
3970 IO::AIO::flush;
3971
3307 warn Carp::longmess "post_cleanup backtrace" 3972 error Carp::longmess "post_cleanup backtrace"
3308 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 }
3309} 4002}
3310 4003
3311sub do_reload_perl() { 4004sub do_reload_perl() {
3312 # can/must only be called in main 4005 # can/must only be called in main
3313 if ($Coro::current != $Coro::main) { 4006 unless (in_main) {
3314 warn "can only reload from main coroutine"; 4007 error "can only reload from main coroutine";
3315 return; 4008 return;
3316 } 4009 }
3317 4010
3318 warn "reloading..."; 4011 return if $RELOAD++;
3319 4012
3320 warn "entering sync_job"; 4013 my $t1 = AE::time;
3321 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
3322 cf::sync_job { 4021 cf::sync_job {
3323 cf::write_runtime; # external watchdog should not bark
3324 cf::emergency_save; 4022 #cf::emergency_save;
3325 cf::write_runtime; # external watchdog should not bark
3326 4023
3327 warn "syncing database to disk";
3328 BDB::db_env_txn_checkpoint $DB_ENV;
3329
3330 # if anything goes wrong in here, we should simply crash as we already saved
3331
3332 warn "cancelling all WF_AUTOCANCEL watchers";
3333 for (Event::all_watchers) {
3334 $_->cancel if $_->data & WF_AUTOCANCEL;
3335 }
3336
3337 warn "flushing outstanding aio requests";
3338 for (;;) {
3339 BDB::flush;
3340 IO::AIO::flush;
3341 Coro::cede;
3342 last unless IO::AIO::nreqs || BDB::nreqs;
3343 warn "iterate...";
3344 }
3345
3346 ++$RELOAD;
3347
3348 warn "cancelling all extension coros"; 4024 trace "perl_reload: cancelling all extension coros";
3349 $_->cancel for values %EXT_CORO; 4025 $_->cancel for values %EXT_CORO;
3350 %EXT_CORO = (); 4026 %EXT_CORO = ();
3351 4027
3352 warn "removing commands"; 4028 trace "perl_reload: removing commands";
3353 %COMMAND = (); 4029 %COMMAND = ();
3354 4030
3355 warn "removing ext/exti commands"; 4031 trace "perl_reload: removing ext/exti commands";
3356 %EXTCMD = (); 4032 %EXTCMD = ();
3357 %EXTICMD = (); 4033 %EXTICMD = ();
3358 4034
3359 warn "unloading/nuking all extensions"; 4035 trace "perl_reload: unloading/nuking all extensions";
3360 for my $pkg (@EXTS) { 4036 for my $pkg (@EXTS) {
3361 warn "... unloading $pkg"; 4037 trace "... unloading $pkg";
3362 4038
3363 if (my $cb = $pkg->can ("unload")) { 4039 if (my $cb = $pkg->can ("unload")) {
3364 eval { 4040 eval {
3365 $cb->($pkg); 4041 $cb->($pkg);
3366 1 4042 1
3367 } 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;
3368 } 4048 }
3369 4049
3370 warn "... nuking $pkg";
3371 Symbol::delete_package $pkg;
3372 }
3373
3374 warn "unloading all perl modules loaded from $LIBDIR"; 4050 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3375 while (my ($k, $v) = each %INC) { 4051 while (my ($k, $v) = each %INC) {
3376 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4052 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3377 4053
3378 warn "... unloading $k"; 4054 trace "... unloading $k";
3379 delete $INC{$k}; 4055 delete $INC{$k};
3380 4056
3381 $k =~ s/\.pm$//; 4057 $k =~ s/\.pm$//;
3382 $k =~ s/\//::/g; 4058 $k =~ s/\//::/g;
3383 4059
3384 if (my $cb = $k->can ("unload_module")) { 4060 if (my $cb = $k->can ("unload_module")) {
3385 $cb->(); 4061 $cb->();
4062 }
4063
4064 clear_package $k;
3386 } 4065 }
3387 4066
3388 Symbol::delete_package $k;
3389 }
3390
3391 warn "getting rid of safe::, as good as possible"; 4067 trace "perl_reload: getting rid of safe::, as good as possible";
3392 Symbol::delete_package "safe::$_" 4068 clear_package "safe::$_"
3393 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);
3394 4070
3395 warn "unloading cf.pm \"a bit\""; 4071 trace "perl_reload: unloading cf.pm \"a bit\"";
3396 delete $INC{"cf.pm"}; 4072 delete $INC{"cf.pm"};
3397 delete $INC{"cf/pod.pm"}; 4073 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3398 4074
3399 # don't, removes xs symbols, too, 4075 # don't, removes xs symbols, too,
3400 # and global variables created in xs 4076 # and global variables created in xs
3401 #Symbol::delete_package __PACKAGE__; 4077 #clear_package __PACKAGE__;
3402 4078
3403 warn "unload completed, starting to reload now"; 4079 info "perl_reload: unload completed, starting to reload now";
3404 4080
3405 warn "reloading cf.pm"; 4081 trace "perl_reload: reloading cf.pm";
3406 require cf; 4082 require cf;
3407 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4083 cf::_connect_to_perl_1;
3408 4084
3409 warn "loading config and database again"; 4085 trace "perl_reload: loading config and database again";
3410 cf::reload_config; 4086 cf::reload_config;
3411 4087
3412 warn "loading extensions"; 4088 trace "perl_reload: loading extensions";
3413 cf::load_extensions; 4089 cf::load_extensions;
3414 4090
4091 if ($REATTACH_ON_RELOAD) {
3415 warn "reattaching attachments to objects/players"; 4092 trace "perl_reload: reattaching attachments to objects/players";
3416 _global_reattach; # objects, sockets 4093 _global_reattach; # objects, sockets
3417 warn "reattaching attachments to maps"; 4094 trace "perl_reload: reattaching attachments to maps";
3418 reattach $_ for values %MAP; 4095 reattach $_ for values %MAP;
3419 warn "reattaching attachments to players"; 4096 trace "perl_reload: reattaching attachments to players";
3420 reattach $_ for values %PLAYER; 4097 reattach $_ for values %PLAYER;
4098 }
3421 4099
3422 warn "leaving sync_job"; 4100 cf::_post_init 1;
3423 4101
4102 trace "perl_reload: leaving sync_job";
4103
3424 1 4104 1
3425 } or do { 4105 } or do {
3426 warn $@; 4106 error $@;
3427 warn "error while reloading, exiting."; 4107 cf::cleanup "perl_reload: error, exiting.";
3428 exit 1; 4108 };
4109
4110 --$RELOAD;
3429 }; 4111 }
3430 4112
3431 warn "reloaded"; 4113 $t1 = AE::time - $t1;
4114 info "perl_reload: completed in ${t1}s\n";
3432}; 4115};
3433 4116
3434our $RELOAD_WATCHER; # used only during reload 4117our $RELOAD_WATCHER; # used only during reload
3435 4118
3436sub reload_perl() { 4119sub reload_perl() {
3437 # doing reload synchronously and two reloads happen back-to-back, 4120 # doing reload synchronously and two reloads happen back-to-back,
3438 # coro crashes during coro_state_free->destroy here. 4121 # coro crashes during coro_state_free->destroy here.
3439 4122
3440 $RELOAD_WATCHER ||= Event->timer ( 4123 $RELOAD_WATCHER ||= cf::async {
3441 reentrant => 0, 4124 Coro::AIO::aio_wait cache_extensions;
3442 after => 0, 4125
3443 data => WF_AUTOCANCEL, 4126 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3444 cb => sub {
3445 do_reload_perl; 4127 do_reload_perl;
3446 undef $RELOAD_WATCHER; 4128 undef $RELOAD_WATCHER;
3447 }, 4129 };
3448 ); 4130 };
3449} 4131}
3450 4132
3451register_command "reload" => sub { 4133register_command "reload" => sub {
3452 my ($who, $arg) = @_; 4134 my ($who, $arg) = @_;
3453 4135
3458 reload_perl; 4140 reload_perl;
3459 }; 4141 };
3460 } 4142 }
3461}; 4143};
3462 4144
3463unshift @INC, $LIBDIR; 4145#############################################################################
3464 4146
3465my $bug_warning = 0; 4147my $bug_warning = 0;
3466 4148
3467our @WAIT_FOR_TICK;
3468our @WAIT_FOR_TICK_BEGIN;
3469
3470sub wait_for_tick { 4149sub wait_for_tick() {
3471 return unless $TICK_WATCHER->is_active; 4150 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3472 return if $Coro::current == $Coro::main;
3473 4151
3474 my $signal = new Coro::Signal; 4152 $WAIT_FOR_TICK->wait;
3475 push @WAIT_FOR_TICK, $signal;
3476 $signal->wait;
3477} 4153}
3478 4154
3479sub wait_for_tick_begin { 4155sub wait_for_tick_begin() {
3480 return unless $TICK_WATCHER->is_active; 4156 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3481 return if $Coro::current == $Coro::main;
3482 4157
3483 my $signal = new Coro::Signal; 4158 my $signal = new Coro::Signal;
3484 push @WAIT_FOR_TICK_BEGIN, $signal; 4159 push @WAIT_FOR_TICK_BEGIN, $signal;
3485 $signal->wait; 4160 $signal->wait;
3486} 4161}
3487 4162
3488$TICK_WATCHER = Event->timer ( 4163sub tick {
3489 reentrant => 0,
3490 parked => 1,
3491 prio => 0,
3492 at => $NEXT_TICK || $TICK,
3493 data => WF_AUTOCANCEL,
3494 cb => sub {
3495 if ($Coro::current != $Coro::main) { 4164 if ($Coro::current != $Coro::main) {
3496 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"
3497 unless ++$bug_warning > 10; 4166 unless ++$bug_warning > 10;
3498 return; 4167 return;
3499 } 4168 }
3500 4169
3501 $NOW = $tick_start = Event::time; 4170 cf::one_tick; # one server iteration
3502 4171
3503 cf::server_tick; # one server iteration 4172 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3504 4173
3505 $RUNTIME += $TICK;
3506 $NEXT_TICK += $TICK;
3507
3508 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4174 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3509 $NEXT_RUNTIME_WRITE = $NOW + 10; 4175 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3510 Coro::async_pool { 4176 Coro::async_pool {
3511 $Coro::current->{desc} = "runtime saver"; 4177 $Coro::current->{desc} = "runtime saver";
3512 write_runtime 4178 write_runtime_sync
3513 or warn "ERROR: unable to write runtime file: $!"; 4179 or error "ERROR: unable to write runtime file: $!";
3514 };
3515 } 4180 };
4181 }
3516 4182
3517 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4183 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3518 $sig->send; 4184 $sig->send;
3519 } 4185 }
3520 while (my $sig = shift @WAIT_FOR_TICK) { 4186 $WAIT_FOR_TICK->broadcast;
3521 $sig->send;
3522 }
3523 4187
3524 $NOW = Event::time; 4188 $LOAD = ($NOW - $TICK_START) / $TICK;
3525
3526 # if we are delayed by four ticks or more, skip them all
3527 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3528
3529 $TICK_WATCHER->at ($NEXT_TICK);
3530 $TICK_WATCHER->start;
3531
3532 $LOAD = ($NOW - $tick_start) / $TICK;
3533 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4189 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3534 4190
3535 _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 }
3536 }, 4197 }
3537); 4198}
3538 4199
3539{ 4200{
4201 # configure BDB
4202
3540 BDB::min_parallel 8; 4203 BDB::min_parallel 16;
3541 BDB::max_poll_time $TICK * 0.1; 4204 BDB::max_poll_reqs $TICK * 0.1;
3542 $BDB_POLL_WATCHER = Event->io ( 4205 #$AnyEvent::BDB::WATCHER->priority (1);
3543 reentrant => 0,
3544 fd => BDB::poll_fileno,
3545 poll => 'r',
3546 prio => 0,
3547 data => WF_AUTOCANCEL,
3548 cb => \&BDB::poll_cb,
3549 );
3550
3551 BDB::set_sync_prepare {
3552 my $status;
3553 my $current = $Coro::current;
3554 (
3555 sub {
3556 $status = $!;
3557 $current->ready; undef $current;
3558 },
3559 sub {
3560 Coro::schedule while defined $current;
3561 $! = $status;
3562 },
3563 )
3564 };
3565 4206
3566 unless ($DB_ENV) { 4207 unless ($DB_ENV) {
3567 $DB_ENV = BDB::db_env_create; 4208 $DB_ENV = BDB::db_env_create;
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3569 | 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;
3570 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4212 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3571 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4213 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3572 4214
3573 cf::sync_job { 4215 cf::sync_job {
3574 eval { 4216 eval {
3584 4226
3585 cf::cleanup "db_env_open(db): $@" if $@; 4227 cf::cleanup "db_env_open(db): $@" if $@;
3586 }; 4228 };
3587 } 4229 }
3588 4230
3589 $BDB_DEADLOCK_WATCHER = Event->timer ( 4231 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3590 after => 3,
3591 interval => 1,
3592 hard => 1,
3593 prio => 0,
3594 data => WF_AUTOCANCEL,
3595 cb => sub {
3596 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 { };
3597 },
3598 ); 4233 };
3599 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4234 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3600 after => 11,
3601 interval => 60,
3602 hard => 1,
3603 prio => 0,
3604 data => WF_AUTOCANCEL,
3605 cb => sub {
3606 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4235 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3607 },
3608 ); 4236 };
3609 $BDB_TRICKLE_WATCHER = Event->timer ( 4237 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3610 after => 5,
3611 interval => 10,
3612 hard => 1,
3613 prio => 0,
3614 data => WF_AUTOCANCEL,
3615 cb => sub {
3616 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4238 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3617 },
3618 ); 4239 };
3619} 4240}
3620 4241
3621{ 4242{
4243 # configure IO::AIO
4244
3622 IO::AIO::min_parallel 8; 4245 IO::AIO::min_parallel 8;
3623
3624 undef $Coro::AIO::WATCHER;
3625 IO::AIO::max_poll_time $TICK * 0.1; 4246 IO::AIO::max_poll_time $TICK * 0.1;
3626 $AIO_POLL_WATCHER = Event->io ( 4247 undef $AnyEvent::AIO::WATCHER;
3627 reentrant => 0,
3628 data => WF_AUTOCANCEL,
3629 fd => IO::AIO::poll_fileno,
3630 poll => 'r',
3631 prio => 6,
3632 cb => \&IO::AIO::poll_cb,
3633 );
3634} 4248}
3635 4249
3636my $_log_backtrace; 4250our $_log_backtrace;
4251our $_log_backtrace_last;
3637 4252
3638sub _log_backtrace { 4253sub _log_backtrace {
3639 my ($msg, @addr) = @_; 4254 my ($msg, @addr) = @_;
3640 4255
3641 $msg =~ s/\n//; 4256 $msg =~ s/\n$//;
3642 4257
4258 if ($_log_backtrace_last eq $msg) {
4259 LOG llevInfo, "[ABT] $msg\n";
4260 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3643 # limit the # of concurrent backtraces 4261 # limit the # of concurrent backtraces
3644 if ($_log_backtrace < 2) { 4262 } elsif ($_log_backtrace < 2) {
4263 $_log_backtrace_last = $msg;
3645 ++$_log_backtrace; 4264 ++$_log_backtrace;
4265 my $perl_bt = Carp::longmess $msg;
3646 async { 4266 async {
3647 $Coro::current->{desc} = "abt $msg"; 4267 $Coro::current->{desc} = "abt $msg";
3648 4268
3649 my @bt = fork_call { 4269 my @bt = fork_call {
3650 @addr = map { sprintf "%x", $_ } @addr; 4270 @addr = map { sprintf "%x", $_ } @addr;
3661 } 4281 }
3662 4282
3663 @funcs 4283 @funcs
3664 }; 4284 };
3665 4285
3666 LOG llevInfo, "[ABT] $msg\n"; 4286 LOG llevInfo, "[ABT] $perl_bt\n";
4287 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3667 LOG llevInfo, "[ABT] $_\n" for @bt; 4288 LOG llevInfo, "[ABT] $_\n" for @bt;
3668 --$_log_backtrace; 4289 --$_log_backtrace;
3669 }; 4290 };
3670 } else { 4291 } else {
3671 LOG llevInfo, "[ABT] $msg\n"; 4292 LOG llevInfo, "[ABT] $msg\n";
3672 LOG llevInfo, "[ABT] [suppressed]\n"; 4293 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3673 } 4294 }
3674} 4295}
3675 4296
3676# load additional modules 4297# load additional modules
3677use cf::pod; 4298require "cf/$_.pm" for @EXTRA_MODULES;
4299cf::_connect_to_perl_2;
3678 4300
3679END { cf::emergency_save } 4301END { cf::emergency_save }
3680 4302
36811 43031
3682 4304

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines