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.432 by root, Mon May 5 22:38:47 2008 UTC vs.
Revision 1.584 by root, Tue Oct 30 17:07:50 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines