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.371 by root, Thu Sep 13 16:16:01 2007 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 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 Carp::cluck "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 || {} });
1026); 1340);
1027 1341
1028sub object_freezer_save { 1342sub object_freezer_save {
1029 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1030 1344
1031 my $guard = cf::lock_acquire "io";
1032
1033 sync_job { 1345 sync_job {
1034 if (length $$rdata) { 1346 if (length $$rdata) {
1035 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1036 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1037 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1038 1351
1039 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1040 chmod SAVE_MODE, $fh; 1353 aio_chmod $fh, SAVE_MODE;
1041 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1042 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 }
1043 close $fh; 1359 aio_close $fh;
1044 1360
1045 if (@$objs) { 1361 if (@$objs) {
1046 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) {
1047 chmod SAVE_MODE, $fh; 1363 aio_chmod $fh, SAVE_MODE;
1048 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1049 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1050 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 }
1051 close $fh; 1370 aio_close $fh;
1052 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1053 } 1372 }
1054 } else { 1373 } else {
1055 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1056 } 1375 }
1057 1376
1058 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1059 } else { 1381 } else {
1060 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1061 } 1383 }
1062 } else { 1384 } else {
1063 aio_unlink $filename; 1385 aio_unlink $filename;
1064 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1065 } 1387 }
1066 }; 1388 };
1067
1068 undef $guard;
1069} 1389}
1070 1390
1071sub object_freezer_as_string { 1391sub object_freezer_as_string {
1072 my ($rdata, $objs) = @_; 1392 my ($rdata, $objs) = @_;
1073 1393
1078 1398
1079sub object_thawer_load { 1399sub object_thawer_load {
1080 my ($filename) = @_; 1400 my ($filename) = @_;
1081 1401
1082 my ($data, $av); 1402 my ($data, $av);
1083
1084 my $guard = cf::lock_acquire "io";
1085 1403
1086 (aio_load $filename, $data) >= 0 1404 (aio_load $filename, $data) >= 0
1087 or return; 1405 or return;
1088 1406
1089 unless (aio_stat "$filename.pst") { 1407 unless (aio_stat "$filename.pst") {
1090 (aio_load "$filename.pst", $av) >= 0 1408 (aio_load "$filename.pst", $av) >= 0
1091 or return; 1409 or return;
1092 1410
1093 undef $guard;
1094 $av = eval { (Storable::thaw $av)->{objs} }; 1411 my $st = eval { Coro::Storable::thaw $av };
1412 $av = $st->{objs};
1095 } 1413 }
1096 1414
1097 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1098 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1099 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1100 1419
1101 ($data, $av) 1420 ($data, $av)
1102} 1421}
1103 1422
1104=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1160 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1161 1480
1162 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1163} 1482}
1164 1483
1484use File::Glob ();
1485
1165cf::player->attach ( 1486cf::player->attach (
1166 on_command => sub { 1487 on_unknown_command => sub {
1167 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1168 1489
1169 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1170 or return; 1491 or return;
1171 1492
1179 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1180 1501
1181 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1182 1503
1183 if (ref $msg) { 1504 if (ref $msg) {
1184 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1185 "ARRAY" eq ref $msg
1186 ? @$msg
1187 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1188 1506
1189 my @reply; 1507 my @reply;
1190 1508
1191 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1192 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1194 1512
1195 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1196 if $reply; 1514 if $reply;
1197 1515
1198 } else { 1516 } else {
1199 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1200 } 1518 }
1201 1519
1202 cf::override; 1520 cf::override;
1203 }, 1521 },
1204); 1522);
1205 1523
1524# "readahead" all extensions
1525sub cache_extensions {
1526 my $grp = IO::AIO::aio_group;
1527
1528 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1529 for (grep /\.ext$/, @{$_[0]}) {
1530 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1531 }
1532 };
1533
1534 $grp
1535}
1536
1537sub _ext_cfg_reg($$$$) {
1538 my ($rvar, $varname, $cfgname, $default) = @_;
1539
1540 $cfgname = lc $varname
1541 unless length $cfgname;
1542
1543 $EXT_CFG{$cfgname} = [$rvar, $default];
1544
1545 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1546}
1547
1206sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1207 cf::sync_job { 1553 cf::sync_job {
1208 my %todo; 1554 my %todo;
1209 1555
1210 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1211 next unless -r $path; 1557 next unless -r $path;
1229 1575
1230 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1231 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1232 1578
1233 $ext{source} = 1579 $ext{source} =
1234 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1235 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1236 . $source 1582 . $source
1237 . "\n};\n1"; 1583 . "\n};\n1";
1238 1584
1239 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1240 } 1586 }
1241 1587
1588 my $pass = 0;
1242 my %done; 1589 my %done;
1243 while (%todo) { 1590 while (%todo) {
1244 my $progress; 1591 my $progress;
1245 1592
1593 ++$pass;
1594
1595 ext:
1246 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1247 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1248 goto skip 1598 next ext
1249 unless exists $done{$_}; 1599 unless exists $done{$_};
1250 } 1600 }
1251 1601
1252 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1253 1603
1254 unless (eval $v->{source}) { 1604 my $source = $v->{source};
1605
1606 # support "CONF varname :confname = default" pseudo-statements
1607 $source =~ s{
1608 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1609 }{
1610 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1611 }gmxe;
1612
1613 my $active = eval $source;
1614
1615 if (length $@) {
1255 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1256 : "$v->{base}: extension inactive.\n";
1257 1617
1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1258 if (exists $v->{meta}{mandatory}) { 1619 if exists $v->{meta}{mandatory};
1259 warn $msg; 1620
1260 warn "mandatory extension failed to load, exiting.\n"; 1621 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1261 exit 1; 1622 delete $todo{$k};
1262 } 1623 } else {
1263 1624 $done{$k} = delete $todo{$k};
1264 warn $msg; 1625 push @EXTS, $v->{pkg};
1626 $progress = 1;
1627
1628 info "$v->{base}: extension inactive.\n"
1629 unless $active;
1265 } 1630 }
1266
1267 $done{$k} = delete $todo{$k};
1268 push @EXTS, $v->{pkg};
1269 $progress = 1;
1270 } 1631 }
1271 1632
1272 skip: 1633 unless ($progress) {
1273 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1274 unless $progress; 1635
1636 while (my ($k, $v) = each %todo) {
1637 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1638 if exists $v->{meta}{mandatory};
1639 }
1640
1641 last;
1642 }
1275 } 1643 }
1276 }; 1644 };
1277} 1645}
1278 1646
1279############################################################################# 1647#############################################################################
1280 1648
1281=back 1649=back
1282 1650
1283=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1284 1652
1285Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1286 1654
1287=cut 1655=cut
1288 1656
1289package cf::player; 1657package cf::player;
1290 1658
1333 1701
1334sub exists($) { 1702sub exists($) {
1335 my ($login) = @_; 1703 my ($login) = @_;
1336 1704
1337 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1338 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1339} 1707}
1340 1708
1341sub find($) { 1709sub find($) {
1342 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1343 my $login = $_[0]; 1711 my $login = $_[0];
1353 aio_unlink +(playerdir $login) . "/$login.pl"; 1721 aio_unlink +(playerdir $login) . "/$login.pl";
1354 1722
1355 my $f = new_from_file cf::object::thawer path $login 1723 my $f = new_from_file cf::object::thawer path $login
1356 or return; 1724 or return;
1357 1725
1358 $f->next;
1359 my $pl = cf::player::load_pl $f 1726 my $pl = cf::player::load_pl $f
1360 or return; 1727 or return;
1728
1361 local $cf::PLAYER_LOADING{$login} = $pl; 1729 local $cf::PLAYER_LOADING{$login} = $pl;
1362 $f->resolve_delayed_derefs; 1730 $f->resolve_delayed_derefs;
1363 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1364 } 1732 }
1365 } 1733 }
1366} 1734}
1367 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
1368sub save($) { 1749sub save($) {
1369 my ($pl) = @_; 1750 my ($pl) = @_;
1370 1751
1371 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1372 1753
1375 1756
1376 return if $pl->{deny_save}; 1757 return if $pl->{deny_save};
1377 1758
1378 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1379 $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];
1380 1766
1381 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1382 cf::cede_to_tick; 1768 cf::cede_to_tick;
1383} 1769}
1384 1770
1416 my ($pl) = @_; 1802 my ($pl) = @_;
1417 1803
1418 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1419 1805
1420 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1421 $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
1422 1808
1423 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1424 $pl->deactivate; 1810 $pl->deactivate;
1811
1812 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1425 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1426 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1427 1817
1428 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1429 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1430 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1468 1858
1469 for my $login (@$dirs) { 1859 for my $login (@$dirs) {
1470 my $path = path $login; 1860 my $path = path $login;
1471 1861
1472 # a .pst is a dead give-away for a valid player 1862 # a .pst is a dead give-away for a valid player
1473 unless (-e "$path.pst") { 1863 # if no pst file found, open and chekc for blocked users
1864 if (aio_stat "$path.pst") {
1474 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1865 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1475 aio_read $fh, 0, 512, my $buf, 0 or next; 1866 aio_read $fh, 0, 512, my $buf, 0 or next;
1476 $buf !~ /^password -------------$/m or next; # official not-valid tag 1867 $buf !~ /^password -------------$/m or next; # official not-valid tag
1477 } 1868 }
1478 1869
1482 1873
1483 \@logins 1874 \@logins
1484} 1875}
1485 1876
1486=item $player->maps 1877=item $player->maps
1878
1879=item cf::player::maps $login
1487 1880
1488Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1489player. May block. 1882player. May block.
1490 1883
1491=cut 1884=cut
1509 } 1902 }
1510 1903
1511 \@paths 1904 \@paths
1512} 1905}
1513 1906
1514=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1515 1908
1516Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1517
1518=cut
1519
1520sub expand_cfpod {
1521 ((my $self), (local $_)) = @_;
1522
1523 # escape & and <
1524 s/&/&amp;/g;
1525 s/(?<![BIUGHT])</&lt;/g;
1526
1527 # this is buggy, it needs to properly take care of nested <'s
1528
1529 1 while
1530 # replace B<>, I<>, U<> etc.
1531 s/B<([^\>]*)>/<b>$1<\/b>/
1532 || s/I<([^\>]*)>/<i>$1<\/i>/
1533 || s/U<([^\>]*)>/<u>$1<\/u>/
1534 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1535 # replace G<male|female> tags
1536 || s{G<([^>|]*)\|([^>]*)>}{
1537 $self->gender ? $2 : $1
1538 }ge
1539 # replace H<hint text>
1540 || s{H<([^\>]*)>}
1541 {
1542 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1543 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1544 "")
1545 [$self->{hintmode}]
1546 }ge;
1547
1548 # create single paragraphs (very hackish)
1549 s/(?<=\S)\n(?=\w)/ /g;
1550
1551 # compress some whitespace
1552 s/\s+\n/\n/g; # ws line-ends
1553 s/\n\n+/\n/g; # double lines
1554 s/^\n+//; # beginning lines
1555 s/\n+$//; # ending lines
1556
1557 $_
1558}
1559
1560sub hintmode {
1561 $_[0]{hintmode} = $_[1] if @_ > 1;
1562 $_[0]{hintmode}
1563}
1564 1910
1565=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1566 1912
1567Sends an ext reply to the player. 1913Sends an ext reply to the player.
1568 1914
1600 1946
1601=cut 1947=cut
1602 1948
1603sub find_by_path($) { 1949sub find_by_path($) {
1604 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1605 1953
1606 my ($match, $specificity); 1954 my ($match, $specificity);
1607 1955
1608 for my $region (list) { 1956 for my $region (list) {
1609 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1635our $MAX_RESET = 3600; 1983our $MAX_RESET = 3600;
1636our $DEFAULT_RESET = 3000; 1984our $DEFAULT_RESET = 3000;
1637 1985
1638sub generate_random_map { 1986sub generate_random_map {
1639 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1640 # mit "rum" bekleckern, nicht 1988
1989 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1990
1641 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1642 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1643 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1644 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1645 $rmp->{exit_on_final_map},
1646 $rmp->{xsize}, $rmp->{ysize},
1647 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1648 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1649 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1650 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1651 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1652 (cf::region::find $rmp->{region}), $rmp->{custom}
1653 )
1654} 1992}
1655 1993
1656=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1657 1995
1658Register 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
1663 2001
1664sub register { 2002sub register {
1665 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1666 my $pkg = caller; 2004 my $pkg = caller;
1667 2005
1668 no strict;
1669 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1670 2007
1671 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1672} 2009}
1673 2010
1674# also paths starting with '/' 2011# also paths starting with '/'
1675$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1676 2013
1677sub thawer_merge { 2014sub thawer_merge {
1678 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1679 2016
1680 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1685} 2022}
1686 2023
1687sub normalise { 2024sub normalise {
1688 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1689 2026
1690 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1691 2028
1692 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1693 2030
1694 # map plan: 2031 # map plan:
1695 # 2032 #
1710 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1711 $path = "$base/$path"; 2048 $path = "$base/$path";
1712 } 2049 }
1713 2050
1714 for ($path) { 2051 for ($path) {
1715 redo if s{//}{/};
1716 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1717 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1718 } 2054 }
1719 2055
1720 $path 2056 $path
1734 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1735 return $self; 2071 return $self;
1736 } 2072 }
1737 } 2073 }
1738 2074
1739 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1740 () 2076 ()
1741} 2077}
1742 2078
2079# may re-bless or do other evil things
1743sub init { 2080sub init {
1744 my ($self) = @_; 2081 my ($self) = @_;
1745 2082
1746 $self 2083 $self
1747} 2084}
1766 2103
1767# the temporary/swap location 2104# the temporary/swap location
1768sub save_path { 2105sub save_path {
1769 my ($self) = @_; 2106 my ($self) = @_;
1770 2107
1771 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1772 "$TMPDIR/$path.map" 2109 "$TMPDIR/$path.map"
1773} 2110}
1774 2111
1775# the unique path, undef == no special unique path 2112# the unique path, undef == no special unique path
1776sub uniq_path { 2113sub uniq_path {
1777 my ($self) = @_; 2114 my ($self) = @_;
1778 2115
1779 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1780 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1781}
1782
1783# and all this just because we cannot iterate over
1784# all maps in C++...
1785sub change_all_map_light {
1786 my ($change) = @_;
1787
1788 $_->change_map_light ($change)
1789 for grep $_->outdoor, values %cf::MAP;
1790} 2118}
1791 2119
1792sub decay_objects { 2120sub decay_objects {
1793 my ($self) = @_; 2121 my ($self) = @_;
1794 2122
1821 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1822 2150
1823 1 2151 1
1824} 2152}
1825 2153
2154# used to laod the header of an original map
1826sub load_header_orig { 2155sub load_header_orig {
1827 my ($self) = @_; 2156 my ($self) = @_;
1828 2157
1829 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1830} 2159}
1831 2160
2161# used to laod the header of an instantiated map
1832sub load_header_temp { 2162sub load_header_temp {
1833 my ($self) = @_; 2163 my ($self) = @_;
1834 2164
1835 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1836} 2166}
1837 2167
2168# called after loading the header from an instantiated map
1838sub prepare_temp { 2169sub prepare_temp {
1839 my ($self) = @_; 2170 my ($self) = @_;
1840 2171
1841 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1842 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1843 # safety 2174 # safety
1844 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1845 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1846} 2177}
1847 2178
2179# called after loading the header from an original map
1848sub prepare_orig { 2180sub prepare_orig {
1849 my ($self) = @_; 2181 my ($self) = @_;
1850 2182
1851 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
1852 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
1876 2208
1877sub find; 2209sub find;
1878sub find { 2210sub find {
1879 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
1880 2212
2213 cf::cede_to_tick;
2214
1881 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
1882 2216
1883 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1884 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
1885 2219
1886 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
1887 my $guard1 = cf::lock_acquire "map_find:$path";
1888 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1889
1890 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
1891 or return; 2222 or return;
1892 2223
1893 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
1894 2225
1896 or return; 2227 or return;
1897 2228
1898 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2229 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1899 # doing this can freeze the server in a sync job, obviously 2230 # doing this can freeze the server in a sync job, obviously
1900 #$cf::WAIT_FOR_TICK->wait; 2231 #$cf::WAIT_FOR_TICK->wait;
2232 undef $guard2;
1901 undef $guard1; 2233 undef $guard1;
1902 undef $guard2;
1903 $map->reset; 2234 $map->reset;
1904 return find $path; 2235 return find $path;
1905 } 2236 }
1906 2237
1907 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
1908 } 2239 }
1909} 2240}
1910 2241
1911sub pre_load { } 2242sub pre_load { }
1912sub post_load { } 2243#sub post_load { } # XS
1913 2244
1914sub load { 2245sub load {
1915 my ($self) = @_; 2246 my ($self) = @_;
1916 2247
1917 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
1920 2251
1921 { 2252 {
1922 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
1923 2254
1924 return unless $self->valid; 2255 return unless $self->valid;
1925 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
1926
1927 $self->in_memory (cf::MAP_LOADING);
1928 2257
1929 $self->alloc; 2258 $self->alloc;
1930 2259
1931 $self->pre_load; 2260 $self->pre_load;
1932 cf::cede_to_tick; 2261 cf::cede_to_tick;
1933 2262
2263 if (exists $self->{load_path}) {
1934 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
1935 $f->skip_block; 2265 $f->skip_block;
1936 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
1937 or return; 2267 or return;
1938 2268
1939 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2269 $self->post_load_original
1940 if delete $self->{load_original}; 2270 if delete $self->{load_original};
1941 2271
1942 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
1943 utf8::encode $uniq; 2273 utf8::encode $uniq;
1944 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
1945 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
1946 $self->clear_unique_items; 2276 $self->clear_unique_items;
1947 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
1948 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
1949 } 2280 }
1950 } 2281 }
1951 }
1952 2282
1953 $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);
1954 2290
1955 cf::cede_to_tick; 2291 cf::cede_to_tick;
1956 # now do the right thing for maps 2292 # now do the right thing for maps
1957 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
1958 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
1962 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
1963 $self->decay_objects; 2299 $self->decay_objects;
1964 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
1965 $self->update_buttons; 2301 $self->update_buttons;
1966 cf::cede_to_tick; 2302 cf::cede_to_tick;
1967 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
1968 cf::cede_to_tick;
1969 $self->activate;
1970 } 2304 }
1971 2305
1972 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
1973 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
1974
1975 $self->in_memory (cf::MAP_IN_MEMORY);
1976 } 2308 }
1977 2309
1978 $self->post_load; 2310 $self->post_load;
1979}
1980 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
1981sub customise_for { 2318sub customise_for {
1982 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
1983 2320
1984 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
1985 if $self->per_player; 2322 if $self->per_player;
1988# if $self->per_party; 2325# if $self->per_party;
1989 2326
1990 $self 2327 $self
1991} 2328}
1992 2329
1993# find and load all maps in the 3x3 area around a map
1994sub load_neighbours {
1995 my ($map) = @_;
1996
1997 my @neigh; # diagonal neighbours
1998
1999 for (0 .. 3) {
2000 my $neigh = $map->tile_path ($_)
2001 or next;
2002 $neigh = find $neigh, $map
2003 or next;
2004 $neigh->load;
2005
2006 push @neigh,
2007 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2008 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2009 }
2010
2011 for (grep defined $_->[0], @neigh) {
2012 my ($path, $origin) = @$_;
2013 my $neigh = find $path, $origin
2014 or next;
2015 $neigh->load;
2016 }
2017}
2018
2019sub find_sync { 2330sub find_sync {
2020 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2021 2332
2022 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
2023} 2338}
2024 2339
2025sub do_load_sync { 2340sub do_load_sync {
2026 my ($map) = @_; 2341 my ($map) = @_;
2027 2342
2343 # it's a bug to call this from the main context
2028 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2029 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2030 2346
2031 cf::sync_job { $map->load }; 2347 $map->load;
2032} 2348}
2033 2349
2034our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2035our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2036 2352
2037sub find_async { 2353sub find_async {
2038 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2039 2355
2040 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2041 2357
2042 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2043 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2359 return $map if !$load || $map->linkable;
2044 } 2360 }
2045 2361
2046 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2047 2363
2048 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2365 $Coro::current->{desc} = "map prefetcher";
2366
2049 while (%MAP_PREFETCH) { 2367 while (%MAP_PREFETCH) {
2050 while (my ($k, $v) = each %MAP_PREFETCH) { 2368 while (my ($k, $v) = each %MAP_PREFETCH) {
2051 if (my $map = find $k) { 2369 if (my $map = find $k) {
2052 $map->load if $v; 2370 $map->load if $v;
2053 } 2371 }
2060 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2061 2379
2062 () 2380 ()
2063} 2381}
2064 2382
2383# common code, used by both ->save and ->swapout
2065sub save { 2384sub _save {
2066 my ($self) = @_; 2385 my ($self) = @_;
2067
2068 my $lock = cf::lock_acquire "map_data:$self->{path}";
2069 2386
2070 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2071 2388
2072 return unless $self->dirty; 2389 return unless $self->dirty;
2073 2390
2079 return if $self->{deny_save}; 2396 return if $self->{deny_save};
2080 2397
2081 local $self->{last_access} = $self->last_access;#d# 2398 local $self->{last_access} = $self->last_access;#d#
2082 2399
2083 cf::async { 2400 cf::async {
2401 $Coro::current->{desc} = "map player save";
2084 $_->contr->save for $self->players; 2402 $_->contr->save for $self->players;
2085 }; 2403 };
2404
2405 cf::get_slot 0.02;
2086 2406
2087 if ($uniq) { 2407 if ($uniq) {
2088 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2408 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2089 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2409 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2090 } else { 2410 } else {
2091 $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);
2092 } 2412 }
2093} 2413}
2094 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2095sub swap_out { 2423sub swap_out {
2096 my ($self) = @_; 2424 my ($self) = @_;
2097 2425
2098 # save first because save cedes
2099 $self->save;
2100
2101 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2102 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2103 return if $self->players; 2430 return if $self->players;
2104 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
2105 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2106 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
2107 $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};
2108 2482
2109 $self->deactivate; 2483 $self->deactivate;
2110 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2111 $self->clear; 2485 $self->clear;
2112}
2113
2114sub reset_at {
2115 my ($self) = @_;
2116
2117 # TODO: safety, remove and allow resettable per-player maps
2118 return 1e99 if $self->{deny_reset};
2119
2120 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2121 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2122
2123 $time + $to
2124}
2125
2126sub should_reset {
2127 my ($self) = @_;
2128
2129 $self->reset_at <= $cf::RUNTIME
2130}
2131
2132sub reset {
2133 my ($self) = @_;
2134
2135 my $lock = cf::lock_acquire "map_data:$self->{path}";
2136
2137 return if $self->players;
2138
2139 warn "resetting map ", $self->path;
2140
2141 $self->in_memory (cf::MAP_SWAPPED);
2142
2143 # need to save uniques path
2144 unless ($self->{deny_save}) {
2145 my $uniq = $self->uniq_path; utf8::encode $uniq;
2146
2147 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2148 if $uniq;
2149 }
2150
2151 delete $cf::MAP{$self->path};
2152
2153 $self->deactivate;
2154 $_->clear_links_to ($self) for values %cf::MAP;
2155 $self->clear;
2156 2486
2157 $self->unlink_save; 2487 $self->unlink_save;
2158 $self->destroy; 2488 $self->destroy;
2159} 2489}
2160 2490
2168 2498
2169 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2170 2500
2171 $self->unlink_save; 2501 $self->unlink_save;
2172 2502
2173 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2174 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2175 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2176 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2177 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2178 2508
2227 2557
2228sub unique_maps() { 2558sub unique_maps() {
2229 [ 2559 [
2230 map { 2560 map {
2231 utf8::decode $_; 2561 utf8::decode $_;
2232 /\.map$/ 2562 s/\.map$//; # TODO future compatibility hack
2563 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2564 ? ()
2233 ? normalise $_ 2565 : normalise $_
2234 : ()
2235 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2236 ] 2567 ]
2237} 2568}
2238 2569
2239package 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}
2240 2601
2241=back 2602=back
2242 2603
2243=head3 cf::object 2604=head3 cf::object
2244 2605
2248 2609
2249=over 4 2610=over 4
2250 2611
2251=item $ob->inv_recursive 2612=item $ob->inv_recursive
2252 2613
2253Returns 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.
2254 2616
2255=cut 2617=cut
2256 2618
2257sub inv_recursive_; 2619sub inv_recursive_;
2258sub inv_recursive_ { 2620sub inv_recursive_ {
2263 inv_recursive_ inv $_[0] 2625 inv_recursive_ inv $_[0]
2264} 2626}
2265 2627
2266=item $ref = $ob->ref 2628=item $ref = $ob->ref
2267 2629
2268creates 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.
2269 2631
2270=item $ob = cf::object::deref ($refstring) 2632=item $ob = cf::object::deref ($refstring)
2271 2633
2272returns 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,
2273even if the object actually exists. May block. 2635even if the object actually exists. May block.
2275=cut 2637=cut
2276 2638
2277sub deref { 2639sub deref {
2278 my ($ref) = @_; 2640 my ($ref) = @_;
2279 2641
2280 # temporary compatibility#TODO#remove
2281 $ref =~ s{^<}{player/<};
2282
2283 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2642 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2284 my ($uuid, $name) = ($1, $2); 2643 my ($uuid, $name) = ($1, $2);
2285 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2644 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2286 or return; 2645 or return;
2287 $pl->ob->uuid eq $uuid 2646 $pl->ob->uuid eq $uuid
2288 or return; 2647 or return;
2308can 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
2309dialogue with the given NPC character. 2668dialogue with the given NPC character.
2310 2669
2311=cut 2670=cut
2312 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
2313# rough implementation of a future "reply" method that works 2686# rough implementation of a future "reply" method that works
2314# with dialog boxes. 2687# with dialog boxes.
2315#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
2316sub cf::object::player::reply($$$;$) { 2689sub cf::object::player::reply($$$;$) {
2317 my ($self, $npc, $msg, $flags) = @_; 2690 my ($self, $npc, $msg, $flags) = @_;
2328 my $dialog = $pl->{npc_dialog}; 2701 my $dialog = $pl->{npc_dialog};
2329 $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));
2330 2703
2331 } else { 2704 } else {
2332 $msg = $npc->name . " says: $msg" if $npc; 2705 $msg = $npc->name . " says: $msg" if $npc;
2333 $self->message ($msg, $flags); 2706 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2334 } 2707 }
2335 } 2708 }
2336} 2709}
2337 2710
2338=item $object->send_msg ($channel, $msg, $color, [extra...]) 2711=item $object->send_msg ($channel, $msg, $color, [extra...])
2363 2736
2364=item $player_object->enter_link 2737=item $player_object->enter_link
2365 2738
2366Freezes 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}>).
2367 2740
2368The 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.
2369I<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.
2370 2745
2371Will never block. 2746Will never block.
2372 2747
2373=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2374 2749
2394sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2395 my ($self) = @_; 2770 my ($self) = @_;
2396 2771
2397 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2398 2773
2774 ++$self->{_link_recursion};
2775
2399 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2400 2777
2401 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2402 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2403 2780
2404 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2405} 2782}
2406 2783
2407sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2408 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2409 2786
2426 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2427 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2428 2805
2429 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2430 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2431 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2432 2809
2433 $map->load; 2810 $map->load;
2434 $map->load_neighbours;
2435 2811
2436 return unless $self->contr->active; 2812 return unless $self->contr->active;
2437 $self->activate_recursive;
2438 2813
2439 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2440 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2441} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2442 2821
2822}
2823
2443=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)]])
2444 2825
2445Moves 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
2446her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2447that 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
2448the 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
2449be called at the end of this process. 2830be called at the end of this process.
2450 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
2451=cut 2835=cut
2452 2836
2453our $GOTOGEN; 2837our $GOTOGEN;
2454 2838
2455sub cf::object::player::goto { 2839sub cf::object::player::goto {
2456 my ($self, $path, $x, $y, $check, $done) = @_; 2840 my ($self, $path, $x, $y, $check, $done) = @_;
2457 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
2458 # 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
2459 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2460 2850
2461 $self->enter_link; 2851 $self->enter_link;
2462 2852
2463 (async { 2853 (async {
2854 $Coro::current->{desc} = "player::goto $path $x $y";
2855
2464 # *tag paths override both path and x|y 2856 # *tag paths override both path and x|y
2465 if ($path =~ /^\*(.*)$/) { 2857 if ($path =~ /^\*(.*)$/) {
2466 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2858 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2467 my $ob = $obs[rand @obs]; 2859 my $ob = $obs[rand @obs];
2468 2860
2479 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2480 } 2872 }
2481 } 2873 }
2482 2874
2483 my $map = eval { 2875 my $map = eval {
2484 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2485 2877
2486 if ($map) { 2878 if ($map) {
2487 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2488 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2489 } else { 2881 } else {
2490 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2882 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2491 } 2883 }
2492 2884
2493 $map 2885 $map
2501 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2502 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2503 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2504 } 2896 }
2505 2897
2506 $done->() if $done; 2898 $done->($self) if $done;
2507 })->prio (1); 2899 })->prio (1);
2508} 2900}
2509 2901
2510=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2511 2903
2531} 2923}
2532 2924
2533sub prepare_random_map { 2925sub prepare_random_map {
2534 my ($exit) = @_; 2926 my ($exit) = @_;
2535 2927
2536 my $guard = cf::lock_acquire "exit_prepare:$exit";
2537
2538 # all this does is basically replace the /! path by 2928 # all this does is basically replace the /! path by
2539 # a new random map path (?random/...) with a seed 2929 # a new random map path (?random/...) with a seed
2540 # that depends on the exit object 2930 # that depends on the exit object
2541 2931
2542 my $rmp = parse_random_map_params $exit->msg; 2932 my $rmp = parse_random_map_params $exit->msg;
2544 if ($exit->map) { 2934 if ($exit->map) {
2545 $rmp->{region} = $exit->region->name; 2935 $rmp->{region} = $exit->region->name;
2546 $rmp->{origin_map} = $exit->map->path; 2936 $rmp->{origin_map} = $exit->map->path;
2547 $rmp->{origin_x} = $exit->x; 2937 $rmp->{origin_x} = $exit->x;
2548 $rmp->{origin_y} = $exit->y; 2938 $rmp->{origin_y} = $exit->y;
2939
2940 $exit->map->touch;
2549 } 2941 }
2550 2942
2551 $rmp->{random_seed} ||= $exit->random_seed; 2943 $rmp->{random_seed} ||= $exit->random_seed;
2552 2944
2553 my $data = cf::to_json $rmp; 2945 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2554 my $md5 = Digest::MD5::md5_hex $data; 2946 my $md5 = Digest::MD5::md5_hex $data;
2555 my $meta = "$RANDOMDIR/$md5.meta"; 2947 my $meta = "$RANDOMDIR/$md5.meta";
2556 2948
2557 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2949 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2558 aio_write $fh, 0, (length $data), $data, 0; 2950 aio_write $fh, 0, (length $data), $data, 0;
2559 undef $fh; 2951 undef $fh;
2560 aio_rename "$meta~", $meta; 2952 aio_rename "$meta~", $meta;
2561 2953
2954 my $slaying = "?random/$md5";
2955
2956 if ($exit->valid) {
2562 $exit->slaying ("?random/$md5"); 2957 $exit->slaying ("?random/$md5");
2563 $exit->msg (undef); 2958 $exit->msg (undef);
2959 }
2564 } 2960 }
2565} 2961}
2566 2962
2567sub cf::object::player::enter_exit { 2963sub cf::object::player::enter_exit {
2568 my ($self, $exit) = @_; 2964 my ($self, $exit) = @_;
2569 2965
2570 return unless $self->type == cf::PLAYER; 2966 return unless $self->type == cf::PLAYER;
2571 2967
2572 if ($exit->slaying eq "/!") {
2573 #TODO: this should de-fi-ni-te-ly not be a sync-job
2574 # the problem is that $exit might not survive long enough
2575 # so it needs to be done right now, right here
2576 cf::sync_job { prepare_random_map $exit };
2577 }
2578
2579 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2580 my $hp = $exit->stats->hp;
2581 my $sp = $exit->stats->sp;
2582
2583 $self->enter_link; 2968 $self->enter_link;
2584 2969
2585 # if exit is damned, update players death & WoR home-position
2586 $self->contr->savebed ($slaying, $hp, $sp)
2587 if $exit->flag (FLAG_DAMNED);
2588
2589 (async { 2970 (async {
2590 $self->deactivate_recursive; # just to be sure 2971 $Coro::current->{desc} = "enter_exit";
2972
2591 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
2592 $self->goto ($slaying, $hp, $sp); 3003 $self->goto ($map, $x, $y);
2593 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
2594 1; 3009 1
2595 }) { 3010 }) {
2596 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2597 . "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. "
2598 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2599 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2600 3015
2601 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2602 $self->leave_link; 3017 $self->leave_link;
2603 } 3018 }
2604 })->prio (1); 3019 })->prio (1);
2605} 3020}
2606 3021
2618sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2619 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2620 3035
2621 utf8::encode $text; 3036 utf8::encode $text;
2622 $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);
2623} 3063}
2624 3064
2625=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2626 3066
2627Send 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
2629the 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
2630the message unless the client supports the msg packet. 3070the message unless the client supports the msg packet.
2631 3071
2632=cut 3072=cut
2633 3073
3074# non-persistent channels (usually the info channel)
2634our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2635 "c/identify" => { 3082 "c/identify" => {
2636 id => "identify", 3083 id => "infobox",
2637 title => "Identify", 3084 title => "Identify",
2638 reply => undef, 3085 reply => undef,
2639 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2640 }, 3087 },
2641 "c/examine" => { 3088 "c/examine" => {
2642 id => "examine", 3089 id => "infobox",
2643 title => "Examine", 3090 title => "Examine",
2644 reply => undef, 3091 reply => undef,
2645 tooltip => "Signs and other items you examined", 3092 tooltip => "Signs and other items you examined",
2646 }, 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,
2647); 3186);
2648 3187
2649sub cf::client::send_msg { 3188sub cf::client::send_msg {
2650 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2651 3190
2652 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2653 3193
2654 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2655 3195
2656 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2657 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 3197 if ($CHANNEL{$channel}) {
3198 $channel = $CHANNEL{$channel};
2658 3199
3200 $self->ext_msg (channel_info => $channel);
3201 $channel = $channel->{id};
3202
2659 if (ref $channel) { 3203 } elsif (ref $channel) {
2660 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2661 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2662 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2663 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2664 if $self->can_msg;
2665 } 3208 }
2666 3209
2667 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2668 } 3211 }
2669 3212
2670 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2671 3214
2672 if ($self->can_msg) {
2673 # default colour, mask it out 3215 # default colour, mask it out
2674 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2675 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2676 3218
2677 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2678 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2679 } else { 3222 );
2680 if ($color >= 0) {
2681 # replace some tags by gcfclient-compatible ones
2682 for ($msg) {
2683 1 while
2684 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2685 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2686 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2687 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2688 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2689 }
2690 3223
2691 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2692
2693 utf8::encode $msg;
2694
2695 if (0 && $msg =~ /\[/) {
2696 # COMMAND/INFO
2697 $self->send_packet ("drawextinfo $color 10 8 $msg")
2698 } else {
2699 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2700 $self->send_packet ("drawinfo $color $msg")
2701 }
2702 }
2703 }
2704} 3225}
2705 3226
2706=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2707 3228
2708Sends an ext event to the client. 3229Sends an ext event to the client.
2711 3232
2712sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2713 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2714 3235
2715 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2716 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2717 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2718 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2719 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2720 } 3241 }
2721} 3242}
2722 3243
2723=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2724 3245
2727=cut 3248=cut
2728 3249
2729sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2730 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2731 3252
2732 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2733 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2734 } elsif ($self->extcmd == 1) {
2735 #TODO: version 1, remove
2736 unshift @msg, msgtype => "reply", msgid => $id;
2737 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2738 }
2739} 3256}
2740 3257
2741=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2742 3259
2743Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
2798 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
2799 3316
2800 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2801 3318
2802 if (ref $msg) { 3319 if (ref $msg) {
2803 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2804 "ARRAY" eq ref $msg
2805 ? @$msg
2806 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2807 3321
2808 my @reply; 3322 my @reply;
2809 3323
2810 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
2811 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
2813 3327
2814 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
2815 if $reply; 3329 if $reply;
2816 3330
2817 } else { 3331 } else {
2818 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";
2819 } 3333 }
2820 3334
2821 cf::override; 3335 cf::override;
2822 }, 3336 },
2823); 3337);
2843 3357
2844 $coro 3358 $coro
2845} 3359}
2846 3360
2847cf::client->attach ( 3361cf::client->attach (
2848 on_destroy => sub { 3362 on_client_destroy => sub {
2849 my ($ns) = @_; 3363 my ($ns) = @_;
2850 3364
2851 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2852 }, 3366 },
2853); 3367);
2869our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
2870 3384
2871$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
2872 3386
2873$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
2874 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
2875 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
2876 sort time 3390 sort time
2877)); 3391));
2878 3392
2879# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
2881=pod 3395=pod
2882 3396
2883The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
2884 3398
2885 cf::object 3399 cf::object
2886 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
2887 insert remove name archname title slaying race decrease_ob_nr 3401 insert remove name archname title slaying race decrease split
3402 value
2888 3403
2889 cf::object::player 3404 cf::object::player
2890 player 3405 player
2891 3406
2892 cf::player 3407 cf::player
2897 3412
2898=cut 3413=cut
2899 3414
2900for ( 3415for (
2901 ["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
2902 insert remove inv name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
2903 decrease_ob_nr)], 3418 decrease split destroy change_exp value msg lore send_msg)],
2904 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
2905 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
2906 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
2907) { 3422) {
2908 no strict 'refs';
2909 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
2910 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2911 for @funs; 3425 for @funs;
2912} 3426}
2913 3427
2928 3442
2929 my $qcode = $code; 3443 my $qcode = $code;
2930 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2931 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
2932 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
2933 local $_; 3450 local $_;
2934 local @safe::cf::_safe_eval_args = values %vars;
2935 3451
2936 my $eval = 3452 my $eval =
2937 "do {\n" 3453 "do {\n"
2938 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2939 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
2940 . $code 3456 . $code
2941 . "\n}" 3457 . "\n}"
2942 ; 3458 ;
2943 3459
3460 if ($CFG{safe_eval}) {
2944 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
2945 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2946 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 }
2947 3469
2948 if ($@) { 3470 if ($@) {
2949 warn "$@"; 3471 warn "$@",
2950 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
2951 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
2952 } 3474 }
2953 3475
2954 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
2955} 3477}
2956 3478
2970=cut 3492=cut
2971 3493
2972sub register_script_function { 3494sub register_script_function {
2973 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
2974 3496
2975 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
2976 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
2977} 3499}
2978 3500
2979=back 3501=back
2980 3502
2981=cut 3503=cut
2990 # for this (global event?) 3512 # for this (global event?)
2991 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
2992 3514
2993 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2994 3516
2995 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
2996 3518
2997 my $facedata; 3519 my $facedata = decode_storable load_file $path;
2998 0 < aio_load $path, $facedata
2999 or die "$path: $!";
3000
3001 $facedata = Coro::Storable::thaw $facedata;
3002 3520
3003 $facedata->{version} == 2 3521 $facedata->{version} == 2
3004 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3005 3523
3006 # patch in the exptable 3524 # patch in the exptable
3525 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3007 $facedata->{resource}{"res/exp_table"} = { 3526 $facedata->{resource}{"res/exp_table"} = {
3008 type => FT_RSRC, 3527 type => FT_RSRC,
3009 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3528 data => $exp_table,
3529 hash => (Digest::MD5::md5 $exp_table),
3010 }; 3530 };
3011 cf::cede_to_tick; 3531 cf::cede_to_tick;
3012 3532
3013 { 3533 {
3014 my $faces = $facedata->{faceinfo}; 3534 my $faces = $facedata->{faceinfo};
3015 3535
3016 while (my ($face, $info) = each %$faces) { 3536 while (my ($face, $info) = each %$faces) {
3017 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3537 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3538
3018 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3019 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3020 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3021 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3542 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3543 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3022 3544
3023 cf::cede_to_tick; 3545 cf::cede_to_tick;
3024 } 3546 }
3025 3547
3026 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
3027 next unless $info->{smooth}; 3549 next unless $info->{smooth};
3550
3028 my $idx = cf::face::find $face 3551 my $idx = cf::face::find $face
3029 or next; 3552 or next;
3553
3030 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3031 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3032 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3033 } else { 3557 } else {
3034 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3035 } 3559 }
3036 3560
3037 cf::cede_to_tick; 3561 cf::cede_to_tick;
3038 } 3562 }
3039 } 3563 }
3048 3572
3049 cf::anim::invalidate_all; # d'oh 3573 cf::anim::invalidate_all; # d'oh
3050 } 3574 }
3051 3575
3052 { 3576 {
3053 # TODO: for gcfclient pleasure, we should give resources
3054 # that gcfclient doesn't grok a >10000 face index.
3055 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3056 3578
3057 my $soundconf = delete $res->{"res/sound.conf"};
3058
3059 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3580 if (defined (my $type = $info->{type})) {
3581 # TODO: different hash - must free and use new index, or cache ixface data queue
3060 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3061 my $data;
3062 3583
3063 if ($info->{type} & 1) { 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3064 # prepend meta info 3585 cf::face::set_type $idx, $type;
3065 3586 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3066 my $meta = $enc->encode ({
3067 name => $name,
3068 %{ $info->{meta} || {} },
3069 });
3070
3071 $data = pack "(w/a*)*", $meta, $info->{data};
3072 } else { 3587 } else {
3073 $data = $info->{data}; 3588# $RESOURCE{$name} = $info; # unused
3074 } 3589 }
3075 3590
3076 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3077 cf::face::set_type $idx, $info->{type};
3078
3079 cf::cede_to_tick; 3591 cf::cede_to_tick;
3080 } 3592 }
3081
3082 if ($soundconf) {
3083 $soundconf = $enc->decode (delete $soundconf->{data});
3084
3085 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3086 my $sound = $soundconf->{compat}[$_]
3087 or next;
3088
3089 my $face = cf::face::find "sound/$sound->[1]";
3090 cf::sound::set $sound->[0] => $face;
3091 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3092 }
3093
3094 while (my ($k, $v) = each %{$soundconf->{event}}) {
3095 my $face = cf::face::find "sound/$v";
3096 cf::sound::set $k => $face;
3097 }
3098 }
3099 } 3593 }
3594
3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3100 3596
3101 1 3597 1
3102} 3598}
3103 3599
3104register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3106 3602
3107 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
3108 $ns->fx_want ($k, $v); 3604 $ns->fx_want ($k, $v);
3109 } 3605 }
3110}; 3606};
3607
3608sub load_resource_file($) {
3609 my $guard = lock_acquire "load_resource_file";
3610
3611 my $status = load_resource_file_ $_[0];
3612 get_slot 0.1, 100;
3613 cf::arch::commit_load;
3614
3615 $status
3616}
3111 3617
3112sub reload_regions { 3618sub reload_regions {
3113 # HACK to clear player env face cache, we need some signal framework 3619 # HACK to clear player env face cache, we need some signal framework
3114 # for this (global event?) 3620 # for this (global event?)
3115 %ext::player_env::MUSIC_FACE_CACHE = (); 3621 %ext::player_env::MUSIC_FACE_CACHE = ();
3129} 3635}
3130 3636
3131sub reload_archetypes { 3637sub reload_archetypes {
3132 load_resource_file "$DATADIR/archetypes" 3638 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n"; 3639 or die "unable to load archetypes\n";
3134 #d# NEED to laod twice to resolve forward references
3135 # this really needs to be done in an extra post-pass
3136 # (which needs to be synchronous, so solve it differently)
3137 load_resource_file "$DATADIR/archetypes"
3138 or die "unable to load archetypes\n";
3139} 3640}
3140 3641
3141sub reload_treasures { 3642sub reload_treasures {
3142 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3143 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3144} 3645}
3145 3646
3647sub reload_sound {
3648 trace "loading sound config from $DATADIR/sound\n";
3649
3650 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3651
3652 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3653 my $sound = $soundconf->{compat}[$_]
3654 or next;
3655
3656 my $face = cf::face::find "sound/$sound->[1]";
3657 cf::sound::set $sound->[0] => $face;
3658 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3659 }
3660
3661 while (my ($k, $v) = each %{$soundconf->{event}}) {
3662 my $face = cf::face::find "sound/$v";
3663 cf::sound::set $k => $face;
3664 }
3665}
3666
3146sub reload_resources { 3667sub reload_resources {
3147 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3148 3669
3670 reload_exp_table;
3671 reload_materials;
3672 reload_facedata;
3673 reload_sound;
3674 reload_archetypes;
3149 reload_regions; 3675 reload_regions;
3150 reload_facedata;
3151 #reload_archetypes;#d#
3152 reload_archetypes;
3153 reload_treasures; 3676 reload_treasures;
3154 3677
3155 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3156}
3157
3158sub init {
3159 reload_resources;
3160} 3679}
3161 3680
3162sub reload_config { 3681sub reload_config {
3163 open my $fh, "<:utf8", "$CONFDIR/config" 3682 trace "reloading config file...\n";
3164 or return;
3165 3683
3166 local $/; 3684 my $config = load_file "$CONFDIR/config";
3167 *CFG = YAML::Syck::Load <$fh>; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3168 3687
3169 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3170 3689
3171 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3690 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3172 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3691 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3173 3692
3174 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
3178 }; 3697 };
3179 warn $@ if $@; 3698 warn $@ if $@;
3180 } 3699 }
3181} 3700}
3182 3701
3702sub pidfile() {
3703 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3704 or die "$PIDFILE: $!";
3705 flock $fh, &Fcntl::LOCK_EX
3706 or die "$PIDFILE: flock: $!";
3707 $fh
3708}
3709
3710# make sure only one server instance is running at any one time
3711sub atomic {
3712 my $fh = pidfile;
3713
3714 my $pid = <$fh>;
3715 kill 9, $pid if $pid > 0;
3716
3717 seek $fh, 0, 0;
3718 print $fh $$;
3719}
3720
3721sub main_loop {
3722 trace "EV::loop starting\n";
3723 if (1) {
3724 EV::loop;
3725 }
3726 trace "EV::loop returned\n";
3727 goto &main_loop unless $REALLY_UNLOOP;
3728}
3729
3183sub main { 3730sub main {
3731 cf::init_globals; # initialise logging
3732
3733 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3734 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3735 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3736 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3737
3738 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3739
3184 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3185 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
3186 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3742 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3187 (async { 3743 (async {
3188 Event::one_event; 3744 $Coro::current->{desc} = "IDLE BUG HANDLER";
3745 EV::loop EV::LOOP_ONESHOT;
3189 })->prio (Coro::PRIO_MAX); 3746 })->prio (Coro::PRIO_MAX);
3190 }; 3747 };
3191 3748
3749 evthread_start IO::AIO::poll_fileno;
3750
3751 cf::sync_job {
3752 cf::incloader::init ();
3753
3754 cf::init_anim;
3755 cf::init_attackmess;
3756 cf::init_dynamic;
3757
3758 cf::load_settings;
3759
3760 reload_resources;
3192 reload_config; 3761 reload_config;
3193 db_init; 3762 db_init;
3763
3764 cf::init_uuid;
3765 cf::init_signals;
3766 cf::init_skills;
3767
3768 cf::init_beforeplay;
3769
3770 atomic;
3771
3194 load_extensions; 3772 load_extensions;
3195 3773
3196 $TICK_WATCHER->start; 3774 utime time, time, $RUNTIMEFILE;
3197 Event::loop; 3775
3776 # no (long-running) fork's whatsoever before this point(!)
3777 use POSIX ();
3778 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3779
3780 cf::_post_init 0;
3781 };
3782
3783 cf::object::thawer::errors_are_fatal 0;
3784 info "parse errors in files are no longer fatal from this point on.\n";
3785
3786 AE::postpone {
3787 undef &main; # free gobs of memory :)
3788 };
3789
3790 goto &main_loop;
3198} 3791}
3199 3792
3200############################################################################# 3793#############################################################################
3201# initialisation and cleanup 3794# initialisation and cleanup
3202 3795
3203# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3204BEGIN { 3797BEGIN {
3798 our %SIGWATCHER = ();
3205 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3206 Event->signal ( 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3207 reentrant => 0,
3208 data => WF_AUTOCANCEL,
3209 signal => $signal,
3210 prio => 0,
3211 cb => sub {
3212 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3213 },
3214 ); 3802 };
3215 } 3803 }
3216} 3804}
3217 3805
3218sub write_runtime { 3806sub write_runtime_sync {
3219 my $runtime = "$LOCALDIR/runtime"; 3807 my $t0 = AE::time;
3220 3808
3221 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3222 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3223 3811
3224 IO::AIO::aio_utime $runtime, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3225 3813
3226 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3227 3815
3228 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3229 or return; 3817 or return;
3230 3818
3231 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3232 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3233 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
3243 aio_utime $fh, undef, undef; 3831 aio_utime $fh, undef, undef;
3244 3832
3245 close $fh 3833 close $fh
3246 or return; 3834 or return;
3247 3835
3248 aio_rename "$runtime~", $runtime 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3249 and return; 3837 and return;
3250 3838
3251 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3252 3840
3253 1 3841 1
3842}
3843
3844our $uuid_lock;
3845our $uuid_skip;
3846
3847sub write_uuid_sync($) {
3848 $uuid_skip ||= $_[0];
3849
3850 return if $uuid_lock;
3851 local $uuid_lock = 1;
3852
3853 my $uuid = "$LOCALDIR/uuid";
3854
3855 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3856 or return;
3857
3858 my $value = uuid_seq uuid_cur;
3859
3860 unless ($value) {
3861 info "cowardly refusing to write zero uuid value!\n";
3862 return;
3863 }
3864
3865 my $value = uuid_str $value + $uuid_skip;
3866 $uuid_skip = 0;
3867
3868 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3869 and return;
3870
3871 # always fsync - this file is important
3872 aio_fsync $fh
3873 and return;
3874
3875 close $fh
3876 or return;
3877
3878 aio_rename "$uuid~", $uuid
3879 and return;
3880
3881 trace "uuid file written ($value).\n";
3882
3883 1
3884
3885}
3886
3887sub write_uuid($$) {
3888 my ($skip, $sync) = @_;
3889
3890 $sync ? write_uuid_sync $skip
3891 : async { write_uuid_sync $skip };
3254} 3892}
3255 3893
3256sub emergency_save() { 3894sub emergency_save() {
3257 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3258 3896
3259 warn "enter emergency perl save\n"; 3897 info "emergency_perl_save: enter\n";
3898
3899 # this is a trade-off: we want to be very quick here, so
3900 # save all maps without fsync, and later call a global sync
3901 # (which in turn might be very very slow)
3902 local $USE_FSYNC = 0;
3260 3903
3261 cf::sync_job { 3904 cf::sync_job {
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3262 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3263 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3264 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3265 warn "begin emergency player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3266 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3267 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3268 $pl->valid or next; 3913 $pl->valid or next;
3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3269 $pl->save; 3915 $pl->save;
3270 } 3916 }
3271 warn "end emergency player save\n"; 3917 info "emergency_perl_save: end player save\n";
3272 3918
3273 warn "begin emergency map save\n"; 3919 cf::write_runtime_sync; # external watchdog should not bark
3920
3921 info "emergency_perl_save: begin map save\n";
3274 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3275 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3276 $map->valid or next; 3924 $map->valid or next;
3277 $map->save; 3925 $map->save;
3278 } 3926 }
3279 warn "end emergency map save\n"; 3927 info "emergency_perl_save: end map save\n";
3280 3928
3281 warn "begin emergency database checkpoint\n"; 3929 cf::write_runtime_sync; # external watchdog should not bark
3930
3931 info "emergency_perl_save: begin database checkpoint\n";
3282 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3283 warn "end emergency database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3934
3935 info "emergency_perl_save: begin write uuid\n";
3936 write_uuid_sync 1;
3937 info "emergency_perl_save: end write uuid\n";
3938
3939 cf::write_runtime_sync; # external watchdog should not bark
3940
3941 trace "emergency_perl_save: syncing database to disk";
3942 BDB::db_env_txn_checkpoint $DB_ENV;
3943
3944 info "emergency_perl_save: starting sync\n";
3945 IO::AIO::aio_sync sub {
3946 info "emergency_perl_save: finished sync\n";
3947 };
3948
3949 cf::write_runtime_sync; # external watchdog should not bark
3950
3951 trace "emergency_perl_save: flushing outstanding aio requests";
3952 while (IO::AIO::nreqs || BDB::nreqs) {
3953 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3954 }
3955
3956 cf::write_runtime_sync; # external watchdog should not bark
3284 }; 3957 };
3285 3958
3286 warn "leave emergency perl save\n"; 3959 info "emergency_perl_save: leave\n";
3287} 3960}
3288 3961
3289sub post_cleanup { 3962sub post_cleanup {
3290 my ($make_core) = @_; 3963 my ($make_core) = @_;
3291 3964
3965 IO::AIO::flush;
3966
3292 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3293 if $make_core; 3968 if $make_core;
3969
3970 my $fh = pidfile;
3971 unlink $PIDFILE if <$fh> == $$;
3972}
3973
3974# a safer delete_package, copied from Symbol
3975sub clear_package($) {
3976 my $pkg = shift;
3977
3978 # expand to full symbol table name if needed
3979 unless ($pkg =~ /^main::.*::$/) {
3980 $pkg = "main$pkg" if $pkg =~ /^::/;
3981 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3982 $pkg .= '::' unless $pkg =~ /::$/;
3983 }
3984
3985 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3986 my $stem_symtab = *{$stem}{HASH};
3987
3988 defined $stem_symtab and exists $stem_symtab->{$leaf}
3989 or return;
3990
3991 # clear all symbols
3992 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3993 for my $name (keys %$leaf_symtab) {
3994 _gv_clear *{"$pkg$name"};
3995# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3996 }
3294} 3997}
3295 3998
3296sub do_reload_perl() { 3999sub do_reload_perl() {
3297 # can/must only be called in main 4000 # can/must only be called in main
3298 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3299 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3300 return; 4003 return;
3301 } 4004 }
3302 4005
3303 warn "reloading..."; 4006 return if $RELOAD++;
3304 4007
3305 warn "entering sync_job"; 4008 my $t1 = AE::time;
3306 4009
4010 while ($RELOAD) {
4011 cf::get_slot 0.1, -1, "reload_perl";
4012 info "perl_reload: reloading...";
4013
4014 trace "perl_reload: entering sync_job";
4015
3307 cf::sync_job { 4016 cf::sync_job {
3308 cf::write_runtime; # external watchdog should not bark
3309 cf::emergency_save; 4017 #cf::emergency_save;
3310 cf::write_runtime; # external watchdog should not bark
3311 4018
3312 warn "syncing database to disk";
3313 BDB::db_env_txn_checkpoint $DB_ENV;
3314
3315 # if anything goes wrong in here, we should simply crash as we already saved
3316
3317 warn "cancelling all WF_AUTOCANCEL watchers";
3318 for (Event::all_watchers) {
3319 $_->cancel if $_->data & WF_AUTOCANCEL;
3320 }
3321
3322 warn "flushing outstanding aio requests";
3323 for (;;) {
3324 BDB::flush;
3325 IO::AIO::flush;
3326 Coro::cede;
3327 last unless IO::AIO::nreqs || BDB::nreqs;
3328 warn "iterate...";
3329 }
3330
3331 ++$RELOAD;
3332
3333 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3334 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3335 %EXT_CORO = (); 4021 %EXT_CORO = ();
3336 4022
3337 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3338 %COMMAND = (); 4024 %COMMAND = ();
3339 4025
3340 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3341 %EXTCMD = (); 4027 %EXTCMD = ();
3342 %EXTICMD = (); 4028 %EXTICMD = ();
3343 4029
3344 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3345 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3346 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3347 4033
3348 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3349 eval { 4035 eval {
3350 $cb->($pkg); 4036 $cb->($pkg);
3351 1 4037 1
3352 } or warn "$pkg unloaded, but with errors: $@"; 4038 } or error "$pkg unloaded, but with errors: $@";
4039 }
4040
4041 trace "... clearing $pkg";
4042 clear_package $pkg;
3353 } 4043 }
3354 4044
3355 warn "... nuking $pkg";
3356 Symbol::delete_package $pkg;
3357 }
3358
3359 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3360 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3361 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3362 4048
3363 warn "... unloading $k"; 4049 trace "... unloading $k";
3364 delete $INC{$k}; 4050 delete $INC{$k};
3365 4051
3366 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3367 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3368 4054
3369 if (my $cb = $k->can ("unload_module")) { 4055 if (my $cb = $k->can ("unload_module")) {
3370 $cb->(); 4056 $cb->();
4057 }
4058
4059 clear_package $k;
3371 } 4060 }
3372 4061
3373 Symbol::delete_package $k;
3374 }
3375
3376 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3377 Symbol::delete_package "safe::$_" 4063 clear_package "safe::$_"
3378 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4064 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3379 4065
3380 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3381 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3382 delete $INC{"cf/pod.pm"}; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3383 4069
3384 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3385 # and global variables created in xs 4071 # and global variables created in xs
3386 #Symbol::delete_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3387 4073
3388 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3389 4075
3390 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3391 require cf; 4077 require cf;
3392 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4078 cf::_connect_to_perl_1;
3393 4079
3394 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3395 cf::reload_config; 4081 cf::reload_config;
3396 4082
3397 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3398 cf::load_extensions; 4084 cf::load_extensions;
3399 4085
4086 if ($REATTACH_ON_RELOAD) {
3400 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3401 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3402 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3403 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3404 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3405 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
4093 }
3406 4094
3407 warn "leaving sync_job"; 4095 cf::_post_init 1;
3408 4096
4097 trace "perl_reload: leaving sync_job";
4098
3409 1 4099 1
3410 } or do { 4100 } or do {
3411 warn $@; 4101 error $@;
3412 warn "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
3413 exit 1; 4103 };
4104
4105 --$RELOAD;
3414 }; 4106 }
3415 4107
3416 warn "reloaded"; 4108 $t1 = AE::time - $t1;
4109 info "perl_reload: completed in ${t1}s\n";
3417}; 4110};
3418 4111
3419our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3420 4113
3421sub reload_perl() { 4114sub reload_perl() {
3422 # doing reload synchronously and two reloads happen back-to-back, 4115 # doing reload synchronously and two reloads happen back-to-back,
3423 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3424 4117
3425 $RELOAD_WATCHER ||= Event->timer ( 4118 $RELOAD_WATCHER ||= cf::async {
3426 reentrant => 0, 4119 Coro::AIO::aio_wait cache_extensions;
3427 after => 0, 4120
3428 data => WF_AUTOCANCEL, 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3429 cb => sub {
3430 do_reload_perl; 4122 do_reload_perl;
3431 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
3432 }, 4124 };
3433 ); 4125 };
3434} 4126}
3435 4127
3436register_command "reload" => sub { 4128register_command "reload" => sub {
3437 my ($who, $arg) = @_; 4129 my ($who, $arg) = @_;
3438 4130
3439 if ($who->flag (FLAG_WIZ)) { 4131 if ($who->flag (FLAG_WIZ)) {
3440 $who->message ("reloading server."); 4132 $who->message ("reloading server.");
4133 async {
4134 $Coro::current->{desc} = "perl_reload";
3441 async { reload_perl }; 4135 reload_perl;
4136 };
3442 } 4137 }
3443}; 4138};
3444 4139
3445unshift @INC, $LIBDIR; 4140#############################################################################
3446 4141
3447my $bug_warning = 0; 4142my $bug_warning = 0;
3448 4143
3449our @WAIT_FOR_TICK;
3450our @WAIT_FOR_TICK_BEGIN;
3451
3452sub wait_for_tick { 4144sub wait_for_tick() {
3453 return unless $TICK_WATCHER->is_active; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3454 return if $Coro::current == $Coro::main;
3455 4146
3456 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3457 push @WAIT_FOR_TICK, $signal;
3458 $signal->wait;
3459} 4148}
3460 4149
3461sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3462 return unless $TICK_WATCHER->is_active; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3463 return if $Coro::current == $Coro::main;
3464 4152
3465 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3466 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3467 $signal->wait; 4155 $signal->wait;
3468} 4156}
3469 4157
3470$TICK_WATCHER = Event->timer ( 4158sub tick {
3471 reentrant => 0,
3472 parked => 1,
3473 prio => 0,
3474 at => $NEXT_TICK || $TICK,
3475 data => WF_AUTOCANCEL,
3476 cb => sub {
3477 if ($Coro::current != $Coro::main) { 4159 if ($Coro::current != $Coro::main) {
3478 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4160 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3479 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3480 return; 4162 return;
3481 } 4163 }
3482 4164
3483 $NOW = $tick_start = Event::time; 4165 cf::one_tick; # one server iteration
3484 4166
3485 cf::server_tick; # one server iteration 4167 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3486 4168
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 4170 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 4171 Coro::async_pool {
4172 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 4173 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3495 };
3496 } 4175 };
4176 }
3497 4177
3498 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3499 $sig->send; 4179 $sig->send;
3500 } 4180 }
3501 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3502 $sig->send;
3503 }
3504 4182
3505 $NOW = Event::time; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3506
3507 # if we are delayed by four ticks or more, skip them all
3508 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3509
3510 $TICK_WATCHER->at ($NEXT_TICK);
3511 $TICK_WATCHER->start;
3512
3513 $LOAD = ($NOW - $tick_start) / $TICK;
3514 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3515 4185
3516 _post_tick; 4186 if (0) {
4187 if ($NEXT_TICK) {
4188 my $jitter = $TICK_START - $NEXT_TICK;
4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4190 debug "jitter $JITTER\n";#d#
4191 }
3517 }, 4192 }
3518); 4193}
3519 4194
3520{ 4195{
4196 # configure BDB
4197
3521 BDB::min_parallel 8; 4198 BDB::min_parallel 16;
3522 BDB::max_poll_time $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3523 $BDB_POLL_WATCHER = Event->io ( 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3524 reentrant => 0,
3525 fd => BDB::poll_fileno,
3526 poll => 'r',
3527 prio => 0,
3528 data => WF_AUTOCANCEL,
3529 cb => \&BDB::poll_cb,
3530 );
3531
3532 BDB::set_sync_prepare {
3533 my $status;
3534 my $current = $Coro::current;
3535 (
3536 sub {
3537 $status = $!;
3538 $current->ready; undef $current;
3539 },
3540 sub {
3541 Coro::schedule while defined $current;
3542 $! = $status;
3543 },
3544 )
3545 };
3546 4201
3547 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3548 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3549 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3550 | BDB::LOG_AUTOREMOVE, 1); 4205 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4206 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3551 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 4207 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3552 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 4208 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3553 4209
3554 cf::sync_job { 4210 cf::sync_job {
3555 eval { 4211 eval {
3565 4221
3566 cf::cleanup "db_env_open(db): $@" if $@; 4222 cf::cleanup "db_env_open(db): $@" if $@;
3567 }; 4223 };
3568 } 4224 }
3569 4225
3570 $BDB_DEADLOCK_WATCHER = Event->timer ( 4226 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3571 after => 3,
3572 interval => 1,
3573 hard => 1,
3574 prio => 0,
3575 data => WF_AUTOCANCEL,
3576 cb => sub {
3577 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 4227 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3578 },
3579 ); 4228 };
3580 $BDB_CHECKPOINT_WATCHER = Event->timer ( 4229 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 after => 11,
3582 interval => 60,
3583 hard => 1,
3584 prio => 0,
3585 data => WF_AUTOCANCEL,
3586 cb => sub {
3587 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4230 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3588 },
3589 ); 4231 };
3590 $BDB_TRICKLE_WATCHER = Event->timer ( 4232 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3591 after => 5,
3592 interval => 10,
3593 hard => 1,
3594 prio => 0,
3595 data => WF_AUTOCANCEL,
3596 cb => sub {
3597 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4233 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3598 },
3599 ); 4234 };
3600} 4235}
3601 4236
3602{ 4237{
4238 # configure IO::AIO
4239
3603 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
3604
3605 undef $Coro::AIO::WATCHER;
3606 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
3607 $AIO_POLL_WATCHER = Event->io ( 4242 undef $AnyEvent::AIO::WATCHER;
3608 reentrant => 0,
3609 data => WF_AUTOCANCEL,
3610 fd => IO::AIO::poll_fileno,
3611 poll => 'r',
3612 prio => 6,
3613 cb => \&IO::AIO::poll_cb,
3614 );
3615} 4243}
3616 4244
3617my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
3618 4247
3619sub _log_backtrace { 4248sub _log_backtrace {
3620 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
3621 4250
3622 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
3623 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3624 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
3625 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
3626 ++$_log_backtrace; 4259 ++$_log_backtrace;
4260 my $perl_bt = Carp::longmess $msg;
3627 async { 4261 async {
4262 $Coro::current->{desc} = "abt $msg";
4263
3628 my @bt = fork_call { 4264 my @bt = fork_call {
3629 @addr = map { sprintf "%x", $_ } @addr; 4265 @addr = map { sprintf "%x", $_ } @addr;
3630 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4266 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3631 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4267 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3632 or die "addr2line: $!"; 4268 or die "addr2line: $!";
3640 } 4276 }
3641 4277
3642 @funcs 4278 @funcs
3643 }; 4279 };
3644 4280
3645 LOG llevInfo, "[ABT] $msg\n"; 4281 LOG llevInfo, "[ABT] $perl_bt\n";
4282 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3646 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
3647 --$_log_backtrace; 4284 --$_log_backtrace;
3648 }; 4285 };
3649 } else { 4286 } else {
3650 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
3651 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3652 } 4289 }
3653} 4290}
3654 4291
3655# load additional modules 4292# load additional modules
3656use cf::pod; 4293require "cf/$_.pm" for @EXTRA_MODULES;
4294cf::_connect_to_perl_2;
3657 4295
3658END { cf::emergency_save } 4296END { cf::emergency_save }
3659 4297
36601 42981
3661 4299

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines