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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines