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.457 by root, Wed Oct 1 05:50:19 2008 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 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
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;
134 158
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow) 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;
136 164
137binmode STDOUT; 165binmode STDOUT;
138binmode STDERR; 166binmode STDERR;
139 167
140# read virtual server time, if available 168# read virtual server time, if available
142 open my $fh, "<", $RUNTIMEFILE 170 open my $fh, "<", $RUNTIMEFILE
143 or die "unable to read $RUNTIMEFILE file: $!"; 171 or die "unable to read $RUNTIMEFILE file: $!";
144 $RUNTIME = <$fh> + 0.; 172 $RUNTIME = <$fh> + 0.;
145} 173}
146 174
175eval "sub TICK() { $TICK } 1" or die;
176
147mkdir $_ 177mkdir $_
148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 178 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
149 179
150our $EMERGENCY_POSITION; 180our $EMERGENCY_POSITION;
151 181
152sub cf::map::normalise; 182sub cf::map::normalise;
153 183
184sub in_main() {
185 $Coro::current == $Coro::main
186}
187
154############################################################################# 188#############################################################################
155 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
156=head2 GLOBAL VARIABLES 201=head2 GLOBAL VARIABLES
157 202
158=over 4 203=over 4
159 204
160=item $cf::UPTIME 205=item $cf::UPTIME
161 206
162The 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.
163 223
164=item $cf::RUNTIME 224=item $cf::RUNTIME
165 225
166The 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
167every server tick. 227every server tick.
168 228
169=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 229=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
170$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 230$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
171$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 231$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
172 232
173Various directories - "/etc", read-only install directory, perl-library 233Various directories - "/etc", read-only install directory, perl-library
174directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 234directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
175unique-items directory, player file directory, random maps directory and 235unique-items directory, player file directory, random maps directory and
176database environment. 236database environment.
177 237
178=item $cf::NOW
179
180The time of the last (current) server tick.
181
182=item $cf::TICK
183
184The interval between server ticks, in seconds.
185
186=item $cf::LOADAVG 238=item $cf::LOADAVG
187 239
188The 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
189(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
190objects per tick. Healthy values are < 0.5. 242objects per tick. Healthy values are < 0.5.
199from wherever your confdir points to. 251from wherever your confdir points to.
200 252
201=item cf::wait_for_tick, cf::wait_for_tick_begin 253=item cf::wait_for_tick, cf::wait_for_tick_begin
202 254
203These 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
204returns 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
205per 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.
206 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
207=item @cf::INVOKE_RESULTS 276=item @cf::INVOKE_RESULTS
208 277
209This array contains the results of the last C<invoke ()> call. When 278This array contains the results of the last C<invoke ()> call. When
210C<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
211that call. 280that call.
212 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
213=back 288=back
214 289
215=cut 290=cut
216 291
217BEGIN { 292sub error(@) { LOG llevError, join "", @_ }
218 *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 {
219 my $msg = join "", @_; 299 my $msg = join "", @_;
220 300
221 $msg .= "\n" 301 $msg .= "\n"
222 unless $msg =~ /\n$/; 302 unless $msg =~ /\n$/;
223 303
224 $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;
225 305
226 LOG llevError, $msg; 306 LOG llevWarn, $msg;
227 }; 307};
228}
229 308
230$Coro::State::DIEHOOK = sub { 309$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "==" 310 return unless $^S eq 0; # "eq", not "=="
232 311
233 if ($Coro::current == $Coro::main) {#d# 312 error Carp::longmess $_[0];
313
314 if (in_main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d# 315 error "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d# 316 return;#d#
236 }#d# 317 }#d#
237 318
238 # kill coroutine otherwise 319 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate 320 Coro::terminate
241}; 321};
242
243$SIG{__DIE__} = sub { }; #d#?
244 322
245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 323@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 324@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 325@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 326@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
262)) { 340)) {
263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 341 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
264} 342}
265 343
266$EV::DIED = sub { 344$EV::DIED = sub {
267 warn "error in event callback: @_"; 345 warn "error in event callback: $@";
268}; 346};
347
348#############################################################################
349
350sub fork_call(&@);
351sub get_slot($;$$);
269 352
270############################################################################# 353#############################################################################
271 354
272=head2 UTILITY FUNCTIONS 355=head2 UTILITY FUNCTIONS
273 356
294 $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;
295 $d 378 $d
296 } || "[unable to dump $_[0]: '$@']"; 379 } || "[unable to dump $_[0]: '$@']";
297} 380}
298 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
299=item $ref = cf::decode_json $json 434=item $ref = cf::decode_json $json
300 435
301Converts a JSON string into the corresponding perl data structure. 436Converts a JSON string into the corresponding perl data structure.
302 437
303=item $json = cf::encode_json $ref 438=item $json = cf::encode_json $ref
309our $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
310 445
311sub encode_json($) { $json_coder->encode ($_[0]) } 446sub encode_json($) { $json_coder->encode ($_[0]) }
312sub decode_json($) { $json_coder->decode ($_[0]) } 447sub decode_json($) { $json_coder->decode ($_[0]) }
313 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
314=item cf::post_init { BLOCK } 480=item cf::post_init { BLOCK }
315 481
316Execute the given codeblock, I<after> all extensions have been (re-)loaded, 482Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again. 483but I<before> the server starts ticking again.
318 484
319The cdoeblock will have a single boolean argument to indicate whether this 485The codeblock will have a single boolean argument to indicate whether this
320is a reload or not. 486is a reload or not.
321 487
322=cut 488=cut
323 489
324sub post_init(&) { 490sub post_init(&) {
325 push @POST_INIT, shift; 491 push @POST_INIT, shift;
326} 492}
327 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
328=item cf::lock_wait $string 511=item cf::lock_wait $string
329 512
330Wait until the given lock is available. See cf::lock_acquire. 513Wait until the given lock is available. See cf::lock_acquire.
331 514
332=item my $lock = cf::lock_acquire $string 515=item my $lock = cf::lock_acquire $string
333 516
334Wait 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
335a 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,
336for example when the coroutine gets canceled), the lock is automatically 519for example when the coroutine gets canceled), the lock is automatically
337returned. 520returned.
338 521
339Locks 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
340deadlocked coro. 523deadlocked coro.
346 529
347Return 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.
348 531
349=cut 532=cut
350 533
351our %LOCK; 534our $LOCKS = new Coro::SemaphoreSet;
352our %LOCKER;#d#
353 535
354sub lock_wait($) { 536sub lock_wait($) {
355 my ($key) = @_; 537 $LOCKS->wait ($_[0]);
356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
362 # wait for lock, if any
363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
365 push @{ $LOCK{$key} }, $Coro::current;
366 Coro::schedule;
367 }
368} 538}
369 539
370sub lock_acquire($) { 540sub lock_acquire($) {
371 my ($key) = @_; 541 $LOCKS->guard ($_[0])
372
373 # wait, to be sure we are not locked
374 lock_wait $key;
375
376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
378
379 Coro::guard {
380 delete $LOCKER{$key};#d#
381 # wake up all waiters, to be on the safe side
382 $_->ready for @{ delete $LOCK{$key} };
383 }
384} 542}
385 543
386sub lock_active($) { 544sub lock_active($) {
387 my ($key) = @_; 545 $LOCKS->count ($_[0]) < 1
388
389 ! ! $LOCK{$key}
390} 546}
391 547
392sub freeze_mainloop { 548sub freeze_mainloop {
393 tick_inhibit_inc; 549 tick_inhibit_inc;
394 550
395 Coro::guard \&tick_inhibit_dec; 551 &Guard::guard (\&tick_inhibit_dec);
396} 552}
397 553
398=item cf::periodic $interval, $cb 554=item cf::periodic $interval, $cb
399 555
400Like 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
401get spread over timer. 557get spread over time.
402 558
403=cut 559=cut
404 560
405sub periodic($$) { 561sub periodic($$) {
406 my ($interval, $cb) = @_; 562 my ($interval, $cb) = @_;
410 EV::periodic $start, $interval, 0, $cb 566 EV::periodic $start, $interval, 0, $cb
411} 567}
412 568
413=item cf::get_slot $time[, $priority[, $name]] 569=item cf::get_slot $time[, $priority[, $name]]
414 570
415Allocate $time seconds of blocking CPU time at priority C<$priority>: 571Allocate $time seconds of blocking CPU time at priority C<$priority>
416This 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
417of 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.
418 578
419The 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
420used for statistical purposes and should identify the same time-class. 580used for statistical purposes and should identify the same time-class.
421 581
422Useful for short background jobs. 582Useful for short background jobs.
423 583
424=cut 584=cut
425 585
426our @SLOT_QUEUE; 586our @SLOT_QUEUE;
427our $SLOT_QUEUE; 587our $SLOT_QUEUE;
588our $SLOT_DECAY = 0.9;
428 589
429$SLOT_QUEUE->cancel if $SLOT_QUEUE; 590$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430$SLOT_QUEUE = Coro::async { 591$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager"); 592 $Coro::current->desc ("timeslot manager");
432 593
433 my $signal = new Coro::Signal; 594 my $signal = new Coro::Signal;
595 my $busy;
434 596
435 while () { 597 while () {
436 next_job: 598 next_job:
599
437 my $avail = cf::till_tick; 600 my $avail = cf::till_tick;
438 if ($avail > 0.01) { 601
439 for (0 .. $#SLOT_QUEUE) { 602 for (0 .. $#SLOT_QUEUE) {
440 if ($SLOT_QUEUE[$_][0] < $avail) { 603 if ($SLOT_QUEUE[$_][0] <= $avail) {
604 $busy = 0;
441 my $job = splice @SLOT_QUEUE, $_, 1, (); 605 my $job = splice @SLOT_QUEUE, $_, 1, ();
442 $job->[2]->send; 606 $job->[2]->send;
443 Coro::cede; 607 Coro::cede;
444 goto next_job; 608 goto next_job;
445 } 609 } else {
610 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446 } 611 }
447 } 612 }
448 613
449 if (@SLOT_QUEUE) { 614 if (@SLOT_QUEUE) {
450 # 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
451 push @cf::WAIT_FOR_TICK, $signal; 616 $WAIT_FOR_TICK->wait;
452 $signal->wait;
453 } else { 617 } else {
618 $busy = 0;
454 Coro::schedule; 619 Coro::schedule;
455 } 620 }
456 } 621 }
457}; 622};
458 623
459sub get_slot($;$$) { 624sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main; 625 return if tick_inhibit || $Coro::current == $Coro::main;
461 626
462 my ($time, $pri, $name) = @_; 627 my ($time, $pri, $name) = @_;
463 628
464 $time = $TICK * .6 if $time > $TICK * .6; 629 $time = clamp $time, 0.01, $TICK * .6;
630
465 my $sig = new Coro::Signal; 631 my $sig = new Coro::Signal;
466 632
467 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 633 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 634 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469 $SLOT_QUEUE->ready; 635 $SLOT_QUEUE->ready;
495=cut 661=cut
496 662
497sub sync_job(&) { 663sub sync_job(&) {
498 my ($job) = @_; 664 my ($job) = @_;
499 665
500 if ($Coro::current == $Coro::main) { 666 if (in_main) {
501 my $time = EV::time; 667 my $time = AE::time;
502 668
503 # this is the main coro, too bad, we have to block 669 # this is the main coro, too bad, we have to block
504 # till the operation succeeds, freezing the server :/ 670 # till the operation succeeds, freezing the server :/
505 671
506 LOG llevError, Carp::longmess "sync job";#d# 672 #LOG llevError, Carp::longmess "sync job";#d#
507 673
508 my $freeze_guard = freeze_mainloop; 674 my $freeze_guard = freeze_mainloop;
509 675
510 my $busy = 1; 676 my $busy = 1;
511 my @res; 677 my @res;
512 678
513 (async { 679 (async {
514 $Coro::current->desc ("sync job coro"); 680 $Coro::current->desc ("sync job coro");
515 @res = eval { $job->() }; 681 @res = eval { $job->() };
516 warn $@ if $@; 682 error $@ if $@;
517 undef $busy; 683 undef $busy;
518 })->prio (Coro::PRIO_MAX); 684 })->prio (Coro::PRIO_MAX);
519 685
520 while ($busy) { 686 while ($busy) {
521 if (Coro::nready) { 687 if (Coro::nready) {
523 } else { 689 } else {
524 EV::loop EV::LOOP_ONESHOT; 690 EV::loop EV::LOOP_ONESHOT;
525 } 691 }
526 } 692 }
527 693
528 my $time = EV::time - $time; 694 my $time = AE::time - $time;
529 695
530 $TICK_START += $time; # do not account sync jobs to server load 696 $TICK_START += $time; # do not account sync jobs to server load
531 697
532 wantarray ? @res : $res[0] 698 wantarray ? @res : $res[0]
533 } else { 699 } else {
555 $EXT_CORO{$coro+0} = $coro; 721 $EXT_CORO{$coro+0} = $coro;
556 722
557 $coro 723 $coro
558} 724}
559 725
560=item fork_call { }, $args 726=item fork_call { }, @args
561 727
562Executes the given code block with the given arguments in a seperate 728Executes the given code block with the given arguments in a seperate
563process, returning the results. Everything must be serialisable with 729process, returning the results. Everything must be serialisable with
564Coro::Storable. May, of course, block. Note that the executed sub may 730Coro::Storable. May, of course, block. Note that the executed sub may
565never block itself or use any form of event handling. 731never block itself or use any form of event handling.
566 732
567=cut 733=cut
568 734
735sub post_fork {
736 reset_signals;
737}
738
569sub fork_call(&@) { 739sub fork_call(&@) {
570 my ($cb, @args) = @_; 740 my ($cb, @args) = @_;
571 741
572 # 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,
573 # otherwise perl prematurely frees the stuff :/ 743 # otherwise perl prematurely frees the stuff :/
574 # TODO: investigate and fix (likely this will be rather laborious) 744 # TODO: investigate and fix (likely this will be rather laborious)
575 745
576 my @res = Coro::Util::fork_eval { 746 my @res = Coro::Util::fork_eval {
577 reset_signals; 747 cf::post_fork;
578 &$cb 748 &$cb
579 }, @args; 749 } @args;
580 750
581 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 )
582} 763}
583 764
584=item $coin = coin_from_name $name 765=item $coin = coin_from_name $name
585 766
586=cut 767=cut
623within each server. 804within each server.
624 805
625=cut 806=cut
626 807
627sub db_table($) { 808sub db_table($) {
809 cf::error "db_get called from main context"
810 if $Coro::current == $Coro::main;
811
628 my ($name) = @_; 812 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV; 813 my $db = BDB::db_create $DB_ENV;
630 814
631 eval { 815 eval {
632 $db->set_flags (BDB::CHKSUM); 816 $db->set_flags (BDB::CHKSUM);
642} 826}
643 827
644our $DB; 828our $DB;
645 829
646sub db_init { 830sub db_init {
647 cf::sync_job {
648 $DB ||= db_table "db"; 831 $DB ||= db_table "db";
649 };
650} 832}
651 833
652sub db_get($$) { 834sub db_get($$) {
653 my $key = "$_[0]/$_[1]"; 835 my $key = "$_[0]/$_[1]";
654 836
655 cf::sync_job { 837 cf::error "db_get called from main context"
838 if $Coro::current == $Coro::main;
839
656 BDB::db_get $DB, undef, $key, my $data; 840 BDB::db_get $DB, undef, $key, my $data;
657 841
658 $! ? () 842 $! ? ()
659 : $data 843 : $data
660 }
661} 844}
662 845
663sub db_put($$$) { 846sub db_put($$$) {
664 BDB::dbreq_pri 4; 847 BDB::dbreq_pri 4;
665 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 848 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
693 876
694 my @data; 877 my @data;
695 my $md5; 878 my $md5;
696 879
697 for (0 .. $#$src) { 880 for (0 .. $#$src) {
698 0 <= aio_load $src->[$_], $data[$_] 881 $data[$_] = load_file $src->[$_];
699 or Carp::croak "$src->[$_]: $!";
700 } 882 }
701 883
702 # if processing is expensive, check 884 # if processing is expensive, check
703 # checksum first 885 # checksum first
704 if (1) { 886 if (1) {
721 903
722 my $t1 = Time::HiRes::time; 904 my $t1 = Time::HiRes::time;
723 my $data = $process->(\@data); 905 my $data = $process->(\@data);
724 my $t2 = Time::HiRes::time; 906 my $t2 = Time::HiRes::time;
725 907
726 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 908 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727 909
728 db_put cache => "$id/data", $data; 910 db_put cache => "$id/data", $data;
729 db_put cache => "$id/md5" , $md5; 911 db_put cache => "$id/md5" , $md5;
730 db_put cache => "$id/meta", $meta; 912 db_put cache => "$id/meta", $meta;
731 913
741 923
742=cut 924=cut
743 925
744sub datalog($@) { 926sub datalog($@) {
745 my ($type, %kv) = @_; 927 my ($type, %kv) = @_;
746 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 928 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747} 929}
748 930
749=back 931=back
750 932
751=cut 933=cut
946 1128
947 } elsif (exists $cb_id{$type}) { 1129 } elsif (exists $cb_id{$type}) {
948 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1130 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949 1131
950 } elsif (ref $type) { 1132 } elsif (ref $type) {
951 warn "attaching objects not supported, ignoring.\n"; 1133 error "attaching objects not supported, ignoring.\n";
952 1134
953 } else { 1135 } else {
954 shift @arg; 1136 shift @arg;
955 warn "attach argument '$type' not supported, ignoring.\n"; 1137 error "attach argument '$type' not supported, ignoring.\n";
956 } 1138 }
957 } 1139 }
958} 1140}
959 1141
960sub _object_attach { 1142sub _object_attach {
970 _attach $registry, $klass, @attach; 1152 _attach $registry, $klass, @attach;
971 } 1153 }
972 1154
973 $obj->{$name} = \%arg; 1155 $obj->{$name} = \%arg;
974 } else { 1156 } else {
975 warn "object uses attachment '$name' which is not available, postponing.\n"; 1157 info "object uses attachment '$name' which is not available, postponing.\n";
976 } 1158 }
977 1159
978 $obj->{_attachment}{$name} = undef; 1160 $obj->{_attachment}{$name} = undef;
979} 1161}
980 1162
1039 1221
1040 for (@$callbacks) { 1222 for (@$callbacks) {
1041 eval { &{$_->[1]} }; 1223 eval { &{$_->[1]} };
1042 1224
1043 if ($@) { 1225 if ($@) {
1044 warn "$@";
1045 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1226 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046 override; 1227 override;
1047 } 1228 }
1048 1229
1049 return 1 if $override; 1230 return 1 if $override;
1050 } 1231 }
1129 for (@$attach) { 1310 for (@$attach) {
1130 my ($klass, @attach) = @$_; 1311 my ($klass, @attach) = @$_;
1131 _attach $registry, $klass, @attach; 1312 _attach $registry, $klass, @attach;
1132 } 1313 }
1133 } else { 1314 } else {
1134 warn "object uses attachment '$name' that is not available, postponing.\n"; 1315 info "object uses attachment '$name' that is not available, postponing.\n";
1135 } 1316 }
1136 } 1317 }
1137} 1318}
1138 1319
1139cf::attachable->attach ( 1320cf::attachable->attach (
1166 my ($filename, $rdata, $objs) = @_; 1347 my ($filename, $rdata, $objs) = @_;
1167 1348
1168 sync_job { 1349 sync_job {
1169 if (length $$rdata) { 1350 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename); 1351 utf8::decode (my $decname = $filename);
1171 warn sprintf "saving %s (%d,%d)\n", 1352 trace sprintf "saving %s (%d,%d)\n",
1172 $decname, length $$rdata, scalar @$objs; 1353 $decname, length $$rdata, scalar @$objs
1354 if $VERBOSE_IO;
1173 1355
1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1356 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175 aio_chmod $fh, SAVE_MODE; 1357 aio_chmod $fh, SAVE_MODE;
1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1358 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177 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 }
1178 aio_close $fh; 1363 aio_close $fh;
1179 1364
1180 if (@$objs) { 1365 if (@$objs) {
1181 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) {
1182 aio_chmod $fh, SAVE_MODE; 1367 aio_chmod $fh, SAVE_MODE;
1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1368 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1184 aio_write $fh, 0, (length $data), $data, 0; 1369 aio_write $fh, 0, (length $data), $data, 0;
1185 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 }
1186 aio_close $fh; 1374 aio_close $fh;
1187 aio_rename "$filename.pst~", "$filename.pst"; 1375 aio_rename "$filename.pst~", "$filename.pst";
1188 } 1376 }
1189 } else { 1377 } else {
1190 aio_unlink "$filename.pst"; 1378 aio_unlink "$filename.pst";
1193 aio_rename "$filename~", $filename; 1381 aio_rename "$filename~", $filename;
1194 1382
1195 $filename =~ s%/[^/]+$%%; 1383 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC; 1384 aio_pathsync $filename if $cf::USE_FSYNC;
1197 } else { 1385 } else {
1198 warn "FATAL: $filename~: $!\n"; 1386 error "unable to save objects: $filename~: $!\n";
1199 } 1387 }
1200 } else { 1388 } else {
1201 aio_unlink $filename; 1389 aio_unlink $filename;
1202 aio_unlink "$filename.pst"; 1390 aio_unlink "$filename.pst";
1203 } 1391 }
1227 my $st = eval { Coro::Storable::thaw $av }; 1415 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs}; 1416 $av = $st->{objs};
1229 } 1417 }
1230 1418
1231 utf8::decode (my $decname = $filename); 1419 utf8::decode (my $decname = $filename);
1232 warn sprintf "loading %s (%d,%d)\n", 1420 trace sprintf "loading %s (%d,%d)\n",
1233 $decname, length $data, scalar @{$av || []}; 1421 $decname, length $data, scalar @{$av || []}
1422 if $VERBOSE_IO;
1234 1423
1235 ($data, $av) 1424 ($data, $av)
1236} 1425}
1237 1426
1238=head2 COMMAND CALLBACKS 1427=head2 COMMAND CALLBACKS
1297} 1486}
1298 1487
1299use File::Glob (); 1488use File::Glob ();
1300 1489
1301cf::player->attach ( 1490cf::player->attach (
1302 on_command => sub { 1491 on_unknown_command => sub {
1303 my ($pl, $name, $params) = @_; 1492 my ($pl, $name, $params) = @_;
1304 1493
1305 my $cb = $COMMAND{$name} 1494 my $cb = $COMMAND{$name}
1306 or return; 1495 or return;
1307 1496
1315 my ($pl, $buf) = @_; 1504 my ($pl, $buf) = @_;
1316 1505
1317 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1506 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1318 1507
1319 if (ref $msg) { 1508 if (ref $msg) {
1320 my ($type, $reply, @payload) = 1509 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1321 "ARRAY" eq ref $msg
1322 ? @$msg
1323 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1324 1510
1325 my @reply; 1511 my @reply;
1326 1512
1327 if (my $cb = $EXTCMD{$type}) { 1513 if (my $cb = $EXTCMD{$type}) {
1328 @reply = $cb->($pl, @payload); 1514 @reply = $cb->($pl, @payload);
1330 1516
1331 $pl->ext_reply ($reply, @reply) 1517 $pl->ext_reply ($reply, @reply)
1332 if $reply; 1518 if $reply;
1333 1519
1334 } else { 1520 } else {
1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1521 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1336 } 1522 }
1337 1523
1338 cf::override; 1524 cf::override;
1339 }, 1525 },
1340); 1526);
1341 1527
1342# "readahead" all extensions 1528# "readahead" all extensions
1343sub cache_extensions { 1529sub cache_extensions {
1344 my $grp = IO::AIO::aio_group; 1530 my $grp = IO::AIO::aio_group;
1345 1531
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub { 1532 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1347 for (grep /\.ext$/, @{$_[0]}) { 1533 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; 1534 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 } 1535 }
1350 }; 1536 };
1351 1537
1352 $grp 1538 $grp
1353} 1539}
1354 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
1355sub load_extensions { 1552sub load_extensions {
1553 info "loading extensions...";
1554
1555 %EXT_CFG = ();
1556
1356 cf::sync_job { 1557 cf::sync_job {
1357 my %todo; 1558 my %todo;
1358 1559
1359 for my $path (<$LIBDIR/*.ext>) { 1560 for my $path (<$LIBDIR/*.ext>) {
1360 next unless -r $path; 1561 next unless -r $path;
1378 1579
1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1580 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1581 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1381 1582
1382 $ext{source} = 1583 $ext{source} =
1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1584 "package $pkg; use common::sense;\n"
1384 . "#line 1 \"$path\"\n{\n" 1585 . "#line 1 \"$path\"\n{\n"
1385 . $source 1586 . $source
1386 . "\n};\n1"; 1587 . "\n};\n1";
1387 1588
1388 $todo{$base} = \%ext; 1589 $todo{$base} = \%ext;
1389 } 1590 }
1390 1591
1592 my $pass = 0;
1391 my %done; 1593 my %done;
1392 while (%todo) { 1594 while (%todo) {
1393 my $progress; 1595 my $progress;
1394 1596
1597 ++$pass;
1598
1599 ext:
1395 while (my ($k, $v) = each %todo) { 1600 while (my ($k, $v) = each %todo) {
1396 for (split /,\s*/, $v->{meta}{depends}) { 1601 for (split /,\s*/, $v->{meta}{depends}) {
1397 goto skip 1602 next ext
1398 unless exists $done{$_}; 1603 unless exists $done{$_};
1399 } 1604 }
1400 1605
1401 warn "... loading '$k' into '$v->{pkg}'\n"; 1606 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1402 1607
1403 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 $@) {
1404 my $msg = $@ ? "$v->{path}: $@\n" 1620 error "$v->{path}: $@\n";
1405 : "$v->{base}: extension inactive.\n";
1406 1621
1407 if (exists $v->{meta}{mandatory}) {
1408 warn $msg;
1409 cf::cleanup "mandatory extension failed to load, exiting."; 1622 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1410 } 1623 if exists $v->{meta}{mandatory};
1411 1624
1412 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;
1413 } 1634 }
1414
1415 $done{$k} = delete $todo{$k};
1416 push @EXTS, $v->{pkg};
1417 $progress = 1;
1418 } 1635 }
1419 1636
1420 skip: 1637 unless ($progress) {
1421 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1638 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1422 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 }
1423 } 1647 }
1424 }; 1648 };
1425} 1649}
1426 1650
1427############################################################################# 1651#############################################################################
1511 $cf::PLAYER{$login} = $pl 1735 $cf::PLAYER{$login} = $pl
1512 } 1736 }
1513 } 1737 }
1514} 1738}
1515 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
1516sub save($) { 1753sub save($) {
1517 my ($pl) = @_; 1754 my ($pl) = @_;
1518 1755
1519 return if $pl->{deny_save}; 1756 return if $pl->{deny_save};
1520 1757
1525 1762
1526 aio_mkdir playerdir $pl, 0770; 1763 aio_mkdir playerdir $pl, 0770;
1527 $pl->{last_save} = $cf::RUNTIME; 1764 $pl->{last_save} = $cf::RUNTIME;
1528 1765
1529 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];
1530 1770
1531 $pl->save_pl ($path); 1771 $pl->save_pl ($path);
1532 cf::cede_to_tick; 1772 cf::cede_to_tick;
1533} 1773}
1534 1774
1568 my $name = $pl->ob->name; 1808 my $name = $pl->ob->name;
1569 1809
1570 $pl->{deny_save} = 1; 1810 $pl->{deny_save} = 1;
1571 $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
1572 1812
1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1813 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1574 $pl->deactivate; 1814 $pl->deactivate;
1815
1575 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;
1576 $pl->ob->check_score;
1577 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1817 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1818 ext::highscore::check ($pl->ob);
1819
1578 $pl->ns->destroy if $pl->ns; 1820 $pl->ns->destroy if $pl->ns;
1579 1821
1580 my $path = playerdir $pl; 1822 my $path = playerdir $pl;
1581 my $temp = "$path~$cf::RUNTIME~deleting~"; 1823 my $temp = "$path~$cf::RUNTIME~deleting~";
1582 aio_rename $path, $temp; 1824 aio_rename $path, $temp;
1636 \@logins 1878 \@logins
1637} 1879}
1638 1880
1639=item $player->maps 1881=item $player->maps
1640 1882
1883=item cf::player::maps $login
1884
1641Returns an arrayref of map paths that are private for this 1885Returns an arrayref of map paths that are private for this
1642player. May block. 1886player. May block.
1643 1887
1644=cut 1888=cut
1645 1889
1707=cut 1951=cut
1708 1952
1709sub find_by_path($) { 1953sub find_by_path($) {
1710 my ($path) = @_; 1954 my ($path) = @_;
1711 1955
1956 $path =~ s/^~[^\/]*//; # skip ~login
1957
1712 my ($match, $specificity); 1958 my ($match, $specificity);
1713 1959
1714 for my $region (list) { 1960 for my $region (list) {
1715 if ($region->{match} && $path =~ $region->{match}) { 1961 if ($region->{match} && $path =~ $region->{match}) {
1716 ($match, $specificity) = ($region, $region->specificity) 1962 ($match, $specificity) = ($region, $region->specificity)
1744sub generate_random_map { 1990sub generate_random_map {
1745 my ($self, $rmp) = @_; 1991 my ($self, $rmp) = @_;
1746 1992
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 1993 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748 1994
1749 # mit "rum" bekleckern, nicht
1750 $self->_create_random_map ( 1995 $self->_create_random_map ($rmp);
1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1754 $rmp->{exit_on_final_map},
1755 $rmp->{xsize}, $rmp->{ysize},
1756 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1757 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1758 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1759 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1760 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1761 (cf::region::find $rmp->{region}), $rmp->{custom}
1762 )
1763} 1996}
1764 1997
1765=item cf::map->register ($regex, $prio) 1998=item cf::map->register ($regex, $prio)
1766 1999
1767Register a handler for the map path matching the given regex at the 2000Register a handler for the map path matching the given regex at the
1772 2005
1773sub register { 2006sub register {
1774 my (undef, $regex, $prio) = @_; 2007 my (undef, $regex, $prio) = @_;
1775 my $pkg = caller; 2008 my $pkg = caller;
1776 2009
1777 no strict;
1778 push @{"$pkg\::ISA"}, __PACKAGE__; 2010 push @{"$pkg\::ISA"}, __PACKAGE__;
1779 2011
1780 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2012 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1781} 2013}
1782 2014
1783# also paths starting with '/' 2015# also paths starting with '/'
1784$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2016$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1785 2017
1786sub thawer_merge { 2018sub thawer_merge {
1787 my ($self, $merge) = @_; 2019 my ($self, $merge) = @_;
1788 2020
1789 # we have to keep some variables in memory intact 2021 # we have to keep some variables in memory intact
1794} 2026}
1795 2027
1796sub normalise { 2028sub normalise {
1797 my ($path, $base) = @_; 2029 my ($path, $base) = @_;
1798 2030
1799 $path = "$path"; # make sure its a string 2031 $path = "$path"; # make sure it's a string
1800 2032
1801 $path =~ s/\.map$//; 2033 $path =~ s/\.map$//;
1802 2034
1803 # map plan: 2035 # map plan:
1804 # 2036 #
1819 $base =~ s{[^/]+/?$}{}; 2051 $base =~ s{[^/]+/?$}{};
1820 $path = "$base/$path"; 2052 $path = "$base/$path";
1821 } 2053 }
1822 2054
1823 for ($path) { 2055 for ($path) {
1824 redo if s{//}{/};
1825 redo if s{/\.?/}{/}; 2056 redo if s{/\.?/}{/};
1826 redo if s{/[^/]+/\.\./}{/}; 2057 redo if s{/[^/]+/\.\./}{/};
1827 } 2058 }
1828 2059
1829 $path 2060 $path
1843 $self->init; # pass $1 etc. 2074 $self->init; # pass $1 etc.
1844 return $self; 2075 return $self;
1845 } 2076 }
1846 } 2077 }
1847 2078
1848 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2079 Carp::cluck "unable to resolve path '$path' (base '$base')";
1849 () 2080 ()
1850} 2081}
1851 2082
2083# may re-bless or do other evil things
1852sub init { 2084sub init {
1853 my ($self) = @_; 2085 my ($self) = @_;
1854 2086
1855 $self 2087 $self
1856} 2088}
1887 2119
1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 2120 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1889 "$UNIQUEDIR/$path" 2121 "$UNIQUEDIR/$path"
1890} 2122}
1891 2123
1892# and all this just because we cannot iterate over
1893# all maps in C++...
1894sub change_all_map_light {
1895 my ($change) = @_;
1896
1897 $_->change_map_light ($change)
1898 for grep $_->outdoor, values %cf::MAP;
1899}
1900
1901sub decay_objects { 2124sub decay_objects {
1902 my ($self) = @_; 2125 my ($self) = @_;
1903 2126
1904 return if $self->{deny_reset}; 2127 return if $self->{deny_reset};
1905 2128
1930 $self->{load_path} = $path; 2153 $self->{load_path} = $path;
1931 2154
1932 1 2155 1
1933} 2156}
1934 2157
2158# used to laod the header of an original map
1935sub load_header_orig { 2159sub load_header_orig {
1936 my ($self) = @_; 2160 my ($self) = @_;
1937 2161
1938 $self->load_header_from ($self->load_path) 2162 $self->load_header_from ($self->load_path)
1939} 2163}
1940 2164
2165# used to laod the header of an instantiated map
1941sub load_header_temp { 2166sub load_header_temp {
1942 my ($self) = @_; 2167 my ($self) = @_;
1943 2168
1944 $self->load_header_from ($self->save_path) 2169 $self->load_header_from ($self->save_path)
1945} 2170}
1946 2171
2172# called after loading the header from an instantiated map
1947sub prepare_temp { 2173sub prepare_temp {
1948 my ($self) = @_; 2174 my ($self) = @_;
1949 2175
1950 $self->last_access ((delete $self->{last_access}) 2176 $self->last_access ((delete $self->{last_access})
1951 || $cf::RUNTIME); #d# 2177 || $cf::RUNTIME); #d#
1952 # safety 2178 # safety
1953 $self->{instantiate_time} = $cf::RUNTIME 2179 $self->{instantiate_time} = $cf::RUNTIME
1954 if $self->{instantiate_time} > $cf::RUNTIME; 2180 if $self->{instantiate_time} > $cf::RUNTIME;
1955} 2181}
1956 2182
2183# called after loading the header from an original map
1957sub prepare_orig { 2184sub prepare_orig {
1958 my ($self) = @_; 2185 my ($self) = @_;
1959 2186
1960 $self->{load_original} = 1; 2187 $self->{load_original} = 1;
1961 $self->{instantiate_time} = $cf::RUNTIME; 2188 $self->{instantiate_time} = $cf::RUNTIME;
1985 2212
1986sub find; 2213sub find;
1987sub find { 2214sub find {
1988 my ($path, $origin) = @_; 2215 my ($path, $origin) = @_;
1989 2216
2217 cf::cede_to_tick;
2218
1990 $path = normalise $path, $origin && $origin->path; 2219 $path = normalise $path, $origin;
1991 2220
1992 cf::lock_wait "map_data:$path";#d#remove 2221 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1993 cf::lock_wait "map_find:$path"; 2222 my $guard2 = cf::lock_acquire "map_find:$path";
1994 2223
1995 $cf::MAP{$path} || do { 2224 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1999 my $map = new_from_path cf::map $path 2225 my $map = new_from_path cf::map $path
2000 or return; 2226 or return;
2001 2227
2002 $map->{last_save} = $cf::RUNTIME; 2228 $map->{last_save} = $cf::RUNTIME;
2003 2229
2015 2241
2016 $cf::MAP{$path} = $map 2242 $cf::MAP{$path} = $map
2017 } 2243 }
2018} 2244}
2019 2245
2020sub pre_load { } 2246sub pre_load { }
2021sub post_load { } 2247#sub post_load { } # XS
2022 2248
2023sub load { 2249sub load {
2024 my ($self) = @_; 2250 my ($self) = @_;
2025 2251
2026 local $self->{deny_reset} = 1; # loading can take a long time 2252 local $self->{deny_reset} = 1; # loading can take a long time
2029 2255
2030 { 2256 {
2031 my $guard = cf::lock_acquire "map_data:$path"; 2257 my $guard = cf::lock_acquire "map_data:$path";
2032 2258
2033 return unless $self->valid; 2259 return unless $self->valid;
2034 return unless $self->in_memory == cf::MAP_SWAPPED; 2260 return unless $self->state == cf::MAP_SWAPPED;
2035
2036 $self->in_memory (cf::MAP_LOADING);
2037 2261
2038 $self->alloc; 2262 $self->alloc;
2039 2263
2040 $self->pre_load; 2264 $self->pre_load;
2041 cf::cede_to_tick; 2265 cf::cede_to_tick;
2042 2266
2267 if (exists $self->{load_path}) {
2043 my $f = new_from_file cf::object::thawer $self->{load_path}; 2268 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block; 2269 $f->skip_block;
2045 $self->_load_objects ($f) 2270 $self->_load_objects ($f)
2046 or return; 2271 or return;
2047 2272
2048 $self->post_load_original 2273 $self->post_load_original
2049 if delete $self->{load_original}; 2274 if delete $self->{load_original};
2050 2275
2051 if (my $uniq = $self->uniq_path) { 2276 if (my $uniq = $self->uniq_path) {
2052 utf8::encode $uniq; 2277 utf8::encode $uniq;
2053 unless (aio_stat $uniq) { 2278 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) { 2279 if (my $f = new_from_file cf::object::thawer $uniq) {
2055 $self->clear_unique_items; 2280 $self->clear_unique_items;
2056 $self->_load_objects ($f); 2281 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs; 2282 $f->resolve_delayed_derefs;
2283 }
2058 } 2284 }
2059 } 2285 }
2060 }
2061 2286
2062 $f->resolve_delayed_derefs; 2287 $f->resolve_delayed_derefs;
2288 } else {
2289 $self->post_load_original
2290 if delete $self->{load_original};
2291 }
2292
2293 $self->state (cf::MAP_INACTIVE);
2063 2294
2064 cf::cede_to_tick; 2295 cf::cede_to_tick;
2065 # now do the right thing for maps 2296 # now do the right thing for maps
2066 $self->link_multipart_objects; 2297 $self->link_multipart_objects;
2067 $self->difficulty ($self->estimate_difficulty) 2298 $self->difficulty ($self->estimate_difficulty)
2071 unless ($self->{deny_activate}) { 2302 unless ($self->{deny_activate}) {
2072 $self->decay_objects; 2303 $self->decay_objects;
2073 $self->fix_auto_apply; 2304 $self->fix_auto_apply;
2074 $self->update_buttons; 2305 $self->update_buttons;
2075 cf::cede_to_tick; 2306 cf::cede_to_tick;
2076 $self->set_darkness_map; 2307 #$self->activate; # no longer activate maps automatically
2077 cf::cede_to_tick;
2078 $self->activate;
2079 } 2308 }
2080 2309
2081 $self->{last_save} = $cf::RUNTIME; 2310 $self->{last_save} = $cf::RUNTIME;
2082 $self->last_access ($cf::RUNTIME); 2311 $self->last_access ($cf::RUNTIME);
2083
2084 $self->in_memory (cf::MAP_ACTIVE);
2085 } 2312 }
2086 2313
2087 $self->post_load; 2314 $self->post_load;
2088}
2089 2315
2316 1
2317}
2318
2319# customize the map for a given player, i.e.
2320# return the _real_ map. used by e.g. per-player
2321# maps to change the path to ~playername/mappath
2090sub customise_for { 2322sub customise_for {
2091 my ($self, $ob) = @_; 2323 my ($self, $ob) = @_;
2092 2324
2093 return find "~" . $ob->name . "/" . $self->{path} 2325 return find "~" . $ob->name . "/" . $self->{path}
2094 if $self->per_player; 2326 if $self->per_player;
2097# if $self->per_party; 2329# if $self->per_party;
2098 2330
2099 $self 2331 $self
2100} 2332}
2101 2333
2102# find and load all maps in the 3x3 area around a map
2103sub load_neighbours {
2104 my ($map) = @_;
2105
2106 my @neigh; # diagonal neighbours
2107
2108 for (0 .. 3) {
2109 my $neigh = $map->tile_path ($_)
2110 or next;
2111 $neigh = find $neigh, $map
2112 or next;
2113 $neigh->load;
2114
2115 push @neigh,
2116 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2117 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2118 }
2119
2120 for (grep defined $_->[0], @neigh) {
2121 my ($path, $origin) = @$_;
2122 my $neigh = find $path, $origin
2123 or next;
2124 $neigh->load;
2125 }
2126}
2127
2128sub find_sync { 2334sub find_sync {
2129 my ($path, $origin) = @_; 2335 my ($path, $origin) = @_;
2130 2336
2131 cf::sync_job { find $path, $origin } 2337 # it's a bug to call this from the main context
2338 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2339 if $Coro::current == $Coro::main;
2340
2341 find $path, $origin
2132} 2342}
2133 2343
2134sub do_load_sync { 2344sub do_load_sync {
2135 my ($map) = @_; 2345 my ($map) = @_;
2136 2346
2347 # it's a bug to call this from the main context
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2348 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main; 2349 if $Coro::current == $Coro::main;
2139 2350
2140 cf::sync_job { $map->load }; 2351 $map->load;
2141} 2352}
2142 2353
2143our %MAP_PREFETCH; 2354our %MAP_PREFETCH;
2144our $MAP_PREFETCHER = undef; 2355our $MAP_PREFETCHER = undef;
2145 2356
2146sub find_async { 2357sub find_async {
2147 my ($path, $origin, $load) = @_; 2358 my ($path, $origin, $load) = @_;
2148 2359
2149 $path = normalise $path, $origin && $origin->{path}; 2360 $path = normalise $path, $origin;
2150 2361
2151 if (my $map = $cf::MAP{$path}) { 2362 if (my $map = $cf::MAP{$path}) {
2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2363 return $map if !$load || $map->linkable;
2153 } 2364 }
2154 2365
2155 $MAP_PREFETCH{$path} |= $load; 2366 $MAP_PREFETCH{$path} |= $load;
2156 2367
2157 $MAP_PREFETCHER ||= cf::async { 2368 $MAP_PREFETCHER ||= cf::async {
2171 $MAP_PREFETCHER->prio (6); 2382 $MAP_PREFETCHER->prio (6);
2172 2383
2173 () 2384 ()
2174} 2385}
2175 2386
2387# common code, used by both ->save and ->swapout
2176sub save { 2388sub _save {
2177 my ($self) = @_; 2389 my ($self) = @_;
2178
2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2390
2181 $self->{last_save} = $cf::RUNTIME; 2391 $self->{last_save} = $cf::RUNTIME;
2182 2392
2183 return unless $self->dirty; 2393 return unless $self->dirty;
2184 2394
2204 } else { 2414 } else {
2205 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2415 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2206 } 2416 }
2207} 2417}
2208 2418
2419sub save {
2420 my ($self) = @_;
2421
2422 my $lock = cf::lock_acquire "map_data:$self->{path}";
2423
2424 $self->_save;
2425}
2426
2209sub swap_out { 2427sub swap_out {
2210 my ($self) = @_; 2428 my ($self) = @_;
2211 2429
2212 # save first because save cedes
2213 $self->save;
2214
2215 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2430 my $lock = cf::lock_acquire "map_data:$self->{path}";
2216 2431
2432 return if !$self->linkable;
2433 return if $self->{deny_save};
2217 return if $self->players; 2434 return if $self->players;
2218 return if $self->in_memory != cf::MAP_ACTIVE; 2435
2436 # first deactivate the map and "unlink" it from the core
2437 $self->deactivate;
2438 $_->clear_links_to ($self) for values %cf::MAP;
2439 $self->state (cf::MAP_SWAPPED);
2440
2441 # then atomically save
2442 $self->_save;
2443
2444 # then free the map
2445 $self->clear;
2446}
2447
2448sub reset_at {
2449 my ($self) = @_;
2450
2451 # TODO: safety, remove and allow resettable per-player maps
2219 return if $self->{deny_save}; 2452 return 1e99 if $self->{deny_reset};
2220 2453
2454 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2455 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2456
2457 $time + $to
2458}
2459
2460sub should_reset {
2461 my ($self) = @_;
2462
2463 $self->reset_at <= $cf::RUNTIME
2464}
2465
2466sub reset {
2467 my ($self) = @_;
2468
2469 my $lock = cf::lock_acquire "map_data:$self->{path}";
2470
2471 return if $self->players;
2472
2473 cf::trace "resetting map ", $self->path, "\n";
2474
2221 $self->in_memory (cf::MAP_SWAPPED); 2475 $self->state (cf::MAP_SWAPPED);
2476
2477 # need to save uniques path
2478 unless ($self->{deny_save}) {
2479 my $uniq = $self->uniq_path; utf8::encode $uniq;
2480
2481 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2482 if $uniq;
2483 }
2484
2485 delete $cf::MAP{$self->path};
2222 2486
2223 $self->deactivate; 2487 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP; 2488 $_->clear_links_to ($self) for values %cf::MAP;
2225 $self->clear; 2489 $self->clear;
2226}
2227
2228sub reset_at {
2229 my ($self) = @_;
2230
2231 # TODO: safety, remove and allow resettable per-player maps
2232 return 1e99 if $self->{deny_reset};
2233
2234 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2235 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2236
2237 $time + $to
2238}
2239
2240sub should_reset {
2241 my ($self) = @_;
2242
2243 $self->reset_at <= $cf::RUNTIME
2244}
2245
2246sub reset {
2247 my ($self) = @_;
2248
2249 my $lock = cf::lock_acquire "map_data:$self->{path}";
2250
2251 return if $self->players;
2252
2253 warn "resetting map ", $self->path;
2254
2255 $self->in_memory (cf::MAP_SWAPPED);
2256
2257 # need to save uniques path
2258 unless ($self->{deny_save}) {
2259 my $uniq = $self->uniq_path; utf8::encode $uniq;
2260
2261 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2262 if $uniq;
2263 }
2264
2265 delete $cf::MAP{$self->path};
2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2269 $self->clear;
2270 2490
2271 $self->unlink_save; 2491 $self->unlink_save;
2272 $self->destroy; 2492 $self->destroy;
2273} 2493}
2274 2494
2282 2502
2283 delete $cf::MAP{$self->path}; 2503 delete $cf::MAP{$self->path};
2284 2504
2285 $self->unlink_save; 2505 $self->unlink_save;
2286 2506
2287 bless $self, "cf::map"; 2507 bless $self, "cf::map::wrap";
2288 delete $self->{deny_reset}; 2508 delete $self->{deny_reset};
2289 $self->{deny_save} = 1; 2509 $self->{deny_save} = 1;
2290 $self->reset_timeout (1); 2510 $self->reset_timeout (1);
2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2511 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2292 2512
2349 : normalise $_ 2569 : normalise $_
2350 } @{ aio_readdir $UNIQUEDIR or [] } 2570 } @{ aio_readdir $UNIQUEDIR or [] }
2351 ] 2571 ]
2352} 2572}
2353 2573
2574=item cf::map::static_maps
2575
2576Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2577file in the shared directory excluding F</styles> and F</editor>). May
2578block.
2579
2580=cut
2581
2582sub static_maps() {
2583 my @dirs = "";
2584 my @maps;
2585
2586 while (@dirs) {
2587 my $dir = shift @dirs;
2588
2589 next if $dir eq "/styles" || $dir eq "/editor";
2590
2591 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2592 or return;
2593
2594 for (@$files) {
2595 s/\.map$// or next;
2596 utf8::decode $_;
2597 push @maps, "$dir/$_";
2598 }
2599
2600 push @dirs, map "$dir/$_", @$dirs;
2601 }
2602
2603 \@maps
2604}
2605
2354=back 2606=back
2355 2607
2356=head3 cf::object 2608=head3 cf::object
2357 2609
2358=cut 2610=cut
2423 2675
2424our $SAY_CHANNEL = { 2676our $SAY_CHANNEL = {
2425 id => "say", 2677 id => "say",
2426 title => "Map", 2678 title => "Map",
2427 reply => "say ", 2679 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.", 2680 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2429}; 2681};
2430 2682
2431our $CHAT_CHANNEL = { 2683our $CHAT_CHANNEL = {
2432 id => "chat", 2684 id => "chat",
2433 title => "Chat", 2685 title => "Chat",
2490 2742
2491Freezes the player and moves him/her to a special map (C<{link}>). 2743Freezes the player and moves him/her to a special map (C<{link}>).
2492 2744
2493The player should be reasonably safe there for short amounts of time (e.g. 2745The player should be reasonably safe there for short amounts of time (e.g.
2494for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2746for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link 2747though, as the player cannot control the character while it is on the link
2496map. 2748map.
2497 2749
2498Will never block. 2750Will never block.
2499 2751
2500=item $player_object->leave_link ($map, $x, $y) 2752=item $player_object->leave_link ($map, $x, $y)
2521sub cf::object::player::enter_link { 2773sub cf::object::player::enter_link {
2522 my ($self) = @_; 2774 my ($self) = @_;
2523 2775
2524 $self->deactivate_recursive; 2776 $self->deactivate_recursive;
2525 2777
2778 ++$self->{_link_recursion};
2779
2526 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2780 return if UNIVERSAL::isa $self->map, "ext::map_link";
2527 2781
2528 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2782 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2529 if $self->map && $self->map->{path} ne "{link}"; 2783 if $self->map && $self->map->{path} ne "{link}";
2530 2784
2531 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2785 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2532} 2786}
2533 2787
2534sub cf::object::player::leave_link { 2788sub cf::object::player::leave_link {
2535 my ($self, $map, $x, $y) = @_; 2789 my ($self, $map, $x, $y) = @_;
2536 2790
2553 ($x, $y) = (-1, -1) 2807 ($x, $y) = (-1, -1)
2554 unless (defined $x) && (defined $y); 2808 unless (defined $x) && (defined $y);
2555 2809
2556 # use -1 or undef as default coordinates, not 0, 0 2810 # use -1 or undef as default coordinates, not 0, 0
2557 ($x, $y) = ($map->enter_x, $map->enter_y) 2811 ($x, $y) = ($map->enter_x, $map->enter_y)
2558 if $x <=0 && $y <= 0; 2812 if $x <= 0 && $y <= 0;
2559 2813
2560 $map->load; 2814 $map->load;
2561 $map->load_neighbours;
2562 2815
2563 return unless $self->contr->active; 2816 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2565 $self->activate_recursive;
2566 2817
2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2818 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2568 $self->enter_map ($map, $x, $y); 2819 if ($self->enter_map ($map, $x, $y)) {
2569} 2820 # entering was successful
2821 delete $self->{_link_recursion};
2822 # only activate afterwards, to support waiting in hooks
2823 $self->activate_recursive;
2824 }
2570 2825
2826}
2827
2571=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2828=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2572 2829
2573Moves the player to the given map-path and coordinates by first freezing 2830Moves the player to the given map-path and coordinates by first freezing
2574her, loading and preparing them map, calling the provided $check callback 2831her, loading and preparing them map, calling the provided $check callback
2575that has to return the map if sucecssful, and then unfreezes the player on 2832that has to return the map if sucecssful, and then unfreezes the player on
2576the new (success) or old (failed) map position. In either case, $done will 2833the new (success) or old (failed) map position. In either case, $done will
2583 2840
2584our $GOTOGEN; 2841our $GOTOGEN;
2585 2842
2586sub cf::object::player::goto { 2843sub cf::object::player::goto {
2587 my ($self, $path, $x, $y, $check, $done) = @_; 2844 my ($self, $path, $x, $y, $check, $done) = @_;
2845
2846 if ($self->{_link_recursion} >= $MAX_LINKS) {
2847 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2848 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2849 ($path, $x, $y) = @$EMERGENCY_POSITION;
2850 }
2588 2851
2589 # do generation counting so two concurrent goto's will be executed in-order 2852 # do generation counting so two concurrent goto's will be executed in-order
2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2853 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2591 2854
2592 $self->enter_link; 2855 $self->enter_link;
2612 ($path, $x, $y) = (undef, undef, undef); 2875 ($path, $x, $y) = (undef, undef, undef);
2613 } 2876 }
2614 } 2877 }
2615 2878
2616 my $map = eval { 2879 my $map = eval {
2617 my $map = defined $path ? cf::map::find $path : undef; 2880 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2618 2881
2619 if ($map) { 2882 if ($map) {
2620 $map = $map->customise_for ($self); 2883 $map = $map->customise_for ($self);
2621 $map = $check->($map) if $check && $map; 2884 $map = $check->($map, $x, $y, $self) if $check && $map;
2622 } else { 2885 } else {
2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2886 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2624 } 2887 }
2625 2888
2626 $map 2889 $map
2634 if ($gen == $self->{_goto_generation}) { 2897 if ($gen == $self->{_goto_generation}) {
2635 delete $self->{_goto_generation}; 2898 delete $self->{_goto_generation};
2636 $self->leave_link ($map, $x, $y); 2899 $self->leave_link ($map, $x, $y);
2637 } 2900 }
2638 2901
2639 $done->() if $done; 2902 $done->($self) if $done;
2640 })->prio (1); 2903 })->prio (1);
2641} 2904}
2642 2905
2643=item $player_object->enter_exit ($exit_object) 2906=item $player_object->enter_exit ($exit_object)
2644 2907
2712 $Coro::current->{desc} = "enter_exit"; 2975 $Coro::current->{desc} = "enter_exit";
2713 2976
2714 unless (eval { 2977 unless (eval {
2715 $self->deactivate_recursive; # just to be sure 2978 $self->deactivate_recursive; # just to be sure
2716 2979
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2980 my $map = cf::map::normalise $exit->slaying, $exit->map;
2726 my $x = $exit->stats->hp; 2981 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp; 2982 my $y = $exit->stats->sp;
2983
2984 # special map handling
2985 my $slaying = $exit->slaying;
2986
2987 # special map handling
2988 if ($slaying eq "/!") {
2989 my $guard = cf::lock_acquire "exit_prepare:$exit";
2990
2991 prepare_random_map $exit
2992 if $exit->slaying eq "/!"; # need to re-check after getting the lock
2993
2994 $map = $exit->slaying;
2995
2996 } elsif ($slaying eq '!up') {
2997 $map = $exit->map->tile_path (cf::TILE_UP);
2998 $x = $exit->x;
2999 $y = $exit->y;
3000
3001 } elsif ($slaying eq '!down') {
3002 $map = $exit->map->tile_path (cf::TILE_DOWN);
3003 $x = $exit->x;
3004 $y = $exit->y;
3005 }
2728 3006
2729 $self->goto ($map, $x, $y); 3007 $self->goto ($map, $x, $y);
2730 3008
2731 # if exit is damned, update players death & WoR home-position 3009 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y) 3010 $self->contr->savebed ($map, $x, $y)
2737 $self->message ("Something went wrong deep within the deliantra server. " 3015 $self->message ("Something went wrong deep within the deliantra server. "
2738 . "I'll try to bring you back to the map you were before. " 3016 . "I'll try to bring you back to the map you were before. "
2739 . "Please report this to the dungeon master!", 3017 . "Please report this to the dungeon master!",
2740 cf::NDI_UNIQUE | cf::NDI_RED); 3018 cf::NDI_UNIQUE | cf::NDI_RED);
2741 3019
2742 warn "ERROR in enter_exit: $@"; 3020 error "ERROR in enter_exit: $@";
2743 $self->leave_link; 3021 $self->leave_link;
2744 } 3022 }
2745 })->prio (1); 3023 })->prio (1);
2746} 3024}
2747 3025
2759sub cf::client::send_drawinfo { 3037sub cf::client::send_drawinfo {
2760 my ($self, $text, $flags) = @_; 3038 my ($self, $text, $flags) = @_;
2761 3039
2762 utf8::encode $text; 3040 utf8::encode $text;
2763 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3041 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
3042}
3043
3044=item $client->send_big_packet ($pkt)
3045
3046Like C<send_packet>, but tries to compress large packets, and fragments
3047them as required.
3048
3049=cut
3050
3051our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3052
3053sub cf::client::send_big_packet {
3054 my ($self, $pkt) = @_;
3055
3056 # try lzf for large packets
3057 $pkt = "lzf " . Compress::LZF::compress $pkt
3058 if 1024 <= length $pkt and $self->{can_lzf};
3059
3060 # split very large packets
3061 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3062 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3063 $pkt = "frag";
3064 }
3065
3066 $self->send_packet ($pkt);
2764} 3067}
2765 3068
2766=item $client->send_msg ($channel, $msg, $color, [extra...]) 3069=item $client->send_msg ($channel, $msg, $color, [extra...])
2767 3070
2768Send a drawinfo or msg packet to the client, formatting the msg for the 3071Send a drawinfo or msg packet to the client, formatting the msg for the
2772 3075
2773=cut 3076=cut
2774 3077
2775# non-persistent channels (usually the info channel) 3078# non-persistent channels (usually the info channel)
2776our %CHANNEL = ( 3079our %CHANNEL = (
3080 "c/motd" => {
3081 id => "infobox",
3082 title => "MOTD",
3083 reply => undef,
3084 tooltip => "The message of the day",
3085 },
2777 "c/identify" => { 3086 "c/identify" => {
2778 id => "infobox", 3087 id => "infobox",
2779 title => "Identify", 3088 title => "Identify",
2780 reply => undef, 3089 reply => undef,
2781 tooltip => "Items recently identified", 3090 tooltip => "Items recently identified",
2783 "c/examine" => { 3092 "c/examine" => {
2784 id => "infobox", 3093 id => "infobox",
2785 title => "Examine", 3094 title => "Examine",
2786 reply => undef, 3095 reply => undef,
2787 tooltip => "Signs and other items you examined", 3096 tooltip => "Signs and other items you examined",
3097 },
3098 "c/shopinfo" => {
3099 id => "infobox",
3100 title => "Shop Info",
3101 reply => undef,
3102 tooltip => "What your bargaining skill tells you about the shop",
2788 }, 3103 },
2789 "c/book" => { 3104 "c/book" => {
2790 id => "infobox", 3105 id => "infobox",
2791 title => "Book", 3106 title => "Book",
2792 reply => undef, 3107 reply => undef,
2808 id => "infobox", 3123 id => "infobox",
2809 title => "Body Parts", 3124 title => "Body Parts",
2810 reply => undef, 3125 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available", 3126 tooltip => "Shows which body parts you posess and are available",
2812 }, 3127 },
3128 "c/statistics" => {
3129 id => "infobox",
3130 title => "Statistics",
3131 reply => undef,
3132 tooltip => "Shows your primary statistics",
3133 },
2813 "c/skills" => { 3134 "c/skills" => {
2814 id => "infobox", 3135 id => "infobox",
2815 title => "Skills", 3136 title => "Skills",
2816 reply => undef, 3137 reply => undef,
2817 tooltip => "Shows your experience per skill and item power", 3138 tooltip => "Shows your experience per skill and item power",
3139 },
3140 "c/shopitems" => {
3141 id => "infobox",
3142 title => "Shop Items",
3143 reply => undef,
3144 tooltip => "Shows the items currently for sale in this shop",
3145 },
3146 "c/resistances" => {
3147 id => "infobox",
3148 title => "Resistances",
3149 reply => undef,
3150 tooltip => "Shows your resistances",
3151 },
3152 "c/pets" => {
3153 id => "infobox",
3154 title => "Pets",
3155 reply => undef,
3156 tooltip => "Shows information abotu your pets/a specific pet",
3157 },
3158 "c/perceiveself" => {
3159 id => "infobox",
3160 title => "Perceive Self",
3161 reply => undef,
3162 tooltip => "You gained detailed knowledge about yourself",
2818 }, 3163 },
2819 "c/uptime" => { 3164 "c/uptime" => {
2820 id => "infobox", 3165 id => "infobox",
2821 title => "Uptime", 3166 title => "Uptime",
2822 reply => undef, 3167 reply => undef,
2832 id => "party", 3177 id => "party",
2833 title => "Party", 3178 title => "Party",
2834 reply => "gsay ", 3179 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party", 3180 tooltip => "Messages and chat related to your party",
2836 }, 3181 },
3182 "c/death" => {
3183 id => "death",
3184 title => "Death",
3185 reply => undef,
3186 tooltip => "Reason for and more info about your most recent death",
3187 },
3188 "c/say" => $SAY_CHANNEL,
3189 "c/chat" => $CHAT_CHANNEL,
2837); 3190);
2838 3191
2839sub cf::client::send_msg { 3192sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 3193 my ($self, $channel, $msg, $color, @extra) = @_;
2841 3194
2846 3199
2847 # check predefined channels, for the benefit of C 3200 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) { 3201 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel}; 3202 $channel = $CHANNEL{$channel};
2850 3203
2851 $self->ext_msg (channel_info => $channel) 3204 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id}; 3205 $channel = $channel->{id};
2855 3206
2856 } elsif (ref $channel) { 3207 } elsif (ref $channel) {
2857 # send meta info to client, if not yet sent 3208 # send meta info to client, if not yet sent
2858 unless (exists $self->{channel}{$channel->{id}}) { 3209 unless (exists $self->{channel}{$channel->{id}}) {
2859 $self->{channel}{$channel->{id}} = $channel; 3210 $self->{channel}{$channel->{id}} = $channel;
2860 $self->ext_msg (channel_info => $channel) 3211 $self->ext_msg (channel_info => $channel);
2861 if $self->can_msg;
2862 } 3212 }
2863 3213
2864 $channel = $channel->{id}; 3214 $channel = $channel->{id};
2865 } 3215 }
2866 3216
2867 return unless @extra || length $msg; 3217 return unless @extra || length $msg;
2868 3218
2869 if ($self->can_msg) {
2870 # default colour, mask it out 3219 # default colour, mask it out
2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3220 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2872 if $color & cf::NDI_DEF; 3221 if $color & cf::NDI_DEF;
2873 3222
2874 my $pkt = "msg " 3223 my $pkt = "msg "
2875 . $self->{json_coder}->encode ( 3224 . $self->{json_coder}->encode (
2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3225 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 ); 3226 );
2878 3227
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt); 3228 $self->send_big_packet ($pkt);
2890 } else {
2891 if ($color >= 0) {
2892 # replace some tags by gcfclient-compatible ones
2893 for ($msg) {
2894 1 while
2895 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2896 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2897 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2898 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2899 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2900 }
2901
2902 $color &= cf::NDI_COLOR_MASK;
2903
2904 utf8::encode $msg;
2905
2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2909 } else {
2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2911 $self->send_packet ("drawinfo $color $msg")
2912 }
2913 }
2914 }
2915} 3229}
2916 3230
2917=item $client->ext_msg ($type, @msg) 3231=item $client->ext_msg ($type, @msg)
2918 3232
2919Sends an ext event to the client. 3233Sends an ext event to the client.
2921=cut 3235=cut
2922 3236
2923sub cf::client::ext_msg($$@) { 3237sub cf::client::ext_msg($$@) {
2924 my ($self, $type, @msg) = @_; 3238 my ($self, $type, @msg) = @_;
2925 3239
2926 if ($self->extcmd == 2) {
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3240 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2928 } elsif ($self->extcmd == 1) { # TODO: remove
2929 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932} 3241}
2933 3242
2934=item $client->ext_reply ($msgid, @msg) 3243=item $client->ext_reply ($msgid, @msg)
2935 3244
2936Sends an ext reply to the client. 3245Sends an ext reply to the client.
2938=cut 3247=cut
2939 3248
2940sub cf::client::ext_reply($$@) { 3249sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_; 3250 my ($self, $id, @msg) = @_;
2942 3251
2943 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3252 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id;
2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950} 3253}
2951 3254
2952=item $success = $client->query ($flags, "text", \&cb) 3255=item $success = $client->query ($flags, "text", \&cb)
2953 3256
2954Queues a query to the client, calling the given callback with 3257Queues a query to the client, calling the given callback with
3009 my ($ns, $buf) = @_; 3312 my ($ns, $buf) = @_;
3010 3313
3011 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3314 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3012 3315
3013 if (ref $msg) { 3316 if (ref $msg) {
3014 my ($type, $reply, @payload) = 3317 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3015 "ARRAY" eq ref $msg
3016 ? @$msg
3017 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3018 3318
3019 my @reply; 3319 my @reply;
3020 3320
3021 if (my $cb = $EXTICMD{$type}) { 3321 if (my $cb = $EXTICMD{$type}) {
3022 @reply = $cb->($ns, @payload); 3322 @reply = $cb->($ns, @payload);
3024 3324
3025 $ns->ext_reply ($reply, @reply) 3325 $ns->ext_reply ($reply, @reply)
3026 if $reply; 3326 if $reply;
3027 3327
3028 } else { 3328 } else {
3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3329 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3030 } 3330 }
3031 3331
3032 cf::override; 3332 cf::override;
3033 }, 3333 },
3034); 3334);
3054 3354
3055 $coro 3355 $coro
3056} 3356}
3057 3357
3058cf::client->attach ( 3358cf::client->attach (
3059 on_destroy => sub { 3359 on_client_destroy => sub {
3060 my ($ns) = @_; 3360 my ($ns) = @_;
3061 3361
3062 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3362 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3063 }, 3363 },
3064); 3364);
3080our $safe_hole = new Safe::Hole; 3380our $safe_hole = new Safe::Hole;
3081 3381
3082$SIG{FPE} = 'IGNORE'; 3382$SIG{FPE} = 'IGNORE';
3083 3383
3084$safe->permit_only (Opcode::opset qw( 3384$safe->permit_only (Opcode::opset qw(
3085 :base_core :base_mem :base_orig :base_math 3385 :base_core :base_mem :base_orig :base_math :base_loop
3086 grepstart grepwhile mapstart mapwhile 3386 grepstart grepwhile mapstart mapwhile
3087 sort time 3387 sort time
3088)); 3388));
3089 3389
3090# here we export the classes and methods available to script code 3390# here we export the classes and methods available to script code
3094The following functions and methods are available within a safe environment: 3394The following functions and methods are available within a safe environment:
3095 3395
3096 cf::object 3396 cf::object
3097 contr pay_amount pay_player map x y force_find force_add destroy 3397 contr pay_amount pay_player map x y force_find force_add destroy
3098 insert remove name archname title slaying race decrease split 3398 insert remove name archname title slaying race decrease split
3399 value
3099 3400
3100 cf::object::player 3401 cf::object::player
3101 player 3402 player
3102 3403
3103 cf::player 3404 cf::player
3109=cut 3410=cut
3110 3411
3111for ( 3412for (
3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3413 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3113 insert remove inv nrof name archname title slaying race 3414 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)], 3415 decrease split destroy change_exp value msg lore send_msg)],
3115 ["cf::object::player" => qw(player)], 3416 ["cf::object::player" => qw(player)],
3116 ["cf::player" => qw(peaceful)], 3417 ["cf::player" => qw(peaceful send_msg)],
3117 ["cf::map" => qw(trigger)], 3418 ["cf::map" => qw(trigger)],
3118) { 3419) {
3119 no strict 'refs';
3120 my ($pkg, @funs) = @$_; 3420 my ($pkg, @funs) = @$_;
3121 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3421 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3122 for @funs; 3422 for @funs;
3123} 3423}
3124 3424
3139 3439
3140 my $qcode = $code; 3440 my $qcode = $code;
3141 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3441 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3142 $qcode =~ s/\n/\\n/g; 3442 $qcode =~ s/\n/\\n/g;
3143 3443
3444 %vars = (_dummy => 0) unless %vars;
3445
3446 my @res;
3144 local $_; 3447 local $_;
3145 local @safe::cf::_safe_eval_args = values %vars;
3146 3448
3147 my $eval = 3449 my $eval =
3148 "do {\n" 3450 "do {\n"
3149 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3451 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3150 . "#line 0 \"{$qcode}\"\n" 3452 . "#line 0 \"{$qcode}\"\n"
3151 . $code 3453 . $code
3152 . "\n}" 3454 . "\n}"
3153 ; 3455 ;
3154 3456
3457 if ($CFG{safe_eval}) {
3155 sub_generation_inc; 3458 sub_generation_inc;
3459 local @safe::cf::_safe_eval_args = values %vars;
3156 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3460 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3157 sub_generation_inc; 3461 sub_generation_inc;
3462 } else {
3463 local @cf::_safe_eval_args = values %vars;
3464 @res = wantarray ? eval eval : scalar eval $eval;
3465 }
3158 3466
3159 if ($@) { 3467 if ($@) {
3160 warn "$@"; 3468 warn "$@",
3161 warn "while executing safe code '$code'\n"; 3469 "while executing safe code '$code'\n",
3162 warn "with arguments " . (join " ", %vars) . "\n"; 3470 "with arguments " . (join " ", %vars) . "\n";
3163 } 3471 }
3164 3472
3165 wantarray ? @res : $res[0] 3473 wantarray ? @res : $res[0]
3166} 3474}
3167 3475
3181=cut 3489=cut
3182 3490
3183sub register_script_function { 3491sub register_script_function {
3184 my ($fun, $cb) = @_; 3492 my ($fun, $cb) = @_;
3185 3493
3186 no strict 'refs'; 3494 $fun = "safe::$fun" if $CFG{safe_eval};
3187 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3495 *$fun = $safe_hole->wrap ($cb);
3188} 3496}
3189 3497
3190=back 3498=back
3191 3499
3192=cut 3500=cut
3193 3501
3194############################################################################# 3502#############################################################################
3195# the server's init and main functions 3503# the server's init and main functions
3504
3505our %FACEHASH; # hash => idx, #d# HACK for http server
3506
3507# internal api, not fianlised
3508sub add_face {
3509 my ($name, $type, $data) = @_;
3510
3511 my $idx = cf::face::find $name;
3512
3513 if ($idx) {
3514 delete $FACEHASH{cf::face::get_chksum $idx};
3515 } else {
3516 $idx = cf::face::alloc $name;
3517 }
3518
3519 my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3520
3521 cf::face::set_type $idx, $type;
3522 cf::face::set_data $idx, 0, $data, $hash;
3523 cf::face::set_meta $idx, $type & 1 ? undef : undef;
3524 $FACEHASH{$hash} = $idx;#d#
3525
3526 $idx
3527}
3196 3528
3197sub load_facedata($) { 3529sub load_facedata($) {
3198 my ($path) = @_; 3530 my ($path) = @_;
3199 3531
3200 # HACK to clear player env face cache, we need some signal framework 3532 # HACK to clear player env face cache, we need some signal framework
3201 # for this (global event?) 3533 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = (); 3534 %ext::player_env::MUSIC_FACE_CACHE = ();
3203 3535
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3536 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205 3537
3206 warn "loading facedata from $path\n"; 3538 trace "loading facedata from $path\n";
3207 3539
3208 my $facedata; 3540 my $facedata = decode_storable load_file $path;
3209 0 < aio_load $path, $facedata
3210 or die "$path: $!";
3211
3212 $facedata = Coro::Storable::thaw $facedata;
3213 3541
3214 $facedata->{version} == 2 3542 $facedata->{version} == 2
3215 or cf::cleanup "$path: version mismatch, cannot proceed."; 3543 or cf::cleanup "$path: version mismatch, cannot proceed.";
3216 3544
3217 # patch in the exptable
3218 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3221 };
3222 cf::cede_to_tick; 3545 cf::cede_to_tick;
3223 3546
3224 { 3547 {
3225 my $faces = $facedata->{faceinfo}; 3548 my $faces = $facedata->{faceinfo};
3226 3549
3227 while (my ($face, $info) = each %$faces) { 3550 for my $face (sort keys %$faces) {
3551 my $info = $faces->{$face};
3228 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3552 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229 3553
3230 cf::face::set_visibility $idx, $info->{visibility}; 3554 cf::face::set_visibility $idx, $info->{visibility};
3231 cf::face::set_magicmap $idx, $info->{magicmap}; 3555 cf::face::set_magicmap $idx, $info->{magicmap};
3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3556 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3557 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3558 cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3559 $FACEHASH{$info->{hash64}} = $idx;#d#
3234 3560
3235 cf::cede_to_tick; 3561 cf::cede_to_tick;
3236 } 3562 }
3237 3563
3238 while (my ($face, $info) = each %$faces) { 3564 while (my ($face, $info) = each %$faces) {
3243 3569
3244 if (my $smooth = cf::face::find $info->{smooth}) { 3570 if (my $smooth = cf::face::find $info->{smooth}) {
3245 cf::face::set_smooth $idx, $smooth; 3571 cf::face::set_smooth $idx, $smooth;
3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3572 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3247 } else { 3573 } else {
3248 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3574 error "smooth face '$info->{smooth}' not found for face '$face'";
3249 } 3575 }
3250 3576
3251 cf::cede_to_tick; 3577 cf::cede_to_tick;
3252 } 3578 }
3253 } 3579 }
3262 3588
3263 cf::anim::invalidate_all; # d'oh 3589 cf::anim::invalidate_all; # d'oh
3264 } 3590 }
3265 3591
3266 { 3592 {
3267 # TODO: for gcfclient pleasure, we should give resources
3268 # that gcfclient doesn't grok a >10000 face index.
3269 my $res = $facedata->{resource}; 3593 my $res = $facedata->{resource};
3270 3594
3271 while (my ($name, $info) = each %$res) { 3595 while (my ($name, $info) = each %$res) {
3272 if (defined $info->{type}) { 3596 if (defined (my $type = $info->{type})) {
3597 # TODO: different hash - must free and use new index, or cache ixface data queue
3273 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3598 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
3275 3599
3276 if ($info->{type} & 1) {
3277 # prepend meta info
3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
3284 $data = pack "(w/a*)*", $meta, $info->{data};
3285 } else {
3286 $data = $info->{data};
3287 }
3288
3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type}; 3600 cf::face::set_type $idx, $type;
3601 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3602 cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3603 $FACEHASH{$info->{hash}} = $idx;#d#
3291 } else { 3604 } else {
3292 $RESOURCE{$name} = $info; 3605# $RESOURCE{$name} = $info; # unused
3293 } 3606 }
3294 3607
3295 cf::cede_to_tick; 3608 cf::cede_to_tick;
3296 } 3609 }
3297 } 3610 }
3298 3611
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3612 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3300 3613
3301 1 3614 1
3302} 3615}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
3323 3616
3324register_exticmd fx_want => sub { 3617register_exticmd fx_want => sub {
3325 my ($ns, $want) = @_; 3618 my ($ns, $want) = @_;
3326 3619
3327 while (my ($k, $v) = each %$want) { 3620 while (my ($k, $v) = each %$want) {
3335 my $status = load_resource_file_ $_[0]; 3628 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100; 3629 get_slot 0.1, 100;
3337 cf::arch::commit_load; 3630 cf::arch::commit_load;
3338 3631
3339 $status 3632 $status
3633}
3634
3635sub reload_exp_table {
3636 _reload_exp_table;
3637
3638 add_face "res/exp_table" => FT_RSRC,
3639 JSON::XS->new->utf8->canonical->encode (
3640 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3641 );
3642}
3643
3644sub reload_materials {
3645 _reload_materials;
3340} 3646}
3341 3647
3342sub reload_regions { 3648sub reload_regions {
3343 # HACK to clear player env face cache, we need some signal framework 3649 # HACK to clear player env face cache, we need some signal framework
3344 # for this (global event?) 3650 # for this (global event?)
3359} 3665}
3360 3666
3361sub reload_archetypes { 3667sub reload_archetypes {
3362 load_resource_file "$DATADIR/archetypes" 3668 load_resource_file "$DATADIR/archetypes"
3363 or die "unable to load archetypes\n"; 3669 or die "unable to load archetypes\n";
3670
3671 add_face "res/skill_info" => FT_RSRC,
3672 JSON::XS->new->utf8->canonical->encode (
3673 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3674 );
3675 add_face "res/spell_paths" => FT_RSRC,
3676 JSON::XS->new->utf8->canonical->encode (
3677 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3678 );
3364} 3679}
3365 3680
3366sub reload_treasures { 3681sub reload_treasures {
3367 load_resource_file "$DATADIR/treasures" 3682 load_resource_file "$DATADIR/treasures"
3368 or die "unable to load treasurelists\n"; 3683 or die "unable to load treasurelists\n";
3369} 3684}
3370 3685
3686sub reload_sound {
3687 trace "loading sound config from $DATADIR/sound\n";
3688
3689 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3690
3691 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3692 my $sound = $soundconf->{compat}[$_]
3693 or next;
3694
3695 my $face = cf::face::find "sound/$sound->[1]";
3696 cf::sound::set $sound->[0] => $face;
3697 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3698 }
3699
3700 while (my ($k, $v) = each %{$soundconf->{event}}) {
3701 my $face = cf::face::find "sound/$v";
3702 cf::sound::set $k => $face;
3703 }
3704}
3705
3706sub reload_pod {
3707 trace "loading pods $PODDIR\n";
3708
3709 my @command_help;
3710
3711 for (
3712 [0, "command_help"],
3713 [1, "emote_help"],
3714 [2, "dmcommand_help"],
3715 ) {
3716 my ($type, $path) = @$_;
3717
3718 my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
3719 or die "unable to load $path";
3720
3721 my $level = 1e9;
3722
3723 for my $par (@$paragraphs) {
3724 if ($par->{type} eq "head2") {
3725 # this code taken almost verbatim from DC/Protocol.pm
3726
3727 if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
3728 my $cmd = $1;
3729 my @args = split /\|/, $2;
3730 @args = (".*") unless @args;
3731
3732 $_ = $_ eq ".*" ? "" : " $_"
3733 for @args;
3734
3735 my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
3736
3737 push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
3738 $level = $par->{level};
3739 } else {
3740 error "$par->{markup}: unparsable command heading";
3741 }
3742 } elsif ($par->{level} > $level) {
3743 $command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
3744 }
3745
3746 cf::cede_to_tick;
3747 }
3748 }
3749
3750 @command_help = sort {
3751 $a->[0] <=> $b->[0]
3752 or $a->[1] cmp $b->[1]
3753 } @command_help;
3754
3755 cf::cede_to_tick;
3756
3757 add_face "res/command_help" => FT_RSRC,
3758 JSON::XS->new->utf8->encode (\@command_help);
3759}
3760
3371sub reload_resources { 3761sub reload_resources {
3372 warn "reloading resource files...\n"; 3762 trace "reloading resource files...\n";
3373 3763
3764 reload_materials;
3374 reload_facedata; 3765 reload_facedata;
3766 reload_exp_table;
3767 reload_sound;
3375 reload_archetypes; 3768 reload_archetypes;
3376 reload_regions; 3769 reload_regions;
3377 reload_treasures; 3770 reload_treasures;
3771 reload_pod;
3378 3772
3379 warn "finished reloading resource files\n"; 3773 trace "finished reloading resource files\n";
3380} 3774}
3381 3775
3382sub reload_config { 3776sub reload_config {
3383 open my $fh, "<:utf8", "$CONFDIR/config" 3777 trace "reloading config file...\n";
3384 or return;
3385 3778
3386 local $/; 3779 my $config = load_file "$CONFDIR/config";
3387 *CFG = YAML::Load <$fh>; 3780 utf8::decode $config;
3781 *CFG = decode_yaml $config;
3388 3782
3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3783 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3390 3784
3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3785 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3786 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3393 3787
3394 if (exists $CFG{mlockall}) { 3788 if (exists $CFG{mlockall}) {
3417 3811
3418 seek $fh, 0, 0; 3812 seek $fh, 0, 0;
3419 print $fh $$; 3813 print $fh $$;
3420} 3814}
3421 3815
3816sub main_loop {
3817 trace "EV::loop starting\n";
3818 if (1) {
3819 EV::loop;
3820 }
3821 trace "EV::loop returned\n";
3822 goto &main_loop unless $REALLY_UNLOOP;
3823}
3824
3422sub main { 3825sub main {
3423 cf::init_globals; # initialise logging 3826 cf::init_globals; # initialise logging
3424 3827
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3828 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3829 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3830 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3831 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429 3832
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3833 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437 3834
3438 # we must not ever block the main coroutine 3835 # we must not ever block the main coroutine
3439 local $Coro::idle = sub { 3836 $Coro::idle = sub {
3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3837 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3441 (async { 3838 (async {
3442 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3839 $Coro::current->{desc} = "IDLE BUG HANDLER";
3443 EV::loop EV::LOOP_ONESHOT; 3840 EV::loop EV::LOOP_ONESHOT;
3444 })->prio (Coro::PRIO_MAX); 3841 })->prio (Coro::PRIO_MAX);
3445 }; 3842 };
3446 3843
3447 evthread_start IO::AIO::poll_fileno; 3844 evthread_start IO::AIO::poll_fileno;
3448 3845
3449 cf::sync_job { 3846 cf::sync_job {
3847 cf::incloader::init ();
3848
3849 db_init;
3850
3851 cf::init_anim;
3852 cf::init_attackmess;
3853 cf::init_dynamic;
3854
3855 cf::load_settings;
3856
3450 reload_resources; 3857 reload_resources;
3451 reload_config; 3858 reload_config;
3452 db_init;
3453 3859
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid; 3860 cf::init_uuid;
3457 cf::init_signals; 3861 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills; 3862 cf::init_skills;
3460 3863
3461 cf::init_beforeplay; 3864 cf::init_beforeplay;
3462 3865
3463 atomic; 3866 atomic;
3465 load_extensions; 3868 load_extensions;
3466 3869
3467 utime time, time, $RUNTIMEFILE; 3870 utime time, time, $RUNTIMEFILE;
3468 3871
3469 # no (long-running) fork's whatsoever before this point(!) 3872 # no (long-running) fork's whatsoever before this point(!)
3873 use POSIX ();
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3874 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471 3875
3472 (pop @POST_INIT)->(0) while @POST_INIT; 3876 cf::_post_init 0;
3473 }; 3877 };
3474 3878
3475 EV::loop; 3879 cf::object::thawer::errors_are_fatal 0;
3880 info "parse errors in files are no longer fatal from this point on.\n";
3881
3882 AE::postpone {
3883 undef &main; # free gobs of memory :)
3884 };
3885
3886 goto &main_loop;
3476} 3887}
3477 3888
3478############################################################################# 3889#############################################################################
3479# initialisation and cleanup 3890# initialisation and cleanup
3480 3891
3481# install some emergency cleanup handlers 3892# install some emergency cleanup handlers
3482BEGIN { 3893BEGIN {
3483 our %SIGWATCHER = (); 3894 our %SIGWATCHER = ();
3484 for my $signal (qw(INT HUP TERM)) { 3895 for my $signal (qw(INT HUP TERM)) {
3485 $SIGWATCHER{$signal} = EV::signal $signal, sub { 3896 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3486 cf::cleanup "SIG$signal"; 3897 cf::cleanup "SIG$signal";
3487 }; 3898 };
3488 } 3899 }
3489} 3900}
3490 3901
3491sub write_runtime_sync { 3902sub write_runtime_sync {
3903 my $t0 = AE::time;
3904
3492 # first touch the runtime file to show we are still running: 3905 # first touch the runtime file to show we are still running:
3493 # the fsync below can take a very very long time. 3906 # the fsync below can take a very very long time.
3494 3907
3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 3908 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3496 3909
3497 my $guard = cf::lock_acquire "write_runtime"; 3910 my $guard = cf::lock_acquire "write_runtime";
3498 3911
3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 3912 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3500 or return; 3913 or return;
3501 3914
3502 my $value = $cf::RUNTIME + 90 + 10; 3915 my $value = $cf::RUNTIME + 90 + 10;
3503 # 10 is the runtime save interval, for a monotonic clock 3916 # 10 is the runtime save interval, for a monotonic clock
3504 # 60 allows for the watchdog to kill the server. 3917 # 60 allows for the watchdog to kill the server.
3517 or return; 3930 or return;
3518 3931
3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 3932 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3520 and return; 3933 and return;
3521 3934
3522 warn "runtime file written.\n"; 3935 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3523 3936
3524 1 3937 1
3525} 3938}
3526 3939
3527our $uuid_lock; 3940our $uuid_lock;
3539 or return; 3952 or return;
3540 3953
3541 my $value = uuid_seq uuid_cur; 3954 my $value = uuid_seq uuid_cur;
3542 3955
3543 unless ($value) { 3956 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n"; 3957 info "cowardly refusing to write zero uuid value!\n";
3545 return; 3958 return;
3546 } 3959 }
3547 3960
3548 my $value = uuid_str $value + $uuid_skip; 3961 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0; 3962 $uuid_skip = 0;
3559 or return; 3972 or return;
3560 3973
3561 aio_rename "$uuid~", $uuid 3974 aio_rename "$uuid~", $uuid
3562 and return; 3975 and return;
3563 3976
3564 warn "uuid file written ($value).\n"; 3977 trace "uuid file written ($value).\n";
3565 3978
3566 1 3979 1
3567 3980
3568} 3981}
3569 3982
3575} 3988}
3576 3989
3577sub emergency_save() { 3990sub emergency_save() {
3578 my $freeze_guard = cf::freeze_mainloop; 3991 my $freeze_guard = cf::freeze_mainloop;
3579 3992
3580 warn "emergency_perl_save: enter\n"; 3993 info "emergency_perl_save: enter\n";
3994
3995 # this is a trade-off: we want to be very quick here, so
3996 # save all maps without fsync, and later call a global sync
3997 # (which in turn might be very very slow)
3998 local $USE_FSYNC = 0;
3581 3999
3582 cf::sync_job { 4000 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so 4001 cf::write_runtime_sync; # external watchdog should not bark
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587 4002
3588 # use a peculiar iteration method to avoid tripping on perl 4003 # use a peculiar iteration method to avoid tripping on perl
3589 # refcount bugs in for. also avoids problems with players 4004 # refcount bugs in for. also avoids problems with players
3590 # and maps saved/destroyed asynchronously. 4005 # and maps saved/destroyed asynchronously.
3591 warn "emergency_perl_save: begin player save\n"; 4006 info "emergency_perl_save: begin player save\n";
3592 for my $login (keys %cf::PLAYER) { 4007 for my $login (keys %cf::PLAYER) {
3593 my $pl = $cf::PLAYER{$login} or next; 4008 my $pl = $cf::PLAYER{$login} or next;
3594 $pl->valid or next; 4009 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4010 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3596 $pl->save; 4011 $pl->save;
3597 } 4012 }
3598 warn "emergency_perl_save: end player save\n"; 4013 info "emergency_perl_save: end player save\n";
3599 4014
4015 cf::write_runtime_sync; # external watchdog should not bark
4016
3600 warn "emergency_perl_save: begin map save\n"; 4017 info "emergency_perl_save: begin map save\n";
3601 for my $path (keys %cf::MAP) { 4018 for my $path (keys %cf::MAP) {
3602 my $map = $cf::MAP{$path} or next; 4019 my $map = $cf::MAP{$path} or next;
3603 $map->valid or next; 4020 $map->valid or next;
3604 $map->save; 4021 $map->save;
3605 } 4022 }
3606 warn "emergency_perl_save: end map save\n"; 4023 info "emergency_perl_save: end map save\n";
3607 4024
4025 cf::write_runtime_sync; # external watchdog should not bark
4026
3608 warn "emergency_perl_save: begin database checkpoint\n"; 4027 info "emergency_perl_save: begin database checkpoint\n";
3609 BDB::db_env_txn_checkpoint $DB_ENV; 4028 BDB::db_env_txn_checkpoint $DB_ENV;
3610 warn "emergency_perl_save: end database checkpoint\n"; 4029 info "emergency_perl_save: end database checkpoint\n";
3611 4030
3612 warn "emergency_perl_save: begin write uuid\n"; 4031 info "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1; 4032 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n"; 4033 info "emergency_perl_save: end write uuid\n";
4034
4035 cf::write_runtime_sync; # external watchdog should not bark
4036
4037 trace "emergency_perl_save: syncing database to disk";
4038 BDB::db_env_txn_checkpoint $DB_ENV;
4039
4040 info "emergency_perl_save: starting sync\n";
4041 IO::AIO::aio_sync sub {
4042 info "emergency_perl_save: finished sync\n";
4043 };
4044
4045 cf::write_runtime_sync; # external watchdog should not bark
4046
4047 trace "emergency_perl_save: flushing outstanding aio requests";
4048 while (IO::AIO::nreqs || BDB::nreqs) {
4049 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4050 }
4051
4052 cf::write_runtime_sync; # external watchdog should not bark
3615 }; 4053 };
3616 4054
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3622 warn "emergency_perl_save: leave\n"; 4055 info "emergency_perl_save: leave\n";
3623} 4056}
3624 4057
3625sub post_cleanup { 4058sub post_cleanup {
3626 my ($make_core) = @_; 4059 my ($make_core) = @_;
3627 4060
4061 IO::AIO::flush;
4062
3628 warn Carp::longmess "post_cleanup backtrace" 4063 error Carp::longmess "post_cleanup backtrace"
3629 if $make_core; 4064 if $make_core;
3630 4065
3631 my $fh = pidfile; 4066 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$; 4067 unlink $PIDFILE if <$fh> == $$;
3633} 4068}
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4088 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) { 4089 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"}; 4090 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4091# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 } 4092 }
3658 warn "cleared package $pkg\n";#d#
3659} 4093}
3660 4094
3661sub do_reload_perl() { 4095sub do_reload_perl() {
3662 # can/must only be called in main 4096 # can/must only be called in main
3663 if ($Coro::current != $Coro::main) { 4097 unless (in_main) {
3664 warn "can only reload from main coroutine"; 4098 error "can only reload from main coroutine";
3665 return; 4099 return;
3666 } 4100 }
3667 4101
3668 return if $RELOAD++; 4102 return if $RELOAD++;
3669 4103
3670 my $t1 = EV::time; 4104 my $t1 = AE::time;
3671 4105
3672 while ($RELOAD) { 4106 while ($RELOAD) {
3673 warn "reloading..."; 4107 cf::get_slot 0.1, -1, "reload_perl";
4108 info "perl_reload: reloading...";
3674 4109
3675 warn "entering sync_job"; 4110 trace "perl_reload: entering sync_job";
3676 4111
3677 cf::sync_job { 4112 cf::sync_job {
3678 cf::write_runtime_sync; # external watchdog should not bark
3679 cf::emergency_save; 4113 #cf::emergency_save;
3680 cf::write_runtime_sync; # external watchdog should not bark
3681 4114
3682 warn "syncing database to disk";
3683 BDB::db_env_txn_checkpoint $DB_ENV;
3684
3685 # if anything goes wrong in here, we should simply crash as we already saved
3686
3687 warn "flushing outstanding aio requests";
3688 while (IO::AIO::nreqs || BDB::nreqs) {
3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3690 }
3691
3692 warn "cancelling all extension coros"; 4115 trace "perl_reload: cancelling all extension coros";
3693 $_->cancel for values %EXT_CORO; 4116 $_->cancel for values %EXT_CORO;
3694 %EXT_CORO = (); 4117 %EXT_CORO = ();
3695 4118
3696 warn "removing commands"; 4119 trace "perl_reload: removing commands";
3697 %COMMAND = (); 4120 %COMMAND = ();
3698 4121
3699 warn "removing ext/exti commands"; 4122 trace "perl_reload: removing ext/exti commands";
3700 %EXTCMD = (); 4123 %EXTCMD = ();
3701 %EXTICMD = (); 4124 %EXTICMD = ();
3702 4125
3703 warn "unloading/nuking all extensions"; 4126 trace "perl_reload: unloading/nuking all extensions";
3704 for my $pkg (@EXTS) { 4127 for my $pkg (@EXTS) {
3705 warn "... unloading $pkg"; 4128 trace "... unloading $pkg";
3706 4129
3707 if (my $cb = $pkg->can ("unload")) { 4130 if (my $cb = $pkg->can ("unload")) {
3708 eval { 4131 eval {
3709 $cb->($pkg); 4132 $cb->($pkg);
3710 1 4133 1
3711 } or warn "$pkg unloaded, but with errors: $@"; 4134 } or error "$pkg unloaded, but with errors: $@";
3712 } 4135 }
3713 4136
3714 warn "... clearing $pkg"; 4137 trace "... clearing $pkg";
3715 clear_package $pkg; 4138 clear_package $pkg;
3716 } 4139 }
3717 4140
3718 warn "unloading all perl modules loaded from $LIBDIR"; 4141 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) { 4142 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4143 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721 4144
3722 warn "... unloading $k"; 4145 trace "... unloading $k";
3723 delete $INC{$k}; 4146 delete $INC{$k};
3724 4147
3725 $k =~ s/\.pm$//; 4148 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g; 4149 $k =~ s/\//::/g;
3727 4150
3730 } 4153 }
3731 4154
3732 clear_package $k; 4155 clear_package $k;
3733 } 4156 }
3734 4157
3735 warn "getting rid of safe::, as good as possible"; 4158 trace "perl_reload: getting rid of safe::, as good as possible";
3736 clear_package "safe::$_" 4159 clear_package "safe::$_"
3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4160 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3738 4161
3739 warn "unloading cf.pm \"a bit\""; 4162 trace "perl_reload: unloading cf.pm \"a bit\"";
3740 delete $INC{"cf.pm"}; 4163 delete $INC{"cf.pm"};
3741 delete $INC{"cf/pod.pm"}; 4164 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3742 4165
3743 # don't, removes xs symbols, too, 4166 # don't, removes xs symbols, too,
3744 # and global variables created in xs 4167 # and global variables created in xs
3745 #clear_package __PACKAGE__; 4168 #clear_package __PACKAGE__;
3746 4169
3747 warn "unload completed, starting to reload now"; 4170 info "perl_reload: unload completed, starting to reload now";
3748 4171
3749 warn "reloading cf.pm"; 4172 trace "perl_reload: reloading cf.pm";
3750 require cf; 4173 require cf;
3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 4174 cf::_connect_to_perl_1;
3752 4175
3753 warn "loading config and database again"; 4176 trace "perl_reload: loading config and database again";
3754 cf::reload_config; 4177 cf::reload_config;
3755 4178
3756 warn "loading extensions"; 4179 trace "perl_reload: loading extensions";
3757 cf::load_extensions; 4180 cf::load_extensions;
3758 4181
3759 if ($REATTACH_ON_RELOAD) { 4182 if ($REATTACH_ON_RELOAD) {
3760 warn "reattaching attachments to objects/players"; 4183 trace "perl_reload: reattaching attachments to objects/players";
3761 _global_reattach; # objects, sockets 4184 _global_reattach; # objects, sockets
3762 warn "reattaching attachments to maps"; 4185 trace "perl_reload: reattaching attachments to maps";
3763 reattach $_ for values %MAP; 4186 reattach $_ for values %MAP;
3764 warn "reattaching attachments to players"; 4187 trace "perl_reload: reattaching attachments to players";
3765 reattach $_ for values %PLAYER; 4188 reattach $_ for values %PLAYER;
3766 } 4189 }
3767 4190
3768 warn "running post_init jobs"; 4191 cf::_post_init 1;
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770 4192
3771 warn "leaving sync_job"; 4193 trace "perl_reload: leaving sync_job";
3772 4194
3773 1 4195 1
3774 } or do { 4196 } or do {
3775 warn $@; 4197 error $@;
3776 cf::cleanup "error while reloading, exiting."; 4198 cf::cleanup "perl_reload: error, exiting.";
3777 }; 4199 };
3778 4200
3779 warn "reloaded";
3780 --$RELOAD; 4201 --$RELOAD;
3781 } 4202 }
3782 4203
3783 $t1 = EV::time - $t1; 4204 $t1 = AE::time - $t1;
3784 warn "reload completed in ${t1}s\n"; 4205 info "perl_reload: completed in ${t1}s\n";
3785}; 4206};
3786 4207
3787our $RELOAD_WATCHER; # used only during reload 4208our $RELOAD_WATCHER; # used only during reload
3788 4209
3789sub reload_perl() { 4210sub reload_perl() {
3791 # coro crashes during coro_state_free->destroy here. 4212 # coro crashes during coro_state_free->destroy here.
3792 4213
3793 $RELOAD_WATCHER ||= cf::async { 4214 $RELOAD_WATCHER ||= cf::async {
3794 Coro::AIO::aio_wait cache_extensions; 4215 Coro::AIO::aio_wait cache_extensions;
3795 4216
3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4217 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3797 do_reload_perl; 4218 do_reload_perl;
3798 undef $RELOAD_WATCHER; 4219 undef $RELOAD_WATCHER;
3799 }; 4220 };
3800 }; 4221 };
3801} 4222}
3810 reload_perl; 4231 reload_perl;
3811 }; 4232 };
3812 } 4233 }
3813}; 4234};
3814 4235
3815unshift @INC, $LIBDIR; 4236#############################################################################
3816 4237
3817my $bug_warning = 0; 4238my $bug_warning = 0;
3818 4239
3819our @WAIT_FOR_TICK;
3820our @WAIT_FOR_TICK_BEGIN;
3821
3822sub wait_for_tick { 4240sub wait_for_tick() {
3823 return if tick_inhibit || $Coro::current == $Coro::main; 4241 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3824 4242
3825 my $signal = new Coro::Signal; 4243 $WAIT_FOR_TICK->wait;
3826 push @WAIT_FOR_TICK, $signal;
3827 $signal->wait;
3828} 4244}
3829 4245
3830sub wait_for_tick_begin { 4246sub wait_for_tick_begin() {
3831 return if tick_inhibit || $Coro::current == $Coro::main; 4247 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3832 4248
3833 my $signal = new Coro::Signal; 4249 my $signal = new Coro::Signal;
3834 push @WAIT_FOR_TICK_BEGIN, $signal; 4250 push @WAIT_FOR_TICK_BEGIN, $signal;
3835 $signal->wait; 4251 $signal->wait;
3836} 4252}
3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4256 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3841 unless ++$bug_warning > 10; 4257 unless ++$bug_warning > 10;
3842 return; 4258 return;
3843 } 4259 }
3844 4260
3845 cf::server_tick; # one server iteration 4261 cf::one_tick; # one server iteration
4262
4263 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3846 4264
3847 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4265 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4266 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3849 Coro::async_pool { 4267 Coro::async_pool {
3850 $Coro::current->{desc} = "runtime saver"; 4268 $Coro::current->{desc} = "runtime saver";
3851 write_runtime_sync 4269 write_runtime_sync
3852 or warn "ERROR: unable to write runtime file: $!"; 4270 or error "ERROR: unable to write runtime file: $!";
3853 }; 4271 };
3854 } 4272 }
3855 4273
3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4274 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3857 $sig->send; 4275 $sig->send;
3858 } 4276 }
3859 while (my $sig = shift @WAIT_FOR_TICK) { 4277 $WAIT_FOR_TICK->broadcast;
3860 $sig->send;
3861 }
3862 4278
3863 $LOAD = ($NOW - $TICK_START) / $TICK; 4279 $LOAD = ($NOW - $TICK_START) / $TICK;
3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4280 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3865 4281
3866 if (0) { 4282 if (0) {
3867 if ($NEXT_TICK) { 4283 if ($NEXT_TICK) {
3868 my $jitter = $TICK_START - $NEXT_TICK; 4284 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4285 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d# 4286 debug "jitter $JITTER\n";#d#
3871 } 4287 }
3872 } 4288 }
3873} 4289}
3874 4290
3875{ 4291{
3876 # configure BDB 4292 # configure BDB
4293 info "initialising database";
3877 4294
3878 BDB::min_parallel 8; 4295 BDB::min_parallel 16;
3879 BDB::max_poll_reqs $TICK * 0.1; 4296 BDB::max_poll_reqs $TICK * 0.1;
3880 $AnyEvent::BDB::WATCHER->priority (1); 4297 #$AnyEvent::BDB::WATCHER->priority (1);
3881 4298
3882 unless ($DB_ENV) { 4299 unless ($DB_ENV) {
3883 $DB_ENV = BDB::db_env_create; 4300 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4301 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4302 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4327 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3911 }; 4328 };
3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4329 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4330 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3914 }; 4331 };
4332
4333 info "database initialised";
3915} 4334}
3916 4335
3917{ 4336{
3918 # configure IO::AIO 4337 # configure IO::AIO
3919 4338
4339 info "initialising aio";
3920 IO::AIO::min_parallel 8; 4340 IO::AIO::min_parallel 8;
3921 IO::AIO::max_poll_time $TICK * 0.1; 4341 IO::AIO::max_poll_time $TICK * 0.1;
3922 undef $AnyEvent::AIO::WATCHER; 4342 undef $AnyEvent::AIO::WATCHER;
4343 info "aio initialised";
3923} 4344}
3924 4345
3925my $_log_backtrace; 4346our $_log_backtrace;
4347our $_log_backtrace_last;
3926 4348
3927sub _log_backtrace { 4349sub _log_backtrace {
3928 my ($msg, @addr) = @_; 4350 my ($msg, @addr) = @_;
3929 4351
3930 $msg =~ s/\n//; 4352 $msg =~ s/\n$//;
3931 4353
4354 if ($_log_backtrace_last eq $msg) {
4355 LOG llevInfo, "[ABT] $msg\n";
4356 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3932 # limit the # of concurrent backtraces 4357 # limit the # of concurrent backtraces
3933 if ($_log_backtrace < 2) { 4358 } elsif ($_log_backtrace < 2) {
4359 $_log_backtrace_last = $msg;
3934 ++$_log_backtrace; 4360 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg; 4361 my $perl_bt = Carp::longmess $msg;
3936 async { 4362 async {
3937 $Coro::current->{desc} = "abt $msg"; 4363 $Coro::current->{desc} = "abt $msg";
3938 4364
3958 LOG llevInfo, "[ABT] $_\n" for @bt; 4384 LOG llevInfo, "[ABT] $_\n" for @bt;
3959 --$_log_backtrace; 4385 --$_log_backtrace;
3960 }; 4386 };
3961 } else { 4387 } else {
3962 LOG llevInfo, "[ABT] $msg\n"; 4388 LOG llevInfo, "[ABT] $msg\n";
3963 LOG llevInfo, "[ABT] [suppressed]\n"; 4389 LOG llevInfo, "[ABT] [overload, suppressed]\n";
3964 } 4390 }
3965} 4391}
3966 4392
3967# load additional modules 4393# load additional modules
3968use cf::pod; 4394require "cf/$_.pm" for @EXTRA_MODULES;
4395cf::_connect_to_perl_2;
3969 4396
3970END { cf::emergency_save } 4397END { cf::emergency_save }
3971 4398
39721 43991
3973 4400

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines