ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.439 by root, Mon Jul 14 16:42:49 2008 UTC vs.
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines