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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines