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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines