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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines