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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines