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.528 by root, Fri Apr 23 04:42:12 2010 UTC vs.
Revision 1.623 by root, Wed Aug 30 14:18:51 2017 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify it under 6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the 7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your 8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the Affero GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>. 18# <http://www.gnu.org/licenses/>.
19# 19#
20# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
21# 21#
22 22
23package cf; 23package cf;
24 24
25use 5.10.0; 25use common::sense;
26use utf8;
27use strict qw(vars subs);
28 26
29use Symbol; 27use Symbol;
30use List::Util; 28use List::Util;
31use Socket; 29use Socket;
32use EV; 30use EV;
34use Safe; 32use Safe;
35use Safe::Hole; 33use Safe::Hole;
36use Storable (); 34use Storable ();
37use Carp (); 35use Carp ();
38 36
39use Guard (); 37use AnyEvent ();
38use AnyEvent::IO ();
39use AnyEvent::DNS ();
40
40use Coro (); 41use Coro ();
41use Coro::State; 42use Coro::State;
42use Coro::Handle; 43use Coro::Handle;
43use Coro::EV; 44use Coro::EV;
44use Coro::AnyEvent; 45use Coro::AnyEvent;
50use Coro::AIO; 51use Coro::AIO;
51use Coro::BDB 1.6; 52use Coro::BDB 1.6;
52use Coro::Storable; 53use Coro::Storable;
53use Coro::Util (); 54use Coro::Util ();
54 55
56use Guard ();
55use JSON::XS 2.01 (); 57use JSON::XS 2.01 ();
56use BDB (); 58use BDB ();
57use Data::Dumper; 59use Data::Dumper;
58use Fcntl; 60use Fcntl;
59use YAML::XS (); 61use YAML::XS ();
62use CBOR::XS ();
60use IO::AIO (); 63use IO::AIO ();
61use Time::HiRes;
62use Compress::LZF; 64use Compress::LZF;
63use Digest::MD5 (); 65use Digest::MD5 ();
64 66
65AnyEvent::detect; 67AnyEvent::detect;
66 68
78# strictly for debugging 80# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; 81$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80 82
81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 83sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82 84
85our @ORIG_INC;
86
83our %COMMAND = (); 87our %COMMAND = ();
84our %COMMAND_TIME = (); 88our %COMMAND_TIME = ();
85 89
86our @EXTS = (); # list of extension package names 90our @EXTS = (); # list of extension package names
87our %EXTCMD = (); 91our %EXTCMD = ();
92our %EXTACMD = ();
88our %EXTICMD = (); 93our %EXTICMD = ();
94our %EXTIACMD = ();
89our %EXT_CORO = (); # coroutines bound to extensions 95our %EXT_CORO = (); # coroutines bound to extensions
90our %EXT_MAP = (); # pluggable maps 96our %EXT_MAP = (); # pluggable maps
91 97
92our $RELOAD; # number of reloads so far, non-zero while in reload 98our $RELOAD; # number of reloads so far, non-zero while in reload
93our @EVENT; 99our @EVENT;
94our @REFLECT; # set by XS 100our @REFLECT; # set by XS
95our %REFLECT; # set by us 101our %REFLECT; # set by us
96 102
97our $CONFDIR = confdir; 103our $CONFDIR = confdir;
104
98our $DATADIR = datadir; 105our $DATADIR = datadir;
99our $LIBDIR = "$DATADIR/ext"; 106our $LIBDIR = "$DATADIR/ext";
100our $PODDIR = "$DATADIR/pod"; 107our $PODDIR = "$DATADIR/pod";
101our $MAPDIR = "$DATADIR/" . mapdir; 108our $MAPDIR = "$DATADIR/" . mapdir;
109
102our $LOCALDIR = localdir; 110our $LOCALDIR = localdir;
103our $TMPDIR = "$LOCALDIR/" . tmpdir; 111our $TMPDIR = "$LOCALDIR/" . tmpdir;
104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 112our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105our $PLAYERDIR = "$LOCALDIR/" . playerdir; 113our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106our $RANDOMDIR = "$LOCALDIR/random"; 114our $RANDOMDIR = "$LOCALDIR/random";
107our $BDBDIR = "$LOCALDIR/db"; 115our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid"; 116our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime"; 117our $RUNTIMEFILE = "$LOCALDIR/runtime";
110 118
111our %RESOURCE; 119#our %RESOURCE; # unused
112 120
113our $OUTPUT_RATE_MIN = 3000; 121our $OUTPUT_RATE_MIN = 3000;
114our $OUTPUT_RATE_MAX = 1000000; 122our $OUTPUT_RATE_MAX = 1000000;
115 123
116our $MAX_LINKS = 32; # how many chained exits to follow 124our $MAX_LINKS = 32; # how many chained exits to follow
124our $BDB_DEADLOCK_WATCHER; 132our $BDB_DEADLOCK_WATCHER;
125our $BDB_CHECKPOINT_WATCHER; 133our $BDB_CHECKPOINT_WATCHER;
126our $BDB_TRICKLE_WATCHER; 134our $BDB_TRICKLE_WATCHER;
127our $DB_ENV; 135our $DB_ENV;
128 136
129our @EXTRA_MODULES = qw(pod match mapscript); 137our @EXTRA_MODULES = qw(pod match mapscript incloader);
130 138
131our %CFG; 139our %CFG;
140our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132 141
133our $UPTIME; $UPTIME ||= time; 142our $UPTIME; $UPTIME ||= time;
134our $RUNTIME; 143our $RUNTIME = 0;
144our $SERVER_TICK = 0;
135our $NOW; 145our $NOW;
136 146
137our (%PLAYER, %PLAYER_LOADING); # all users 147our (%PLAYER, %PLAYER_LOADING); # all users
138our (%MAP, %MAP_LOADING ); # all maps 148our (%MAP, %MAP_LOADING ); # all maps
139our $LINK_MAP; # the special {link} map, which is always available 149our $LINK_MAP; # the special {link} map, which is always available
148 158
149our @POST_INIT; 159our @POST_INIT;
150 160
151our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) 161our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152our $REALLY_UNLOOP; # never set to true, please :) 162our $REALLY_UNLOOP; # never set to true, please :)
163
164our $WAIT_FOR_TICK = new Coro::Signal;
165our @WAIT_FOR_TICK_BEGIN;
153 166
154binmode STDOUT; 167binmode STDOUT;
155binmode STDERR; 168binmode STDERR;
156 169
157# read virtual server time, if available 170# read virtual server time, if available
191 204
192=over 4 205=over 4
193 206
194=item $cf::UPTIME 207=item $cf::UPTIME
195 208
196The timestamp of the server start (so not actually an uptime). 209The timestamp of the server start (so not actually an "uptime").
210
211=item $cf::SERVER_TICK
212
213An unsigned integer that starts at zero when the server is started and is
214incremented on every tick.
215
216=item $cf::NOW
217
218The (real) time of the last (current) server tick - updated before and
219after tick processing, so this is useful only as a rough "what time is it
220now" estimate.
221
222=item $cf::TICK
223
224The interval between each server tick, in seconds.
197 225
198=item $cf::RUNTIME 226=item $cf::RUNTIME
199 227
200The time this server has run, starts at 0 and is increased by $cf::TICK on 228The time this server has run, starts at 0 and is increased by $cf::TICK on
201every server tick. 229every server tick.
202 230
203=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR 231=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR 232$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR 233$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206 234
207Various directories - "/etc", read-only install directory, perl-library 235Various directories - "/etc", read-only install directory, perl-library
208directory, pod-directory, read-only maps directory, "/var", "/var/tmp", 236directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209unique-items directory, player file directory, random maps directory and 237unique-items directory, player file directory, random maps directory and
210database environment. 238database environment.
211 239
212=item $cf::NOW
213
214The time of the last (current) server tick.
215
216=item $cf::TICK
217
218The interval between server ticks, in seconds.
219
220=item $cf::LOADAVG 240=item $cf::LOADAVG
221 241
222The current CPU load on the server (alpha-smoothed), as a value between 0 242The current CPU load on the server (alpha-smoothed), as a value between 0
223(none) and 1 (overloaded), indicating how much time is spent on processing 243(none) and 1 (overloaded), indicating how much time is spent on processing
224objects per tick. Healthy values are < 0.5. 244objects per tick. Healthy values are < 0.5.
232Configuration for the server, loaded from C</etc/deliantra-server/config>, or 252Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233from wherever your confdir points to. 253from wherever your confdir points to.
234 254
235=item cf::wait_for_tick, cf::wait_for_tick_begin 255=item cf::wait_for_tick, cf::wait_for_tick_begin
236 256
237These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 257These are functions that inhibit the current coroutine one tick.
238returns directly I<after> the tick processing (and consequently, can only wake one process 258cf::wait_for_tick_begin only returns directly I<after> the tick
259processing (and consequently, can only wake one thread per tick), while
239per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 260cf::wait_for_tick wakes up all waiters after tick processing.
261
262Note that cf::wait_for_tick will immediately return when the server is not
263ticking, making it suitable for small pauses in threads that need to run
264when the server is paused. If that is not applicable (i.e. you I<really>
265want to wait, use C<$cf::WAIT_FOR_TICK>).
266
267=item $cf::WAIT_FOR_TICK
268
269Note that C<cf::wait_for_tick> is probably the correct thing to use. This
270variable contains a L<Coro::Signal> that is broadcats after every server
271tick. Calling C<< ->wait >> on it will suspend the caller until after the
272next server tick.
273
274=cut
275
276sub wait_for_tick();
277sub wait_for_tick_begin();
240 278
241=item @cf::INVOKE_RESULTS 279=item @cf::INVOKE_RESULTS
242 280
243This array contains the results of the last C<invoke ()> call. When 281This array contains the results of the last C<invoke ()> call. When
244C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 282C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
252 290
253=back 291=back
254 292
255=cut 293=cut
256 294
295sub error(@) { LOG llevError, join "", @_ }
296sub warn (@) { LOG llevWarn , join "", @_ }
297sub info (@) { LOG llevInfo , join "", @_ }
298sub debug(@) { LOG llevDebug, join "", @_ }
299sub trace(@) { LOG llevTrace, join "", @_ }
300
257$Coro::State::WARNHOOK = sub { 301$Coro::State::WARNHOOK = sub {
258 my $msg = join "", @_; 302 my $msg = join "", @_;
259 303
260 $msg .= "\n" 304 $msg .= "\n"
261 unless $msg =~ /\n$/; 305 unless $msg =~ /\n$/;
262 306
263 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 307 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264 308
265 LOG llevError, $msg; 309 LOG llevWarn, $msg;
266}; 310};
267 311
268$Coro::State::DIEHOOK = sub { 312$Coro::State::DIEHOOK = sub {
269 return unless $^S eq 0; # "eq", not "==" 313 return unless $^S eq 0; # "eq", not "=="
270 314
271 warn Carp::longmess $_[0]; 315 error Carp::longmess $_[0];
272 316
273 if (in_main) {#d# 317 if (in_main) {#d#
274 warn "DIEHOOK called in main context, Coro bug?\n";#d# 318 error "DIEHOOK called in main context, Coro bug?\n";#d#
275 return;#d# 319 return;#d#
276 }#d# 320 }#d#
277 321
278 # kill coroutine otherwise 322 # kill coroutine otherwise
279 Coro::terminate 323 Coro::terminate
299)) { 343)) {
300 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 344 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301} 345}
302 346
303$EV::DIED = sub { 347$EV::DIED = sub {
304 Carp::cluck "error in event callback: @_"; 348 warn "error in event callback: $@";
305}; 349};
350
351#############################################################################
352
353sub fork_call(&@);
354sub get_slot($;$$);
306 355
307############################################################################# 356#############################################################################
308 357
309=head2 UTILITY FUNCTIONS 358=head2 UTILITY FUNCTIONS
310 359
331 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 380 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
332 $d 381 $d
333 } || "[unable to dump $_[0]: '$@']"; 382 } || "[unable to dump $_[0]: '$@']";
334} 383}
335 384
385=item $scalar = cf::load_file $path
386
387Loads the given file from path and returns its contents. Croaks on error
388and can block.
389
390=cut
391
392sub load_file($) {
393 0 <= aio_load $_[0], my $data
394 or Carp::croak "$_[0]: $!";
395
396 $data
397}
398
399=item $success = cf::replace_file $path, $data, $sync
400
401Atomically replaces the file at the given $path with new $data, and
402optionally $sync the data to disk before replacing the file.
403
404=cut
405
406sub replace_file($$;$) {
407 my ($path, $data, $sync) = @_;
408
409 my $lock = cf::lock_acquire ("replace_file:$path");
410
411 my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
412 or return;
413
414 $data = $data->() if ref $data;
415
416 length $data == aio_write $fh, 0, (length $data), $data, 0
417 or return;
418
419 !$sync
420 or !aio_fsync $fh
421 or return;
422
423 aio_close $fh
424 and return;
425
426 aio_rename "$path~", $path
427 and return;
428
429 if ($sync) {
430 $path =~ s%/[^/]*$%%;
431 aio_pathsync $path;
432 }
433
434 1
435}
436
336=item $ref = cf::decode_json $json 437=item $ref = cf::decode_json $json
337 438
338Converts a JSON string into the corresponding perl data structure. 439Converts a JSON string into the corresponding perl data structure.
339 440
340=item $json = cf::encode_json $ref 441=item $json = cf::encode_json $ref
346our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 447our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347 448
348sub encode_json($) { $json_coder->encode ($_[0]) } 449sub encode_json($) { $json_coder->encode ($_[0]) }
349sub decode_json($) { $json_coder->decode ($_[0]) } 450sub decode_json($) { $json_coder->decode ($_[0]) }
350 451
452=item $ref = cf::decode_storable $scalar
453
454Same as Coro::Storable::thaw, so blocks.
455
456=cut
457
458BEGIN { *decode_storable = \&Coro::Storable::thaw }
459
460=item $ref = cf::decode_yaml $scalar
461
462Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
463
464=cut
465
466sub decode_yaml($) {
467 fork_call { YAML::XS::Load $_[0] } @_
468}
469
470=item $scalar = cf::decode_cbor $scalar
471
472Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
473blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
474alternative.
475
476=cut
477
478sub decode_cbor($) {
479 # we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
480 cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
481 CBOR::XS::decode_cbor $_[0]
482}
483
484=item $scalar = cf::unlzf $scalar
485
486Same as Compress::LZF::compress, but takes server ticks into account, so
487blocks.
488
489=cut
490
491sub unlzf($) {
492 # we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
493 cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
494 Compress::LZF::decompress $_[0]
495}
496
351=item cf::post_init { BLOCK } 497=item cf::post_init { BLOCK }
352 498
353Execute the given codeblock, I<after> all extensions have been (re-)loaded, 499Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354but I<before> the server starts ticking again. 500but I<before> the server starts ticking again.
355 501
356The cdoeblock will have a single boolean argument to indicate whether this 502The codeblock will have a single boolean argument to indicate whether this
357is a reload or not. 503is a reload or not.
358 504
359=cut 505=cut
360 506
361sub post_init(&) { 507sub post_init(&) {
362 push @POST_INIT, shift; 508 push @POST_INIT, shift;
363} 509}
364 510
511sub _post_init {
512 trace "running post_init jobs";
513
514 # run them in parallel...
515
516 my @join;
517
518 while () {
519 push @join, map &Coro::async ($_, 0), @POST_INIT;
520 @POST_INIT = ();
521
522 @join or last;
523
524 (pop @join)->join;
525 }
526}
527
365=item cf::lock_wait $string 528=item cf::lock_wait $string
366 529
367Wait until the given lock is available. See cf::lock_acquire. 530Wait until the given lock is available. See cf::lock_acquire.
368 531
369=item my $lock = cf::lock_acquire $string 532=item my $lock = cf::lock_acquire $string
370 533
371Wait until the given lock is available and then acquires it and returns 534Wait until the given lock is available and then acquires it and returns
372a L<Guard> object. If the guard object gets destroyed (goes out of scope, 535a L<Guard> object. If the guard object gets destroyed (goes out of scope,
420 EV::periodic $start, $interval, 0, $cb 583 EV::periodic $start, $interval, 0, $cb
421} 584}
422 585
423=item cf::get_slot $time[, $priority[, $name]] 586=item cf::get_slot $time[, $priority[, $name]]
424 587
425Allocate $time seconds of blocking CPU time at priority C<$priority>: 588Allocate $time seconds of blocking CPU time at priority C<$priority>
426This call blocks and returns only when you have at least C<$time> seconds 589(default: 0): This call blocks and returns only when you have at least
427of cpu time till the next tick. The slot is only valid till the next cede. 590C<$time> seconds of cpu time till the next tick. The slot is only valid
591till the next cede.
592
593Background jobs should use a priority less than zero, interactive jobs
594should use 100 or more.
428 595
429The optional C<$name> can be used to identify the job to run. It might be 596The optional C<$name> can be used to identify the job to run. It might be
430used for statistical purposes and should identify the same time-class. 597used for statistical purposes and should identify the same time-class.
431 598
432Useful for short background jobs. 599Useful for short background jobs.
444 my $signal = new Coro::Signal; 611 my $signal = new Coro::Signal;
445 my $busy; 612 my $busy;
446 613
447 while () { 614 while () {
448 next_job: 615 next_job:
616
617 Coro::cede;
449 618
450 my $avail = cf::till_tick; 619 my $avail = cf::till_tick;
451 620
452 for (0 .. $#SLOT_QUEUE) { 621 for (0 .. $#SLOT_QUEUE) {
453 if ($SLOT_QUEUE[$_][0] <= $avail) { 622 if ($SLOT_QUEUE[$_][0] <= $avail) {
454 $busy = 0; 623 $busy = 0;
455 my $job = splice @SLOT_QUEUE, $_, 1, (); 624 my $job = splice @SLOT_QUEUE, $_, 1, ();
456 $job->[2]->send; 625 $job->[2]->send;
457 Coro::cede;
458 goto next_job; 626 goto next_job;
459 } else { 627 } else {
460 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY; 628 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
461 } 629 }
462 } 630 }
463 631
464 if (@SLOT_QUEUE) { 632 if (@SLOT_QUEUE) {
465 # we do not use wait_for_tick() as it returns immediately when tick is inactive 633 wait_for_tick;
466 push @cf::WAIT_FOR_TICK, $signal;
467 $signal->wait;
468 } else { 634 } else {
469 $busy = 0; 635 $busy = 0;
470 Coro::schedule; 636 Coro::schedule;
471 } 637 }
472 } 638 }
498BEGIN { *async = \&Coro::async_pool } 664BEGIN { *async = \&Coro::async_pool }
499 665
500=item cf::sync_job { BLOCK } 666=item cf::sync_job { BLOCK }
501 667
502The design of Deliantra requires that the main coroutine ($Coro::main) 668The design of Deliantra requires that the main coroutine ($Coro::main)
503is always able to handle events or runnable, as Deliantra is only 669is always able to handle events or is runnable, as Deliantra is only
504partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 670partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
505acceptable. 671acceptable.
506 672
507If it must be done, put the blocking parts into C<sync_job>. This will run 673If it must be done, put the blocking parts into C<sync_job>. This will run
508the given BLOCK in another coroutine while waiting for the result. The 674the given BLOCK in another coroutine while waiting for the result. The
512=cut 678=cut
513 679
514sub sync_job(&) { 680sub sync_job(&) {
515 my ($job) = @_; 681 my ($job) = @_;
516 682
517 if ($Coro::current == $Coro::main) { 683 if (in_main) {
518 my $time = AE::time; 684 my $time = AE::time;
519 685
520 # this is the main coro, too bad, we have to block 686 # this is the main coro, too bad, we have to block
521 # till the operation succeeds, freezing the server :/ 687 # till the operation succeeds, freezing the server :/
522 688
523 LOG llevError, Carp::longmess "sync job";#d# 689 #LOG llevError, Carp::longmess "sync job";#d#
524 690
525 my $freeze_guard = freeze_mainloop; 691 my $freeze_guard = freeze_mainloop;
526 692
527 my $busy = 1; 693 my $busy = 1;
528 my @res; 694 my @res;
529 695
530 (async { 696 (async {
531 $Coro::current->desc ("sync job coro"); 697 $Coro::current->desc ("sync job coro");
532 @res = eval { $job->() }; 698 @res = eval { $job->() };
533 warn $@ if $@; 699 error $@ if $@;
534 undef $busy; 700 undef $busy;
535 })->prio (Coro::PRIO_MAX); 701 })->prio (Coro::PRIO_MAX);
536 702
537 while ($busy) { 703 while ($busy) {
538 if (Coro::nready) { 704 if (Coro::nready) {
539 Coro::cede_notself; 705 Coro::cede_notself;
540 } else { 706 } else {
541 EV::loop EV::LOOP_ONESHOT; 707 EV::run EV::RUN_ONCE;
542 } 708 }
543 } 709 }
544 710
545 my $time = AE::time - $time; 711 my $time = AE::time - $time;
546 712
572 $EXT_CORO{$coro+0} = $coro; 738 $EXT_CORO{$coro+0} = $coro;
573 739
574 $coro 740 $coro
575} 741}
576 742
577=item fork_call { }, $args 743=item fork_call { }, @args
578 744
579Executes the given code block with the given arguments in a seperate 745Executes the given code block with the given arguments in a seperate
580process, returning the results. Everything must be serialisable with 746process, returning the results. Everything must be serialisable with
581Coro::Storable. May, of course, block. Note that the executed sub may 747Coro::Storable. May, of course, block. Note that the executed sub may
582never block itself or use any form of event handling. 748never block itself or use any form of event handling.
583 749
584=cut 750=cut
585 751
752sub post_fork {
753 reset_signals;
754}
755
586sub fork_call(&@) { 756sub fork_call(&@) {
587 my ($cb, @args) = @_; 757 my ($cb, @args) = @_;
588 758
589 # we seemingly have to make a local copy of the whole thing,
590 # otherwise perl prematurely frees the stuff :/
591 # TODO: investigate and fix (likely this will be rather laborious)
592
593 my @res = Coro::Util::fork_eval { 759 my @res = Coro::Util::fork_eval {
594 reset_signals; 760 cf::post_fork;
595 &$cb 761 &$cb
596 }, @args; 762 } @args;
597 763
598 wantarray ? @res : $res[-1] 764 wantarray ? @res : $res[-1]
599} 765}
600 766
601sub objinfo { 767sub objinfo {
651within each server. 817within each server.
652 818
653=cut 819=cut
654 820
655sub db_table($) { 821sub db_table($) {
822 cf::error "db_get called from main context"
823 if $Coro::current == $Coro::main;
824
656 my ($name) = @_; 825 my ($name) = @_;
657 my $db = BDB::db_create $DB_ENV; 826 my $db = BDB::db_create $DB_ENV;
658 827
659 eval { 828 eval {
660 $db->set_flags (BDB::CHKSUM); 829 $db->set_flags (BDB::CHKSUM);
670} 839}
671 840
672our $DB; 841our $DB;
673 842
674sub db_init { 843sub db_init {
675 cf::sync_job {
676 $DB ||= db_table "db"; 844 $DB ||= db_table "db";
677 };
678} 845}
679 846
680sub db_get($$) { 847sub db_get($$) {
681 my $key = "$_[0]/$_[1]"; 848 my $key = "$_[0]/$_[1]";
682 849
683 cf::sync_job { 850 cf::error "db_get called from main context"
851 if $Coro::current == $Coro::main;
852
684 BDB::db_get $DB, undef, $key, my $data; 853 BDB::db_get $DB, undef, $key, my $data;
685 854
686 $! ? () 855 $! ? ()
687 : $data 856 : $data
688 }
689} 857}
690 858
691sub db_put($$$) { 859sub db_put($$$) {
692 BDB::dbreq_pri 4; 860 BDB::dbreq_pri 4;
693 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { }; 861 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
721 889
722 my @data; 890 my @data;
723 my $md5; 891 my $md5;
724 892
725 for (0 .. $#$src) { 893 for (0 .. $#$src) {
726 0 <= aio_load $src->[$_], $data[$_] 894 $data[$_] = load_file $src->[$_];
727 or Carp::croak "$src->[$_]: $!";
728 } 895 }
729 896
730 # if processing is expensive, check 897 # if processing is expensive, check
731 # checksum first 898 # checksum first
732 if (1) { 899 if (1) {
745 912
746 return db_get cache => "$id/data"; 913 return db_get cache => "$id/data";
747 } 914 }
748 } 915 }
749 916
750 my $t1 = Time::HiRes::time; 917 my $t1 = EV::time;
751 my $data = $process->(\@data); 918 my $data = $process->(\@data);
752 my $t2 = Time::HiRes::time; 919 my $t2 = EV::time;
753 920
754 warn "cache: '$id' processed in ", $t2 - $t1, "s\n"; 921 info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755 922
756 db_put cache => "$id/data", $data; 923 db_put cache => "$id/data", $data;
757 db_put cache => "$id/md5" , $md5; 924 db_put cache => "$id/md5" , $md5;
758 db_put cache => "$id/meta", $meta; 925 db_put cache => "$id/meta", $meta;
759 926
769 936
770=cut 937=cut
771 938
772sub datalog($@) { 939sub datalog($@) {
773 my ($type, %kv) = @_; 940 my ($type, %kv) = @_;
774 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type }); 941 info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775} 942}
776 943
777=back 944=back
778 945
779=cut 946=cut
974 1141
975 } elsif (exists $cb_id{$type}) { 1142 } elsif (exists $cb_id{$type}) {
976 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg; 1143 _attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977 1144
978 } elsif (ref $type) { 1145 } elsif (ref $type) {
979 warn "attaching objects not supported, ignoring.\n"; 1146 error "attaching objects not supported, ignoring.\n";
980 1147
981 } else { 1148 } else {
982 shift @arg; 1149 shift @arg;
983 warn "attach argument '$type' not supported, ignoring.\n"; 1150 error "attach argument '$type' not supported, ignoring.\n";
984 } 1151 }
985 } 1152 }
986} 1153}
987 1154
988sub _object_attach { 1155sub _object_attach {
998 _attach $registry, $klass, @attach; 1165 _attach $registry, $klass, @attach;
999 } 1166 }
1000 1167
1001 $obj->{$name} = \%arg; 1168 $obj->{$name} = \%arg;
1002 } else { 1169 } else {
1003 warn "object uses attachment '$name' which is not available, postponing.\n"; 1170 info "object uses attachment '$name' which is not available, postponing.\n";
1004 } 1171 }
1005 1172
1006 $obj->{_attachment}{$name} = undef; 1173 $obj->{_attachment}{$name} = undef;
1007} 1174}
1008 1175
1067 1234
1068 for (@$callbacks) { 1235 for (@$callbacks) {
1069 eval { &{$_->[1]} }; 1236 eval { &{$_->[1]} };
1070 1237
1071 if ($@) { 1238 if ($@) {
1072 warn "$@";
1073 warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n"; 1239 error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074 override; 1240 override;
1075 } 1241 }
1076 1242
1077 return 1 if $override; 1243 return 1 if $override;
1078 } 1244 }
1157 for (@$attach) { 1323 for (@$attach) {
1158 my ($klass, @attach) = @$_; 1324 my ($klass, @attach) = @$_;
1159 _attach $registry, $klass, @attach; 1325 _attach $registry, $klass, @attach;
1160 } 1326 }
1161 } else { 1327 } else {
1162 warn "object uses attachment '$name' that is not available, postponing.\n"; 1328 info "object uses attachment '$name' that is not available, postponing.\n";
1163 } 1329 }
1164 } 1330 }
1165} 1331}
1166 1332
1167cf::attachable->attach ( 1333cf::attachable->attach (
1194 my ($filename, $rdata, $objs) = @_; 1360 my ($filename, $rdata, $objs) = @_;
1195 1361
1196 sync_job { 1362 sync_job {
1197 if (length $$rdata) { 1363 if (length $$rdata) {
1198 utf8::decode (my $decname = $filename); 1364 utf8::decode (my $decname = $filename);
1199 warn sprintf "saving %s (%d,%d)\n", 1365 trace sprintf "saving %s (%d,%d)\n",
1200 $decname, length $$rdata, scalar @$objs 1366 $decname, length $$rdata, scalar @$objs
1201 if $VERBOSE_IO; 1367 if $VERBOSE_IO;
1202 1368
1203 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1369 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204 aio_chmod $fh, SAVE_MODE; 1370 aio_chmod $fh, SAVE_MODE;
1205 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1371 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1228 aio_rename "$filename~", $filename; 1394 aio_rename "$filename~", $filename;
1229 1395
1230 $filename =~ s%/[^/]+$%%; 1396 $filename =~ s%/[^/]+$%%;
1231 aio_pathsync $filename if $cf::USE_FSYNC; 1397 aio_pathsync $filename if $cf::USE_FSYNC;
1232 } else { 1398 } else {
1233 warn "unable to save objects: $filename~: $!\n"; 1399 error "unable to save objects: $filename~: $!\n";
1234 } 1400 }
1235 } else { 1401 } else {
1236 aio_unlink $filename; 1402 aio_unlink $filename;
1237 aio_unlink "$filename.pst"; 1403 aio_unlink "$filename.pst";
1238 } 1404 }
1262 my $st = eval { Coro::Storable::thaw $av }; 1428 my $st = eval { Coro::Storable::thaw $av };
1263 $av = $st->{objs}; 1429 $av = $st->{objs};
1264 } 1430 }
1265 1431
1266 utf8::decode (my $decname = $filename); 1432 utf8::decode (my $decname = $filename);
1267 warn sprintf "loading %s (%d,%d)\n", 1433 trace sprintf "loading %s (%d,%d)\n",
1268 $decname, length $data, scalar @{$av || []} 1434 $decname, length $data, scalar @{$av || []}
1269 if $VERBOSE_IO; 1435 if $VERBOSE_IO;
1270 1436
1271 ($data, $av) 1437 ($data, $av)
1272} 1438}
1273 1439
1278=cut 1444=cut
1279 1445
1280############################################################################# 1446#############################################################################
1281# command handling &c 1447# command handling &c
1282 1448
1283=item cf::register_command $name => \&callback($ob,$args); 1449=item cf::register_command $name => \&callback($ob,$args)
1284 1450
1285Register a callback for execution when the client sends the user command 1451Register a callback for execution when the client sends the user command
1286$name. 1452$name.
1287 1453
1288=cut 1454=cut
1294 #warn "registering command '$name/$time' to '$caller'"; 1460 #warn "registering command '$name/$time' to '$caller'";
1295 1461
1296 push @{ $COMMAND{$name} }, [$caller, $cb]; 1462 push @{ $COMMAND{$name} }, [$caller, $cb];
1297} 1463}
1298 1464
1299=item cf::register_extcmd $name => \&callback($pl,$packet); 1465=item cf::register_extcmd $name => \&callback($pl,@args)
1300 1466
1301Register a callback for execution when the client sends an (synchronous) 1467Register a callback for execution when the client sends an (synchronous)
1302extcmd packet. Ext commands will be processed in the order they are 1468extcmd packet. Ext commands will be processed in the order they are
1303received by the server, like other user commands. The first argument is 1469received by the server, like other user commands. The first argument is
1304the logged-in player. Ext commands can only be processed after a player 1470the logged-in player. Ext commands can only be processed after a player
1305has logged in successfully. 1471has logged in successfully.
1306 1472
1307If the callback returns something, it is sent back as if reply was being 1473The values will be sent back to the client.
1308called.
1309 1474
1475=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
1476
1477Same as C<cf::register_extcmd>, but instead of returning values, the
1478callback needs to clal the C<$reply> function.
1479
1310=item cf::register_exticmd $name => \&callback($ns,$packet); 1480=item cf::register_exticmd $name => \&callback($ns,@args)
1311 1481
1312Register a callback for execution when the client sends an (asynchronous) 1482Register a callback for execution when the client sends an (asynchronous)
1313exticmd packet. Exti commands are processed by the server as soon as they 1483exticmd packet. Exti commands are processed by the server as soon as they
1314are received, i.e. out of order w.r.t. other commands. The first argument 1484are received, i.e. out of order w.r.t. other commands. The first argument
1315is a client socket. Exti commands can be received anytime, even before 1485is a client socket. Exti commands can be received anytime, even before
1316log-in. 1486log-in.
1317 1487
1318If the callback returns something, it is sent back as if reply was being 1488The values will be sent back to the client.
1319called.
1320 1489
1321=cut 1490=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322 1491
1492Same as C<cf::register_extcmd>, but instead of returning values, the
1493callback needs to clal the C<$reply> function.
1494
1495=cut
1496
1323sub register_extcmd { 1497sub register_extcmd($$) {
1324 my ($name, $cb) = @_; 1498 my ($name, $cb) = @_;
1325 1499
1326 $EXTCMD{$name} = $cb; 1500 $EXTCMD{$name} = $cb;
1327} 1501}
1328 1502
1329sub register_exticmd { 1503sub register_async_extcmd($$) {
1330 my ($name, $cb) = @_; 1504 my ($name, $cb) = @_;
1331 1505
1506 $EXTACMD{$name} = $cb;
1507}
1508
1509sub register_exticmd($$) {
1510 my ($name, $cb) = @_;
1511
1332 $EXTICMD{$name} = $cb; 1512 $EXTICMD{$name} = $cb;
1513}
1514
1515sub register_async_exticmd($$) {
1516 my ($name, $cb) = @_;
1517
1518 $EXTIACMD{$name} = $cb;
1333} 1519}
1334 1520
1335use File::Glob (); 1521use File::Glob ();
1336 1522
1337cf::player->attach ( 1523cf::player->attach (
1351 my ($pl, $buf) = @_; 1537 my ($pl, $buf) = @_;
1352 1538
1353 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1539 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354 1540
1355 if (ref $msg) { 1541 if (ref $msg) {
1356 my ($type, $reply, @payload) = 1542 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357 "ARRAY" eq ref $msg
1358 ? @$msg
1359 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360 1543
1361 my @reply;
1362
1363 if (my $cb = $EXTCMD{$type}) { 1544 if (my $cb = $EXTACMD{$type}) {
1545 $cb->(
1546 $pl,
1547 sub {
1548 $pl->ext_msg ("reply-$reply", @_)
1549 if $reply;
1550 },
1551 @payload
1552 );
1553 } else {
1554 my @reply;
1555
1556 if (my $cb = $EXTCMD{$type}) {
1364 @reply = $cb->($pl, @payload); 1557 @reply = $cb->($pl, @payload);
1558 }
1559
1560 $pl->ext_msg ("reply-$reply", @reply)
1561 if $reply;
1365 } 1562 }
1366 1563
1367 $pl->ext_reply ($reply, @reply)
1368 if $reply;
1369
1370 } else { 1564 } else {
1371 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1565 error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372 } 1566 }
1373 1567
1374 cf::override; 1568 cf::override;
1375 }, 1569 },
1376); 1570);
1386 }; 1580 };
1387 1581
1388 $grp 1582 $grp
1389} 1583}
1390 1584
1585sub _ext_cfg_reg($$$$) {
1586 my ($rvar, $varname, $cfgname, $default) = @_;
1587
1588 $cfgname = lc $varname
1589 unless length $cfgname;
1590
1591 $EXT_CFG{$cfgname} = [$rvar, $default];
1592
1593 $$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
1594}
1595
1391sub load_extensions { 1596sub load_extensions {
1597 info "loading extensions...";
1598
1599 %EXT_CFG = ();
1600
1392 cf::sync_job { 1601 cf::sync_job {
1393 my %todo; 1602 my %todo;
1394 1603
1395 for my $path (<$LIBDIR/*.ext>) { 1604 for my $path (<$LIBDIR/*.ext>) {
1396 next unless -r $path; 1605 next unless -r $path;
1414 1623
1415 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1624 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1625 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417 1626
1418 $ext{source} = 1627 $ext{source} =
1419 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n" 1628 "package $pkg; use common::sense;\n"
1420 . "#line 1 \"$path\"\n{\n" 1629 . "#line 1 \"$path\"\n{\n"
1421 . $source 1630 . $source
1422 . "\n};\n1"; 1631 . "\n};\n1";
1423 1632
1424 $todo{$base} = \%ext; 1633 $todo{$base} = \%ext;
1436 for (split /,\s*/, $v->{meta}{depends}) { 1645 for (split /,\s*/, $v->{meta}{depends}) {
1437 next ext 1646 next ext
1438 unless exists $done{$_}; 1647 unless exists $done{$_};
1439 } 1648 }
1440 1649
1441 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n"; 1650 trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442 1651
1652 my $source = $v->{source};
1653
1654 # support "CONF varname :confname = default" pseudo-statements
1655 $source =~ s{
1656 ^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
1657 }{
1658 "our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
1659 }gmxe;
1660
1443 my $active = eval $v->{source}; 1661 my $active = eval $source;
1444 1662
1445 if (length $@) { 1663 if (length $@) {
1446 warn "$v->{path}: $@\n"; 1664 error "$v->{path}: $@\n";
1447 1665
1448 cf::cleanup "mandatory extension '$k' failed to load, exiting." 1666 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449 if exists $v->{meta}{mandatory}; 1667 if exists $v->{meta}{mandatory};
1450 1668
1451 warn "$v->{base}: optional extension cannot be loaded, skipping.\n"; 1669 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1453 } else { 1671 } else {
1454 $done{$k} = delete $todo{$k}; 1672 $done{$k} = delete $todo{$k};
1455 push @EXTS, $v->{pkg}; 1673 push @EXTS, $v->{pkg};
1456 $progress = 1; 1674 $progress = 1;
1457 1675
1458 warn "$v->{base}: extension inactive.\n" 1676 info "$v->{base}: extension inactive.\n"
1459 unless $active; 1677 unless $active;
1460 } 1678 }
1461 } 1679 }
1462 1680
1463 unless ($progress) { 1681 unless ($progress) {
1465 1683
1466 while (my ($k, $v) = each %todo) { 1684 while (my ($k, $v) = each %todo) {
1467 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting." 1685 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468 if exists $v->{meta}{mandatory}; 1686 if exists $v->{meta}{mandatory};
1469 } 1687 }
1688
1689 last;
1470 } 1690 }
1471 } 1691 }
1472 }; 1692 };
1473} 1693}
1474 1694
1632 my $name = $pl->ob->name; 1852 my $name = $pl->ob->name;
1633 1853
1634 $pl->{deny_save} = 1; 1854 $pl->{deny_save} = 1;
1635 $pl->password ("*"); # this should lock out the player until we have nuked the dir 1855 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1636 1856
1637 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1857 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638 $pl->deactivate; 1858 $pl->deactivate;
1859
1639 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy; 1860 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640 $pl->ob->check_score;
1641 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1861 $pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1862 ext::highscore::check ($pl->ob);
1863
1642 $pl->ns->destroy if $pl->ns; 1864 $pl->ns->destroy if $pl->ns;
1643 1865
1644 my $path = playerdir $pl; 1866 my $path = playerdir $pl;
1645 my $temp = "$path~$cf::RUNTIME~deleting~"; 1867 my $temp = "$path~$cf::RUNTIME~deleting~";
1646 aio_rename $path, $temp; 1868 aio_rename $path, $temp;
1732 1954
1733=item $protocol_xml = $player->expand_cfpod ($cfpod) 1955=item $protocol_xml = $player->expand_cfpod ($cfpod)
1734 1956
1735Expand deliantra pod fragments into protocol xml. 1957Expand deliantra pod fragments into protocol xml.
1736 1958
1737=item $player->ext_reply ($msgid, @msg)
1738
1739Sends an ext reply to the player.
1740
1741=cut
1742
1743sub ext_reply($$@) {
1744 my ($self, $id, @msg) = @_;
1745
1746 $self->ns->ext_reply ($id, @msg)
1747}
1748
1749=item $player->ext_msg ($type, @msg) 1959=item $player->ext_msg ($type, @msg)
1750 1960
1751Sends an ext event to the client. 1961Sends an ext event to the client.
1752 1962
1753=cut 1963=cut
1812sub generate_random_map { 2022sub generate_random_map {
1813 my ($self, $rmp) = @_; 2023 my ($self, $rmp) = @_;
1814 2024
1815 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM 2025 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1816 2026
1817 # mit "rum" bekleckern, nicht
1818 $self->_create_random_map ( 2027 $self->_create_random_map ($rmp);
1819 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1820 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1821 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1822 $rmp->{exit_on_final_map},
1823 $rmp->{xsize}, $rmp->{ysize},
1824 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1825 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1826 $rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1827 $rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1828 $rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1829 (cf::region::find $rmp->{region}), $rmp->{custom}
1830 )
1831} 2028}
1832 2029
1833=item cf::map->register ($regex, $prio) 2030=item cf::map->register ($regex, $prio)
1834 2031
1835Register a handler for the map path matching the given regex at the 2032Register a handler for the map path matching the given regex at the
1840 2037
1841sub register { 2038sub register {
1842 my (undef, $regex, $prio) = @_; 2039 my (undef, $regex, $prio) = @_;
1843 my $pkg = caller; 2040 my $pkg = caller;
1844 2041
1845 no strict;
1846 push @{"$pkg\::ISA"}, __PACKAGE__; 2042 push @{"$pkg\::ISA"}, __PACKAGE__;
1847 2043
1848 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 2044 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1849} 2045}
1850 2046
1862} 2058}
1863 2059
1864sub normalise { 2060sub normalise {
1865 my ($path, $base) = @_; 2061 my ($path, $base) = @_;
1866 2062
1867 $path = "$path"; # make sure its a string 2063 $path = "$path"; # make sure it's a string
1868 2064
1869 $path =~ s/\.map$//; 2065 $path =~ s/\.map$//;
1870 2066
1871 # map plan: 2067 # map plan:
1872 # 2068 #
1887 $base =~ s{[^/]+/?$}{}; 2083 $base =~ s{[^/]+/?$}{};
1888 $path = "$base/$path"; 2084 $path = "$base/$path";
1889 } 2085 }
1890 2086
1891 for ($path) { 2087 for ($path) {
1892 redo if s{//}{/};
1893 redo if s{/\.?/}{/}; 2088 redo if s{/\.?/}{/};
1894 redo if s{/[^/]+/\.\./}{/}; 2089 redo if s{/[^/]+/\.\./}{/};
1895 } 2090 }
1896 2091
1897 $path 2092 $path
1911 $self->init; # pass $1 etc. 2106 $self->init; # pass $1 etc.
1912 return $self; 2107 return $self;
1913 } 2108 }
1914 } 2109 }
1915 2110
1916 Carp::cluck "unable to resolve path '$path' (base '$base')."; 2111 Carp::cluck "unable to resolve path '$path' (base '$base')";
1917 () 2112 ()
1918} 2113}
1919 2114
2115# may re-bless or do other evil things
1920sub init { 2116sub init {
1921 my ($self) = @_; 2117 my ($self) = @_;
1922 2118
1923 $self 2119 $self
1924} 2120}
1989 $self->{load_path} = $path; 2185 $self->{load_path} = $path;
1990 2186
1991 1 2187 1
1992} 2188}
1993 2189
2190# used to laod the header of an original map
1994sub load_header_orig { 2191sub load_header_orig {
1995 my ($self) = @_; 2192 my ($self) = @_;
1996 2193
1997 $self->load_header_from ($self->load_path) 2194 $self->load_header_from ($self->load_path)
1998} 2195}
1999 2196
2197# used to laod the header of an instantiated map
2000sub load_header_temp { 2198sub load_header_temp {
2001 my ($self) = @_; 2199 my ($self) = @_;
2002 2200
2003 $self->load_header_from ($self->save_path) 2201 $self->load_header_from ($self->save_path)
2004} 2202}
2005 2203
2204# called after loading the header from an instantiated map
2006sub prepare_temp { 2205sub prepare_temp {
2007 my ($self) = @_; 2206 my ($self) = @_;
2008 2207
2009 $self->last_access ((delete $self->{last_access}) 2208 $self->last_access ((delete $self->{last_access})
2010 || $cf::RUNTIME); #d# 2209 || $cf::RUNTIME); #d#
2011 # safety 2210 # safety
2012 $self->{instantiate_time} = $cf::RUNTIME 2211 $self->{instantiate_time} = $cf::RUNTIME
2013 if $self->{instantiate_time} > $cf::RUNTIME; 2212 if $self->{instantiate_time} > $cf::RUNTIME;
2014} 2213}
2015 2214
2215# called after loading the header from an original map
2016sub prepare_orig { 2216sub prepare_orig {
2017 my ($self) = @_; 2217 my ($self) = @_;
2018 2218
2019 $self->{load_original} = 1; 2219 $self->{load_original} = 1;
2020 $self->{instantiate_time} = $cf::RUNTIME; 2220 $self->{instantiate_time} = $cf::RUNTIME;
2044 2244
2045sub find; 2245sub find;
2046sub find { 2246sub find {
2047 my ($path, $origin) = @_; 2247 my ($path, $origin) = @_;
2048 2248
2249 cf::cede_to_tick;
2250
2049 $path = normalise $path, $origin && $origin->path; 2251 $path = normalise $path, $origin;
2050 2252
2051 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove 2253 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2052 my $guard2 = cf::lock_acquire "map_find:$path"; 2254 my $guard2 = cf::lock_acquire "map_find:$path";
2053 2255
2054 $cf::MAP{$path} || do { 2256 $cf::MAP{$path} || do {
2085 2287
2086 { 2288 {
2087 my $guard = cf::lock_acquire "map_data:$path"; 2289 my $guard = cf::lock_acquire "map_data:$path";
2088 2290
2089 return unless $self->valid; 2291 return unless $self->valid;
2090 return unless $self->in_memory == cf::MAP_SWAPPED; 2292 return unless $self->state == cf::MAP_SWAPPED;
2091
2092 $self->in_memory (cf::MAP_LOADING);
2093 2293
2094 $self->alloc; 2294 $self->alloc;
2095 2295
2096 $self->pre_load; 2296 $self->pre_load;
2097 cf::cede_to_tick; 2297 cf::cede_to_tick;
2098 2298
2299 if (exists $self->{load_path}) {
2099 my $f = new_from_file cf::object::thawer $self->{load_path}; 2300 my $f = new_from_file cf::object::thawer $self->{load_path};
2100 $f->skip_block; 2301 $f->skip_block;
2101 $self->_load_objects ($f) 2302 $self->_load_objects ($f)
2102 or return; 2303 or return;
2103 2304
2104 $self->post_load_original 2305 $self->post_load_original
2105 if delete $self->{load_original}; 2306 if delete $self->{load_original};
2106 2307
2107 if (my $uniq = $self->uniq_path) { 2308 if (my $uniq = $self->uniq_path) {
2108 utf8::encode $uniq; 2309 utf8::encode $uniq;
2109 unless (aio_stat $uniq) { 2310 unless (aio_stat $uniq) {
2110 if (my $f = new_from_file cf::object::thawer $uniq) { 2311 if (my $f = new_from_file cf::object::thawer $uniq) {
2111 $self->clear_unique_items; 2312 $self->clear_unique_items;
2112 $self->_load_objects ($f); 2313 $self->_load_objects ($f);
2113 $f->resolve_delayed_derefs; 2314 $f->resolve_delayed_derefs;
2315 }
2114 } 2316 }
2115 } 2317 }
2116 }
2117 2318
2118 $f->resolve_delayed_derefs; 2319 $f->resolve_delayed_derefs;
2320 } else {
2321 $self->post_load_original
2322 if delete $self->{load_original};
2323 }
2324
2325 $self->state (cf::MAP_INACTIVE);
2119 2326
2120 cf::cede_to_tick; 2327 cf::cede_to_tick;
2121 # now do the right thing for maps 2328 # now do the right thing for maps
2122 $self->link_multipart_objects; 2329 $self->link_multipart_objects;
2123 $self->difficulty ($self->estimate_difficulty) 2330 $self->difficulty ($self->estimate_difficulty)
2127 unless ($self->{deny_activate}) { 2334 unless ($self->{deny_activate}) {
2128 $self->decay_objects; 2335 $self->decay_objects;
2129 $self->fix_auto_apply; 2336 $self->fix_auto_apply;
2130 $self->update_buttons; 2337 $self->update_buttons;
2131 cf::cede_to_tick; 2338 cf::cede_to_tick;
2132 $self->activate; 2339 #$self->activate; # no longer activate maps automatically
2133 } 2340 }
2134 2341
2135 $self->{last_save} = $cf::RUNTIME; 2342 $self->{last_save} = $cf::RUNTIME;
2136 $self->last_access ($cf::RUNTIME); 2343 $self->last_access ($cf::RUNTIME);
2137
2138 $self->in_memory (cf::MAP_ACTIVE);
2139 } 2344 }
2140 2345
2141 $self->post_load; 2346 $self->post_load;
2347
2348 1
2142} 2349}
2143 2350
2144# customize the map for a given player, i.e. 2351# customize the map for a given player, i.e.
2145# return the _real_ map. used by e.g. per-player 2352# return the _real_ map. used by e.g. per-player
2146# maps to change the path to ~playername/mappath 2353# maps to change the path to ~playername/mappath
2154# if $self->per_party; 2361# if $self->per_party;
2155 2362
2156 $self 2363 $self
2157} 2364}
2158 2365
2159# find and load all maps in the 3x3 area around a map
2160sub load_neighbours {
2161 my ($map) = @_;
2162
2163 my @neigh; # diagonal neighbours
2164
2165 for (0 .. 3) {
2166 my $neigh = $map->tile_path ($_)
2167 or next;
2168 $neigh = find $neigh, $map
2169 or next;
2170 $neigh->load;
2171
2172 # now find the diagonal neighbours
2173 push @neigh,
2174 [$neigh->tile_path (($_ + 3) % 4), $neigh],
2175 [$neigh->tile_path (($_ + 1) % 4), $neigh];
2176 }
2177
2178 for (grep defined $_->[0], @neigh) {
2179 my ($path, $origin) = @$_;
2180 my $neigh = find $path, $origin
2181 or next;
2182 $neigh->load;
2183 }
2184}
2185
2186sub find_sync { 2366sub find_sync {
2187 my ($path, $origin) = @_; 2367 my ($path, $origin) = @_;
2188 2368
2189 cf::sync_job { find $path, $origin } 2369 # it's a bug to call this from the main context
2370 return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2371 if $Coro::current == $Coro::main;
2372
2373 find $path, $origin
2190} 2374}
2191 2375
2192sub do_load_sync { 2376sub do_load_sync {
2193 my ($map) = @_; 2377 my ($map) = @_;
2194 2378
2379 # it's a bug to call this from the main context
2195 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2380 return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2196 if $Coro::current == $Coro::main; 2381 if $Coro::current == $Coro::main;
2197 2382
2198 cf::sync_job { $map->load }; 2383 $map->load;
2199} 2384}
2200 2385
2201our %MAP_PREFETCH; 2386our %MAP_PREFETCH;
2202our $MAP_PREFETCHER = undef; 2387our $MAP_PREFETCHER = undef;
2203 2388
2204sub find_async { 2389sub find_async {
2205 my ($path, $origin, $load) = @_; 2390 my ($path, $origin, $load) = @_;
2206 2391
2207 $path = normalise $path, $origin && $origin->{path}; 2392 $path = normalise $path, $origin;
2208 2393
2209 if (my $map = $cf::MAP{$path}) { 2394 if (my $map = $cf::MAP{$path}) {
2210 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE; 2395 return $map if !$load || $map->linkable;
2211 } 2396 }
2212 2397
2213 $MAP_PREFETCH{$path} |= $load; 2398 $MAP_PREFETCH{$path} |= $load;
2214 2399
2215 $MAP_PREFETCHER ||= cf::async { 2400 $MAP_PREFETCHER ||= cf::async {
2216 $Coro::current->{desc} = "map prefetcher"; 2401 $Coro::current->{desc} = "map prefetcher";
2217 2402
2218 while (%MAP_PREFETCH) { 2403 while (%MAP_PREFETCH) {
2219 while (my ($k, $v) = each %MAP_PREFETCH) { 2404 for my $k (keys %MAP_PREFETCH) {
2220 if (my $map = find $k) { 2405 if (my $map = find $k) {
2221 $map->load if $v; 2406 $map->load if $MAP_PREFETCH{$k};
2222 } 2407 }
2223 2408
2224 delete $MAP_PREFETCH{$k}; 2409 delete $MAP_PREFETCH{$k};
2225 } 2410 }
2226 } 2411 }
2274sub swap_out { 2459sub swap_out {
2275 my ($self) = @_; 2460 my ($self) = @_;
2276 2461
2277 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2462 my $lock = cf::lock_acquire "map_data:$self->{path}";
2278 2463
2279 return if $self->in_memory != cf::MAP_ACTIVE; 2464 return if !$self->linkable;
2280 return if $self->{deny_save}; 2465 return if $self->{deny_save};
2281 return if $self->players; 2466 return if $self->players;
2282 2467
2283 # first deactivate the map and "unlink" it from the core 2468 # first deactivate the map and "unlink" it from the core
2284 $self->deactivate; 2469 $self->deactivate;
2285 $_->clear_links_to ($self) for values %cf::MAP; 2470 $_->clear_links_to ($self) for values %cf::MAP;
2286 $self->in_memory (cf::MAP_SWAPPED); 2471 $self->state (cf::MAP_SWAPPED);
2287 2472
2288 # then atomically save 2473 # then atomically save
2289 $self->_save; 2474 $self->_save;
2290 2475
2291 # then free the map 2476 # then free the map
2315 2500
2316 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2501 my $lock = cf::lock_acquire "map_data:$self->{path}";
2317 2502
2318 return if $self->players; 2503 return if $self->players;
2319 2504
2320 warn "resetting map ", $self->path, "\n"; 2505 cf::trace "resetting map ", $self->path, "\n";
2321 2506
2322 $self->in_memory (cf::MAP_SWAPPED); 2507 $self->state (cf::MAP_SWAPPED);
2323 2508
2324 # need to save uniques path 2509 # need to save uniques path
2325 unless ($self->{deny_save}) { 2510 unless ($self->{deny_save}) {
2326 my $uniq = $self->uniq_path; utf8::encode $uniq; 2511 my $uniq = $self->uniq_path; utf8::encode $uniq;
2327 2512
2480 2665
2481Creates and returns a persistent reference to an object that can be stored as a string. 2666Creates and returns a persistent reference to an object that can be stored as a string.
2482 2667
2483=item $ob = cf::object::deref ($refstring) 2668=item $ob = cf::object::deref ($refstring)
2484 2669
2485returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2670returns the objetc referenced by refstring. may return undef when it cannot find the object,
2486even if the object actually exists. May block. 2671even if the object actually exists. May block.
2487 2672
2488=cut 2673=cut
2489 2674
2490sub deref { 2675sub deref {
2572=item $player_object->may ("access") 2757=item $player_object->may ("access")
2573 2758
2574Returns wether the given player is authorized to access resource "access" 2759Returns wether the given player is authorized to access resource "access"
2575(e.g. "command_wizcast"). 2760(e.g. "command_wizcast").
2576 2761
2762This is implemented by checking a config setting of C<may_access> where
2763C<access> is replaced by the access string. The following alternatives are
2764possible (and are tested in order):
2765
2766=over 4
2767
2768=item * Player is DM
2769
2770The request will succeed.
2771
2772=item * may_access is an array reference
2773
2774If either the player nickname or UUID is in the array, the request will
2775succeed, otherwise it will fail.
2776
2777=item * may_access is a true value
2778
2779The request will succeed.
2780
2781=item * may_access is missing or false
2782
2783The request will fail.
2784
2785=back
2786
2577=cut 2787=cut
2578 2788
2579sub cf::object::player::may { 2789sub cf::object::player::may {
2580 my ($self, $access) = @_; 2790 my ($self, $access) = @_;
2581 2791
2582 $self->flag (cf::FLAG_WIZ) || 2792 $self->flag (cf::FLAG_WIZ) ||
2583 (ref $cf::CFG{"may_$access"} 2793 (ref $cf::CFG{"may_$access"}
2584 ? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}} 2794 ? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2585 : $cf::CFG{"may_$access"}) 2795 : $cf::CFG{"may_$access"})
2586} 2796}
2587 2797
2588=item $player_object->enter_link 2798=item $player_object->enter_link
2589 2799
2592The player should be reasonably safe there for short amounts of time (e.g. 2802The player should be reasonably safe there for short amounts of time (e.g.
2593for loading a map). You I<MUST> call C<leave_link> as soon as possible, 2803for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2594though, as the player cannot control the character while it is on the link 2804though, as the player cannot control the character while it is on the link
2595map. 2805map.
2596 2806
2597Will never block. 2807This method will never block, which is the whole reaosn for it's
2808existance: you can I<always> put a player onto the link map, which is the
2809only place to put objects that is guaranteed to exist.
2810
2811A typical usage pattern is to call C<enter_link> synchronously from the
2812server, then start a new thread, do your blocking stuff there and then
2813call C<leave_link> from that thread.
2598 2814
2599=item $player_object->leave_link ($map, $x, $y) 2815=item $player_object->leave_link ($map, $x, $y)
2600 2816
2601Moves the player out of the special C<{link}> map onto the specified 2817Moves the player out of the special C<{link}> map onto the specified
2602map. If the map is not valid (or omitted), the player will be moved back 2818map. If the map is not valid (or omitted), the player will be moved back
2657 # use -1 or undef as default coordinates, not 0, 0 2873 # use -1 or undef as default coordinates, not 0, 0
2658 ($x, $y) = ($map->enter_x, $map->enter_y) 2874 ($x, $y) = ($map->enter_x, $map->enter_y)
2659 if $x <= 0 && $y <= 0; 2875 if $x <= 0 && $y <= 0;
2660 2876
2661 $map->load; 2877 $map->load;
2662 $map->load_neighbours;
2663 2878
2664 return unless $self->contr->active; 2879 return unless $self->contr->active;
2665 2880
2666 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2881 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2667 if ($self->enter_map ($map, $x, $y)) { 2882 if ($self->enter_map ($map, $x, $y)) {
2690 2905
2691sub cf::object::player::goto { 2906sub cf::object::player::goto {
2692 my ($self, $path, $x, $y, $check, $done) = @_; 2907 my ($self, $path, $x, $y, $check, $done) = @_;
2693 2908
2694 if ($self->{_link_recursion} >= $MAX_LINKS) { 2909 if ($self->{_link_recursion} >= $MAX_LINKS) {
2695 warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting."; 2910 error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2696 $self->failmsg ("Something went wrong inside the server - please contact an administrator!"); 2911 $self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2697 ($path, $x, $y) = @$EMERGENCY_POSITION; 2912 ($path, $x, $y) = @$EMERGENCY_POSITION;
2698 } 2913 }
2699 2914
2700 # do generation counting so two concurrent goto's will be executed in-order 2915 # do generation counting so two concurrent goto's will be executed in-order
2723 ($path, $x, $y) = (undef, undef, undef); 2938 ($path, $x, $y) = (undef, undef, undef);
2724 } 2939 }
2725 } 2940 }
2726 2941
2727 my $map = eval { 2942 my $map = eval {
2728 my $map = defined $path ? cf::map::find $path : undef; 2943 my $map = defined $path ? cf::map::find $path, $self->map : undef;
2729 2944
2730 if ($map) { 2945 if ($map) {
2731 $map = $map->customise_for ($self); 2946 $map = $map->customise_for ($self);
2732 $map = $check->($map, $x, $y, $self) if $check && $map; 2947 $map = $check->($map, $x, $y, $self) if $check && $map;
2733 } else { 2948 } else {
2823 $Coro::current->{desc} = "enter_exit"; 3038 $Coro::current->{desc} = "enter_exit";
2824 3039
2825 unless (eval { 3040 unless (eval {
2826 $self->deactivate_recursive; # just to be sure 3041 $self->deactivate_recursive; # just to be sure
2827 3042
2828 # random map handling
2829 {
2830 my $guard = cf::lock_acquire "exit_prepare:$exit";
2831
2832 prepare_random_map $exit
2833 if $exit->slaying eq "/!";
2834 }
2835
2836 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 3043 my $map = cf::map::normalise $exit->slaying, $exit->map;
2837 my $x = $exit->stats->hp; 3044 my $x = $exit->stats->hp;
2838 my $y = $exit->stats->sp; 3045 my $y = $exit->stats->sp;
3046
3047 # special map handling
3048 my $slaying = $exit->slaying;
3049
3050 # special map handling
3051 if ($slaying eq "/!") {
3052 my $guard = cf::lock_acquire "exit_prepare:$exit";
3053
3054 prepare_random_map $exit
3055 if $exit->slaying eq "/!"; # need to re-check after getting the lock
3056
3057 $map = $exit->slaying;
3058
3059 } elsif ($slaying eq '!up') {
3060 $map = $exit->map->tile_path (cf::TILE_UP);
3061 $x = $exit->x;
3062 $y = $exit->y;
3063
3064 } elsif ($slaying eq '!down') {
3065 $map = $exit->map->tile_path (cf::TILE_DOWN);
3066 $x = $exit->x;
3067 $y = $exit->y;
3068 }
2839 3069
2840 $self->goto ($map, $x, $y); 3070 $self->goto ($map, $x, $y);
2841 3071
2842 # if exit is damned, update players death & WoR home-position 3072 # if exit is damned, update players death & WoR home-position
2843 $self->contr->savebed ($map, $x, $y) 3073 $self->contr->savebed ($map, $x, $y)
2848 $self->message ("Something went wrong deep within the deliantra server. " 3078 $self->message ("Something went wrong deep within the deliantra server. "
2849 . "I'll try to bring you back to the map you were before. " 3079 . "I'll try to bring you back to the map you were before. "
2850 . "Please report this to the dungeon master!", 3080 . "Please report this to the dungeon master!",
2851 cf::NDI_UNIQUE | cf::NDI_RED); 3081 cf::NDI_UNIQUE | cf::NDI_RED);
2852 3082
2853 warn "ERROR in enter_exit: $@"; 3083 error "ERROR in enter_exit: $@";
2854 $self->leave_link; 3084 $self->leave_link;
2855 } 3085 }
2856 })->prio (1); 3086 })->prio (1);
2857} 3087}
2858 3088
2859=head3 cf::client 3089=head3 cf::client
2860 3090
2861=over 4 3091=over 4
2862
2863=item $client->send_drawinfo ($text, $flags)
2864
2865Sends a drawinfo packet to the client. Circumvents output buffering so
2866should not be used under normal circumstances.
2867
2868=cut
2869
2870sub cf::client::send_drawinfo {
2871 my ($self, $text, $flags) = @_;
2872
2873 utf8::encode $text;
2874 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2875}
2876 3092
2877=item $client->send_big_packet ($pkt) 3093=item $client->send_big_packet ($pkt)
2878 3094
2879Like C<send_packet>, but tries to compress large packets, and fragments 3095Like C<send_packet>, but tries to compress large packets, and fragments
2880them as required. 3096them as required.
2899 $self->send_packet ($pkt); 3115 $self->send_packet ($pkt);
2900} 3116}
2901 3117
2902=item $client->send_msg ($channel, $msg, $color, [extra...]) 3118=item $client->send_msg ($channel, $msg, $color, [extra...])
2903 3119
2904Send a drawinfo or msg packet to the client, formatting the msg for the 3120Send a msg packet to the client, formatting the msg for the client if
2905client if neccessary. C<$type> should be a string identifying the type of 3121necessary. C<$type> should be a string identifying the type of the
2906the message, with C<log> being the default. If C<$color> is negative, suppress 3122message, with C<log> being the default. If C<$color> is negative, suppress
2907the message unless the client supports the msg packet. 3123the message unless the client supports the msg packet.
2908 3124
2909=cut 3125=cut
2910 3126
2911# non-persistent channels (usually the info channel) 3127# non-persistent channels (usually the info channel)
2954 }, 3170 },
2955 "c/body" => { 3171 "c/body" => {
2956 id => "infobox", 3172 id => "infobox",
2957 title => "Body Parts", 3173 title => "Body Parts",
2958 reply => undef, 3174 reply => undef,
2959 tooltip => "Shows which body parts you posess and are available", 3175 tooltip => "Shows which body parts you possess and are available",
2960 }, 3176 },
2961 "c/statistics" => { 3177 "c/statistics" => {
2962 id => "infobox", 3178 id => "infobox",
2963 title => "Statistics", 3179 title => "Statistics",
2964 reply => undef, 3180 reply => undef,
3016 id => "death", 3232 id => "death",
3017 title => "Death", 3233 title => "Death",
3018 reply => undef, 3234 reply => undef,
3019 tooltip => "Reason for and more info about your most recent death", 3235 tooltip => "Reason for and more info about your most recent death",
3020 }, 3236 },
3237 "c/fatal" => {
3238 id => "fatal",
3239 title => "Fatal Error",
3240 reply => undef,
3241 tooltip => "Reason for the server disconnect",
3242 },
3021 "c/say" => $SAY_CHANNEL, 3243 "c/say" => $SAY_CHANNEL,
3022 "c/chat" => $CHAT_CHANNEL, 3244 "c/chat" => $CHAT_CHANNEL,
3023); 3245);
3024 3246
3025sub cf::client::send_msg { 3247sub cf::client::send_msg {
3068=cut 3290=cut
3069 3291
3070sub cf::client::ext_msg($$@) { 3292sub cf::client::ext_msg($$@) {
3071 my ($self, $type, @msg) = @_; 3293 my ($self, $type, @msg) = @_;
3072 3294
3073 if ($self->extcmd == 2) {
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3295 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3075 } elsif ($self->extcmd == 1) { # TODO: remove
3076 push @msg, msgtype => "event_$type";
3077 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3078 }
3079}
3080
3081=item $client->ext_reply ($msgid, @msg)
3082
3083Sends an ext reply to the client.
3084
3085=cut
3086
3087sub cf::client::ext_reply($$@) {
3088 my ($self, $id, @msg) = @_;
3089
3090 if ($self->extcmd == 2) {
3091 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3092 } elsif ($self->extcmd == 1) {
3093 #TODO: version 1, remove
3094 unshift @msg, msgtype => "reply", msgid => $id;
3095 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3096 }
3097} 3296}
3098 3297
3099=item $success = $client->query ($flags, "text", \&cb) 3298=item $success = $client->query ($flags, "text", \&cb)
3100 3299
3101Queues a query to the client, calling the given callback with 3300Queues a query to the client, calling the given callback with
3121 3320
3122 $self->send_packet ($self->{query_queue}[0][0]) 3321 $self->send_packet ($self->{query_queue}[0][0])
3123 if @{ $self->{query_queue} } == 1; 3322 if @{ $self->{query_queue} } == 1;
3124 3323
3125 1 3324 1
3325}
3326
3327=item $client->update_command_faces
3328
3329=cut
3330
3331our %COMMAND_FACE;
3332
3333sub cf::client::update_command_faces {
3334 my ($self) = @_;
3335
3336 my @faces = grep $_,
3337 $COMMAND_FACE{preferred},
3338 $COMMAND_FACE{standard},
3339 $COMMAND_FACE{skill},
3340 $self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
3341 $COMMAND_FACE{emote},
3342 ;
3343
3344 $self->send_face ($_)
3345 for @faces;
3346 $self->flush_fx;
3347
3348 $self->ext_msg (command_list => @faces);
3349}
3350
3351=item cf::client::set_command_face $type, $commands
3352
3353=cut
3354
3355sub cf::client::set_command_face {
3356 my ($type, $list) = @_;
3357
3358 my $idx = &cf::face::set ( #d# ugly forward reference
3359 "command_list/$type" => cf::FT_RSRC,
3360 JSON::XS->new->utf8->encode ([ sort @$list ])
3361 );
3362
3363 $COMMAND_FACE{$type} = $idx;
3126} 3364}
3127 3365
3128cf::client->attach ( 3366cf::client->attach (
3129 on_connect => sub { 3367 on_connect => sub {
3130 my ($ns) = @_; 3368 my ($ns) = @_;
3156 my ($ns, $buf) = @_; 3394 my ($ns, $buf) = @_;
3157 3395
3158 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3396 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3159 3397
3160 if (ref $msg) { 3398 if (ref $msg) {
3161 my ($type, $reply, @payload) = 3399 my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3162 "ARRAY" eq ref $msg
3163 ? @$msg
3164 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3165 3400
3166 my @reply;
3167
3168 if (my $cb = $EXTICMD{$type}) { 3401 if (my $cb = $EXTIACMD{$type}) {
3402 $cb->(
3403 $ns,
3404 sub {
3405 $ns->ext_msg ("reply-$reply", @_)
3406 if $reply;
3407 },
3408 @payload
3409 );
3410 } else {
3411 my @reply;
3412
3413 if (my $cb = $EXTICMD{$type}) {
3169 @reply = $cb->($ns, @payload); 3414 @reply = $cb->($ns, @payload);
3415 }
3416
3417 $ns->ext_msg ("reply-$reply", @reply)
3418 if $reply;
3170 } 3419 }
3171
3172 $ns->ext_reply ($reply, @reply)
3173 if $reply;
3174
3175 } else { 3420 } else {
3176 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3421 error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3177 } 3422 }
3178 3423
3179 cf::override; 3424 cf::override;
3180 }, 3425 },
3181); 3426);
3262 decrease split destroy change_exp value msg lore send_msg)], 3507 decrease split destroy change_exp value msg lore send_msg)],
3263 ["cf::object::player" => qw(player)], 3508 ["cf::object::player" => qw(player)],
3264 ["cf::player" => qw(peaceful send_msg)], 3509 ["cf::player" => qw(peaceful send_msg)],
3265 ["cf::map" => qw(trigger)], 3510 ["cf::map" => qw(trigger)],
3266) { 3511) {
3267 no strict 'refs';
3268 my ($pkg, @funs) = @$_; 3512 my ($pkg, @funs) = @$_;
3269 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3513 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3270 for @funs; 3514 for @funs;
3271} 3515}
3272 3516
3311 local @cf::_safe_eval_args = values %vars; 3555 local @cf::_safe_eval_args = values %vars;
3312 @res = wantarray ? eval eval : scalar eval $eval; 3556 @res = wantarray ? eval eval : scalar eval $eval;
3313 } 3557 }
3314 3558
3315 if ($@) { 3559 if ($@) {
3316 warn "$@"; 3560 warn "$@",
3317 warn "while executing safe code '$code'\n"; 3561 "while executing safe code '$code'\n",
3318 warn "with arguments " . (join " ", %vars) . "\n"; 3562 "with arguments " . (join " ", %vars) . "\n";
3319 } 3563 }
3320 3564
3321 wantarray ? @res : $res[0] 3565 wantarray ? @res : $res[0]
3322} 3566}
3323 3567
3348=cut 3592=cut
3349 3593
3350############################################################################# 3594#############################################################################
3351# the server's init and main functions 3595# the server's init and main functions
3352 3596
3597{
3598 package cf::face;
3599
3600 our %HASH; # hash => idx
3601 our @DATA; # dynamically-created facedata, only faceste 0 used
3602 our @FOFS; # file offset, if > 0
3603 our @SIZE; # size of face, in octets
3604 our @META; # meta hash of face, if any
3605 our $DATAFH; # facedata filehandle
3606
3607 # internal api, not finalised
3608 sub set {
3609 my ($name, $type, $data) = @_;
3610
3611 my $idx = cf::face::find $name;
3612
3613 if ($idx) {
3614 delete $HASH{cf::face::get_csum $idx};
3615 } else {
3616 $idx = cf::face::alloc $name;
3617 }
3618
3619 my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3620
3621 cf::face::set_type $idx, $type;
3622 cf::face::set_csum $idx, 0, $hash;
3623
3624 # we need to destroy the SV itself, not just modify it, as a running ix
3625 # might hold a reference to it: "delete" achieves that.
3626 delete $FOFS[0][$idx];
3627 delete $DATA[0][$idx];
3628 $DATA[0][$idx] = $data;
3629 $SIZE[0][$idx] = length $data;
3630 delete $META[$idx];
3631 $HASH{$hash} = $idx;#d#
3632
3633 $idx
3634 }
3635
3636 sub _get_data($$$) {
3637 my ($idx, $set, $cb) = @_;
3638
3639 if (defined $DATA[$set][$idx]) {
3640 $cb->($DATA[$set][$idx]);
3641 } elsif (my $fofs = $FOFS[$set][$idx]) {
3642 my $size = $SIZE[$set][$idx];
3643 my $buf;
3644 IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
3645 if ($_[0] == $size) {
3646 #cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
3647 $cb->($buf);
3648 } else {
3649 cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
3650 }
3651 };
3652 } else {
3653 cf::error "requested facedata for unknown face $idx#$set, ignoring.";
3654 }
3655 }
3656
3657 # rather ineffient
3658 sub cf::face::get_data($;$) {
3659 my ($idx, $set) = @_;
3660
3661 _get_data $idx, $set, Coro::rouse_cb;
3662 Coro::rouse_wait
3663 }
3664
3665 sub cf::face::ix {
3666 my ($ns, $set, $idx, $pri) = @_;
3667
3668 _get_data $idx, $set, sub {
3669 $ns->ix_send ($idx, $pri, $_[0]);
3670 };
3671 }
3672}
3673
3353sub load_facedata($) { 3674sub load_facedata($) {
3354 my ($path) = @_; 3675 my ($path) = @_;
3355 3676
3356 # HACK to clear player env face cache, we need some signal framework
3357 # for this (global event?)
3358 %ext::player_env::MUSIC_FACE_CACHE = ();
3359
3360 my $enc = JSON::XS->new->utf8->canonical->relaxed; 3677 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3361 3678
3362 warn "loading facedata from $path\n"; 3679 trace "loading facedata from $path\n";
3363 3680
3364 my $facedata; 3681 my $facedata = decode_storable load_file "$path/faceinfo";
3365 0 < aio_load $path, $facedata
3366 or die "$path: $!";
3367
3368 $facedata = Coro::Storable::thaw $facedata;
3369 3682
3370 $facedata->{version} == 2 3683 $facedata->{version} == 2
3371 or cf::cleanup "$path: version mismatch, cannot proceed."; 3684 or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3372 3685
3373 # patch in the exptable 3686 my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3374 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]); 3687 or cf::cleanup "$path/facedata: $!, cannot proceed.";
3375 $facedata->{resource}{"res/exp_table"} = { 3688
3376 type => FT_RSRC, 3689 get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3377 data => $exp_table, 3690
3378 hash => (Digest::MD5::md5 $exp_table), 3691 # BEGIN ATOMIC
3379 }; 3692 # from here on, everything must be atomic - no thread switch allowed
3380 cf::cede_to_tick; 3693 my $t1 = EV::time;
3381 3694
3382 { 3695 {
3383 my $faces = $facedata->{faceinfo}; 3696 my $faces = $facedata->{faceinfo};
3384 3697
3385 while (my ($face, $info) = each %$faces) { 3698 for my $face (sort keys %$faces) {
3699 my $info = $faces->{$face};
3386 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3700 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3387 3701
3388 cf::face::set_visibility $idx, $info->{visibility}; 3702 cf::face::set_visibility $idx, $info->{visibility};
3389 cf::face::set_magicmap $idx, $info->{magicmap}; 3703 cf::face::set_magicmap $idx, $info->{magicmap};
3390 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; 3704 cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3391 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; 3705 cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3392 3706 cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3393 cf::cede_to_tick; 3707 $cf::face::HASH{$info->{hash64}} = $idx;
3708 delete $cf::face::META[$idx];
3394 } 3709 }
3395 3710
3396 while (my ($face, $info) = each %$faces) { 3711 while (my ($face, $info) = each %$faces) {
3397 next unless $info->{smooth}; 3712 next unless $info->{smooth};
3398 3713
3401 3716
3402 if (my $smooth = cf::face::find $info->{smooth}) { 3717 if (my $smooth = cf::face::find $info->{smooth}) {
3403 cf::face::set_smooth $idx, $smooth; 3718 cf::face::set_smooth $idx, $smooth;
3404 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3719 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3405 } else { 3720 } else {
3406 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3721 error "smooth face '$info->{smooth}' not found for face '$face'";
3407 } 3722 }
3408
3409 cf::cede_to_tick;
3410 } 3723 }
3411 } 3724 }
3412 3725
3413 { 3726 {
3414 my $anims = $facedata->{animinfo}; 3727 my $anims = $facedata->{animinfo};
3415 3728
3416 while (my ($anim, $info) = each %$anims) { 3729 while (my ($anim, $info) = each %$anims) {
3417 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3730 cf::anim::set $anim, $info->{frames}, $info->{facings};
3418 cf::cede_to_tick;
3419 } 3731 }
3420 3732
3421 cf::anim::invalidate_all; # d'oh 3733 cf::anim::invalidate_all; # d'oh
3422 } 3734 }
3423 3735
3424 { 3736 {
3425 my $res = $facedata->{resource}; 3737 my $res = $facedata->{resource};
3426 3738
3427 while (my ($name, $info) = each %$res) { 3739 while (my ($name, $info) = each %$res) {
3428 if (defined $info->{type}) { 3740 if (defined (my $type = $info->{type})) {
3741 # TODO: different hash - must free and use new index, or cache ixface data queue
3429 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3742 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3430 3743
3431 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3432 cf::face::set_type $idx, $info->{type}; 3744 cf::face::set_type $idx, $type;
3745 cf::face::set_csum $idx, 0, $info->{hash};
3746 $cf::face::SIZE[0][$idx] = $info->{size};
3747 $cf::face::FOFS[0][$idx] = $info->{fofs};
3748 $cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3749 $cf::face::HASH{$info->{hash}} = $idx;
3433 } else { 3750 } else {
3434 $RESOURCE{$name} = $info; 3751# $RESOURCE{$name} = $info; # unused
3435 } 3752 }
3436
3437 cf::cede_to_tick;
3438 } 3753 }
3439 } 3754 }
3755
3756 ($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
3757
3758 # HACK to clear player env face cache, we need some signal framework
3759 # for this (global event?)
3760 %ext::player_env::MUSIC_FACE_CACHE = ();
3761
3762 # END ATOMIC
3763
3764 cf::debug "facedata atomic update time ", EV::time - $t1;
3440 3765
3441 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE); 3766 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3442 3767
3768 aio_close $fh if $fh; # close old facedata
3769
3443 1 3770 1
3444} 3771}
3445
3446cf::global->attach (on_resource_update => sub {
3447 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3448 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3449
3450 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3451 my $sound = $soundconf->{compat}[$_]
3452 or next;
3453
3454 my $face = cf::face::find "sound/$sound->[1]";
3455 cf::sound::set $sound->[0] => $face;
3456 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3457 }
3458
3459 while (my ($k, $v) = each %{$soundconf->{event}}) {
3460 my $face = cf::face::find "sound/$v";
3461 cf::sound::set $k => $face;
3462 }
3463 }
3464});
3465 3772
3466register_exticmd fx_want => sub { 3773register_exticmd fx_want => sub {
3467 my ($ns, $want) = @_; 3774 my ($ns, $want) = @_;
3468 3775
3469 while (my ($k, $v) = each %$want) { 3776 while (my ($k, $v) = each %$want) {
3477 my $status = load_resource_file_ $_[0]; 3784 my $status = load_resource_file_ $_[0];
3478 get_slot 0.1, 100; 3785 get_slot 0.1, 100;
3479 cf::arch::commit_load; 3786 cf::arch::commit_load;
3480 3787
3481 $status 3788 $status
3789}
3790
3791sub reload_exp_table {
3792 _reload_exp_table;
3793
3794 cf::face::set
3795 "res/exp_table" => FT_RSRC,
3796 JSON::XS->new->utf8->canonical->encode (
3797 [map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
3798 );
3799}
3800
3801sub reload_materials {
3802 _reload_materials;
3482} 3803}
3483 3804
3484sub reload_regions { 3805sub reload_regions {
3485 # HACK to clear player env face cache, we need some signal framework 3806 # HACK to clear player env face cache, we need some signal framework
3486 # for this (global event?) 3807 # for this (global event?)
3494 if exists $_->{match}; 3815 if exists $_->{match};
3495 } 3816 }
3496} 3817}
3497 3818
3498sub reload_facedata { 3819sub reload_facedata {
3499 load_facedata "$DATADIR/facedata" 3820 load_facedata $DATADIR
3500 or die "unable to load facedata\n"; 3821 or die "unable to load facedata\n";
3501} 3822}
3502 3823
3503sub reload_archetypes { 3824sub reload_archetypes {
3504 load_resource_file "$DATADIR/archetypes" 3825 load_resource_file "$DATADIR/archetypes"
3505 or die "unable to load archetypes\n"; 3826 or die "unable to load archetypes\n";
3827
3828 cf::face::set
3829 "res/skill_info" => FT_RSRC,
3830 JSON::XS->new->utf8->canonical->encode (
3831 [map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
3832 );
3833
3834 cf::face::set
3835 "res/spell_paths" => FT_RSRC,
3836 JSON::XS->new->utf8->canonical->encode (
3837 [map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
3838 );
3839
3840 # command completion
3841 my @commands;
3842
3843 for (0..cf::arch::skillvec_size - 1) {
3844 my $skill = cf::arch::skillvec $_;
3845 my $name = $skill->name;
3846 my $flags = cf::skill_flags $skill->subtype;
3847
3848 push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
3849 push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
3850 }
3851
3852 cf::client::set_command_face skill => \@commands;
3506} 3853}
3507 3854
3508sub reload_treasures { 3855sub reload_treasures {
3509 load_resource_file "$DATADIR/treasures" 3856 load_resource_file "$DATADIR/treasures"
3510 or die "unable to load treasurelists\n"; 3857 or die "unable to load treasurelists\n";
3511} 3858}
3512 3859
3860sub reload_sound {
3861 trace "loading sound config from $DATADIR/sound\n";
3862
3863 my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3864
3865 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3866 my $sound = $soundconf->{compat}[$_]
3867 or next;
3868
3869 my $face = cf::face::find "sound/$sound->[1]";
3870 cf::sound::set $sound->[0] => $face;
3871 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3872 }
3873
3874 while (my ($k, $v) = each %{$soundconf->{event}}) {
3875 my $face = cf::face::find "sound/$v";
3876 cf::sound::set $k => $face;
3877 }
3878}
3879
3513sub reload_resources { 3880sub reload_resources {
3514 warn "reloading resource files...\n"; 3881 trace "reloading resource files...\n";
3515 3882
3883 reload_materials;
3516 reload_facedata; 3884 reload_facedata;
3885 reload_exp_table;
3886 reload_sound;
3517 reload_archetypes; 3887 reload_archetypes;
3518 reload_regions; 3888 reload_regions;
3519 reload_treasures; 3889 reload_treasures;
3520 3890
3521 warn "finished reloading resource files\n"; 3891 trace "finished reloading resource files\n";
3522} 3892}
3523 3893
3524sub reload_config { 3894sub reload_config {
3525 warn "reloading config file...\n"; 3895 trace "reloading config file...\n";
3526 3896
3527 open my $fh, "<:utf8", "$CONFDIR/config" 3897 my $config = load_file "$CONFDIR/config";
3528 or return; 3898 utf8::decode $config;
3529 3899 *CFG = decode_yaml $config;
3530 local $/;
3531 *CFG = YAML::XS::Load scalar <$fh>;
3532 3900
3533 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38]; 3901 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3534 3902
3535 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3903 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3536 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3904 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3540 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3908 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3541 and die "WARNING: m(un)lockall failed: $!\n"; 3909 and die "WARNING: m(un)lockall failed: $!\n";
3542 }; 3910 };
3543 warn $@ if $@; 3911 warn $@ if $@;
3544 } 3912 }
3545
3546 warn "finished reloading resource files\n";
3547} 3913}
3548 3914
3549sub pidfile() { 3915sub pidfile() {
3550 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT 3916 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3551 or die "$PIDFILE: $!"; 3917 or die "$PIDFILE: $!";
3564 seek $fh, 0, 0; 3930 seek $fh, 0, 0;
3565 print $fh $$; 3931 print $fh $$;
3566} 3932}
3567 3933
3568sub main_loop { 3934sub main_loop {
3569 warn "EV::loop starting\n"; 3935 trace "EV::run starting\n";
3570 if (1) { 3936 if (1) {
3571 EV::loop; 3937 EV::run;
3572 } 3938 }
3573 warn "EV::loop returned\n"; 3939 trace "EV::run returned\n";
3574 goto &main_loop unless $REALLY_UNLOOP; 3940 goto &main_loop unless $REALLY_UNLOOP;
3575} 3941}
3576 3942
3577sub main { 3943sub main {
3578 cf::init_globals; # initialise logging 3944 cf::init_globals; # initialise logging
3579 3945
3580 LOG llevInfo, "Welcome to Deliantra, v" . VERSION; 3946 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3581 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; 3947 LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3582 LOG llevInfo, "Copyright (C) 1994 Mark Wedel."; 3948 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3583 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen."; 3949 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3584 3950
3585 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3951 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3586 3952
3587 # we must not ever block the main coroutine 3953 # we must not ever block the main coroutine
3588 local $Coro::idle = sub { 3954 $Coro::idle = sub {
3589 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3955 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3590 (async { 3956 (async {
3591 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3957 $Coro::current->{desc} = "IDLE BUG HANDLER";
3592 EV::loop EV::LOOP_ONESHOT; 3958 EV::run EV::RUN_ONCE;
3593 })->prio (Coro::PRIO_MAX); 3959 })->prio (Coro::PRIO_MAX);
3594 }; 3960 };
3595 3961
3596 evthread_start IO::AIO::poll_fileno; 3962 evthread_start IO::AIO::poll_fileno;
3597 3963
3598 cf::sync_job { 3964 cf::sync_job {
3599 cf::init_experience; 3965 cf::incloader::init ();
3966
3967 db_init;
3968
3600 cf::init_anim; 3969 cf::init_anim;
3601 cf::init_attackmess; 3970 cf::init_attackmess;
3602 cf::init_dynamic; 3971 cf::init_dynamic;
3603 3972
3604 cf::load_settings; 3973 cf::load_settings;
3605 cf::load_materials;
3606 3974
3607 reload_resources; 3975 reload_resources;
3608 reload_config; 3976 reload_config;
3609 db_init;
3610 3977
3611 cf::init_uuid; 3978 cf::init_uuid;
3612 cf::init_signals; 3979 cf::init_signals;
3613 cf::init_skills; 3980 cf::init_skills;
3614 3981
3622 3989
3623 # no (long-running) fork's whatsoever before this point(!) 3990 # no (long-running) fork's whatsoever before this point(!)
3624 use POSIX (); 3991 use POSIX ();
3625 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; 3992 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3626 3993
3627 (pop @POST_INIT)->(0) while @POST_INIT; 3994 cf::_post_init 0;
3628 }; 3995 };
3629 3996
3630 cf::object::thawer::errors_are_fatal 0; 3997 cf::object::thawer::errors_are_fatal 0;
3631 warn "parse errors in files are no longer fatal from this point on.\n"; 3998 info "parse errors in files are no longer fatal from this point on.\n";
3632 3999
4000 AE::postpone {
4001 undef &main; # free gobs of memory :)
4002 };
4003
3633 main_loop; 4004 goto &main_loop;
3634} 4005}
3635 4006
3636############################################################################# 4007#############################################################################
3637# initialisation and cleanup 4008# initialisation and cleanup
3638 4009
3677 or return; 4048 or return;
3678 4049
3679 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE 4050 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3680 and return; 4051 and return;
3681 4052
3682 warn sprintf "runtime file written (%gs).\n", AE::time - $t0; 4053 trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3683 4054
3684 1 4055 1
3685} 4056}
3686 4057
3687our $uuid_lock; 4058our $uuid_lock;
3699 or return; 4070 or return;
3700 4071
3701 my $value = uuid_seq uuid_cur; 4072 my $value = uuid_seq uuid_cur;
3702 4073
3703 unless ($value) { 4074 unless ($value) {
3704 warn "cowardly refusing to write zero uuid value!\n"; 4075 info "cowardly refusing to write zero uuid value!\n";
3705 return; 4076 return;
3706 } 4077 }
3707 4078
3708 my $value = uuid_str $value + $uuid_skip; 4079 my $value = uuid_str $value + $uuid_skip;
3709 $uuid_skip = 0; 4080 $uuid_skip = 0;
3719 or return; 4090 or return;
3720 4091
3721 aio_rename "$uuid~", $uuid 4092 aio_rename "$uuid~", $uuid
3722 and return; 4093 and return;
3723 4094
3724 warn "uuid file written ($value).\n"; 4095 trace "uuid file written ($value).\n";
3725 4096
3726 1 4097 1
3727 4098
3728} 4099}
3729 4100
3735} 4106}
3736 4107
3737sub emergency_save() { 4108sub emergency_save() {
3738 my $freeze_guard = cf::freeze_mainloop; 4109 my $freeze_guard = cf::freeze_mainloop;
3739 4110
3740 warn "emergency_perl_save: enter\n"; 4111 info "emergency_perl_save: enter\n";
4112
4113 # this is a trade-off: we want to be very quick here, so
4114 # save all maps without fsync, and later call a global sync
4115 # (which in turn might be very very slow)
4116 local $USE_FSYNC = 0;
3741 4117
3742 cf::sync_job { 4118 cf::sync_job {
3743 # this is a trade-off: we want to be very quick here, so 4119 cf::write_runtime_sync; # external watchdog should not bark
3744 # save all maps without fsync, and later call a global sync
3745 # (which in turn might be very very slow)
3746 local $USE_FSYNC = 0;
3747 4120
3748 # use a peculiar iteration method to avoid tripping on perl 4121 # use a peculiar iteration method to avoid tripping on perl
3749 # refcount bugs in for. also avoids problems with players 4122 # refcount bugs in for. also avoids problems with players
3750 # and maps saved/destroyed asynchronously. 4123 # and maps saved/destroyed asynchronously.
3751 warn "emergency_perl_save: begin player save\n"; 4124 info "emergency_perl_save: begin player save\n";
3752 for my $login (keys %cf::PLAYER) { 4125 for my $login (keys %cf::PLAYER) {
3753 my $pl = $cf::PLAYER{$login} or next; 4126 my $pl = $cf::PLAYER{$login} or next;
3754 $pl->valid or next; 4127 $pl->valid or next;
3755 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 4128 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3756 $pl->save; 4129 $pl->save;
3757 } 4130 }
3758 warn "emergency_perl_save: end player save\n"; 4131 info "emergency_perl_save: end player save\n";
3759 4132
4133 cf::write_runtime_sync; # external watchdog should not bark
4134
3760 warn "emergency_perl_save: begin map save\n"; 4135 info "emergency_perl_save: begin map save\n";
3761 for my $path (keys %cf::MAP) { 4136 for my $path (keys %cf::MAP) {
3762 my $map = $cf::MAP{$path} or next; 4137 my $map = $cf::MAP{$path} or next;
3763 $map->valid or next; 4138 $map->valid or next;
3764 $map->save; 4139 $map->save;
3765 } 4140 }
3766 warn "emergency_perl_save: end map save\n"; 4141 info "emergency_perl_save: end map save\n";
3767 4142
4143 cf::write_runtime_sync; # external watchdog should not bark
4144
3768 warn "emergency_perl_save: begin database checkpoint\n"; 4145 info "emergency_perl_save: begin database checkpoint\n";
3769 BDB::db_env_txn_checkpoint $DB_ENV; 4146 BDB::db_env_txn_checkpoint $DB_ENV;
3770 warn "emergency_perl_save: end database checkpoint\n"; 4147 info "emergency_perl_save: end database checkpoint\n";
3771 4148
3772 warn "emergency_perl_save: begin write uuid\n"; 4149 info "emergency_perl_save: begin write uuid\n";
3773 write_uuid_sync 1; 4150 write_uuid_sync 1;
3774 warn "emergency_perl_save: end write uuid\n"; 4151 info "emergency_perl_save: end write uuid\n";
4152
4153 cf::write_runtime_sync; # external watchdog should not bark
4154
4155 trace "emergency_perl_save: syncing database to disk";
4156 BDB::db_env_txn_checkpoint $DB_ENV;
4157
4158 info "emergency_perl_save: starting sync\n";
4159 IO::AIO::aio_sync sub {
4160 info "emergency_perl_save: finished sync\n";
4161 };
4162
4163 cf::write_runtime_sync; # external watchdog should not bark
4164
4165 trace "emergency_perl_save: flushing outstanding aio requests";
4166 while (IO::AIO::nreqs || BDB::nreqs) {
4167 Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
4168 }
4169
4170 cf::write_runtime_sync; # external watchdog should not bark
3775 }; 4171 };
3776 4172
3777 warn "emergency_perl_save: starting sync()\n";
3778 IO::AIO::aio_sync sub {
3779 warn "emergency_perl_save: finished sync()\n";
3780 };
3781
3782 warn "emergency_perl_save: leave\n"; 4173 info "emergency_perl_save: leave\n";
3783} 4174}
3784 4175
3785sub post_cleanup { 4176sub post_cleanup {
3786 my ($make_core) = @_; 4177 my ($make_core) = @_;
3787 4178
4179 IO::AIO::flush;
4180
3788 warn Carp::longmess "post_cleanup backtrace" 4181 error Carp::longmess "post_cleanup backtrace"
3789 if $make_core; 4182 if $make_core;
3790 4183
3791 my $fh = pidfile; 4184 my $fh = pidfile;
3792 unlink $PIDFILE if <$fh> == $$; 4185 unlink $PIDFILE if <$fh> == $$;
3793} 4186}
3817 } 4210 }
3818} 4211}
3819 4212
3820sub do_reload_perl() { 4213sub do_reload_perl() {
3821 # can/must only be called in main 4214 # can/must only be called in main
3822 if (in_main) { 4215 unless (in_main) {
3823 warn "can only reload from main coroutine"; 4216 error "can only reload from main coroutine";
3824 return; 4217 return;
3825 } 4218 }
3826 4219
3827 return if $RELOAD++; 4220 return if $RELOAD++;
3828 4221
3829 my $t1 = AE::time; 4222 my $t1 = AE::time;
3830 4223
3831 while ($RELOAD) { 4224 while ($RELOAD) {
3832 warn "reloading..."; 4225 cf::get_slot 0.1, -1, "reload_perl";
4226 info "perl_reload: reloading...";
3833 4227
3834 warn "entering sync_job"; 4228 trace "perl_reload: entering sync_job";
3835 4229
3836 cf::sync_job { 4230 cf::sync_job {
3837 cf::write_runtime_sync; # external watchdog should not bark
3838 cf::emergency_save; 4231 #cf::emergency_save;
3839 cf::write_runtime_sync; # external watchdog should not bark
3840 4232
3841 warn "syncing database to disk";
3842 BDB::db_env_txn_checkpoint $DB_ENV;
3843
3844 # if anything goes wrong in here, we should simply crash as we already saved
3845
3846 warn "flushing outstanding aio requests";
3847 while (IO::AIO::nreqs || BDB::nreqs) {
3848 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3849 }
3850
3851 warn "cancelling all extension coros"; 4233 trace "perl_reload: cancelling all extension coros";
3852 $_->cancel for values %EXT_CORO; 4234 $_->cancel for values %EXT_CORO;
3853 %EXT_CORO = (); 4235 %EXT_CORO = ();
3854 4236
3855 warn "removing commands"; 4237 trace "perl_reload: removing commands";
3856 %COMMAND = (); 4238 %COMMAND = ();
3857 4239
3858 warn "removing ext/exti commands"; 4240 trace "perl_reload: removing ext/exti commands";
3859 %EXTCMD = (); 4241 %EXTCMD = ();
3860 %EXTICMD = (); 4242 %EXTICMD = ();
3861 4243
3862 warn "unloading/nuking all extensions"; 4244 trace "perl_reload: unloading/nuking all extensions";
3863 for my $pkg (@EXTS) { 4245 for my $pkg (@EXTS) {
3864 warn "... unloading $pkg"; 4246 trace "... unloading $pkg";
3865 4247
3866 if (my $cb = $pkg->can ("unload")) { 4248 if (my $cb = $pkg->can ("unload")) {
3867 eval { 4249 eval {
3868 $cb->($pkg); 4250 $cb->($pkg);
3869 1 4251 1
3870 } or warn "$pkg unloaded, but with errors: $@"; 4252 } or error "$pkg unloaded, but with errors: $@";
3871 } 4253 }
3872 4254
3873 warn "... clearing $pkg"; 4255 trace "... clearing $pkg";
3874 clear_package $pkg; 4256 clear_package $pkg;
3875 } 4257 }
3876 4258
3877 warn "unloading all perl modules loaded from $LIBDIR"; 4259 trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3878 while (my ($k, $v) = each %INC) { 4260 while (my ($k, $v) = each %INC) {
3879 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/; 4261 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3880 4262
3881 warn "... unloading $k"; 4263 trace "... unloading $k";
3882 delete $INC{$k}; 4264 delete $INC{$k};
3883 4265
3884 $k =~ s/\.pm$//; 4266 $k =~ s/\.pm$//;
3885 $k =~ s/\//::/g; 4267 $k =~ s/\//::/g;
3886 4268
3889 } 4271 }
3890 4272
3891 clear_package $k; 4273 clear_package $k;
3892 } 4274 }
3893 4275
3894 warn "getting rid of safe::, as good as possible"; 4276 trace "perl_reload: getting rid of safe::, as good as possible";
3895 clear_package "safe::$_" 4277 clear_package "safe::$_"
3896 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 4278 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3897 4279
3898 warn "unloading cf.pm \"a bit\""; 4280 trace "perl_reload: unloading cf.pm \"a bit\"";
3899 delete $INC{"cf.pm"}; 4281 delete $INC{"cf.pm"};
3900 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; 4282 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3901 4283
3902 # don't, removes xs symbols, too, 4284 # don't, removes xs symbols, too,
3903 # and global variables created in xs 4285 # and global variables created in xs
3904 #clear_package __PACKAGE__; 4286 #clear_package __PACKAGE__;
3905 4287
3906 warn "unload completed, starting to reload now"; 4288 info "perl_reload: unload completed, starting to reload now";
3907 4289
3908 warn "reloading cf.pm"; 4290 trace "perl_reload: reloading cf.pm";
3909 require cf; 4291 require cf;
3910 cf::_connect_to_perl_1; 4292 cf::_connect_to_perl_1;
3911 4293
3912 warn "loading config and database again"; 4294 trace "perl_reload: loading config and database again";
3913 cf::reload_config; 4295 cf::reload_config;
3914 4296
3915 warn "loading extensions"; 4297 trace "perl_reload: loading extensions";
3916 cf::load_extensions; 4298 cf::load_extensions;
3917 4299
3918 if ($REATTACH_ON_RELOAD) { 4300 if ($REATTACH_ON_RELOAD) {
3919 warn "reattaching attachments to objects/players"; 4301 trace "perl_reload: reattaching attachments to objects/players";
3920 _global_reattach; # objects, sockets 4302 _global_reattach; # objects, sockets
3921 warn "reattaching attachments to maps"; 4303 trace "perl_reload: reattaching attachments to maps";
3922 reattach $_ for values %MAP; 4304 reattach $_ for values %MAP;
3923 warn "reattaching attachments to players"; 4305 trace "perl_reload: reattaching attachments to players";
3924 reattach $_ for values %PLAYER; 4306 reattach $_ for values %PLAYER;
3925 } 4307 }
3926 4308
3927 warn "running post_init jobs"; 4309 cf::_post_init 1;
3928 (pop @POST_INIT)->(1) while @POST_INIT;
3929 4310
3930 warn "leaving sync_job"; 4311 trace "perl_reload: leaving sync_job";
3931 4312
3932 1 4313 1
3933 } or do { 4314 } or do {
3934 warn $@; 4315 error $@;
3935 cf::cleanup "error while reloading, exiting."; 4316 cf::cleanup "perl_reload: error, exiting.";
3936 }; 4317 };
3937 4318
3938 warn "reloaded";
3939 --$RELOAD; 4319 --$RELOAD;
3940 } 4320 }
3941 4321
3942 $t1 = AE::time - $t1; 4322 $t1 = AE::time - $t1;
3943 warn "reload completed in ${t1}s\n"; 4323 info "perl_reload: completed in ${t1}s\n";
3944}; 4324};
3945 4325
3946our $RELOAD_WATCHER; # used only during reload 4326our $RELOAD_WATCHER; # used only during reload
3947 4327
3948sub reload_perl() { 4328sub reload_perl() {
3969 reload_perl; 4349 reload_perl;
3970 }; 4350 };
3971 } 4351 }
3972}; 4352};
3973 4353
3974unshift @INC, $LIBDIR; 4354#############################################################################
3975 4355
3976my $bug_warning = 0; 4356my $bug_warning = 0;
3977 4357
3978our @WAIT_FOR_TICK;
3979our @WAIT_FOR_TICK_BEGIN;
3980
3981sub wait_for_tick { 4358sub wait_for_tick() {
3982 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4359 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3983 4360
3984 my $signal = new Coro::Signal; 4361 $WAIT_FOR_TICK->wait;
3985 push @WAIT_FOR_TICK, $signal;
3986 $signal->wait;
3987} 4362}
3988 4363
3989sub wait_for_tick_begin { 4364sub wait_for_tick_begin() {
3990 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; 4365 return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3991 4366
3992 my $signal = new Coro::Signal; 4367 my $signal = new Coro::Signal;
3993 push @WAIT_FOR_TICK_BEGIN, $signal; 4368 push @WAIT_FOR_TICK_BEGIN, $signal;
3994 $signal->wait; 4369 $signal->wait;
3995} 4370}
3999 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 4374 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4000 unless ++$bug_warning > 10; 4375 unless ++$bug_warning > 10;
4001 return; 4376 return;
4002 } 4377 }
4003 4378
4004 cf::server_tick; # one server iteration 4379 cf::one_tick; # one server iteration
4005 4380
4006 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d# 4381 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4007 4382
4008 if ($NOW >= $NEXT_RUNTIME_WRITE) { 4383 if ($NOW >= $NEXT_RUNTIME_WRITE) {
4009 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 4384 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4010 Coro::async_pool { 4385 Coro::async_pool {
4011 $Coro::current->{desc} = "runtime saver"; 4386 $Coro::current->{desc} = "runtime saver";
4012 write_runtime_sync 4387 write_runtime_sync
4013 or warn "ERROR: unable to write runtime file: $!"; 4388 or error "ERROR: unable to write runtime file: $!";
4014 }; 4389 };
4015 } 4390 }
4016 4391
4017 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4392 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4018 $sig->send; 4393 $sig->send;
4019 } 4394 }
4020 while (my $sig = shift @WAIT_FOR_TICK) { 4395 $WAIT_FOR_TICK->broadcast;
4021 $sig->send;
4022 }
4023 4396
4024 $LOAD = ($NOW - $TICK_START) / $TICK; 4397 $LOAD = ($NOW - $TICK_START) / $TICK;
4025 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4398 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4026 4399
4027 if (0) { 4400 if (0) {
4028 if ($NEXT_TICK) { 4401 if ($NEXT_TICK) {
4029 my $jitter = $TICK_START - $NEXT_TICK; 4402 my $jitter = $TICK_START - $NEXT_TICK;
4030 $JITTER = $JITTER * 0.75 + $jitter * 0.25; 4403 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4031 warn "jitter $JITTER\n";#d# 4404 debug "jitter $JITTER\n";#d#
4032 } 4405 }
4033 } 4406 }
4034} 4407}
4035 4408
4036{ 4409{
4037 # configure BDB 4410 # configure BDB
4411 info "initialising database";
4038 4412
4039 BDB::min_parallel 16; 4413 BDB::min_parallel 16;
4040 BDB::max_poll_reqs $TICK * 0.1; 4414 BDB::max_poll_reqs $TICK * 0.1;
4041 $AnyEvent::BDB::WATCHER->priority (1); 4415 #$AnyEvent::BDB::WATCHER->priority (1);
4042 4416
4043 unless ($DB_ENV) { 4417 unless ($DB_ENV) {
4044 $DB_ENV = BDB::db_env_create; 4418 $DB_ENV = BDB::db_env_create;
4045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT); 4419 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4046 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7; 4420 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4071 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 4445 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4072 }; 4446 };
4073 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub { 4447 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4074 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 4448 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4075 }; 4449 };
4450
4451 info "database initialised";
4076} 4452}
4077 4453
4078{ 4454{
4079 # configure IO::AIO 4455 # configure IO::AIO
4080 4456
4457 info "initialising aio";
4081 IO::AIO::min_parallel 8; 4458 IO::AIO::min_parallel 8;
4082 IO::AIO::max_poll_time $TICK * 0.1; 4459 IO::AIO::max_poll_time $TICK * 0.1;
4083 undef $AnyEvent::AIO::WATCHER; 4460 undef $AnyEvent::AIO::WATCHER;
4461 info "aio initialised";
4084} 4462}
4085 4463
4086my $_log_backtrace; 4464our $_log_backtrace;
4465our $_log_backtrace_last;
4087 4466
4088sub _log_backtrace { 4467sub _log_backtrace {
4089 my ($msg, @addr) = @_; 4468 my ($msg, @addr) = @_;
4090 4469
4091 $msg =~ s/\n//; 4470 $msg =~ s/\n$//;
4092 4471
4472 if ($_log_backtrace_last eq $msg) {
4473 LOG llevInfo, "[ABT] $msg\n";
4474 LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4093 # limit the # of concurrent backtraces 4475 # limit the # of concurrent backtraces
4094 if ($_log_backtrace < 2) { 4476 } elsif ($_log_backtrace < 2) {
4477 $_log_backtrace_last = $msg;
4095 ++$_log_backtrace; 4478 ++$_log_backtrace;
4096 my $perl_bt = Carp::longmess $msg; 4479 my $perl_bt = Carp::longmess $msg;
4097 async { 4480 async {
4098 $Coro::current->{desc} = "abt $msg"; 4481 $Coro::current->{desc} = "abt $msg";
4099 4482
4119 LOG llevInfo, "[ABT] $_\n" for @bt; 4502 LOG llevInfo, "[ABT] $_\n" for @bt;
4120 --$_log_backtrace; 4503 --$_log_backtrace;
4121 }; 4504 };
4122 } else { 4505 } else {
4123 LOG llevInfo, "[ABT] $msg\n"; 4506 LOG llevInfo, "[ABT] $msg\n";
4124 LOG llevInfo, "[ABT] [suppressed]\n"; 4507 LOG llevInfo, "[ABT] [overload, suppressed]\n";
4125 } 4508 }
4126} 4509}
4127 4510
4128# load additional modules 4511# load additional modules
4129require "cf/$_.pm" for @EXTRA_MODULES; 4512require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines