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.442 by root, Sun Aug 31 09:03:31 2008 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# 18# <http://www.gnu.org/licenses/>.
19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
24use 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
1630sub expand_cfpod {
1631 my ($self, $pod) = @_;
1632
1633 my @nest = [qr<\G$>, undef, ""];
1634 my $xml;
1635
1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1648
1649 my $cb;
1650
1651 if ($code eq "B") {
1652 $cb = sub { "<b>$_[0]</b>" };
1653 } elsif ($code eq "C") {
1654 $cb = sub { "<tt>$_[0]</tt>" };
1655 } elsif ($code eq "E") {
1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1657 } elsif ($code eq "G") {
1658 $cb = sub {
1659 my ($male, $female) = split /\|/, $_[0];
1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1667 "",
1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1707 }
1708 }
1709 }
1710
1711 $xml
1712}
1713
1714sub hintmode {
1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1716 $_[0]{hintmode}
1717}
1718 1910
1719=item $player->ext_reply ($msgid, @msg) 1911=item $player->ext_reply ($msgid, @msg)
1720 1912
1721Sends an ext reply to the player. 1913Sends an ext reply to the player.
1722 1914
1754 1946
1755=cut 1947=cut
1756 1948
1757sub find_by_path($) { 1949sub find_by_path($) {
1758 my ($path) = @_; 1950 my ($path) = @_;
1951
1952 $path =~ s/^~[^\/]*//; # skip ~login
1759 1953
1760 my ($match, $specificity); 1954 my ($match, $specificity);
1761 1955
1762 for my $region (list) { 1956 for my $region (list) {
1763 if ($region->{match} && $path =~ $region->{match}) { 1957 if ($region->{match} && $path =~ $region->{match}) {
1792sub generate_random_map { 1986sub generate_random_map {
1793 my ($self, $rmp) = @_; 1987 my ($self, $rmp) = @_;
1794 1988
1795 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
1796 1990
1797 # mit "rum" bekleckern, nicht
1798 $self->_create_random_map ( 1991 $self->_create_random_map ($rmp);
1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1802 $rmp->{exit_on_final_map},
1803 $rmp->{xsize}, $rmp->{ysize},
1804 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1805 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1806 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1807 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1808 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1809 (cf::region::find $rmp->{region}), $rmp->{custom}
1810 )
1811} 1992}
1812 1993
1813=item cf::map->register ($regex, $prio) 1994=item cf::map->register ($regex, $prio)
1814 1995
1815Register 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
1820 2001
1821sub register { 2002sub register {
1822 my (undef, $regex, $prio) = @_; 2003 my (undef, $regex, $prio) = @_;
1823 my $pkg = caller; 2004 my $pkg = caller;
1824 2005
1825 no strict;
1826 push @{"$pkg\::ISA"}, __PACKAGE__; 2006 push @{"$pkg\::ISA"}, __PACKAGE__;
1827 2007
1828 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2008 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1829} 2009}
1830 2010
1831# also paths starting with '/' 2011# also paths starting with '/'
1832$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2012$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1833 2013
1834sub thawer_merge { 2014sub thawer_merge {
1835 my ($self, $merge) = @_; 2015 my ($self, $merge) = @_;
1836 2016
1837 # we have to keep some variables in memory intact 2017 # we have to keep some variables in memory intact
1842} 2022}
1843 2023
1844sub normalise { 2024sub normalise {
1845 my ($path, $base) = @_; 2025 my ($path, $base) = @_;
1846 2026
1847 $path = "$path"; # make sure its a string 2027 $path = "$path"; # make sure it's a string
1848 2028
1849 $path =~ s/\.map$//; 2029 $path =~ s/\.map$//;
1850 2030
1851 # map plan: 2031 # map plan:
1852 # 2032 #
1867 $base =~ s{[^/]+/?$}{}; 2047 $base =~ s{[^/]+/?$}{};
1868 $path = "$base/$path"; 2048 $path = "$base/$path";
1869 } 2049 }
1870 2050
1871 for ($path) { 2051 for ($path) {
1872 redo if s{//}{/};
1873 redo if s{/\.?/}{/}; 2052 redo if s{/\.?/}{/};
1874 redo if s{/[^/]+/\.\./}{/}; 2053 redo if s{/[^/]+/\.\./}{/};
1875 } 2054 }
1876 2055
1877 $path 2056 $path
1891 $self->init; # pass $1 etc. 2070 $self->init; # pass $1 etc.
1892 return $self; 2071 return $self;
1893 } 2072 }
1894 } 2073 }
1895 2074
1896 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2075 Carp::cluck "unable to resolve path '$path' (base '$base')";
1897 () 2076 ()
1898} 2077}
1899 2078
2079# may re-bless or do other evil things
1900sub init { 2080sub init {
1901 my ($self) = @_; 2081 my ($self) = @_;
1902 2082
1903 $self 2083 $self
1904} 2084}
1935 2115
1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2116 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1937 "$UNIQUEDIR/$path" 2117 "$UNIQUEDIR/$path"
1938} 2118}
1939 2119
1940# and all this just because we cannot iterate over
1941# all maps in C++...
1942sub change_all_map_light {
1943 my ($change) = @_;
1944
1945 $_->change_map_light ($change)
1946 for grep $_->outdoor, values %cf::MAP;
1947}
1948
1949sub decay_objects { 2120sub decay_objects {
1950 my ($self) = @_; 2121 my ($self) = @_;
1951 2122
1952 return if $self->{deny_reset}; 2123 return if $self->{deny_reset};
1953 2124
1978 $self->{load_path} = $path; 2149 $self->{load_path} = $path;
1979 2150
1980 1 2151 1
1981} 2152}
1982 2153
2154# used to laod the header of an original map
1983sub load_header_orig { 2155sub load_header_orig {
1984 my ($self) = @_; 2156 my ($self) = @_;
1985 2157
1986 $self->load_header_from ($self->load_path) 2158 $self->load_header_from ($self->load_path)
1987} 2159}
1988 2160
2161# used to laod the header of an instantiated map
1989sub load_header_temp { 2162sub load_header_temp {
1990 my ($self) = @_; 2163 my ($self) = @_;
1991 2164
1992 $self->load_header_from ($self->save_path) 2165 $self->load_header_from ($self->save_path)
1993} 2166}
1994 2167
2168# called after loading the header from an instantiated map
1995sub prepare_temp { 2169sub prepare_temp {
1996 my ($self) = @_; 2170 my ($self) = @_;
1997 2171
1998 $self->last_access ((delete $self->{last_access}) 2172 $self->last_access ((delete $self->{last_access})
1999 || $cf::RUNTIME); #d# 2173 || $cf::RUNTIME); #d#
2000 # safety 2174 # safety
2001 $self->{instantiate_time} = $cf::RUNTIME 2175 $self->{instantiate_time} = $cf::RUNTIME
2002 if $self->{instantiate_time} > $cf::RUNTIME; 2176 if $self->{instantiate_time} > $cf::RUNTIME;
2003} 2177}
2004 2178
2179# called after loading the header from an original map
2005sub prepare_orig { 2180sub prepare_orig {
2006 my ($self) = @_; 2181 my ($self) = @_;
2007 2182
2008 $self->{load_original} = 1; 2183 $self->{load_original} = 1;
2009 $self->{instantiate_time} = $cf::RUNTIME; 2184 $self->{instantiate_time} = $cf::RUNTIME;
2033 2208
2034sub find; 2209sub find;
2035sub find { 2210sub find {
2036 my ($path, $origin) = @_; 2211 my ($path, $origin) = @_;
2037 2212
2213 cf::cede_to_tick;
2214
2038 $path = normalise $path, $origin && $origin->path; 2215 $path = normalise $path, $origin;
2039 2216
2040 cf::lock_wait "map_data:$path";#d#remove 2217 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2041 cf::lock_wait "map_find:$path"; 2218 my $guard2 = cf::lock_acquire "map_find:$path";
2042 2219
2043 $cf::MAP{$path} || do { 2220 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
2047 my $map = new_from_path cf::map $path 2221 my $map = new_from_path cf::map $path
2048 or return; 2222 or return;
2049 2223
2050 $map->{last_save} = $cf::RUNTIME; 2224 $map->{last_save} = $cf::RUNTIME;
2051 2225
2063 2237
2064 $cf::MAP{$path} = $map 2238 $cf::MAP{$path} = $map
2065 } 2239 }
2066} 2240}
2067 2241
2068sub pre_load { } 2242sub pre_load { }
2069sub post_load { } 2243#sub post_load { } # XS
2070 2244
2071sub load { 2245sub load {
2072 my ($self) = @_; 2246 my ($self) = @_;
2073 2247
2074 local $self->{deny_reset} = 1; # loading can take a long time 2248 local $self->{deny_reset} = 1; # loading can take a long time
2077 2251
2078 { 2252 {
2079 my $guard = cf::lock_acquire "map_data:$path"; 2253 my $guard = cf::lock_acquire "map_data:$path";
2080 2254
2081 return unless $self->valid; 2255 return unless $self->valid;
2082 return unless $self->in_memory == cf::MAP_SWAPPED; 2256 return unless $self->state == cf::MAP_SWAPPED;
2083
2084 $self->in_memory (cf::MAP_LOADING);
2085 2257
2086 $self->alloc; 2258 $self->alloc;
2087 2259
2088 $self->pre_load; 2260 $self->pre_load;
2089 cf::cede_to_tick; 2261 cf::cede_to_tick;
2090 2262
2263 if (exists $self->{load_path}) {
2091 my $f = new_from_file cf::object::thawer $self->{load_path}; 2264 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block; 2265 $f->skip_block;
2093 $self->_load_objects ($f) 2266 $self->_load_objects ($f)
2094 or return; 2267 or return;
2095 2268
2096 $self->post_load_original 2269 $self->post_load_original
2097 if delete $self->{load_original}; 2270 if delete $self->{load_original};
2098 2271
2099 if (my $uniq = $self->uniq_path) { 2272 if (my $uniq = $self->uniq_path) {
2100 utf8::encode $uniq; 2273 utf8::encode $uniq;
2101 unless (aio_stat $uniq) { 2274 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) { 2275 if (my $f = new_from_file cf::object::thawer $uniq) {
2103 $self->clear_unique_items; 2276 $self->clear_unique_items;
2104 $self->_load_objects ($f); 2277 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs; 2278 $f->resolve_delayed_derefs;
2279 }
2106 } 2280 }
2107 } 2281 }
2108 }
2109 2282
2110 $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);
2111 2290
2112 cf::cede_to_tick; 2291 cf::cede_to_tick;
2113 # now do the right thing for maps 2292 # now do the right thing for maps
2114 $self->link_multipart_objects; 2293 $self->link_multipart_objects;
2115 $self->difficulty ($self->estimate_difficulty) 2294 $self->difficulty ($self->estimate_difficulty)
2119 unless ($self->{deny_activate}) { 2298 unless ($self->{deny_activate}) {
2120 $self->decay_objects; 2299 $self->decay_objects;
2121 $self->fix_auto_apply; 2300 $self->fix_auto_apply;
2122 $self->update_buttons; 2301 $self->update_buttons;
2123 cf::cede_to_tick; 2302 cf::cede_to_tick;
2124 $self->set_darkness_map; 2303 #$self->activate; # no longer activate maps automatically
2125 cf::cede_to_tick;
2126 $self->activate;
2127 } 2304 }
2128 2305
2129 $self->{last_save} = $cf::RUNTIME; 2306 $self->{last_save} = $cf::RUNTIME;
2130 $self->last_access ($cf::RUNTIME); 2307 $self->last_access ($cf::RUNTIME);
2131
2132 $self->in_memory (cf::MAP_ACTIVE);
2133 } 2308 }
2134 2309
2135 $self->post_load; 2310 $self->post_load;
2136}
2137 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
2138sub customise_for { 2318sub customise_for {
2139 my ($self, $ob) = @_; 2319 my ($self, $ob) = @_;
2140 2320
2141 return find "~" . $ob->name . "/" . $self->{path} 2321 return find "~" . $ob->name . "/" . $self->{path}
2142 if $self->per_player; 2322 if $self->per_player;
2145# if $self->per_party; 2325# if $self->per_party;
2146 2326
2147 $self 2327 $self
2148} 2328}
2149 2329
2150# find and load all maps in the 3x3 area around a map
2151sub load_neighbours {
2152 my ($map) = @_;
2153
2154 my @neigh; # diagonal neighbours
2155
2156 for (0 .. 3) {
2157 my $neigh = $map->tile_path ($_)
2158 or next;
2159 $neigh = find $neigh, $map
2160 or next;
2161 $neigh->load;
2162
2163 push @neigh,
2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2166 }
2167
2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
2170 my $neigh = find $path, $origin
2171 or next;
2172 $neigh->load;
2173 }
2174}
2175
2176sub find_sync { 2330sub find_sync {
2177 my ($path, $origin) = @_; 2331 my ($path, $origin) = @_;
2178 2332
2179 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
2180} 2338}
2181 2339
2182sub do_load_sync { 2340sub do_load_sync {
2183 my ($map) = @_; 2341 my ($map) = @_;
2184 2342
2343 # it's a bug to call this from the main context
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2344 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main; 2345 if $Coro::current == $Coro::main;
2187 2346
2188 cf::sync_job { $map->load }; 2347 $map->load;
2189} 2348}
2190 2349
2191our %MAP_PREFETCH; 2350our %MAP_PREFETCH;
2192our $MAP_PREFETCHER = undef; 2351our $MAP_PREFETCHER = undef;
2193 2352
2194sub find_async { 2353sub find_async {
2195 my ($path, $origin, $load) = @_; 2354 my ($path, $origin, $load) = @_;
2196 2355
2197 $path = normalise $path, $origin && $origin->{path}; 2356 $path = normalise $path, $origin;
2198 2357
2199 if (my $map = $cf::MAP{$path}) { 2358 if (my $map = $cf::MAP{$path}) {
2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2359 return $map if !$load || $map->linkable;
2201 } 2360 }
2202 2361
2203 $MAP_PREFETCH{$path} |= $load; 2362 $MAP_PREFETCH{$path} |= $load;
2204 2363
2205 $MAP_PREFETCHER ||= cf::async { 2364 $MAP_PREFETCHER ||= cf::async {
2219 $MAP_PREFETCHER->prio (6); 2378 $MAP_PREFETCHER->prio (6);
2220 2379
2221 () 2380 ()
2222} 2381}
2223 2382
2383# common code, used by both ->save and ->swapout
2224sub save { 2384sub _save {
2225 my ($self) = @_; 2385 my ($self) = @_;
2226
2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
2228 2386
2229 $self->{last_save} = $cf::RUNTIME; 2387 $self->{last_save} = $cf::RUNTIME;
2230 2388
2231 return unless $self->dirty; 2389 return unless $self->dirty;
2232 2390
2252 } else { 2410 } else {
2253 $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);
2254 } 2412 }
2255} 2413}
2256 2414
2415sub save {
2416 my ($self) = @_;
2417
2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2419
2420 $self->_save;
2421}
2422
2257sub swap_out { 2423sub swap_out {
2258 my ($self) = @_; 2424 my ($self) = @_;
2259 2425
2260 # save first because save cedes
2261 $self->save;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2426 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264 2427
2428 return if !$self->linkable;
2429 return if $self->{deny_save};
2265 return if $self->players; 2430 return if $self->players;
2266 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
2267 return if $self->{deny_save}; 2448 return 1e99 if $self->{deny_reset};
2268 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
2269 $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};
2270 2482
2271 $self->deactivate; 2483 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP; 2484 $_->clear_links_to ($self) for values %cf::MAP;
2273 $self->clear; 2485 $self->clear;
2274}
2275
2276sub reset_at {
2277 my ($self) = @_;
2278
2279 # TODO: safety, remove and allow resettable per-player maps
2280 return 1e99 if $self->{deny_reset};
2281
2282 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2283 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2284
2285 $time + $to
2286}
2287
2288sub should_reset {
2289 my ($self) = @_;
2290
2291 $self->reset_at <= $cf::RUNTIME
2292}
2293
2294sub reset {
2295 my ($self) = @_;
2296
2297 my $lock = cf::lock_acquire "map_data:$self->{path}";
2298
2299 return if $self->players;
2300
2301 warn "resetting map ", $self->path;
2302
2303 $self->in_memory (cf::MAP_SWAPPED);
2304
2305 # need to save uniques path
2306 unless ($self->{deny_save}) {
2307 my $uniq = $self->uniq_path; utf8::encode $uniq;
2308
2309 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2310 if $uniq;
2311 }
2312
2313 delete $cf::MAP{$self->path};
2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2317 $self->clear;
2318 2486
2319 $self->unlink_save; 2487 $self->unlink_save;
2320 $self->destroy; 2488 $self->destroy;
2321} 2489}
2322 2490
2330 2498
2331 delete $cf::MAP{$self->path}; 2499 delete $cf::MAP{$self->path};
2332 2500
2333 $self->unlink_save; 2501 $self->unlink_save;
2334 2502
2335 bless $self, "cf::map"; 2503 bless $self, "cf::map::wrap";
2336 delete $self->{deny_reset}; 2504 delete $self->{deny_reset};
2337 $self->{deny_save} = 1; 2505 $self->{deny_save} = 1;
2338 $self->reset_timeout (1); 2506 $self->reset_timeout (1);
2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2507 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2340 2508
2397 : normalise $_ 2565 : normalise $_
2398 } @{ aio_readdir $UNIQUEDIR or [] } 2566 } @{ aio_readdir $UNIQUEDIR or [] }
2399 ] 2567 ]
2400} 2568}
2401 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
2402=back 2602=back
2403 2603
2404=head3 cf::object 2604=head3 cf::object
2405 2605
2406=cut 2606=cut
2471 2671
2472our $SAY_CHANNEL = { 2672our $SAY_CHANNEL = {
2473 id => "say", 2673 id => "say",
2474 title => "Map", 2674 title => "Map",
2475 reply => "say ", 2675 reply => "say ",
2476 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.",
2477}; 2677};
2478 2678
2479our $CHAT_CHANNEL = { 2679our $CHAT_CHANNEL = {
2480 id => "chat", 2680 id => "chat",
2481 title => "Chat", 2681 title => "Chat",
2536 2736
2537=item $player_object->enter_link 2737=item $player_object->enter_link
2538 2738
2539Freezes 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}>).
2540 2740
2541The 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.
2542I<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.
2543 2745
2544Will never block. 2746Will never block.
2545 2747
2546=item $player_object->leave_link ($map, $x, $y) 2748=item $player_object->leave_link ($map, $x, $y)
2547 2749
2567sub cf::object::player::enter_link { 2769sub cf::object::player::enter_link {
2568 my ($self) = @_; 2770 my ($self) = @_;
2569 2771
2570 $self->deactivate_recursive; 2772 $self->deactivate_recursive;
2571 2773
2774 ++$self->{_link_recursion};
2775
2572 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2776 return if UNIVERSAL::isa $self->map, "ext::map_link";
2573 2777
2574 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2778 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2575 if $self->map && $self->map->{path} ne "{link}"; 2779 if $self->map && $self->map->{path} ne "{link}";
2576 2780
2577 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2781 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2578} 2782}
2579 2783
2580sub cf::object::player::leave_link { 2784sub cf::object::player::leave_link {
2581 my ($self, $map, $x, $y) = @_; 2785 my ($self, $map, $x, $y) = @_;
2582 2786
2599 ($x, $y) = (-1, -1) 2803 ($x, $y) = (-1, -1)
2600 unless (defined $x) && (defined $y); 2804 unless (defined $x) && (defined $y);
2601 2805
2602 # use -1 or undef as default coordinates, not 0, 0 2806 # use -1 or undef as default coordinates, not 0, 0
2603 ($x, $y) = ($map->enter_x, $map->enter_y) 2807 ($x, $y) = ($map->enter_x, $map->enter_y)
2604 if $x <=0 && $y <= 0; 2808 if $x <= 0 && $y <= 0;
2605 2809
2606 $map->load; 2810 $map->load;
2607 $map->load_neighbours;
2608 2811
2609 return unless $self->contr->active; 2812 return unless $self->contr->active;
2610 $self->activate_recursive;
2611 2813
2612 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2814 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2613 $self->enter_map ($map, $x, $y); 2815 if ($self->enter_map ($map, $x, $y)) {
2614} 2816 # entering was successful
2817 delete $self->{_link_recursion};
2818 # only activate afterwards, to support waiting in hooks
2819 $self->activate_recursive;
2820 }
2615 2821
2822}
2823
2616=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)]])
2617 2825
2618Moves 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
2619her, loading and preparing them map, calling the provided $check callback 2827her, loading and preparing them map, calling the provided $check callback
2620that 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
2621the 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
2628 2836
2629our $GOTOGEN; 2837our $GOTOGEN;
2630 2838
2631sub cf::object::player::goto { 2839sub cf::object::player::goto {
2632 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 }
2633 2847
2634 # 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
2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2849 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2636 2850
2637 $self->enter_link; 2851 $self->enter_link;
2657 ($path, $x, $y) = (undef, undef, undef); 2871 ($path, $x, $y) = (undef, undef, undef);
2658 } 2872 }
2659 } 2873 }
2660 2874
2661 my $map = eval { 2875 my $map = eval {
2662 my $map = defined $path ? cf::map::find $path : undef; 2876 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2663 2877
2664 if ($map) { 2878 if ($map) {
2665 $map = $map->customise_for ($self); 2879 $map = $map->customise_for ($self);
2666 $map = $check->($map) if $check && $map; 2880 $map = $check->($map, $x, $y, $self) if $check && $map;
2667 } else { 2881 } else {
2668 $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);
2669 } 2883 }
2670 2884
2671 $map 2885 $map
2679 if ($gen == $self->{_goto_generation}) { 2893 if ($gen == $self->{_goto_generation}) {
2680 delete $self->{_goto_generation}; 2894 delete $self->{_goto_generation};
2681 $self->leave_link ($map, $x, $y); 2895 $self->leave_link ($map, $x, $y);
2682 } 2896 }
2683 2897
2684 $done->() if $done; 2898 $done->($self) if $done;
2685 })->prio (1); 2899 })->prio (1);
2686} 2900}
2687 2901
2688=item $player_object->enter_exit ($exit_object) 2902=item $player_object->enter_exit ($exit_object)
2689 2903
2757 $Coro::current->{desc} = "enter_exit"; 2971 $Coro::current->{desc} = "enter_exit";
2758 2972
2759 unless (eval { 2973 unless (eval {
2760 $self->deactivate_recursive; # just to be sure 2974 $self->deactivate_recursive; # just to be sure
2761 2975
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2976 my $map = cf::map::normalise $exit->slaying, $exit->map;
2771 my $x = $exit->stats->hp; 2977 my $x = $exit->stats->hp;
2772 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 }
2773 3002
2774 $self->goto ($map, $x, $y); 3003 $self->goto ($map, $x, $y);
2775 3004
2776 # if exit is damned, update players death & WoR home-position 3005 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y) 3006 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED); 3007 if $exit->flag (cf::FLAG_DAMNED);
2779 3008
2780 1 3009 1
2781 }) { 3010 }) {
2782 $self->message ("Something went wrong deep within the crossfire server. " 3011 $self->message ("Something went wrong deep within the deliantra server. "
2783 . "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. "
2784 . "Please report this to the dungeon master!", 3013 . "Please report this to the dungeon master!",
2785 cf::NDI_UNIQUE | cf::NDI_RED); 3014 cf::NDI_UNIQUE | cf::NDI_RED);
2786 3015
2787 warn "ERROR in enter_exit: $@"; 3016 error "ERROR in enter_exit: $@";
2788 $self->leave_link; 3017 $self->leave_link;
2789 } 3018 }
2790 })->prio (1); 3019 })->prio (1);
2791} 3020}
2792 3021
2804sub cf::client::send_drawinfo { 3033sub cf::client::send_drawinfo {
2805 my ($self, $text, $flags) = @_; 3034 my ($self, $text, $flags) = @_;
2806 3035
2807 utf8::encode $text; 3036 utf8::encode $text;
2808 $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);
2809} 3063}
2810 3064
2811=item $client->send_msg ($channel, $msg, $color, [extra...]) 3065=item $client->send_msg ($channel, $msg, $color, [extra...])
2812 3066
2813Send 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
2817 3071
2818=cut 3072=cut
2819 3073
2820# non-persistent channels (usually the info channel) 3074# non-persistent channels (usually the info channel)
2821our %CHANNEL = ( 3075our %CHANNEL = (
3076 "c/motd" => {
3077 id => "infobox",
3078 title => "MOTD",
3079 reply => undef,
3080 tooltip => "The message of the day",
3081 },
2822 "c/identify" => { 3082 "c/identify" => {
2823 id => "infobox", 3083 id => "infobox",
2824 title => "Identify", 3084 title => "Identify",
2825 reply => undef, 3085 reply => undef,
2826 tooltip => "Items recently identified", 3086 tooltip => "Items recently identified",
2828 "c/examine" => { 3088 "c/examine" => {
2829 id => "infobox", 3089 id => "infobox",
2830 title => "Examine", 3090 title => "Examine",
2831 reply => undef, 3091 reply => undef,
2832 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",
2833 }, 3099 },
2834 "c/book" => { 3100 "c/book" => {
2835 id => "infobox", 3101 id => "infobox",
2836 title => "Book", 3102 title => "Book",
2837 reply => undef, 3103 reply => undef,
2853 id => "infobox", 3119 id => "infobox",
2854 title => "Body Parts", 3120 title => "Body Parts",
2855 reply => undef, 3121 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available", 3122 tooltip => "Shows which body parts you posess and are available",
2857 }, 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 },
2858 "c/uptime" => { 3160 "c/uptime" => {
2859 id => "infobox", 3161 id => "infobox",
2860 title => "Uptime", 3162 title => "Uptime",
2861 reply => undef, 3163 reply => undef,
2862 tooltip => "How long the server has been running since last restart", 3164 tooltip => "How long the server has been running since last restart",
2871 id => "party", 3173 id => "party",
2872 title => "Party", 3174 title => "Party",
2873 reply => "gsay ", 3175 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party", 3176 tooltip => "Messages and chat related to your party",
2875 }, 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,
2876); 3186);
2877 3187
2878sub cf::client::send_msg { 3188sub cf::client::send_msg {
2879 my ($self, $channel, $msg, $color, @extra) = @_; 3189 my ($self, $channel, $msg, $color, @extra) = @_;
2880 3190
2881 $msg = $self->pl->expand_cfpod ($msg); 3191 $msg = $self->pl->expand_cfpod ($msg)
3192 unless $color & cf::NDI_VERBATIM;
2882 3193
2883 $color &= cf::NDI_CLIENT_MASK; # just in case... 3194 $color &= cf::NDI_CLIENT_MASK; # just in case...
2884 3195
2885 # check predefined channels, for the benefit of C 3196 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) { 3197 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel}; 3198 $channel = $CHANNEL{$channel};
2888 3199
2889 $self->ext_msg (channel_info => $channel) 3200 $self->ext_msg (channel_info => $channel);
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id}; 3201 $channel = $channel->{id};
2893 3202
2894 } elsif (ref $channel) { 3203 } elsif (ref $channel) {
2895 # send meta info to client, if not yet sent 3204 # send meta info to client, if not yet sent
2896 unless (exists $self->{channel}{$channel->{id}}) { 3205 unless (exists $self->{channel}{$channel->{id}}) {
2897 $self->{channel}{$channel->{id}} = $channel; 3206 $self->{channel}{$channel->{id}} = $channel;
2898 $self->ext_msg (channel_info => $channel) 3207 $self->ext_msg (channel_info => $channel);
2899 if $self->can_msg;
2900 } 3208 }
2901 3209
2902 $channel = $channel->{id}; 3210 $channel = $channel->{id};
2903 } 3211 }
2904 3212
2905 return unless @extra || length $msg; 3213 return unless @extra || length $msg;
2906 3214
2907 if ($self->can_msg) {
2908 # default colour, mask it out 3215 # default colour, mask it out
2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3216 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2910 if $color & cf::NDI_DEF; 3217 if $color & cf::NDI_DEF;
2911 3218
2912 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3219 my $pkt = "msg "
3220 . $self->{json_coder}->encode (
2913 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3221 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2914 } else { 3222 );
2915 if ($color >= 0) {
2916 # replace some tags by gcfclient-compatible ones
2917 for ($msg) {
2918 1 while
2919 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2920 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2921 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2922 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2923 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2924 }
2925 3223
2926 $color &= cf::NDI_COLOR_MASK; 3224 $self->send_big_packet ($pkt);
2927
2928 utf8::encode $msg;
2929
2930 if (0 && $msg =~ /\[/) {
2931 # COMMAND/INFO
2932 $self->send_packet ("drawextinfo $color 10 8 $msg")
2933 } else {
2934 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2935 $self->send_packet ("drawinfo $color $msg")
2936 }
2937 }
2938 }
2939} 3225}
2940 3226
2941=item $client->ext_msg ($type, @msg) 3227=item $client->ext_msg ($type, @msg)
2942 3228
2943Sends an ext event to the client. 3229Sends an ext event to the client.
2946 3232
2947sub cf::client::ext_msg($$@) { 3233sub cf::client::ext_msg($$@) {
2948 my ($self, $type, @msg) = @_; 3234 my ($self, $type, @msg) = @_;
2949 3235
2950 if ($self->extcmd == 2) { 3236 if ($self->extcmd == 2) {
2951 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3237 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2952 } elsif ($self->extcmd == 1) { # TODO: remove 3238 } elsif ($self->extcmd == 1) { # TODO: remove
2953 push @msg, msgtype => "event_$type"; 3239 push @msg, msgtype => "event_$type";
2954 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2955 } 3241 }
2956} 3242}
2957 3243
2958=item $client->ext_reply ($msgid, @msg) 3244=item $client->ext_reply ($msgid, @msg)
2959 3245
2962=cut 3248=cut
2963 3249
2964sub cf::client::ext_reply($$@) { 3250sub cf::client::ext_reply($$@) {
2965 my ($self, $id, @msg) = @_; 3251 my ($self, $id, @msg) = @_;
2966 3252
2967 if ($self->extcmd == 2) { 3253 return unless $self->extcmd == 2;
3254
2968 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3255 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2969 } elsif ($self->extcmd == 1) {
2970 #TODO: version 1, remove
2971 unshift @msg, msgtype => "reply", msgid => $id;
2972 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2973 }
2974} 3256}
2975 3257
2976=item $success = $client->query ($flags, "text", \&cb) 3258=item $success = $client->query ($flags, "text", \&cb)
2977 3259
2978Queues a query to the client, calling the given callback with 3260Queues a query to the client, calling the given callback with
3033 my ($ns, $buf) = @_; 3315 my ($ns, $buf) = @_;
3034 3316
3035 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3317 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3036 3318
3037 if (ref $msg) { 3319 if (ref $msg) {
3038 my ($type, $reply, @payload) = 3320 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3039 "ARRAY" eq ref $msg
3040 ? @$msg
3041 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3042 3321
3043 my @reply; 3322 my @reply;
3044 3323
3045 if (my $cb = $EXTICMD{$type}) { 3324 if (my $cb = $EXTICMD{$type}) {
3046 @reply = $cb->($ns, @payload); 3325 @reply = $cb->($ns, @payload);
3048 3327
3049 $ns->ext_reply ($reply, @reply) 3328 $ns->ext_reply ($reply, @reply)
3050 if $reply; 3329 if $reply;
3051 3330
3052 } else { 3331 } else {
3053 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";
3054 } 3333 }
3055 3334
3056 cf::override; 3335 cf::override;
3057 }, 3336 },
3058); 3337);
3078 3357
3079 $coro 3358 $coro
3080} 3359}
3081 3360
3082cf::client->attach ( 3361cf::client->attach (
3083 on_destroy => sub { 3362 on_client_destroy => sub {
3084 my ($ns) = @_; 3363 my ($ns) = @_;
3085 3364
3086 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3365 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3087 }, 3366 },
3088); 3367);
3104our $safe_hole = new Safe::Hole; 3383our $safe_hole = new Safe::Hole;
3105 3384
3106$SIG{FPE} = 'IGNORE'; 3385$SIG{FPE} = 'IGNORE';
3107 3386
3108$safe->permit_only (Opcode::opset qw( 3387$safe->permit_only (Opcode::opset qw(
3109 :base_core :base_mem :base_orig :base_math 3388 :base_core :base_mem :base_orig :base_math :base_loop
3110 grepstart grepwhile mapstart mapwhile 3389 grepstart grepwhile mapstart mapwhile
3111 sort time 3390 sort time
3112)); 3391));
3113 3392
3114# here we export the classes and methods available to script code 3393# here we export the classes and methods available to script code
3118The following functions and methods are available within a safe environment: 3397The following functions and methods are available within a safe environment:
3119 3398
3120 cf::object 3399 cf::object
3121 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
3122 insert remove name archname title slaying race decrease split 3401 insert remove name archname title slaying race decrease split
3402 value
3123 3403
3124 cf::object::player 3404 cf::object::player
3125 player 3405 player
3126 3406
3127 cf::player 3407 cf::player
3133=cut 3413=cut
3134 3414
3135for ( 3415for (
3136 ["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
3137 insert remove inv nrof name archname title slaying race 3417 insert remove inv nrof name archname title slaying race
3138 decrease split destroy change_exp)], 3418 decrease split destroy change_exp value msg lore send_msg)],
3139 ["cf::object::player" => qw(player)], 3419 ["cf::object::player" => qw(player)],
3140 ["cf::player" => qw(peaceful)], 3420 ["cf::player" => qw(peaceful send_msg)],
3141 ["cf::map" => qw(trigger)], 3421 ["cf::map" => qw(trigger)],
3142) { 3422) {
3143 no strict 'refs';
3144 my ($pkg, @funs) = @$_; 3423 my ($pkg, @funs) = @$_;
3145 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3424 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3146 for @funs; 3425 for @funs;
3147} 3426}
3148 3427
3163 3442
3164 my $qcode = $code; 3443 my $qcode = $code;
3165 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3444 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3166 $qcode =~ s/\n/\\n/g; 3445 $qcode =~ s/\n/\\n/g;
3167 3446
3447 %vars = (_dummy => 0) unless %vars;
3448
3449 my @res;
3168 local $_; 3450 local $_;
3169 local @safe::cf::_safe_eval_args = values %vars;
3170 3451
3171 my $eval = 3452 my $eval =
3172 "do {\n" 3453 "do {\n"
3173 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3454 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3174 . "#line 0 \"{$qcode}\"\n" 3455 . "#line 0 \"{$qcode}\"\n"
3175 . $code 3456 . $code
3176 . "\n}" 3457 . "\n}"
3177 ; 3458 ;
3178 3459
3460 if ($CFG{safe_eval}) {
3179 sub_generation_inc; 3461 sub_generation_inc;
3462 local @safe::cf::_safe_eval_args = values %vars;
3180 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3463 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3181 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 }
3182 3469
3183 if ($@) { 3470 if ($@) {
3184 warn "$@"; 3471 warn "$@",
3185 warn "while executing safe code '$code'\n"; 3472 "while executing safe code '$code'\n",
3186 warn "with arguments " . (join " ", %vars) . "\n"; 3473 "with arguments " . (join " ", %vars) . "\n";
3187 } 3474 }
3188 3475
3189 wantarray ? @res : $res[0] 3476 wantarray ? @res : $res[0]
3190} 3477}
3191 3478
3205=cut 3492=cut
3206 3493
3207sub register_script_function { 3494sub register_script_function {
3208 my ($fun, $cb) = @_; 3495 my ($fun, $cb) = @_;
3209 3496
3210 no strict 'refs'; 3497 $fun = "safe::$fun" if $CFG{safe_eval};
3211 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3498 *$fun = $safe_hole->wrap ($cb);
3212} 3499}
3213 3500
3214=back 3501=back
3215 3502
3216=cut 3503=cut
3217 3504
3218############################################################################# 3505#############################################################################
3219# the server's init and main functions 3506# the server's init and main functions
3507
3508our %FACEHASH; # hash => idx, #d# HACK for http server
3220 3509
3221sub load_facedata($) { 3510sub load_facedata($) {
3222 my ($path) = @_; 3511 my ($path) = @_;
3223 3512
3224 # HACK to clear player env face cache, we need some signal framework 3513 # HACK to clear player env face cache, we need some signal framework
3225 # for this (global event?) 3514 # for this (global event?)
3226 %ext::player_env::MUSIC_FACE_CACHE = (); 3515 %ext::player_env::MUSIC_FACE_CACHE = ();
3227 3516
3228 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3517 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3229 3518
3230 warn "loading facedata from $path\n"; 3519 trace "loading facedata from $path\n";
3231 3520
3232 my $facedata; 3521 my $facedata = decode_storable load_file $path;
3233 0 < aio_load $path, $facedata
3234 or die "$path: $!";
3235
3236 $facedata = Coro::Storable::thaw $facedata;
3237 3522
3238 $facedata->{version} == 2 3523 $facedata->{version} == 2
3239 or cf::cleanup "$path: version mismatch, cannot proceed."; 3524 or cf::cleanup "$path: version mismatch, cannot proceed.";
3240 3525
3241 # patch in the exptable 3526 # patch in the exptable
3527 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3242 $facedata->{resource}{"res/exp_table"} = { 3528 $facedata->{resource}{"res/exp_table"} = {
3243 type => FT_RSRC, 3529 type => FT_RSRC,
3244 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3530 data => $exp_table,
3531 hash => (Digest::MD5::md5 $exp_table),
3245 }; 3532 };
3246 cf::cede_to_tick; 3533 cf::cede_to_tick;
3247 3534
3248 { 3535 {
3249 my $faces = $facedata->{faceinfo}; 3536 my $faces = $facedata->{faceinfo};
3251 while (my ($face, $info) = each %$faces) { 3538 while (my ($face, $info) = each %$faces) {
3252 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3539 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3253 3540
3254 cf::face::set_visibility $idx, $info->{visibility}; 3541 cf::face::set_visibility $idx, $info->{visibility};
3255 cf::face::set_magicmap $idx, $info->{magicmap}; 3542 cf::face::set_magicmap $idx, $info->{magicmap};
3256 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3543 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3257 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3544 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3545 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3546 $FACEHASH{$info->{hash64}} = $idx;#d#
3258 3547
3259 cf::cede_to_tick; 3548 cf::cede_to_tick;
3260 } 3549 }
3261 3550
3262 while (my ($face, $info) = each %$faces) { 3551 while (my ($face, $info) = each %$faces) {
3267 3556
3268 if (my $smooth = cf::face::find $info->{smooth}) { 3557 if (my $smooth = cf::face::find $info->{smooth}) {
3269 cf::face::set_smooth $idx, $smooth; 3558 cf::face::set_smooth $idx, $smooth;
3270 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3559 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3271 } else { 3560 } else {
3272 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3561 error "smooth face '$info->{smooth}' not found for face '$face'";
3273 } 3562 }
3274 3563
3275 cf::cede_to_tick; 3564 cf::cede_to_tick;
3276 } 3565 }
3277 } 3566 }
3286 3575
3287 cf::anim::invalidate_all; # d'oh 3576 cf::anim::invalidate_all; # d'oh
3288 } 3577 }
3289 3578
3290 { 3579 {
3291 # TODO: for gcfclient pleasure, we should give resources
3292 # that gcfclient doesn't grok a >10000 face index.
3293 my $res = $facedata->{resource}; 3580 my $res = $facedata->{resource};
3294 3581
3295 while (my ($name, $info) = each %$res) { 3582 while (my ($name, $info) = each %$res) {
3296 if (defined $info->{type}) { 3583 if (defined (my $type = $info->{type})) {
3584 # TODO: different hash - must free and use new index, or cache ixface data queue
3297 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3585 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3298 my $data;
3299 3586
3300 if ($info->{type} & 1) { 3587 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3301 # prepend meta info
3302
3303 my $meta = $enc->encode ({
3304 name => $name,
3305 %{ $info->{meta} || {} },
3306 });
3307
3308 $data = pack "(w/a*)*", $meta, $info->{data};
3309 } else {
3310 $data = $info->{data};
3311 }
3312
3313 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3314 cf::face::set_type $idx, $info->{type}; 3588 cf::face::set_type $idx, $type;
3589 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3590 $FACEHASH{$info->{hash}} = $idx;#d#
3315 } else { 3591 } else {
3316 $RESOURCE{$name} = $info; 3592# $RESOURCE{$name} = $info; # unused
3317 } 3593 }
3318 3594
3319 cf::cede_to_tick; 3595 cf::cede_to_tick;
3320 } 3596 }
3321 } 3597 }
3322 3598
3323 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3599 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3324 3600
3325 1 3601 1
3326} 3602}
3327
3328cf::global->attach (on_resource_update => sub {
3329 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3330 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3331
3332 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3333 my $sound = $soundconf->{compat}[$_]
3334 or next;
3335
3336 my $face = cf::face::find "sound/$sound->[1]";
3337 cf::sound::set $sound->[0] => $face;
3338 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3339 }
3340
3341 while (my ($k, $v) = each %{$soundconf->{event}}) {
3342 my $face = cf::face::find "sound/$v";
3343 cf::sound::set $k => $face;
3344 }
3345 }
3346});
3347 3603
3348register_exticmd fx_want => sub { 3604register_exticmd fx_want => sub {
3349 my ($ns, $want) = @_; 3605 my ($ns, $want) = @_;
3350 3606
3351 while (my ($k, $v) = each %$want) { 3607 while (my ($k, $v) = each %$want) {
3390sub reload_treasures { 3646sub reload_treasures {
3391 load_resource_file "$DATADIR/treasures" 3647 load_resource_file "$DATADIR/treasures"
3392 or die "unable to load treasurelists\n"; 3648 or die "unable to load treasurelists\n";
3393} 3649}
3394 3650
3651sub reload_sound {
3652 trace "loading sound config from $DATADIR/sound\n";
3653
3654 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3655
3656 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3657 my $sound = $soundconf->{compat}[$_]
3658 or next;
3659
3660 my $face = cf::face::find "sound/$sound->[1]";
3661 cf::sound::set $sound->[0] => $face;
3662 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3663 }
3664
3665 while (my ($k, $v) = each %{$soundconf->{event}}) {
3666 my $face = cf::face::find "sound/$v";
3667 cf::sound::set $k => $face;
3668 }
3669}
3670
3395sub reload_resources { 3671sub reload_resources {
3396 warn "reloading resource files...\n"; 3672 trace "reloading resource files...\n";
3397 3673
3674 reload_exp_table;
3675 reload_materials;
3398 reload_facedata; 3676 reload_facedata;
3677 reload_sound;
3399 reload_archetypes; 3678 reload_archetypes;
3400 reload_regions; 3679 reload_regions;
3401 reload_treasures; 3680 reload_treasures;
3402 3681
3403 warn "finished reloading resource files\n"; 3682 trace "finished reloading resource files\n";
3404}
3405
3406sub init {
3407 my $guard = freeze_mainloop;
3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 reload_resources;
3412} 3683}
3413 3684
3414sub reload_config { 3685sub reload_config {
3415 open my $fh, "<:utf8", "$CONFDIR/config" 3686 trace "reloading config file...\n";
3416 or return;
3417 3687
3418 local $/; 3688 my $config = load_file "$CONFDIR/config";
3419 *CFG = YAML::Load <$fh>; 3689 utf8::decode $config;
3690 *CFG = decode_yaml $config;
3420 3691
3421 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3692 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3422 3693
3423 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3694 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3424 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3695 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3425 3696
3426 if (exists $CFG{mlockall}) { 3697 if (exists $CFG{mlockall}) {
3430 }; 3701 };
3431 warn $@ if $@; 3702 warn $@ if $@;
3432 } 3703 }
3433} 3704}
3434 3705
3706sub pidfile() {
3707 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3708 or die "$PIDFILE: $!";
3709 flock $fh, &Fcntl::LOCK_EX
3710 or die "$PIDFILE: flock: $!";
3711 $fh
3712}
3713
3714# make sure only one server instance is running at any one time
3715sub atomic {
3716 my $fh = pidfile;
3717
3718 my $pid = <$fh>;
3719 kill 9, $pid if $pid > 0;
3720
3721 seek $fh, 0, 0;
3722 print $fh $$;
3723}
3724
3725sub main_loop {
3726 trace "EV::loop starting\n";
3727 if (1) {
3728 EV::loop;
3729 }
3730 trace "EV::loop returned\n";
3731 goto &main_loop unless $REALLY_UNLOOP;
3732}
3733
3435sub main { 3734sub main {
3735 cf::init_globals; # initialise logging
3736
3737 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3738 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3739 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3740 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3741
3742 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3743
3436 # we must not ever block the main coroutine 3744 # we must not ever block the main coroutine
3437 local $Coro::idle = sub { 3745 local $Coro::idle = sub {
3438 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3746 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3439 (async { 3747 (async {
3440 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3748 $Coro::current->{desc} = "IDLE BUG HANDLER";
3441 EV::loop EV::LOOP_ONESHOT; 3749 EV::loop EV::LOOP_ONESHOT;
3442 })->prio (Coro::PRIO_MAX); 3750 })->prio (Coro::PRIO_MAX);
3443 }; 3751 };
3444 3752
3445 { 3753 evthread_start IO::AIO::poll_fileno;
3446 my $guard = freeze_mainloop; 3754
3755 cf::sync_job {
3756 cf::incloader::init ();
3757
3758 cf::init_anim;
3759 cf::init_attackmess;
3760 cf::init_dynamic;
3761
3762 cf::load_settings;
3763
3764 reload_resources;
3447 reload_config; 3765 reload_config;
3448 db_init; 3766 db_init;
3767
3768 cf::init_uuid;
3769 cf::init_signals;
3770 cf::init_skills;
3771
3772 cf::init_beforeplay;
3773
3774 atomic;
3775
3449 load_extensions; 3776 load_extensions;
3450 3777
3451 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3778 utime time, time, $RUNTIMEFILE;
3779
3780 # no (long-running) fork's whatsoever before this point(!)
3781 use POSIX ();
3782 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3783
3784 cf::_post_init 0;
3452 } 3785 };
3453 3786
3454 EV::loop; 3787 cf::object::thawer::errors_are_fatal 0;
3788 info "parse errors in files are no longer fatal from this point on.\n";
3789
3790 AE::postpone {
3791 undef &main; # free gobs of memory :)
3792 };
3793
3794 goto &main_loop;
3455} 3795}
3456 3796
3457############################################################################# 3797#############################################################################
3458# initialisation and cleanup 3798# initialisation and cleanup
3459 3799
3460# install some emergency cleanup handlers 3800# install some emergency cleanup handlers
3461BEGIN { 3801BEGIN {
3462 our %SIGWATCHER = (); 3802 our %SIGWATCHER = ();
3463 for my $signal (qw(INT HUP TERM)) { 3803 for my $signal (qw(INT HUP TERM)) {
3464 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3804 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3465 cf::cleanup "SIG$signal"; 3805 cf::cleanup "SIG$signal";
3466 }; 3806 };
3467 } 3807 }
3468} 3808}
3469 3809
3470sub write_runtime_sync { 3810sub write_runtime_sync {
3471 my $runtime = "$LOCALDIR/runtime"; 3811 my $t0 = AE::time;
3472 3812
3473 # first touch the runtime file to show we are still running: 3813 # first touch the runtime file to show we are still running:
3474 # the fsync below can take a very very long time. 3814 # the fsync below can take a very very long time.
3475 3815
3476 IO::AIO::aio_utime $runtime, undef, undef; 3816 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3477 3817
3478 my $guard = cf::lock_acquire "write_runtime"; 3818 my $guard = cf::lock_acquire "write_runtime";
3479 3819
3480 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3820 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3481 or return; 3821 or return;
3482 3822
3483 my $value = $cf::RUNTIME + 90 + 10; 3823 my $value = $cf::RUNTIME + 90 + 10;
3484 # 10 is the runtime save interval, for a monotonic clock 3824 # 10 is the runtime save interval, for a monotonic clock
3485 # 60 allows for the watchdog to kill the server. 3825 # 60 allows for the watchdog to kill the server.
3495 aio_utime $fh, undef, undef; 3835 aio_utime $fh, undef, undef;
3496 3836
3497 close $fh 3837 close $fh
3498 or return; 3838 or return;
3499 3839
3500 aio_rename "$runtime~", $runtime 3840 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3501 and return; 3841 and return;
3502 3842
3503 warn "runtime file written.\n"; 3843 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3504 3844
3505 1 3845 1
3506} 3846}
3507 3847
3508our $uuid_lock; 3848our $uuid_lock;
3517 my $uuid = "$LOCALDIR/uuid"; 3857 my $uuid = "$LOCALDIR/uuid";
3518 3858
3519 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3859 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3520 or return; 3860 or return;
3521 3861
3522 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3862 my $value = uuid_seq uuid_cur;
3863
3864 unless ($value) {
3865 info "cowardly refusing to write zero uuid value!\n";
3866 return;
3867 }
3868
3869 my $value = uuid_str $value + $uuid_skip;
3523 $uuid_skip = 0; 3870 $uuid_skip = 0;
3524 3871
3525 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3872 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3526 and return; 3873 and return;
3527 3874
3533 or return; 3880 or return;
3534 3881
3535 aio_rename "$uuid~", $uuid 3882 aio_rename "$uuid~", $uuid
3536 and return; 3883 and return;
3537 3884
3538 warn "uuid file written ($value).\n"; 3885 trace "uuid file written ($value).\n";
3539 3886
3540 1 3887 1
3541 3888
3542} 3889}
3543 3890
3549} 3896}
3550 3897
3551sub emergency_save() { 3898sub emergency_save() {
3552 my $freeze_guard = cf::freeze_mainloop; 3899 my $freeze_guard = cf::freeze_mainloop;
3553 3900
3554 warn "enter emergency perl save\n"; 3901 info "emergency_perl_save: enter\n";
3902
3903 # this is a trade-off: we want to be very quick here, so
3904 # save all maps without fsync, and later call a global sync
3905 # (which in turn might be very very slow)
3906 local $USE_FSYNC = 0;
3555 3907
3556 cf::sync_job { 3908 cf::sync_job {
3909 cf::write_runtime_sync; # external watchdog should not bark
3910
3557 # use a peculiar iteration method to avoid tripping on perl 3911 # use a peculiar iteration method to avoid tripping on perl
3558 # refcount bugs in for. also avoids problems with players 3912 # refcount bugs in for. also avoids problems with players
3559 # and maps saved/destroyed asynchronously. 3913 # and maps saved/destroyed asynchronously.
3560 warn "begin emergency player save\n"; 3914 info "emergency_perl_save: begin player save\n";
3561 for my $login (keys %cf::PLAYER) { 3915 for my $login (keys %cf::PLAYER) {
3562 my $pl = $cf::PLAYER{$login} or next; 3916 my $pl = $cf::PLAYER{$login} or next;
3563 $pl->valid or next; 3917 $pl->valid or next;
3564 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3918 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3565 $pl->save; 3919 $pl->save;
3566 } 3920 }
3567 warn "end emergency player save\n"; 3921 info "emergency_perl_save: end player save\n";
3568 3922
3569 warn "begin emergency map save\n"; 3923 cf::write_runtime_sync; # external watchdog should not bark
3924
3925 info "emergency_perl_save: begin map save\n";
3570 for my $path (keys %cf::MAP) { 3926 for my $path (keys %cf::MAP) {
3571 my $map = $cf::MAP{$path} or next; 3927 my $map = $cf::MAP{$path} or next;
3572 $map->valid or next; 3928 $map->valid or next;
3573 $map->save; 3929 $map->save;
3574 } 3930 }
3575 warn "end emergency map save\n"; 3931 info "emergency_perl_save: end map save\n";
3576 3932
3577 warn "begin emergency database checkpoint\n"; 3933 cf::write_runtime_sync; # external watchdog should not bark
3934
3935 info "emergency_perl_save: begin database checkpoint\n";
3578 BDB::db_env_txn_checkpoint $DB_ENV; 3936 BDB::db_env_txn_checkpoint $DB_ENV;
3579 warn "end emergency database checkpoint\n"; 3937 info "emergency_perl_save: end database checkpoint\n";
3580 3938
3581 warn "begin write uuid\n"; 3939 info "emergency_perl_save: begin write uuid\n";
3582 write_uuid_sync 1; 3940 write_uuid_sync 1;
3583 warn "end write uuid\n"; 3941 info "emergency_perl_save: end write uuid\n";
3942
3943 cf::write_runtime_sync; # external watchdog should not bark
3944
3945 trace "emergency_perl_save: syncing database to disk";
3946 BDB::db_env_txn_checkpoint $DB_ENV;
3947
3948 info "emergency_perl_save: starting sync\n";
3949 IO::AIO::aio_sync sub {
3950 info "emergency_perl_save: finished sync\n";
3951 };
3952
3953 cf::write_runtime_sync; # external watchdog should not bark
3954
3955 trace "emergency_perl_save: flushing outstanding aio requests";
3956 while (IO::AIO::nreqs || BDB::nreqs) {
3957 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3958 }
3959
3960 cf::write_runtime_sync; # external watchdog should not bark
3584 }; 3961 };
3585 3962
3586 warn "leave emergency perl save\n"; 3963 info "emergency_perl_save: leave\n";
3587} 3964}
3588 3965
3589sub post_cleanup { 3966sub post_cleanup {
3590 my ($make_core) = @_; 3967 my ($make_core) = @_;
3591 3968
3969 IO::AIO::flush;
3970
3592 warn Carp::longmess "post_cleanup backtrace" 3971 error Carp::longmess "post_cleanup backtrace"
3593 if $make_core; 3972 if $make_core;
3973
3974 my $fh = pidfile;
3975 unlink $PIDFILE if <$fh> == $$;
3594} 3976}
3595 3977
3596# a safer delete_package, copied from Symbol 3978# a safer delete_package, copied from Symbol
3597sub clear_package($) { 3979sub clear_package($) {
3598 my $pkg = shift; 3980 my $pkg = shift;
3614 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 3996 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3615 for my $name (keys %$leaf_symtab) { 3997 for my $name (keys %$leaf_symtab) {
3616 _gv_clear *{"$pkg$name"}; 3998 _gv_clear *{"$pkg$name"};
3617# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 3999# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3618 } 4000 }
3619 warn "cleared package #$pkg\n";#d#
3620} 4001}
3621
3622our $RELOAD; # how many times to reload
3623 4002
3624sub do_reload_perl() { 4003sub do_reload_perl() {
3625 # can/must only be called in main 4004 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 4005 unless (in_main) {
3627 warn "can only reload from main coroutine"; 4006 error "can only reload from main coroutine";
3628 return; 4007 return;
3629 } 4008 }
3630 4009
3631 return if $RELOAD++; 4010 return if $RELOAD++;
3632 4011
4012 my $t1 = AE::time;
4013
3633 while ($RELOAD) { 4014 while ($RELOAD) {
3634 warn "reloading..."; 4015 cf::get_slot 0.1, -1, "reload_perl";
4016 info "perl_reload: reloading...";
3635 4017
3636 warn "entering sync_job"; 4018 trace "perl_reload: entering sync_job";
3637 4019
3638 cf::sync_job { 4020 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 4021 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 4022
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 4023 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 4024 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 4025 %EXT_CORO = ();
3656 4026
3657 warn "removing commands"; 4027 trace "perl_reload: removing commands";
3658 %COMMAND = (); 4028 %COMMAND = ();
3659 4029
3660 warn "removing ext/exti commands"; 4030 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 4031 %EXTCMD = ();
3662 %EXTICMD = (); 4032 %EXTICMD = ();
3663 4033
3664 warn "unloading/nuking all extensions"; 4034 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 4035 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 4036 trace "... unloading $pkg";
3667 4037
3668 if (my $cb = $pkg->can ("unload")) { 4038 if (my $cb = $pkg->can ("unload")) {
3669 eval { 4039 eval {
3670 $cb->($pkg); 4040 $cb->($pkg);
3671 1 4041 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 4042 } or error "$pkg unloaded, but with errors: $@";
3673 } 4043 }
3674 4044
3675 warn "... clearing $pkg"; 4045 trace "... clearing $pkg";
3676 clear_package $pkg; 4046 clear_package $pkg;
3677 } 4047 }
3678 4048
3679 warn "unloading all perl modules loaded from $LIBDIR"; 4049 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 4050 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4051 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 4052
3683 warn "... unloading $k"; 4053 trace "... unloading $k";
3684 delete $INC{$k}; 4054 delete $INC{$k};
3685 4055
3686 $k =~ s/\.pm$//; 4056 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 4057 $k =~ s/\//::/g;
3688 4058
3691 } 4061 }
3692 4062
3693 clear_package $k; 4063 clear_package $k;
3694 } 4064 }
3695 4065
3696 warn "getting rid of safe::, as good as possible"; 4066 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 4067 clear_package "safe::$_"
3698 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4068 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3699 4069
3700 warn "unloading cf.pm \"a bit\""; 4070 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 4071 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 4072 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 4073
3704 # don't, removes xs symbols, too, 4074 # don't, removes xs symbols, too,
3705 # and global variables created in xs 4075 # and global variables created in xs
3706 #clear_package __PACKAGE__; 4076 #clear_package __PACKAGE__;
3707 4077
3708 warn "unload completed, starting to reload now"; 4078 info "perl_reload: unload completed, starting to reload now";
3709 4079
3710 warn "reloading cf.pm"; 4080 trace "perl_reload: reloading cf.pm";
3711 require cf; 4081 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4082 cf::_connect_to_perl_1;
3713 4083
3714 warn "loading config and database again"; 4084 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4085 cf::reload_config;
3716 4086
3717 warn "loading extensions"; 4087 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4088 cf::load_extensions;
3719 4089
4090 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4091 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4092 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4093 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4094 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4095 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4096 reattach $_ for values %PLAYER;
4097 }
3726 4098
3727 warn "leaving sync_job"; 4099 cf::_post_init 1;
4100
4101 trace "perl_reload: leaving sync_job";
3728 4102
3729 1 4103 1
3730 } or do { 4104 } or do {
3731 warn $@; 4105 error $@;
3732 cf::cleanup "error while reloading, exiting."; 4106 cf::cleanup "perl_reload: error, exiting.";
3733 }; 4107 };
3734 4108
3735 warn "reloaded";
3736 --$RELOAD; 4109 --$RELOAD;
3737 } 4110 }
4111
4112 $t1 = AE::time - $t1;
4113 info "perl_reload: completed in ${t1}s\n";
3738}; 4114};
3739 4115
3740our $RELOAD_WATCHER; # used only during reload 4116our $RELOAD_WATCHER; # used only during reload
3741 4117
3742sub reload_perl() { 4118sub reload_perl() {
3743 # doing reload synchronously and two reloads happen back-to-back, 4119 # doing reload synchronously and two reloads happen back-to-back,
3744 # coro crashes during coro_state_free->destroy here. 4120 # coro crashes during coro_state_free->destroy here.
3745 4121
4122 $RELOAD_WATCHER ||= cf::async {
4123 Coro::AIO::aio_wait cache_extensions;
4124
3746 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 4125 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3747 do_reload_perl; 4126 do_reload_perl;
3748 undef $RELOAD_WATCHER; 4127 undef $RELOAD_WATCHER;
4128 };
3749 }; 4129 };
3750} 4130}
3751 4131
3752register_command "reload" => sub { 4132register_command "reload" => sub {
3753 my ($who, $arg) = @_; 4133 my ($who, $arg) = @_;
3759 reload_perl; 4139 reload_perl;
3760 }; 4140 };
3761 } 4141 }
3762}; 4142};
3763 4143
3764unshift @INC, $LIBDIR; 4144#############################################################################
3765 4145
3766my $bug_warning = 0; 4146my $bug_warning = 0;
3767 4147
3768our @WAIT_FOR_TICK;
3769our @WAIT_FOR_TICK_BEGIN;
3770
3771sub wait_for_tick { 4148sub wait_for_tick() {
3772 return if tick_inhibit || $Coro::current == $Coro::main; 4149 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3773 4150
3774 my $signal = new Coro::Signal; 4151 $WAIT_FOR_TICK->wait;
3775 push @WAIT_FOR_TICK, $signal;
3776 $signal->wait;
3777} 4152}
3778 4153
3779sub wait_for_tick_begin { 4154sub wait_for_tick_begin() {
3780 return if tick_inhibit || $Coro::current == $Coro::main; 4155 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3781 4156
3782 my $signal = new Coro::Signal; 4157 my $signal = new Coro::Signal;
3783 push @WAIT_FOR_TICK_BEGIN, $signal; 4158 push @WAIT_FOR_TICK_BEGIN, $signal;
3784 $signal->wait; 4159 $signal->wait;
3785} 4160}
3789 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4164 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3790 unless ++$bug_warning > 10; 4165 unless ++$bug_warning > 10;
3791 return; 4166 return;
3792 } 4167 }
3793 4168
3794 cf::server_tick; # one server iteration 4169 cf::one_tick; # one server iteration
4170
4171 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3795 4172
3796 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4173 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3797 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4174 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3798 Coro::async_pool { 4175 Coro::async_pool {
3799 $Coro::current->{desc} = "runtime saver"; 4176 $Coro::current->{desc} = "runtime saver";
3800 write_runtime_sync 4177 write_runtime_sync
3801 or warn "ERROR: unable to write runtime file: $!"; 4178 or error "ERROR: unable to write runtime file: $!";
3802 }; 4179 };
3803 } 4180 }
3804 4181
3805 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4182 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3806 $sig->send; 4183 $sig->send;
3807 } 4184 }
3808 while (my $sig = shift @WAIT_FOR_TICK) { 4185 $WAIT_FOR_TICK->broadcast;
3809 $sig->send;
3810 }
3811 4186
3812 $LOAD = ($NOW - $TICK_START) / $TICK; 4187 $LOAD = ($NOW - $TICK_START) / $TICK;
3813 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4188 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3814 4189
3815 if (0) { 4190 if (0) {
3816 if ($NEXT_TICK) { 4191 if ($NEXT_TICK) {
3817 my $jitter = $TICK_START - $NEXT_TICK; 4192 my $jitter = $TICK_START - $NEXT_TICK;
3818 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4193 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3819 warn "jitter $JITTER\n";#d# 4194 debug "jitter $JITTER\n";#d#
3820 } 4195 }
3821 } 4196 }
3822} 4197}
3823 4198
3824{ 4199{
3825 # configure BDB 4200 # configure BDB
3826 4201
3827 BDB::min_parallel 8; 4202 BDB::min_parallel 16;
3828 BDB::max_poll_reqs $TICK * 0.1; 4203 BDB::max_poll_reqs $TICK * 0.1;
3829 $AnyEvent::BDB::WATCHER->priority (1); 4204 #$AnyEvent::BDB::WATCHER->priority (1);
3830 4205
3831 unless ($DB_ENV) { 4206 unless ($DB_ENV) {
3832 $DB_ENV = BDB::db_env_create; 4207 $DB_ENV = BDB::db_env_create;
3833 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4208 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3834 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4209 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3869 IO::AIO::min_parallel 8; 4244 IO::AIO::min_parallel 8;
3870 IO::AIO::max_poll_time $TICK * 0.1; 4245 IO::AIO::max_poll_time $TICK * 0.1;
3871 undef $AnyEvent::AIO::WATCHER; 4246 undef $AnyEvent::AIO::WATCHER;
3872} 4247}
3873 4248
3874my $_log_backtrace; 4249our $_log_backtrace;
4250our $_log_backtrace_last;
3875 4251
3876sub _log_backtrace { 4252sub _log_backtrace {
3877 my ($msg, @addr) = @_; 4253 my ($msg, @addr) = @_;
3878 4254
3879 $msg =~ s/\n//; 4255 $msg =~ s/\n$//;
3880 4256
4257 if ($_log_backtrace_last eq $msg) {
4258 LOG llevInfo, "[ABT] $msg\n";
4259 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3881 # limit the # of concurrent backtraces 4260 # limit the # of concurrent backtraces
3882 if ($_log_backtrace < 2) { 4261 } elsif ($_log_backtrace < 2) {
4262 $_log_backtrace_last = $msg;
3883 ++$_log_backtrace; 4263 ++$_log_backtrace;
4264 my $perl_bt = Carp::longmess $msg;
3884 async { 4265 async {
3885 $Coro::current->{desc} = "abt $msg"; 4266 $Coro::current->{desc} = "abt $msg";
3886 4267
3887 my @bt = fork_call { 4268 my @bt = fork_call {
3888 @addr = map { sprintf "%x", $_ } @addr; 4269 @addr = map { sprintf "%x", $_ } @addr;
3899 } 4280 }
3900 4281
3901 @funcs 4282 @funcs
3902 }; 4283 };
3903 4284
3904 LOG llevInfo, "[ABT] $msg\n"; 4285 LOG llevInfo, "[ABT] $perl_bt\n";
4286 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3905 LOG llevInfo, "[ABT] $_\n" for @bt; 4287 LOG llevInfo, "[ABT] $_\n" for @bt;
3906 --$_log_backtrace; 4288 --$_log_backtrace;
3907 }; 4289 };
3908 } else { 4290 } else {
3909 LOG llevInfo, "[ABT] $msg\n"; 4291 LOG llevInfo, "[ABT] $msg\n";
3910 LOG llevInfo, "[ABT] [suppressed]\n"; 4292 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3911 } 4293 }
3912} 4294}
3913 4295
3914# load additional modules 4296# load additional modules
3915use cf::pod; 4297require "cf/$_.pm" for @EXTRA_MODULES;
4298cf::_connect_to_perl_2;
3916 4299
3917END { cf::emergency_save } 4300END { cf::emergency_save }
3918 4301
39191 43021
3920 4303

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines