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.453 by root, Tue Sep 23 04:29:11 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
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
132 156
133our @POST_INIT; 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;
134 164
135binmode STDOUT; 165binmode STDOUT;
136binmode STDERR; 166binmode STDERR;
137 167
138# read virtual server time, if available 168# read virtual server time, if available
140 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
141 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
142 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
143} 173}
144 174
175eval "sub TICK() { $TICK } 1" or die;
176
145mkdir $_ 177mkdir $_
146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
147 179
148our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
149 181
150sub cf::map::normalise; 182sub cf::map::normalise;
151 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
152############################################################################# 188#############################################################################
153 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
154=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
155 202
156=over 4 203=over 4
157 204
158=item $cf::UPTIME 205=item $cf::UPTIME
159 206
160The 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.
161 223
162=item $cf::RUNTIME 224=item $cf::RUNTIME
163 225
164The 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
165every server tick. 227every server tick.
166 228
167=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
168$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
169$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
170 232
171Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
172directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
173unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
174database environment. 236database environment.
175 237
176=item $cf::NOW
177
178The time of the last (current) server tick.
179
180=item $cf::TICK
181
182The interval between server ticks, in seconds.
183
184=item $cf::LOADAVG 238=item $cf::LOADAVG
185 239
186The 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
187(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
188objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
197from wherever your confdir points to. 251from wherever your confdir points to.
198 252
199=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
200 254
201These 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
202returns 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
203per 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.
204 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
205=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
206 277
207This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
208C<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
209that call. 280that call.
210 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
211=back 288=back
212 289
213=cut 290=cut
214 291
215BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
216 *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 {
217 my $msg = join "", @_; 299 my $msg = join "", @_;
218 300
219 $msg .= "\n" 301 $msg .= "\n"
220 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
221 303
222 $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;
223 305
224 LOG llevError, $msg; 306 LOG llevWarn, $msg;
225 }; 307};
226}
227 308
228$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
229 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
230 311
231 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
232 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
233 return;#d# 316 return;#d#
234 }#d# 317 }#d#
235 318
236 # kill coroutine otherwise 319 # kill coroutine otherwise
237 warn Carp::longmess $_[0];
238 Coro::terminate 320 Coro::terminate
239}; 321};
240
241$SIG{__DIE__} = sub { }; #d#?
242 322
243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
260)) { 340)) {
261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
262} 342}
263 343
264$EV::DIED = sub { 344$EV::DIED = sub {
265 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
266}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
267 352
268############################################################################# 353#############################################################################
269 354
270=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
271 356
292 $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;
293 $d 378 $d
294 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
295} 380}
296 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
297=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
298 435
299Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
300 437
301=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
307our $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
308 445
309sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
310sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
311 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
312=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
313 481
314Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
315but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
316 484
317The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
318is a reload or not. 486is a reload or not.
319 487
320=cut 488=cut
321 489
322sub post_init(&) { 490sub post_init(&) {
323 push @POST_INIT, shift; 491 push @POST_INIT, shift;
324} 492}
325 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
326=item cf::lock_wait $string 511=item cf::lock_wait $string
327 512
328Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
329 514
330=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
331 516
332Wait 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
333a 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,
334for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
335returned. 520returned.
336 521
337Locks 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
338deadlocked coro. 523deadlocked coro.
344 529
345Return 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.
346 531
347=cut 532=cut
348 533
349our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
350our %LOCKER;#d#
351 535
352sub lock_wait($) { 536sub lock_wait($) {
353 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
354
355 if ($LOCKER{$key} == $Coro::current) {#d#
356 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
357 return;#d#
358 }#d#
359
360 # wait for lock, if any
361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
363 push @{ $LOCK{$key} }, $Coro::current;
364 Coro::schedule;
365 }
366} 538}
367 539
368sub lock_acquire($) { 540sub lock_acquire($) {
369 my ($key) = @_; 541 $LOCKS->guard ($_[0])
370
371 # wait, to be sure we are not locked
372 lock_wait $key;
373
374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
376
377 Coro::guard {
378 delete $LOCKER{$key};#d#
379 # wake up all waiters, to be on the safe side
380 $_->ready for @{ delete $LOCK{$key} };
381 }
382} 542}
383 543
384sub lock_active($) { 544sub lock_active($) {
385 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
386
387 ! ! $LOCK{$key}
388} 546}
389 547
390sub freeze_mainloop { 548sub freeze_mainloop {
391 tick_inhibit_inc; 549 tick_inhibit_inc;
392 550
393 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
394} 552}
395 553
396=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
397 555
398Like 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
399get spread over timer. 557get spread over time.
400 558
401=cut 559=cut
402 560
403sub periodic($$) { 561sub periodic($$) {
404 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
408 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
409} 567}
410 568
411=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
412 570
413Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
414This 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
415of 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.
416 578
417The 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
418used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
419 581
420Useful for short background jobs. 582Useful for short background jobs.
421 583
422=cut 584=cut
423 585
424our @SLOT_QUEUE; 586our @SLOT_QUEUE;
425our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
426 589
427$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
428$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
429 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
430 593
431 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
432 596
433 while () { 597 while () {
434 next_job: 598 next_job:
599
435 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
436 if ($avail > 0.01) { 601
437 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
438 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
439 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
440 $job->[2]->send; 606 $job->[2]->send;
441 Coro::cede; 607 Coro::cede;
442 goto next_job; 608 goto next_job;
443 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
444 } 611 }
445 } 612 }
446 613
447 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
448 # 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
449 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
450 $signal->wait;
451 } else { 617 } else {
618 $busy = 0;
452 Coro::schedule; 619 Coro::schedule;
453 } 620 }
454 } 621 }
455}; 622};
456 623
457sub get_slot($;$$) { 624sub get_slot($;$$) {
458 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
459 626
460 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
461 628
462 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
463 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
464 632
465 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
466 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
467 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
493=cut 661=cut
494 662
495sub sync_job(&) { 663sub sync_job(&) {
496 my ($job) = @_; 664 my ($job) = @_;
497 665
498 if ($Coro::current == $Coro::main) { 666 if (in_main) {
499 my $time = EV::time; 667 my $time = AE::time;
500 668
501 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
502 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
503 671
504 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
505 673
506 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
507 675
508 my $busy = 1; 676 my $busy = 1;
509 my @res; 677 my @res;
510 678
511 (async { 679 (async {
512 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
513 @res = eval { $job->() }; 681 @res = eval { $job->() };
514 warn $@ if $@; 682 error $@ if $@;
515 undef $busy; 683 undef $busy;
516 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
517 685
518 while ($busy) { 686 while ($busy) {
519 if (Coro::nready) { 687 if (Coro::nready) {
521 } else { 689 } else {
522 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
523 } 691 }
524 } 692 }
525 693
526 my $time = EV::time - $time; 694 my $time = AE::time - $time;
527 695
528 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
529 697
530 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
531 } else { 699 } else {
553 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
554 722
555 $coro 723 $coro
556} 724}
557 725
558=item fork_call { }, $args 726=item fork_call { }, @args
559 727
560Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
561process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
562Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
563never block itself or use any form of event handling. 731never block itself or use any form of event handling.
564 732
565=cut 733=cut
566 734
735sub post_fork {
736 reset_signals;
737}
738
567sub fork_call(&@) { 739sub fork_call(&@) {
568 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
569 741
570 # 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,
571 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
572 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
573 745
574 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
575 reset_signals; 747 cf::post_fork;
576 &$cb 748 &$cb
577 }, @args; 749 } @args;
578 750
579 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 )
580} 763}
581 764
582=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
583 766
584=cut 767=cut
621within each server. 804within each server.
622 805
623=cut 806=cut
624 807
625sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
626 my ($name) = @_; 812 my ($name) = @_;
627 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
628 814
629 eval { 815 eval {
630 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
640} 826}
641 827
642our $DB; 828our $DB;
643 829
644sub db_init { 830sub db_init {
645 cf::sync_job {
646 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
647 };
648} 832}
649 833
650sub db_get($$) { 834sub db_get($$) {
651 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
652 836
653 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
654 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
655 841
656 $! ? () 842 $! ? ()
657 : $data 843 : $data
658 }
659} 844}
660 845
661sub db_put($$$) { 846sub db_put($$$) {
662 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
663 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
691 876
692 my @data; 877 my @data;
693 my $md5; 878 my $md5;
694 879
695 for (0 .. $#$src) { 880 for (0 .. $#$src) {
696 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
697 or Carp::croak "$src->[$_]: $!";
698 } 882 }
699 883
700 # if processing is expensive, check 884 # if processing is expensive, check
701 # checksum first 885 # checksum first
702 if (1) { 886 if (1) {
719 903
720 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
721 my $data = $process->(\@data); 905 my $data = $process->(\@data);
722 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
723 907
724 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
725 909
726 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
727 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
728 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
729 913
739 923
740=cut 924=cut
741 925
742sub datalog($@) { 926sub datalog($@) {
743 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
744 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
745} 929}
746 930
747=back 931=back
748 932
749=cut 933=cut
944 1128
945 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
946 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
947 1131
948 } elsif (ref $type) { 1132 } elsif (ref $type) {
949 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
950 1134
951 } else { 1135 } else {
952 shift @arg; 1136 shift @arg;
953 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
954 } 1138 }
955 } 1139 }
956} 1140}
957 1141
958sub _object_attach { 1142sub _object_attach {
968 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
969 } 1153 }
970 1154
971 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
972 } else { 1156 } else {
973 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
974 } 1158 }
975 1159
976 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
977} 1161}
978 1162
1037 1221
1038 for (@$callbacks) { 1222 for (@$callbacks) {
1039 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1040 1224
1041 if ($@) { 1225 if ($@) {
1042 warn "$@";
1043 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1044 override; 1227 override;
1045 } 1228 }
1046 1229
1047 return 1 if $override; 1230 return 1 if $override;
1048 } 1231 }
1127 for (@$attach) { 1310 for (@$attach) {
1128 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1129 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1130 } 1313 }
1131 } else { 1314 } else {
1132 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1133 } 1316 }
1134 } 1317 }
1135} 1318}
1136 1319
1137cf::attachable->attach ( 1320cf::attachable->attach (
1164 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1165 1348
1166 sync_job { 1349 sync_job {
1167 if (length $$rdata) { 1350 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1169 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1170 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1171 1355
1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1173 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1175 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 }
1176 aio_close $fh; 1363 aio_close $fh;
1177 1364
1178 if (@$objs) { 1365 if (@$objs) {
1179 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) {
1180 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1182 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1183 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 }
1184 aio_close $fh; 1374 aio_close $fh;
1185 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1186 } 1376 }
1187 } else { 1377 } else {
1188 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1189 } 1379 }
1190 1380
1191 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1382
1383 $filename =~ s%/[^/]+$%%;
1384 aio_pathsync $filename if $cf::USE_FSYNC;
1192 } else { 1385 } else {
1193 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1194 } 1387 }
1195 } else { 1388 } else {
1196 aio_unlink $filename; 1389 aio_unlink $filename;
1197 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1198 } 1391 }
1222 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs}; 1416 $av = $st->{objs};
1224 } 1417 }
1225 1418
1226 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1227 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1228 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1229 1423
1230 ($data, $av) 1424 ($data, $av)
1231} 1425}
1232 1426
1233=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1237=cut 1431=cut
1238 1432
1239############################################################################# 1433#############################################################################
1240# command handling &c 1434# command handling &c
1241 1435
1242=item cf::register_command $name => \&callback($ob,$args); 1436=item cf::register_command $name => \&callback($ob,$args)
1243 1437
1244Register a callback for execution when the client sends the user command 1438Register a callback for execution when the client sends the user command
1245$name. 1439$name.
1246 1440
1247=cut 1441=cut
1253 #warn "registering command '$name/$time' to '$caller'"; 1447 #warn "registering command '$name/$time' to '$caller'";
1254 1448
1255 push @{ $COMMAND{$name} }, [$caller, $cb]; 1449 push @{ $COMMAND{$name} }, [$caller, $cb];
1256} 1450}
1257 1451
1258=item cf::register_extcmd $name => \&callback($pl,$packet); 1452=item cf::register_extcmd $name => \&callback($pl,$packet)
1259 1453
1260Register a callback for execution when the client sends an (synchronous) 1454Register a callback for execution when the client sends an (synchronous)
1261extcmd packet. Ext commands will be processed in the order they are 1455extcmd packet. Ext commands will be processed in the order they are
1262received by the server, like other user commands. The first argument is 1456received by the server, like other user commands. The first argument is
1263the 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
1264has logged in successfully. 1458has logged in successfully.
1265 1459
1266If 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
1267called. 1461called.
1268 1462
1269=item cf::register_exticmd $name => \&callback($ns,$packet); 1463=item cf::register_exticmd $name => \&callback($ns,$packet)
1270 1464
1271Register a callback for execution when the client sends an (asynchronous) 1465Register a callback for execution when the client sends an (asynchronous)
1272exticmd 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
1273are 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
1274is a client socket. Exti commands can be received anytime, even before 1468is a client socket. Exti commands can be received anytime, even before
1289 my ($name, $cb) = @_; 1483 my ($name, $cb) = @_;
1290 1484
1291 $EXTICMD{$name} = $cb; 1485 $EXTICMD{$name} = $cb;
1292} 1486}
1293 1487
1488use File::Glob ();
1489
1294cf::player->attach ( 1490cf::player->attach (
1295 on_command => sub { 1491 on_unknown_command => sub {
1296 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1297 1493
1298 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1299 or return; 1495 or return;
1300 1496
1308 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1309 1505
1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1311 1507
1312 if (ref $msg) { 1508 if (ref $msg) {
1313 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1314 "ARRAY" eq ref $msg
1315 ? @$msg
1316 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1317 1510
1318 my @reply; 1511 my @reply;
1319 1512
1320 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1321 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1322 } 1515 }
1323 1516
1324 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_msg ("reply-$reply", @reply)
1325 if $reply; 1518 if $reply;
1326 1519
1327 } else { 1520 } else {
1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1329 } 1522 }
1330 1523
1331 cf::override; 1524 cf::override;
1332 }, 1525 },
1333); 1526);
1334 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
1335sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1336 cf::sync_job { 1557 cf::sync_job {
1337 my %todo; 1558 my %todo;
1338 1559
1339 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1340 next unless -r $path; 1561 next unless -r $path;
1358 1579
1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1361 1582
1362 $ext{source} = 1583 $ext{source} =
1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1364 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1365 . $source 1586 . $source
1366 . "\n};\n1"; 1587 . "\n};\n1";
1367 1588
1368 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1369 } 1590 }
1370 1591
1592 my $pass = 0;
1371 my %done; 1593 my %done;
1372 while (%todo) { 1594 while (%todo) {
1373 my $progress; 1595 my $progress;
1374 1596
1597 ++$pass;
1598
1599 ext:
1375 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1376 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1377 goto skip 1602 next ext
1378 unless exists $done{$_}; 1603 unless exists $done{$_};
1379 } 1604 }
1380 1605
1381 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1382 1607
1383 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 $@) {
1384 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1385 : "$v->{base}: extension inactive.\n";
1386 1621
1387 if (exists $v->{meta}{mandatory}) {
1388 warn $msg;
1389 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1390 } 1623 if exists $v->{meta}{mandatory};
1391 1624
1392 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;
1393 } 1634 }
1394
1395 $done{$k} = delete $todo{$k};
1396 push @EXTS, $v->{pkg};
1397 $progress = 1;
1398 } 1635 }
1399 1636
1400 skip: 1637 unless ($progress) {
1401 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1402 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 }
1403 } 1647 }
1404 }; 1648 };
1405} 1649}
1406 1650
1407############################################################################# 1651#############################################################################
1491 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1492 } 1736 }
1493 } 1737 }
1494} 1738}
1495 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
1496sub save($) { 1753sub save($) {
1497 my ($pl) = @_; 1754 my ($pl) = @_;
1498 1755
1499 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1500 1757
1505 1762
1506 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1507 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1508 1765
1509 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];
1510 1770
1511 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1512 cf::cede_to_tick; 1772 cf::cede_to_tick;
1513} 1773}
1514 1774
1548 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1549 1809
1550 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1551 $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
1552 1812
1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1554 $pl->deactivate; 1814 $pl->deactivate;
1815
1555 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;
1556 $pl->ob->check_score;
1557 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1558 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1559 1821
1560 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1561 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1562 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1616 \@logins 1878 \@logins
1617} 1879}
1618 1880
1619=item $player->maps 1881=item $player->maps
1620 1882
1883=item cf::player::maps $login
1884
1621Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1622player. May block. 1886player. May block.
1623 1887
1624=cut 1888=cut
1625 1889
1646 1910
1647=item $protocol_xml = $player->expand_cfpod ($cfpod) 1911=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648 1912
1649Expand deliantra pod fragments into protocol xml. 1913Expand deliantra pod fragments into protocol xml.
1650 1914
1651=item $player->ext_reply ($msgid, @msg)
1652
1653Sends an ext reply to the player.
1654
1655=cut
1656
1657sub ext_reply($$@) {
1658 my ($self, $id, @msg) = @_;
1659
1660 $self->ns->ext_reply ($id, @msg)
1661}
1662
1663=item $player->ext_msg ($type, @msg) 1915=item $player->ext_msg ($type, @msg)
1664 1916
1665Sends an ext event to the client. 1917Sends an ext event to the client.
1666 1918
1667=cut 1919=cut
1686 1938
1687=cut 1939=cut
1688 1940
1689sub find_by_path($) { 1941sub find_by_path($) {
1690 my ($path) = @_; 1942 my ($path) = @_;
1943
1944 $path =~ s/^~[^\/]*//; # skip ~login
1691 1945
1692 my ($match, $specificity); 1946 my ($match, $specificity);
1693 1947
1694 for my $region (list) { 1948 for my $region (list) {
1695 if ($region->{match} && $path =~ $region->{match}) { 1949 if ($region->{match} && $path =~ $region->{match}) {
1724sub generate_random_map { 1978sub generate_random_map {
1725 my ($self, $rmp) = @_; 1979 my ($self, $rmp) = @_;
1726 1980
1727 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
1728 1982
1729 # mit "rum" bekleckern, nicht
1730 $self->_create_random_map ( 1983 $self->_create_random_map ($rmp);
1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1734 $rmp->{exit_on_final_map},
1735 $rmp->{xsize}, $rmp->{ysize},
1736 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1737 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1738 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1739 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1740 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1741 (cf::region::find $rmp->{region}), $rmp->{custom}
1742 )
1743} 1984}
1744 1985
1745=item cf::map->register ($regex, $prio) 1986=item cf::map->register ($regex, $prio)
1746 1987
1747Register 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
1752 1993
1753sub register { 1994sub register {
1754 my (undef, $regex, $prio) = @_; 1995 my (undef, $regex, $prio) = @_;
1755 my $pkg = caller; 1996 my $pkg = caller;
1756 1997
1757 no strict;
1758 push @{"$pkg\::ISA"}, __PACKAGE__; 1998 push @{"$pkg\::ISA"}, __PACKAGE__;
1759 1999
1760 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2000 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1761} 2001}
1762 2002
1763# also paths starting with '/' 2003# also paths starting with '/'
1764$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2004$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1765 2005
1766sub thawer_merge { 2006sub thawer_merge {
1767 my ($self, $merge) = @_; 2007 my ($self, $merge) = @_;
1768 2008
1769 # we have to keep some variables in memory intact 2009 # we have to keep some variables in memory intact
1774} 2014}
1775 2015
1776sub normalise { 2016sub normalise {
1777 my ($path, $base) = @_; 2017 my ($path, $base) = @_;
1778 2018
1779 $path = "$path"; # make sure its a string 2019 $path = "$path"; # make sure it's a string
1780 2020
1781 $path =~ s/\.map$//; 2021 $path =~ s/\.map$//;
1782 2022
1783 # map plan: 2023 # map plan:
1784 # 2024 #
1799 $base =~ s{[^/]+/?$}{}; 2039 $base =~ s{[^/]+/?$}{};
1800 $path = "$base/$path"; 2040 $path = "$base/$path";
1801 } 2041 }
1802 2042
1803 for ($path) { 2043 for ($path) {
1804 redo if s{//}{/};
1805 redo if s{/\.?/}{/}; 2044 redo if s{/\.?/}{/};
1806 redo if s{/[^/]+/\.\./}{/}; 2045 redo if s{/[^/]+/\.\./}{/};
1807 } 2046 }
1808 2047
1809 $path 2048 $path
1823 $self->init; # pass $1 etc. 2062 $self->init; # pass $1 etc.
1824 return $self; 2063 return $self;
1825 } 2064 }
1826 } 2065 }
1827 2066
1828 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2067 Carp::cluck "unable to resolve path '$path' (base '$base')";
1829 () 2068 ()
1830} 2069}
1831 2070
2071# may re-bless or do other evil things
1832sub init { 2072sub init {
1833 my ($self) = @_; 2073 my ($self) = @_;
1834 2074
1835 $self 2075 $self
1836} 2076}
1867 2107
1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2108 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1869 "$UNIQUEDIR/$path" 2109 "$UNIQUEDIR/$path"
1870} 2110}
1871 2111
1872# and all this just because we cannot iterate over
1873# all maps in C++...
1874sub change_all_map_light {
1875 my ($change) = @_;
1876
1877 $_->change_map_light ($change)
1878 for grep $_->outdoor, values %cf::MAP;
1879}
1880
1881sub decay_objects { 2112sub decay_objects {
1882 my ($self) = @_; 2113 my ($self) = @_;
1883 2114
1884 return if $self->{deny_reset}; 2115 return if $self->{deny_reset};
1885 2116
1910 $self->{load_path} = $path; 2141 $self->{load_path} = $path;
1911 2142
1912 1 2143 1
1913} 2144}
1914 2145
2146# used to laod the header of an original map
1915sub load_header_orig { 2147sub load_header_orig {
1916 my ($self) = @_; 2148 my ($self) = @_;
1917 2149
1918 $self->load_header_from ($self->load_path) 2150 $self->load_header_from ($self->load_path)
1919} 2151}
1920 2152
2153# used to laod the header of an instantiated map
1921sub load_header_temp { 2154sub load_header_temp {
1922 my ($self) = @_; 2155 my ($self) = @_;
1923 2156
1924 $self->load_header_from ($self->save_path) 2157 $self->load_header_from ($self->save_path)
1925} 2158}
1926 2159
2160# called after loading the header from an instantiated map
1927sub prepare_temp { 2161sub prepare_temp {
1928 my ($self) = @_; 2162 my ($self) = @_;
1929 2163
1930 $self->last_access ((delete $self->{last_access}) 2164 $self->last_access ((delete $self->{last_access})
1931 || $cf::RUNTIME); #d# 2165 || $cf::RUNTIME); #d#
1932 # safety 2166 # safety
1933 $self->{instantiate_time} = $cf::RUNTIME 2167 $self->{instantiate_time} = $cf::RUNTIME
1934 if $self->{instantiate_time} > $cf::RUNTIME; 2168 if $self->{instantiate_time} > $cf::RUNTIME;
1935} 2169}
1936 2170
2171# called after loading the header from an original map
1937sub prepare_orig { 2172sub prepare_orig {
1938 my ($self) = @_; 2173 my ($self) = @_;
1939 2174
1940 $self->{load_original} = 1; 2175 $self->{load_original} = 1;
1941 $self->{instantiate_time} = $cf::RUNTIME; 2176 $self->{instantiate_time} = $cf::RUNTIME;
1965 2200
1966sub find; 2201sub find;
1967sub find { 2202sub find {
1968 my ($path, $origin) = @_; 2203 my ($path, $origin) = @_;
1969 2204
2205 cf::cede_to_tick;
2206
1970 $path = normalise $path, $origin && $origin->path; 2207 $path = normalise $path, $origin;
1971 2208
1972 cf::lock_wait "map_data:$path";#d#remove 2209 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1973 cf::lock_wait "map_find:$path"; 2210 my $guard2 = cf::lock_acquire "map_find:$path";
1974 2211
1975 $cf::MAP{$path} || do { 2212 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1979 my $map = new_from_path cf::map $path 2213 my $map = new_from_path cf::map $path
1980 or return; 2214 or return;
1981 2215
1982 $map->{last_save} = $cf::RUNTIME; 2216 $map->{last_save} = $cf::RUNTIME;
1983 2217
1995 2229
1996 $cf::MAP{$path} = $map 2230 $cf::MAP{$path} = $map
1997 } 2231 }
1998} 2232}
1999 2233
2000sub pre_load { } 2234sub pre_load { }
2001sub post_load { } 2235#sub post_load { } # XS
2002 2236
2003sub load { 2237sub load {
2004 my ($self) = @_; 2238 my ($self) = @_;
2005 2239
2006 local $self->{deny_reset} = 1; # loading can take a long time 2240 local $self->{deny_reset} = 1; # loading can take a long time
2009 2243
2010 { 2244 {
2011 my $guard = cf::lock_acquire "map_data:$path"; 2245 my $guard = cf::lock_acquire "map_data:$path";
2012 2246
2013 return unless $self->valid; 2247 return unless $self->valid;
2014 return unless $self->in_memory == cf::MAP_SWAPPED; 2248 return unless $self->state == cf::MAP_SWAPPED;
2015
2016 $self->in_memory (cf::MAP_LOADING);
2017 2249
2018 $self->alloc; 2250 $self->alloc;
2019 2251
2020 $self->pre_load; 2252 $self->pre_load;
2021 cf::cede_to_tick; 2253 cf::cede_to_tick;
2022 2254
2255 if (exists $self->{load_path}) {
2023 my $f = new_from_file cf::object::thawer $self->{load_path}; 2256 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block; 2257 $f->skip_block;
2025 $self->_load_objects ($f) 2258 $self->_load_objects ($f)
2026 or return; 2259 or return;
2027 2260
2028 $self->post_load_original 2261 $self->post_load_original
2029 if delete $self->{load_original}; 2262 if delete $self->{load_original};
2030 2263
2031 if (my $uniq = $self->uniq_path) { 2264 if (my $uniq = $self->uniq_path) {
2032 utf8::encode $uniq; 2265 utf8::encode $uniq;
2033 unless (aio_stat $uniq) { 2266 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) { 2267 if (my $f = new_from_file cf::object::thawer $uniq) {
2035 $self->clear_unique_items; 2268 $self->clear_unique_items;
2036 $self->_load_objects ($f); 2269 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs; 2270 $f->resolve_delayed_derefs;
2271 }
2038 } 2272 }
2039 } 2273 }
2040 }
2041 2274
2042 $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);
2043 2282
2044 cf::cede_to_tick; 2283 cf::cede_to_tick;
2045 # now do the right thing for maps 2284 # now do the right thing for maps
2046 $self->link_multipart_objects; 2285 $self->link_multipart_objects;
2047 $self->difficulty ($self->estimate_difficulty) 2286 $self->difficulty ($self->estimate_difficulty)
2051 unless ($self->{deny_activate}) { 2290 unless ($self->{deny_activate}) {
2052 $self->decay_objects; 2291 $self->decay_objects;
2053 $self->fix_auto_apply; 2292 $self->fix_auto_apply;
2054 $self->update_buttons; 2293 $self->update_buttons;
2055 cf::cede_to_tick; 2294 cf::cede_to_tick;
2056 $self->set_darkness_map; 2295 #$self->activate; # no longer activate maps automatically
2057 cf::cede_to_tick;
2058 $self->activate;
2059 } 2296 }
2060 2297
2061 $self->{last_save} = $cf::RUNTIME; 2298 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME); 2299 $self->last_access ($cf::RUNTIME);
2063
2064 $self->in_memory (cf::MAP_ACTIVE);
2065 } 2300 }
2066 2301
2067 $self->post_load; 2302 $self->post_load;
2068}
2069 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
2070sub customise_for { 2310sub customise_for {
2071 my ($self, $ob) = @_; 2311 my ($self, $ob) = @_;
2072 2312
2073 return find "~" . $ob->name . "/" . $self->{path} 2313 return find "~" . $ob->name . "/" . $self->{path}
2074 if $self->per_player; 2314 if $self->per_player;
2077# if $self->per_party; 2317# if $self->per_party;
2078 2318
2079 $self 2319 $self
2080} 2320}
2081 2321
2082# find and load all maps in the 3x3 area around a map
2083sub load_neighbours {
2084 my ($map) = @_;
2085
2086 my @neigh; # diagonal neighbours
2087
2088 for (0 .. 3) {
2089 my $neigh = $map->tile_path ($_)
2090 or next;
2091 $neigh = find $neigh, $map
2092 or next;
2093 $neigh->load;
2094
2095 push @neigh,
2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2098 }
2099
2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
2102 my $neigh = find $path, $origin
2103 or next;
2104 $neigh->load;
2105 }
2106}
2107
2108sub find_sync { 2322sub find_sync {
2109 my ($path, $origin) = @_; 2323 my ($path, $origin) = @_;
2110 2324
2111 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
2112} 2330}
2113 2331
2114sub do_load_sync { 2332sub do_load_sync {
2115 my ($map) = @_; 2333 my ($map) = @_;
2116 2334
2335 # it's a bug to call this from the main context
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2336 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main; 2337 if $Coro::current == $Coro::main;
2119 2338
2120 cf::sync_job { $map->load }; 2339 $map->load;
2121} 2340}
2122 2341
2123our %MAP_PREFETCH; 2342our %MAP_PREFETCH;
2124our $MAP_PREFETCHER = undef; 2343our $MAP_PREFETCHER = undef;
2125 2344
2126sub find_async { 2345sub find_async {
2127 my ($path, $origin, $load) = @_; 2346 my ($path, $origin, $load) = @_;
2128 2347
2129 $path = normalise $path, $origin && $origin->{path}; 2348 $path = normalise $path, $origin;
2130 2349
2131 if (my $map = $cf::MAP{$path}) { 2350 if (my $map = $cf::MAP{$path}) {
2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2351 return $map if !$load || $map->linkable;
2133 } 2352 }
2134 2353
2135 $MAP_PREFETCH{$path} |= $load; 2354 $MAP_PREFETCH{$path} |= $load;
2136 2355
2137 $MAP_PREFETCHER ||= cf::async { 2356 $MAP_PREFETCHER ||= cf::async {
2151 $MAP_PREFETCHER->prio (6); 2370 $MAP_PREFETCHER->prio (6);
2152 2371
2153 () 2372 ()
2154} 2373}
2155 2374
2375# common code, used by both ->save and ->swapout
2156sub save { 2376sub _save {
2157 my ($self) = @_; 2377 my ($self) = @_;
2158
2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
2160 2378
2161 $self->{last_save} = $cf::RUNTIME; 2379 $self->{last_save} = $cf::RUNTIME;
2162 2380
2163 return unless $self->dirty; 2381 return unless $self->dirty;
2164 2382
2184 } else { 2402 } else {
2185 $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);
2186 } 2404 }
2187} 2405}
2188 2406
2407sub save {
2408 my ($self) = @_;
2409
2410 my $lock = cf::lock_acquire "map_data:$self->{path}";
2411
2412 $self->_save;
2413}
2414
2189sub swap_out { 2415sub swap_out {
2190 my ($self) = @_; 2416 my ($self) = @_;
2191 2417
2192 # save first because save cedes
2193 $self->save;
2194
2195 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2418 my $lock = cf::lock_acquire "map_data:$self->{path}";
2196 2419
2420 return if !$self->linkable;
2421 return if $self->{deny_save};
2197 return if $self->players; 2422 return if $self->players;
2198 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
2199 return if $self->{deny_save}; 2440 return 1e99 if $self->{deny_reset};
2200 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
2201 $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};
2202 2474
2203 $self->deactivate; 2475 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP; 2476 $_->clear_links_to ($self) for values %cf::MAP;
2205 $self->clear; 2477 $self->clear;
2206}
2207
2208sub reset_at {
2209 my ($self) = @_;
2210
2211 # TODO: safety, remove and allow resettable per-player maps
2212 return 1e99 if $self->{deny_reset};
2213
2214 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2215 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2216
2217 $time + $to
2218}
2219
2220sub should_reset {
2221 my ($self) = @_;
2222
2223 $self->reset_at <= $cf::RUNTIME
2224}
2225
2226sub reset {
2227 my ($self) = @_;
2228
2229 my $lock = cf::lock_acquire "map_data:$self->{path}";
2230
2231 return if $self->players;
2232
2233 warn "resetting map ", $self->path;
2234
2235 $self->in_memory (cf::MAP_SWAPPED);
2236
2237 # need to save uniques path
2238 unless ($self->{deny_save}) {
2239 my $uniq = $self->uniq_path; utf8::encode $uniq;
2240
2241 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2242 if $uniq;
2243 }
2244
2245 delete $cf::MAP{$self->path};
2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
2249 $self->clear;
2250 2478
2251 $self->unlink_save; 2479 $self->unlink_save;
2252 $self->destroy; 2480 $self->destroy;
2253} 2481}
2254 2482
2262 2490
2263 delete $cf::MAP{$self->path}; 2491 delete $cf::MAP{$self->path};
2264 2492
2265 $self->unlink_save; 2493 $self->unlink_save;
2266 2494
2267 bless $self, "cf::map"; 2495 bless $self, "cf::map::wrap";
2268 delete $self->{deny_reset}; 2496 delete $self->{deny_reset};
2269 $self->{deny_save} = 1; 2497 $self->{deny_save} = 1;
2270 $self->reset_timeout (1); 2498 $self->reset_timeout (1);
2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2499 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2272 2500
2329 : normalise $_ 2557 : normalise $_
2330 } @{ aio_readdir $UNIQUEDIR or [] } 2558 } @{ aio_readdir $UNIQUEDIR or [] }
2331 ] 2559 ]
2332} 2560}
2333 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
2334=back 2594=back
2335 2595
2336=head3 cf::object 2596=head3 cf::object
2337 2597
2338=cut 2598=cut
2403 2663
2404our $SAY_CHANNEL = { 2664our $SAY_CHANNEL = {
2405 id => "say", 2665 id => "say",
2406 title => "Map", 2666 title => "Map",
2407 reply => "say ", 2667 reply => "say ",
2408 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.",
2409}; 2669};
2410 2670
2411our $CHAT_CHANNEL = { 2671our $CHAT_CHANNEL = {
2412 id => "chat", 2672 id => "chat",
2413 title => "Chat", 2673 title => "Chat",
2470 2730
2471Freezes 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}>).
2472 2732
2473The 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.
2474for 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,
2475though, 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
2476map. 2736map.
2477 2737
2478Will never block. 2738Will never block.
2479 2739
2480=item $player_object->leave_link ($map, $x, $y) 2740=item $player_object->leave_link ($map, $x, $y)
2501sub cf::object::player::enter_link { 2761sub cf::object::player::enter_link {
2502 my ($self) = @_; 2762 my ($self) = @_;
2503 2763
2504 $self->deactivate_recursive; 2764 $self->deactivate_recursive;
2505 2765
2766 ++$self->{_link_recursion};
2767
2506 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2768 return if UNIVERSAL::isa $self->map, "ext::map_link";
2507 2769
2508 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2770 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2509 if $self->map && $self->map->{path} ne "{link}"; 2771 if $self->map && $self->map->{path} ne "{link}";
2510 2772
2511 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2773 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2512} 2774}
2513 2775
2514sub cf::object::player::leave_link { 2776sub cf::object::player::leave_link {
2515 my ($self, $map, $x, $y) = @_; 2777 my ($self, $map, $x, $y) = @_;
2516 2778
2533 ($x, $y) = (-1, -1) 2795 ($x, $y) = (-1, -1)
2534 unless (defined $x) && (defined $y); 2796 unless (defined $x) && (defined $y);
2535 2797
2536 # use -1 or undef as default coordinates, not 0, 0 2798 # use -1 or undef as default coordinates, not 0, 0
2537 ($x, $y) = ($map->enter_x, $map->enter_y) 2799 ($x, $y) = ($map->enter_x, $map->enter_y)
2538 if $x <=0 && $y <= 0; 2800 if $x <= 0 && $y <= 0;
2539 2801
2540 $map->load; 2802 $map->load;
2541 $map->load_neighbours;
2542 2803
2543 return unless $self->contr->active; 2804 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2545 $self->activate_recursive;
2546 2805
2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2806 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2548 $self->enter_map ($map, $x, $y); 2807 if ($self->enter_map ($map, $x, $y)) {
2549} 2808 # entering was successful
2809 delete $self->{_link_recursion};
2810 # only activate afterwards, to support waiting in hooks
2811 $self->activate_recursive;
2812 }
2550 2813
2814}
2815
2551=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)]])
2552 2817
2553Moves 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
2554her, loading and preparing them map, calling the provided $check callback 2819her, loading and preparing them map, calling the provided $check callback
2555that 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
2556the 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
2563 2828
2564our $GOTOGEN; 2829our $GOTOGEN;
2565 2830
2566sub cf::object::player::goto { 2831sub cf::object::player::goto {
2567 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 }
2568 2839
2569 # 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
2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2841 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2571 2842
2572 $self->enter_link; 2843 $self->enter_link;
2592 ($path, $x, $y) = (undef, undef, undef); 2863 ($path, $x, $y) = (undef, undef, undef);
2593 } 2864 }
2594 } 2865 }
2595 2866
2596 my $map = eval { 2867 my $map = eval {
2597 my $map = defined $path ? cf::map::find $path : undef; 2868 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2598 2869
2599 if ($map) { 2870 if ($map) {
2600 $map = $map->customise_for ($self); 2871 $map = $map->customise_for ($self);
2601 $map = $check->($map) if $check && $map; 2872 $map = $check->($map, $x, $y, $self) if $check && $map;
2602 } else { 2873 } else {
2603 $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);
2604 } 2875 }
2605 2876
2606 $map 2877 $map
2614 if ($gen == $self->{_goto_generation}) { 2885 if ($gen == $self->{_goto_generation}) {
2615 delete $self->{_goto_generation}; 2886 delete $self->{_goto_generation};
2616 $self->leave_link ($map, $x, $y); 2887 $self->leave_link ($map, $x, $y);
2617 } 2888 }
2618 2889
2619 $done->() if $done; 2890 $done->($self) if $done;
2620 })->prio (1); 2891 })->prio (1);
2621} 2892}
2622 2893
2623=item $player_object->enter_exit ($exit_object) 2894=item $player_object->enter_exit ($exit_object)
2624 2895
2692 $Coro::current->{desc} = "enter_exit"; 2963 $Coro::current->{desc} = "enter_exit";
2693 2964
2694 unless (eval { 2965 unless (eval {
2695 $self->deactivate_recursive; # just to be sure 2966 $self->deactivate_recursive; # just to be sure
2696 2967
2697 # random map handling
2698 {
2699 my $guard = cf::lock_acquire "exit_prepare:$exit";
2700
2701 prepare_random_map $exit
2702 if $exit->slaying eq "/!";
2703 }
2704
2705 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2968 my $map = cf::map::normalise $exit->slaying, $exit->map;
2706 my $x = $exit->stats->hp; 2969 my $x = $exit->stats->hp;
2707 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 }
2708 2994
2709 $self->goto ($map, $x, $y); 2995 $self->goto ($map, $x, $y);
2710 2996
2711 # if exit is damned, update players death & WoR home-position 2997 # if exit is damned, update players death & WoR home-position
2712 $self->contr->savebed ($map, $x, $y) 2998 $self->contr->savebed ($map, $x, $y)
2717 $self->message ("Something went wrong deep within the deliantra server. " 3003 $self->message ("Something went wrong deep within the deliantra server. "
2718 . "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. "
2719 . "Please report this to the dungeon master!", 3005 . "Please report this to the dungeon master!",
2720 cf::NDI_UNIQUE | cf::NDI_RED); 3006 cf::NDI_UNIQUE | cf::NDI_RED);
2721 3007
2722 warn "ERROR in enter_exit: $@"; 3008 error "ERROR in enter_exit: $@";
2723 $self->leave_link; 3009 $self->leave_link;
2724 } 3010 }
2725 })->prio (1); 3011 })->prio (1);
2726} 3012}
2727 3013
2739sub cf::client::send_drawinfo { 3025sub cf::client::send_drawinfo {
2740 my ($self, $text, $flags) = @_; 3026 my ($self, $text, $flags) = @_;
2741 3027
2742 utf8::encode $text; 3028 utf8::encode $text;
2743 $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);
2744} 3055}
2745 3056
2746=item $client->send_msg ($channel, $msg, $color, [extra...]) 3057=item $client->send_msg ($channel, $msg, $color, [extra...])
2747 3058
2748Send 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
2752 3063
2753=cut 3064=cut
2754 3065
2755# non-persistent channels (usually the info channel) 3066# non-persistent channels (usually the info channel)
2756our %CHANNEL = ( 3067our %CHANNEL = (
3068 "c/motd" => {
3069 id => "infobox",
3070 title => "MOTD",
3071 reply => undef,
3072 tooltip => "The message of the day",
3073 },
2757 "c/identify" => { 3074 "c/identify" => {
2758 id => "infobox", 3075 id => "infobox",
2759 title => "Identify", 3076 title => "Identify",
2760 reply => undef, 3077 reply => undef,
2761 tooltip => "Items recently identified", 3078 tooltip => "Items recently identified",
2763 "c/examine" => { 3080 "c/examine" => {
2764 id => "infobox", 3081 id => "infobox",
2765 title => "Examine", 3082 title => "Examine",
2766 reply => undef, 3083 reply => undef,
2767 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",
2768 }, 3091 },
2769 "c/book" => { 3092 "c/book" => {
2770 id => "infobox", 3093 id => "infobox",
2771 title => "Book", 3094 title => "Book",
2772 reply => undef, 3095 reply => undef,
2788 id => "infobox", 3111 id => "infobox",
2789 title => "Body Parts", 3112 title => "Body Parts",
2790 reply => undef, 3113 reply => undef,
2791 tooltip => "Shows which body parts you posess and are available", 3114 tooltip => "Shows which body parts you posess and are available",
2792 }, 3115 },
3116 "c/statistics" => {
3117 id => "infobox",
3118 title => "Statistics",
3119 reply => undef,
3120 tooltip => "Shows your primary statistics",
3121 },
2793 "c/skills" => { 3122 "c/skills" => {
2794 id => "infobox", 3123 id => "infobox",
2795 title => "Skills", 3124 title => "Skills",
2796 reply => undef, 3125 reply => undef,
2797 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",
2798 }, 3151 },
2799 "c/uptime" => { 3152 "c/uptime" => {
2800 id => "infobox", 3153 id => "infobox",
2801 title => "Uptime", 3154 title => "Uptime",
2802 reply => undef, 3155 reply => undef,
2812 id => "party", 3165 id => "party",
2813 title => "Party", 3166 title => "Party",
2814 reply => "gsay ", 3167 reply => "gsay ",
2815 tooltip => "Messages and chat related to your party", 3168 tooltip => "Messages and chat related to your party",
2816 }, 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,
2817); 3178);
2818 3179
2819sub cf::client::send_msg { 3180sub cf::client::send_msg {
2820 my ($self, $channel, $msg, $color, @extra) = @_; 3181 my ($self, $channel, $msg, $color, @extra) = @_;
2821 3182
2826 3187
2827 # check predefined channels, for the benefit of C 3188 # check predefined channels, for the benefit of C
2828 if ($CHANNEL{$channel}) { 3189 if ($CHANNEL{$channel}) {
2829 $channel = $CHANNEL{$channel}; 3190 $channel = $CHANNEL{$channel};
2830 3191
2831 $self->ext_msg (channel_info => $channel) 3192 $self->ext_msg (channel_info => $channel);
2832 if $self->can_msg;
2833
2834 $channel = $channel->{id}; 3193 $channel = $channel->{id};
2835 3194
2836 } elsif (ref $channel) { 3195 } elsif (ref $channel) {
2837 # send meta info to client, if not yet sent 3196 # send meta info to client, if not yet sent
2838 unless (exists $self->{channel}{$channel->{id}}) { 3197 unless (exists $self->{channel}{$channel->{id}}) {
2839 $self->{channel}{$channel->{id}} = $channel; 3198 $self->{channel}{$channel->{id}} = $channel;
2840 $self->ext_msg (channel_info => $channel) 3199 $self->ext_msg (channel_info => $channel);
2841 if $self->can_msg;
2842 } 3200 }
2843 3201
2844 $channel = $channel->{id}; 3202 $channel = $channel->{id};
2845 } 3203 }
2846 3204
2847 return unless @extra || length $msg; 3205 return unless @extra || length $msg;
2848 3206
2849 if ($self->can_msg) {
2850 # default colour, mask it out 3207 # default colour, mask it out
2851 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3208 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2852 if $color & cf::NDI_DEF; 3209 if $color & cf::NDI_DEF;
2853 3210
2854 my $pkt = "msg " 3211 my $pkt = "msg "
2855 . $self->{json_coder}->encode ( 3212 . $self->{json_coder}->encode (
2856 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3213 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2857 ); 3214 );
2858 3215
2859 # try lzf for large packets
2860 $pkt = "lzf " . Compress::LZF::compress $pkt
2861 if 1024 <= length $pkt and $self->{can_lzf};
2862
2863 # split very large packets
2864 if (8192 < length $pkt and $self->{can_lzf}) {
2865 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2866 $pkt = "frag";
2867 }
2868
2869 $self->send_packet ($pkt); 3216 $self->send_big_packet ($pkt);
2870 } else {
2871 if ($color >= 0) {
2872 # replace some tags by gcfclient-compatible ones
2873 for ($msg) {
2874 1 while
2875 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2876 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2877 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2878 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2879 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2880 }
2881
2882 $color &= cf::NDI_COLOR_MASK;
2883
2884 utf8::encode $msg;
2885
2886 if (0 && $msg =~ /\[/) {
2887 # COMMAND/INFO
2888 $self->send_packet ("drawextinfo $color 10 8 $msg")
2889 } else {
2890 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2891 $self->send_packet ("drawinfo $color $msg")
2892 }
2893 }
2894 }
2895} 3217}
2896 3218
2897=item $client->ext_msg ($type, @msg) 3219=item $client->ext_msg ($type, @msg)
2898 3220
2899Sends an ext event to the client. 3221Sends an ext event to the client.
2901=cut 3223=cut
2902 3224
2903sub cf::client::ext_msg($$@) { 3225sub cf::client::ext_msg($$@) {
2904 my ($self, $type, @msg) = @_; 3226 my ($self, $type, @msg) = @_;
2905 3227
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3228 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2909 push @msg, msgtype => "event_$type";
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2912}
2913
2914=item $client->ext_reply ($msgid, @msg)
2915
2916Sends an ext reply to the client.
2917
2918=cut
2919
2920sub cf::client::ext_reply($$@) {
2921 my ($self, $id, @msg) = @_;
2922
2923 if ($self->extcmd == 2) {
2924 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2925 } elsif ($self->extcmd == 1) {
2926 #TODO: version 1, remove
2927 unshift @msg, msgtype => "reply", msgid => $id;
2928 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2929 }
2930} 3229}
2931 3230
2932=item $success = $client->query ($flags, "text", \&cb) 3231=item $success = $client->query ($flags, "text", \&cb)
2933 3232
2934Queues a query to the client, calling the given callback with 3233Queues a query to the client, calling the given callback with
2989 my ($ns, $buf) = @_; 3288 my ($ns, $buf) = @_;
2990 3289
2991 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3290 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2992 3291
2993 if (ref $msg) { 3292 if (ref $msg) {
2994 my ($type, $reply, @payload) = 3293 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
2995 "ARRAY" eq ref $msg
2996 ? @$msg
2997 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2998 3294
2999 my @reply; 3295 my @reply;
3000 3296
3001 if (my $cb = $EXTICMD{$type}) { 3297 if (my $cb = $EXTICMD{$type}) {
3002 @reply = $cb->($ns, @payload); 3298 @reply = $cb->($ns, @payload);
3003 } 3299 }
3004 3300
3005 $ns->ext_reply ($reply, @reply) 3301 $ns->ext_msg ("reply-$reply", @reply)
3006 if $reply; 3302 if $reply;
3007 3303
3008 } else { 3304 } else {
3009 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";
3010 } 3306 }
3011 3307
3012 cf::override; 3308 cf::override;
3013 }, 3309 },
3014); 3310);
3034 3330
3035 $coro 3331 $coro
3036} 3332}
3037 3333
3038cf::client->attach ( 3334cf::client->attach (
3039 on_destroy => sub { 3335 on_client_destroy => sub {
3040 my ($ns) = @_; 3336 my ($ns) = @_;
3041 3337
3042 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3338 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3043 }, 3339 },
3044); 3340);
3060our $safe_hole = new Safe::Hole; 3356our $safe_hole = new Safe::Hole;
3061 3357
3062$SIG{FPE} = 'IGNORE'; 3358$SIG{FPE} = 'IGNORE';
3063 3359
3064$safe->permit_only (Opcode::opset qw( 3360$safe->permit_only (Opcode::opset qw(
3065 :base_core :base_mem :base_orig :base_math 3361 :base_core :base_mem :base_orig :base_math :base_loop
3066 grepstart grepwhile mapstart mapwhile 3362 grepstart grepwhile mapstart mapwhile
3067 sort time 3363 sort time
3068)); 3364));
3069 3365
3070# here we export the classes and methods available to script code 3366# here we export the classes and methods available to script code
3074The following functions and methods are available within a safe environment: 3370The following functions and methods are available within a safe environment:
3075 3371
3076 cf::object 3372 cf::object
3077 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
3078 insert remove name archname title slaying race decrease split 3374 insert remove name archname title slaying race decrease split
3375 value
3079 3376
3080 cf::object::player 3377 cf::object::player
3081 player 3378 player
3082 3379
3083 cf::player 3380 cf::player
3089=cut 3386=cut
3090 3387
3091for ( 3388for (
3092 ["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
3093 insert remove inv nrof name archname title slaying race 3390 insert remove inv nrof name archname title slaying race
3094 decrease split destroy change_exp)], 3391 decrease split destroy change_exp value msg lore send_msg)],
3095 ["cf::object::player" => qw(player)], 3392 ["cf::object::player" => qw(player)],
3096 ["cf::player" => qw(peaceful)], 3393 ["cf::player" => qw(peaceful send_msg)],
3097 ["cf::map" => qw(trigger)], 3394 ["cf::map" => qw(trigger)],
3098) { 3395) {
3099 no strict 'refs';
3100 my ($pkg, @funs) = @$_; 3396 my ($pkg, @funs) = @$_;
3101 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3397 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3102 for @funs; 3398 for @funs;
3103} 3399}
3104 3400
3119 3415
3120 my $qcode = $code; 3416 my $qcode = $code;
3121 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3417 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3122 $qcode =~ s/\n/\\n/g; 3418 $qcode =~ s/\n/\\n/g;
3123 3419
3420 %vars = (_dummy => 0) unless %vars;
3421
3422 my @res;
3124 local $_; 3423 local $_;
3125 local @safe::cf::_safe_eval_args = values %vars;
3126 3424
3127 my $eval = 3425 my $eval =
3128 "do {\n" 3426 "do {\n"
3129 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3427 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3130 . "#line 0 \"{$qcode}\"\n" 3428 . "#line 0 \"{$qcode}\"\n"
3131 . $code 3429 . $code
3132 . "\n}" 3430 . "\n}"
3133 ; 3431 ;
3134 3432
3433 if ($CFG{safe_eval}) {
3135 sub_generation_inc; 3434 sub_generation_inc;
3435 local @safe::cf::_safe_eval_args = values %vars;
3136 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3436 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3137 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 }
3138 3442
3139 if ($@) { 3443 if ($@) {
3140 warn "$@"; 3444 warn "$@",
3141 warn "while executing safe code '$code'\n"; 3445 "while executing safe code '$code'\n",
3142 warn "with arguments " . (join " ", %vars) . "\n"; 3446 "with arguments " . (join " ", %vars) . "\n";
3143 } 3447 }
3144 3448
3145 wantarray ? @res : $res[0] 3449 wantarray ? @res : $res[0]
3146} 3450}
3147 3451
3161=cut 3465=cut
3162 3466
3163sub register_script_function { 3467sub register_script_function {
3164 my ($fun, $cb) = @_; 3468 my ($fun, $cb) = @_;
3165 3469
3166 no strict 'refs'; 3470 $fun = "safe::$fun" if $CFG{safe_eval};
3167 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3471 *$fun = $safe_hole->wrap ($cb);
3168} 3472}
3169 3473
3170=back 3474=back
3171 3475
3172=cut 3476=cut
3173 3477
3174############################################################################# 3478#############################################################################
3175# 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}
3176 3504
3177sub load_facedata($) { 3505sub load_facedata($) {
3178 my ($path) = @_; 3506 my ($path) = @_;
3179 3507
3180 # 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
3181 # for this (global event?) 3509 # for this (global event?)
3182 %ext::player_env::MUSIC_FACE_CACHE = (); 3510 %ext::player_env::MUSIC_FACE_CACHE = ();
3183 3511
3184 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3512 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3185 3513
3186 warn "loading facedata from $path\n"; 3514 trace "loading facedata from $path\n";
3187 3515
3188 my $facedata; 3516 my $facedata = decode_storable load_file $path;
3189 0 < aio_load $path, $facedata
3190 or die "$path: $!";
3191
3192 $facedata = Coro::Storable::thaw $facedata;
3193 3517
3194 $facedata->{version} == 2 3518 $facedata->{version} == 2
3195 or cf::cleanup "$path: version mismatch, cannot proceed."; 3519 or cf::cleanup "$path: version mismatch, cannot proceed.";
3196 3520
3197 # patch in the exptable
3198 $facedata->{resource}{"res/exp_table"} = {
3199 type => FT_RSRC,
3200 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3201 };
3202 cf::cede_to_tick; 3521 cf::cede_to_tick;
3203 3522
3204 { 3523 {
3205 my $faces = $facedata->{faceinfo}; 3524 my $faces = $facedata->{faceinfo};
3206 3525
3207 while (my ($face, $info) = each %$faces) { 3526 for my $face (sort keys %$faces) {
3527 my $info = $faces->{$face};
3208 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3528 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209 3529
3210 cf::face::set_visibility $idx, $info->{visibility}; 3530 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap}; 3531 cf::face::set_magicmap $idx, $info->{magicmap};
3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3532 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3213 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#
3214 3536
3215 cf::cede_to_tick; 3537 cf::cede_to_tick;
3216 } 3538 }
3217 3539
3218 while (my ($face, $info) = each %$faces) { 3540 while (my ($face, $info) = each %$faces) {
3223 3545
3224 if (my $smooth = cf::face::find $info->{smooth}) { 3546 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth; 3547 cf::face::set_smooth $idx, $smooth;
3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3548 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3227 } else { 3549 } else {
3228 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3550 error "smooth face '$info->{smooth}' not found for face '$face'";
3229 } 3551 }
3230 3552
3231 cf::cede_to_tick; 3553 cf::cede_to_tick;
3232 } 3554 }
3233 } 3555 }
3242 3564
3243 cf::anim::invalidate_all; # d'oh 3565 cf::anim::invalidate_all; # d'oh
3244 } 3566 }
3245 3567
3246 { 3568 {
3247 # TODO: for gcfclient pleasure, we should give resources
3248 # that gcfclient doesn't grok a >10000 face index.
3249 my $res = $facedata->{resource}; 3569 my $res = $facedata->{resource};
3250 3570
3251 while (my ($name, $info) = each %$res) { 3571 while (my ($name, $info) = each %$res) {
3252 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
3253 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3574 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3254 my $data;
3255 3575
3256 if ($info->{type} & 1) {
3257 # prepend meta info
3258
3259 my $meta = $enc->encode ({
3260 name => $name,
3261 %{ $info->{meta} || {} },
3262 });
3263
3264 $data = pack "(w/a*)*", $meta, $info->{data};
3265 } else {
3266 $data = $info->{data};
3267 }
3268
3269 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3270 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#
3271 } else { 3580 } else {
3272 $RESOURCE{$name} = $info; 3581# $RESOURCE{$name} = $info; # unused
3273 } 3582 }
3274 3583
3275 cf::cede_to_tick; 3584 cf::cede_to_tick;
3276 } 3585 }
3277 } 3586 }
3278 3587
3279 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3588 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3280 3589
3281 1 3590 1
3282} 3591}
3283
3284cf::global->attach (on_resource_update => sub {
3285 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3286 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3287
3288 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3289 my $sound = $soundconf->{compat}[$_]
3290 or next;
3291
3292 my $face = cf::face::find "sound/$sound->[1]";
3293 cf::sound::set $sound->[0] => $face;
3294 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3295 }
3296
3297 while (my ($k, $v) = each %{$soundconf->{event}}) {
3298 my $face = cf::face::find "sound/$v";
3299 cf::sound::set $k => $face;
3300 }
3301 }
3302});
3303 3592
3304register_exticmd fx_want => sub { 3593register_exticmd fx_want => sub {
3305 my ($ns, $want) = @_; 3594 my ($ns, $want) = @_;
3306 3595
3307 while (my ($k, $v) = each %$want) { 3596 while (my ($k, $v) = each %$want) {
3315 my $status = load_resource_file_ $_[0]; 3604 my $status = load_resource_file_ $_[0];
3316 get_slot 0.1, 100; 3605 get_slot 0.1, 100;
3317 cf::arch::commit_load; 3606 cf::arch::commit_load;
3318 3607
3319 $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;
3320} 3622}
3321 3623
3322sub reload_regions { 3624sub reload_regions {
3323 # 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
3324 # for this (global event?) 3626 # for this (global event?)
3339} 3641}
3340 3642
3341sub reload_archetypes { 3643sub reload_archetypes {
3342 load_resource_file "$DATADIR/archetypes" 3644 load_resource_file "$DATADIR/archetypes"
3343 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 );
3344} 3655}
3345 3656
3346sub reload_treasures { 3657sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3658 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3659 or die "unable to load treasurelists\n";
3349} 3660}
3350 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
3351sub reload_resources { 3744sub reload_resources {
3352 warn "reloading resource files...\n"; 3745 trace "reloading resource files...\n";
3353 3746
3747 reload_materials;
3354 reload_facedata; 3748 reload_facedata;
3749 reload_exp_table;
3750 reload_sound;
3355 reload_archetypes; 3751 reload_archetypes;
3356 reload_regions; 3752 reload_regions;
3357 reload_treasures; 3753 reload_treasures;
3754 reload_pod;
3358 3755
3359 warn "finished reloading resource files\n"; 3756 trace "finished reloading resource files\n";
3360} 3757}
3361 3758
3362sub reload_config { 3759sub reload_config {
3363 open my $fh, "<:utf8", "$CONFDIR/config" 3760 trace "reloading config file...\n";
3364 or return;
3365 3761
3366 local $/; 3762 my $config = load_file "$CONFDIR/config";
3367 *CFG = YAML::Load <$fh>; 3763 utf8::decode $config;
3764 *CFG = decode_yaml $config;
3368 3765
3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3766 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3370 3767
3371 $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};
3372 $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};
3373 3770
3374 if (exists $CFG{mlockall}) { 3771 if (exists $CFG{mlockall}) {
3397 3794
3398 seek $fh, 0, 0; 3795 seek $fh, 0, 0;
3399 print $fh $$; 3796 print $fh $$;
3400} 3797}
3401 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
3402sub main { 3808sub main {
3403 cf::init_globals; # initialise logging 3809 cf::init_globals; # initialise logging
3404 3810
3405 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3811 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3406 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3812 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3407 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3813 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3408 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3814 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3409 3815
3410 cf::init_experience;
3411 cf::init_anim;
3412 cf::init_attackmess;
3413 cf::init_dynamic;
3414 cf::init_block;
3415
3416 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3816 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3417 3817
3418 # we must not ever block the main coroutine 3818 # we must not ever block the main coroutine
3419 local $Coro::idle = sub { 3819 $Coro::idle = sub {
3420 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#
3421 (async { 3821 (async {
3422 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3822 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT; 3823 EV::loop EV::LOOP_ONESHOT;
3424 })->prio (Coro::PRIO_MAX); 3824 })->prio (Coro::PRIO_MAX);
3425 }; 3825 };
3426 3826
3427 evthread_start IO::AIO::poll_fileno; 3827 evthread_start IO::AIO::poll_fileno;
3428 3828
3429 cf::sync_job { 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
3430 reload_resources; 3840 reload_resources;
3431 reload_config; 3841 reload_config;
3432 db_init;
3433 3842
3434 cf::load_settings;
3435 cf::load_materials;
3436 cf::init_uuid; 3843 cf::init_uuid;
3437 cf::init_signals; 3844 cf::init_signals;
3438 cf::init_commands;
3439 cf::init_skills; 3845 cf::init_skills;
3440 3846
3441 cf::init_beforeplay; 3847 cf::init_beforeplay;
3442 3848
3443 atomic; 3849 atomic;
3445 load_extensions; 3851 load_extensions;
3446 3852
3447 utime time, time, $RUNTIMEFILE; 3853 utime time, time, $RUNTIMEFILE;
3448 3854
3449 # no (long-running) fork's whatsoever before this point(!) 3855 # no (long-running) fork's whatsoever before this point(!)
3856 use POSIX ();
3450 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};
3451 3858
3452 (pop @POST_INIT)->(0) while @POST_INIT; 3859 cf::_post_init 0;
3453 }; 3860 };
3454 3861
3455 EV::loop; 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;
3456} 3870}
3457 3871
3458############################################################################# 3872#############################################################################
3459# initialisation and cleanup 3873# initialisation and cleanup
3460 3874
3461# install some emergency cleanup handlers 3875# install some emergency cleanup handlers
3462BEGIN { 3876BEGIN {
3463 our %SIGWATCHER = (); 3877 our %SIGWATCHER = ();
3464 for my $signal (qw(INT HUP TERM)) { 3878 for my $signal (qw(INT HUP TERM)) {
3465 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3879 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3466 cf::cleanup "SIG$signal"; 3880 cf::cleanup "SIG$signal";
3467 }; 3881 };
3468 } 3882 }
3469} 3883}
3470 3884
3471sub write_runtime_sync { 3885sub write_runtime_sync {
3886 my $t0 = AE::time;
3887
3472 # first touch the runtime file to show we are still running: 3888 # first touch the runtime file to show we are still running:
3473 # the fsync below can take a very very long time. 3889 # the fsync below can take a very very long time.
3474 3890
3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3891 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3476 3892
3477 my $guard = cf::lock_acquire "write_runtime"; 3893 my $guard = cf::lock_acquire "write_runtime";
3478 3894
3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3895 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3480 or return; 3896 or return;
3481 3897
3482 my $value = $cf::RUNTIME + 90 + 10; 3898 my $value = $cf::RUNTIME + 90 + 10;
3483 # 10 is the runtime save interval, for a monotonic clock 3899 # 10 is the runtime save interval, for a monotonic clock
3484 # 60 allows for the watchdog to kill the server. 3900 # 60 allows for the watchdog to kill the server.
3497 or return; 3913 or return;
3498 3914
3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3915 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3500 and return; 3916 and return;
3501 3917
3502 warn "runtime file written.\n"; 3918 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3503 3919
3504 1 3920 1
3505} 3921}
3506 3922
3507our $uuid_lock; 3923our $uuid_lock;
3516 my $uuid = "$LOCALDIR/uuid"; 3932 my $uuid = "$LOCALDIR/uuid";
3517 3933
3518 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3934 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3519 or return; 3935 or return;
3520 3936
3521 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;
3522 $uuid_skip = 0; 3945 $uuid_skip = 0;
3523 3946
3524 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3947 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3525 and return; 3948 and return;
3526 3949
3532 or return; 3955 or return;
3533 3956
3534 aio_rename "$uuid~", $uuid 3957 aio_rename "$uuid~", $uuid
3535 and return; 3958 and return;
3536 3959
3537 warn "uuid file written ($value).\n"; 3960 trace "uuid file written ($value).\n";
3538 3961
3539 1 3962 1
3540 3963
3541} 3964}
3542 3965
3548} 3971}
3549 3972
3550sub emergency_save() { 3973sub emergency_save() {
3551 my $freeze_guard = cf::freeze_mainloop; 3974 my $freeze_guard = cf::freeze_mainloop;
3552 3975
3553 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;
3554 3982
3555 cf::sync_job { 3983 cf::sync_job {
3984 cf::write_runtime_sync; # external watchdog should not bark
3985
3556 # use a peculiar iteration method to avoid tripping on perl 3986 # use a peculiar iteration method to avoid tripping on perl
3557 # refcount bugs in for. also avoids problems with players 3987 # refcount bugs in for. also avoids problems with players
3558 # and maps saved/destroyed asynchronously. 3988 # and maps saved/destroyed asynchronously.
3559 warn "begin emergency player save\n"; 3989 info "emergency_perl_save: begin player save\n";
3560 for my $login (keys %cf::PLAYER) { 3990 for my $login (keys %cf::PLAYER) {
3561 my $pl = $cf::PLAYER{$login} or next; 3991 my $pl = $cf::PLAYER{$login} or next;
3562 $pl->valid or next; 3992 $pl->valid or next;
3563 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3993 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3564 $pl->save; 3994 $pl->save;
3565 } 3995 }
3566 warn "end emergency player save\n"; 3996 info "emergency_perl_save: end player save\n";
3567 3997
3568 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";
3569 for my $path (keys %cf::MAP) { 4001 for my $path (keys %cf::MAP) {
3570 my $map = $cf::MAP{$path} or next; 4002 my $map = $cf::MAP{$path} or next;
3571 $map->valid or next; 4003 $map->valid or next;
3572 $map->save; 4004 $map->save;
3573 } 4005 }
3574 warn "end emergency map save\n"; 4006 info "emergency_perl_save: end map save\n";
3575 4007
3576 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";
3577 BDB::db_env_txn_checkpoint $DB_ENV; 4011 BDB::db_env_txn_checkpoint $DB_ENV;
3578 warn "end emergency database checkpoint\n"; 4012 info "emergency_perl_save: end database checkpoint\n";
3579 4013
3580 warn "begin write uuid\n"; 4014 info "emergency_perl_save: begin write uuid\n";
3581 write_uuid_sync 1; 4015 write_uuid_sync 1;
3582 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
3583 }; 4036 };
3584 4037
3585 warn "leave emergency perl save\n"; 4038 info "emergency_perl_save: leave\n";
3586} 4039}
3587 4040
3588sub post_cleanup { 4041sub post_cleanup {
3589 my ($make_core) = @_; 4042 my ($make_core) = @_;
3590 4043
4044 IO::AIO::flush;
4045
3591 warn Carp::longmess "post_cleanup backtrace" 4046 error Carp::longmess "post_cleanup backtrace"
3592 if $make_core; 4047 if $make_core;
3593 4048
3594 my $fh = pidfile; 4049 my $fh = pidfile;
3595 unlink $PIDFILE if <$fh> == $$; 4050 unlink $PIDFILE if <$fh> == $$;
3596} 4051}
3616 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4071 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3617 for my $name (keys %$leaf_symtab) { 4072 for my $name (keys %$leaf_symtab) {
3618 _gv_clear *{"$pkg$name"}; 4073 _gv_clear *{"$pkg$name"};
3619# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4074# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3620 } 4075 }
3621 warn "cleared package $pkg\n";#d#
3622} 4076}
3623 4077
3624sub do_reload_perl() { 4078sub do_reload_perl() {
3625 # can/must only be called in main 4079 # can/must only be called in main
3626 if ($Coro::current != $Coro::main) { 4080 unless (in_main) {
3627 warn "can only reload from main coroutine"; 4081 error "can only reload from main coroutine";
3628 return; 4082 return;
3629 } 4083 }
3630 4084
3631 return if $RELOAD++; 4085 return if $RELOAD++;
3632 4086
4087 my $t1 = AE::time;
4088
3633 while ($RELOAD) { 4089 while ($RELOAD) {
3634 warn "reloading..."; 4090 cf::get_slot 0.1, -1, "reload_perl";
4091 info "perl_reload: reloading...";
3635 4092
3636 warn "entering sync_job"; 4093 trace "perl_reload: entering sync_job";
3637 4094
3638 cf::sync_job { 4095 cf::sync_job {
3639 cf::write_runtime_sync; # external watchdog should not bark
3640 cf::emergency_save; 4096 #cf::emergency_save;
3641 cf::write_runtime_sync; # external watchdog should not bark
3642 4097
3643 warn "syncing database to disk";
3644 BDB::db_env_txn_checkpoint $DB_ENV;
3645
3646 # if anything goes wrong in here, we should simply crash as we already saved
3647
3648 warn "flushing outstanding aio requests";
3649 while (IO::AIO::nreqs || BDB::nreqs) {
3650 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3651 }
3652
3653 warn "cancelling all extension coros"; 4098 trace "perl_reload: cancelling all extension coros";
3654 $_->cancel for values %EXT_CORO; 4099 $_->cancel for values %EXT_CORO;
3655 %EXT_CORO = (); 4100 %EXT_CORO = ();
3656 4101
3657 warn "removing commands"; 4102 trace "perl_reload: removing commands";
3658 %COMMAND = (); 4103 %COMMAND = ();
3659 4104
3660 warn "removing ext/exti commands"; 4105 trace "perl_reload: removing ext/exti commands";
3661 %EXTCMD = (); 4106 %EXTCMD = ();
3662 %EXTICMD = (); 4107 %EXTICMD = ();
3663 4108
3664 warn "unloading/nuking all extensions"; 4109 trace "perl_reload: unloading/nuking all extensions";
3665 for my $pkg (@EXTS) { 4110 for my $pkg (@EXTS) {
3666 warn "... unloading $pkg"; 4111 trace "... unloading $pkg";
3667 4112
3668 if (my $cb = $pkg->can ("unload")) { 4113 if (my $cb = $pkg->can ("unload")) {
3669 eval { 4114 eval {
3670 $cb->($pkg); 4115 $cb->($pkg);
3671 1 4116 1
3672 } or warn "$pkg unloaded, but with errors: $@"; 4117 } or error "$pkg unloaded, but with errors: $@";
3673 } 4118 }
3674 4119
3675 warn "... clearing $pkg"; 4120 trace "... clearing $pkg";
3676 clear_package $pkg; 4121 clear_package $pkg;
3677 } 4122 }
3678 4123
3679 warn "unloading all perl modules loaded from $LIBDIR"; 4124 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3680 while (my ($k, $v) = each %INC) { 4125 while (my ($k, $v) = each %INC) {
3681 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4126 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3682 4127
3683 warn "... unloading $k"; 4128 trace "... unloading $k";
3684 delete $INC{$k}; 4129 delete $INC{$k};
3685 4130
3686 $k =~ s/\.pm$//; 4131 $k =~ s/\.pm$//;
3687 $k =~ s/\//::/g; 4132 $k =~ s/\//::/g;
3688 4133
3691 } 4136 }
3692 4137
3693 clear_package $k; 4138 clear_package $k;
3694 } 4139 }
3695 4140
3696 warn "getting rid of safe::, as good as possible"; 4141 trace "perl_reload: getting rid of safe::, as good as possible";
3697 clear_package "safe::$_" 4142 clear_package "safe::$_"
3698 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);
3699 4144
3700 warn "unloading cf.pm \"a bit\""; 4145 trace "perl_reload: unloading cf.pm \"a bit\"";
3701 delete $INC{"cf.pm"}; 4146 delete $INC{"cf.pm"};
3702 delete $INC{"cf/pod.pm"}; 4147 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3703 4148
3704 # don't, removes xs symbols, too, 4149 # don't, removes xs symbols, too,
3705 # and global variables created in xs 4150 # and global variables created in xs
3706 #clear_package __PACKAGE__; 4151 #clear_package __PACKAGE__;
3707 4152
3708 warn "unload completed, starting to reload now"; 4153 info "perl_reload: unload completed, starting to reload now";
3709 4154
3710 warn "reloading cf.pm"; 4155 trace "perl_reload: reloading cf.pm";
3711 require cf; 4156 require cf;
3712 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4157 cf::_connect_to_perl_1;
3713 4158
3714 warn "loading config and database again"; 4159 trace "perl_reload: loading config and database again";
3715 cf::reload_config; 4160 cf::reload_config;
3716 4161
3717 warn "loading extensions"; 4162 trace "perl_reload: loading extensions";
3718 cf::load_extensions; 4163 cf::load_extensions;
3719 4164
4165 if ($REATTACH_ON_RELOAD) {
3720 warn "reattaching attachments to objects/players"; 4166 trace "perl_reload: reattaching attachments to objects/players";
3721 _global_reattach; # objects, sockets 4167 _global_reattach; # objects, sockets
3722 warn "reattaching attachments to maps"; 4168 trace "perl_reload: reattaching attachments to maps";
3723 reattach $_ for values %MAP; 4169 reattach $_ for values %MAP;
3724 warn "reattaching attachments to players"; 4170 trace "perl_reload: reattaching attachments to players";
3725 reattach $_ for values %PLAYER; 4171 reattach $_ for values %PLAYER;
4172 }
3726 4173
3727 warn "running post_load"; 4174 cf::_post_init 1;
3728 (pop @POST_INIT)->(1) while @POST_INIT;
3729 4175
3730 warn "leaving sync_job"; 4176 trace "perl_reload: leaving sync_job";
3731 4177
3732 1 4178 1
3733 } or do { 4179 } or do {
3734 warn $@; 4180 error $@;
3735 cf::cleanup "error while reloading, exiting."; 4181 cf::cleanup "perl_reload: error, exiting.";
3736 }; 4182 };
3737 4183
3738 warn "reloaded";
3739 --$RELOAD; 4184 --$RELOAD;
3740 } 4185 }
4186
4187 $t1 = AE::time - $t1;
4188 info "perl_reload: completed in ${t1}s\n";
3741}; 4189};
3742 4190
3743our $RELOAD_WATCHER; # used only during reload 4191our $RELOAD_WATCHER; # used only during reload
3744 4192
3745sub reload_perl() { 4193sub reload_perl() {
3746 # doing reload synchronously and two reloads happen back-to-back, 4194 # doing reload synchronously and two reloads happen back-to-back,
3747 # coro crashes during coro_state_free->destroy here. 4195 # coro crashes during coro_state_free->destroy here.
3748 4196
4197 $RELOAD_WATCHER ||= cf::async {
4198 Coro::AIO::aio_wait cache_extensions;
4199
3749 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { 4200 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3750 do_reload_perl; 4201 do_reload_perl;
3751 undef $RELOAD_WATCHER; 4202 undef $RELOAD_WATCHER;
4203 };
3752 }; 4204 };
3753} 4205}
3754 4206
3755register_command "reload" => sub { 4207register_command "reload" => sub {
3756 my ($who, $arg) = @_; 4208 my ($who, $arg) = @_;
3762 reload_perl; 4214 reload_perl;
3763 }; 4215 };
3764 } 4216 }
3765}; 4217};
3766 4218
3767unshift @INC, $LIBDIR; 4219#############################################################################
3768 4220
3769my $bug_warning = 0; 4221my $bug_warning = 0;
3770 4222
3771our @WAIT_FOR_TICK;
3772our @WAIT_FOR_TICK_BEGIN;
3773
3774sub wait_for_tick { 4223sub wait_for_tick() {
3775 return if tick_inhibit || $Coro::current == $Coro::main; 4224 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3776 4225
3777 my $signal = new Coro::Signal; 4226 $WAIT_FOR_TICK->wait;
3778 push @WAIT_FOR_TICK, $signal;
3779 $signal->wait;
3780} 4227}
3781 4228
3782sub wait_for_tick_begin { 4229sub wait_for_tick_begin() {
3783 return if tick_inhibit || $Coro::current == $Coro::main; 4230 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3784 4231
3785 my $signal = new Coro::Signal; 4232 my $signal = new Coro::Signal;
3786 push @WAIT_FOR_TICK_BEGIN, $signal; 4233 push @WAIT_FOR_TICK_BEGIN, $signal;
3787 $signal->wait; 4234 $signal->wait;
3788} 4235}
3792 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"
3793 unless ++$bug_warning > 10; 4240 unless ++$bug_warning > 10;
3794 return; 4241 return;
3795 } 4242 }
3796 4243
3797 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#
3798 4247
3799 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4248 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3800 $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.;
3801 Coro::async_pool { 4250 Coro::async_pool {
3802 $Coro::current->{desc} = "runtime saver"; 4251 $Coro::current->{desc} = "runtime saver";
3803 write_runtime_sync 4252 write_runtime_sync
3804 or warn "ERROR: unable to write runtime file: $!"; 4253 or error "ERROR: unable to write runtime file: $!";
3805 }; 4254 };
3806 } 4255 }
3807 4256
3808 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4257 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3809 $sig->send; 4258 $sig->send;
3810 } 4259 }
3811 while (my $sig = shift @WAIT_FOR_TICK) { 4260 $WAIT_FOR_TICK->broadcast;
3812 $sig->send;
3813 }
3814 4261
3815 $LOAD = ($NOW - $TICK_START) / $TICK; 4262 $LOAD = ($NOW - $TICK_START) / $TICK;
3816 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4263 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3817 4264
3818 if (0) { 4265 if (0) {
3819 if ($NEXT_TICK) { 4266 if ($NEXT_TICK) {
3820 my $jitter = $TICK_START - $NEXT_TICK; 4267 my $jitter = $TICK_START - $NEXT_TICK;
3821 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4268 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3822 warn "jitter $JITTER\n";#d# 4269 debug "jitter $JITTER\n";#d#
3823 } 4270 }
3824 } 4271 }
3825} 4272}
3826 4273
3827{ 4274{
3828 # configure BDB 4275 # configure BDB
4276 info "initialising database";
3829 4277
3830 BDB::min_parallel 8; 4278 BDB::min_parallel 16;
3831 BDB::max_poll_reqs $TICK * 0.1; 4279 BDB::max_poll_reqs $TICK * 0.1;
3832 $AnyEvent::BDB::WATCHER->priority (1); 4280 #$AnyEvent::BDB::WATCHER->priority (1);
3833 4281
3834 unless ($DB_ENV) { 4282 unless ($DB_ENV) {
3835 $DB_ENV = BDB::db_env_create; 4283 $DB_ENV = BDB::db_env_create;
3836 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4284 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3837 $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;
3862 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4310 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3863 }; 4311 };
3864 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4312 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3865 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4313 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3866 }; 4314 };
4315
4316 info "database initialised";
3867} 4317}
3868 4318
3869{ 4319{
3870 # configure IO::AIO 4320 # configure IO::AIO
3871 4321
4322 info "initialising aio";
3872 IO::AIO::min_parallel 8; 4323 IO::AIO::min_parallel 8;
3873 IO::AIO::max_poll_time $TICK * 0.1; 4324 IO::AIO::max_poll_time $TICK * 0.1;
3874 undef $AnyEvent::AIO::WATCHER; 4325 undef $AnyEvent::AIO::WATCHER;
4326 info "aio initialised";
3875} 4327}
3876 4328
3877my $_log_backtrace; 4329our $_log_backtrace;
4330our $_log_backtrace_last;
3878 4331
3879sub _log_backtrace { 4332sub _log_backtrace {
3880 my ($msg, @addr) = @_; 4333 my ($msg, @addr) = @_;
3881 4334
3882 $msg =~ s/\n//; 4335 $msg =~ s/\n$//;
3883 4336
4337 if ($_log_backtrace_last eq $msg) {
4338 LOG llevInfo, "[ABT] $msg\n";
4339 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3884 # limit the # of concurrent backtraces 4340 # limit the # of concurrent backtraces
3885 if ($_log_backtrace < 2) { 4341 } elsif ($_log_backtrace < 2) {
4342 $_log_backtrace_last = $msg;
3886 ++$_log_backtrace; 4343 ++$_log_backtrace;
3887 my $perl_bt = Carp::longmess $msg; 4344 my $perl_bt = Carp::longmess $msg;
3888 async { 4345 async {
3889 $Coro::current->{desc} = "abt $msg"; 4346 $Coro::current->{desc} = "abt $msg";
3890 4347
3910 LOG llevInfo, "[ABT] $_\n" for @bt; 4367 LOG llevInfo, "[ABT] $_\n" for @bt;
3911 --$_log_backtrace; 4368 --$_log_backtrace;
3912 }; 4369 };
3913 } else { 4370 } else {
3914 LOG llevInfo, "[ABT] $msg\n"; 4371 LOG llevInfo, "[ABT] $msg\n";
3915 LOG llevInfo, "[ABT] [suppressed]\n"; 4372 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3916 } 4373 }
3917} 4374}
3918 4375
3919# load additional modules 4376# load additional modules
3920use cf::pod; 4377require "cf/$_.pm" for @EXTRA_MODULES;
4378cf::_connect_to_perl_2;
3921 4379
3922END { cf::emergency_save } 4380END { cf::emergency_save }
3923 4381
39241 43821
3925 4383

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines