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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines