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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines