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.430 by root, Sun May 4 14:12:37 2008 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines