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.440 by root, Mon Aug 11 23:23:41 2008 UTC vs.
Revision 1.589 by root, Sun Nov 4 01:01:13 2012 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines