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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines