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.493 by root, Mon Oct 26 02:34:37 2009 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 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 it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# 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 Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# 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>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Digest::MD5;
59use Fcntl; 60use Fcntl;
60use YAML::XS (); 61use YAML::XS ();
62use CBOR::XS ();
61use IO::AIO (); 63use IO::AIO ();
62use Time::HiRes;
63use Compress::LZF; 64use Compress::LZF;
64use Digest::MD5 (); 65use Digest::MD5 ();
65 66
66AnyEvent::detect; 67AnyEvent::detect;
67 68
79# strictly for debugging 80# strictly for debugging
80$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
81 82
82sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
83 84
85our @ORIG_INC;
86
84our %COMMAND = (); 87our %COMMAND = ();
85our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
86 89
87our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
88our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
89our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
90our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
91our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
92 97
93our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
94our @EVENT; 99our @EVENT;
95our @REFLECT; # set by XS 100our @REFLECT; # set by XS
96our %REFLECT; # set by us 101our %REFLECT; # set by us
97 102
98our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
99our $DATADIR = datadir; 105our $DATADIR = datadir;
100our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
101our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
102our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
103our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
104our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
105our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
106our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
107our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
108our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
109our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
110our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
111 118
112our %RESOURCE; 119#our %RESOURCE; # unused
120
121our $OUTPUT_RATE_MIN = 3000;
122our $OUTPUT_RATE_MAX = 1000000;
123
124our $MAX_LINKS = 32; # how many chained exits to follow
125our $VERBOSE_IO = 1;
113 126
114our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 127our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
115our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 128our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
116our $NEXT_TICK; 129our $NEXT_TICK;
117our $USE_FSYNC = 1; # use fsync to write maps - default on 130our $USE_FSYNC = 1; # use fsync to write maps - default on
119our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
120our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
121our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
122our $DB_ENV; 135our $DB_ENV;
123 136
124our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
125 138
126our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
127 141
128our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
129our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
130our $NOW; 145our $NOW;
131 146
132our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
133our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
134our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
143 158
144our @POST_INIT; 159our @POST_INIT;
145 160
146our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
147our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
148 166
149binmode STDOUT; 167binmode STDOUT;
150binmode STDERR; 168binmode STDERR;
151 169
152# read virtual server time, if available 170# read virtual server time, if available
163 181
164our $EMERGENCY_POSITION; 182our $EMERGENCY_POSITION;
165 183
166sub cf::map::normalise; 184sub cf::map::normalise;
167 185
186sub in_main() {
187 $Coro::current == $Coro::main
188}
189
168############################################################################# 190#############################################################################
169 191
170%REFLECT = (); 192%REFLECT = ();
171for (@REFLECT) { 193for (@REFLECT) {
172 my $reflect = JSON::XS::decode_json $_; 194 my $reflect = JSON::XS::decode_json $_;
182 204
183=over 4 205=over 4
184 206
185=item $cf::UPTIME 207=item $cf::UPTIME
186 208
187The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
188 225
189=item $cf::RUNTIME 226=item $cf::RUNTIME
190 227
191The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
192every server tick. 229every server tick.
193 230
194=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
195$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
196$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
197 234
198Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
199directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
200unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
201database environment. 238database environment.
202 239
203=item $cf::NOW
204
205The time of the last (current) server tick.
206
207=item $cf::TICK
208
209The interval between server ticks, in seconds.
210
211=item $cf::LOADAVG 240=item $cf::LOADAVG
212 241
213The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
214(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
215objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
223Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
224from wherever your confdir points to. 253from wherever your confdir points to.
225 254
226=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
227 256
228These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
229returns directly I<after> the tick processing (and consequently, can only wake one process 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
230per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
273
274=cut
275
276sub wait_for_tick();
277sub wait_for_tick_begin();
231 278
232=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
233 280
234This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
235C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 282C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
243 290
244=back 291=back
245 292
246=cut 293=cut
247 294
295sub error(@) { LOG llevError, join "", @_ }
296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
248$Coro::State::WARNHOOK = sub { 301$Coro::State::WARNHOOK = sub {
249 my $msg = join "", @_; 302 my $msg = join "", @_;
250 303
251 $msg .= "\n" 304 $msg .= "\n"
252 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
253 306
254 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 307 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
255 308
256 LOG llevError, $msg; 309 LOG llevWarn, $msg;
257}; 310};
258 311
259$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
260 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
261 314
262 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
263 316
264 if ($Coro::current == $Coro::main) {#d# 317 if (in_main) {#d#
265 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
266 return;#d# 319 return;#d#
267 }#d# 320 }#d#
268 321
269 # kill coroutine otherwise 322 # kill coroutine otherwise
270 Coro::terminate 323 Coro::terminate
290)) { 343)) {
291 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
292} 345}
293 346
294$EV::DIED = sub { 347$EV::DIED = sub {
295 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
296}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
297 355
298############################################################################# 356#############################################################################
299 357
300=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
301 359
322 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
323 $d 381 $d
324 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
325} 383}
326 384
385=item $scalar = cf::load_file $path
386
387Loads the given file from path and returns its contents. Croaks on error
388and can block.
389
390=cut
391
392sub load_file($) {
393 0 <= aio_load $_[0], my $data
394 or Carp::croak "$_[0]: $!";
395
396 $data
397}
398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
327=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
328 438
329Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
330 440
331=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
337our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 447our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
338 448
339sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
340sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
341 451
452=item $ref = cf::decode_storable $scalar
453
454Same as Coro::Storable::thaw, so blocks.
455
456=cut
457
458BEGIN { *decode_storable = \&Coro::Storable::thaw }
459
460=item $ref = cf::decode_yaml $scalar
461
462Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
463
464=cut
465
466sub decode_yaml($) {
467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
482}
483
484=item $scalar = cf::unlzf $scalar
485
486Same as Compress::LZF::compress, but takes server ticks into account, so
487blocks.
488
489=cut
490
491sub unlzf($) {
492 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
493 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
494 Compress::LZF::decompress $_[0]
495}
496
342=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
343 498
344Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
345but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
346 501
347The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
348is a reload or not. 503is a reload or not.
349 504
350=cut 505=cut
351 506
352sub post_init(&) { 507sub post_init(&) {
353 push @POST_INIT, shift; 508 push @POST_INIT, shift;
354} 509}
355 510
511sub _post_init {
512 trace "running post_init jobs";
513
514 # run them in parallel...
515
516 my @join;
517
518 while () {
519 push @join, map &Coro::async ($_, 0), @POST_INIT;
520 @POST_INIT = ();
521
522 @join or last;
523
524 (pop @join)->join;
525 }
526}
527
356=item cf::lock_wait $string 528=item cf::lock_wait $string
357 529
358Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
359 531
360=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
361 533
362Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
363a L<Guard> object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
397} 569}
398 570
399=item cf::periodic $interval, $cb 571=item cf::periodic $interval, $cb
400 572
401Like EV::periodic, but randomly selects a starting point so that the actions 573Like EV::periodic, but randomly selects a starting point so that the actions
402get spread over timer. 574get spread over time.
403 575
404=cut 576=cut
405 577
406sub periodic($$) { 578sub periodic($$) {
407 my ($interval, $cb) = @_; 579 my ($interval, $cb) = @_;
411 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
412} 584}
413 585
414=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
415 587
416Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
417This call blocks and returns only when you have at least C<$time> seconds 589(default: 0): This call blocks and returns only when you have at least
418of cpu time till the next tick. The slot is only valid till the next cede. 590C<$time> seconds of cpu time till the next tick. The slot is only valid
591till the next cede.
592
593Background jobs should use a priority less than zero, interactive jobs
594should use 100 or more.
419 595
420The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
421used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
422 598
423Useful for short background jobs. 599Useful for short background jobs.
424 600
425=cut 601=cut
426 602
427our @SLOT_QUEUE; 603our @SLOT_QUEUE;
428our $SLOT_QUEUE; 604our $SLOT_QUEUE;
605our $SLOT_DECAY = 0.9;
429 606
430$SLOT_QUEUE->cancel if $SLOT_QUEUE; 607$SLOT_QUEUE->cancel if $SLOT_QUEUE;
431$SLOT_QUEUE = Coro::async { 608$SLOT_QUEUE = Coro::async {
432 $Coro::current->desc ("timeslot manager"); 609 $Coro::current->desc ("timeslot manager");
433 610
434 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
612 my $busy;
435 613
436 while () { 614 while () {
437 next_job: 615 next_job:
616
617 Coro::cede;
618
438 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
439 if ($avail > 0.01) { 620
440 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
441 if ($SLOT_QUEUE[$_][0] < $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
623 $busy = 0;
442 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
443 $job->[2]->send; 625 $job->[2]->send;
444 Coro::cede;
445 goto next_job; 626 goto next_job;
446 } 627 } else {
628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
447 } 629 }
448 } 630 }
449 631
450 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
451 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
452 push @cf::WAIT_FOR_TICK, $signal;
453 $signal->wait;
454 } else { 634 } else {
635 $busy = 0;
455 Coro::schedule; 636 Coro::schedule;
456 } 637 }
457 } 638 }
458}; 639};
459 640
460sub get_slot($;$$) { 641sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main; 642 return if tick_inhibit || $Coro::current == $Coro::main;
462 643
463 my ($time, $pri, $name) = @_; 644 my ($time, $pri, $name) = @_;
464 645
465 $time = $TICK * .6 if $time > $TICK * .6; 646 $time = clamp $time, 0.01, $TICK * .6;
647
466 my $sig = new Coro::Signal; 648 my $sig = new Coro::Signal;
467 649
468 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 650 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
469 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 651 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
470 $SLOT_QUEUE->ready; 652 $SLOT_QUEUE->ready;
482BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
483 665
484=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
485 667
486The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
487is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
488partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
489acceptable. 671acceptable.
490 672
491If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
492the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
496=cut 678=cut
497 679
498sub sync_job(&) { 680sub sync_job(&) {
499 my ($job) = @_; 681 my ($job) = @_;
500 682
501 if ($Coro::current == $Coro::main) { 683 if (in_main) {
502 my $time = EV::time; 684 my $time = AE::time;
503 685
504 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
505 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
506 688
507 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
508 690
509 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
510 692
511 my $busy = 1; 693 my $busy = 1;
512 my @res; 694 my @res;
513 695
514 (async { 696 (async {
515 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
516 @res = eval { $job->() }; 698 @res = eval { $job->() };
517 warn $@ if $@; 699 error $@ if $@;
518 undef $busy; 700 undef $busy;
519 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
520 702
521 while ($busy) { 703 while ($busy) {
522 if (Coro::nready) { 704 if (Coro::nready) {
523 Coro::cede_notself; 705 Coro::cede_notself;
524 } else { 706 } else {
525 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
526 } 708 }
527 } 709 }
528 710
529 my $time = EV::time - $time; 711 my $time = AE::time - $time;
530 712
531 $TICK_START += $time; # do not account sync jobs to server load 713 $TICK_START += $time; # do not account sync jobs to server load
532 714
533 wantarray ? @res : $res[0] 715 wantarray ? @res : $res[0]
534 } else { 716 } else {
556 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
557 739
558 $coro 740 $coro
559} 741}
560 742
561=item fork_call { }, $args 743=item fork_call { }, @args
562 744
563Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
564process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
565Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
566never block itself or use any form of event handling. 748never block itself or use any form of event handling.
567 749
568=cut 750=cut
569 751
752sub post_fork {
753 reset_signals;
754}
755
570sub fork_call(&@) { 756sub fork_call(&@) {
571 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
572 758
573 # we seemingly have to make a local copy of the whole thing,
574 # otherwise perl prematurely frees the stuff :/
575 # TODO: investigate and fix (likely this will be rather laborious)
576
577 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
578 reset_signals; 760 cf::post_fork;
579 &$cb 761 &$cb
580 }, @args; 762 } @args;
581 763
582 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
765}
766
767sub objinfo {
768 (
769 "counter value" => cf::object::object_count,
770 "objects created" => cf::object::create_count,
771 "objects destroyed" => cf::object::destroy_count,
772 "freelist size" => cf::object::free_count,
773 "allocated objects" => cf::object::objects_size,
774 "active objects" => cf::object::actives_size,
775 )
583} 776}
584 777
585=item $coin = coin_from_name $name 778=item $coin = coin_from_name $name
586 779
587=cut 780=cut
624within each server. 817within each server.
625 818
626=cut 819=cut
627 820
628sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
629 my ($name) = @_; 825 my ($name) = @_;
630 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
631 827
632 eval { 828 eval {
633 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
643} 839}
644 840
645our $DB; 841our $DB;
646 842
647sub db_init { 843sub db_init {
648 cf::sync_job {
649 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
650 };
651} 845}
652 846
653sub db_get($$) { 847sub db_get($$) {
654 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
655 849
656 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
657 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
658 854
659 $! ? () 855 $! ? ()
660 : $data 856 : $data
661 }
662} 857}
663 858
664sub db_put($$$) { 859sub db_put($$$) {
665 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
666 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
694 889
695 my @data; 890 my @data;
696 my $md5; 891 my $md5;
697 892
698 for (0 .. $#$src) { 893 for (0 .. $#$src) {
699 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
700 or Carp::croak "$src->[$_]: $!";
701 } 895 }
702 896
703 # if processing is expensive, check 897 # if processing is expensive, check
704 # checksum first 898 # checksum first
705 if (1) { 899 if (1) {
718 912
719 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
720 } 914 }
721 } 915 }
722 916
723 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
724 my $data = $process->(\@data); 918 my $data = $process->(\@data);
725 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
726 920
727 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
728 922
729 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
730 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
731 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
732 926
742 936
743=cut 937=cut
744 938
745sub datalog($@) { 939sub datalog($@) {
746 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
747 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
748} 942}
749 943
750=back 944=back
751 945
752=cut 946=cut
947 1141
948 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
949 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
950 1144
951 } elsif (ref $type) { 1145 } elsif (ref $type) {
952 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
953 1147
954 } else { 1148 } else {
955 shift @arg; 1149 shift @arg;
956 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
957 } 1151 }
958 } 1152 }
959} 1153}
960 1154
961sub _object_attach { 1155sub _object_attach {
971 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
972 } 1166 }
973 1167
974 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
975 } else { 1169 } else {
976 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
977 } 1171 }
978 1172
979 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
980} 1174}
981 1175
1040 1234
1041 for (@$callbacks) { 1235 for (@$callbacks) {
1042 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1043 1237
1044 if ($@) { 1238 if ($@) {
1045 warn "$@";
1046 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1047 override; 1240 override;
1048 } 1241 }
1049 1242
1050 return 1 if $override; 1243 return 1 if $override;
1051 } 1244 }
1130 for (@$attach) { 1323 for (@$attach) {
1131 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1132 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1133 } 1326 }
1134 } else { 1327 } else {
1135 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1136 } 1329 }
1137 } 1330 }
1138} 1331}
1139 1332
1140cf::attachable->attach ( 1333cf::attachable->attach (
1167 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1168 1361
1169 sync_job { 1362 sync_job {
1170 if (length $$rdata) { 1363 if (length $$rdata) {
1171 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1172 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1173 $decname, length $$rdata, scalar @$objs; 1366 $decname, length $$rdata, scalar @$objs
1367 if $VERBOSE_IO;
1174 1368
1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1176 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1178 if ($cf::USE_FSYNC) { 1372 if ($cf::USE_FSYNC) {
1200 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1201 1395
1202 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1203 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1204 } else { 1398 } else {
1205 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1206 } 1400 }
1207 } else { 1401 } else {
1208 aio_unlink $filename; 1402 aio_unlink $filename;
1209 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1210 } 1404 }
1234 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1235 $av = $st->{objs}; 1429 $av = $st->{objs};
1236 } 1430 }
1237 1431
1238 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1239 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1240 $decname, length $data, scalar @{$av || []}; 1434 $decname, length $data, scalar @{$av || []}
1435 if $VERBOSE_IO;
1241 1436
1242 ($data, $av) 1437 ($data, $av)
1243} 1438}
1244 1439
1245=head2 COMMAND CALLBACKS 1440=head2 COMMAND CALLBACKS
1249=cut 1444=cut
1250 1445
1251############################################################################# 1446#############################################################################
1252# command handling &c 1447# command handling &c
1253 1448
1254=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1255 1450
1256Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1257$name. 1452$name.
1258 1453
1259=cut 1454=cut
1265 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1266 1461
1267 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1268} 1463}
1269 1464
1270=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1271 1466
1272Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1273extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1274received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1275the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1276has logged in successfully. 1471has logged in successfully.
1277 1472
1278If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1279called.
1280 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1281=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1282 1481
1283Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1284exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd packet. Exti commands are processed by the server as soon as they
1285are received, i.e. out of order w.r.t. other commands. The first argument 1484are received, i.e. out of order w.r.t. other commands. The first argument
1286is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1287log-in. 1486log-in.
1288 1487
1289If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1290called.
1291 1489
1292=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1293 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1294sub register_extcmd { 1497sub register_extcmd($$) {
1295 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1296 1499
1297 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1298} 1501}
1299 1502
1300sub register_exticmd { 1503sub register_async_extcmd($$) {
1301 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1302 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1303 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1304} 1513}
1305 1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1519}
1520
1306use File::Glob (); 1521use File::Glob ();
1307 1522
1308cf::player->attach ( 1523cf::player->attach (
1309 on_command => sub { 1524 on_unknown_command => sub {
1310 my ($pl, $name, $params) = @_; 1525 my ($pl, $name, $params) = @_;
1311 1526
1312 my $cb = $COMMAND{$name} 1527 my $cb = $COMMAND{$name}
1313 or return; 1528 or return;
1314 1529
1322 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1323 1538
1324 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1325 1540
1326 if (ref $msg) { 1541 if (ref $msg) {
1327 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1328 "ARRAY" eq ref $msg
1329 ? @$msg
1330 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1331 1543
1332 my @reply;
1333
1334 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1335 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1336 } 1562 }
1337 1563
1338 $pl->ext_reply ($reply, @reply)
1339 if $reply;
1340
1341 } else { 1564 } else {
1342 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1343 } 1566 }
1344 1567
1345 cf::override; 1568 cf::override;
1346 }, 1569 },
1347); 1570);
1357 }; 1580 };
1358 1581
1359 $grp 1582 $grp
1360} 1583}
1361 1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1362sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1363 cf::sync_job { 1601 cf::sync_job {
1364 my %todo; 1602 my %todo;
1365 1603
1366 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1367 next unless -r $path; 1605 next unless -r $path;
1385 1623
1386 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1387 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1388 1626
1389 $ext{source} = 1627 $ext{source} =
1390 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1391 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1392 . $source 1630 . $source
1393 . "\n};\n1"; 1631 . "\n};\n1";
1394 1632
1395 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1396 } 1634 }
1397 1635
1636 my $pass = 0;
1398 my %done; 1637 my %done;
1399 while (%todo) { 1638 while (%todo) {
1400 my $progress; 1639 my $progress;
1401 1640
1641 ++$pass;
1642
1643 ext:
1402 while (my ($k, $v) = each %todo) { 1644 while (my ($k, $v) = each %todo) {
1403 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1404 goto skip 1646 next ext
1405 unless exists $done{$_}; 1647 unless exists $done{$_};
1406 } 1648 }
1407 1649
1408 warn "... loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1409 1651
1410 unless (eval $v->{source}) { 1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1661 my $active = eval $source;
1662
1663 if (length $@) {
1411 my $msg = $@ ? "$v->{path}: $@\n" 1664 error "$v->{path}: $@\n";
1412 : "$v->{base}: extension inactive.\n";
1413 1665
1414 if (exists $v->{meta}{mandatory}) {
1415 warn $msg;
1416 cf::cleanup "mandatory extension failed to load, exiting."; 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1417 } 1667 if exists $v->{meta}{mandatory};
1418 1668
1419 warn $msg; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1670 delete $todo{$k};
1671 } else {
1672 $done{$k} = delete $todo{$k};
1673 push @EXTS, $v->{pkg};
1674 $progress = 1;
1675
1676 info "$v->{base}: extension inactive.\n"
1677 unless $active;
1420 } 1678 }
1421
1422 $done{$k} = delete $todo{$k};
1423 push @EXTS, $v->{pkg};
1424 $progress = 1;
1425 } 1679 }
1426 1680
1427 skip: 1681 unless ($progress) {
1428 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1682 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1429 unless $progress; 1683
1684 while (my ($k, $v) = each %todo) {
1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1686 if exists $v->{meta}{mandatory};
1687 }
1688
1689 last;
1690 }
1430 } 1691 }
1431 }; 1692 };
1432} 1693}
1433 1694
1434############################################################################# 1695#############################################################################
1518 $cf::PLAYER{$login} = $pl 1779 $cf::PLAYER{$login} = $pl
1519 } 1780 }
1520 } 1781 }
1521} 1782}
1522 1783
1784cf::player->attach (
1785 on_load => sub {
1786 my ($pl, $path) = @_;
1787
1788 # restore slots saved in save, below
1789 my $slots = delete $pl->{_slots};
1790
1791 $pl->ob->current_weapon ($slots->[0]);
1792 $pl->combat_ob ($slots->[1]);
1793 $pl->ranged_ob ($slots->[2]);
1794 },
1795);
1796
1523sub save($) { 1797sub save($) {
1524 my ($pl) = @_; 1798 my ($pl) = @_;
1525 1799
1526 return if $pl->{deny_save}; 1800 return if $pl->{deny_save};
1527 1801
1532 1806
1533 aio_mkdir playerdir $pl, 0770; 1807 aio_mkdir playerdir $pl, 0770;
1534 $pl->{last_save} = $cf::RUNTIME; 1808 $pl->{last_save} = $cf::RUNTIME;
1535 1809
1536 cf::get_slot 0.01; 1810 cf::get_slot 0.01;
1811
1812 # save slots, to be restored later
1813 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1537 1814
1538 $pl->save_pl ($path); 1815 $pl->save_pl ($path);
1539 cf::cede_to_tick; 1816 cf::cede_to_tick;
1540} 1817}
1541 1818
1575 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1576 1853
1577 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1578 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1855 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1579 1856
1580 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1581 $pl->deactivate; 1858 $pl->deactivate;
1859
1582 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1583 $pl->ob->check_score;
1584 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1585 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1586 1865
1587 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1588 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1589 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1643 \@logins 1922 \@logins
1644} 1923}
1645 1924
1646=item $player->maps 1925=item $player->maps
1647 1926
1927=item cf::player::maps $login
1928
1648Returns an arrayref of map paths that are private for this 1929Returns an arrayref of map paths that are private for this
1649player. May block. 1930player. May block.
1650 1931
1651=cut 1932=cut
1652 1933
1673 1954
1674=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1675 1956
1676Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1677 1958
1678=item $player->ext_reply ($msgid, @msg)
1679
1680Sends an ext reply to the player.
1681
1682=cut
1683
1684sub ext_reply($$@) {
1685 my ($self, $id, @msg) = @_;
1686
1687 $self->ns->ext_reply ($id, @msg)
1688}
1689
1690=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1691 1960
1692Sends an ext event to the client. 1961Sends an ext event to the client.
1693 1962
1694=cut 1963=cut
1713 1982
1714=cut 1983=cut
1715 1984
1716sub find_by_path($) { 1985sub find_by_path($) {
1717 my ($path) = @_; 1986 my ($path) = @_;
1987
1988 $path =~ s/^~[^\/]*//; # skip ~login
1718 1989
1719 my ($match, $specificity); 1990 my ($match, $specificity);
1720 1991
1721 for my $region (list) { 1992 for my $region (list) {
1722 if ($region->{match} && $path =~ $region->{match}) { 1993 if ($region->{match} && $path =~ $region->{match}) {
1751sub generate_random_map { 2022sub generate_random_map {
1752 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1753 2024
1754 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1755 2026
1756 # mit "rum" bekleckern, nicht
1757 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1758 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1759 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1760 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1761 $rmp->{exit_on_final_map},
1762 $rmp->{xsize}, $rmp->{ysize},
1763 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1764 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1765 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1766 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1767 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1768 (cf::region::find $rmp->{region}), $rmp->{custom}
1769 )
1770} 2028}
1771 2029
1772=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1773 2031
1774Register a handler for the map path matching the given regex at the 2032Register a handler for the map path matching the given regex at the
1779 2037
1780sub register { 2038sub register {
1781 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1782 my $pkg = caller; 2040 my $pkg = caller;
1783 2041
1784 no strict;
1785 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1786 2043
1787 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1788} 2045}
1789 2046
1790# also paths starting with '/' 2047# also paths starting with '/'
1791$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 2048$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1792 2049
1793sub thawer_merge { 2050sub thawer_merge {
1794 my ($self, $merge) = @_; 2051 my ($self, $merge) = @_;
1795 2052
1796 # we have to keep some variables in memory intact 2053 # we have to keep some variables in memory intact
1801} 2058}
1802 2059
1803sub normalise { 2060sub normalise {
1804 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1805 2062
1806 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1807 2064
1808 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1809 2066
1810 # map plan: 2067 # map plan:
1811 # 2068 #
1826 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1827 $path = "$base/$path"; 2084 $path = "$base/$path";
1828 } 2085 }
1829 2086
1830 for ($path) { 2087 for ($path) {
1831 redo if s{//}{/};
1832 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1833 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1834 } 2090 }
1835 2091
1836 $path 2092 $path
1850 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1851 return $self; 2107 return $self;
1852 } 2108 }
1853 } 2109 }
1854 2110
1855 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1856 () 2112 ()
1857} 2113}
1858 2114
2115# may re-bless or do other evil things
1859sub init { 2116sub init {
1860 my ($self) = @_; 2117 my ($self) = @_;
1861 2118
1862 $self 2119 $self
1863} 2120}
1928 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1929 2186
1930 1 2187 1
1931} 2188}
1932 2189
2190# used to laod the header of an original map
1933sub load_header_orig { 2191sub load_header_orig {
1934 my ($self) = @_; 2192 my ($self) = @_;
1935 2193
1936 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1937} 2195}
1938 2196
2197# used to laod the header of an instantiated map
1939sub load_header_temp { 2198sub load_header_temp {
1940 my ($self) = @_; 2199 my ($self) = @_;
1941 2200
1942 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
1943} 2202}
1944 2203
2204# called after loading the header from an instantiated map
1945sub prepare_temp { 2205sub prepare_temp {
1946 my ($self) = @_; 2206 my ($self) = @_;
1947 2207
1948 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
1949 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
1950 # safety 2210 # safety
1951 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
1952 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
1953} 2213}
1954 2214
2215# called after loading the header from an original map
1955sub prepare_orig { 2216sub prepare_orig {
1956 my ($self) = @_; 2217 my ($self) = @_;
1957 2218
1958 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
1959 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
1983 2244
1984sub find; 2245sub find;
1985sub find { 2246sub find {
1986 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
1987 2248
2249 cf::cede_to_tick;
2250
1988 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
1989 2252
1990 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1991 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
1992 2255
1993 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2010 2273
2011 $cf::MAP{$path} = $map 2274 $cf::MAP{$path} = $map
2012 } 2275 }
2013} 2276}
2014 2277
2015sub pre_load { } 2278sub pre_load { }
2016sub post_load { } 2279#sub post_load { } # XS
2017 2280
2018sub load { 2281sub load {
2019 my ($self) = @_; 2282 my ($self) = @_;
2020 2283
2021 local $self->{deny_reset} = 1; # loading can take a long time 2284 local $self->{deny_reset} = 1; # loading can take a long time
2024 2287
2025 { 2288 {
2026 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2027 2290
2028 return unless $self->valid; 2291 return unless $self->valid;
2029 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2030
2031 $self->in_memory (cf::MAP_LOADING);
2032 2293
2033 $self->alloc; 2294 $self->alloc;
2034 2295
2035 $self->pre_load; 2296 $self->pre_load;
2036 cf::cede_to_tick; 2297 cf::cede_to_tick;
2037 2298
2299 if (exists $self->{load_path}) {
2038 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2039 $f->skip_block; 2301 $f->skip_block;
2040 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2041 or return; 2303 or return;
2042 2304
2043 $self->post_load_original 2305 $self->post_load_original
2044 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2045 2307
2046 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2047 utf8::encode $uniq; 2309 utf8::encode $uniq;
2048 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2049 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2050 $self->clear_unique_items; 2312 $self->clear_unique_items;
2051 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2052 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2053 } 2316 }
2054 } 2317 }
2055 }
2056 2318
2057 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2058 2326
2059 cf::cede_to_tick; 2327 cf::cede_to_tick;
2060 # now do the right thing for maps 2328 # now do the right thing for maps
2061 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2062 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2066 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2067 $self->decay_objects; 2335 $self->decay_objects;
2068 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2069 $self->update_buttons; 2337 $self->update_buttons;
2070 cf::cede_to_tick; 2338 cf::cede_to_tick;
2071 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2072 } 2340 }
2073 2341
2074 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2075 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2076
2077 $self->in_memory (cf::MAP_ACTIVE);
2078 } 2344 }
2079 2345
2080 $self->post_load; 2346 $self->post_load;
2081}
2082 2347
2348 1
2349}
2350
2351# customize the map for a given player, i.e.
2352# return the _real_ map. used by e.g. per-player
2353# maps to change the path to ~playername/mappath
2083sub customise_for { 2354sub customise_for {
2084 my ($self, $ob) = @_; 2355 my ($self, $ob) = @_;
2085 2356
2086 return find "~" . $ob->name . "/" . $self->{path} 2357 return find "~" . $ob->name . "/" . $self->{path}
2087 if $self->per_player; 2358 if $self->per_player;
2090# if $self->per_party; 2361# if $self->per_party;
2091 2362
2092 $self 2363 $self
2093} 2364}
2094 2365
2095# find and load all maps in the 3x3 area around a map
2096sub load_neighbours {
2097 my ($map) = @_;
2098
2099 my @neigh; # diagonal neighbours
2100
2101 for (0 .. 3) {
2102 my $neigh = $map->tile_path ($_)
2103 or next;
2104 $neigh = find $neigh, $map
2105 or next;
2106 $neigh->load;
2107
2108 push @neigh,
2109 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2110 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2111 }
2112
2113 for (grep defined $_->[0], @neigh) {
2114 my ($path, $origin) = @$_;
2115 my $neigh = find $path, $origin
2116 or next;
2117 $neigh->load;
2118 }
2119}
2120
2121sub find_sync { 2366sub find_sync {
2122 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2123 2368
2124 cf::sync_job { find $path, $origin } 2369 # it's a bug to call this from the main context
2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2371 if $Coro::current == $Coro::main;
2372
2373 find $path, $origin
2125} 2374}
2126 2375
2127sub do_load_sync { 2376sub do_load_sync {
2128 my ($map) = @_; 2377 my ($map) = @_;
2129 2378
2379 # it's a bug to call this from the main context
2130 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2131 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2132 2382
2133 cf::sync_job { $map->load }; 2383 $map->load;
2134} 2384}
2135 2385
2136our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2137our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2138 2388
2139sub find_async { 2389sub find_async {
2140 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2141 2391
2142 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2143 2393
2144 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2145 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2146 } 2396 }
2147 2397
2148 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2149 2399
2150 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2151 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2152 2402
2153 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2154 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2155 if (my $map = find $k) { 2405 if (my $map = find $k) {
2156 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2157 } 2407 }
2158 2408
2159 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2160 } 2410 }
2161 } 2411 }
2164 $MAP_PREFETCHER->prio (6); 2414 $MAP_PREFETCHER->prio (6);
2165 2415
2166 () 2416 ()
2167} 2417}
2168 2418
2419# common code, used by both ->save and ->swapout
2169sub save { 2420sub _save {
2170 my ($self) = @_; 2421 my ($self) = @_;
2171
2172 my $lock = cf::lock_acquire "map_data:$self->{path}";
2173 2422
2174 $self->{last_save} = $cf::RUNTIME; 2423 $self->{last_save} = $cf::RUNTIME;
2175 2424
2176 return unless $self->dirty; 2425 return unless $self->dirty;
2177 2426
2197 } else { 2446 } else {
2198 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2447 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2199 } 2448 }
2200} 2449}
2201 2450
2451sub save {
2452 my ($self) = @_;
2453
2454 my $lock = cf::lock_acquire "map_data:$self->{path}";
2455
2456 $self->_save;
2457}
2458
2202sub swap_out { 2459sub swap_out {
2203 my ($self) = @_; 2460 my ($self) = @_;
2204 2461
2205 # save first because save cedes
2206 $self->save;
2207
2208 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2209 2463
2464 return if !$self->linkable;
2465 return if $self->{deny_save};
2210 return if $self->players; 2466 return if $self->players;
2211 return if $self->in_memory != cf::MAP_ACTIVE; 2467
2468 # first deactivate the map and "unlink" it from the core
2469 $self->deactivate;
2470 $_->clear_links_to ($self) for values %cf::MAP;
2471 $self->state (cf::MAP_SWAPPED);
2472
2473 # then atomically save
2474 $self->_save;
2475
2476 # then free the map
2477 $self->clear;
2478}
2479
2480sub reset_at {
2481 my ($self) = @_;
2482
2483 # TODO: safety, remove and allow resettable per-player maps
2212 return if $self->{deny_save}; 2484 return 1e99 if $self->{deny_reset};
2213 2485
2486 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2487 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2488
2489 $time + $to
2490}
2491
2492sub should_reset {
2493 my ($self) = @_;
2494
2495 $self->reset_at <= $cf::RUNTIME
2496}
2497
2498sub reset {
2499 my ($self) = @_;
2500
2501 my $lock = cf::lock_acquire "map_data:$self->{path}";
2502
2503 return if $self->players;
2504
2505 cf::trace "resetting map ", $self->path, "\n";
2506
2214 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2508
2509 # need to save uniques path
2510 unless ($self->{deny_save}) {
2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2512
2513 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2514 if $uniq;
2515 }
2516
2517 delete $cf::MAP{$self->path};
2215 2518
2216 $self->deactivate; 2519 $self->deactivate;
2217 $_->clear_links_to ($self) for values %cf::MAP; 2520 $_->clear_links_to ($self) for values %cf::MAP;
2218 $self->clear; 2521 $self->clear;
2219}
2220
2221sub reset_at {
2222 my ($self) = @_;
2223
2224 # TODO: safety, remove and allow resettable per-player maps
2225 return 1e99 if $self->{deny_reset};
2226
2227 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2228 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2229
2230 $time + $to
2231}
2232
2233sub should_reset {
2234 my ($self) = @_;
2235
2236 $self->reset_at <= $cf::RUNTIME
2237}
2238
2239sub reset {
2240 my ($self) = @_;
2241
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
2244 return if $self->players;
2245
2246 warn "resetting map ", $self->path, "\n";
2247
2248 $self->in_memory (cf::MAP_SWAPPED);
2249
2250 # need to save uniques path
2251 unless ($self->{deny_save}) {
2252 my $uniq = $self->uniq_path; utf8::encode $uniq;
2253
2254 $self->_save_objects ($uniq, cf::IO_UNIQUES)
2255 if $uniq;
2256 }
2257
2258 delete $cf::MAP{$self->path};
2259
2260 $self->deactivate;
2261 $_->clear_links_to ($self) for values %cf::MAP;
2262 $self->clear;
2263 2522
2264 $self->unlink_save; 2523 $self->unlink_save;
2265 $self->destroy; 2524 $self->destroy;
2266} 2525}
2267 2526
2275 2534
2276 delete $cf::MAP{$self->path}; 2535 delete $cf::MAP{$self->path};
2277 2536
2278 $self->unlink_save; 2537 $self->unlink_save;
2279 2538
2280 bless $self, "cf::map"; 2539 bless $self, "cf::map::wrap";
2281 delete $self->{deny_reset}; 2540 delete $self->{deny_reset};
2282 $self->{deny_save} = 1; 2541 $self->{deny_save} = 1;
2283 $self->reset_timeout (1); 2542 $self->reset_timeout (1);
2284 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2543 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2285 2544
2406 2665
2407Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2408 2667
2409=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2410 2669
2411returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2412even if the object actually exists. May block. 2671even if the object actually exists. May block.
2413 2672
2414=cut 2673=cut
2415 2674
2416sub deref { 2675sub deref {
2498=item $player_object->may ("access") 2757=item $player_object->may ("access")
2499 2758
2500Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2501(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2502 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2503=cut 2787=cut
2504 2788
2505sub cf::object::player::may { 2789sub cf::object::player::may {
2506 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2507 2791
2508 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2509 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2510 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2511 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2512} 2796}
2513 2797
2514=item $player_object->enter_link 2798=item $player_object->enter_link
2515 2799
2516Freezes the player and moves him/her to a special map (C<{link}>). 2800Freezes the player and moves him/her to a special map (C<{link}>).
2517 2801
2518The player should be reasonably safe there for short amounts of time (e.g. 2802The player should be reasonably safe there for short amounts of time (e.g.
2519for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2520though, as the palyer cannot control the character while it is on the link 2804though, as the player cannot control the character while it is on the link
2521map. 2805map.
2522 2806
2523Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2524 2814
2525=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2526 2816
2527Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2528map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2546sub cf::object::player::enter_link { 2836sub cf::object::player::enter_link {
2547 my ($self) = @_; 2837 my ($self) = @_;
2548 2838
2549 $self->deactivate_recursive; 2839 $self->deactivate_recursive;
2550 2840
2841 ++$self->{_link_recursion};
2842
2551 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2843 return if UNIVERSAL::isa $self->map, "ext::map_link";
2552 2844
2553 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2845 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2554 if $self->map && $self->map->{path} ne "{link}"; 2846 if $self->map && $self->map->{path} ne "{link}";
2555 2847
2556 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2848 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2557} 2849}
2558 2850
2559sub cf::object::player::leave_link { 2851sub cf::object::player::leave_link {
2560 my ($self, $map, $x, $y) = @_; 2852 my ($self, $map, $x, $y) = @_;
2561 2853
2581 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2582 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2583 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2584 2876
2585 $map->load; 2877 $map->load;
2586 $map->load_neighbours;
2587 2878
2588 return unless $self->contr->active; 2879 return unless $self->contr->active;
2589 2880
2590 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2591 $self->enter_map ($map, $x, $y); 2882 if ($self->enter_map ($map, $x, $y)) {
2592 2883 # entering was successful
2884 delete $self->{_link_recursion};
2593 # only activate afterwards, to support waiting in hooks 2885 # only activate afterwards, to support waiting in hooks
2594 $self->activate_recursive; 2886 $self->activate_recursive;
2595} 2887 }
2596 2888
2889}
2890
2597=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2891=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2598 2892
2599Moves the player to the given map-path and coordinates by first freezing 2893Moves the player to the given map-path and coordinates by first freezing
2600her, loading and preparing them map, calling the provided $check callback 2894her, loading and preparing them map, calling the provided $check callback
2601that has to return the map if sucecssful, and then unfreezes the player on 2895that has to return the map if sucecssful, and then unfreezes the player on
2602the new (success) or old (failed) map position. In either case, $done will 2896the new (success) or old (failed) map position. In either case, $done will
2609 2903
2610our $GOTOGEN; 2904our $GOTOGEN;
2611 2905
2612sub cf::object::player::goto { 2906sub cf::object::player::goto {
2613 my ($self, $path, $x, $y, $check, $done) = @_; 2907 my ($self, $path, $x, $y, $check, $done) = @_;
2908
2909 if ($self->{_link_recursion} >= $MAX_LINKS) {
2910 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2911 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2912 ($path, $x, $y) = @$EMERGENCY_POSITION;
2913 }
2614 2914
2615 # do generation counting so two concurrent goto's will be executed in-order 2915 # do generation counting so two concurrent goto's will be executed in-order
2616 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2916 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2617 2917
2618 $self->enter_link; 2918 $self->enter_link;
2638 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2639 } 2939 }
2640 } 2940 }
2641 2941
2642 my $map = eval { 2942 my $map = eval {
2643 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2644 2944
2645 if ($map) { 2945 if ($map) {
2646 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2647 $map = $check->($map) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2648 } else { 2948 } else {
2649 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED); 2949 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 } 2950 }
2651 2951
2652 $map 2952 $map
2660 if ($gen == $self->{_goto_generation}) { 2960 if ($gen == $self->{_goto_generation}) {
2661 delete $self->{_goto_generation}; 2961 delete $self->{_goto_generation};
2662 $self->leave_link ($map, $x, $y); 2962 $self->leave_link ($map, $x, $y);
2663 } 2963 }
2664 2964
2665 $done->() if $done; 2965 $done->($self) if $done;
2666 })->prio (1); 2966 })->prio (1);
2667} 2967}
2668 2968
2669=item $player_object->enter_exit ($exit_object) 2969=item $player_object->enter_exit ($exit_object)
2670 2970
2738 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2739 3039
2740 unless (eval { 3040 unless (eval {
2741 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2742 3042
2743 # random map handling
2744 {
2745 my $guard = cf::lock_acquire "exit_prepare:$exit";
2746
2747 prepare_random_map $exit
2748 if $exit->slaying eq "/!";
2749 }
2750
2751 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2752 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2753 my $y = $exit->stats->sp; 3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
2754 3069
2755 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2756 3071
2757 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2758 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2763 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2764 . "I'll try to bring you back to the map you were before. " 3079 . "I'll try to bring you back to the map you were before. "
2765 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2766 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2767 3082
2768 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2769 $self->leave_link; 3084 $self->leave_link;
2770 } 3085 }
2771 })->prio (1); 3086 })->prio (1);
2772} 3087}
2773 3088
2774=head3 cf::client 3089=head3 cf::client
2775 3090
2776=over 4 3091=over 4
2777 3092
2778=item $client->send_drawinfo ($text, $flags) 3093=item $client->send_big_packet ($pkt)
2779 3094
2780Sends a drawinfo packet to the client. Circumvents output buffering so 3095Like C<send_packet>, but tries to compress large packets, and fragments
2781should not be used under normal circumstances. 3096them as required.
2782 3097
2783=cut 3098=cut
2784 3099
3100our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
3101
2785sub cf::client::send_drawinfo { 3102sub cf::client::send_big_packet {
2786 my ($self, $text, $flags) = @_; 3103 my ($self, $pkt) = @_;
2787 3104
2788 utf8::encode $text; 3105 # try lzf for large packets
2789 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 3106 $pkt = "lzf " . Compress::LZF::compress $pkt
3107 if 1024 <= length $pkt and $self->{can_lzf};
3108
3109 # split very large packets
3110 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
3111 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
3112 $pkt = "frag";
3113 }
3114
3115 $self->send_packet ($pkt);
2790} 3116}
2791 3117
2792=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2793 3119
2794Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
2795client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2796the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
2797the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2798 3124
2799=cut 3125=cut
2800 3126
2801# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2844 }, 3170 },
2845 "c/body" => { 3171 "c/body" => {
2846 id => "infobox", 3172 id => "infobox",
2847 title => "Body Parts", 3173 title => "Body Parts",
2848 reply => undef, 3174 reply => undef,
2849 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
2850 }, 3176 },
2851 "c/statistics" => { 3177 "c/statistics" => {
2852 id => "infobox", 3178 id => "infobox",
2853 title => "Statistics", 3179 title => "Statistics",
2854 reply => undef, 3180 reply => undef,
2906 id => "death", 3232 id => "death",
2907 title => "Death", 3233 title => "Death",
2908 reply => undef, 3234 reply => undef,
2909 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
2910 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
2911 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
2912 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
2913); 3245);
2914 3246
2915sub cf::client::send_msg { 3247sub cf::client::send_msg {
2946 my $pkt = "msg " 3278 my $pkt = "msg "
2947 . $self->{json_coder}->encode ( 3279 . $self->{json_coder}->encode (
2948 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] 3280 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2949 ); 3281 );
2950 3282
2951 # try lzf for large packets
2952 $pkt = "lzf " . Compress::LZF::compress $pkt
2953 if 1024 <= length $pkt and $self->{can_lzf};
2954
2955 # split very large packets
2956 if (8192 < length $pkt and $self->{can_lzf}) {
2957 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2958 $pkt = "frag";
2959 }
2960
2961 $self->send_packet ($pkt); 3283 $self->send_big_packet ($pkt);
2962} 3284}
2963 3285
2964=item $client->ext_msg ($type, @msg) 3286=item $client->ext_msg ($type, @msg)
2965 3287
2966Sends an ext event to the client. 3288Sends an ext event to the client.
2968=cut 3290=cut
2969 3291
2970sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
2971 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
2972 3294
2973 if ($self->extcmd == 2) {
2974 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2975 } elsif ($self->extcmd == 1) { # TODO: remove
2976 push @msg, msgtype => "event_$type";
2977 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2978 }
2979}
2980
2981=item $client->ext_reply ($msgid, @msg)
2982
2983Sends an ext reply to the client.
2984
2985=cut
2986
2987sub cf::client::ext_reply($$@) {
2988 my ($self, $id, @msg) = @_;
2989
2990 if ($self->extcmd == 2) {
2991 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2992 } elsif ($self->extcmd == 1) {
2993 #TODO: version 1, remove
2994 unshift @msg, msgtype => "reply", msgid => $id;
2995 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2996 }
2997} 3296}
2998 3297
2999=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3000 3299
3001Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3021 3320
3022 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3023 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3024 3323
3025 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
3026} 3364}
3027 3365
3028cf::client->attach ( 3366cf::client->attach (
3029 on_connect => sub { 3367 on_connect => sub {
3030 my ($ns) = @_; 3368 my ($ns) = @_;
3056 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3057 3395
3058 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3059 3397
3060 if (ref $msg) { 3398 if (ref $msg) {
3061 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3062 "ARRAY" eq ref $msg
3063 ? @$msg
3064 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3065 3400
3066 my @reply;
3067
3068 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3069 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3070 } 3419 }
3071
3072 $ns->ext_reply ($reply, @reply)
3073 if $reply;
3074
3075 } else { 3420 } else {
3076 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3077 } 3422 }
3078 3423
3079 cf::override; 3424 cf::override;
3080 }, 3425 },
3081); 3426);
3101 3446
3102 $coro 3447 $coro
3103} 3448}
3104 3449
3105cf::client->attach ( 3450cf::client->attach (
3106 on_destroy => sub { 3451 on_client_destroy => sub {
3107 my ($ns) = @_; 3452 my ($ns) = @_;
3108 3453
3109 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3454 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
3110 }, 3455 },
3111); 3456);
3127our $safe_hole = new Safe::Hole; 3472our $safe_hole = new Safe::Hole;
3128 3473
3129$SIG{FPE} = 'IGNORE'; 3474$SIG{FPE} = 'IGNORE';
3130 3475
3131$safe->permit_only (Opcode::opset qw( 3476$safe->permit_only (Opcode::opset qw(
3132 :base_core :base_mem :base_orig :base_math 3477 :base_core :base_mem :base_orig :base_math :base_loop
3133 grepstart grepwhile mapstart mapwhile 3478 grepstart grepwhile mapstart mapwhile
3134 sort time 3479 sort time
3135)); 3480));
3136 3481
3137# here we export the classes and methods available to script code 3482# here we export the classes and methods available to script code
3162 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3163 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3164 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3165 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3166) { 3511) {
3167 no strict 'refs';
3168 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3169 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3170 for @funs; 3514 for @funs;
3171} 3515}
3172 3516
3189 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3533 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3190 $qcode =~ s/\n/\\n/g; 3534 $qcode =~ s/\n/\\n/g;
3191 3535
3192 %vars = (_dummy => 0) unless %vars; 3536 %vars = (_dummy => 0) unless %vars;
3193 3537
3538 my @res;
3194 local $_; 3539 local $_;
3195 local @safe::cf::_safe_eval_args = values %vars;
3196 3540
3197 my $eval = 3541 my $eval =
3198 "do {\n" 3542 "do {\n"
3199 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3543 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3200 . "#line 0 \"{$qcode}\"\n" 3544 . "#line 0 \"{$qcode}\"\n"
3201 . $code 3545 . $code
3202 . "\n}" 3546 . "\n}"
3203 ; 3547 ;
3204 3548
3549 if ($CFG{safe_eval}) {
3205 sub_generation_inc; 3550 sub_generation_inc;
3551 local @safe::cf::_safe_eval_args = values %vars;
3206 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3552 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3207 sub_generation_inc; 3553 sub_generation_inc;
3554 } else {
3555 local @cf::_safe_eval_args = values %vars;
3556 @res = wantarray ? eval eval : scalar eval $eval;
3557 }
3208 3558
3209 if ($@) { 3559 if ($@) {
3210 warn "$@"; 3560 warn "$@",
3211 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3212 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3213 } 3563 }
3214 3564
3215 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3216} 3566}
3217 3567
3231=cut 3581=cut
3232 3582
3233sub register_script_function { 3583sub register_script_function {
3234 my ($fun, $cb) = @_; 3584 my ($fun, $cb) = @_;
3235 3585
3236 no strict 'refs'; 3586 $fun = "safe::$fun" if $CFG{safe_eval};
3237 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3587 *$fun = $safe_hole->wrap ($cb);
3238} 3588}
3239 3589
3240=back 3590=back
3241 3591
3242=cut 3592=cut
3243 3593
3244############################################################################# 3594#############################################################################
3245# the server's init and main functions 3595# the server's init and main functions
3246 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3247sub load_facedata($) { 3674sub load_facedata($) {
3248 my ($path) = @_; 3675 my ($path) = @_;
3249 3676
3250 # HACK to clear player env face cache, we need some signal framework
3251 # for this (global event?)
3252 %ext::player_env::MUSIC_FACE_CACHE = ();
3253
3254 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3255 3678
3256 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3257 3680
3258 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3259 0 < aio_load $path, $facedata
3260 or die "$path: $!";
3261
3262 $facedata = Coro::Storable::thaw $facedata;
3263 3682
3264 $facedata->{version} == 2 3683 $facedata->{version} == 2
3265 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3266 3685
3267 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3268 $facedata->{resource}{"res/exp_table"} = { 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3269 type => FT_RSRC, 3688
3270 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3271 }; 3690
3272 cf::cede_to_tick; 3691 # BEGIN ATOMIC
3692 # from here on, everything must be atomic - no thread switch allowed
3693 my $t1 = EV::time;
3273 3694
3274 { 3695 {
3275 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3276 3697
3277 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3278 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3279 3701
3280 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3281 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3282 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3283 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3284 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3285 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3286 } 3709 }
3287 3710
3288 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3289 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3290 3713
3293 3716
3294 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3295 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3296 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3297 } else { 3720 } else {
3298 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3299 } 3722 }
3300
3301 cf::cede_to_tick;
3302 } 3723 }
3303 } 3724 }
3304 3725
3305 { 3726 {
3306 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3307 3728
3308 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3309 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3310 cf::cede_to_tick;
3311 } 3731 }
3312 3732
3313 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3314 } 3734 }
3315 3735
3316 { 3736 {
3317 # TODO: for gcfclient pleasure, we should give resources
3318 # that gcfclient doesn't grok a >10000 face index.
3319 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3320 3738
3321 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3322 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # TODO: different hash - must free and use new index, or cache ixface data queue
3323 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3324 my $data;
3325 3743
3326 if ($info->{type} & 1) {
3327 # prepend meta info
3328
3329 my $meta = $enc->encode ({
3330 name => $name,
3331 %{ $info->{meta} || {} },
3332 });
3333
3334 $data = pack "(w/a*)*", $meta, $info->{data};
3335 } else {
3336 $data = $info->{data};
3337 }
3338
3339 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3340 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3341 } else { 3750 } else {
3342 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3343 } 3752 }
3344
3345 cf::cede_to_tick;
3346 } 3753 }
3347 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3348 3765
3349 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3350 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3351 1 3770 1
3352} 3771}
3353
3354cf::global->attach (on_resource_update => sub {
3355 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3356 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3357
3358 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3359 my $sound = $soundconf->{compat}[$_]
3360 or next;
3361
3362 my $face = cf::face::find "sound/$sound->[1]";
3363 cf::sound::set $sound->[0] => $face;
3364 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3365 }
3366
3367 while (my ($k, $v) = each %{$soundconf->{event}}) {
3368 my $face = cf::face::find "sound/$v";
3369 cf::sound::set $k => $face;
3370 }
3371 }
3372});
3373 3772
3374register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3375 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3376 3775
3377 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3385 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3386 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3387 cf::arch::commit_load; 3786 cf::arch::commit_load;
3388 3787
3389 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3390} 3803}
3391 3804
3392sub reload_regions { 3805sub reload_regions {
3393 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3394 # for this (global event?) 3807 # for this (global event?)
3402 if exists $_->{match}; 3815 if exists $_->{match};
3403 } 3816 }
3404} 3817}
3405 3818
3406sub reload_facedata { 3819sub reload_facedata {
3407 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3408 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3409} 3822}
3410 3823
3411sub reload_archetypes { 3824sub reload_archetypes {
3412 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3413 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3414} 3853}
3415 3854
3416sub reload_treasures { 3855sub reload_treasures {
3417 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3418 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3419} 3858}
3420 3859
3860sub reload_sound {
3861 trace "loading sound config from $DATADIR/sound\n";
3862
3863 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3864
3865 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3866 my $sound = $soundconf->{compat}[$_]
3867 or next;
3868
3869 my $face = cf::face::find "sound/$sound->[1]";
3870 cf::sound::set $sound->[0] => $face;
3871 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3872 }
3873
3874 while (my ($k, $v) = each %{$soundconf->{event}}) {
3875 my $face = cf::face::find "sound/$v";
3876 cf::sound::set $k => $face;
3877 }
3878}
3879
3421sub reload_resources { 3880sub reload_resources {
3422 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3423 3882
3883 reload_materials;
3424 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3425 reload_archetypes; 3887 reload_archetypes;
3426 reload_regions; 3888 reload_regions;
3427 reload_treasures; 3889 reload_treasures;
3428 3890
3429 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3430} 3892}
3431 3893
3432sub reload_config { 3894sub reload_config {
3433 warn "reloading config file...\n"; 3895 trace "reloading config file...\n";
3434 3896
3435 open my $fh, "<:utf8", "$CONFDIR/config" 3897 my $config = load_file "$CONFDIR/config";
3436 or return; 3898 utf8::decode $config;
3899 *CFG = decode_yaml $config;
3437 3900
3438 local $/;
3439 *CFG = YAML::XS::Load scalar <$fh>;
3440
3441 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3442 3902
3443 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3903 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3444 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3904 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3445 3905
3446 if (exists $CFG{mlockall}) { 3906 if (exists $CFG{mlockall}) {
3448 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3908 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3449 and die "WARNING: m(un)lockall failed: $!\n"; 3909 and die "WARNING: m(un)lockall failed: $!\n";
3450 }; 3910 };
3451 warn $@ if $@; 3911 warn $@ if $@;
3452 } 3912 }
3453
3454 warn "finished reloading resource files\n";
3455} 3913}
3456 3914
3457sub pidfile() { 3915sub pidfile() {
3458 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3459 or die "$PIDFILE: $!"; 3917 or die "$PIDFILE: $!";
3472 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3473 print $fh $$; 3931 print $fh $$;
3474} 3932}
3475 3933
3476sub main_loop { 3934sub main_loop {
3477 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3478 if (1) { 3936 if (1) {
3479 EV::loop; 3937 EV::run;
3480 } 3938 }
3481 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3482 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3483} 3941}
3484 3942
3485sub main { 3943sub main {
3486 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3487 3945
3488 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3489 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3490 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3491 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3492 3950
3493 cf::init_experience;
3494 cf::init_anim;
3495 cf::init_attackmess;
3496 cf::init_dynamic;
3497
3498 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3499 3952
3500 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3501 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3502 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3503 (async { 3956 (async {
3504 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3505 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3506 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3507 }; 3960 };
3508 3961
3509 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3510 3963
3511 cf::sync_job { 3964 cf::sync_job {
3965 cf::incloader::init ();
3966
3967 db_init;
3968
3969 cf::init_anim;
3970 cf::init_attackmess;
3971 cf::init_dynamic;
3972
3973 cf::load_settings;
3974
3512 reload_resources; 3975 reload_resources;
3513 reload_config; 3976 reload_config;
3514 db_init;
3515 3977
3516 cf::load_settings;
3517 cf::load_materials;
3518 cf::init_uuid; 3978 cf::init_uuid;
3519 cf::init_signals; 3979 cf::init_signals;
3520 cf::init_commands;
3521 cf::init_skills; 3980 cf::init_skills;
3522 3981
3523 cf::init_beforeplay; 3982 cf::init_beforeplay;
3524 3983
3525 atomic; 3984 atomic;
3530 3989
3531 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3532 use POSIX (); 3991 use POSIX ();
3533 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3992 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3534 3993
3535 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3536 }; 3995 };
3537 3996
3997 cf::object::thawer::errors_are_fatal 0;
3998 info "parse errors in files are no longer fatal from this point on.\n";
3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
3538 main_loop; 4004 goto &main_loop;
3539} 4005}
3540 4006
3541############################################################################# 4007#############################################################################
3542# initialisation and cleanup 4008# initialisation and cleanup
3543 4009
3544# install some emergency cleanup handlers 4010# install some emergency cleanup handlers
3545BEGIN { 4011BEGIN {
3546 our %SIGWATCHER = (); 4012 our %SIGWATCHER = ();
3547 for my $signal (qw(INT HUP TERM)) { 4013 for my $signal (qw(INT HUP TERM)) {
3548 $SIGWATCHER{$signal} = EV::signal $signal, sub { 4014 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3549 cf::cleanup "SIG$signal"; 4015 cf::cleanup "SIG$signal";
3550 }; 4016 };
3551 } 4017 }
3552} 4018}
3553 4019
3554sub write_runtime_sync { 4020sub write_runtime_sync {
4021 my $t0 = AE::time;
4022
3555 # first touch the runtime file to show we are still running: 4023 # first touch the runtime file to show we are still running:
3556 # the fsync below can take a very very long time. 4024 # the fsync below can take a very very long time.
3557 4025
3558 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef; 4026 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3559 4027
3560 my $guard = cf::lock_acquire "write_runtime"; 4028 my $guard = cf::lock_acquire "write_runtime";
3561 4029
3562 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644 4030 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3563 or return; 4031 or return;
3564 4032
3565 my $value = $cf::RUNTIME + 90 + 10; 4033 my $value = $cf::RUNTIME + 90 + 10;
3566 # 10 is the runtime save interval, for a monotonic clock 4034 # 10 is the runtime save interval, for a monotonic clock
3567 # 60 allows for the watchdog to kill the server. 4035 # 60 allows for the watchdog to kill the server.
3580 or return; 4048 or return;
3581 4049
3582 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3583 and return; 4051 and return;
3584 4052
3585 warn "runtime file written.\n"; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3586 4054
3587 1 4055 1
3588} 4056}
3589 4057
3590our $uuid_lock; 4058our $uuid_lock;
3602 or return; 4070 or return;
3603 4071
3604 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3605 4073
3606 unless ($value) { 4074 unless ($value) {
3607 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3608 return; 4076 return;
3609 } 4077 }
3610 4078
3611 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3612 $uuid_skip = 0; 4080 $uuid_skip = 0;
3622 or return; 4090 or return;
3623 4091
3624 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3625 and return; 4093 and return;
3626 4094
3627 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3628 4096
3629 1 4097 1
3630 4098
3631} 4099}
3632 4100
3638} 4106}
3639 4107
3640sub emergency_save() { 4108sub emergency_save() {
3641 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3642 4110
3643 warn "emergency_perl_save: enter\n"; 4111 info "emergency_perl_save: enter\n";
4112
4113 # this is a trade-off: we want to be very quick here, so
4114 # save all maps without fsync, and later call a global sync
4115 # (which in turn might be very very slow)
4116 local $USE_FSYNC = 0;
3644 4117
3645 cf::sync_job { 4118 cf::sync_job {
3646 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3647 # save all maps without fsync, and later call a global sync
3648 # (which in turn might be very very slow)
3649 local $USE_FSYNC = 0;
3650 4120
3651 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3652 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3653 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3654 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3655 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3656 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3657 $pl->valid or next; 4127 $pl->valid or next;
3658 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3659 $pl->save; 4129 $pl->save;
3660 } 4130 }
3661 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3662 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3663 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3664 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3665 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3666 $map->valid or next; 4138 $map->valid or next;
3667 $map->save; 4139 $map->save;
3668 } 4140 }
3669 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3670 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3671 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3672 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3673 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3674 4148
3675 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3676 write_uuid_sync 1; 4150 write_uuid_sync 1;
3677 warn "emergency_perl_save: end write uuid\n"; 4151 info "emergency_perl_save: end write uuid\n";
4152
4153 cf::write_runtime_sync; # external watchdog should not bark
4154
4155 trace "emergency_perl_save: syncing database to disk";
4156 BDB::db_env_txn_checkpoint $DB_ENV;
4157
4158 info "emergency_perl_save: starting sync\n";
4159 IO::AIO::aio_sync sub {
4160 info "emergency_perl_save: finished sync\n";
4161 };
4162
4163 cf::write_runtime_sync; # external watchdog should not bark
4164
4165 trace "emergency_perl_save: flushing outstanding aio requests";
4166 while (IO::AIO::nreqs || BDB::nreqs) {
4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4168 }
4169
4170 cf::write_runtime_sync; # external watchdog should not bark
3678 }; 4171 };
3679 4172
3680 warn "emergency_perl_save: starting sync()\n";
3681 IO::AIO::aio_sync sub {
3682 warn "emergency_perl_save: finished sync()\n";
3683 };
3684
3685 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3686} 4174}
3687 4175
3688sub post_cleanup { 4176sub post_cleanup {
3689 my ($make_core) = @_; 4177 my ($make_core) = @_;
3690 4178
4179 IO::AIO::flush;
4180
3691 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3692 if $make_core; 4182 if $make_core;
3693 4183
3694 my $fh = pidfile; 4184 my $fh = pidfile;
3695 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3696} 4186}
3716 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH}; 4206 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3717 for my $name (keys %$leaf_symtab) { 4207 for my $name (keys %$leaf_symtab) {
3718 _gv_clear *{"$pkg$name"}; 4208 _gv_clear *{"$pkg$name"};
3719# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"}; 4209# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3720 } 4210 }
3721 warn "cleared package $pkg\n";#d#
3722} 4211}
3723 4212
3724sub do_reload_perl() { 4213sub do_reload_perl() {
3725 # can/must only be called in main 4214 # can/must only be called in main
3726 if ($Coro::current != $Coro::main) { 4215 unless (in_main) {
3727 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3728 return; 4217 return;
3729 } 4218 }
3730 4219
3731 return if $RELOAD++; 4220 return if $RELOAD++;
3732 4221
3733 my $t1 = EV::time; 4222 my $t1 = AE::time;
3734 4223
3735 while ($RELOAD) { 4224 while ($RELOAD) {
3736 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3737 4227
3738 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3739 4229
3740 cf::sync_job { 4230 cf::sync_job {
3741 cf::write_runtime_sync; # external watchdog should not bark
3742 cf::emergency_save; 4231 #cf::emergency_save;
3743 cf::write_runtime_sync; # external watchdog should not bark
3744 4232
3745 warn "syncing database to disk";
3746 BDB::db_env_txn_checkpoint $DB_ENV;
3747
3748 # if anything goes wrong in here, we should simply crash as we already saved
3749
3750 warn "flushing outstanding aio requests";
3751 while (IO::AIO::nreqs || BDB::nreqs) {
3752 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3753 }
3754
3755 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3756 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3757 %EXT_CORO = (); 4235 %EXT_CORO = ();
3758 4236
3759 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3760 %COMMAND = (); 4238 %COMMAND = ();
3761 4239
3762 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3763 %EXTCMD = (); 4241 %EXTCMD = ();
3764 %EXTICMD = (); 4242 %EXTICMD = ();
3765 4243
3766 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3767 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3768 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3769 4247
3770 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3771 eval { 4249 eval {
3772 $cb->($pkg); 4250 $cb->($pkg);
3773 1 4251 1
3774 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3775 } 4253 }
3776 4254
3777 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3778 clear_package $pkg; 4256 clear_package $pkg;
3779 } 4257 }
3780 4258
3781 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3782 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3783 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3784 4262
3785 warn "... unloading $k"; 4263 trace "... unloading $k";
3786 delete $INC{$k}; 4264 delete $INC{$k};
3787 4265
3788 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3789 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3790 4268
3793 } 4271 }
3794 4272
3795 clear_package $k; 4273 clear_package $k;
3796 } 4274 }
3797 4275
3798 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3799 clear_package "safe::$_" 4277 clear_package "safe::$_"
3800 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4278 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3801 4279
3802 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3803 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3804 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3805 4283
3806 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3807 # and global variables created in xs 4285 # and global variables created in xs
3808 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3809 4287
3810 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3811 4289
3812 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3813 require cf; 4291 require cf;
3814 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3815 4293
3816 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3817 cf::reload_config; 4295 cf::reload_config;
3818 4296
3819 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3820 cf::load_extensions; 4298 cf::load_extensions;
3821 4299
3822 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3823 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3824 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3825 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3826 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3827 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3828 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3829 } 4307 }
3830 4308
3831 warn "running post_init jobs"; 4309 cf::_post_init 1;
3832 (pop @POST_INIT)->(1) while @POST_INIT;
3833 4310
3834 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3835 4312
3836 1 4313 1
3837 } or do { 4314 } or do {
3838 warn $@; 4315 error $@;
3839 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3840 }; 4317 };
3841 4318
3842 warn "reloaded";
3843 --$RELOAD; 4319 --$RELOAD;
3844 } 4320 }
3845 4321
3846 $t1 = EV::time - $t1; 4322 $t1 = AE::time - $t1;
3847 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3848}; 4324};
3849 4325
3850our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3851 4327
3852sub reload_perl() { 4328sub reload_perl() {
3854 # coro crashes during coro_state_free->destroy here. 4330 # coro crashes during coro_state_free->destroy here.
3855 4331
3856 $RELOAD_WATCHER ||= cf::async { 4332 $RELOAD_WATCHER ||= cf::async {
3857 Coro::AIO::aio_wait cache_extensions; 4333 Coro::AIO::aio_wait cache_extensions;
3858 4334
3859 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { 4335 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3860 do_reload_perl; 4336 do_reload_perl;
3861 undef $RELOAD_WATCHER; 4337 undef $RELOAD_WATCHER;
3862 }; 4338 };
3863 }; 4339 };
3864} 4340}
3873 reload_perl; 4349 reload_perl;
3874 }; 4350 };
3875 } 4351 }
3876}; 4352};
3877 4353
3878unshift @INC, $LIBDIR; 4354#############################################################################
3879 4355
3880my $bug_warning = 0; 4356my $bug_warning = 0;
3881 4357
3882our @WAIT_FOR_TICK;
3883our @WAIT_FOR_TICK_BEGIN;
3884
3885sub wait_for_tick { 4358sub wait_for_tick() {
3886 return if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3887 4360
3888 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3889 push @WAIT_FOR_TICK, $signal;
3890 $signal->wait;
3891} 4362}
3892 4363
3893sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3894 return if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3895 4366
3896 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3897 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3898 $signal->wait; 4369 $signal->wait;
3899} 4370}
3903 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3904 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
3905 return; 4376 return;
3906 } 4377 }
3907 4378
3908 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4380
4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3909 4382
3910 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3911 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3912 Coro::async_pool { 4385 Coro::async_pool {
3913 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
3914 write_runtime_sync 4387 write_runtime_sync
3915 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
3916 }; 4389 };
3917 } 4390 }
3918 4391
3919 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3920 $sig->send; 4393 $sig->send;
3921 } 4394 }
3922 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
3923 $sig->send;
3924 }
3925 4396
3926 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
3927 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3928 4399
3929 if (0) { 4400 if (0) {
3930 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
3931 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
3932 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3933 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
3934 } 4405 }
3935 } 4406 }
3936} 4407}
3937 4408
3938{ 4409{
3939 # configure BDB 4410 # configure BDB
4411 info "initialising database";
3940 4412
3941 BDB::min_parallel 8; 4413 BDB::min_parallel 16;
3942 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
3943 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
3944 4416
3945 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
3946 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
3947 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3948 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4420 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3973 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3974 }; 4446 };
3975 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3976 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3977 }; 4449 };
4450
4451 info "database initialised";
3978} 4452}
3979 4453
3980{ 4454{
3981 # configure IO::AIO 4455 # configure IO::AIO
3982 4456
4457 info "initialising aio";
3983 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
3984 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
3985 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
3986} 4462}
3987 4463
3988my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
3989 4466
3990sub _log_backtrace { 4467sub _log_backtrace {
3991 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
3992 4469
3993 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
3994 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3995 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
3996 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
3997 ++$_log_backtrace; 4478 ++$_log_backtrace;
3998 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
3999 async { 4480 async {
4000 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4001 4482
4021 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4022 --$_log_backtrace; 4503 --$_log_backtrace;
4023 }; 4504 };
4024 } else { 4505 } else {
4025 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4026 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4027 } 4508 }
4028} 4509}
4029 4510
4030# load additional modules 4511# load additional modules
4031require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines