ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.548 by root, Mon May 10 21:40:22 2010 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 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
23	package cf;	23	package cf;
24		24
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
		62	use CBOR::XS ();
58	use IO::AIO ();	63	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	64	use Compress::LZF;
61	use Digest::MD5 ();	65	use Digest::MD5 ();
62		66
63	AnyEvent::detect;	67	AnyEvent::detect;
64		68
…		…
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE; # unused	119	#our %RESOURCE; # unused
112		120
113	our $OUTPUT_RATE_MIN = 3000;	121	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	122	our $OUTPUT_RATE_MAX = 1000000;
115		123
116	our $MAX_LINKS = 32; # how many chained exits to follow	124	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	135	our $DB_ENV;
128		136
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		138
131	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		141
133	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
135	our $NOW;	145	our $NOW;
136		146
137	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		158
149	our @POST_INIT;	159	our @POST_INIT;
150		160
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
153		166
154	binmode STDOUT;	167	binmode STDOUT;
155	binmode STDERR;	168	binmode 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
196	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
197		225
198	=item $cf::RUNTIME	226	=item $cf::RUNTIME
199		227
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	229	every 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
207	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
210	database environment.	238	database environment.
211		239
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	240	=item $cf::LOADAVG
221		241
222	The current CPU load on the server (alpha-smoothed), as a value between 0	242	The 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
224	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	252	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	253	from 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
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one thread	258	cf::wait_for_tick_begin only returns directly I<after> the tick
		259	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	260	cf::wait_for_tick wakes up all waiters after tick processing.
		261
		262	Note that cf::wait_for_tick will immediately return when the server is not
		263	ticking, making it suitable for small pauses in threads that need to run
		264	when the server is paused. If that is not applicable (i.e. you I<really>
		265	want to wait, use C<$cf::WAIT_FOR_TICK>).
		266
		267	=item $cf::WAIT_FOR_TICK
		268
		269	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		270	variable contains a L<Coro::Signal> that is broadcats after every server
		271	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		272	next server tick.
240		273
241	=cut	274	=cut
242		275
243	sub wait_for_tick();	276	sub wait_for_tick();
244	sub wait_for_tick_begin();	277	sub wait_for_tick_begin();
…		…
310	)) {	343	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	344	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	345	}
313		346
314	$EV::DIED = sub {	347	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	348	warn "error in event callback: $@";
316	};	349	};
		350
		351	#############################################################################
		352
		353	sub fork_call(&@);
		354	sub get_slot($;$$);
317		355
318	#############################################################################	356	#############################################################################
319		357
320	=head2 UTILITY FUNCTIONS	358	=head2 UTILITY FUNCTIONS
321		359
…		…
342	$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;
343	$d	381	$d
344	} || "[unable to dump $_[0]: '$@']";	382	} || "[unable to dump $_[0]: '$@']";
345	}	383	}
346		384
		385	=item $scalar = cf::load_file $path
		386
		387	Loads the given file from path and returns its contents. Croaks on error
		388	and can block.
		389
		390	=cut
		391
		392	sub 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
		401	Atomically replaces the file at the given $path with new $data, and
		402	optionally $sync the data to disk before replacing the file.
		403
		404	=cut
		405
		406	sub 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
347	=item $ref = cf::decode_json $json	437	=item $ref = cf::decode_json $json
348		438
349	Converts a JSON string into the corresponding perl data structure.	439	Converts a JSON string into the corresponding perl data structure.
350		440
351	=item $json = cf::encode_json $ref	441	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	447	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		448
359	sub encode_json($) { $json_coder->encode ($_[0]) }	449	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	450	sub decode_json($) { $json_coder->decode ($_[0]) }
361		451
		452	=item $ref = cf::decode_storable $scalar
		453
		454	Same as Coro::Storable::thaw, so blocks.
		455
		456	=cut
		457
		458	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		459
362	=item $ref = cf::yaml_load $scalar	460	=item $ref = cf::decode_yaml $scalar
363		461
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	462	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		463
366	=cut	464	=cut
367		465
368	sub fork_call(&@);	466	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	467	fork_call { YAML::XS::Load $_[0] } @_
		468	}
		469
		470	=item $scalar = cf::decode_cbor $scalar
		471
		472	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		473	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		474	alternative.
		475
		476	=cut
		477
		478	sub 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
		486	Same as Compress::LZF::compress, but takes server ticks into account, so
		487	blocks.
		488
		489	=cut
		490
		491	sub 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]
372	}	495	}
373		496
374	=item cf::post_init { BLOCK }	497	=item cf::post_init { BLOCK }
375		498
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	499	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
383		506
384	sub post_init(&) {	507	sub post_init(&) {
385	push @POST_INIT, shift;	508	push @POST_INIT, shift;
386	}	509	}
387		510
		511	sub _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
388	=item cf::lock_wait $string	528	=item cf::lock_wait $string
389		529
390	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
391		531
392	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
393		533
394	Wait until the given lock is available and then acquires it and returns	534	Wait until the given lock is available and then acquires it and returns
395	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	535	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
443	EV::periodic $start, $interval, 0, $cb	583	EV::periodic $start, $interval, 0, $cb
444	}	584	}
445		585
446	=item cf::get_slot $time[, $priority[, $name]]	586	=item cf::get_slot $time[, $priority[, $name]]
447		587
448	Allocate $time seconds of blocking CPU time at priority C<$priority>:	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
449	This 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
450	of cpu time till the next tick. The slot is only valid till the next cede.	590	C<$time> seconds of cpu time till the next tick. The slot is only valid
		591	till the next cede.
		592
		593	Background jobs should use a priority less than zero, interactive jobs
		594	should use 100 or more.
451		595
452	The optional C<$name> can be used to identify the job to run. It might be	596	The optional C<$name> can be used to identify the job to run. It might be
453	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
454		598
455	Useful for short background jobs.	599	Useful for short background jobs.
…		…
467	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
468	my $busy;	612	my $busy;
469		613
470	while () {	614	while () {
471	next_job:	615	next_job:
		616
		617	Coro::cede;
472		618
473	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
474		620
475	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
476	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
477	$busy = 0;	623	$busy = 0;
478	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
479	$job->[2]->send;	625	$job->[2]->send;
480	Coro::cede;
481	goto next_job;	626	goto next_job;
482	} else {	627	} else {
483	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
484	}	629	}
485	}	630	}
486		631
487	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
488	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
489	push @cf::WAIT_FOR_TICK, $signal;
490	$signal->wait;
491	} else {	634	} else {
492	$busy = 0;	635	$busy = 0;
493	Coro::schedule;	636	Coro::schedule;
494	}	637	}
495	}	638	}
…		…
521	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
522		665
523	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
524		667
525	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
526	is always able to handle events or runnable, as Deliantra is only	669	is always able to handle events or is runnable, as Deliantra is only
527	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	670	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
528	acceptable.	671	acceptable.
529		672
530	If it must be done, put the blocking parts into C<sync_job>. This will run	673	If it must be done, put the blocking parts into C<sync_job>. This will run
531	the given BLOCK in another coroutine while waiting for the result. The	674	the given BLOCK in another coroutine while waiting for the result. The
…		…
559		702
560	while ($busy) {	703	while ($busy) {
561	if (Coro::nready) {	704	if (Coro::nready) {
562	Coro::cede_notself;	705	Coro::cede_notself;
563	} else {	706	} else {
564	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
565	}	708	}
566	}	709	}
567		710
568	my $time = AE::time - $time;	711	my $time = AE::time - $time;
569		712
…		…
610	reset_signals;	753	reset_signals;
611	}	754	}
612		755
613	sub fork_call(&@) {	756	sub fork_call(&@) {
614	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
615
616	# we seemingly have to make a local copy of the whole thing,
617	# otherwise perl prematurely frees the stuff :/
618	# TODO: investigate and fix (likely this will be rather laborious)
619		758
620	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
621	cf::post_fork;	760	cf::post_fork;
622	&$cb	761	&$cb
623	} @args;	762	} @args;
…		…
750		889
751	my @data;	890	my @data;
752	my $md5;	891	my $md5;
753		892
754	for (0 .. $#$src) {	893	for (0 .. $#$src) {
755	0 <= aio_load $src->[$_], $data[$_]	894	$data[$_] = load_file $src->[$_];
756	or Carp::croak "$src->[$_]: $!";
757	}	895	}
758		896
759	# if processing is expensive, check	897	# if processing is expensive, check
760	# checksum first	898	# checksum first
761	if (1) {	899	if (1) {
…		…
774		912
775	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
776	}	914	}
777	}	915	}
778		916
779	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
780	my $data = $process->(\@data);	918	my $data = $process->(\@data);
781	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
782		920
783	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
784		922
785	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
786	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
…		…
1306	=cut	1444	=cut
1307		1445
1308	#############################################################################	1446	#############################################################################
1309	# command handling &c	1447	# command handling &c
1310		1448
1311	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1312		1450
1313	Register a callback for execution when the client sends the user command	1451	Register a callback for execution when the client sends the user command
1314	$name.	1452	$name.
1315		1453
1316	=cut	1454	=cut
…		…
1322	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1323		1461
1324	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1325	}	1463	}
1326		1464
1327	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1328		1466
1329	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1330	extcmd packet. Ext commands will be processed in the order they are	1468	extcmd packet. Ext commands will be processed in the order they are
1331	received by the server, like other user commands. The first argument is	1469	received by the server, like other user commands. The first argument is
1332	the logged-in player. Ext commands can only be processed after a player	1470	the logged-in player. Ext commands can only be processed after a player
1333	has logged in successfully.	1471	has logged in successfully.
1334		1472
1335	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1336	called.
1337		1474
		1475	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
1338	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1339		1481
1340	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1341	exticmd packet. Exti commands are processed by the server as soon as they	1483	exticmd packet. Exti commands are processed by the server as soon as they
1342	are received, i.e. out of order w.r.t. other commands. The first argument	1484	are received, i.e. out of order w.r.t. other commands. The first argument
1343	is a client socket. Exti commands can be received anytime, even before	1485	is a client socket. Exti commands can be received anytime, even before
1344	log-in.	1486	log-in.
1345		1487
1346	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1347	called.
1348		1489
1349	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1350		1491
		1492	Same as C<cf::register_extcmd>, but instead of returning values, the
		1493	callback needs to clal the C<$reply> function.
		1494
		1495	=cut
		1496
1351	sub register_extcmd {	1497	sub register_extcmd($$) {
1352	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1353		1499
1354	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1355	}	1501	}
1356		1502
1357	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1358	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1359		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1360	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1361	}	1519	}
1362		1520
1363	use File::Glob ();	1521	use File::Glob ();
1364		1522
1365	cf::player->attach (	1523	cf::player->attach (
…		…
1379	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1380		1538
1381	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1382		1540
1383	if (ref $msg) {	1541	if (ref $msg) {
1384	my ($type, $reply, @payload) =	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1385	"ARRAY" eq ref $msg
1386	? @$msg
1387	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1388		1543
1389	my @reply;
1390
1391	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}) {
1392	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1393	}	1562	}
1394
1395	$pl->ext_reply ($reply, @reply)
1396	if $reply;
1397		1563
1398	} else {	1564	} else {
1399	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1400	}	1566	}
1401		1567
…		…
1414	};	1580	};
1415		1581
1416	$grp	1582	$grp
1417	}	1583	}
1418		1584
		1585	sub _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
1419	sub load_extensions {	1596	sub load_extensions {
1420	info "loading extensions...";	1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
1421		1600
1422	cf::sync_job {	1601	cf::sync_job {
1423	my %todo;	1602	my %todo;
1424		1603
1425	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
…		…
1468	unless exists $done{$_};	1647	unless exists $done{$_};
1469	}	1648	}
1470		1649
1471	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1472		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
1473	my $active = eval $v->{source};	1661	my $active = eval $source;
1474		1662
1475	if (length $@) {	1663	if (length $@) {
1476	error "$v->{path}: $@\n";	1664	error "$v->{path}: $@\n";
1477		1665
1478	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1495		1683
1496	while (my ($k, $v) = each %todo) {	1684	while (my ($k, $v) = each %todo) {
1497	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1685	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1498	if exists $v->{meta}{mandatory};	1686	if exists $v->{meta}{mandatory};
1499	}	1687	}
		1688
		1689	last;
1500	}	1690	}
1501	}	1691	}
1502	};	1692	};
1503	}	1693	}
1504		1694
…		…
1662	my $name = $pl->ob->name;	1852	my $name = $pl->ob->name;
1663		1853
1664	$pl->{deny_save} = 1;	1854	$pl->{deny_save} = 1;
1665	$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
1666		1856
1667	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1857	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1668	$pl->deactivate;	1858	$pl->deactivate;
1669		1859
1670	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;
		1861	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1671	ext::highscore::check ($pl->ob);	1862	ext::highscore::check ($pl->ob);
1672		1863
1673	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1674	$pl->ns->destroy if $pl->ns;	1864	$pl->ns->destroy if $pl->ns;
1675		1865
1676	my $path = playerdir $pl;	1866	my $path = playerdir $pl;
1677	my $temp = "$path~$cf::RUNTIME~deleting~";	1867	my $temp = "$path~$cf::RUNTIME~deleting~";
1678	aio_rename $path, $temp;	1868	aio_rename $path, $temp;
…		…
1764		1954
1765	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1766		1956
1767	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1768		1958
1769	=item $player->ext_reply ($msgid, @msg)
1770
1771	Sends an ext reply to the player.
1772
1773	=cut
1774
1775	sub ext_reply($$@) {
1776	my ($self, $id, @msg) = @_;
1777
1778	$self->ns->ext_reply ($id, @msg)
1779	}
1780
1781	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1782		1960
1783	Sends an ext event to the client.	1961	Sends an ext event to the client.
1784		1962
1785	=cut	1963	=cut
…		…
1844	sub generate_random_map {	2022	sub generate_random_map {
1845	my ($self, $rmp) = @_;	2023	my ($self, $rmp) = @_;
1846		2024
1847	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
1848		2026
1849	# mit "rum" bekleckern, nicht
1850	$self->_create_random_map (	2027	$self->_create_random_map ($rmp);
1851	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1852	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1853	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1854	$rmp->{exit_on_final_map},
1855	$rmp->{xsize}, $rmp->{ysize},
1856	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1857	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1858	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1859	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1860	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1861	(cf::region::find $rmp->{region}), $rmp->{custom}
1862	)
1863	}	2028	}
1864		2029
1865	=item cf::map->register ($regex, $prio)	2030	=item cf::map->register ($regex, $prio)
1866		2031
1867	Register a handler for the map path matching the given regex at the	2032	Register a handler for the map path matching the given regex at the
…		…
1918	$base =~ s{[^/]+/?$}{};	2083	$base =~ s{[^/]+/?$}{};
1919	$path = "$base/$path";	2084	$path = "$base/$path";
1920	}	2085	}
1921		2086
1922	for ($path) {	2087	for ($path) {
1923	redo if s{//}{/};
1924	redo if s{/\.?/}{/};	2088	redo if s{/\.?/}{/};
1925	redo if s{/[^/]+/\.\./}{/};	2089	redo if s{/[^/]+/\.\./}{/};
1926	}	2090	}
1927		2091
1928	$path	2092	$path
…		…
1946		2110
1947	Carp::cluck "unable to resolve path '$path' (base '$base')";	2111	Carp::cluck "unable to resolve path '$path' (base '$base')";
1948	()	2112	()
1949	}	2113	}
1950		2114
		2115	# may re-bless or do other evil things
1951	sub init {	2116	sub init {
1952	my ($self) = @_;	2117	my ($self) = @_;
1953		2118
1954	$self	2119	$self
1955	}	2120	}
…		…
2020	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
2021		2186
2022	1	2187	1
2023	}	2188	}
2024		2189
		2190	# used to laod the header of an original map
2025	sub load_header_orig {	2191	sub load_header_orig {
2026	my ($self) = @_;	2192	my ($self) = @_;
2027		2193
2028	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
2029	}	2195	}
2030		2196
		2197	# used to laod the header of an instantiated map
2031	sub load_header_temp {	2198	sub load_header_temp {
2032	my ($self) = @_;	2199	my ($self) = @_;
2033		2200
2034	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
2035	}	2202	}
2036		2203
		2204	# called after loading the header from an instantiated map
2037	sub prepare_temp {	2205	sub prepare_temp {
2038	my ($self) = @_;	2206	my ($self) = @_;
2039		2207
2040	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
2041	|| $cf::RUNTIME); #d#	2209	|| $cf::RUNTIME); #d#
2042	# safety	2210	# safety
2043	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
2044	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
2045	}	2213	}
2046		2214
		2215	# called after loading the header from an original map
2047	sub prepare_orig {	2216	sub prepare_orig {
2048	my ($self) = @_;	2217	my ($self) = @_;
2049		2218
2050	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
2051	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2077	sub find {	2246	sub find {
2078	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
2079		2248
2080	cf::cede_to_tick;	2249	cf::cede_to_tick;
2081		2250
2082	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
2083		2252
2084	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2085	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
2086		2255
2087	$cf::MAP{$path} || do {	2256	$cf::MAP{$path} || do {
…		…
2118		2287
2119	{	2288	{
2120	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2121		2290
2122	return unless $self->valid;	2291	return unless $self->valid;
2123	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2124
2125	$self->in_memory (cf::MAP_LOADING);
2126		2293
2127	$self->alloc;	2294	$self->alloc;
2128		2295
2129	$self->pre_load;	2296	$self->pre_load;
2130	cf::cede_to_tick;	2297	cf::cede_to_tick;
2131		2298
		2299	if (exists $self->{load_path}) {
2132	my $f = new_from_file cf::object::thawer $self->{load_path};	2300	my $f = new_from_file cf::object::thawer $self->{load_path};
2133	$f->skip_block;	2301	$f->skip_block;
2134	$self->_load_objects ($f)	2302	$self->_load_objects ($f)
2135	or return;	2303	or return;
2136		2304
2137	$self->post_load_original	2305	$self->post_load_original
2138	if delete $self->{load_original};	2306	if delete $self->{load_original};
2139		2307
2140	if (my $uniq = $self->uniq_path) {	2308	if (my $uniq = $self->uniq_path) {
2141	utf8::encode $uniq;	2309	utf8::encode $uniq;
2142	unless (aio_stat $uniq) {	2310	unless (aio_stat $uniq) {
2143	if (my $f = new_from_file cf::object::thawer $uniq) {	2311	if (my $f = new_from_file cf::object::thawer $uniq) {
2144	$self->clear_unique_items;	2312	$self->clear_unique_items;
2145	$self->_load_objects ($f);	2313	$self->_load_objects ($f);
2146	$f->resolve_delayed_derefs;	2314	$f->resolve_delayed_derefs;
		2315	}
2147	}	2316	}
2148	}	2317	}
2149	}
2150		2318
2151	$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);
2152		2326
2153	cf::cede_to_tick;	2327	cf::cede_to_tick;
2154	# now do the right thing for maps	2328	# now do the right thing for maps
2155	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2156	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2160	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2161	$self->decay_objects;	2335	$self->decay_objects;
2162	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2163	$self->update_buttons;	2337	$self->update_buttons;
2164	cf::cede_to_tick;	2338	cf::cede_to_tick;
2165	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2166	}	2340	}
2167		2341
2168	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2169	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2170
2171	$self->in_memory (cf::MAP_ACTIVE);
2172	}	2344	}
2173		2345
2174	$self->post_load;	2346	$self->post_load;
		2347
		2348	1
2175	}	2349	}
2176		2350
2177	# customize the map for a given player, i.e.	2351	# customize the map for a given player, i.e.
2178	# return the _real_ map. used by e.g. per-player	2352	# return the _real_ map. used by e.g. per-player
2179	# maps to change the path to ~playername/mappath	2353	# maps to change the path to ~playername/mappath
…		…
2187	# if $self->per_party;	2361	# if $self->per_party;
2188		2362
2189	$self	2363	$self
2190	}	2364	}
2191		2365
2192	# find and load all maps in the 3x3 area around a map
2193	sub load_neighbours {
2194	my ($map) = @_;
2195
2196	my @neigh; # diagonal neighbours
2197
2198	for (0 .. 3) {
2199	my $neigh = $map->tile_path ($_)
2200	or next;
2201	$neigh = find $neigh, $map
2202	or next;
2203	$neigh->load;
2204
2205	# now find the diagonal neighbours
2206	push @neigh,
2207	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2208	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2209	}
2210
2211	for (grep defined $_->[0], @neigh) {
2212	my ($path, $origin) = @$_;
2213	my $neigh = find $path, $origin
2214	or next;
2215	$neigh->load;
2216	}
2217	}
2218
2219	sub find_sync {	2366	sub find_sync {
2220	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2221		2368
		2369	# it's a bug to call this from the main context
2222	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2370	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2223	if $Coro::current == $Coro::main;	2371	if $Coro::current == $Coro::main;
2224		2372
2225	find $path, $origin	2373	find $path, $origin
2226	}	2374	}
2227		2375
2228	sub do_load_sync {	2376	sub do_load_sync {
2229	my ($map) = @_;	2377	my ($map) = @_;
2230		2378
		2379	# it's a bug to call this from the main context
2231	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2232	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2233		2382
2234	$map->load;	2383	$map->load;
2235	}	2384	}
…		…
2238	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2239		2388
2240	sub find_async {	2389	sub find_async {
2241	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2242		2391
2243	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2244		2393
2245	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2246	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load || $map->linkable;
2247	}	2396	}
2248		2397
2249	$MAP_PREFETCH{$path} |= $load;	2398	$MAP_PREFETCH{$path} |= $load;
2250		2399
2251	$MAP_PREFETCHER ||= cf::async {	2400	$MAP_PREFETCHER ||= cf::async {
2252	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2253		2402
2254	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2255	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2256	if (my $map = find $k) {	2405	if (my $map = find $k) {
2257	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2258	}	2407	}
2259		2408
2260	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2261	}	2410	}
2262	}	2411	}
…		…
2310	sub swap_out {	2459	sub swap_out {
2311	my ($self) = @_;	2460	my ($self) = @_;
2312		2461
2313	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2314		2463
2315	return if $self->in_memory != cf::MAP_ACTIVE;	2464	return if !$self->linkable;
2316	return if $self->{deny_save};	2465	return if $self->{deny_save};
2317	return if $self->players;	2466	return if $self->players;
2318		2467
2319	# first deactivate the map and "unlink" it from the core	2468	# first deactivate the map and "unlink" it from the core
2320	$self->deactivate;	2469	$self->deactivate;
2321	$_->clear_links_to ($self) for values %cf::MAP;	2470	$_->clear_links_to ($self) for values %cf::MAP;
2322	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2323		2472
2324	# then atomically save	2473	# then atomically save
2325	$self->_save;	2474	$self->_save;
2326		2475
2327	# then free the map	2476	# then free the map
…		…
2353		2502
2354	return if $self->players;	2503	return if $self->players;
2355		2504
2356	cf::trace "resetting map ", $self->path, "\n";	2505	cf::trace "resetting map ", $self->path, "\n";
2357		2506
2358	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
2359		2508
2360	# need to save uniques path	2509	# need to save uniques path
2361	unless ($self->{deny_save}) {	2510	unless ($self->{deny_save}) {
2362	my $uniq = $self->uniq_path; utf8::encode $uniq;	2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
2363		2512
…		…
2516		2665
2517	Creates and returns a persistent reference to an object that can be stored as a string.	2666	Creates and returns a persistent reference to an object that can be stored as a string.
2518		2667
2519	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2520		2669
2521	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2670	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2522	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2523		2672
2524	=cut	2673	=cut
2525		2674
2526	sub deref {	2675	sub deref {
…		…
2608	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2609		2758
2610	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2611	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2612		2761
		2762	This is implemented by checking a config setting of C<may_access> where
		2763	C<access> is replaced by the access string. The following alternatives are
		2764	possible (and are tested in order):
		2765
		2766	=over 4
		2767
		2768	=item * Player is DM
		2769
		2770	The request will succeed.
		2771
		2772	=item * may_access is an array reference
		2773
		2774	If either the player nickname or UUID is in the array, the request will
		2775	succeed, otherwise it will fail.
		2776
		2777	=item * may_access is a true value
		2778
		2779	The request will succeed.
		2780
		2781	=item * may_access is missing or false
		2782
		2783	The request will fail.
		2784
		2785	=back
		2786
2613	=cut	2787	=cut
2614		2788
2615	sub cf::object::player::may {	2789	sub cf::object::player::may {
2616	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2617		2791
2618	$self->flag (cf::FLAG_WIZ) ||	2792	$self->flag (cf::FLAG_WIZ) ||
2619	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2620	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2621	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2622	}	2796	}
2623		2797
2624	=item $player_object->enter_link	2798	=item $player_object->enter_link
2625		2799
…		…
2628	The player should be reasonably safe there for short amounts of time (e.g.	2802	The player should be reasonably safe there for short amounts of time (e.g.
2629	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2803	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2630	though, as the player cannot control the character while it is on the link	2804	though, as the player cannot control the character while it is on the link
2631	map.	2805	map.
2632		2806
2633	Will never block.	2807	This method will never block, which is the whole reaosn for it's
		2808	existance: you can I<always> put a player onto the link map, which is the
		2809	only place to put objects that is guaranteed to exist.
		2810
		2811	A typical usage pattern is to call C<enter_link> synchronously from the
		2812	server, then start a new thread, do your blocking stuff there and then
		2813	call C<leave_link> from that thread.
2634		2814
2635	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2636		2816
2637	Moves the player out of the special C<{link}> map onto the specified	2817	Moves the player out of the special C<{link}> map onto the specified
2638	map. If the map is not valid (or omitted), the player will be moved back	2818	map. If the map is not valid (or omitted), the player will be moved back
…		…
2693	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2694	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2695	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2696		2876
2697	$map->load;	2877	$map->load;
2698	$map->load_neighbours;
2699		2878
2700	return unless $self->contr->active;	2879	return unless $self->contr->active;
2701		2880
2702	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2703	if ($self->enter_map ($map, $x, $y)) {	2882	if ($self->enter_map ($map, $x, $y)) {
…		…
2759	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2760	}	2939	}
2761	}	2940	}
2762		2941
2763	my $map = eval {	2942	my $map = eval {
2764	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2765		2944
2766	if ($map) {	2945	if ($map) {
2767	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2768	$map = $check->($map, $x, $y, $self) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2769	} else {	2948	} else {
…		…
2859	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2860		3039
2861	unless (eval {	3040	unless (eval {
2862	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2863		3042
2864	# random map handling
2865	{
2866	my $guard = cf::lock_acquire "exit_prepare:$exit";
2867
2868	prepare_random_map $exit
2869	if $exit->slaying eq "/!";
2870	}
2871
2872	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2873	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2874	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	}
2875		3069
2876	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2877		3071
2878	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2879	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2894		3088
2895	=head3 cf::client	3089	=head3 cf::client
2896		3090
2897	=over 4	3091	=over 4
2898		3092
2899	=item $client->send_drawinfo ($text, $flags)
2900
2901	Sends a drawinfo packet to the client. Circumvents output buffering so
2902	should not be used under normal circumstances.
2903
2904	=cut
2905
2906	sub cf::client::send_drawinfo {
2907	my ($self, $text, $flags) = @_;
2908
2909	utf8::encode $text;
2910	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2911	}
2912
2913	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2914		3094
2915	Like C<send_packet>, but tries to compress large packets, and fragments	3095	Like C<send_packet>, but tries to compress large packets, and fragments
2916	them as required.	3096	them as required.
2917		3097
…		…
2935	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2936	}	3116	}
2937		3117
2938	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2939		3119
2940	Send a drawinfo or msg packet to the client, formatting the msg for the	3120	Send a msg packet to the client, formatting the msg for the client if
2941	client if neccessary. C<$type> should be a string identifying the type of	3121	necessary. C<$type> should be a string identifying the type of the
2942	the message, with C<log> being the default. If C<$color> is negative, suppress	3122	message, with C<log> being the default. If C<$color> is negative, suppress
2943	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2944		3124
2945	=cut	3125	=cut
2946		3126
2947	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
3052	id => "death",	3232	id => "death",
3053	title => "Death",	3233	title => "Death",
3054	reply => undef,	3234	reply => undef,
3055	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
3056	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
3057	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
3058	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
3059	);	3245	);
3060		3246
3061	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3104	=cut	3290	=cut
3105		3291
3106	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3107	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3108		3294
3109	if ($self->extcmd == 2) {
3110	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3111	} elsif ($self->extcmd == 1) { # TODO: remove
3112	push @msg, msgtype => "event_$type";
3113	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3114	}
3115	}
3116
3117	=item $client->ext_reply ($msgid, @msg)
3118
3119	Sends an ext reply to the client.
3120
3121	=cut
3122
3123	sub cf::client::ext_reply($$@) {
3124	my ($self, $id, @msg) = @_;
3125
3126	if ($self->extcmd == 2) {
3127	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3128	} elsif ($self->extcmd == 1) {
3129	#TODO: version 1, remove
3130	unshift @msg, msgtype => "reply", msgid => $id;
3131	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3132	}
3133	}	3296	}
3134		3297
3135	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3136		3299
3137	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3157		3320
3158	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3159	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3160		3323
3161	1	3324	1
		3325	}
		3326
		3327	=item $client->update_command_faces
		3328
		3329	=cut
		3330
		3331	our %COMMAND_FACE;
		3332
		3333	sub 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
		3355	sub 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;
3162	}	3364	}
3163		3365
3164	cf::client->attach (	3366	cf::client->attach (
3165	on_connect => sub {	3367	on_connect => sub {
3166	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3192	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3193		3395
3194	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3195		3397
3196	if (ref $msg) {	3398	if (ref $msg) {
3197	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3198	"ARRAY" eq ref $msg
3199	? @$msg
3200	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3201		3400
3202	my @reply;
3203
3204	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}) {
3205	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3206	}	3419	}
3207
3208	$ns->ext_reply ($reply, @reply)
3209	if $reply;
3210
3211	} else {	3420	} else {
3212	error "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";
3213	}	3422	}
3214		3423
3215	cf::override;	3424	cf::override;
…		…
3383	=cut	3592	=cut
3384		3593
3385	#############################################################################	3594	#############################################################################
3386	# the server's init and main functions	3595	# the server's init and main functions
3387		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
3388	sub load_facedata($) {	3674	sub load_facedata($) {
3389	my ($path) = @_;	3675	my ($path) = @_;
3390		3676
3391	# HACK to clear player env face cache, we need some signal framework
3392	# for this (global event?)
3393	%ext::player_env::MUSIC_FACE_CACHE = ();
3394
3395	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3396		3678
3397	trace "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3398		3680
3399	0 < aio_load $path, my $facedata	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3400	or die "$path: $!";
3401
3402	$facedata = Coro::Storable::thaw $facedata;
3403		3682
3404	$facedata->{version} == 2	3683	$facedata->{version} == 2
3405	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3406		3685
3407	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3408	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3409	$facedata->{resource}{"res/exp_table"} = {	3688
3410	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3411	data => $exp_table,	3690
3412	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3413	};	3692	# from here on, everything must be atomic - no thread switch allowed
3414	cf::cede_to_tick;	3693	my $t1 = EV::time;
3415		3694
3416	{	3695	{
3417	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3418		3697
3419	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3420	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3421		3701
3422	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3423	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3424	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};
3425	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};
3426		3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3427	cf::cede_to_tick;	3707	$cf::face::HASH{$info->{hash64}} = $idx;
		3708	delete $cf::face::META[$idx];
3428	}	3709	}
3429		3710
3430	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3431	next unless $info->{smooth};	3712	next unless $info->{smooth};
3432		3713
…		…
3437	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3438	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3439	} else {	3720	} else {
3440	error "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3441	}	3722	}
3442
3443	cf::cede_to_tick;
3444	}	3723	}
3445	}	3724	}
3446		3725
3447	{	3726	{
3448	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3449		3728
3450	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3451	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3452	cf::cede_to_tick;
3453	}	3731	}
3454		3732
3455	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3456	}	3734	}
3457		3735
3458	{	3736	{
3459	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3460		3738
3461	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3462	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
3463	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3464		3743
3465	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3466	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;
3467	} else {	3750	} else {
3468	$RESOURCE{$name} = $info; # unused	3751	# $RESOURCE{$name} = $info; # unused
3469	}	3752	}
3470
3471	cf::cede_to_tick;
3472	}	3753	}
3473	}	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;
3474		3765
3475	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3766	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3767
		3768	aio_close $fh if $fh; # close old facedata
3476		3769
3477	1	3770	1
3478	}	3771	}
3479		3772
3480	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
…		…
3491	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3492	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3493	cf::arch::commit_load;	3786	cf::arch::commit_load;
3494		3787
3495	$status	3788	$status
		3789	}
		3790
		3791	sub 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
		3801	sub reload_materials {
		3802	_reload_materials;
3496	}	3803	}
3497		3804
3498	sub reload_regions {	3805	sub reload_regions {
3499	# 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
3500	# for this (global event?)	3807	# for this (global event?)
…		…
3508	if exists $_->{match};	3815	if exists $_->{match};
3509	}	3816	}
3510	}	3817	}
3511		3818
3512	sub reload_facedata {	3819	sub reload_facedata {
3513	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3514	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3515	}	3822	}
3516		3823
3517	sub reload_archetypes {	3824	sub reload_archetypes {
3518	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3519	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;
3520	}	3853	}
3521		3854
3522	sub reload_treasures {	3855	sub reload_treasures {
3523	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3524	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
3525	}	3858	}
3526		3859
3527	sub reload_sound {	3860	sub reload_sound {
3528	trace "loading sound config from $DATADIR/sound\n";	3861	trace "loading sound config from $DATADIR/sound\n";
3529		3862
3530	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3531	or die "$DATADIR/sound $!";
3532
3533	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3863	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3534		3864
3535	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3865	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3536	my $sound = $soundconf->{compat}[$_]	3866	my $sound = $soundconf->{compat}[$_]
3537	or next;	3867	or next;
3538		3868
…		…
3548	}	3878	}
3549		3879
3550	sub reload_resources {	3880	sub reload_resources {
3551	trace "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3552		3882
3553	reload_exp_table;
3554	reload_materials;	3883	reload_materials;
3555	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
3556	reload_sound;	3886	reload_sound;
3557	reload_archetypes;	3887	reload_archetypes;
3558	reload_regions;	3888	reload_regions;
3559	reload_treasures;	3889	reload_treasures;
3560		3890
…		…
3562	}	3892	}
3563		3893
3564	sub reload_config {	3894	sub reload_config {
3565	trace "reloading config file...\n";	3895	trace "reloading config file...\n";
3566		3896
3567	0 < aio_load "$CONFDIR/config", my $config	3897	my $config = load_file "$CONFDIR/config";
3568	or die "$CONFDIR/config: $!";
3569
3570	utf8::decode $config;	3898	utf8::decode $config;
3571	*CFG = yaml_load $config;	3899	*CFG = decode_yaml $config;
3572		3900
3573	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3901	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3574		3902
3575	$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};
3576	$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};
…		…
3602	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3603	print $fh $$;	3931	print $fh $$;
3604	}	3932	}
3605		3933
3606	sub main_loop {	3934	sub main_loop {
3607	trace "EV::loop starting\n";	3935	trace "EV::run starting\n";
3608	if (1) {	3936	if (1) {
3609	EV::loop;	3937	EV::run;
3610	}	3938	}
3611	trace "EV::loop returned\n";	3939	trace "EV::run returned\n";
3612	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3613	}	3941	}
3614		3942
3615	sub main {	3943	sub main {
3616	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3617		3945
3618	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3619	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3947	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3620	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3621	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3622		3950
3623	$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
3624		3952
3625	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3626	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3627	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#
3628	(async {	3956	(async {
3629	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3630	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3631	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3632	};	3960	};
3633		3961
3634	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3635		3963
3636	cf::sync_job {	3964	cf::sync_job {
3637	cf::incloader::init ();	3965	cf::incloader::init ();
		3966
		3967	db_init;
3638		3968
3639	cf::init_anim;	3969	cf::init_anim;
3640	cf::init_attackmess;	3970	cf::init_attackmess;
3641	cf::init_dynamic;	3971	cf::init_dynamic;
3642		3972
3643	cf::load_settings;	3973	cf::load_settings;
3644		3974
3645	reload_resources;	3975	reload_resources;
3646	reload_config;	3976	reload_config;
3647	db_init;
3648		3977
3649	cf::init_uuid;	3978	cf::init_uuid;
3650	cf::init_signals;	3979	cf::init_signals;
3651	cf::init_skills;	3980	cf::init_skills;
3652		3981
…		…
3660		3989
3661	# no (long-running) fork's whatsoever before this point(!)	3990	# no (long-running) fork's whatsoever before this point(!)
3662	use POSIX ();	3991	use POSIX ();
3663	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};
3664		3993
3665	(pop @POST_INIT)->(0) while @POST_INIT;	3994	cf::_post_init 0;
3666	};	3995	};
3667		3996
3668	cf::object::thawer::errors_are_fatal 0;	3997	cf::object::thawer::errors_are_fatal 0;
3669	info "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";
3670		3999
3671	my $free_main; $free_main = EV::idle sub {	4000	AE::postpone {
3672	undef $free_main;
3673	undef &main; # free gobs of memory :)	4001	undef &main; # free gobs of memory :)
3674	};	4002	};
3675		4003
3676	goto &main_loop;	4004	goto &main_loop;
3677	}	4005	}
…		…
3834		4162
3835	cf::write_runtime_sync; # external watchdog should not bark	4163	cf::write_runtime_sync; # external watchdog should not bark
3836		4164
3837	trace "emergency_perl_save: flushing outstanding aio requests";	4165	trace "emergency_perl_save: flushing outstanding aio requests";
3838	while (IO::AIO::nreqs || BDB::nreqs) {	4166	while (IO::AIO::nreqs || BDB::nreqs) {
3839	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4167	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3840	}	4168	}
3841		4169
3842	cf::write_runtime_sync; # external watchdog should not bark	4170	cf::write_runtime_sync; # external watchdog should not bark
3843	};	4171	};
3844		4172
…		…
3893		4221
3894	my $t1 = AE::time;	4222	my $t1 = AE::time;
3895		4223
3896	while ($RELOAD) {	4224	while ($RELOAD) {
3897	cf::get_slot 0.1, -1, "reload_perl";	4225	cf::get_slot 0.1, -1, "reload_perl";
3898	info "reloading...";	4226	info "perl_reload: reloading...";
3899		4227
3900	trace "entering sync_job";	4228	trace "perl_reload: entering sync_job";
3901		4229
3902	cf::sync_job {	4230	cf::sync_job {
3903	#cf::emergency_save;	4231	#cf::emergency_save;
3904		4232
3905	trace "cancelling all extension coros";	4233	trace "perl_reload: cancelling all extension coros";
3906	$_->cancel for values %EXT_CORO;	4234	$_->cancel for values %EXT_CORO;
3907	%EXT_CORO = ();	4235	%EXT_CORO = ();
3908		4236
3909	trace "removing commands";	4237	trace "perl_reload: removing commands";
3910	%COMMAND = ();	4238	%COMMAND = ();
3911		4239
3912	trace "removing ext/exti commands";	4240	trace "perl_reload: removing ext/exti commands";
3913	%EXTCMD = ();	4241	%EXTCMD = ();
3914	%EXTICMD = ();	4242	%EXTICMD = ();
3915		4243
3916	trace "unloading/nuking all extensions";	4244	trace "perl_reload: unloading/nuking all extensions";
3917	for my $pkg (@EXTS) {	4245	for my $pkg (@EXTS) {
3918	trace "... unloading $pkg";	4246	trace "... unloading $pkg";
3919		4247
3920	if (my $cb = $pkg->can ("unload")) {	4248	if (my $cb = $pkg->can ("unload")) {
3921	eval {	4249	eval {
…		…
3926		4254
3927	trace "... clearing $pkg";	4255	trace "... clearing $pkg";
3928	clear_package $pkg;	4256	clear_package $pkg;
3929	}	4257	}
3930		4258
3931	trace "unloading all perl modules loaded from $LIBDIR";	4259	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3932	while (my ($k, $v) = each %INC) {	4260	while (my ($k, $v) = each %INC) {
3933	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4261	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3934		4262
3935	trace "... unloading $k";	4263	trace "... unloading $k";
3936	delete $INC{$k};	4264	delete $INC{$k};
…		…
3943	}	4271	}
3944		4272
3945	clear_package $k;	4273	clear_package $k;
3946	}	4274	}
3947		4275
3948	trace "getting rid of safe::, as good as possible";	4276	trace "perl_reload: getting rid of safe::, as good as possible";
3949	clear_package "safe::$_"	4277	clear_package "safe::$_"
3950	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);
3951		4279
3952	trace "unloading cf.pm \"a bit\"";	4280	trace "perl_reload: unloading cf.pm \"a bit\"";
3953	delete $INC{"cf.pm"};	4281	delete $INC{"cf.pm"};
3954	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4282	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3955		4283
3956	# don't, removes xs symbols, too,	4284	# don't, removes xs symbols, too,
3957	# and global variables created in xs	4285	# and global variables created in xs
3958	#clear_package __PACKAGE__;	4286	#clear_package __PACKAGE__;
3959		4287
3960	info "unload completed, starting to reload now";	4288	info "perl_reload: unload completed, starting to reload now";
3961		4289
3962	trace "reloading cf.pm";	4290	trace "perl_reload: reloading cf.pm";
3963	require cf;	4291	require cf;
3964	cf::_connect_to_perl_1;	4292	cf::_connect_to_perl_1;
3965		4293
3966	trace "loading config and database again";	4294	trace "perl_reload: loading config and database again";
3967	cf::reload_config;	4295	cf::reload_config;
3968		4296
3969	trace "loading extensions";	4297	trace "perl_reload: loading extensions";
3970	cf::load_extensions;	4298	cf::load_extensions;
3971		4299
3972	if ($REATTACH_ON_RELOAD) {	4300	if ($REATTACH_ON_RELOAD) {
3973	trace "reattaching attachments to objects/players";	4301	trace "perl_reload: reattaching attachments to objects/players";
3974	_global_reattach; # objects, sockets	4302	_global_reattach; # objects, sockets
3975	trace "reattaching attachments to maps";	4303	trace "perl_reload: reattaching attachments to maps";
3976	reattach $_ for values %MAP;	4304	reattach $_ for values %MAP;
3977	trace "reattaching attachments to players";	4305	trace "perl_reload: reattaching attachments to players";
3978	reattach $_ for values %PLAYER;	4306	reattach $_ for values %PLAYER;
3979	}	4307	}
3980		4308
3981	trace "running post_init jobs";	4309	cf::_post_init 1;
3982	(pop @POST_INIT)->(1) while @POST_INIT;
3983		4310
3984	trace "leaving sync_job";	4311	trace "perl_reload: leaving sync_job";
3985		4312
3986	1	4313	1
3987	} or do {	4314	} or do {
3988	error $@;	4315	error $@;
3989	cf::cleanup "error while reloading, exiting.";	4316	cf::cleanup "perl_reload: error, exiting.";
3990	};	4317	};
3991		4318
3992	info "reloaded";
3993	--$RELOAD;	4319	--$RELOAD;
3994	}	4320	}
3995		4321
3996	$t1 = AE::time - $t1;	4322	$t1 = AE::time - $t1;
3997	info "reload completed in ${t1}s\n";	4323	info "perl_reload: completed in ${t1}s\n";
3998	};	4324	};
3999		4325
4000	our $RELOAD_WATCHER; # used only during reload	4326	our $RELOAD_WATCHER; # used only during reload
4001		4327
4002	sub reload_perl() {	4328	sub reload_perl() {
…		…
4027		4353
4028	#############################################################################	4354	#############################################################################
4029		4355
4030	my $bug_warning = 0;	4356	my $bug_warning = 0;
4031		4357
4032	our @WAIT_FOR_TICK;
4033	our @WAIT_FOR_TICK_BEGIN;
4034
4035	sub wait_for_tick() {	4358	sub wait_for_tick() {
4036	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4037		4360
4038	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
4039	push @WAIT_FOR_TICK, $signal;
4040	$signal->wait;
4041	}	4362	}
4042		4363
4043	sub wait_for_tick_begin() {	4364	sub wait_for_tick_begin() {
4044	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4045		4366
4046	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
4047	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
4048	$signal->wait;	4369	$signal->wait;
4049	}	4370	}
…		…
4053	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"
4054	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
4055	return;	4376	return;
4056	}	4377	}
4057		4378
4058	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
4059		4380
4060	#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#
4061		4382
4062	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4063	$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.;
…		…
4069	}	4390	}
4070		4391
4071	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4072	$sig->send;	4393	$sig->send;
4073	}	4394	}
4074	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
4075	$sig->send;
4076	}
4077		4396
4078	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
4079	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4080		4399
4081	if (0) {	4400	if (0) {
…		…
4087	}	4406	}
4088	}	4407	}
4089		4408
4090	{	4409	{
4091	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4092		4412
4093	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4094	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4095	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4096		4416
4097	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
4098	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
4099	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4100	$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;
…		…
4125	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4126	};	4446	};
4127	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4128	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4129	};	4449	};
		4450
		4451	info "database initialised";
4130	}	4452	}
4131		4453
4132	{	4454	{
4133	# configure IO::AIO	4455	# configure IO::AIO
4134		4456
		4457	info "initialising aio";
4135	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4136	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4137	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4138	}	4462	}
4139		4463
4140	my $_log_backtrace;	4464	our $_log_backtrace;
		4465	our $_log_backtrace_last;
4141		4466
4142	sub _log_backtrace {	4467	sub _log_backtrace {
4143	my ($msg, @addr) = @_;	4468	my ($msg, @addr) = @_;
4144		4469
4145	$msg =~ s/\n//;	4470	$msg =~ s/\n$//;
4146		4471
		4472	if ($_log_backtrace_last eq $msg) {
		4473	LOG llevInfo, "[ABT] $msg\n";
		4474	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4147	# limit the # of concurrent backtraces	4475	# limit the # of concurrent backtraces
4148	if ($_log_backtrace < 2) {	4476	} elsif ($_log_backtrace < 2) {
		4477	$_log_backtrace_last = $msg;
4149	++$_log_backtrace;	4478	++$_log_backtrace;
4150	my $perl_bt = Carp::longmess $msg;	4479	my $perl_bt = Carp::longmess $msg;
4151	async {	4480	async {
4152	$Coro::current->{desc} = "abt $msg";	4481	$Coro::current->{desc} = "abt $msg";
4153		4482
…		…
4173	LOG llevInfo, "[ABT] $_\n" for @bt;	4502	LOG llevInfo, "[ABT] $_\n" for @bt;
4174	--$_log_backtrace;	4503	--$_log_backtrace;
4175	};	4504	};
4176	} else {	4505	} else {
4177	LOG llevInfo, "[ABT] $msg\n";	4506	LOG llevInfo, "[ABT] $msg\n";
4178	LOG llevInfo, "[ABT] [suppressed]\n";	4507	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4179	}	4508	}
4180	}	4509	}
4181		4510
4182	# load additional modules	4511	# load additional modules
4183	require "cf/$_.pm" for @EXTRA_MODULES;	4512	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines