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.451 by root, Mon Sep 22 05:42:41 2008 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 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 5.10.0; 25use common::sense;
25use utf8;
26use strict "vars", "subs";
27 26
28use Symbol; 27use Symbol;
29use List::Util; 28use List::Util;
30use Socket; 29use Socket;
31use EV; 30use EV;
32use Opcode; 31use Opcode;
33use Safe; 32use Safe;
34use Safe::Hole; 33use Safe::Hole;
35use Storable (); 34use Storable ();
35use Carp ();
36
37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
36 40
37use Coro (); 41use Coro ();
38use Coro::State; 42use Coro::State;
39use Coro::Handle; 43use Coro::Handle;
40use Coro::EV; 44use Coro::EV;
41use Coro::AnyEvent; 45use Coro::AnyEvent;
42use Coro::Timer; 46use Coro::Timer;
43use Coro::Signal; 47use Coro::Signal;
44use Coro::Semaphore; 48use Coro::Semaphore;
49use Coro::SemaphoreSet;
45use Coro::AnyEvent; 50use Coro::AnyEvent;
46use Coro::AIO; 51use Coro::AIO;
47use Coro::BDB 1.6; 52use Coro::BDB 1.6;
48use Coro::Storable; 53use Coro::Storable;
49use Coro::Util (); 54use Coro::Util ();
50 55
56use Guard ();
51use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
52use BDB (); 58use BDB ();
53use Data::Dumper; 59use Data::Dumper;
54use Digest::MD5;
55use Fcntl; 60use Fcntl;
56use YAML (); 61use YAML::XS ();
57use IO::AIO (); 62use IO::AIO ();
58use Time::HiRes; 63use Time::HiRes;
59use Compress::LZF; 64use Compress::LZF;
60use Digest::MD5 (); 65use Digest::MD5 ();
61 66
70 75
71# make sure c-lzf reinitialises itself 76# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; 77Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
73Compress::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
74 79
80# strictly for debugging
81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
82
75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
84
85our @ORIG_INC;
76 86
77our %COMMAND = (); 87our %COMMAND = ();
78our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
79 89
80our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
83our %EXT_CORO = (); # coroutines bound to extensions 93our %EXT_CORO = (); # coroutines bound to extensions
84our %EXT_MAP = (); # pluggable maps 94our %EXT_MAP = (); # pluggable maps
85 95
86our $RELOAD; # number of reloads so far, non-zero while in reload 96our $RELOAD; # number of reloads so far, non-zero while in reload
87our @EVENT; 97our @EVENT;
98our @REFLECT; # set by XS
99our %REFLECT; # set by us
88 100
89our $CONFDIR = confdir; 101our $CONFDIR = confdir;
102
90our $DATADIR = datadir; 103our $DATADIR = datadir;
91our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
92our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
93our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
107
94our $LOCALDIR = localdir; 108our $LOCALDIR = localdir;
95our $TMPDIR = "$LOCALDIR/" . tmpdir; 109our $TMPDIR = "$LOCALDIR/" . tmpdir;
96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 110our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
97our $PLAYERDIR = "$LOCALDIR/" . playerdir; 111our $PLAYERDIR = "$LOCALDIR/" . playerdir;
98our $RANDOMDIR = "$LOCALDIR/random"; 112our $RANDOMDIR = "$LOCALDIR/random";
99our $BDBDIR = "$LOCALDIR/db"; 113our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid"; 114our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime"; 115our $RUNTIMEFILE = "$LOCALDIR/runtime";
102 116
103our %RESOURCE; 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;
104 124
105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 125our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 126our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
107our $NEXT_TICK; 127our $NEXT_TICK;
108our $USE_FSYNC = 1; # use fsync to write maps - default off 128our $USE_FSYNC = 1; # use fsync to write maps - default on
109 129
110our $BDB_DEADLOCK_WATCHER; 130our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER; 131our $BDB_CHECKPOINT_WATCHER;
112our $BDB_TRICKLE_WATCHER; 132our $BDB_TRICKLE_WATCHER;
113our $DB_ENV; 133our $DB_ENV;
114 134
135our @EXTRA_MODULES = qw(pod match mapscript incloader);
136
115our %CFG; 137our %CFG;
138our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
116 139
117our $UPTIME; $UPTIME ||= time; 140our $UPTIME; $UPTIME ||= time;
118our $RUNTIME; 141our $RUNTIME = 0;
142our $SERVER_TICK = 0;
119our $NOW; 143our $NOW;
120 144
121our (%PLAYER, %PLAYER_LOADING); # all users 145our (%PLAYER, %PLAYER_LOADING); # all users
122our (%MAP, %MAP_LOADING ); # all maps 146our (%MAP, %MAP_LOADING ); # all maps
123our $LINK_MAP; # the special {link} map, which is always available 147our $LINK_MAP; # the special {link} map, which is always available
127 151
128our $LOAD; # a number between 0 (idle) and 1 (too many objects) 152our $LOAD; # a number between 0 (idle) and 1 (too many objects)
129our $LOADAVG; # same thing, but with alpha-smoothing 153our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter 154our $JITTER; # average jitter
131our $TICK_START; # for load detecting purposes 155our $TICK_START; # for load detecting purposes
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;
132 164
133binmode STDOUT; 165binmode STDOUT;
134binmode STDERR; 166binmode STDERR;
135 167
136# read virtual server time, if available 168# read virtual server time, if available
138 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
139 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
140 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
141} 173}
142 174
175eval "sub TICK() { $TICK } 1" or die;
176
143mkdir $_ 177mkdir $_
144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
145 179
146our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
147 181
148sub cf::map::normalise; 182sub cf::map::normalise;
149 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
150############################################################################# 188#############################################################################
151 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
152=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
153 202
154=over 4 203=over 4
155 204
156=item $cf::UPTIME 205=item $cf::UPTIME
157 206
158The 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.
159 223
160=item $cf::RUNTIME 224=item $cf::RUNTIME
161 225
162The 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
163every server tick. 227every server tick.
164 228
165=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
166$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
167$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
168 232
169Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
170directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
171unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
172database environment. 236database environment.
173 237
174=item $cf::NOW
175
176The time of the last (current) server tick.
177
178=item $cf::TICK
179
180The interval between server ticks, in seconds.
181
182=item $cf::LOADAVG 238=item $cf::LOADAVG
183 239
184The 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
185(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
186objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
195from wherever your confdir points to. 251from wherever your confdir points to.
196 252
197=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
198 254
199These 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
200returns 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
201per 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.
202 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
203=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
204 277
205This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
206C<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
207that call. 280that call.
208 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
209=back 288=back
210 289
211=cut 290=cut
212 291
213BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
214 *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 {
215 my $msg = join "", @_; 299 my $msg = join "", @_;
216 300
217 $msg .= "\n" 301 $msg .= "\n"
218 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
219 303
220 $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;
221 305
222 LOG llevError, $msg; 306 LOG llevWarn, $msg;
223 }; 307};
224}
225 308
226$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
228 311
229 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d# 316 return;#d#
232 }#d# 317 }#d#
233 318
234 # kill coroutine otherwise 319 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate 320 Coro::terminate
237}; 321};
238
239$SIG{__DIE__} = sub { }; #d#?
240 322
241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
258)) { 340)) {
259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
260} 342}
261 343
262$EV::DIED = sub { 344$EV::DIED = sub {
263 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
264}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
265 352
266############################################################################# 353#############################################################################
267 354
268=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
269 356
290 $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;
291 $d 378 $d
292 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
293} 380}
294 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
295=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
296 435
297Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
298 437
299=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
305our $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
306 445
307sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
309 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
310=item cf::lock_wait $string 511=item cf::lock_wait $string
311 512
312Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
313 514
314=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
315 516
316Wait 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
317a 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,
318for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
319returned. 520returned.
320 521
321Locks 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
322deadlocked coro. 523deadlocked coro.
328 529
329Return 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.
330 531
331=cut 532=cut
332 533
333our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
334our %LOCKER;#d#
335 535
336sub lock_wait($) { 536sub lock_wait($) {
337 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
338
339 if ($LOCKER{$key} == $Coro::current) {#d#
340 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
341 return;#d#
342 }#d#
343
344 # wait for lock, if any
345 while ($LOCK{$key}) {
346 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
347 push @{ $LOCK{$key} }, $Coro::current;
348 Coro::schedule;
349 }
350} 538}
351 539
352sub lock_acquire($) { 540sub lock_acquire($) {
353 my ($key) = @_; 541 $LOCKS->guard ($_[0])
354
355 # wait, to be sure we are not locked
356 lock_wait $key;
357
358 $LOCK{$key} = [];
359 $LOCKER{$key} = $Coro::current;#d#
360
361 Coro::guard {
362 delete $LOCKER{$key};#d#
363 # wake up all waiters, to be on the safe side
364 $_->ready for @{ delete $LOCK{$key} };
365 }
366} 542}
367 543
368sub lock_active($) { 544sub lock_active($) {
369 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
370
371 ! ! $LOCK{$key}
372} 546}
373 547
374sub freeze_mainloop { 548sub freeze_mainloop {
375 tick_inhibit_inc; 549 tick_inhibit_inc;
376 550
377 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
378} 552}
379 553
380=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
381 555
382Like 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
383get spread over timer. 557get spread over time.
384 558
385=cut 559=cut
386 560
387sub periodic($$) { 561sub periodic($$) {
388 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
392 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
393} 567}
394 568
395=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
396 570
397Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
398This 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
399of 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.
400 578
401The 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
402used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
403 581
404Useful for short background jobs. 582Useful for short background jobs.
405 583
406=cut 584=cut
407 585
408our @SLOT_QUEUE; 586our @SLOT_QUEUE;
409our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
410 589
411$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
412$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
413 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
414 593
415 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
416 596
417 while () { 597 while () {
418 next_job: 598 next_job:
599
419 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
420 if ($avail > 0.01) { 601
421 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
422 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
423 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
424 $job->[2]->send; 606 $job->[2]->send;
425 Coro::cede; 607 Coro::cede;
426 goto next_job; 608 goto next_job;
427 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
428 } 611 }
429 } 612 }
430 613
431 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
432 # 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
433 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
434 $signal->wait;
435 } else { 617 } else {
618 $busy = 0;
436 Coro::schedule; 619 Coro::schedule;
437 } 620 }
438 } 621 }
439}; 622};
440 623
441sub get_slot($;$$) { 624sub get_slot($;$$) {
442 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
443 626
444 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
445 628
446 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
447 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
448 632
449 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
450 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
451 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
477=cut 661=cut
478 662
479sub sync_job(&) { 663sub sync_job(&) {
480 my ($job) = @_; 664 my ($job) = @_;
481 665
482 if ($Coro::current == $Coro::main) { 666 if (in_main) {
483 my $time = EV::time; 667 my $time = AE::time;
484 668
485 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
486 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
487 671
488 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
489 673
490 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
491 675
492 my $busy = 1; 676 my $busy = 1;
493 my @res; 677 my @res;
494 678
495 (async { 679 (async {
496 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
497 @res = eval { $job->() }; 681 @res = eval { $job->() };
498 warn $@ if $@; 682 error $@ if $@;
499 undef $busy; 683 undef $busy;
500 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
501 685
502 while ($busy) { 686 while ($busy) {
503 if (Coro::nready) { 687 if (Coro::nready) {
505 } else { 689 } else {
506 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
507 } 691 }
508 } 692 }
509 693
510 my $time = EV::time - $time; 694 my $time = AE::time - $time;
511 695
512 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
513 697
514 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
515 } else { 699 } else {
537 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
538 722
539 $coro 723 $coro
540} 724}
541 725
542=item fork_call { }, $args 726=item fork_call { }, @args
543 727
544Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
545process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
546Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
547never block itself or use any form of event handling. 731never block itself or use any form of event handling.
548 732
549=cut 733=cut
550 734
735sub post_fork {
736 reset_signals;
737}
738
551sub fork_call(&@) { 739sub fork_call(&@) {
552 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
553 741
554 # 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,
555 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
556 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
557 745
558 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
559 reset_signals; 747 cf::post_fork;
560 &$cb 748 &$cb
561 }, @args; 749 } @args;
562 750
563 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 )
564} 763}
565 764
566=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
567 766
568=cut 767=cut
605within each server. 804within each server.
606 805
607=cut 806=cut
608 807
609sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
610 my ($name) = @_; 812 my ($name) = @_;
611 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
612 814
613 eval { 815 eval {
614 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
624} 826}
625 827
626our $DB; 828our $DB;
627 829
628sub db_init { 830sub db_init {
629 cf::sync_job {
630 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
631 };
632} 832}
633 833
634sub db_get($$) { 834sub db_get($$) {
635 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
636 836
637 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
638 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
639 841
640 $! ? () 842 $! ? ()
641 : $data 843 : $data
642 }
643} 844}
644 845
645sub db_put($$$) { 846sub db_put($$$) {
646 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
647 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
675 876
676 my @data; 877 my @data;
677 my $md5; 878 my $md5;
678 879
679 for (0 .. $#$src) { 880 for (0 .. $#$src) {
680 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
681 or Carp::croak "$src->[$_]: $!";
682 } 882 }
683 883
684 # if processing is expensive, check 884 # if processing is expensive, check
685 # checksum first 885 # checksum first
686 if (1) { 886 if (1) {
703 903
704 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
705 my $data = $process->(\@data); 905 my $data = $process->(\@data);
706 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
707 907
708 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
709 909
710 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
711 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
712 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
713 913
723 923
724=cut 924=cut
725 925
726sub datalog($@) { 926sub datalog($@) {
727 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
728 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
729} 929}
730 930
731=back 931=back
732 932
733=cut 933=cut
928 1128
929 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
930 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
931 1131
932 } elsif (ref $type) { 1132 } elsif (ref $type) {
933 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
934 1134
935 } else { 1135 } else {
936 shift @arg; 1136 shift @arg;
937 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
938 } 1138 }
939 } 1139 }
940} 1140}
941 1141
942sub _object_attach { 1142sub _object_attach {
952 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
953 } 1153 }
954 1154
955 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
956 } else { 1156 } else {
957 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
958 } 1158 }
959 1159
960 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
961} 1161}
962 1162
1021 1221
1022 for (@$callbacks) { 1222 for (@$callbacks) {
1023 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1024 1224
1025 if ($@) { 1225 if ($@) {
1026 warn "$@";
1027 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1028 override; 1227 override;
1029 } 1228 }
1030 1229
1031 return 1 if $override; 1230 return 1 if $override;
1032 } 1231 }
1111 for (@$attach) { 1310 for (@$attach) {
1112 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1113 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1114 } 1313 }
1115 } else { 1314 } else {
1116 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1117 } 1316 }
1118 } 1317 }
1119} 1318}
1120 1319
1121cf::attachable->attach ( 1320cf::attachable->attach (
1148 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1149 1348
1150 sync_job { 1349 sync_job {
1151 if (length $$rdata) { 1350 if (length $$rdata) {
1152 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1153 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1154 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1155 1355
1156 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1157 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1158 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1159 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 }
1160 aio_close $fh; 1363 aio_close $fh;
1161 1364
1162 if (@$objs) { 1365 if (@$objs) {
1163 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) {
1164 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1165 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1166 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1167 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 }
1168 aio_close $fh; 1374 aio_close $fh;
1169 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1170 } 1376 }
1171 } else { 1377 } else {
1172 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1173 } 1379 }
1174 1380
1175 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1176 } else { 1385 } else {
1177 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1178 } 1387 }
1179 } else { 1388 } else {
1180 aio_unlink $filename; 1389 aio_unlink $filename;
1181 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1182 } 1391 }
1206 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs}; 1416 $av = $st->{objs};
1208 } 1417 }
1209 1418
1210 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1211 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1212 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1213 1423
1214 ($data, $av) 1424 ($data, $av)
1215} 1425}
1216 1426
1217=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1221=cut 1431=cut
1222 1432
1223############################################################################# 1433#############################################################################
1224# command handling &c 1434# command handling &c
1225 1435
1226=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1227 1437
1228Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1229$name. 1439$name.
1230 1440
1231=cut 1441=cut
1237 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1238 1448
1239 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1240} 1450}
1241 1451
1242=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1243 1453
1244Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1245extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1246received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1247the logged-in player. Ext commands can only be processed after a player 1457the logged-in player. Ext commands can only be processed after a player
1248has logged in successfully. 1458has logged in successfully.
1249 1459
1250If the callback returns something, it is sent back as if reply was being 1460If the callback returns something, it is sent back as if reply was being
1251called. 1461called.
1252 1462
1253=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1254 1464
1255Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1256exticmd packet. Exti commands are processed by the server as soon as they 1466exticmd packet. Exti commands are processed by the server as soon as they
1257are received, i.e. out of order w.r.t. other commands. The first argument 1467are received, i.e. out of order w.r.t. other commands. The first argument
1258is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1273 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1274 1484
1275 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1276} 1486}
1277 1487
1488use File::Glob ();
1489
1278cf::player->attach ( 1490cf::player->attach (
1279 on_command => sub { 1491 on_unknown_command => sub {
1280 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1281 1493
1282 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1283 or return; 1495 or return;
1284 1496
1292 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1293 1505
1294 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1295 1507
1296 if (ref $msg) { 1508 if (ref $msg) {
1297 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1298 "ARRAY" eq ref $msg
1299 ? @$msg
1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1301 1510
1302 my @reply; 1511 my @reply;
1303 1512
1304 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1305 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1306 } 1515 }
1307 1516
1308 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1309 if $reply; 1518 if $reply;
1310 1519
1311 } else { 1520 } else {
1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1313 } 1522 }
1314 1523
1315 cf::override; 1524 cf::override;
1316 }, 1525 },
1317); 1526);
1318 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
1319sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1320 cf::sync_job { 1557 cf::sync_job {
1321 my %todo; 1558 my %todo;
1322 1559
1323 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1324 next unless -r $path; 1561 next unless -r $path;
1342 1579
1343 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1344 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1345 1582
1346 $ext{source} = 1583 $ext{source} =
1347 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1348 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1349 . $source 1586 . $source
1350 . "\n};\n1"; 1587 . "\n};\n1";
1351 1588
1352 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1353 } 1590 }
1354 1591
1592 my $pass = 0;
1355 my %done; 1593 my %done;
1356 while (%todo) { 1594 while (%todo) {
1357 my $progress; 1595 my $progress;
1358 1596
1597 ++$pass;
1598
1599 ext:
1359 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1360 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1361 goto skip 1602 next ext
1362 unless exists $done{$_}; 1603 unless exists $done{$_};
1363 } 1604 }
1364 1605
1365 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1366 1607
1367 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 $@) {
1368 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1369 : "$v->{base}: extension inactive.\n";
1370 1621
1371 if (exists $v->{meta}{mandatory}) {
1372 warn $msg;
1373 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1374 } 1623 if exists $v->{meta}{mandatory};
1375 1624
1376 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;
1377 } 1634 }
1378
1379 $done{$k} = delete $todo{$k};
1380 push @EXTS, $v->{pkg};
1381 $progress = 1;
1382 } 1635 }
1383 1636
1384 skip: 1637 unless ($progress) {
1385 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1386 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 }
1387 } 1647 }
1388 }; 1648 };
1389} 1649}
1390 1650
1391############################################################################# 1651#############################################################################
1445 1705
1446sub exists($) { 1706sub exists($) {
1447 my ($login) = @_; 1707 my ($login) = @_;
1448 1708
1449 $cf::PLAYER{$login} 1709 $cf::PLAYER{$login}
1450 or cf::sync_job { !aio_stat path $login } 1710 or !aio_stat path $login
1451} 1711}
1452 1712
1453sub find($) { 1713sub find($) {
1454 return $cf::PLAYER{$_[0]} || do { 1714 return $cf::PLAYER{$_[0]} || do {
1455 my $login = $_[0]; 1715 my $login = $_[0];
1475 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1476 } 1736 }
1477 } 1737 }
1478} 1738}
1479 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
1480sub save($) { 1753sub save($) {
1481 my ($pl) = @_; 1754 my ($pl) = @_;
1482 1755
1483 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1484 1757
1489 1762
1490 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1491 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1492 1765
1493 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];
1494 1770
1495 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1496 cf::cede_to_tick; 1772 cf::cede_to_tick;
1497} 1773}
1498 1774
1532 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1533 1809
1534 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1535 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1811 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1536 1812
1537 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1538 $pl->deactivate; 1814 $pl->deactivate;
1815
1539 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;
1540 $pl->ob->check_score;
1541 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1542 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1543 1821
1544 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1545 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1546 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1600 \@logins 1878 \@logins
1601} 1879}
1602 1880
1603=item $player->maps 1881=item $player->maps
1604 1882
1883=item cf::player::maps $login
1884
1605Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1606player. May block. 1886player. May block.
1607 1887
1608=cut 1888=cut
1609 1889
1630 1910
1631=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1632 1912
1633Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1634 1914
1635=item $player->ext_reply ($msgid, @msg)
1636
1637Sends an ext reply to the player.
1638
1639=cut
1640
1641sub ext_reply($$@) {
1642 my ($self, $id, @msg) = @_;
1643
1644 $self->ns->ext_reply ($id, @msg)
1645}
1646
1647=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1648 1916
1649Sends an ext event to the client. 1917Sends an ext event to the client.
1650 1918
1651=cut 1919=cut
1670 1938
1671=cut 1939=cut
1672 1940
1673sub find_by_path($) { 1941sub find_by_path($) {
1674 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1675 1945
1676 my ($match, $specificity); 1946 my ($match, $specificity);
1677 1947
1678 for my $region (list) { 1948 for my $region (list) {
1679 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
1708sub generate_random_map { 1978sub generate_random_map {
1709 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1710 1980
1711 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1981 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1712 1982
1713 # mit "rum" bekleckern, nicht
1714 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1715 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1716 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1717 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1718 $rmp->{exit_on_final_map},
1719 $rmp->{xsize}, $rmp->{ysize},
1720 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1721 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1722 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1723 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1724 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1725 (cf::region::find $rmp->{region}), $rmp->{custom}
1726 )
1727} 1984}
1728 1985
1729=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1730 1987
1731Register a handler for the map path matching the given regex at the 1988Register a handler for the map path matching the given regex at the
1736 1993
1737sub register { 1994sub register {
1738 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1739 my $pkg = caller; 1996 my $pkg = caller;
1740 1997
1741 no strict;
1742 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1743 1999
1744 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1745} 2001}
1746 2002
1747# also paths starting with '/' 2003# also paths starting with '/'
1748$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1749 2005
1750sub thawer_merge { 2006sub thawer_merge {
1751 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1752 2008
1753 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
1758} 2014}
1759 2015
1760sub normalise { 2016sub normalise {
1761 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1762 2018
1763 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1764 2020
1765 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1766 2022
1767 # map plan: 2023 # map plan:
1768 # 2024 #
1783 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1784 $path = "$base/$path"; 2040 $path = "$base/$path";
1785 } 2041 }
1786 2042
1787 for ($path) { 2043 for ($path) {
1788 redo if s{//}{/};
1789 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1790 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1791 } 2046 }
1792 2047
1793 $path 2048 $path
1807 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1808 return $self; 2063 return $self;
1809 } 2064 }
1810 } 2065 }
1811 2066
1812 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1813 () 2068 ()
1814} 2069}
1815 2070
2071# may re-bless or do other evil things
1816sub init { 2072sub init {
1817 my ($self) = @_; 2073 my ($self) = @_;
1818 2074
1819 $self 2075 $self
1820} 2076}
1851 2107
1852 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1853 "$UNIQUEDIR/$path" 2109 "$UNIQUEDIR/$path"
1854} 2110}
1855 2111
1856# and all this just because we cannot iterate over
1857# all maps in C++...
1858sub change_all_map_light {
1859 my ($change) = @_;
1860
1861 $_->change_map_light ($change)
1862 for grep $_->outdoor, values %cf::MAP;
1863}
1864
1865sub decay_objects { 2112sub decay_objects {
1866 my ($self) = @_; 2113 my ($self) = @_;
1867 2114
1868 return if $self->{deny_reset}; 2115 return if $self->{deny_reset};
1869 2116
1894 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1895 2142
1896 1 2143 1
1897} 2144}
1898 2145
2146# used to laod the header of an original map
1899sub load_header_orig { 2147sub load_header_orig {
1900 my ($self) = @_; 2148 my ($self) = @_;
1901 2149
1902 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1903} 2151}
1904 2152
2153# used to laod the header of an instantiated map
1905sub load_header_temp { 2154sub load_header_temp {
1906 my ($self) = @_; 2155 my ($self) = @_;
1907 2156
1908 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1909} 2158}
1910 2159
2160# called after loading the header from an instantiated map
1911sub prepare_temp { 2161sub prepare_temp {
1912 my ($self) = @_; 2162 my ($self) = @_;
1913 2163
1914 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1915 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1916 # safety 2166 # safety
1917 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1918 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1919} 2169}
1920 2170
2171# called after loading the header from an original map
1921sub prepare_orig { 2172sub prepare_orig {
1922 my ($self) = @_; 2173 my ($self) = @_;
1923 2174
1924 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
1925 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
1949 2200
1950sub find; 2201sub find;
1951sub find { 2202sub find {
1952 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
1953 2204
2205 cf::cede_to_tick;
2206
1954 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
1955 2208
1956 cf::lock_wait "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1957 cf::lock_wait "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
1958 2211
1959 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
1960 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961 my $guard2 = cf::lock_acquire "map_find:$path";
1962
1963 my $map = new_from_path cf::map $path 2213 my $map = new_from_path cf::map $path
1964 or return; 2214 or return;
1965 2215
1966 $map->{last_save} = $cf::RUNTIME; 2216 $map->{last_save} = $cf::RUNTIME;
1967 2217
1979 2229
1980 $cf::MAP{$path} = $map 2230 $cf::MAP{$path} = $map
1981 } 2231 }
1982} 2232}
1983 2233
1984sub pre_load { } 2234sub pre_load { }
1985sub post_load { } 2235#sub post_load { } # XS
1986 2236
1987sub load { 2237sub load {
1988 my ($self) = @_; 2238 my ($self) = @_;
1989 2239
1990 local $self->{deny_reset} = 1; # loading can take a long time 2240 local $self->{deny_reset} = 1; # loading can take a long time
1993 2243
1994 { 2244 {
1995 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
1996 2246
1997 return unless $self->valid; 2247 return unless $self->valid;
1998 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
1999
2000 $self->in_memory (cf::MAP_LOADING);
2001 2249
2002 $self->alloc; 2250 $self->alloc;
2003 2251
2004 $self->pre_load; 2252 $self->pre_load;
2005 cf::cede_to_tick; 2253 cf::cede_to_tick;
2006 2254
2255 if (exists $self->{load_path}) {
2007 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2008 $f->skip_block; 2257 $f->skip_block;
2009 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2010 or return; 2259 or return;
2011 2260
2012 $self->post_load_original 2261 $self->post_load_original
2013 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2014 2263
2015 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2016 utf8::encode $uniq; 2265 utf8::encode $uniq;
2017 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2018 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2019 $self->clear_unique_items; 2268 $self->clear_unique_items;
2020 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2021 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2022 } 2272 }
2023 } 2273 }
2024 }
2025 2274
2026 $f->resolve_delayed_derefs; 2275 $f->resolve_delayed_derefs;
2276 } else {
2277 $self->post_load_original
2278 if delete $self->{load_original};
2279 }
2280
2281 $self->state (cf::MAP_INACTIVE);
2027 2282
2028 cf::cede_to_tick; 2283 cf::cede_to_tick;
2029 # now do the right thing for maps 2284 # now do the right thing for maps
2030 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2031 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2035 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2036 $self->decay_objects; 2291 $self->decay_objects;
2037 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2038 $self->update_buttons; 2293 $self->update_buttons;
2039 cf::cede_to_tick; 2294 cf::cede_to_tick;
2040 $self->set_darkness_map; 2295 #$self->activate; # no longer activate maps automatically
2041 cf::cede_to_tick;
2042 $self->activate;
2043 } 2296 }
2044 2297
2045 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2046 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2047
2048 $self->in_memory (cf::MAP_ACTIVE);
2049 } 2300 }
2050 2301
2051 $self->post_load; 2302 $self->post_load;
2052}
2053 2303
2304 1
2305}
2306
2307# customize the map for a given player, i.e.
2308# return the _real_ map. used by e.g. per-player
2309# maps to change the path to ~playername/mappath
2054sub customise_for { 2310sub customise_for {
2055 my ($self, $ob) = @_; 2311 my ($self, $ob) = @_;
2056 2312
2057 return find "~" . $ob->name . "/" . $self->{path} 2313 return find "~" . $ob->name . "/" . $self->{path}
2058 if $self->per_player; 2314 if $self->per_player;
2061# if $self->per_party; 2317# if $self->per_party;
2062 2318
2063 $self 2319 $self
2064} 2320}
2065 2321
2066# find and load all maps in the 3x3 area around a map
2067sub load_neighbours {
2068 my ($map) = @_;
2069
2070 my @neigh; # diagonal neighbours
2071
2072 for (0 .. 3) {
2073 my $neigh = $map->tile_path ($_)
2074 or next;
2075 $neigh = find $neigh, $map
2076 or next;
2077 $neigh->load;
2078
2079 push @neigh,
2080 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2081 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2082 }
2083
2084 for (grep defined $_->[0], @neigh) {
2085 my ($path, $origin) = @$_;
2086 my $neigh = find $path, $origin
2087 or next;
2088 $neigh->load;
2089 }
2090}
2091
2092sub find_sync { 2322sub find_sync {
2093 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2094 2324
2095 cf::sync_job { find $path, $origin } 2325 # it's a bug to call this from the main context
2326 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2327 if $Coro::current == $Coro::main;
2328
2329 find $path, $origin
2096} 2330}
2097 2331
2098sub do_load_sync { 2332sub do_load_sync {
2099 my ($map) = @_; 2333 my ($map) = @_;
2100 2334
2335 # it's a bug to call this from the main context
2101 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2102 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2103 2338
2104 cf::sync_job { $map->load }; 2339 $map->load;
2105} 2340}
2106 2341
2107our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2108our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2109 2344
2110sub find_async { 2345sub find_async {
2111 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2112 2347
2113 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2114 2349
2115 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2116 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2117 } 2352 }
2118 2353
2119 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2120 2355
2121 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2135 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2136 2371
2137 () 2372 ()
2138} 2373}
2139 2374
2375# common code, used by both ->save and ->swapout
2140sub save { 2376sub _save {
2141 my ($self) = @_; 2377 my ($self) = @_;
2142
2143 my $lock = cf::lock_acquire "map_data:$self->{path}";
2144 2378
2145 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2146 2380
2147 return unless $self->dirty; 2381 return unless $self->dirty;
2148 2382
2168 } else { 2402 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2403 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2170 } 2404 }
2171} 2405}
2172 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2173sub swap_out { 2415sub swap_out {
2174 my ($self) = @_; 2416 my ($self) = @_;
2175 2417
2176 # save first because save cedes
2177 $self->save;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2181 return if $self->players; 2422 return if $self->players;
2182 return if $self->in_memory != cf::MAP_ACTIVE; 2423
2424 # first deactivate the map and "unlink" it from the core
2425 $self->deactivate;
2426 $_->clear_links_to ($self) for values %cf::MAP;
2427 $self->state (cf::MAP_SWAPPED);
2428
2429 # then atomically save
2430 $self->_save;
2431
2432 # then free the map
2433 $self->clear;
2434}
2435
2436sub reset_at {
2437 my ($self) = @_;
2438
2439 # TODO: safety, remove and allow resettable per-player maps
2183 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2184 2441
2442 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2443 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2444
2445 $time + $to
2446}
2447
2448sub should_reset {
2449 my ($self) = @_;
2450
2451 $self->reset_at <= $cf::RUNTIME
2452}
2453
2454sub reset {
2455 my ($self) = @_;
2456
2457 my $lock = cf::lock_acquire "map_data:$self->{path}";
2458
2459 return if $self->players;
2460
2461 cf::trace "resetting map ", $self->path, "\n";
2462
2185 $self->in_memory (cf::MAP_SWAPPED); 2463 $self->state (cf::MAP_SWAPPED);
2464
2465 # need to save uniques path
2466 unless ($self->{deny_save}) {
2467 my $uniq = $self->uniq_path; utf8::encode $uniq;
2468
2469 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2470 if $uniq;
2471 }
2472
2473 delete $cf::MAP{$self->path};
2186 2474
2187 $self->deactivate; 2475 $self->deactivate;
2188 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2189 $self->clear; 2477 $self->clear;
2190}
2191
2192sub reset_at {
2193 my ($self) = @_;
2194
2195 # TODO: safety, remove and allow resettable per-player maps
2196 return 1e99 if $self->{deny_reset};
2197
2198 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2199 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2200
2201 $time + $to
2202}
2203
2204sub should_reset {
2205 my ($self) = @_;
2206
2207 $self->reset_at <= $cf::RUNTIME
2208}
2209
2210sub reset {
2211 my ($self) = @_;
2212
2213 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214
2215 return if $self->players;
2216
2217 warn "resetting map ", $self->path;
2218
2219 $self->in_memory (cf::MAP_SWAPPED);
2220
2221 # need to save uniques path
2222 unless ($self->{deny_save}) {
2223 my $uniq = $self->uniq_path; utf8::encode $uniq;
2224
2225 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2226 if $uniq;
2227 }
2228
2229 delete $cf::MAP{$self->path};
2230
2231 $self->deactivate;
2232 $_->clear_links_to ($self) for values %cf::MAP;
2233 $self->clear;
2234 2478
2235 $self->unlink_save; 2479 $self->unlink_save;
2236 $self->destroy; 2480 $self->destroy;
2237} 2481}
2238 2482
2246 2490
2247 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2248 2492
2249 $self->unlink_save; 2493 $self->unlink_save;
2250 2494
2251 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2252 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2253 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2254 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2255 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2256 2500
2313 : normalise $_ 2557 : normalise $_
2314 } @{ aio_readdir $UNIQUEDIR or [] } 2558 } @{ aio_readdir $UNIQUEDIR or [] }
2315 ] 2559 ]
2316} 2560}
2317 2561
2562=item cf::map::static_maps
2563
2564Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2565file in the shared directory excluding F</styles> and F</editor>). May
2566block.
2567
2568=cut
2569
2570sub static_maps() {
2571 my @dirs = "";
2572 my @maps;
2573
2574 while (@dirs) {
2575 my $dir = shift @dirs;
2576
2577 next if $dir eq "/styles" || $dir eq "/editor";
2578
2579 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2580 or return;
2581
2582 for (@$files) {
2583 s/\.map$// or next;
2584 utf8::decode $_;
2585 push @maps, "$dir/$_";
2586 }
2587
2588 push @dirs, map "$dir/$_", @$dirs;
2589 }
2590
2591 \@maps
2592}
2593
2318=back 2594=back
2319 2595
2320=head3 cf::object 2596=head3 cf::object
2321 2597
2322=cut 2598=cut
2387 2663
2388our $SAY_CHANNEL = { 2664our $SAY_CHANNEL = {
2389 id => "say", 2665 id => "say",
2390 title => "Map", 2666 title => "Map",
2391 reply => "say ", 2667 reply => "say ",
2392 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2668 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2393}; 2669};
2394 2670
2395our $CHAT_CHANNEL = { 2671our $CHAT_CHANNEL = {
2396 id => "chat", 2672 id => "chat",
2397 title => "Chat", 2673 title => "Chat",
2454 2730
2455Freezes the player and moves him/her to a special map (C<{link}>). 2731Freezes the player and moves him/her to a special map (C<{link}>).
2456 2732
2457The player should be reasonably safe there for short amounts of time (e.g. 2733The player should be reasonably safe there for short amounts of time (e.g.
2458for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2734for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2459though, as the palyer cannot control the character while it is on the link 2735though, as the player cannot control the character while it is on the link
2460map. 2736map.
2461 2737
2462Will never block. 2738Will never block.
2463 2739
2464=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2485sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2486 my ($self) = @_; 2762 my ($self) = @_;
2487 2763
2488 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2489 2765
2766 ++$self->{_link_recursion};
2767
2490 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2491 2769
2492 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2493 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2494 2772
2495 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2496} 2774}
2497 2775
2498sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2499 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2500 2778
2517 ($x, $y) = (-1, -1) 2795 ($x, $y) = (-1, -1)
2518 unless (defined $x) && (defined $y); 2796 unless (defined $x) && (defined $y);
2519 2797
2520 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2521 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2522 if $x <=0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2523 2801
2524 $map->load; 2802 $map->load;
2525 $map->load_neighbours;
2526 2803
2527 return unless $self->contr->active; 2804 return unless $self->contr->active;
2528 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2529 $self->activate_recursive;
2530 2805
2531 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2532 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2533} 2808 # entering was successful
2809 delete $self->{_link_recursion};
2810 # only activate afterwards, to support waiting in hooks
2811 $self->activate_recursive;
2812 }
2534 2813
2814}
2815
2535=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2816=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2536 2817
2537Moves the player to the given map-path and coordinates by first freezing 2818Moves the player to the given map-path and coordinates by first freezing
2538her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2539that has to return the map if sucecssful, and then unfreezes the player on 2820that has to return the map if sucecssful, and then unfreezes the player on
2540the new (success) or old (failed) map position. In either case, $done will 2821the new (success) or old (failed) map position. In either case, $done will
2547 2828
2548our $GOTOGEN; 2829our $GOTOGEN;
2549 2830
2550sub cf::object::player::goto { 2831sub cf::object::player::goto {
2551 my ($self, $path, $x, $y, $check, $done) = @_; 2832 my ($self, $path, $x, $y, $check, $done) = @_;
2833
2834 if ($self->{_link_recursion} >= $MAX_LINKS) {
2835 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2836 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2837 ($path, $x, $y) = @$EMERGENCY_POSITION;
2838 }
2552 2839
2553 # do generation counting so two concurrent goto's will be executed in-order 2840 # do generation counting so two concurrent goto's will be executed in-order
2554 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2555 2842
2556 $self->enter_link; 2843 $self->enter_link;
2576 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2577 } 2864 }
2578 } 2865 }
2579 2866
2580 my $map = eval { 2867 my $map = eval {
2581 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2582 2869
2583 if ($map) { 2870 if ($map) {
2584 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2585 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2586 } else { 2873 } else {
2587 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2874 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2588 } 2875 }
2589 2876
2590 $map 2877 $map
2598 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2599 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2600 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2601 } 2888 }
2602 2889
2603 $done->() if $done; 2890 $done->($self) if $done;
2604 })->prio (1); 2891 })->prio (1);
2605} 2892}
2606 2893
2607=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2608 2895
2676 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2677 2964
2678 unless (eval { 2965 unless (eval {
2679 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2680 2967
2681 # random map handling
2682 {
2683 my $guard = cf::lock_acquire "exit_prepare:$exit";
2684
2685 prepare_random_map $exit
2686 if $exit->slaying eq "/!";
2687 }
2688
2689 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2690 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2691 my $y = $exit->stats->sp; 2970 my $y = $exit->stats->sp;
2971
2972 # special map handling
2973 my $slaying = $exit->slaying;
2974
2975 # special map handling
2976 if ($slaying eq "/!") {
2977 my $guard = cf::lock_acquire "exit_prepare:$exit";
2978
2979 prepare_random_map $exit
2980 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2981
2982 $map = $exit->slaying;
2983
2984 } elsif ($slaying eq '!up') {
2985 $map = $exit->map->tile_path (cf::TILE_UP);
2986 $x = $exit->x;
2987 $y = $exit->y;
2988
2989 } elsif ($slaying eq '!down') {
2990 $map = $exit->map->tile_path (cf::TILE_DOWN);
2991 $x = $exit->x;
2992 $y = $exit->y;
2993 }
2692 2994
2693 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2694 2996
2695 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2696 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
2701 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2702 . "I'll try to bring you back to the map you were before. " 3004 . "I'll try to bring you back to the map you were before. "
2703 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2704 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2705 3007
2706 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2707 $self->leave_link; 3009 $self->leave_link;
2708 } 3010 }
2709 })->prio (1); 3011 })->prio (1);
2710} 3012}
2711 3013
2723sub cf::client::send_drawinfo { 3025sub cf::client::send_drawinfo {
2724 my ($self, $text, $flags) = @_; 3026 my ($self, $text, $flags) = @_;
2725 3027
2726 utf8::encode $text; 3028 utf8::encode $text;
2727 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3029 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3030}
3031
3032=item $client->send_big_packet ($pkt)
3033
3034Like C<send_packet>, but tries to compress large packets, and fragments
3035them as required.
3036
3037=cut
3038
3039our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3040
3041sub cf::client::send_big_packet {
3042 my ($self, $pkt) = @_;
3043
3044 # try lzf for large packets
3045 $pkt = "lzf " . Compress::LZF::compress $pkt
3046 if 1024 <= length $pkt and $self->{can_lzf};
3047
3048 # split very large packets
3049 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3050 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3051 $pkt = "frag";
3052 }
3053
3054 $self->send_packet ($pkt);
2728} 3055}
2729 3056
2730=item $client->send_msg ($channel, $msg, $color, [extra...]) 3057=item $client->send_msg ($channel, $msg, $color, [extra...])
2731 3058
2732Send a drawinfo or msg packet to the client, formatting the msg for the 3059Send a drawinfo or msg packet to the client, formatting the msg for the
2736 3063
2737=cut 3064=cut
2738 3065
2739# non-persistent channels (usually the info channel) 3066# non-persistent channels (usually the info channel)
2740our %CHANNEL = ( 3067our %CHANNEL = (
3068 "c/motd" => {
3069 id => "infobox",
3070 title => "MOTD",
3071 reply => undef,
3072 tooltip => "The message of the day",
3073 },
2741 "c/identify" => { 3074 "c/identify" => {
2742 id => "infobox", 3075 id => "infobox",
2743 title => "Identify", 3076 title => "Identify",
2744 reply => undef, 3077 reply => undef,
2745 tooltip => "Items recently identified", 3078 tooltip => "Items recently identified",
2747 "c/examine" => { 3080 "c/examine" => {
2748 id => "infobox", 3081 id => "infobox",
2749 title => "Examine", 3082 title => "Examine",
2750 reply => undef, 3083 reply => undef,
2751 tooltip => "Signs and other items you examined", 3084 tooltip => "Signs and other items you examined",
3085 },
3086 "c/shopinfo" => {
3087 id => "infobox",
3088 title => "Shop Info",
3089 reply => undef,
3090 tooltip => "What your bargaining skill tells you about the shop",
2752 }, 3091 },
2753 "c/book" => { 3092 "c/book" => {
2754 id => "infobox", 3093 id => "infobox",
2755 title => "Book", 3094 title => "Book",
2756 reply => undef, 3095 reply => undef,
2772 id => "infobox", 3111 id => "infobox",
2773 title => "Body Parts", 3112 title => "Body Parts",
2774 reply => undef, 3113 reply => undef,
2775 tooltip => "Shows which body parts you posess and are available", 3114 tooltip => "Shows which body parts you posess and are available",
2776 }, 3115 },
3116 "c/statistics" => {
3117 id => "infobox",
3118 title => "Statistics",
3119 reply => undef,
3120 tooltip => "Shows your primary statistics",
3121 },
2777 "c/skills" => { 3122 "c/skills" => {
2778 id => "infobox", 3123 id => "infobox",
2779 title => "Skills", 3124 title => "Skills",
2780 reply => undef, 3125 reply => undef,
2781 tooltip => "Shows your experience per skill and item power", 3126 tooltip => "Shows your experience per skill and item power",
3127 },
3128 "c/shopitems" => {
3129 id => "infobox",
3130 title => "Shop Items",
3131 reply => undef,
3132 tooltip => "Shows the items currently for sale in this shop",
3133 },
3134 "c/resistances" => {
3135 id => "infobox",
3136 title => "Resistances",
3137 reply => undef,
3138 tooltip => "Shows your resistances",
3139 },
3140 "c/pets" => {
3141 id => "infobox",
3142 title => "Pets",
3143 reply => undef,
3144 tooltip => "Shows information abotu your pets/a specific pet",
3145 },
3146 "c/perceiveself" => {
3147 id => "infobox",
3148 title => "Perceive Self",
3149 reply => undef,
3150 tooltip => "You gained detailed knowledge about yourself",
2782 }, 3151 },
2783 "c/uptime" => { 3152 "c/uptime" => {
2784 id => "infobox", 3153 id => "infobox",
2785 title => "Uptime", 3154 title => "Uptime",
2786 reply => undef, 3155 reply => undef,
2796 id => "party", 3165 id => "party",
2797 title => "Party", 3166 title => "Party",
2798 reply => "gsay ", 3167 reply => "gsay ",
2799 tooltip => "Messages and chat related to your party", 3168 tooltip => "Messages and chat related to your party",
2800 }, 3169 },
3170 "c/death" => {
3171 id => "death",
3172 title => "Death",
3173 reply => undef,
3174 tooltip => "Reason for and more info about your most recent death",
3175 },
3176 "c/say" => $SAY_CHANNEL,
3177 "c/chat" => $CHAT_CHANNEL,
2801); 3178);
2802 3179
2803sub cf::client::send_msg { 3180sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 3181 my ($self, $channel, $msg, $color, @extra) = @_;
2805 3182
2810 3187
2811 # check predefined channels, for the benefit of C 3188 # check predefined channels, for the benefit of C
2812 if ($CHANNEL{$channel}) { 3189 if ($CHANNEL{$channel}) {
2813 $channel = $CHANNEL{$channel}; 3190 $channel = $CHANNEL{$channel};
2814 3191
2815 $self->ext_msg (channel_info => $channel) 3192 $self->ext_msg (channel_info => $channel);
2816 if $self->can_msg;
2817
2818 $channel = $channel->{id}; 3193 $channel = $channel->{id};
2819 3194
2820 } elsif (ref $channel) { 3195 } elsif (ref $channel) {
2821 # send meta info to client, if not yet sent 3196 # send meta info to client, if not yet sent
2822 unless (exists $self->{channel}{$channel->{id}}) { 3197 unless (exists $self->{channel}{$channel->{id}}) {
2823 $self->{channel}{$channel->{id}} = $channel; 3198 $self->{channel}{$channel->{id}} = $channel;
2824 $self->ext_msg (channel_info => $channel) 3199 $self->ext_msg (channel_info => $channel);
2825 if $self->can_msg;
2826 } 3200 }
2827 3201
2828 $channel = $channel->{id}; 3202 $channel = $channel->{id};
2829 } 3203 }
2830 3204
2831 return unless @extra || length $msg; 3205 return unless @extra || length $msg;
2832 3206
2833 if ($self->can_msg) {
2834 # default colour, mask it out 3207 # default colour, mask it out
2835 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3208 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2836 if $color & cf::NDI_DEF; 3209 if $color & cf::NDI_DEF;
2837 3210
2838 my $pkt = "msg " 3211 my $pkt = "msg "
2839 . $self->{json_coder}->encode ( 3212 . $self->{json_coder}->encode (
2840 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3213 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2841 ); 3214 );
2842 3215
2843 # try lzf for large packets
2844 $pkt = "lzf " . Compress::LZF::compress $pkt
2845 if 1024 <= length $pkt and $self->{can_lzf};
2846
2847 # split very large packets
2848 if (8192 < length $pkt and $self->{can_lzf}) {
2849 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2850 $pkt = "frag";
2851 }
2852
2853 $self->send_packet ($pkt); 3216 $self->send_big_packet ($pkt);
2854 } else {
2855 if ($color >= 0) {
2856 # replace some tags by gcfclient-compatible ones
2857 for ($msg) {
2858 1 while
2859 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2860 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2861 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2862 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2863 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2864 }
2865
2866 $color &= cf::NDI_COLOR_MASK;
2867
2868 utf8::encode $msg;
2869
2870 if (0 && $msg =~ /\[/) {
2871 # COMMAND/INFO
2872 $self->send_packet ("drawextinfo $color 10 8 $msg")
2873 } else {
2874 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2875 $self->send_packet ("drawinfo $color $msg")
2876 }
2877 }
2878 }
2879} 3217}
2880 3218
2881=item $client->ext_msg ($type, @msg) 3219=item $client->ext_msg ($type, @msg)
2882 3220
2883Sends an ext event to the client. 3221Sends an ext event to the client.
2885=cut 3223=cut
2886 3224
2887sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
2888 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
2889 3227
2890 if ($self->extcmd == 2) {
2891 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2892 } elsif ($self->extcmd == 1) { # TODO: remove
2893 push @msg, msgtype => "event_$type";
2894 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2895 }
2896}
2897
2898=item $client->ext_reply ($msgid, @msg)
2899
2900Sends an ext reply to the client.
2901
2902=cut
2903
2904sub cf::client::ext_reply($$@) {
2905 my ($self, $id, @msg) = @_;
2906
2907 if ($self->extcmd == 2) {
2908 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2909 } elsif ($self->extcmd == 1) {
2910 #TODO: version 1, remove
2911 unshift @msg, msgtype => "reply", msgid => $id;
2912 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2913 }
2914} 3229}
2915 3230
2916=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
2917 3232
2918Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
2973 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
2974 3289
2975 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2976 3291
2977 if (ref $msg) { 3292 if (ref $msg) {
2978 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2979 "ARRAY" eq ref $msg
2980 ? @$msg
2981 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2982 3294
2983 my @reply; 3295 my @reply;
2984 3296
2985 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
2986 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
2987 } 3299 }
2988 3300
2989 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
2990 if $reply; 3302 if $reply;
2991 3303
2992 } else { 3304 } else {
2993 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3305 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2994 } 3306 }
2995 3307
2996 cf::override; 3308 cf::override;
2997 }, 3309 },
2998); 3310);
3018 3330
3019 $coro 3331 $coro
3020} 3332}
3021 3333
3022cf::client->attach ( 3334cf::client->attach (
3023 on_destroy => sub { 3335 on_client_destroy => sub {
3024 my ($ns) = @_; 3336 my ($ns) = @_;
3025 3337
3026 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3027 }, 3339 },
3028); 3340);
3044our $safe_hole = new Safe::Hole; 3356our $safe_hole = new Safe::Hole;
3045 3357
3046$SIG{FPE} = 'IGNORE'; 3358$SIG{FPE} = 'IGNORE';
3047 3359
3048$safe->permit_only (Opcode::opset qw( 3360$safe->permit_only (Opcode::opset qw(
3049 :base_core :base_mem :base_orig :base_math 3361 :base_core :base_mem :base_orig :base_math :base_loop
3050 grepstart grepwhile mapstart mapwhile 3362 grepstart grepwhile mapstart mapwhile
3051 sort time 3363 sort time
3052)); 3364));
3053 3365
3054# here we export the classes and methods available to script code 3366# here we export the classes and methods available to script code
3058The following functions and methods are available within a safe environment: 3370The following functions and methods are available within a safe environment:
3059 3371
3060 cf::object 3372 cf::object
3061 contr pay_amount pay_player map x y force_find force_add destroy 3373 contr pay_amount pay_player map x y force_find force_add destroy
3062 insert remove name archname title slaying race decrease split 3374 insert remove name archname title slaying race decrease split
3375 value
3063 3376
3064 cf::object::player 3377 cf::object::player
3065 player 3378 player
3066 3379
3067 cf::player 3380 cf::player
3073=cut 3386=cut
3074 3387
3075for ( 3388for (
3076 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3389 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3077 insert remove inv nrof name archname title slaying race 3390 insert remove inv nrof name archname title slaying race
3078 decrease split destroy change_exp)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3079 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3080 ["cf::player" => qw(peaceful)], 3393 ["cf::player" => qw(peaceful send_msg)],
3081 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3082) { 3395) {
3083 no strict 'refs';
3084 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3085 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3086 for @funs; 3398 for @funs;
3087} 3399}
3088 3400
3103 3415
3104 my $qcode = $code; 3416 my $qcode = $code;
3105 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3417 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3106 $qcode =~ s/\n/\\n/g; 3418 $qcode =~ s/\n/\\n/g;
3107 3419
3420 %vars = (_dummy => 0) unless %vars;
3421
3422 my @res;
3108 local $_; 3423 local $_;
3109 local @safe::cf::_safe_eval_args = values %vars;
3110 3424
3111 my $eval = 3425 my $eval =
3112 "do {\n" 3426 "do {\n"
3113 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3427 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3114 . "#line 0 \"{$qcode}\"\n" 3428 . "#line 0 \"{$qcode}\"\n"
3115 . $code 3429 . $code
3116 . "\n}" 3430 . "\n}"
3117 ; 3431 ;
3118 3432
3433 if ($CFG{safe_eval}) {
3119 sub_generation_inc; 3434 sub_generation_inc;
3435 local @safe::cf::_safe_eval_args = values %vars;
3120 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3436 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3121 sub_generation_inc; 3437 sub_generation_inc;
3438 } else {
3439 local @cf::_safe_eval_args = values %vars;
3440 @res = wantarray ? eval eval : scalar eval $eval;
3441 }
3122 3442
3123 if ($@) { 3443 if ($@) {
3124 warn "$@"; 3444 warn "$@",
3125 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3126 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3127 } 3447 }
3128 3448
3129 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3130} 3450}
3131 3451
3145=cut 3465=cut
3146 3466
3147sub register_script_function { 3467sub register_script_function {
3148 my ($fun, $cb) = @_; 3468 my ($fun, $cb) = @_;
3149 3469
3150 no strict 'refs'; 3470 $fun = "safe::$fun" if $CFG{safe_eval};
3151 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3471 *$fun = $safe_hole->wrap ($cb);
3152} 3472}
3153 3473
3154=back 3474=back
3155 3475
3156=cut 3476=cut
3157 3477
3158############################################################################# 3478#############################################################################
3159# the server's init and main functions 3479# the server's init and main functions
3480
3481our %FACEHASH; # hash => idx, #d# HACK for http server
3482
3483# internal api, not fianlised
3484sub add_face {
3485 my ($name, $type, $data) = @_;
3486
3487 my $idx = cf::face::find $name;
3488
3489 if ($idx) {
3490 delete $FACEHASH{cf::face::get_chksum $idx};
3491 } else {
3492 $idx = cf::face::alloc $name;
3493 }
3494
3495 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3496
3497 cf::face::set_type $idx, $type;
3498 cf::face::set_data $idx, 0, $data, $hash;
3499 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3500 $FACEHASH{$hash} = $idx;#d#
3501
3502 $idx
3503}
3160 3504
3161sub load_facedata($) { 3505sub load_facedata($) {
3162 my ($path) = @_; 3506 my ($path) = @_;
3163 3507
3164 # HACK to clear player env face cache, we need some signal framework 3508 # HACK to clear player env face cache, we need some signal framework
3165 # for this (global event?) 3509 # for this (global event?)
3166 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3167 3511
3168 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3169 3513
3170 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3171 3515
3172 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3173 0 < aio_load $path, $facedata
3174 or die "$path: $!";
3175
3176 $facedata = Coro::Storable::thaw $facedata;
3177 3517
3178 $facedata->{version} == 2 3518 $facedata->{version} == 2
3179 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3180 3520
3181 # patch in the exptable
3182 $facedata->{resource}{"res/exp_table"} = {
3183 type => FT_RSRC,
3184 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3185 };
3186 cf::cede_to_tick; 3521 cf::cede_to_tick;
3187 3522
3188 { 3523 {
3189 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3190 3525
3191 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3192 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3193 3529
3194 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3195 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3196 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3197 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3533 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3534 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3535 $FACEHASH{$info->{hash64}} = $idx;#d#
3198 3536
3199 cf::cede_to_tick; 3537 cf::cede_to_tick;
3200 } 3538 }
3201 3539
3202 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3207 3545
3208 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3209 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3210 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3211 } else { 3549 } else {
3212 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3213 } 3551 }
3214 3552
3215 cf::cede_to_tick; 3553 cf::cede_to_tick;
3216 } 3554 }
3217 } 3555 }
3226 3564
3227 cf::anim::invalidate_all; # d'oh 3565 cf::anim::invalidate_all; # d'oh
3228 } 3566 }
3229 3567
3230 { 3568 {
3231 # TODO: for gcfclient pleasure, we should give resources
3232 # that gcfclient doesn't grok a >10000 face index.
3233 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3234 3570
3235 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3236 if (defined $info->{type}) { 3572 if (defined (my $type = $info->{type})) {
3573 # TODO: different hash - must free and use new index, or cache ixface data queue
3237 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3238 my $data;
3239 3575
3240 if ($info->{type} & 1) {
3241 # prepend meta info
3242
3243 my $meta = $enc->encode ({
3244 name => $name,
3245 %{ $info->{meta} || {} },
3246 });
3247
3248 $data = pack "(w/a*)*", $meta, $info->{data};
3249 } else {
3250 $data = $info->{data};
3251 }
3252
3253 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3254 cf::face::set_type $idx, $info->{type}; 3576 cf::face::set_type $idx, $type;
3577 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3578 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3579 $FACEHASH{$info->{hash}} = $idx;#d#
3255 } else { 3580 } else {
3256 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3257 } 3582 }
3258 3583
3259 cf::cede_to_tick; 3584 cf::cede_to_tick;
3260 } 3585 }
3261 } 3586 }
3262 3587
3263 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3264 3589
3265 1 3590 1
3266} 3591}
3267
3268cf::global->attach (on_resource_update => sub {
3269 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3270 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3271
3272 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3273 my $sound = $soundconf->{compat}[$_]
3274 or next;
3275
3276 my $face = cf::face::find "sound/$sound->[1]";
3277 cf::sound::set $sound->[0] => $face;
3278 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3279 }
3280
3281 while (my ($k, $v) = each %{$soundconf->{event}}) {
3282 my $face = cf::face::find "sound/$v";
3283 cf::sound::set $k => $face;
3284 }
3285 }
3286});
3287 3592
3288register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3289 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3290 3595
3291 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3299 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3300 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3301 cf::arch::commit_load; 3606 cf::arch::commit_load;
3302 3607
3303 $status 3608 $status
3609}
3610
3611sub reload_exp_table {
3612 _reload_exp_table;
3613
3614 add_face "res/exp_table" => FT_RSRC,
3615 JSON::XS->new->utf8->canonical->encode (
3616 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3617 );
3618}
3619
3620sub reload_materials {
3621 _reload_materials;
3304} 3622}
3305 3623
3306sub reload_regions { 3624sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3625 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3626 # for this (global event?)
3323} 3641}
3324 3642
3325sub reload_archetypes { 3643sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3645 or die "unable to load archetypes\n";
3646
3647 add_face "res/skill_info" => FT_RSRC,
3648 JSON::XS->new->utf8->canonical->encode (
3649 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3650 );
3651 add_face "res/spell_paths" => FT_RSRC,
3652 JSON::XS->new->utf8->canonical->encode (
3653 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3654 );
3328} 3655}
3329 3656
3330sub reload_treasures { 3657sub reload_treasures {
3331 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3332 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3333} 3660}
3334 3661
3662sub reload_sound {
3663 trace "loading sound config from $DATADIR/sound\n";
3664
3665 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3666
3667 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3668 my $sound = $soundconf->{compat}[$_]
3669 or next;
3670
3671 my $face = cf::face::find "sound/$sound->[1]";
3672 cf::sound::set $sound->[0] => $face;
3673 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3674 }
3675
3676 while (my ($k, $v) = each %{$soundconf->{event}}) {
3677 my $face = cf::face::find "sound/$v";
3678 cf::sound::set $k => $face;
3679 }
3680}
3681
3682#d# move docstuff to help or so
3683our %DOCSTRING;
3684
3685sub reload_pod {
3686 trace "loading pods $PODDIR\n";
3687
3688 %DOCSTRING = ();
3689 my @command_list;
3690
3691 for (
3692 [0, "command_help"],
3693 [1, "emote_help"],
3694 [2, "dmcommand_help"],
3695 ) {
3696 my ($type, $path) = @$_;
3697
3698 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3699 or die "unable to load $path";
3700
3701 my $level = 1e9;
3702 my $rpar;
3703
3704 for my $par (@$paragraphs) {
3705 if ($par->{type} eq "head2") {
3706 # this code taken almost verbatim from DC/Protocol.pm
3707
3708 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3709 my $cmd = $1;
3710 my @args = split /\|/, $2;
3711 @args = (".*") unless @args;
3712
3713 $_ = $_ eq ".*" ? "" : " $_"
3714 for @args;
3715
3716 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3717
3718 $rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
3719
3720 push @command_list, [$type, \@variants];
3721 $level = $par->{level};
3722 } else {
3723 error "$par->{markup}: unparsable command heading";
3724 }
3725 } elsif ($par->{level} > $level) {
3726 $$rpar .= &cf::pod::as_cfpod ([$par]);
3727 }
3728
3729 cf::cede_to_tick;
3730 }
3731 }
3732
3733 @command_list = sort {
3734 $a->[0] <=> $b->[0]
3735 or $a->[1] cmp $b->[1]
3736 } @command_list;
3737
3738 cf::cede_to_tick;
3739
3740 add_face "res/command_list" => FT_RSRC,
3741 JSON::XS->new->utf8->encode (\@command_list);
3742}
3743
3335sub reload_resources { 3744sub reload_resources {
3336 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3337 3746
3747 reload_materials;
3338 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3339 reload_archetypes; 3751 reload_archetypes;
3340 reload_regions; 3752 reload_regions;
3341 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3342 3755
3343 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3344}
3345
3346sub init {
3347 my $guard = freeze_mainloop;
3348
3349 evthread_start IO::AIO::poll_fileno;
3350
3351 reload_resources;
3352} 3757}
3353 3758
3354sub reload_config { 3759sub reload_config {
3355 open my $fh, "<:utf8", "$CONFDIR/config" 3760 trace "reloading config file...\n";
3356 or return;
3357 3761
3358 local $/; 3762 my $config = load_file "$CONFDIR/config";
3359 *CFG = YAML::Load <$fh>; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3360 3765
3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3362 3767
3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3768 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3769 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3365 3770
3366 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3389 3794
3390 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3391 print $fh $$; 3796 print $fh $$;
3392} 3797}
3393 3798
3799sub main_loop {
3800 trace "EV::loop starting\n";
3801 if (1) {
3802 EV::loop;
3803 }
3804 trace "EV::loop returned\n";
3805 goto &main_loop unless $REALLY_UNLOOP;
3806}
3807
3394sub main { 3808sub main {
3395 atomic; 3809 cf::init_globals; # initialise logging
3810
3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3815
3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3396 3817
3397 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3398 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3399 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3820 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3400 (async { 3821 (async {
3401 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3402 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3403 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3404 }; 3825 };
3405 3826
3406 { 3827 evthread_start IO::AIO::poll_fileno;
3407 my $guard = freeze_mainloop; 3828
3829 cf::sync_job {
3830 cf::incloader::init ();
3831
3832 db_init;
3833
3834 cf::init_anim;
3835 cf::init_attackmess;
3836 cf::init_dynamic;
3837
3838 cf::load_settings;
3839
3840 reload_resources;
3408 reload_config; 3841 reload_config;
3409 db_init; 3842
3843 cf::init_uuid;
3844 cf::init_signals;
3845 cf::init_skills;
3846
3847 cf::init_beforeplay;
3848
3849 atomic;
3850
3410 load_extensions; 3851 load_extensions;
3411 3852
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413 }
3414
3415 utime time, time, $RUNTIMEFILE; 3853 utime time, time, $RUNTIMEFILE;
3416 3854
3417 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3856 use POSIX ();
3418 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3857 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3419 3858
3420 EV::loop; 3859 cf::_post_init 0;
3860 };
3861
3862 cf::object::thawer::errors_are_fatal 0;
3863 info "parse errors in files are no longer fatal from this point on.\n";
3864
3865 AE::postpone {
3866 undef &main; # free gobs of memory :)
3867 };
3868
3869 goto &main_loop;
3421} 3870}
3422 3871
3423############################################################################# 3872#############################################################################
3424# initialisation and cleanup 3873# initialisation and cleanup
3425 3874
3426# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3427BEGIN { 3876BEGIN {
3428 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3429 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3430 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3431 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3432 }; 3881 };
3433 } 3882 }
3434} 3883}
3435 3884
3436sub write_runtime_sync { 3885sub write_runtime_sync {
3886 my $t0 = AE::time;
3887
3437 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3438 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3439 3890
3440 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3441 3892
3442 my $guard = cf::lock_acquire "write_runtime"; 3893 my $guard = cf::lock_acquire "write_runtime";
3443 3894
3444 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3895 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3445 or return; 3896 or return;
3446 3897
3447 my $value = $cf::RUNTIME + 90 + 10; 3898 my $value = $cf::RUNTIME + 90 + 10;
3448 # 10 is the runtime save interval, for a monotonic clock 3899 # 10 is the runtime save interval, for a monotonic clock
3449 # 60 allows for the watchdog to kill the server. 3900 # 60 allows for the watchdog to kill the server.
3462 or return; 3913 or return;
3463 3914
3464 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3465 and return; 3916 and return;
3466 3917
3467 warn "runtime file written.\n"; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3468 3919
3469 1 3920 1
3470} 3921}
3471 3922
3472our $uuid_lock; 3923our $uuid_lock;
3481 my $uuid = "$LOCALDIR/uuid"; 3932 my $uuid = "$LOCALDIR/uuid";
3482 3933
3483 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3934 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3484 or return; 3935 or return;
3485 3936
3486 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3937 my $value = uuid_seq uuid_cur;
3938
3939 unless ($value) {
3940 info "cowardly refusing to write zero uuid value!\n";
3941 return;
3942 }
3943
3944 my $value = uuid_str $value + $uuid_skip;
3487 $uuid_skip = 0; 3945 $uuid_skip = 0;
3488 3946
3489 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3947 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3490 and return; 3948 and return;
3491 3949
3497 or return; 3955 or return;
3498 3956
3499 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3500 and return; 3958 and return;
3501 3959
3502 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3503 3961
3504 1 3962 1
3505 3963
3506} 3964}
3507 3965
3513} 3971}
3514 3972
3515sub emergency_save() { 3973sub emergency_save() {
3516 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3517 3975
3518 warn "enter emergency perl save\n"; 3976 info "emergency_perl_save: enter\n";
3977
3978 # this is a trade-off: we want to be very quick here, so
3979 # save all maps without fsync, and later call a global sync
3980 # (which in turn might be very very slow)
3981 local $USE_FSYNC = 0;
3519 3982
3520 cf::sync_job { 3983 cf::sync_job {
3984 cf::write_runtime_sync; # external watchdog should not bark
3985
3521 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3522 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3523 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3524 warn "begin emergency player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3525 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3526 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3527 $pl->valid or next; 3992 $pl->valid or next;
3528 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3529 $pl->save; 3994 $pl->save;
3530 } 3995 }
3531 warn "end emergency player save\n"; 3996 info "emergency_perl_save: end player save\n";
3532 3997
3533 warn "begin emergency map save\n"; 3998 cf::write_runtime_sync; # external watchdog should not bark
3999
4000 info "emergency_perl_save: begin map save\n";
3534 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3535 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3536 $map->valid or next; 4003 $map->valid or next;
3537 $map->save; 4004 $map->save;
3538 } 4005 }
3539 warn "end emergency map save\n"; 4006 info "emergency_perl_save: end map save\n";
3540 4007
3541 warn "begin emergency database checkpoint\n"; 4008 cf::write_runtime_sync; # external watchdog should not bark
4009
4010 info "emergency_perl_save: begin database checkpoint\n";
3542 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3543 warn "end emergency database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3544 4013
3545 warn "begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3546 write_uuid_sync 1; 4015 write_uuid_sync 1;
3547 warn "end write uuid\n"; 4016 info "emergency_perl_save: end write uuid\n";
4017
4018 cf::write_runtime_sync; # external watchdog should not bark
4019
4020 trace "emergency_perl_save: syncing database to disk";
4021 BDB::db_env_txn_checkpoint $DB_ENV;
4022
4023 info "emergency_perl_save: starting sync\n";
4024 IO::AIO::aio_sync sub {
4025 info "emergency_perl_save: finished sync\n";
4026 };
4027
4028 cf::write_runtime_sync; # external watchdog should not bark
4029
4030 trace "emergency_perl_save: flushing outstanding aio requests";
4031 while (IO::AIO::nreqs || BDB::nreqs) {
4032 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4033 }
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
3548 }; 4036 };
3549 4037
3550 warn "leave emergency perl save\n"; 4038 info "emergency_perl_save: leave\n";
3551} 4039}
3552 4040
3553sub post_cleanup { 4041sub post_cleanup {
3554 my ($make_core) = @_; 4042 my ($make_core) = @_;
3555 4043
4044 IO::AIO::flush;
4045
3556 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3557 if $make_core; 4047 if $make_core;
3558 4048
3559 my $fh = pidfile; 4049 my $fh = pidfile;
3560 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3561} 4051}
3581 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3582 for my $name (keys %$leaf_symtab) { 4072 for my $name (keys %$leaf_symtab) {
3583 _gv_clear *{"$pkg$name"}; 4073 _gv_clear *{"$pkg$name"};
3584# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3585 } 4075 }
3586 warn "cleared package $pkg\n";#d#
3587} 4076}
3588 4077
3589sub do_reload_perl() { 4078sub do_reload_perl() {
3590 # can/must only be called in main 4079 # can/must only be called in main
3591 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3592 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3593 return; 4082 return;
3594 } 4083 }
3595 4084
3596 return if $RELOAD++; 4085 return if $RELOAD++;
3597 4086
4087 my $t1 = AE::time;
4088
3598 while ($RELOAD) { 4089 while ($RELOAD) {
3599 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3600 4092
3601 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3602 4094
3603 cf::sync_job { 4095 cf::sync_job {
3604 cf::write_runtime_sync; # external watchdog should not bark
3605 cf::emergency_save; 4096 #cf::emergency_save;
3606 cf::write_runtime_sync; # external watchdog should not bark
3607 4097
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 while (IO::AIO::nreqs || BDB::nreqs) {
3615 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3616 }
3617
3618 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3619 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3620 %EXT_CORO = (); 4100 %EXT_CORO = ();
3621 4101
3622 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3623 %COMMAND = (); 4103 %COMMAND = ();
3624 4104
3625 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3626 %EXTCMD = (); 4106 %EXTCMD = ();
3627 %EXTICMD = (); 4107 %EXTICMD = ();
3628 4108
3629 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3630 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3631 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3632 4112
3633 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3634 eval { 4114 eval {
3635 $cb->($pkg); 4115 $cb->($pkg);
3636 1 4116 1
3637 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3638 } 4118 }
3639 4119
3640 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3641 clear_package $pkg; 4121 clear_package $pkg;
3642 } 4122 }
3643 4123
3644 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3645 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3646 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3647 4127
3648 warn "... unloading $k"; 4128 trace "... unloading $k";
3649 delete $INC{$k}; 4129 delete $INC{$k};
3650 4130
3651 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3652 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3653 4133
3656 } 4136 }
3657 4137
3658 clear_package $k; 4138 clear_package $k;
3659 } 4139 }
3660 4140
3661 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3662 clear_package "safe::$_" 4142 clear_package "safe::$_"
3663 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4143 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3664 4144
3665 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3666 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3667 delete $INC{"cf/pod.pm"}; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3668 4148
3669 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3670 # and global variables created in xs 4150 # and global variables created in xs
3671 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3672 4152
3673 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3674 4154
3675 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3676 require cf; 4156 require cf;
3677 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4157 cf::_connect_to_perl_1;
3678 4158
3679 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3680 cf::reload_config; 4160 cf::reload_config;
3681 4161
3682 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3683 cf::load_extensions; 4163 cf::load_extensions;
3684 4164
4165 if ($REATTACH_ON_RELOAD) {
3685 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3686 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3687 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3688 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3689 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3690 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
4172 }
3691 4173
3692 warn "leaving sync_job"; 4174 cf::_post_init 1;
4175
4176 trace "perl_reload: leaving sync_job";
3693 4177
3694 1 4178 1
3695 } or do { 4179 } or do {
3696 warn $@; 4180 error $@;
3697 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3698 }; 4182 };
3699 4183
3700 warn "reloaded";
3701 --$RELOAD; 4184 --$RELOAD;
3702 } 4185 }
4186
4187 $t1 = AE::time - $t1;
4188 info "perl_reload: completed in ${t1}s\n";
3703}; 4189};
3704 4190
3705our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3706 4192
3707sub reload_perl() { 4193sub reload_perl() {
3708 # doing reload synchronously and two reloads happen back-to-back, 4194 # doing reload synchronously and two reloads happen back-to-back,
3709 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3710 4196
4197 $RELOAD_WATCHER ||= cf::async {
4198 Coro::AIO::aio_wait cache_extensions;
4199
3711 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3712 do_reload_perl; 4201 do_reload_perl;
3713 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
4203 };
3714 }; 4204 };
3715} 4205}
3716 4206
3717register_command "reload" => sub { 4207register_command "reload" => sub {
3718 my ($who, $arg) = @_; 4208 my ($who, $arg) = @_;
3724 reload_perl; 4214 reload_perl;
3725 }; 4215 };
3726 } 4216 }
3727}; 4217};
3728 4218
3729unshift @INC, $LIBDIR; 4219#############################################################################
3730 4220
3731my $bug_warning = 0; 4221my $bug_warning = 0;
3732 4222
3733our @WAIT_FOR_TICK;
3734our @WAIT_FOR_TICK_BEGIN;
3735
3736sub wait_for_tick { 4223sub wait_for_tick() {
3737 return if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3738 4225
3739 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3740 push @WAIT_FOR_TICK, $signal;
3741 $signal->wait;
3742} 4227}
3743 4228
3744sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3745 return if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3746 4231
3747 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3748 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3749 $signal->wait; 4234 $signal->wait;
3750} 4235}
3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4239 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3755 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3756 return; 4241 return;
3757 } 4242 }
3758 4243
3759 cf::server_tick; # one server iteration 4244 cf::one_tick; # one server iteration
4245
4246 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3760 4247
3761 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4249 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3763 Coro::async_pool { 4250 Coro::async_pool {
3764 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3765 write_runtime_sync 4252 write_runtime_sync
3766 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3767 }; 4254 };
3768 } 4255 }
3769 4256
3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3771 $sig->send; 4258 $sig->send;
3772 } 4259 }
3773 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3774 $sig->send;
3775 }
3776 4261
3777 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3779 4264
3780 if (0) { 4265 if (0) {
3781 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3782 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3785 } 4270 }
3786 } 4271 }
3787} 4272}
3788 4273
3789{ 4274{
3790 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3791 4277
3792 BDB::min_parallel 8; 4278 BDB::min_parallel 16;
3793 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3794 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3795 4281
3796 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3797 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3799 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4285 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3824 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3825 }; 4311 };
3826 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3827 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3828 }; 4314 };
4315
4316 info "database initialised";
3829} 4317}
3830 4318
3831{ 4319{
3832 # configure IO::AIO 4320 # configure IO::AIO
3833 4321
4322 info "initialising aio";
3834 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
3835 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
3836 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
3837} 4327}
3838 4328
3839my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
3840 4331
3841sub _log_backtrace { 4332sub _log_backtrace {
3842 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
3843 4334
3844 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
3845 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3846 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
3847 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
3848 ++$_log_backtrace; 4343 ++$_log_backtrace;
3849 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
3850 async { 4345 async {
3851 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
3852 4347
3872 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
3873 --$_log_backtrace; 4368 --$_log_backtrace;
3874 }; 4369 };
3875 } else { 4370 } else {
3876 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
3877 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3878 } 4373 }
3879} 4374}
3880 4375
3881# load additional modules 4376# load additional modules
3882use cf::pod; 4377require "cf/$_.pm" for @EXTRA_MODULES;
4378cf::_connect_to_perl_2;
3883 4379
3884END { cf::emergency_save } 4380END { cf::emergency_save }
3885 4381
38861 43821
3887 4383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines