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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.582 by root, Fri Feb 3 03:01:45 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# <http://www.gnu.org/licenses/>.
18# 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';
246 cf::client cf::player 332 cf::client cf::player
247 cf::arch cf::living 333 cf::arch cf::living
248 cf::map cf::mapspace 334 cf::map cf::mapspace
249 cf::party cf::region 335 cf::party cf::region
250)) { 336)) {
251 no strict 'refs';
252 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 337 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
253} 338}
254 339
255$EV::DIED = sub { 340$EV::DIED = sub {
256 warn "error in event callback: @_"; 341 Carp::cluck "error in event callback: @_";
257}; 342};
343
344#############################################################################
345
346sub fork_call(&@);
347sub get_slot($;$$);
258 348
259############################################################################# 349#############################################################################
260 350
261=head2 UTILITY FUNCTIONS 351=head2 UTILITY FUNCTIONS
262 352
283 $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;
284 $d 374 $d
285 } || "[unable to dump $_[0]: '$@']"; 375 } || "[unable to dump $_[0]: '$@']";
286} 376}
287 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
288=item $ref = cf::decode_json $json 430=item $ref = cf::decode_json $json
289 431
290Converts a JSON string into the corresponding perl data structure. 432Converts a JSON string into the corresponding perl data structure.
291 433
292=item $json = cf::encode_json $ref 434=item $json = cf::encode_json $ref
298our $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
299 441
300sub encode_json($) { $json_coder->encode ($_[0]) } 442sub encode_json($) { $json_coder->encode ($_[0]) }
301sub decode_json($) { $json_coder->decode ($_[0]) } 443sub decode_json($) { $json_coder->decode ($_[0]) }
302 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
303=item cf::lock_wait $string 507=item cf::lock_wait $string
304 508
305Wait until the given lock is available. See cf::lock_acquire. 509Wait until the given lock is available. See cf::lock_acquire.
306 510
307=item my $lock = cf::lock_acquire $string 511=item my $lock = cf::lock_acquire $string
308 512
309Wait 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
310a 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,
311for example when the coroutine gets canceled), the lock is automatically 515for example when the coroutine gets canceled), the lock is automatically
312returned. 516returned.
313 517
314Locks 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
315deadlocked coro. 519deadlocked coro.
321 525
322Return 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.
323 527
324=cut 528=cut
325 529
326our %LOCK; 530our $LOCKS = new Coro::SemaphoreSet;
327our %LOCKER;#d#
328 531
329sub lock_wait($) { 532sub lock_wait($) {
330 my ($key) = @_; 533 $LOCKS->wait ($_[0]);
331
332 if ($LOCKER{$key} == $Coro::current) {#d#
333 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
334 return;#d#
335 }#d#
336
337 # wait for lock, if any
338 while ($LOCK{$key}) {
339 push @{ $LOCK{$key} }, $Coro::current;
340 Coro::schedule;
341 }
342} 534}
343 535
344sub lock_acquire($) { 536sub lock_acquire($) {
345 my ($key) = @_; 537 $LOCKS->guard ($_[0])
346
347 # wait, to be sure we are not locked
348 lock_wait $key;
349
350 $LOCK{$key} = [];
351 $LOCKER{$key} = $Coro::current;#d#
352
353 Coro::guard {
354 delete $LOCKER{$key};#d#
355 # wake up all waiters, to be on the safe side
356 $_->ready for @{ delete $LOCK{$key} };
357 }
358} 538}
359 539
360sub lock_active($) { 540sub lock_active($) {
361 my ($key) = @_; 541 $LOCKS->count ($_[0]) < 1
362
363 ! ! $LOCK{$key}
364} 542}
365 543
366sub freeze_mainloop { 544sub freeze_mainloop {
367 tick_inhibit_inc; 545 tick_inhibit_inc;
368 546
369 Coro::guard \&tick_inhibit_dec; 547 &Guard::guard (\&tick_inhibit_dec);
370} 548}
371 549
372=item cf::periodic $interval, $cb 550=item cf::periodic $interval, $cb
373 551
374Like 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
375get spread over timer. 553get spread over time.
376 554
377=cut 555=cut
378 556
379sub periodic($$) { 557sub periodic($$) {
380 my ($interval, $cb) = @_; 558 my ($interval, $cb) = @_;
384 EV::periodic $start, $interval, 0, $cb 562 EV::periodic $start, $interval, 0, $cb
385} 563}
386 564
387=item cf::get_slot $time[, $priority[, $name]] 565=item cf::get_slot $time[, $priority[, $name]]
388 566
389Allocate $time seconds of blocking CPU time at priority C<$priority>: 567Allocate $time seconds of blocking CPU time at priority C<$priority>
390This 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
391of 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.
392 574
393The 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
394used for statistical purposes and should identify the same time-class. 576used for statistical purposes and should identify the same time-class.
395 577
396Useful for short background jobs. 578Useful for short background jobs.
397 579
398=cut 580=cut
399 581
400our @SLOT_QUEUE; 582our @SLOT_QUEUE;
401our $SLOT_QUEUE; 583our $SLOT_QUEUE;
584our $SLOT_DECAY = 0.9;
402 585
403$SLOT_QUEUE->cancel if $SLOT_QUEUE; 586$SLOT_QUEUE->cancel if $SLOT_QUEUE;
404$SLOT_QUEUE = Coro::async { 587$SLOT_QUEUE = Coro::async {
405 $Coro::current->desc ("timeslot manager"); 588 $Coro::current->desc ("timeslot manager");
406 589
407 my $signal = new Coro::Signal; 590 my $signal = new Coro::Signal;
591 my $busy;
408 592
409 while () { 593 while () {
410 next_job: 594 next_job:
595
411 my $avail = cf::till_tick; 596 my $avail = cf::till_tick;
412 if ($avail > 0.01) { 597
413 for (0 .. $#SLOT_QUEUE) { 598 for (0 .. $#SLOT_QUEUE) {
414 if ($SLOT_QUEUE[$_][0] < $avail) { 599 if ($SLOT_QUEUE[$_][0] <= $avail) {
600 $busy = 0;
415 my $job = splice @SLOT_QUEUE, $_, 1, (); 601 my $job = splice @SLOT_QUEUE, $_, 1, ();
416 $job->[2]->send; 602 $job->[2]->send;
417 Coro::cede; 603 Coro::cede;
418 goto next_job; 604 goto next_job;
419 } 605 } else {
606 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
420 } 607 }
421 } 608 }
422 609
423 if (@SLOT_QUEUE) { 610 if (@SLOT_QUEUE) {
424 # 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
425 push @cf::WAIT_FOR_TICK, $signal; 612 $WAIT_FOR_TICK->wait;
426 $signal->wait;
427 } else { 613 } else {
614 $busy = 0;
428 Coro::schedule; 615 Coro::schedule;
429 } 616 }
430 } 617 }
431}; 618};
432 619
433sub get_slot($;$$) { 620sub get_slot($;$$) {
434 return if tick_inhibit || $Coro::current == $Coro::main; 621 return if tick_inhibit || $Coro::current == $Coro::main;
435 622
436 my ($time, $pri, $name) = @_; 623 my ($time, $pri, $name) = @_;
437 624
438 $time = $TICK * .6 if $time > $TICK * .6; 625 $time = clamp $time, 0.01, $TICK * .6;
626
439 my $sig = new Coro::Signal; 627 my $sig = new Coro::Signal;
440 628
441 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 629 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
442 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 630 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
443 $SLOT_QUEUE->ready; 631 $SLOT_QUEUE->ready;
469=cut 657=cut
470 658
471sub sync_job(&) { 659sub sync_job(&) {
472 my ($job) = @_; 660 my ($job) = @_;
473 661
474 if ($Coro::current == $Coro::main) { 662 if (in_main) {
475 my $time = EV::time; 663 my $time = AE::time;
476 664
477 # this is the main coro, too bad, we have to block 665 # this is the main coro, too bad, we have to block
478 # till the operation succeeds, freezing the server :/ 666 # till the operation succeeds, freezing the server :/
479 667
480 LOG llevError, Carp::longmess "sync job";#d# 668 #LOG llevError, Carp::longmess "sync job";#d#
481 669
482 my $freeze_guard = freeze_mainloop; 670 my $freeze_guard = freeze_mainloop;
483 671
484 my $busy = 1; 672 my $busy = 1;
485 my @res; 673 my @res;
486 674
487 (async { 675 (async {
488 $Coro::current->desc ("sync job coro"); 676 $Coro::current->desc ("sync job coro");
489 @res = eval { $job->() }; 677 @res = eval { $job->() };
490 warn $@ if $@; 678 error $@ if $@;
491 undef $busy; 679 undef $busy;
492 })->prio (Coro::PRIO_MAX); 680 })->prio (Coro::PRIO_MAX);
493 681
494 while ($busy) { 682 while ($busy) {
495 if (Coro::nready) { 683 if (Coro::nready) {
497 } else { 685 } else {
498 EV::loop EV::LOOP_ONESHOT; 686 EV::loop EV::LOOP_ONESHOT;
499 } 687 }
500 } 688 }
501 689
502 my $time = EV::time - $time; 690 my $time = AE::time - $time;
503 691
504 $TICK_START += $time; # do not account sync jobs to server load 692 $TICK_START += $time; # do not account sync jobs to server load
505 693
506 wantarray ? @res : $res[0] 694 wantarray ? @res : $res[0]
507 } else { 695 } else {
529 $EXT_CORO{$coro+0} = $coro; 717 $EXT_CORO{$coro+0} = $coro;
530 718
531 $coro 719 $coro
532} 720}
533 721
534=item fork_call { }, $args 722=item fork_call { }, @args
535 723
536Executes the given code block with the given arguments in a seperate 724Executes the given code block with the given arguments in a seperate
537process, returning the results. Everything must be serialisable with 725process, returning the results. Everything must be serialisable with
538Coro::Storable. May, of course, block. Note that the executed sub may 726Coro::Storable. May, of course, block. Note that the executed sub may
539never block itself or use any form of event handling. 727never block itself or use any form of event handling.
540 728
541=cut 729=cut
542 730
731sub post_fork {
732 reset_signals;
733}
734
543sub fork_call(&@) { 735sub fork_call(&@) {
544 my ($cb, @args) = @_; 736 my ($cb, @args) = @_;
545 737
546 # 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,
547 # otherwise perl prematurely frees the stuff :/ 739 # otherwise perl prematurely frees the stuff :/
548 # TODO: investigate and fix (likely this will be rather laborious) 740 # TODO: investigate and fix (likely this will be rather laborious)
549 741
550 my @res = Coro::Util::fork_eval { 742 my @res = Coro::Util::fork_eval {
551 reset_signals; 743 cf::post_fork;
552 &$cb 744 &$cb
553 }, @args; 745 } @args;
554 746
555 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 )
556} 759}
557 760
558=item $coin = coin_from_name $name 761=item $coin = coin_from_name $name
559 762
560=cut 763=cut
597within each server. 800within each server.
598 801
599=cut 802=cut
600 803
601sub db_table($) { 804sub db_table($) {
805 cf::error "db_get called from main context"
806 if $Coro::current == $Coro::main;
807
602 my ($name) = @_; 808 my ($name) = @_;
603 my $db = BDB::db_create $DB_ENV; 809 my $db = BDB::db_create $DB_ENV;
604 810
605 eval { 811 eval {
606 $db->set_flags (BDB::CHKSUM); 812 $db->set_flags (BDB::CHKSUM);
616} 822}
617 823
618our $DB; 824our $DB;
619 825
620sub db_init { 826sub db_init {
621 cf::sync_job {
622 $DB ||= db_table "db"; 827 $DB ||= db_table "db";
623 };
624} 828}
625 829
626sub db_get($$) { 830sub db_get($$) {
627 my $key = "$_[0]/$_[1]"; 831 my $key = "$_[0]/$_[1]";
628 832
629 cf::sync_job { 833 cf::error "db_get called from main context"
834 if $Coro::current == $Coro::main;
835
630 BDB::db_get $DB, undef, $key, my $data; 836 BDB::db_get $DB, undef, $key, my $data;
631 837
632 $! ? () 838 $! ? ()
633 : $data 839 : $data
634 }
635} 840}
636 841
637sub db_put($$$) { 842sub db_put($$$) {
638 BDB::dbreq_pri 4; 843 BDB::dbreq_pri 4;
639 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 844 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
667 872
668 my @data; 873 my @data;
669 my $md5; 874 my $md5;
670 875
671 for (0 .. $#$src) { 876 for (0 .. $#$src) {
672 0 <= aio_load $src->[$_], $data[$_] 877 $data[$_] = load_file $src->[$_];
673 or Carp::croak "$src->[$_]: $!";
674 } 878 }
675 879
676 # if processing is expensive, check 880 # if processing is expensive, check
677 # checksum first 881 # checksum first
678 if (1) { 882 if (1) {
695 899
696 my $t1 = Time::HiRes::time; 900 my $t1 = Time::HiRes::time;
697 my $data = $process->(\@data); 901 my $data = $process->(\@data);
698 my $t2 = Time::HiRes::time; 902 my $t2 = Time::HiRes::time;
699 903
700 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 904 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
701 905
702 db_put cache => "$id/data", $data; 906 db_put cache => "$id/data", $data;
703 db_put cache => "$id/md5" , $md5; 907 db_put cache => "$id/md5" , $md5;
704 db_put cache => "$id/meta", $meta; 908 db_put cache => "$id/meta", $meta;
705 909
715 919
716=cut 920=cut
717 921
718sub datalog($@) { 922sub datalog($@) {
719 my ($type, %kv) = @_; 923 my ($type, %kv) = @_;
720 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 924 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
721} 925}
722 926
723=back 927=back
724 928
725=cut 929=cut
726 930
727############################################################################# 931#############################################################################
728 932
729=head2 ATTACHABLE OBJECTS 933=head2 ATTACHABLE OBJECTS
730 934
731Many 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
732attach callbacks/event handlers (a collection of which is called an "attachment") 936attach callbacks/event handlers (a collection of which is called an "attachment")
733to it. All such attachable objects support the following methods. 937to it. All such attachable objects support the following methods.
734 938
735In 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>
736C<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
786=item cf::CLASS::attachment $name, ... 990=item cf::CLASS::attachment $name, ...
787 991
788Register an attachment by C<$name> through which attachable objects of the 992Register an attachment by C<$name> through which attachable objects of the
789given CLASS can refer to this attachment. 993given CLASS can refer to this attachment.
790 994
791Some classes such as crossfire maps and objects can specify attachments 995Some classes such as deliantra maps and objects can specify attachments
792that 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.
793 997
794These calls expect any number of the following handler/hook descriptions: 998These calls expect any number of the following handler/hook descriptions:
795 999
796=over 4 1000=over 4
920 1124
921 } elsif (exists $cb_id{$type}) { 1125 } elsif (exists $cb_id{$type}) {
922 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1126 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
923 1127
924 } elsif (ref $type) { 1128 } elsif (ref $type) {
925 warn "attaching objects not supported, ignoring.\n"; 1129 error "attaching objects not supported, ignoring.\n";
926 1130
927 } else { 1131 } else {
928 shift @arg; 1132 shift @arg;
929 warn "attach argument '$type' not supported, ignoring.\n"; 1133 error "attach argument '$type' not supported, ignoring.\n";
930 } 1134 }
931 } 1135 }
932} 1136}
933 1137
934sub _object_attach { 1138sub _object_attach {
944 _attach $registry, $klass, @attach; 1148 _attach $registry, $klass, @attach;
945 } 1149 }
946 1150
947 $obj->{$name} = \%arg; 1151 $obj->{$name} = \%arg;
948 } else { 1152 } else {
949 warn "object uses attachment '$name' which is not available, postponing.\n"; 1153 info "object uses attachment '$name' which is not available, postponing.\n";
950 } 1154 }
951 1155
952 $obj->{_attachment}{$name} = undef; 1156 $obj->{_attachment}{$name} = undef;
953} 1157}
954 1158
1013 1217
1014 for (@$callbacks) { 1218 for (@$callbacks) {
1015 eval { &{$_->[1]} }; 1219 eval { &{$_->[1]} };
1016 1220
1017 if ($@) { 1221 if ($@) {
1018 warn "$@";
1019 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1222 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1020 override; 1223 override;
1021 } 1224 }
1022 1225
1023 return 1 if $override; 1226 return 1 if $override;
1024 } 1227 }
1087 1290
1088sub reattach { 1291sub reattach {
1089 # basically do the same as instantiate, without calling instantiate 1292 # basically do the same as instantiate, without calling instantiate
1090 my ($obj) = @_; 1293 my ($obj) = @_;
1091 1294
1295 # no longer needed after getting rid of delete_package?
1092 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
1093 1297
1094 my $registry = $obj->registry; 1298 my $registry = $obj->registry;
1095 1299
1096 @$registry = (); 1300 @$registry = ();
1097 1301
1102 for (@$attach) { 1306 for (@$attach) {
1103 my ($klass, @attach) = @$_; 1307 my ($klass, @attach) = @$_;
1104 _attach $registry, $klass, @attach; 1308 _attach $registry, $klass, @attach;
1105 } 1309 }
1106 } else { 1310 } else {
1107 warn "object uses attachment '$name' that is not available, postponing.\n"; 1311 info "object uses attachment '$name' that is not available, postponing.\n";
1108 } 1312 }
1109 } 1313 }
1110} 1314}
1111 1315
1112cf::attachable->attach ( 1316cf::attachable->attach (
1139 my ($filename, $rdata, $objs) = @_; 1343 my ($filename, $rdata, $objs) = @_;
1140 1344
1141 sync_job { 1345 sync_job {
1142 if (length $$rdata) { 1346 if (length $$rdata) {
1143 utf8::decode (my $decname = $filename); 1347 utf8::decode (my $decname = $filename);
1144 warn sprintf "saving %s (%d,%d)\n", 1348 trace sprintf "saving %s (%d,%d)\n",
1145 $decname, length $$rdata, scalar @$objs; 1349 $decname, length $$rdata, scalar @$objs
1350 if $VERBOSE_IO;
1146 1351
1147 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1352 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1148 aio_chmod $fh, SAVE_MODE; 1353 aio_chmod $fh, SAVE_MODE;
1149 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1354 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1150 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 }
1151 aio_close $fh; 1359 aio_close $fh;
1152 1360
1153 if (@$objs) { 1361 if (@$objs) {
1154 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) {
1155 aio_chmod $fh, SAVE_MODE; 1363 aio_chmod $fh, SAVE_MODE;
1156 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1364 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1157 aio_write $fh, 0, (length $data), $data, 0; 1365 aio_write $fh, 0, (length $data), $data, 0;
1158 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 }
1159 aio_close $fh; 1370 aio_close $fh;
1160 aio_rename "$filename.pst~", "$filename.pst"; 1371 aio_rename "$filename.pst~", "$filename.pst";
1161 } 1372 }
1162 } else { 1373 } else {
1163 aio_unlink "$filename.pst"; 1374 aio_unlink "$filename.pst";
1164 } 1375 }
1165 1376
1166 aio_rename "$filename~", $filename; 1377 aio_rename "$filename~", $filename;
1378
1379 $filename =~ s%/[^/]+$%%;
1380 aio_pathsync $filename if $cf::USE_FSYNC;
1167 } else { 1381 } else {
1168 warn "FATAL: $filename~: $!\n"; 1382 error "unable to save objects: $filename~: $!\n";
1169 } 1383 }
1170 } else { 1384 } else {
1171 aio_unlink $filename; 1385 aio_unlink $filename;
1172 aio_unlink "$filename.pst"; 1386 aio_unlink "$filename.pst";
1173 } 1387 }
1197 my $st = eval { Coro::Storable::thaw $av }; 1411 my $st = eval { Coro::Storable::thaw $av };
1198 $av = $st->{objs}; 1412 $av = $st->{objs};
1199 } 1413 }
1200 1414
1201 utf8::decode (my $decname = $filename); 1415 utf8::decode (my $decname = $filename);
1202 warn sprintf "loading %s (%d,%d)\n", 1416 trace sprintf "loading %s (%d,%d)\n",
1203 $decname, length $data, scalar @{$av || []}; 1417 $decname, length $data, scalar @{$av || []}
1418 if $VERBOSE_IO;
1204 1419
1205 ($data, $av) 1420 ($data, $av)
1206} 1421}
1207 1422
1208=head2 COMMAND CALLBACKS 1423=head2 COMMAND CALLBACKS
1264 my ($name, $cb) = @_; 1479 my ($name, $cb) = @_;
1265 1480
1266 $EXTICMD{$name} = $cb; 1481 $EXTICMD{$name} = $cb;
1267} 1482}
1268 1483
1484use File::Glob ();
1485
1269cf::player->attach ( 1486cf::player->attach (
1270 on_command => sub { 1487 on_unknown_command => sub {
1271 my ($pl, $name, $params) = @_; 1488 my ($pl, $name, $params) = @_;
1272 1489
1273 my $cb = $COMMAND{$name} 1490 my $cb = $COMMAND{$name}
1274 or return; 1491 or return;
1275 1492
1283 my ($pl, $buf) = @_; 1500 my ($pl, $buf) = @_;
1284 1501
1285 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1502 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1286 1503
1287 if (ref $msg) { 1504 if (ref $msg) {
1288 my ($type, $reply, @payload) = 1505 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1289 "ARRAY" eq ref $msg
1290 ? @$msg
1291 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1292 1506
1293 my @reply; 1507 my @reply;
1294 1508
1295 if (my $cb = $EXTCMD{$type}) { 1509 if (my $cb = $EXTCMD{$type}) {
1296 @reply = $cb->($pl, @payload); 1510 @reply = $cb->($pl, @payload);
1298 1512
1299 $pl->ext_reply ($reply, @reply) 1513 $pl->ext_reply ($reply, @reply)
1300 if $reply; 1514 if $reply;
1301 1515
1302 } else { 1516 } else {
1303 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1517 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1304 } 1518 }
1305 1519
1306 cf::override; 1520 cf::override;
1307 }, 1521 },
1308); 1522);
1309 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
1310sub load_extensions { 1548sub load_extensions {
1549 info "loading extensions...";
1550
1551 %EXT_CFG = ();
1552
1311 cf::sync_job { 1553 cf::sync_job {
1312 my %todo; 1554 my %todo;
1313 1555
1314 for my $path (<$LIBDIR/*.ext>) { 1556 for my $path (<$LIBDIR/*.ext>) {
1315 next unless -r $path; 1557 next unless -r $path;
1333 1575
1334 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1576 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1335 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1577 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1336 1578
1337 $ext{source} = 1579 $ext{source} =
1338 "package $pkg; use strict; use utf8;\n" 1580 "package $pkg; use common::sense;\n"
1339 . "#line 1 \"$path\"\n{\n" 1581 . "#line 1 \"$path\"\n{\n"
1340 . $source 1582 . $source
1341 . "\n};\n1"; 1583 . "\n};\n1";
1342 1584
1343 $todo{$base} = \%ext; 1585 $todo{$base} = \%ext;
1344 } 1586 }
1345 1587
1588 my $pass = 0;
1346 my %done; 1589 my %done;
1347 while (%todo) { 1590 while (%todo) {
1348 my $progress; 1591 my $progress;
1349 1592
1593 ++$pass;
1594
1595 ext:
1350 while (my ($k, $v) = each %todo) { 1596 while (my ($k, $v) = each %todo) {
1351 for (split /,\s*/, $v->{meta}{depends}) { 1597 for (split /,\s*/, $v->{meta}{depends}) {
1352 goto skip 1598 next ext
1353 unless exists $done{$_}; 1599 unless exists $done{$_};
1354 } 1600 }
1355 1601
1356 warn "... loading '$k' into '$v->{pkg}'\n"; 1602 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1357 1603
1358 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 $@) {
1359 my $msg = $@ ? "$v->{path}: $@\n" 1616 error "$v->{path}: $@\n";
1360 : "$v->{base}: extension inactive.\n";
1361 1617
1362 if (exists $v->{meta}{mandatory}) {
1363 warn $msg;
1364 cf::cleanup "mandatory extension failed to load, exiting."; 1618 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1365 } 1619 if exists $v->{meta}{mandatory};
1366 1620
1367 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;
1368 } 1630 }
1369
1370 $done{$k} = delete $todo{$k};
1371 push @EXTS, $v->{pkg};
1372 $progress = 1;
1373 } 1631 }
1374 1632
1375 skip: 1633 unless ($progress) {
1376 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1634 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1377 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 }
1378 } 1643 }
1379 }; 1644 };
1380} 1645}
1381 1646
1382############################################################################# 1647#############################################################################
1383 1648
1384=back 1649=back
1385 1650
1386=head2 CORE EXTENSIONS 1651=head2 CORE EXTENSIONS
1387 1652
1388Functions and methods that extend core crossfire objects. 1653Functions and methods that extend core deliantra objects.
1389 1654
1390=cut 1655=cut
1391 1656
1392package cf::player; 1657package cf::player;
1393 1658
1436 1701
1437sub exists($) { 1702sub exists($) {
1438 my ($login) = @_; 1703 my ($login) = @_;
1439 1704
1440 $cf::PLAYER{$login} 1705 $cf::PLAYER{$login}
1441 or cf::sync_job { !aio_stat path $login } 1706 or !aio_stat path $login
1442} 1707}
1443 1708
1444sub find($) { 1709sub find($) {
1445 return $cf::PLAYER{$_[0]} || do { 1710 return $cf::PLAYER{$_[0]} || do {
1446 my $login = $_[0]; 1711 my $login = $_[0];
1466 $cf::PLAYER{$login} = $pl 1731 $cf::PLAYER{$login} = $pl
1467 } 1732 }
1468 } 1733 }
1469} 1734}
1470 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
1471sub save($) { 1749sub save($) {
1472 my ($pl) = @_; 1750 my ($pl) = @_;
1473 1751
1474 return if $pl->{deny_save}; 1752 return if $pl->{deny_save};
1475 1753
1480 1758
1481 aio_mkdir playerdir $pl, 0770; 1759 aio_mkdir playerdir $pl, 0770;
1482 $pl->{last_save} = $cf::RUNTIME; 1760 $pl->{last_save} = $cf::RUNTIME;
1483 1761
1484 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];
1485 1766
1486 $pl->save_pl ($path); 1767 $pl->save_pl ($path);
1487 cf::cede_to_tick; 1768 cf::cede_to_tick;
1488} 1769}
1489 1770
1521 my ($pl) = @_; 1802 my ($pl) = @_;
1522 1803
1523 my $name = $pl->ob->name; 1804 my $name = $pl->ob->name;
1524 1805
1525 $pl->{deny_save} = 1; 1806 $pl->{deny_save} = 1;
1526 $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
1527 1808
1528 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1809 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1529 $pl->deactivate; 1810 $pl->deactivate;
1811
1530 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;
1531 $pl->ob->check_score;
1532 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1813 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1814 ext::highscore::check ($pl->ob);
1815
1533 $pl->ns->destroy if $pl->ns; 1816 $pl->ns->destroy if $pl->ns;
1534 1817
1535 my $path = playerdir $pl; 1818 my $path = playerdir $pl;
1536 my $temp = "$path~$cf::RUNTIME~deleting~"; 1819 my $temp = "$path~$cf::RUNTIME~deleting~";
1537 aio_rename $path, $temp; 1820 aio_rename $path, $temp;
1591 \@logins 1874 \@logins
1592} 1875}
1593 1876
1594=item $player->maps 1877=item $player->maps
1595 1878
1879=item cf::player::maps $login
1880
1596Returns an arrayref of map paths that are private for this 1881Returns an arrayref of map paths that are private for this
1597player. May block. 1882player. May block.
1598 1883
1599=cut 1884=cut
1600 1885
1617 } 1902 }
1618 1903
1619 \@paths 1904 \@paths
1620} 1905}
1621 1906
1622=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1907=item $protocol_xml = $player->expand_cfpod ($cfpod)
1623 1908
1624Expand crossfire pod fragments into protocol xml. 1909Expand deliantra pod fragments into protocol xml.
1625
1626=cut
1627
1628use re 'eval';
1629
1630my $group;
1631my $interior; $interior = qr{
1632 # match a pod interior sequence sans C<< >>
1633 (?:
1634 \ (.*?)\ (?{ $group = $^N })
1635 | < (??{$interior}) >
1636 )
1637}x;
1638
1639sub expand_cfpod {
1640 my ($self, $pod) = @_;
1641
1642 my $xml;
1643
1644 while () {
1645 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1646 $group = $1;
1647
1648 $group =~ s/&/&amp;/g;
1649 $group =~ s/</&lt;/g;
1650
1651 $xml .= $group;
1652 } elsif ($pod =~ m%\G
1653 ([BCGHITU])
1654 <
1655 (?:
1656 ([^<>]*) (?{ $group = $^N })
1657 | < $interior >
1658 )
1659 >
1660 %gcsx
1661 ) {
1662 my ($code, $data) = ($1, $group);
1663
1664 if ($code eq "B") {
1665 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1666 } elsif ($code eq "I") {
1667 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1668 } elsif ($code eq "U") {
1669 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1670 } elsif ($code eq "C") {
1671 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1672 } elsif ($code eq "T") {
1673 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1674 } elsif ($code eq "G") {
1675 my ($male, $female) = split /\|/, $data;
1676 $data = $self->gender ? $female : $male;
1677 $xml .= expand_cfpod ($self, $data);
1678 } elsif ($code eq "H") {
1679 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1680 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1681 "")
1682 [$self->{hintmode}];
1683 } else {
1684 $xml .= "error processing '$code($data)' directive";
1685 }
1686 } else {
1687 if ($pod =~ /\G(.+)/) {
1688 warn "parse error while expanding $pod (at $1)";
1689 }
1690 last;
1691 }
1692 }
1693
1694 for ($xml) {
1695 # create single paragraphs (very hackish)
1696 s/(?<=\S)\n(?=\w)/ /g;
1697
1698 # compress some whitespace
1699 s/\s+\n/\n/g; # ws line-ends
1700 s/\n\n+/\n/g; # double lines
1701 s/^\n+//; # beginning lines
1702 s/\n+$//; # ending lines
1703 }
1704
1705 $xml
1706}
1707
1708no re 'eval';
1709
1710sub hintmode {
1711 $_[0]{hintmode} = $_[1] if @_ > 1;
1712 $_[0]{hintmode}
1713}
1714 1910
1715=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1716 1912
1717Sends an ext reply to the player. 1913Sends an ext reply to the player.
1718 1914
1750 1946
1751=cut 1947=cut
1752 1948
1753sub find_by_path($) { 1949sub find_by_path($) {
1754 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1755 1953
1756 my ($match, $specificity); 1954 my ($match, $specificity);
1757 1955
1758 for my $region (list) { 1956 for my $region (list) {
1759 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1788sub generate_random_map { 1986sub generate_random_map {
1789 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1790 1988
1791 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
1792 1990
1793 # mit "rum" bekleckern, nicht
1794 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1795 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1796 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1797 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1798 $rmp->{exit_on_final_map},
1799 $rmp->{xsize}, $rmp->{ysize},
1800 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1801 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1802 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1803 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1804 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1805 (cf::region::find $rmp->{region}), $rmp->{custom}
1806 )
1807} 1992}
1808 1993
1809=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1810 1995
1811Register 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
1816 2001
1817sub register { 2002sub register {
1818 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1819 my $pkg = caller; 2004 my $pkg = caller;
1820 2005
1821 no strict;
1822 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1823 2007
1824 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1825} 2009}
1826 2010
1827# also paths starting with '/' 2011# also paths starting with '/'
1828$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1829 2013
1830sub thawer_merge { 2014sub thawer_merge {
1831 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1832 2016
1833 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1838} 2022}
1839 2023
1840sub normalise { 2024sub normalise {
1841 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1842 2026
1843 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1844 2028
1845 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1846 2030
1847 # map plan: 2031 # map plan:
1848 # 2032 #
1863 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1864 $path = "$base/$path"; 2048 $path = "$base/$path";
1865 } 2049 }
1866 2050
1867 for ($path) { 2051 for ($path) {
1868 redo if s{//}{/};
1869 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1870 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1871 } 2054 }
1872 2055
1873 $path 2056 $path
1887 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1888 return $self; 2071 return $self;
1889 } 2072 }
1890 } 2073 }
1891 2074
1892 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1893 () 2076 ()
1894} 2077}
1895 2078
2079# may re-bless or do other evil things
1896sub init { 2080sub init {
1897 my ($self) = @_; 2081 my ($self) = @_;
1898 2082
1899 $self 2083 $self
1900} 2084}
1931 2115
1932 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1933 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1934} 2118}
1935 2119
1936# and all this just because we cannot iterate over
1937# all maps in C++...
1938sub change_all_map_light {
1939 my ($change) = @_;
1940
1941 $_->change_map_light ($change)
1942 for grep $_->outdoor, values %cf::MAP;
1943}
1944
1945sub decay_objects { 2120sub decay_objects {
1946 my ($self) = @_; 2121 my ($self) = @_;
1947 2122
1948 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1949 2124
1974 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1975 2150
1976 1 2151 1
1977} 2152}
1978 2153
2154# used to laod the header of an original map
1979sub load_header_orig { 2155sub load_header_orig {
1980 my ($self) = @_; 2156 my ($self) = @_;
1981 2157
1982 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1983} 2159}
1984 2160
2161# used to laod the header of an instantiated map
1985sub load_header_temp { 2162sub load_header_temp {
1986 my ($self) = @_; 2163 my ($self) = @_;
1987 2164
1988 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1989} 2166}
1990 2167
2168# called after loading the header from an instantiated map
1991sub prepare_temp { 2169sub prepare_temp {
1992 my ($self) = @_; 2170 my ($self) = @_;
1993 2171
1994 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1995 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
1996 # safety 2174 # safety
1997 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
1998 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
1999} 2177}
2000 2178
2179# called after loading the header from an original map
2001sub prepare_orig { 2180sub prepare_orig {
2002 my ($self) = @_; 2181 my ($self) = @_;
2003 2182
2004 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2005 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
2029 2208
2030sub find; 2209sub find;
2031sub find { 2210sub find {
2032 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2033 2212
2213 cf::cede_to_tick;
2214
2034 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2035 2216
2036 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2037 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2038 2219
2039 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2040 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2041 my $guard2 = cf::lock_acquire "map_find:$path";
2042
2043 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
2044 or return; 2222 or return;
2045 2223
2046 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
2047 2225
2059 2237
2060 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2061 } 2239 }
2062} 2240}
2063 2241
2064sub pre_load { } 2242sub pre_load { }
2065sub post_load { } 2243#sub post_load { } # XS
2066 2244
2067sub load { 2245sub load {
2068 my ($self) = @_; 2246 my ($self) = @_;
2069 2247
2070 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2073 2251
2074 { 2252 {
2075 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2076 2254
2077 return unless $self->valid; 2255 return unless $self->valid;
2078 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2079
2080 $self->in_memory (cf::MAP_LOADING);
2081 2257
2082 $self->alloc; 2258 $self->alloc;
2083 2259
2084 $self->pre_load; 2260 $self->pre_load;
2085 cf::cede_to_tick; 2261 cf::cede_to_tick;
2086 2262
2263 if (exists $self->{load_path}) {
2087 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2088 $f->skip_block; 2265 $f->skip_block;
2089 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2090 or return; 2267 or return;
2091 2268
2092 $self->post_load_original 2269 $self->post_load_original
2093 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2094 2271
2095 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2096 utf8::encode $uniq; 2273 utf8::encode $uniq;
2097 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2098 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2099 $self->clear_unique_items; 2276 $self->clear_unique_items;
2100 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2101 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2102 } 2280 }
2103 } 2281 }
2104 }
2105 2282
2106 $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);
2107 2290
2108 cf::cede_to_tick; 2291 cf::cede_to_tick;
2109 # now do the right thing for maps 2292 # now do the right thing for maps
2110 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2111 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2115 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2116 $self->decay_objects; 2299 $self->decay_objects;
2117 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2118 $self->update_buttons; 2301 $self->update_buttons;
2119 cf::cede_to_tick; 2302 cf::cede_to_tick;
2120 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2121 cf::cede_to_tick;
2122 $self->activate;
2123 } 2304 }
2124 2305
2125 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2126 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2127
2128 $self->in_memory (cf::MAP_ACTIVE);
2129 } 2308 }
2130 2309
2131 $self->post_load; 2310 $self->post_load;
2132}
2133 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
2134sub customise_for { 2318sub customise_for {
2135 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2136 2320
2137 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2138 if $self->per_player; 2322 if $self->per_player;
2141# if $self->per_party; 2325# if $self->per_party;
2142 2326
2143 $self 2327 $self
2144} 2328}
2145 2329
2146# find and load all maps in the 3x3 area around a map
2147sub load_neighbours {
2148 my ($map) = @_;
2149
2150 my @neigh; # diagonal neighbours
2151
2152 for (0 .. 3) {
2153 my $neigh = $map->tile_path ($_)
2154 or next;
2155 $neigh = find $neigh, $map
2156 or next;
2157 $neigh->load;
2158
2159 push @neigh,
2160 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2161 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2162 }
2163
2164 for (grep defined $_->[0], @neigh) {
2165 my ($path, $origin) = @$_;
2166 my $neigh = find $path, $origin
2167 or next;
2168 $neigh->load;
2169 }
2170}
2171
2172sub find_sync { 2330sub find_sync {
2173 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2174 2332
2175 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
2176} 2338}
2177 2339
2178sub do_load_sync { 2340sub do_load_sync {
2179 my ($map) = @_; 2341 my ($map) = @_;
2180 2342
2343 # it's a bug to call this from the main context
2181 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2183 2346
2184 cf::sync_job { $map->load }; 2347 $map->load;
2185} 2348}
2186 2349
2187our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2188our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2189 2352
2190sub find_async { 2353sub find_async {
2191 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2192 2355
2193 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2194 2357
2195 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2196 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2197 } 2360 }
2198 2361
2199 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2200 2363
2201 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2215 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2216 2379
2217 () 2380 ()
2218} 2381}
2219 2382
2383# common code, used by both ->save and ->swapout
2220sub save { 2384sub _save {
2221 my ($self) = @_; 2385 my ($self) = @_;
2222
2223 my $lock = cf::lock_acquire "map_data:$self->{path}";
2224 2386
2225 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2226 2388
2227 return unless $self->dirty; 2389 return unless $self->dirty;
2228 2390
2248 } else { 2410 } else {
2249 $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);
2250 } 2412 }
2251} 2413}
2252 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2253sub swap_out { 2423sub swap_out {
2254 my ($self) = @_; 2424 my ($self) = @_;
2255 2425
2256 # save first because save cedes
2257 $self->save;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2261 return if $self->players; 2430 return if $self->players;
2262 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
2263 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2264 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
2265 $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};
2266 2482
2267 $self->deactivate; 2483 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear; 2485 $self->clear;
2270}
2271
2272sub reset_at {
2273 my ($self) = @_;
2274
2275 # TODO: safety, remove and allow resettable per-player maps
2276 return 1e99 if $self->{deny_reset};
2277
2278 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2279 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2280
2281 $time + $to
2282}
2283
2284sub should_reset {
2285 my ($self) = @_;
2286
2287 $self->reset_at <= $cf::RUNTIME
2288}
2289
2290sub reset {
2291 my ($self) = @_;
2292
2293 my $lock = cf::lock_acquire "map_data:$self->{path}";
2294
2295 return if $self->players;
2296
2297 warn "resetting map ", $self->path;
2298
2299 $self->in_memory (cf::MAP_SWAPPED);
2300
2301 # need to save uniques path
2302 unless ($self->{deny_save}) {
2303 my $uniq = $self->uniq_path; utf8::encode $uniq;
2304
2305 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2306 if $uniq;
2307 }
2308
2309 delete $cf::MAP{$self->path};
2310
2311 $self->deactivate;
2312 $_->clear_links_to ($self) for values %cf::MAP;
2313 $self->clear;
2314 2486
2315 $self->unlink_save; 2487 $self->unlink_save;
2316 $self->destroy; 2488 $self->destroy;
2317} 2489}
2318 2490
2326 2498
2327 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2328 2500
2329 $self->unlink_save; 2501 $self->unlink_save;
2330 2502
2331 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2332 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2333 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2334 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2335 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2336 2508
2393 : normalise $_ 2565 : normalise $_
2394 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2395 ] 2567 ]
2396} 2568}
2397 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
2398=back 2602=back
2399 2603
2400=head3 cf::object 2604=head3 cf::object
2401 2605
2402=cut 2606=cut
2467 2671
2468our $SAY_CHANNEL = { 2672our $SAY_CHANNEL = {
2469 id => "say", 2673 id => "say",
2470 title => "Map", 2674 title => "Map",
2471 reply => "say ", 2675 reply => "say ",
2472 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.",
2473}; 2677};
2474 2678
2475our $CHAT_CHANNEL = { 2679our $CHAT_CHANNEL = {
2476 id => "chat", 2680 id => "chat",
2477 title => "Chat", 2681 title => "Chat",
2532 2736
2533=item $player_object->enter_link 2737=item $player_object->enter_link
2534 2738
2535Freezes 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}>).
2536 2740
2537The 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.
2538I<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.
2539 2745
2540Will never block. 2746Will never block.
2541 2747
2542=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2543 2749
2563sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2564 my ($self) = @_; 2770 my ($self) = @_;
2565 2771
2566 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2567 2773
2774 ++$self->{_link_recursion};
2775
2568 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2569 2777
2570 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2571 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2572 2780
2573 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2574} 2782}
2575 2783
2576sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2577 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2578 2786
2595 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2596 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2597 2805
2598 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2599 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2600 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2601 2809
2602 $map->load; 2810 $map->load;
2603 $map->load_neighbours;
2604 2811
2605 return unless $self->contr->active; 2812 return unless $self->contr->active;
2606 $self->activate_recursive;
2607 2813
2608 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2609 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2610} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2611 2821
2822}
2823
2612=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)]])
2613 2825
2614Moves 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
2615her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2616that 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
2617the 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
2624 2836
2625our $GOTOGEN; 2837our $GOTOGEN;
2626 2838
2627sub cf::object::player::goto { 2839sub cf::object::player::goto {
2628 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 }
2629 2847
2630 # 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
2631 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632 2850
2633 $self->enter_link; 2851 $self->enter_link;
2653 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2654 } 2872 }
2655 } 2873 }
2656 2874
2657 my $map = eval { 2875 my $map = eval {
2658 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659 2877
2660 if ($map) { 2878 if ($map) {
2661 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2662 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2663 } else { 2881 } else {
2664 $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);
2665 } 2883 }
2666 2884
2667 $map 2885 $map
2675 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2676 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2677 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2678 } 2896 }
2679 2897
2680 $done->() if $done; 2898 $done->($self) if $done;
2681 })->prio (1); 2899 })->prio (1);
2682} 2900}
2683 2901
2684=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2685 2903
2753 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2754 2972
2755 unless (eval { 2973 unless (eval {
2756 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2757 2975
2758 # random map handling
2759 {
2760 my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762 prepare_random_map $exit
2763 if $exit->slaying eq "/!";
2764 }
2765
2766 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2767 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2768 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 }
2769 3002
2770 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2771 3004
2772 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2773 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2774 if $exit->flag (cf::FLAG_DAMNED); 3007 if $exit->flag (cf::FLAG_DAMNED);
2775 3008
2776 1 3009 1
2777 }) { 3010 }) {
2778 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2779 . "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. "
2780 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2781 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2782 3015
2783 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2784 $self->leave_link; 3017 $self->leave_link;
2785 } 3018 }
2786 })->prio (1); 3019 })->prio (1);
2787} 3020}
2788 3021
2800sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2801 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2802 3035
2803 utf8::encode $text; 3036 utf8::encode $text;
2804 $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);
2805} 3063}
2806 3064
2807=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2808 3066
2809Send 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
2813 3071
2814=cut 3072=cut
2815 3073
2816# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2817our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2818 "c/identify" => { 3082 "c/identify" => {
2819 id => "infobox", 3083 id => "infobox",
2820 title => "Identify", 3084 title => "Identify",
2821 reply => undef, 3085 reply => undef,
2822 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2824 "c/examine" => { 3088 "c/examine" => {
2825 id => "infobox", 3089 id => "infobox",
2826 title => "Examine", 3090 title => "Examine",
2827 reply => undef, 3091 reply => undef,
2828 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",
2829 }, 3099 },
2830 "c/book" => { 3100 "c/book" => {
2831 id => "infobox", 3101 id => "infobox",
2832 title => "Book", 3102 title => "Book",
2833 reply => undef, 3103 reply => undef,
2849 id => "infobox", 3119 id => "infobox",
2850 title => "Body Parts", 3120 title => "Body Parts",
2851 reply => undef, 3121 reply => undef,
2852 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2853 }, 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 },
2854 "c/uptime" => { 3160 "c/uptime" => {
2855 id => "infobox", 3161 id => "infobox",
2856 title => "Uptime", 3162 title => "Uptime",
2857 reply => undef, 3163 reply => undef,
2858 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2867 id => "party", 3173 id => "party",
2868 title => "Party", 3174 title => "Party",
2869 reply => "gsay ", 3175 reply => "gsay ",
2870 tooltip => "Messages and chat related to your party", 3176 tooltip => "Messages and chat related to your party",
2871 }, 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,
2872); 3186);
2873 3187
2874sub cf::client::send_msg { 3188sub cf::client::send_msg {
2875 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2876 3190
2877 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2878 3193
2879 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2880 3195
2881 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2882 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2883 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2884 3199
2885 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2886 if $self->can_msg;
2887
2888 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2889 3202
2890 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2891 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2892 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2893 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2894 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2895 if $self->can_msg;
2896 } 3208 }
2897 3209
2898 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2899 } 3211 }
2900 3212
2901 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2902 3214
2903 if ($self->can_msg) {
2904 # default colour, mask it out 3215 # default colour, mask it out
2905 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2906 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2907 3218
2908 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2909 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910 } else { 3222 );
2911 if ($color >= 0) {
2912 # replace some tags by gcfclient-compatible ones
2913 for ($msg) {
2914 1 while
2915 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2916 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2917 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2918 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2919 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2920 }
2921 3223
2922 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2923
2924 utf8::encode $msg;
2925
2926 if (0 && $msg =~ /\[/) {
2927 # COMMAND/INFO
2928 $self->send_packet ("drawextinfo $color 10 8 $msg")
2929 } else {
2930 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2931 $self->send_packet ("drawinfo $color $msg")
2932 }
2933 }
2934 }
2935} 3225}
2936 3226
2937=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2938 3228
2939Sends an ext event to the client. 3229Sends an ext event to the client.
2942 3232
2943sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2944 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2945 3235
2946 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2947 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2948 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2949 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2950 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951 } 3241 }
2952} 3242}
2953 3243
2954=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2955 3245
2958=cut 3248=cut
2959 3249
2960sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2961 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2962 3252
2963 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2964 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2965 } elsif ($self->extcmd == 1) {
2966 #TODO: version 1, remove
2967 unshift @msg, msgtype => "reply", msgid => $id;
2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2969 }
2970} 3256}
2971 3257
2972=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2973 3259
2974Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
3029 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3030 3316
3031 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3032 3318
3033 if (ref $msg) { 3319 if (ref $msg) {
3034 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3035 "ARRAY" eq ref $msg
3036 ? @$msg
3037 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3038 3321
3039 my @reply; 3322 my @reply;
3040 3323
3041 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3042 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3044 3327
3045 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3046 if $reply; 3329 if $reply;
3047 3330
3048 } else { 3331 } else {
3049 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";
3050 } 3333 }
3051 3334
3052 cf::override; 3335 cf::override;
3053 }, 3336 },
3054); 3337);
3074 3357
3075 $coro 3358 $coro
3076} 3359}
3077 3360
3078cf::client->attach ( 3361cf::client->attach (
3079 on_destroy => sub { 3362 on_client_destroy => sub {
3080 my ($ns) = @_; 3363 my ($ns) = @_;
3081 3364
3082 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3083 }, 3366 },
3084); 3367);
3100our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3101 3384
3102$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3103 3386
3104$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3105 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3106 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3107 sort time 3390 sort time
3108)); 3391));
3109 3392
3110# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3114The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3115 3398
3116 cf::object 3399 cf::object
3117 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
3118 insert remove name archname title slaying race decrease split 3401 insert remove name archname title slaying race decrease split
3402 value
3119 3403
3120 cf::object::player 3404 cf::object::player
3121 player 3405 player
3122 3406
3123 cf::player 3407 cf::player
3129=cut 3413=cut
3130 3414
3131for ( 3415for (
3132 ["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
3133 insert remove inv nrof name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3134 decrease split destroy change_exp)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3135 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3136 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3137 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3138) { 3422) {
3139 no strict 'refs';
3140 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3141 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3142 for @funs; 3425 for @funs;
3143} 3426}
3144 3427
3159 3442
3160 my $qcode = $code; 3443 my $qcode = $code;
3161 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3162 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3163 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3164 local $_; 3450 local $_;
3165 local @safe::cf::_safe_eval_args = values %vars;
3166 3451
3167 my $eval = 3452 my $eval =
3168 "do {\n" 3453 "do {\n"
3169 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3170 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3171 . $code 3456 . $code
3172 . "\n}" 3457 . "\n}"
3173 ; 3458 ;
3174 3459
3460 if ($CFG{safe_eval}) {
3175 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3176 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3177 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 }
3178 3469
3179 if ($@) { 3470 if ($@) {
3180 warn "$@"; 3471 warn "$@",
3181 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3182 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3183 } 3474 }
3184 3475
3185 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3186} 3477}
3187 3478
3201=cut 3492=cut
3202 3493
3203sub register_script_function { 3494sub register_script_function {
3204 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3205 3496
3206 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3207 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3208} 3499}
3209 3500
3210=back 3501=back
3211 3502
3212=cut 3503=cut
3221 # for this (global event?) 3512 # for this (global event?)
3222 %ext::player_env::MUSIC_FACE_CACHE = (); 3513 %ext::player_env::MUSIC_FACE_CACHE = ();
3223 3514
3224 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3515 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3225 3516
3226 warn "loading facedata from $path\n"; 3517 trace "loading facedata from $path\n";
3227 3518
3228 my $facedata; 3519 my $facedata = decode_storable load_file $path;
3229 0 < aio_load $path, $facedata
3230 or die "$path: $!";
3231
3232 $facedata = Coro::Storable::thaw $facedata;
3233 3520
3234 $facedata->{version} == 2 3521 $facedata->{version} == 2
3235 or cf::cleanup "$path: version mismatch, cannot proceed."; 3522 or cf::cleanup "$path: version mismatch, cannot proceed.";
3236 3523
3237 # 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]);
3238 $facedata->{resource}{"res/exp_table"} = { 3526 $facedata->{resource}{"res/exp_table"} = {
3239 type => FT_RSRC, 3527 type => FT_RSRC,
3240 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),
3241 }; 3530 };
3242 cf::cede_to_tick; 3531 cf::cede_to_tick;
3243 3532
3244 { 3533 {
3245 my $faces = $facedata->{faceinfo}; 3534 my $faces = $facedata->{faceinfo};
3247 while (my ($face, $info) = each %$faces) { 3536 while (my ($face, $info) = each %$faces) {
3248 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3537 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3249 3538
3250 cf::face::set_visibility $idx, $info->{visibility}; 3539 cf::face::set_visibility $idx, $info->{visibility};
3251 cf::face::set_magicmap $idx, $info->{magicmap}; 3540 cf::face::set_magicmap $idx, $info->{magicmap};
3252 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3541 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3253 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} ;
3254 3544
3255 cf::cede_to_tick; 3545 cf::cede_to_tick;
3256 } 3546 }
3257 3547
3258 while (my ($face, $info) = each %$faces) { 3548 while (my ($face, $info) = each %$faces) {
3263 3553
3264 if (my $smooth = cf::face::find $info->{smooth}) { 3554 if (my $smooth = cf::face::find $info->{smooth}) {
3265 cf::face::set_smooth $idx, $smooth; 3555 cf::face::set_smooth $idx, $smooth;
3266 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3556 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3267 } else { 3557 } else {
3268 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3558 error "smooth face '$info->{smooth}' not found for face '$face'";
3269 } 3559 }
3270 3560
3271 cf::cede_to_tick; 3561 cf::cede_to_tick;
3272 } 3562 }
3273 } 3563 }
3282 3572
3283 cf::anim::invalidate_all; # d'oh 3573 cf::anim::invalidate_all; # d'oh
3284 } 3574 }
3285 3575
3286 { 3576 {
3287 # TODO: for gcfclient pleasure, we should give resources
3288 # that gcfclient doesn't grok a >10000 face index.
3289 my $res = $facedata->{resource}; 3577 my $res = $facedata->{resource};
3290 3578
3291 while (my ($name, $info) = each %$res) { 3579 while (my ($name, $info) = each %$res) {
3292 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
3293 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3582 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3294 my $data;
3295 3583
3296 if ($info->{type} & 1) { 3584 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3297 # prepend meta info
3298
3299 my $meta = $enc->encode ({
3300 name => $name,
3301 %{ $info->{meta} || {} },
3302 });
3303
3304 $data = pack "(w/a*)*", $meta, $info->{data};
3305 } else {
3306 $data = $info->{data};
3307 }
3308
3309 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3310 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
3311 } else { 3587 } else {
3312 $RESOURCE{$name} = $info; 3588# $RESOURCE{$name} = $info; # unused
3313 } 3589 }
3314 3590
3315 cf::cede_to_tick; 3591 cf::cede_to_tick;
3316 } 3592 }
3317 } 3593 }
3318 3594
3319 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3595 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3320 3596
3321 1 3597 1
3322} 3598}
3323
3324cf::global->attach (on_resource_update => sub {
3325 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3326 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3327
3328 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3329 my $sound = $soundconf->{compat}[$_]
3330 or next;
3331
3332 my $face = cf::face::find "sound/$sound->[1]";
3333 cf::sound::set $sound->[0] => $face;
3334 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3335 }
3336
3337 while (my ($k, $v) = each %{$soundconf->{event}}) {
3338 my $face = cf::face::find "sound/$v";
3339 cf::sound::set $k => $face;
3340 }
3341 }
3342});
3343 3599
3344register_exticmd fx_want => sub { 3600register_exticmd fx_want => sub {
3345 my ($ns, $want) = @_; 3601 my ($ns, $want) = @_;
3346 3602
3347 while (my ($k, $v) = each %$want) { 3603 while (my ($k, $v) = each %$want) {
3386sub reload_treasures { 3642sub reload_treasures {
3387 load_resource_file "$DATADIR/treasures" 3643 load_resource_file "$DATADIR/treasures"
3388 or die "unable to load treasurelists\n"; 3644 or die "unable to load treasurelists\n";
3389} 3645}
3390 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
3391sub reload_resources { 3667sub reload_resources {
3392 warn "reloading resource files...\n"; 3668 trace "reloading resource files...\n";
3393 3669
3670 reload_exp_table;
3671 reload_materials;
3394 reload_facedata; 3672 reload_facedata;
3673 reload_sound;
3395 reload_archetypes; 3674 reload_archetypes;
3396 reload_regions; 3675 reload_regions;
3397 reload_treasures; 3676 reload_treasures;
3398 3677
3399 warn "finished reloading resource files\n"; 3678 trace "finished reloading resource files\n";
3400}
3401
3402sub init {
3403 my $guard = freeze_mainloop;
3404
3405 evthread_start IO::AIO::poll_fileno;
3406
3407 reload_resources;
3408} 3679}
3409 3680
3410sub reload_config { 3681sub reload_config {
3411 open my $fh, "<:utf8", "$CONFDIR/config" 3682 trace "reloading config file...\n";
3412 or return;
3413 3683
3414 local $/; 3684 my $config = load_file "$CONFDIR/config";
3415 *CFG = YAML::Load <$fh>; 3685 utf8::decode $config;
3686 *CFG = decode_yaml $config;
3416 3687
3417 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3688 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3418 3689
3419 $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};
3420 $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};
3421 3692
3422 if (exists $CFG{mlockall}) { 3693 if (exists $CFG{mlockall}) {
3426 }; 3697 };
3427 warn $@ if $@; 3698 warn $@ if $@;
3428 } 3699 }
3429} 3700}
3430 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
3431sub 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
3432 # we must not ever block the main coroutine 3740 # we must not ever block the main coroutine
3433 local $Coro::idle = sub { 3741 local $Coro::idle = sub {
3434 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#
3435 (async { 3743 (async {
3436 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3744 $Coro::current->{desc} = "IDLE BUG HANDLER";
3437 EV::loop EV::LOOP_ONESHOT; 3745 EV::loop EV::LOOP_ONESHOT;
3438 })->prio (Coro::PRIO_MAX); 3746 })->prio (Coro::PRIO_MAX);
3439 }; 3747 };
3440 3748
3441 { 3749 evthread_start IO::AIO::poll_fileno;
3442 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;
3443 reload_config; 3761 reload_config;
3444 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
3445 load_extensions; 3772 load_extensions;
3446 3773
3447 $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;
3448 } 3781 };
3449 3782
3450 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;
3451} 3791}
3452 3792
3453############################################################################# 3793#############################################################################
3454# initialisation and cleanup 3794# initialisation and cleanup
3455 3795
3456# install some emergency cleanup handlers 3796# install some emergency cleanup handlers
3457BEGIN { 3797BEGIN {
3458 our %SIGWATCHER = (); 3798 our %SIGWATCHER = ();
3459 for my $signal (qw(INT HUP TERM)) { 3799 for my $signal (qw(INT HUP TERM)) {
3460 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3800 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3461 cf::cleanup "SIG$signal"; 3801 cf::cleanup "SIG$signal";
3462 }; 3802 };
3463 } 3803 }
3464} 3804}
3465 3805
3466sub write_runtime_sync { 3806sub write_runtime_sync {
3467 my $runtime = "$LOCALDIR/runtime"; 3807 my $t0 = AE::time;
3468 3808
3469 # first touch the runtime file to show we are still running: 3809 # first touch the runtime file to show we are still running:
3470 # the fsync below can take a very very long time. 3810 # the fsync below can take a very very long time.
3471 3811
3472 IO::AIO::aio_utime $runtime, undef, undef; 3812 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3473 3813
3474 my $guard = cf::lock_acquire "write_runtime"; 3814 my $guard = cf::lock_acquire "write_runtime";
3475 3815
3476 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3816 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3477 or return; 3817 or return;
3478 3818
3479 my $value = $cf::RUNTIME + 90 + 10; 3819 my $value = $cf::RUNTIME + 90 + 10;
3480 # 10 is the runtime save interval, for a monotonic clock 3820 # 10 is the runtime save interval, for a monotonic clock
3481 # 60 allows for the watchdog to kill the server. 3821 # 60 allows for the watchdog to kill the server.
3491 aio_utime $fh, undef, undef; 3831 aio_utime $fh, undef, undef;
3492 3832
3493 close $fh 3833 close $fh
3494 or return; 3834 or return;
3495 3835
3496 aio_rename "$runtime~", $runtime 3836 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3497 and return; 3837 and return;
3498 3838
3499 warn "runtime file written.\n"; 3839 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3500 3840
3501 1 3841 1
3502} 3842}
3503 3843
3504our $uuid_lock; 3844our $uuid_lock;
3513 my $uuid = "$LOCALDIR/uuid"; 3853 my $uuid = "$LOCALDIR/uuid";
3514 3854
3515 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3855 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3516 or return; 3856 or return;
3517 3857
3518 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;
3519 $uuid_skip = 0; 3866 $uuid_skip = 0;
3520 3867
3521 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3868 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3522 and return; 3869 and return;
3523 3870
3529 or return; 3876 or return;
3530 3877
3531 aio_rename "$uuid~", $uuid 3878 aio_rename "$uuid~", $uuid
3532 and return; 3879 and return;
3533 3880
3534 warn "uuid file written ($value).\n"; 3881 trace "uuid file written ($value).\n";
3535 3882
3536 1 3883 1
3537 3884
3538} 3885}
3539 3886
3545} 3892}
3546 3893
3547sub emergency_save() { 3894sub emergency_save() {
3548 my $freeze_guard = cf::freeze_mainloop; 3895 my $freeze_guard = cf::freeze_mainloop;
3549 3896
3550 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;
3551 3903
3552 cf::sync_job { 3904 cf::sync_job {
3905 cf::write_runtime_sync; # external watchdog should not bark
3906
3553 # use a peculiar iteration method to avoid tripping on perl 3907 # use a peculiar iteration method to avoid tripping on perl
3554 # refcount bugs in for. also avoids problems with players 3908 # refcount bugs in for. also avoids problems with players
3555 # and maps saved/destroyed asynchronously. 3909 # and maps saved/destroyed asynchronously.
3556 warn "begin emergency player save\n"; 3910 info "emergency_perl_save: begin player save\n";
3557 for my $login (keys %cf::PLAYER) { 3911 for my $login (keys %cf::PLAYER) {
3558 my $pl = $cf::PLAYER{$login} or next; 3912 my $pl = $cf::PLAYER{$login} or next;
3559 $pl->valid or next; 3913 $pl->valid or next;
3560 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3914 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3561 $pl->save; 3915 $pl->save;
3562 } 3916 }
3563 warn "end emergency player save\n"; 3917 info "emergency_perl_save: end player save\n";
3564 3918
3565 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";
3566 for my $path (keys %cf::MAP) { 3922 for my $path (keys %cf::MAP) {
3567 my $map = $cf::MAP{$path} or next; 3923 my $map = $cf::MAP{$path} or next;
3568 $map->valid or next; 3924 $map->valid or next;
3569 $map->save; 3925 $map->save;
3570 } 3926 }
3571 warn "end emergency map save\n"; 3927 info "emergency_perl_save: end map save\n";
3572 3928
3573 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";
3574 BDB::db_env_txn_checkpoint $DB_ENV; 3932 BDB::db_env_txn_checkpoint $DB_ENV;
3575 warn "end emergency database checkpoint\n"; 3933 info "emergency_perl_save: end database checkpoint\n";
3576 3934
3577 warn "begin write uuid\n"; 3935 info "emergency_perl_save: begin write uuid\n";
3578 write_uuid_sync 1; 3936 write_uuid_sync 1;
3579 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
3580 }; 3957 };
3581 3958
3582 warn "leave emergency perl save\n"; 3959 info "emergency_perl_save: leave\n";
3583} 3960}
3584 3961
3585sub post_cleanup { 3962sub post_cleanup {
3586 my ($make_core) = @_; 3963 my ($make_core) = @_;
3587 3964
3965 IO::AIO::flush;
3966
3588 warn Carp::longmess "post_cleanup backtrace" 3967 error Carp::longmess "post_cleanup backtrace"
3589 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 }
3590} 3997}
3591 3998
3592sub do_reload_perl() { 3999sub do_reload_perl() {
3593 # can/must only be called in main 4000 # can/must only be called in main
3594 if ($Coro::current != $Coro::main) { 4001 unless (in_main) {
3595 warn "can only reload from main coroutine"; 4002 error "can only reload from main coroutine";
3596 return; 4003 return;
3597 } 4004 }
3598 4005
3599 warn "reloading..."; 4006 return if $RELOAD++;
3600 4007
3601 warn "entering sync_job"; 4008 my $t1 = AE::time;
3602 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
3603 cf::sync_job { 4016 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 4017 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 4018
3608 warn "syncing database to disk";
3609 BDB::db_env_txn_checkpoint $DB_ENV;
3610
3611 # if anything goes wrong in here, we should simply crash as we already saved
3612
3613 warn "flushing outstanding aio requests";
3614 for (;;) {
3615 BDB::flush;
3616 IO::AIO::flush;
3617 Coro::cede_notself;
3618 last unless IO::AIO::nreqs || BDB::nreqs;
3619 warn "iterate...";
3620 }
3621
3622 ++$RELOAD;
3623
3624 warn "cancelling all extension coros"; 4019 trace "perl_reload: cancelling all extension coros";
3625 $_->cancel for values %EXT_CORO; 4020 $_->cancel for values %EXT_CORO;
3626 %EXT_CORO = (); 4021 %EXT_CORO = ();
3627 4022
3628 warn "removing commands"; 4023 trace "perl_reload: removing commands";
3629 %COMMAND = (); 4024 %COMMAND = ();
3630 4025
3631 warn "removing ext/exti commands"; 4026 trace "perl_reload: removing ext/exti commands";
3632 %EXTCMD = (); 4027 %EXTCMD = ();
3633 %EXTICMD = (); 4028 %EXTICMD = ();
3634 4029
3635 warn "unloading/nuking all extensions"; 4030 trace "perl_reload: unloading/nuking all extensions";
3636 for my $pkg (@EXTS) { 4031 for my $pkg (@EXTS) {
3637 warn "... unloading $pkg"; 4032 trace "... unloading $pkg";
3638 4033
3639 if (my $cb = $pkg->can ("unload")) { 4034 if (my $cb = $pkg->can ("unload")) {
3640 eval { 4035 eval {
3641 $cb->($pkg); 4036 $cb->($pkg);
3642 1 4037 1
3643 } 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;
3644 } 4043 }
3645 4044
3646 warn "... nuking $pkg";
3647 Symbol::delete_package $pkg;
3648 }
3649
3650 warn "unloading all perl modules loaded from $LIBDIR"; 4045 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3651 while (my ($k, $v) = each %INC) { 4046 while (my ($k, $v) = each %INC) {
3652 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4047 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3653 4048
3654 warn "... unloading $k"; 4049 trace "... unloading $k";
3655 delete $INC{$k}; 4050 delete $INC{$k};
3656 4051
3657 $k =~ s/\.pm$//; 4052 $k =~ s/\.pm$//;
3658 $k =~ s/\//::/g; 4053 $k =~ s/\//::/g;
3659 4054
3660 if (my $cb = $k->can ("unload_module")) { 4055 if (my $cb = $k->can ("unload_module")) {
3661 $cb->(); 4056 $cb->();
4057 }
4058
4059 clear_package $k;
3662 } 4060 }
3663 4061
3664 Symbol::delete_package $k;
3665 }
3666
3667 warn "getting rid of safe::, as good as possible"; 4062 trace "perl_reload: getting rid of safe::, as good as possible";
3668 Symbol::delete_package "safe::$_" 4063 clear_package "safe::$_"
3669 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);
3670 4065
3671 warn "unloading cf.pm \"a bit\""; 4066 trace "perl_reload: unloading cf.pm \"a bit\"";
3672 delete $INC{"cf.pm"}; 4067 delete $INC{"cf.pm"};
3673 delete $INC{"cf/pod.pm"}; 4068 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3674 4069
3675 # don't, removes xs symbols, too, 4070 # don't, removes xs symbols, too,
3676 # and global variables created in xs 4071 # and global variables created in xs
3677 #Symbol::delete_package __PACKAGE__; 4072 #clear_package __PACKAGE__;
3678 4073
3679 warn "unload completed, starting to reload now"; 4074 info "perl_reload: unload completed, starting to reload now";
3680 4075
3681 warn "reloading cf.pm"; 4076 trace "perl_reload: reloading cf.pm";
3682 require cf; 4077 require cf;
3683 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4078 cf::_connect_to_perl_1;
3684 4079
3685 warn "loading config and database again"; 4080 trace "perl_reload: loading config and database again";
3686 cf::reload_config; 4081 cf::reload_config;
3687 4082
3688 warn "loading extensions"; 4083 trace "perl_reload: loading extensions";
3689 cf::load_extensions; 4084 cf::load_extensions;
3690 4085
4086 if ($REATTACH_ON_RELOAD) {
3691 warn "reattaching attachments to objects/players"; 4087 trace "perl_reload: reattaching attachments to objects/players";
3692 _global_reattach; # objects, sockets 4088 _global_reattach; # objects, sockets
3693 warn "reattaching attachments to maps"; 4089 trace "perl_reload: reattaching attachments to maps";
3694 reattach $_ for values %MAP; 4090 reattach $_ for values %MAP;
3695 warn "reattaching attachments to players"; 4091 trace "perl_reload: reattaching attachments to players";
3696 reattach $_ for values %PLAYER; 4092 reattach $_ for values %PLAYER;
4093 }
3697 4094
3698 warn "leaving sync_job"; 4095 cf::_post_init 1;
3699 4096
4097 trace "perl_reload: leaving sync_job";
4098
3700 1 4099 1
3701 } or do { 4100 } or do {
3702 warn $@; 4101 error $@;
3703 cf::cleanup "error while reloading, exiting."; 4102 cf::cleanup "perl_reload: error, exiting.";
4103 };
4104
4105 --$RELOAD;
3704 }; 4106 }
3705 4107
3706 warn "reloaded"; 4108 $t1 = AE::time - $t1;
4109 info "perl_reload: completed in ${t1}s\n";
3707}; 4110};
3708 4111
3709our $RELOAD_WATCHER; # used only during reload 4112our $RELOAD_WATCHER; # used only during reload
3710 4113
3711sub reload_perl() { 4114sub reload_perl() {
3712 # doing reload synchronously and two reloads happen back-to-back, 4115 # doing reload synchronously and two reloads happen back-to-back,
3713 # coro crashes during coro_state_free->destroy here. 4116 # coro crashes during coro_state_free->destroy here.
3714 4117
4118 $RELOAD_WATCHER ||= cf::async {
4119 Coro::AIO::aio_wait cache_extensions;
4120
3715 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4121 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3716 do_reload_perl; 4122 do_reload_perl;
3717 undef $RELOAD_WATCHER; 4123 undef $RELOAD_WATCHER;
4124 };
3718 }; 4125 };
3719} 4126}
3720 4127
3721register_command "reload" => sub { 4128register_command "reload" => sub {
3722 my ($who, $arg) = @_; 4129 my ($who, $arg) = @_;
3728 reload_perl; 4135 reload_perl;
3729 }; 4136 };
3730 } 4137 }
3731}; 4138};
3732 4139
3733unshift @INC, $LIBDIR; 4140#############################################################################
3734 4141
3735my $bug_warning = 0; 4142my $bug_warning = 0;
3736 4143
3737our @WAIT_FOR_TICK;
3738our @WAIT_FOR_TICK_BEGIN;
3739
3740sub wait_for_tick { 4144sub wait_for_tick() {
3741 return if tick_inhibit || $Coro::current == $Coro::main; 4145 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3742 4146
3743 my $signal = new Coro::Signal; 4147 $WAIT_FOR_TICK->wait;
3744 push @WAIT_FOR_TICK, $signal;
3745 $signal->wait;
3746} 4148}
3747 4149
3748sub wait_for_tick_begin { 4150sub wait_for_tick_begin() {
3749 return if tick_inhibit || $Coro::current == $Coro::main; 4151 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3750 4152
3751 my $signal = new Coro::Signal; 4153 my $signal = new Coro::Signal;
3752 push @WAIT_FOR_TICK_BEGIN, $signal; 4154 push @WAIT_FOR_TICK_BEGIN, $signal;
3753 $signal->wait; 4155 $signal->wait;
3754} 4156}
3758 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"
3759 unless ++$bug_warning > 10; 4161 unless ++$bug_warning > 10;
3760 return; 4162 return;
3761 } 4163 }
3762 4164
3763 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#
3764 4168
3765 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4169 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3766 $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.;
3767 Coro::async_pool { 4171 Coro::async_pool {
3768 $Coro::current->{desc} = "runtime saver"; 4172 $Coro::current->{desc} = "runtime saver";
3769 write_runtime_sync 4173 write_runtime_sync
3770 or warn "ERROR: unable to write runtime file: $!"; 4174 or error "ERROR: unable to write runtime file: $!";
3771 }; 4175 };
3772 } 4176 }
3773 4177
3774 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4178 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3775 $sig->send; 4179 $sig->send;
3776 } 4180 }
3777 while (my $sig = shift @WAIT_FOR_TICK) { 4181 $WAIT_FOR_TICK->broadcast;
3778 $sig->send;
3779 }
3780 4182
3781 $LOAD = ($NOW - $TICK_START) / $TICK; 4183 $LOAD = ($NOW - $TICK_START) / $TICK;
3782 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4184 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3783 4185
3784 if (0) { 4186 if (0) {
3785 if ($NEXT_TICK) { 4187 if ($NEXT_TICK) {
3786 my $jitter = $TICK_START - $NEXT_TICK; 4188 my $jitter = $TICK_START - $NEXT_TICK;
3787 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4189 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3788 warn "jitter $JITTER\n";#d# 4190 debug "jitter $JITTER\n";#d#
3789 } 4191 }
3790 } 4192 }
3791} 4193}
3792 4194
3793{ 4195{
3794 # configure BDB 4196 # configure BDB
3795 4197
3796 BDB::min_parallel 8; 4198 BDB::min_parallel 16;
3797 BDB::max_poll_reqs $TICK * 0.1; 4199 BDB::max_poll_reqs $TICK * 0.1;
3798 $AnyEvent::BDB::WATCHER->priority (1); 4200 #$AnyEvent::BDB::WATCHER->priority (1);
3799 4201
3800 unless ($DB_ENV) { 4202 unless ($DB_ENV) {
3801 $DB_ENV = BDB::db_env_create; 4203 $DB_ENV = BDB::db_env_create;
3802 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4204 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3803 $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;
3838 IO::AIO::min_parallel 8; 4240 IO::AIO::min_parallel 8;
3839 IO::AIO::max_poll_time $TICK * 0.1; 4241 IO::AIO::max_poll_time $TICK * 0.1;
3840 undef $AnyEvent::AIO::WATCHER; 4242 undef $AnyEvent::AIO::WATCHER;
3841} 4243}
3842 4244
3843my $_log_backtrace; 4245our $_log_backtrace;
4246our $_log_backtrace_last;
3844 4247
3845sub _log_backtrace { 4248sub _log_backtrace {
3846 my ($msg, @addr) = @_; 4249 my ($msg, @addr) = @_;
3847 4250
3848 $msg =~ s/\n//; 4251 $msg =~ s/\n$//;
3849 4252
4253 if ($_log_backtrace_last eq $msg) {
4254 LOG llevInfo, "[ABT] $msg\n";
4255 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3850 # limit the # of concurrent backtraces 4256 # limit the # of concurrent backtraces
3851 if ($_log_backtrace < 2) { 4257 } elsif ($_log_backtrace < 2) {
4258 $_log_backtrace_last = $msg;
3852 ++$_log_backtrace; 4259 ++$_log_backtrace;
4260 my $perl_bt = Carp::longmess $msg;
3853 async { 4261 async {
3854 $Coro::current->{desc} = "abt $msg"; 4262 $Coro::current->{desc} = "abt $msg";
3855 4263
3856 my @bt = fork_call { 4264 my @bt = fork_call {
3857 @addr = map { sprintf "%x", $_ } @addr; 4265 @addr = map { sprintf "%x", $_ } @addr;
3868 } 4276 }
3869 4277
3870 @funcs 4278 @funcs
3871 }; 4279 };
3872 4280
3873 LOG llevInfo, "[ABT] $msg\n"; 4281 LOG llevInfo, "[ABT] $perl_bt\n";
4282 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3874 LOG llevInfo, "[ABT] $_\n" for @bt; 4283 LOG llevInfo, "[ABT] $_\n" for @bt;
3875 --$_log_backtrace; 4284 --$_log_backtrace;
3876 }; 4285 };
3877 } else { 4286 } else {
3878 LOG llevInfo, "[ABT] $msg\n"; 4287 LOG llevInfo, "[ABT] $msg\n";
3879 LOG llevInfo, "[ABT] [suppressed]\n"; 4288 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3880 } 4289 }
3881} 4290}
3882 4291
3883# load additional modules 4292# load additional modules
3884use cf::pod; 4293require "cf/$_.pm" for @EXTRA_MODULES;
4294cf::_connect_to_perl_2;
3885 4295
3886END { cf::emergency_save } 4296END { cf::emergency_save }
3887 4297
38881 42981
3889 4299

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines