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.547 by root, Sun May 9 22:51:13 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
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
		460	=item $ref = cf::decode_yaml $scalar
		461
		462	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		463
		464	=cut
		465
		466	sub decode_yaml($) {
		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]
		495	}
		496
362	=item cf::post_init { BLOCK }	497	=item cf::post_init { BLOCK }
363		498
364	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,
365	but I<before> the server starts ticking again.	500	but I<before> the server starts ticking again.
366		501
367	The cdoeblock will have a single boolean argument to indicate whether this	502	The codeblock will have a single boolean argument to indicate whether this
368	is a reload or not.	503	is a reload or not.
369		504
370	=cut	505	=cut
371		506
372	sub post_init(&) {	507	sub post_init(&) {
373	push @POST_INIT, shift;	508	push @POST_INIT, shift;
374	}	509	}
375		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
376	=item cf::lock_wait $string	528	=item cf::lock_wait $string
377		529
378	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
379		531
380	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
381		533
382	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
383	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,
…		…
431	EV::periodic $start, $interval, 0, $cb	583	EV::periodic $start, $interval, 0, $cb
432	}	584	}
433		585
434	=item cf::get_slot $time[, $priority[, $name]]	586	=item cf::get_slot $time[, $priority[, $name]]
435		587
436	Allocate $time seconds of blocking CPU time at priority C<$priority>:	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
437	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
438	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.
439		595
440	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
441	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
442		598
443	Useful for short background jobs.	599	Useful for short background jobs.
…		…
455	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
456	my $busy;	612	my $busy;
457		613
458	while () {	614	while () {
459	next_job:	615	next_job:
		616
		617	Coro::cede;
460		618
461	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
462		620
463	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
464	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
465	$busy = 0;	623	$busy = 0;
466	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
467	$job->[2]->send;	625	$job->[2]->send;
468	Coro::cede;
469	goto next_job;	626	goto next_job;
470	} else {	627	} else {
471	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
472	}	629	}
473	}	630	}
474		631
475	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
476	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
477	push @cf::WAIT_FOR_TICK, $signal;
478	$signal->wait;
479	} else {	634	} else {
480	$busy = 0;	635	$busy = 0;
481	Coro::schedule;	636	Coro::schedule;
482	}	637	}
483	}	638	}
…		…
509	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
510		665
511	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
512		667
513	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
514	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
515	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
516	acceptable.	671	acceptable.
517		672
518	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
519	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
…		…
547		702
548	while ($busy) {	703	while ($busy) {
549	if (Coro::nready) {	704	if (Coro::nready) {
550	Coro::cede_notself;	705	Coro::cede_notself;
551	} else {	706	} else {
552	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
553	}	708	}
554	}	709	}
555		710
556	my $time = AE::time - $time;	711	my $time = AE::time - $time;
557		712
…		…
583	$EXT_CORO{$coro+0} = $coro;	738	$EXT_CORO{$coro+0} = $coro;
584		739
585	$coro	740	$coro
586	}	741	}
587		742
588	=item fork_call { }, $args	743	=item fork_call { }, @args
589		744
590	Executes the given code block with the given arguments in a seperate	745	Executes the given code block with the given arguments in a seperate
591	process, returning the results. Everything must be serialisable with	746	process, returning the results. Everything must be serialisable with
592	Coro::Storable. May, of course, block. Note that the executed sub may	747	Coro::Storable. May, of course, block. Note that the executed sub may
593	never block itself or use any form of event handling.	748	never block itself or use any form of event handling.
…		…
599	}	754	}
600		755
601	sub fork_call(&@) {	756	sub fork_call(&@) {
602	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
603		758
604	# we seemingly have to make a local copy of the whole thing,
605	# otherwise perl prematurely frees the stuff :/
606	# TODO: investigate and fix (likely this will be rather laborious)
607
608	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
609	cf::post_fork;	760	cf::post_fork;
610	&$cb	761	&$cb
611	}, @args;	762	} @args;
612		763
613	wantarray ? @res : $res[-1]	764	wantarray ? @res : $res[-1]
614	}	765	}
615		766
616	sub objinfo {	767	sub objinfo {
…		…
738		889
739	my @data;	890	my @data;
740	my $md5;	891	my $md5;
741		892
742	for (0 .. $#$src) {	893	for (0 .. $#$src) {
743	0 <= aio_load $src->[$_], $data[$_]	894	$data[$_] = load_file $src->[$_];
744	or Carp::croak "$src->[$_]: $!";
745	}	895	}
746		896
747	# if processing is expensive, check	897	# if processing is expensive, check
748	# checksum first	898	# checksum first
749	if (1) {	899	if (1) {
…		…
762		912
763	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
764	}	914	}
765	}	915	}
766		916
767	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
768	my $data = $process->(\@data);	918	my $data = $process->(\@data);
769	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
770		920
771	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
772		922
773	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
774	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
…		…
1294	=cut	1444	=cut
1295		1445
1296	#############################################################################	1446	#############################################################################
1297	# command handling &c	1447	# command handling &c
1298		1448
1299	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1300		1450
1301	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
1302	$name.	1452	$name.
1303		1453
1304	=cut	1454	=cut
…		…
1310	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1311		1461
1312	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1313	}	1463	}
1314		1464
1315	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1316		1466
1317	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1318	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
1319	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
1320	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
1321	has logged in successfully.	1471	has logged in successfully.
1322		1472
1323	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1324	called.
1325		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
1326	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1327		1481
1328	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1329	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
1330	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
1331	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
1332	log-in.	1486	log-in.
1333		1487
1334	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1335	called.
1336		1489
1337	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1338		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
1339	sub register_extcmd {	1497	sub register_extcmd($$) {
1340	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1341		1499
1342	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1343	}	1501	}
1344		1502
1345	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1346	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1347		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1348	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1349	}	1519	}
1350		1520
1351	use File::Glob ();	1521	use File::Glob ();
1352		1522
1353	cf::player->attach (	1523	cf::player->attach (
…		…
1367	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1368		1538
1369	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370		1540
1371	if (ref $msg) {	1541	if (ref $msg) {
1372	my ($type, $reply, @payload) =	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373	"ARRAY" eq ref $msg
1374	? @$msg
1375	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376		1543
1377	my @reply;
1378
1379	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}) {
1380	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1381	}	1562	}
1382
1383	$pl->ext_reply ($reply, @reply)
1384	if $reply;
1385		1563
1386	} else {	1564	} else {
1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1388	}	1566	}
1389		1567
…		…
1402	};	1580	};
1403		1581
1404	$grp	1582	$grp
1405	}	1583	}
1406		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
1407	sub load_extensions {	1596	sub load_extensions {
1408	info "loading extensions...";	1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
1409		1600
1410	cf::sync_job {	1601	cf::sync_job {
1411	my %todo;	1602	my %todo;
1412		1603
1413	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
…		…
1456	unless exists $done{$_};	1647	unless exists $done{$_};
1457	}	1648	}
1458		1649
1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460		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
1461	my $active = eval $v->{source};	1661	my $active = eval $source;
1462		1662
1463	if (length $@) {	1663	if (length $@) {
1464	error "$v->{path}: $@\n";	1664	error "$v->{path}: $@\n";
1465		1665
1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1483		1683
1484	while (my ($k, $v) = each %todo) {	1684	while (my ($k, $v) = each %todo) {
1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1685	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486	if exists $v->{meta}{mandatory};	1686	if exists $v->{meta}{mandatory};
1487	}	1687	}
		1688
		1689	last;
1488	}	1690	}
1489	}	1691	}
1490	};	1692	};
1491	}	1693	}
1492		1694
…		…
1650	my $name = $pl->ob->name;	1852	my $name = $pl->ob->name;
1651		1853
1652	$pl->{deny_save} = 1;	1854	$pl->{deny_save} = 1;
1653	$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
1654		1856
1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1857	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656	$pl->deactivate;	1858	$pl->deactivate;
1657		1859
1658	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;
1659	ext::highscore::check ($pl->ob);	1862	ext::highscore::check ($pl->ob);
1660		1863
1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1662	$pl->ns->destroy if $pl->ns;	1864	$pl->ns->destroy if $pl->ns;
1663		1865
1664	my $path = playerdir $pl;	1866	my $path = playerdir $pl;
1665	my $temp = "$path~$cf::RUNTIME~deleting~";	1867	my $temp = "$path~$cf::RUNTIME~deleting~";
1666	aio_rename $path, $temp;	1868	aio_rename $path, $temp;
…		…
1752		1954
1753	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754		1956
1755	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1756		1958
1757	=item $player->ext_reply ($msgid, @msg)
1758
1759	Sends an ext reply to the player.
1760
1761	=cut
1762
1763	sub ext_reply($$@) {
1764	my ($self, $id, @msg) = @_;
1765
1766	$self->ns->ext_reply ($id, @msg)
1767	}
1768
1769	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1770		1960
1771	Sends an ext event to the client.	1961	Sends an ext event to the client.
1772		1962
1773	=cut	1963	=cut
…		…
1832	sub generate_random_map {	2022	sub generate_random_map {
1833	my ($self, $rmp) = @_;	2023	my ($self, $rmp) = @_;
1834		2024
1835	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
1836		2026
1837	# mit "rum" bekleckern, nicht
1838	$self->_create_random_map (	2027	$self->_create_random_map ($rmp);
1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842	$rmp->{exit_on_final_map},
1843	$rmp->{xsize}, $rmp->{ysize},
1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849	(cf::region::find $rmp->{region}), $rmp->{custom}
1850	)
1851	}	2028	}
1852		2029
1853	=item cf::map->register ($regex, $prio)	2030	=item cf::map->register ($regex, $prio)
1854		2031
1855	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
…		…
1906	$base =~ s{[^/]+/?$}{};	2083	$base =~ s{[^/]+/?$}{};
1907	$path = "$base/$path";	2084	$path = "$base/$path";
1908	}	2085	}
1909		2086
1910	for ($path) {	2087	for ($path) {
1911	redo if s{//}{/};
1912	redo if s{/\.?/}{/};	2088	redo if s{/\.?/}{/};
1913	redo if s{/[^/]+/\.\./}{/};	2089	redo if s{/[^/]+/\.\./}{/};
1914	}	2090	}
1915		2091
1916	$path	2092	$path
…		…
1934		2110
1935	Carp::cluck "unable to resolve path '$path' (base '$base')";	2111	Carp::cluck "unable to resolve path '$path' (base '$base')";
1936	()	2112	()
1937	}	2113	}
1938		2114
		2115	# may re-bless or do other evil things
1939	sub init {	2116	sub init {
1940	my ($self) = @_;	2117	my ($self) = @_;
1941		2118
1942	$self	2119	$self
1943	}	2120	}
…		…
2008	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
2009		2186
2010	1	2187	1
2011	}	2188	}
2012		2189
		2190	# used to laod the header of an original map
2013	sub load_header_orig {	2191	sub load_header_orig {
2014	my ($self) = @_;	2192	my ($self) = @_;
2015		2193
2016	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
2017	}	2195	}
2018		2196
		2197	# used to laod the header of an instantiated map
2019	sub load_header_temp {	2198	sub load_header_temp {
2020	my ($self) = @_;	2199	my ($self) = @_;
2021		2200
2022	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
2023	}	2202	}
2024		2203
		2204	# called after loading the header from an instantiated map
2025	sub prepare_temp {	2205	sub prepare_temp {
2026	my ($self) = @_;	2206	my ($self) = @_;
2027		2207
2028	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
2029	|| $cf::RUNTIME); #d#	2209	|| $cf::RUNTIME); #d#
2030	# safety	2210	# safety
2031	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
2032	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
2033	}	2213	}
2034		2214
		2215	# called after loading the header from an original map
2035	sub prepare_orig {	2216	sub prepare_orig {
2036	my ($self) = @_;	2217	my ($self) = @_;
2037		2218
2038	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
2039	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2065	sub find {	2246	sub find {
2066	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
2067		2248
2068	cf::cede_to_tick;	2249	cf::cede_to_tick;
2069		2250
2070	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
2071		2252
2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
2074		2255
2075	$cf::MAP{$path} || do {	2256	$cf::MAP{$path} || do {
…		…
2106		2287
2107	{	2288	{
2108	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2109		2290
2110	return unless $self->valid;	2291	return unless $self->valid;
2111	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2112
2113	$self->in_memory (cf::MAP_LOADING);
2114		2293
2115	$self->alloc;	2294	$self->alloc;
2116		2295
2117	$self->pre_load;	2296	$self->pre_load;
2118	cf::cede_to_tick;	2297	cf::cede_to_tick;
2119		2298
		2299	if (exists $self->{load_path}) {
2120	my $f = new_from_file cf::object::thawer $self->{load_path};	2300	my $f = new_from_file cf::object::thawer $self->{load_path};
2121	$f->skip_block;	2301	$f->skip_block;
2122	$self->_load_objects ($f)	2302	$self->_load_objects ($f)
2123	or return;	2303	or return;
2124		2304
2125	$self->post_load_original	2305	$self->post_load_original
2126	if delete $self->{load_original};	2306	if delete $self->{load_original};
2127		2307
2128	if (my $uniq = $self->uniq_path) {	2308	if (my $uniq = $self->uniq_path) {
2129	utf8::encode $uniq;	2309	utf8::encode $uniq;
2130	unless (aio_stat $uniq) {	2310	unless (aio_stat $uniq) {
2131	if (my $f = new_from_file cf::object::thawer $uniq) {	2311	if (my $f = new_from_file cf::object::thawer $uniq) {
2132	$self->clear_unique_items;	2312	$self->clear_unique_items;
2133	$self->_load_objects ($f);	2313	$self->_load_objects ($f);
2134	$f->resolve_delayed_derefs;	2314	$f->resolve_delayed_derefs;
		2315	}
2135	}	2316	}
2136	}	2317	}
2137	}
2138		2318
2139	$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);
2140		2326
2141	cf::cede_to_tick;	2327	cf::cede_to_tick;
2142	# now do the right thing for maps	2328	# now do the right thing for maps
2143	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2144	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2148	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2149	$self->decay_objects;	2335	$self->decay_objects;
2150	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2151	$self->update_buttons;	2337	$self->update_buttons;
2152	cf::cede_to_tick;	2338	cf::cede_to_tick;
2153	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2154	}	2340	}
2155		2341
2156	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2157	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2158
2159	$self->in_memory (cf::MAP_ACTIVE);
2160	}	2344	}
2161		2345
2162	$self->post_load;	2346	$self->post_load;
		2347
		2348	1
2163	}	2349	}
2164		2350
2165	# customize the map for a given player, i.e.	2351	# customize the map for a given player, i.e.
2166	# return the _real_ map. used by e.g. per-player	2352	# return the _real_ map. used by e.g. per-player
2167	# maps to change the path to ~playername/mappath	2353	# maps to change the path to ~playername/mappath
…		…
2175	# if $self->per_party;	2361	# if $self->per_party;
2176		2362
2177	$self	2363	$self
2178	}	2364	}
2179		2365
2180	# find and load all maps in the 3x3 area around a map
2181	sub load_neighbours {
2182	my ($map) = @_;
2183
2184	my @neigh; # diagonal neighbours
2185
2186	for (0 .. 3) {
2187	my $neigh = $map->tile_path ($_)
2188	or next;
2189	$neigh = find $neigh, $map
2190	or next;
2191	$neigh->load;
2192
2193	# now find the diagonal neighbours
2194	push @neigh,
2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2197	}
2198
2199	for (grep defined $_->[0], @neigh) {
2200	my ($path, $origin) = @$_;
2201	my $neigh = find $path, $origin
2202	or next;
2203	$neigh->load;
2204	}
2205	}
2206
2207	sub find_sync {	2366	sub find_sync {
2208	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2209		2368
		2369	# it's a bug to call this from the main context
2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2370	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211	if $Coro::current == $Coro::main;	2371	if $Coro::current == $Coro::main;
2212		2372
2213	find $path, $origin	2373	find $path, $origin
2214	}	2374	}
2215		2375
2216	sub do_load_sync {	2376	sub do_load_sync {
2217	my ($map) = @_;	2377	my ($map) = @_;
2218		2378
		2379	# it's a bug to call this from the main context
2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2221		2382
2222	$map->load;	2383	$map->load;
2223	}	2384	}
…		…
2226	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2227		2388
2228	sub find_async {	2389	sub find_async {
2229	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2230		2391
2231	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2232		2393
2233	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2234	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load || $map->linkable;
2235	}	2396	}
2236		2397
2237	$MAP_PREFETCH{$path} |= $load;	2398	$MAP_PREFETCH{$path} |= $load;
2238		2399
2239	$MAP_PREFETCHER ||= cf::async {	2400	$MAP_PREFETCHER ||= cf::async {
2240	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2241		2402
2242	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2243	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2244	if (my $map = find $k) {	2405	if (my $map = find $k) {
2245	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2246	}	2407	}
2247		2408
2248	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2249	}	2410	}
2250	}	2411	}
…		…
2298	sub swap_out {	2459	sub swap_out {
2299	my ($self) = @_;	2460	my ($self) = @_;
2300		2461
2301	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2302		2463
2303	return if $self->in_memory != cf::MAP_ACTIVE;	2464	return if !$self->linkable;
2304	return if $self->{deny_save};	2465	return if $self->{deny_save};
2305	return if $self->players;	2466	return if $self->players;
2306		2467
2307	# first deactivate the map and "unlink" it from the core	2468	# first deactivate the map and "unlink" it from the core
2308	$self->deactivate;	2469	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;	2470	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2311		2472
2312	# then atomically save	2473	# then atomically save
2313	$self->_save;	2474	$self->_save;
2314		2475
2315	# then free the map	2476	# then free the map
…		…
2341		2502
2342	return if $self->players;	2503	return if $self->players;
2343		2504
2344	cf::trace "resetting map ", $self->path, "\n";	2505	cf::trace "resetting map ", $self->path, "\n";
2345		2506
2346	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
2347		2508
2348	# need to save uniques path	2509	# need to save uniques path
2349	unless ($self->{deny_save}) {	2510	unless ($self->{deny_save}) {
2350	my $uniq = $self->uniq_path; utf8::encode $uniq;	2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
2351		2512
…		…
2504		2665
2505	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.
2506		2667
2507	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2508		2669
2509	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,
2510	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2511		2672
2512	=cut	2673	=cut
2513		2674
2514	sub deref {	2675	sub deref {
…		…
2596	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2597		2758
2598	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2599	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2600		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
2601	=cut	2787	=cut
2602		2788
2603	sub cf::object::player::may {	2789	sub cf::object::player::may {
2604	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2605		2791
2606	$self->flag (cf::FLAG_WIZ) ||	2792	$self->flag (cf::FLAG_WIZ) ||
2607	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2608	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2609	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2610	}	2796	}
2611		2797
2612	=item $player_object->enter_link	2798	=item $player_object->enter_link
2613		2799
…		…
2616	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.
2617	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,
2618	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
2619	map.	2805	map.
2620		2806
2621	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.
2622		2814
2623	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2624		2816
2625	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
2626	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
…		…
2681	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2682	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2683	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2684		2876
2685	$map->load;	2877	$map->load;
2686	$map->load_neighbours;
2687		2878
2688	return unless $self->contr->active;	2879	return unless $self->contr->active;
2689		2880
2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691	if ($self->enter_map ($map, $x, $y)) {	2882	if ($self->enter_map ($map, $x, $y)) {
…		…
2747	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2748	}	2939	}
2749	}	2940	}
2750		2941
2751	my $map = eval {	2942	my $map = eval {
2752	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753		2944
2754	if ($map) {	2945	if ($map) {
2755	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2756	$map = $check->($map, $x, $y, $self) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2757	} else {	2948	} else {
…		…
2847	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2848		3039
2849	unless (eval {	3040	unless (eval {
2850	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2851		3042
2852	# random map handling
2853	{
2854	my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856	prepare_random_map $exit
2857	if $exit->slaying eq "/!";
2858	}
2859
2860	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2861	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2862	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	}
2863		3069
2864	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2865		3071
2866	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2867	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2882		3088
2883	=head3 cf::client	3089	=head3 cf::client
2884		3090
2885	=over 4	3091	=over 4
2886		3092
2887	=item $client->send_drawinfo ($text, $flags)
2888
2889	Sends a drawinfo packet to the client. Circumvents output buffering so
2890	should not be used under normal circumstances.
2891
2892	=cut
2893
2894	sub cf::client::send_drawinfo {
2895	my ($self, $text, $flags) = @_;
2896
2897	utf8::encode $text;
2898	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899	}
2900
2901	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2902		3094
2903	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
2904	them as required.	3096	them as required.
2905		3097
…		…
2923	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2924	}	3116	}
2925		3117
2926	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2927		3119
2928	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
2929	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
2930	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
2931	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2932		3124
2933	=cut	3125	=cut
2934		3126
2935	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
2978	},	3170	},
2979	"c/body" => {	3171	"c/body" => {
2980	id => "infobox",	3172	id => "infobox",
2981	title => "Body Parts",	3173	title => "Body Parts",
2982	reply => undef,	3174	reply => undef,
2983	tooltip => "Shows which body parts you posess and are available",	3175	tooltip => "Shows which body parts you possess and are available",
2984	},	3176	},
2985	"c/statistics" => {	3177	"c/statistics" => {
2986	id => "infobox",	3178	id => "infobox",
2987	title => "Statistics",	3179	title => "Statistics",
2988	reply => undef,	3180	reply => undef,
…		…
3040	id => "death",	3232	id => "death",
3041	title => "Death",	3233	title => "Death",
3042	reply => undef,	3234	reply => undef,
3043	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
3044	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
3045	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
3046	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
3047	);	3245	);
3048		3246
3049	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3092	=cut	3290	=cut
3093		3291
3094	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3095	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3096		3294
3097	if ($self->extcmd == 2) {
3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099	} elsif ($self->extcmd == 1) { # TODO: remove
3100	push @msg, msgtype => "event_$type";
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}
3104
3105	=item $client->ext_reply ($msgid, @msg)
3106
3107	Sends an ext reply to the client.
3108
3109	=cut
3110
3111	sub cf::client::ext_reply($$@) {
3112	my ($self, $id, @msg) = @_;
3113
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116	} elsif ($self->extcmd == 1) {
3117	#TODO: version 1, remove
3118	unshift @msg, msgtype => "reply", msgid => $id;
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120	}
3121	}	3296	}
3122		3297
3123	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3124		3299
3125	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3145		3320
3146	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3147	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3148		3323
3149	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;
3150	}	3364	}
3151		3365
3152	cf::client->attach (	3366	cf::client->attach (
3153	on_connect => sub {	3367	on_connect => sub {
3154	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3180	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3181		3395
3182	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183		3397
3184	if (ref $msg) {	3398	if (ref $msg) {
3185	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186	"ARRAY" eq ref $msg
3187	? @$msg
3188	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189		3400
3190	my @reply;
3191
3192	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}) {
3193	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3194	}	3419	}
3195
3196	$ns->ext_reply ($reply, @reply)
3197	if $reply;
3198
3199	} else {	3420	} else {
3200	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";
3201	}	3422	}
3202		3423
3203	cf::override;	3424	cf::override;
…		…
3371	=cut	3592	=cut
3372		3593
3373	#############################################################################	3594	#############################################################################
3374	# the server's init and main functions	3595	# the server's init and main functions
3375		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
3376	sub load_facedata($) {	3674	sub load_facedata($) {
3377	my ($path) = @_;	3675	my ($path) = @_;
3378		3676
3379	# HACK to clear player env face cache, we need some signal framework
3380	# for this (global event?)
3381	%ext::player_env::MUSIC_FACE_CACHE = ();
3382
3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384		3678
3385	trace "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3386		3680
3387	0 < aio_load $path, my $facedata	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3388	or die "$path: $!";
3389
3390	$facedata = Coro::Storable::thaw $facedata;
3391		3682
3392	$facedata->{version} == 2	3683	$facedata->{version} == 2
3393	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3394		3685
3395	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3397	$facedata->{resource}{"res/exp_table"} = {	3688
3398	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3399	data => $exp_table,	3690
3400	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3401	};	3692	# from here on, everything must be atomic - no thread switch allowed
3402	cf::cede_to_tick;	3693	my $t1 = EV::time;
3403		3694
3404	{	3695	{
3405	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3406		3697
3407	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409		3701
3410	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3411	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3412	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};
3413	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};
3414		3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3415	cf::cede_to_tick;	3707	$cf::face::HASH{$info->{hash64}} = $idx;
		3708	delete $cf::face::META[$idx];
3416	}	3709	}
3417		3710
3418	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3419	next unless $info->{smooth};	3712	next unless $info->{smooth};
3420		3713
…		…
3425	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3426	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3427	} else {	3720	} else {
3428	error "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3429	}	3722	}
3430
3431	cf::cede_to_tick;
3432	}	3723	}
3433	}	3724	}
3434		3725
3435	{	3726	{
3436	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3437		3728
3438	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3439	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3440	cf::cede_to_tick;
3441	}	3731	}
3442		3732
3443	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3444	}	3734	}
3445		3735
3446	{	3736	{
3447	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3448		3738
3449	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3450	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
3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452		3743
3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454	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;
3455	} else {	3750	} else {
3456	$RESOURCE{$name} = $info; # unused	3751	# $RESOURCE{$name} = $info; # unused
3457	}	3752	}
3458
3459	cf::cede_to_tick;
3460	}	3753	}
3461	}	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;
3462		3765
3463	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
3464		3769
3465	1	3770	1
3466	}	3771	}
3467		3772
3468	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
…		…
3479	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3480	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3481	cf::arch::commit_load;	3786	cf::arch::commit_load;
3482		3787
3483	$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;
3484	}	3803	}
3485		3804
3486	sub reload_regions {	3805	sub reload_regions {
3487	# 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
3488	# for this (global event?)	3807	# for this (global event?)
…		…
3496	if exists $_->{match};	3815	if exists $_->{match};
3497	}	3816	}
3498	}	3817	}
3499		3818
3500	sub reload_facedata {	3819	sub reload_facedata {
3501	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3502	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3503	}	3822	}
3504		3823
3505	sub reload_archetypes {	3824	sub reload_archetypes {
3506	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3507	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;
3508	}	3853	}
3509		3854
3510	sub reload_treasures {	3855	sub reload_treasures {
3511	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3512	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
3513	}	3858	}
3514		3859
3515	sub reload_sound {	3860	sub reload_sound {
3516	trace "loading sound config from $DATADIR/sound\n";	3861	trace "loading sound config from $DATADIR/sound\n";
3517		3862
3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519	or die "$DATADIR/sound $!";
3520
3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3863	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522		3864
3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3865	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524	my $sound = $soundconf->{compat}[$_]	3866	my $sound = $soundconf->{compat}[$_]
3525	or next;	3867	or next;
3526		3868
…		…
3536	}	3878	}
3537		3879
3538	sub reload_resources {	3880	sub reload_resources {
3539	trace "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3540		3882
3541	reload_exp_table;
3542	reload_materials;	3883	reload_materials;
3543	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
3544	reload_sound;	3886	reload_sound;
3545	reload_archetypes;	3887	reload_archetypes;
3546	reload_regions;	3888	reload_regions;
3547	reload_treasures;	3889	reload_treasures;
3548		3890
…		…
3550	}	3892	}
3551		3893
3552	sub reload_config {	3894	sub reload_config {
3553	trace "reloading config file...\n";	3895	trace "reloading config file...\n";
3554		3896
3555	0 < aio_load "$CONFDIR/config", my $config	3897	my $config = load_file "$CONFDIR/config";
3556	or die "$CONFDIR/config: $!";
3557
3558	utf8::decode $config;	3898	utf8::decode $config;
3559		3899	*CFG = decode_yaml $config;
3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561	*CFG = YAML::XS::Load $config;
3562		3900
3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3901	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564		3902
3565	$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};
3566	$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};
…		…
3592	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3593	print $fh $$;	3931	print $fh $$;
3594	}	3932	}
3595		3933
3596	sub main_loop {	3934	sub main_loop {
3597	trace "EV::loop starting\n";	3935	trace "EV::run starting\n";
3598	if (1) {	3936	if (1) {
3599	EV::loop;	3937	EV::run;
3600	}	3938	}
3601	trace "EV::loop returned\n";	3939	trace "EV::run returned\n";
3602	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3603	}	3941	}
3604		3942
3605	sub main {	3943	sub main {
3606	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3607		3945
3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609	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.";
3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612		3950
3613	$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
3614		3952
3615	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3616	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3617	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#
3618	(async {	3956	(async {
3619	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3620	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3621	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3622	};	3960	};
3623		3961
3624	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3625		3963
3626	cf::sync_job {	3964	cf::sync_job {
3627	cf::incloader::init ();	3965	cf::incloader::init ();
		3966
		3967	db_init;
3628		3968
3629	cf::init_anim;	3969	cf::init_anim;
3630	cf::init_attackmess;	3970	cf::init_attackmess;
3631	cf::init_dynamic;	3971	cf::init_dynamic;
3632		3972
3633	cf::load_settings;	3973	cf::load_settings;
3634		3974
3635	reload_resources;	3975	reload_resources;
3636	reload_config;	3976	reload_config;
3637	db_init;
3638		3977
3639	cf::init_uuid;	3978	cf::init_uuid;
3640	cf::init_signals;	3979	cf::init_signals;
3641	cf::init_skills;	3980	cf::init_skills;
3642		3981
…		…
3650		3989
3651	# no (long-running) fork's whatsoever before this point(!)	3990	# no (long-running) fork's whatsoever before this point(!)
3652	use POSIX ();	3991	use POSIX ();
3653	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};
3654		3993
3655	(pop @POST_INIT)->(0) while @POST_INIT;	3994	cf::_post_init 0;
3656	};	3995	};
3657		3996
3658	cf::object::thawer::errors_are_fatal 0;	3997	cf::object::thawer::errors_are_fatal 0;
3659	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";
3660		3999
3661	my $free_main; $free_main = EV::idle sub {	4000	AE::postpone {
3662	undef $free_main;
3663	undef &main; # free gobs of memory :)	4001	undef &main; # free gobs of memory :)
3664	};	4002	};
3665		4003
3666	goto &main_loop;	4004	goto &main_loop;
3667	}	4005	}
…		…
3824		4162
3825	cf::write_runtime_sync; # external watchdog should not bark	4163	cf::write_runtime_sync; # external watchdog should not bark
3826		4164
3827	trace "emergency_perl_save: flushing outstanding aio requests";	4165	trace "emergency_perl_save: flushing outstanding aio requests";
3828	while (IO::AIO::nreqs || BDB::nreqs) {	4166	while (IO::AIO::nreqs || BDB::nreqs) {
3829	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
3830	}	4168	}
3831		4169
3832	cf::write_runtime_sync; # external watchdog should not bark	4170	cf::write_runtime_sync; # external watchdog should not bark
3833	};	4171	};
3834		4172
…		…
3883		4221
3884	my $t1 = AE::time;	4222	my $t1 = AE::time;
3885		4223
3886	while ($RELOAD) {	4224	while ($RELOAD) {
3887	cf::get_slot 0.1, -1, "reload_perl";	4225	cf::get_slot 0.1, -1, "reload_perl";
3888	info "reloading...";	4226	info "perl_reload: reloading...";
3889		4227
3890	trace "entering sync_job";	4228	trace "perl_reload: entering sync_job";
3891		4229
3892	cf::sync_job {	4230	cf::sync_job {
3893	#cf::emergency_save;	4231	#cf::emergency_save;
3894		4232
3895	trace "cancelling all extension coros";	4233	trace "perl_reload: cancelling all extension coros";
3896	$_->cancel for values %EXT_CORO;	4234	$_->cancel for values %EXT_CORO;
3897	%EXT_CORO = ();	4235	%EXT_CORO = ();
3898		4236
3899	trace "removing commands";	4237	trace "perl_reload: removing commands";
3900	%COMMAND = ();	4238	%COMMAND = ();
3901		4239
3902	trace "removing ext/exti commands";	4240	trace "perl_reload: removing ext/exti commands";
3903	%EXTCMD = ();	4241	%EXTCMD = ();
3904	%EXTICMD = ();	4242	%EXTICMD = ();
3905		4243
3906	trace "unloading/nuking all extensions";	4244	trace "perl_reload: unloading/nuking all extensions";
3907	for my $pkg (@EXTS) {	4245	for my $pkg (@EXTS) {
3908	trace "... unloading $pkg";	4246	trace "... unloading $pkg";
3909		4247
3910	if (my $cb = $pkg->can ("unload")) {	4248	if (my $cb = $pkg->can ("unload")) {
3911	eval {	4249	eval {
…		…
3916		4254
3917	trace "... clearing $pkg";	4255	trace "... clearing $pkg";
3918	clear_package $pkg;	4256	clear_package $pkg;
3919	}	4257	}
3920		4258
3921	trace "unloading all perl modules loaded from $LIBDIR";	4259	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922	while (my ($k, $v) = each %INC) {	4260	while (my ($k, $v) = each %INC) {
3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4261	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924		4262
3925	trace "... unloading $k";	4263	trace "... unloading $k";
3926	delete $INC{$k};	4264	delete $INC{$k};
…		…
3933	}	4271	}
3934		4272
3935	clear_package $k;	4273	clear_package $k;
3936	}	4274	}
3937		4275
3938	trace "getting rid of safe::, as good as possible";	4276	trace "perl_reload: getting rid of safe::, as good as possible";
3939	clear_package "safe::$_"	4277	clear_package "safe::$_"
3940	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);
3941		4279
3942	trace "unloading cf.pm \"a bit\"";	4280	trace "perl_reload: unloading cf.pm \"a bit\"";
3943	delete $INC{"cf.pm"};	4281	delete $INC{"cf.pm"};
3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4282	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945		4283
3946	# don't, removes xs symbols, too,	4284	# don't, removes xs symbols, too,
3947	# and global variables created in xs	4285	# and global variables created in xs
3948	#clear_package __PACKAGE__;	4286	#clear_package __PACKAGE__;
3949		4287
3950	info "unload completed, starting to reload now";	4288	info "perl_reload: unload completed, starting to reload now";
3951		4289
3952	trace "reloading cf.pm";	4290	trace "perl_reload: reloading cf.pm";
3953	require cf;	4291	require cf;
3954	cf::_connect_to_perl_1;	4292	cf::_connect_to_perl_1;
3955		4293
3956	trace "loading config and database again";	4294	trace "perl_reload: loading config and database again";
3957	cf::reload_config;	4295	cf::reload_config;
3958		4296
3959	trace "loading extensions";	4297	trace "perl_reload: loading extensions";
3960	cf::load_extensions;	4298	cf::load_extensions;
3961		4299
3962	if ($REATTACH_ON_RELOAD) {	4300	if ($REATTACH_ON_RELOAD) {
3963	trace "reattaching attachments to objects/players";	4301	trace "perl_reload: reattaching attachments to objects/players";
3964	_global_reattach; # objects, sockets	4302	_global_reattach; # objects, sockets
3965	trace "reattaching attachments to maps";	4303	trace "perl_reload: reattaching attachments to maps";
3966	reattach $_ for values %MAP;	4304	reattach $_ for values %MAP;
3967	trace "reattaching attachments to players";	4305	trace "perl_reload: reattaching attachments to players";
3968	reattach $_ for values %PLAYER;	4306	reattach $_ for values %PLAYER;
3969	}	4307	}
3970		4308
3971	trace "running post_init jobs";	4309	cf::_post_init 1;
3972	(pop @POST_INIT)->(1) while @POST_INIT;
3973		4310
3974	trace "leaving sync_job";	4311	trace "perl_reload: leaving sync_job";
3975		4312
3976	1	4313	1
3977	} or do {	4314	} or do {
3978	error $@;	4315	error $@;
3979	cf::cleanup "error while reloading, exiting.";	4316	cf::cleanup "perl_reload: error, exiting.";
3980	};	4317	};
3981		4318
3982	info "reloaded";
3983	--$RELOAD;	4319	--$RELOAD;
3984	}	4320	}
3985		4321
3986	$t1 = AE::time - $t1;	4322	$t1 = AE::time - $t1;
3987	info "reload completed in ${t1}s\n";	4323	info "perl_reload: completed in ${t1}s\n";
3988	};	4324	};
3989		4325
3990	our $RELOAD_WATCHER; # used only during reload	4326	our $RELOAD_WATCHER; # used only during reload
3991		4327
3992	sub reload_perl() {	4328	sub reload_perl() {
…		…
4017		4353
4018	#############################################################################	4354	#############################################################################
4019		4355
4020	my $bug_warning = 0;	4356	my $bug_warning = 0;
4021		4357
4022	our @WAIT_FOR_TICK;
4023	our @WAIT_FOR_TICK_BEGIN;
4024
4025	sub wait_for_tick() {	4358	sub wait_for_tick() {
4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027		4360
4028	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
4029	push @WAIT_FOR_TICK, $signal;
4030	$signal->wait;
4031	}	4362	}
4032		4363
4033	sub wait_for_tick_begin() {	4364	sub wait_for_tick_begin() {
4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035		4366
4036	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
4037	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
4038	$signal->wait;	4369	$signal->wait;
4039	}	4370	}
…		…
4043	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"
4044	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
4045	return;	4376	return;
4046	}	4377	}
4047		4378
4048	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
4049		4380
4050	#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#
4051		4382
4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053	$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.;
…		…
4059	}	4390	}
4060		4391
4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062	$sig->send;	4393	$sig->send;
4063	}	4394	}
4064	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
4065	$sig->send;
4066	}
4067		4396
4068	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
4069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070		4399
4071	if (0) {	4400	if (0) {
…		…
4077	}	4406	}
4078	}	4407	}
4079		4408
4080	{	4409	{
4081	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4082		4412
4083	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4084	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4085	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4086		4416
4087	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
4088	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
4089	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090	$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;
…		…
4115	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116	};	4446	};
4117	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119	};	4449	};
		4450
		4451	info "database initialised";
4120	}	4452	}
4121		4453
4122	{	4454	{
4123	# configure IO::AIO	4455	# configure IO::AIO
4124		4456
		4457	info "initialising aio";
4125	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4126	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4127	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4128	}	4462	}
4129		4463
4130	my $_log_backtrace;	4464	our $_log_backtrace;
		4465	our $_log_backtrace_last;
4131		4466
4132	sub _log_backtrace {	4467	sub _log_backtrace {
4133	my ($msg, @addr) = @_;	4468	my ($msg, @addr) = @_;
4134		4469
4135	$msg =~ s/\n//;	4470	$msg =~ s/\n$//;
4136		4471
		4472	if ($_log_backtrace_last eq $msg) {
		4473	LOG llevInfo, "[ABT] $msg\n";
		4474	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137	# limit the # of concurrent backtraces	4475	# limit the # of concurrent backtraces
4138	if ($_log_backtrace < 2) {	4476	} elsif ($_log_backtrace < 2) {
		4477	$_log_backtrace_last = $msg;
4139	++$_log_backtrace;	4478	++$_log_backtrace;
4140	my $perl_bt = Carp::longmess $msg;	4479	my $perl_bt = Carp::longmess $msg;
4141	async {	4480	async {
4142	$Coro::current->{desc} = "abt $msg";	4481	$Coro::current->{desc} = "abt $msg";
4143		4482
…		…
4163	LOG llevInfo, "[ABT] $_\n" for @bt;	4502	LOG llevInfo, "[ABT] $_\n" for @bt;
4164	--$_log_backtrace;	4503	--$_log_backtrace;
4165	};	4504	};
4166	} else {	4505	} else {
4167	LOG llevInfo, "[ABT] $msg\n";	4506	LOG llevInfo, "[ABT] $msg\n";
4168	LOG llevInfo, "[ABT] [suppressed]\n";	4507	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169	}	4508	}
4170	}	4509	}
4171		4510
4172	# load additional modules	4511	# load additional modules
4173	require "cf/$_.pm" for @EXTRA_MODULES;	4512	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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