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.409 by root, Mon Jan 14 11:41:48 2008 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines