ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines