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.434 by root, Thu May 29 03:27:37 2008 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines