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.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines