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.544 by root, Thu May 6 21:58:07 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 process	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.
		273
		274	=cut
		275
		276	sub wait_for_tick();
		277	sub wait_for_tick_begin();
240		278
241	=item @cf::INVOKE_RESULTS	279	=item @cf::INVOKE_RESULTS
242		280
243	This array contains the results of the last C<invoke ()> call. When	281	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	282	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	343	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	344	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	345	}
308		346
309	$EV::DIED = sub {	347	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	348	warn "error in event callback: $@";
311	};	349	};
		350
		351	#############################################################################
		352
		353	sub fork_call(&@);
		354	sub get_slot($;$$);
312		355
313	#############################################################################	356	#############################################################################
314		357
315	=head2 UTILITY FUNCTIONS	358	=head2 UTILITY FUNCTIONS
316		359
…		…
337	$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;
338	$d	381	$d
339	} || "[unable to dump $_[0]: '$@']";	382	} || "[unable to dump $_[0]: '$@']";
340	}	383	}
341		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
342	=item $ref = cf::decode_json $json	437	=item $ref = cf::decode_json $json
343		438
344	Converts a JSON string into the corresponding perl data structure.	439	Converts a JSON string into the corresponding perl data structure.
345		440
346	=item $json = cf::encode_json $ref	441	=item $json = cf::encode_json $ref
…		…
352	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
353		448
354	sub encode_json($) { $json_coder->encode ($_[0]) }	449	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	450	sub decode_json($) { $json_coder->decode ($_[0]) }
356		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
357	=item cf::post_init { BLOCK }	497	=item cf::post_init { BLOCK }
358		498
359	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,
360	but I<before> the server starts ticking again.	500	but I<before> the server starts ticking again.
361		501
362	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
363	is a reload or not.	503	is a reload or not.
364		504
365	=cut	505	=cut
366		506
367	sub post_init(&) {	507	sub post_init(&) {
368	push @POST_INIT, shift;	508	push @POST_INIT, shift;
369	}	509	}
370		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
371	=item cf::lock_wait $string	528	=item cf::lock_wait $string
372		529
373	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
374		531
375	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
376		533
377	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
378	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,
…		…
426	EV::periodic $start, $interval, 0, $cb	583	EV::periodic $start, $interval, 0, $cb
427	}	584	}
428		585
429	=item cf::get_slot $time[, $priority[, $name]]	586	=item cf::get_slot $time[, $priority[, $name]]
430		587
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	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
433	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.
434		595
435	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
436	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
437		598
438	Useful for short background jobs.	599	Useful for short background jobs.
…		…
450	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
451	my $busy;	612	my $busy;
452		613
453	while () {	614	while () {
454	next_job:	615	next_job:
		616
		617	Coro::cede;
455		618
456	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
457		620
458	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
459	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
460	$busy = 0;	623	$busy = 0;
461	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
462	$job->[2]->send;	625	$job->[2]->send;
463	Coro::cede;
464	goto next_job;	626	goto next_job;
465	} else {	627	} else {
466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467	}	629	}
468	}	630	}
469		631
470	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
472	push @cf::WAIT_FOR_TICK, $signal;
473	$signal->wait;
474	} else {	634	} else {
475	$busy = 0;	635	$busy = 0;
476	Coro::schedule;	636	Coro::schedule;
477	}	637	}
478	}	638	}
…		…
504	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
505		665
506	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
507		667
508	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
509	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
510	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
511	acceptable.	671	acceptable.
512		672
513	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
514	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
…		…
542		702
543	while ($busy) {	703	while ($busy) {
544	if (Coro::nready) {	704	if (Coro::nready) {
545	Coro::cede_notself;	705	Coro::cede_notself;
546	} else {	706	} else {
547	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
548	}	708	}
549	}	709	}
550		710
551	my $time = AE::time - $time;	711	my $time = AE::time - $time;
552		712
…		…
578	$EXT_CORO{$coro+0} = $coro;	738	$EXT_CORO{$coro+0} = $coro;
579		739
580	$coro	740	$coro
581	}	741	}
582		742
583	=item fork_call { }, $args	743	=item fork_call { }, @args
584		744
585	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
586	process, returning the results. Everything must be serialisable with	746	process, returning the results. Everything must be serialisable with
587	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
588	never block itself or use any form of event handling.	748	never block itself or use any form of event handling.
589		749
590	=cut	750	=cut
591		751
		752	sub post_fork {
		753	reset_signals;
		754	}
		755
592	sub fork_call(&@) {	756	sub fork_call(&@) {
593	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
594		758
595	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)
598
599	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
600	reset_signals;	760	cf::post_fork;
601	&$cb	761	&$cb
602	}, @args;	762	} @args;
603		763
604	wantarray ? @res : $res[-1]	764	wantarray ? @res : $res[-1]
605	}	765	}
606		766
607	sub objinfo {	767	sub objinfo {
…		…
729		889
730	my @data;	890	my @data;
731	my $md5;	891	my $md5;
732		892
733	for (0 .. $#$src) {	893	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	894	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	895	}
737		896
738	# if processing is expensive, check	897	# if processing is expensive, check
739	# checksum first	898	# checksum first
740	if (1) {	899	if (1) {
…		…
753		912
754	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
755	}	914	}
756	}	915	}
757		916
758	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
759	my $data = $process->(\@data);	918	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
761		920
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		922
764	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1444	=cut
1286		1445
1287	#############################################################################	1446	#############################################################################
1288	# command handling &c	1447	# command handling &c
1289		1448
1290	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1291		1450
1292	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
1293	$name.	1452	$name.
1294		1453
1295	=cut	1454	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1302		1461
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1463	}
1305		1464
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1466
1308	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1309	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
1310	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
1311	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
1312	has logged in successfully.	1471	has logged in successfully.
1313		1472
1314	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1315	called.
1316		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
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1481
1319	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1320	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
1321	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
1322	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
1323	log-in.	1486	log-in.
1324		1487
1325	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1326	called.
1327		1489
1328	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		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
1330	sub register_extcmd {	1497	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1332		1499
1333	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1334	}	1501	}
1335		1502
1336	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1338		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1339	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1340	}	1519	}
1341		1520
1342	use File::Glob ();	1521	use File::Glob ();
1343		1522
1344	cf::player->attach (	1523	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1359		1538
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1540
1362	if (ref $msg) {	1541	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1543
1368	my @reply;
1369
1370	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}) {
1371	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1372	}	1562	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1563
1377	} else {	1564	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1566	}
1380		1567
…		…
1393	};	1580	};
1394		1581
1395	$grp	1582	$grp
1396	}	1583	}
1397		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
1398	sub load_extensions {	1596	sub load_extensions {
1399	info "loading extensions...";	1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
1400		1600
1401	cf::sync_job {	1601	cf::sync_job {
1402	my %todo;	1602	my %todo;
1403		1603
1404	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1647	unless exists $done{$_};
1448	}	1648	}
1449		1649
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		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
1452	my $active = eval $v->{source};	1661	my $active = eval $source;
1453		1662
1454	if (length $@) {	1663	if (length $@) {
1455	error "$v->{path}: $@\n";	1664	error "$v->{path}: $@\n";
1456		1665
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1683
1475	while (my ($k, $v) = each %todo) {	1684	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1685	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1686	if exists $v->{meta}{mandatory};
1478	}	1687	}
		1688
		1689	last;
1479	}	1690	}
1480	}	1691	}
1481	};	1692	};
1482	}	1693	}
1483		1694
…		…
1641	my $name = $pl->ob->name;	1852	my $name = $pl->ob->name;
1642		1853
1643	$pl->{deny_save} = 1;	1854	$pl->{deny_save} = 1;
1644	$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
1645		1856
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1857	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1858	$pl->deactivate;
		1859
1648	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;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1861	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1862	ext::highscore::check ($pl->ob);
		1863
1650	$pl->ns->destroy if $pl->ns;	1864	$pl->ns->destroy if $pl->ns;
1651		1865
1652	my $path = playerdir $pl;	1866	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1867	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1868	aio_rename $path, $temp;
…		…
1740		1954
1741	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742		1956
1743	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1744		1958
1745	=item $player->ext_reply ($msgid, @msg)
1746
1747	Sends an ext reply to the player.
1748
1749	=cut
1750
1751	sub ext_reply($$@) {
1752	my ($self, $id, @msg) = @_;
1753
1754	$self->ns->ext_reply ($id, @msg)
1755	}
1756
1757	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1758		1960
1759	Sends an ext event to the client.	1961	Sends an ext event to the client.
1760		1962
1761	=cut	1963	=cut
…		…
1820	sub generate_random_map {	2022	sub generate_random_map {
1821	my ($self, $rmp) = @_;	2023	my ($self, $rmp) = @_;
1822		2024
1823	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
1824		2026
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	2027	$self->_create_random_map ($rmp);
1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830	$rmp->{exit_on_final_map},
1831	$rmp->{xsize}, $rmp->{ysize},
1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837	(cf::region::find $rmp->{region}), $rmp->{custom}
1838	)
1839	}	2028	}
1840		2029
1841	=item cf::map->register ($regex, $prio)	2030	=item cf::map->register ($regex, $prio)
1842		2031
1843	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
…		…
1894	$base =~ s{[^/]+/?$}{};	2083	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2084	$path = "$base/$path";
1896	}	2085	}
1897		2086
1898	for ($path) {	2087	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2088	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2089	redo if s{/[^/]+/\.\./}{/};
1902	}	2090	}
1903		2091
1904	$path	2092	$path
…		…
1922		2110
1923	Carp::cluck "unable to resolve path '$path' (base '$base')";	2111	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2112	()
1925	}	2113	}
1926		2114
		2115	# may re-bless or do other evil things
1927	sub init {	2116	sub init {
1928	my ($self) = @_;	2117	my ($self) = @_;
1929		2118
1930	$self	2119	$self
1931	}	2120	}
…		…
1996	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
1997		2186
1998	1	2187	1
1999	}	2188	}
2000		2189
		2190	# used to laod the header of an original map
2001	sub load_header_orig {	2191	sub load_header_orig {
2002	my ($self) = @_;	2192	my ($self) = @_;
2003		2193
2004	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
2005	}	2195	}
2006		2196
		2197	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2198	sub load_header_temp {
2008	my ($self) = @_;	2199	my ($self) = @_;
2009		2200
2010	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
2011	}	2202	}
2012		2203
		2204	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2205	sub prepare_temp {
2014	my ($self) = @_;	2206	my ($self) = @_;
2015		2207
2016	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
2017	|| $cf::RUNTIME); #d#	2209	|| $cf::RUNTIME); #d#
2018	# safety	2210	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2213	}
2022		2214
		2215	# called after loading the header from an original map
2023	sub prepare_orig {	2216	sub prepare_orig {
2024	my ($self) = @_;	2217	my ($self) = @_;
2025		2218
2026	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2053	sub find {	2246	sub find {
2054	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
2055		2248
2056	cf::cede_to_tick;	2249	cf::cede_to_tick;
2057		2250
2058	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
2059		2252
2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
2062		2255
2063	$cf::MAP{$path} || do {	2256	$cf::MAP{$path} || do {
…		…
2094		2287
2095	{	2288	{
2096	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2097		2290
2098	return unless $self->valid;	2291	return unless $self->valid;
2099	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2100
2101	$self->in_memory (cf::MAP_LOADING);
2102		2293
2103	$self->alloc;	2294	$self->alloc;
2104		2295
2105	$self->pre_load;	2296	$self->pre_load;
2106	cf::cede_to_tick;	2297	cf::cede_to_tick;
2107		2298
		2299	if (exists $self->{load_path}) {
2108	my $f = new_from_file cf::object::thawer $self->{load_path};	2300	my $f = new_from_file cf::object::thawer $self->{load_path};
2109	$f->skip_block;	2301	$f->skip_block;
2110	$self->_load_objects ($f)	2302	$self->_load_objects ($f)
2111	or return;	2303	or return;
2112		2304
2113	$self->post_load_original	2305	$self->post_load_original
2114	if delete $self->{load_original};	2306	if delete $self->{load_original};
2115		2307
2116	if (my $uniq = $self->uniq_path) {	2308	if (my $uniq = $self->uniq_path) {
2117	utf8::encode $uniq;	2309	utf8::encode $uniq;
2118	unless (aio_stat $uniq) {	2310	unless (aio_stat $uniq) {
2119	if (my $f = new_from_file cf::object::thawer $uniq) {	2311	if (my $f = new_from_file cf::object::thawer $uniq) {
2120	$self->clear_unique_items;	2312	$self->clear_unique_items;
2121	$self->_load_objects ($f);	2313	$self->_load_objects ($f);
2122	$f->resolve_delayed_derefs;	2314	$f->resolve_delayed_derefs;
		2315	}
2123	}	2316	}
2124	}	2317	}
2125	}
2126		2318
2127	$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);
2128		2326
2129	cf::cede_to_tick;	2327	cf::cede_to_tick;
2130	# now do the right thing for maps	2328	# now do the right thing for maps
2131	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2132	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2136	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2137	$self->decay_objects;	2335	$self->decay_objects;
2138	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2139	$self->update_buttons;	2337	$self->update_buttons;
2140	cf::cede_to_tick;	2338	cf::cede_to_tick;
2141	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2142	}	2340	}
2143		2341
2144	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2145	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2146
2147	$self->in_memory (cf::MAP_ACTIVE);
2148	}	2344	}
2149		2345
2150	$self->post_load;	2346	$self->post_load;
		2347
		2348	1
2151	}	2349	}
2152		2350
2153	# customize the map for a given player, i.e.	2351	# customize the map for a given player, i.e.
2154	# return the _real_ map. used by e.g. per-player	2352	# return the _real_ map. used by e.g. per-player
2155	# maps to change the path to ~playername/mappath	2353	# maps to change the path to ~playername/mappath
…		…
2163	# if $self->per_party;	2361	# if $self->per_party;
2164		2362
2165	$self	2363	$self
2166	}	2364	}
2167		2365
2168	# find and load all maps in the 3x3 area around a map
2169	sub load_neighbours {
2170	my ($map) = @_;
2171
2172	my @neigh; # diagonal neighbours
2173
2174	for (0 .. 3) {
2175	my $neigh = $map->tile_path ($_)
2176	or next;
2177	$neigh = find $neigh, $map
2178	or next;
2179	$neigh->load;
2180
2181	# now find the diagonal neighbours
2182	push @neigh,
2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2185	}
2186
2187	for (grep defined $_->[0], @neigh) {
2188	my ($path, $origin) = @$_;
2189	my $neigh = find $path, $origin
2190	or next;
2191	$neigh->load;
2192	}
2193	}
2194
2195	sub find_sync {	2366	sub find_sync {
2196	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2197		2368
		2369	# it's a bug to call this from the main context
2198	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2370	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199	if $Coro::current == $Coro::main;	2371	if $Coro::current == $Coro::main;
2200		2372
2201	find $path, $origin	2373	find $path, $origin
2202	}	2374	}
2203		2375
2204	sub do_load_sync {	2376	sub do_load_sync {
2205	my ($map) = @_;	2377	my ($map) = @_;
2206		2378
		2379	# it's a bug to call this from the main context
2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2209		2382
2210	$map->load;	2383	$map->load;
2211	}	2384	}
…		…
2214	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2215		2388
2216	sub find_async {	2389	sub find_async {
2217	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2218		2391
2219	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2220		2393
2221	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2222	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load || $map->linkable;
2223	}	2396	}
2224		2397
2225	$MAP_PREFETCH{$path} |= $load;	2398	$MAP_PREFETCH{$path} |= $load;
2226		2399
2227	$MAP_PREFETCHER ||= cf::async {	2400	$MAP_PREFETCHER ||= cf::async {
2228	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2229		2402
2230	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2231	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2232	if (my $map = find $k) {	2405	if (my $map = find $k) {
2233	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2234	}	2407	}
2235		2408
2236	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2237	}	2410	}
2238	}	2411	}
…		…
2286	sub swap_out {	2459	sub swap_out {
2287	my ($self) = @_;	2460	my ($self) = @_;
2288		2461
2289	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2290		2463
2291	return if $self->in_memory != cf::MAP_ACTIVE;	2464	return if !$self->linkable;
2292	return if $self->{deny_save};	2465	return if $self->{deny_save};
2293	return if $self->players;	2466	return if $self->players;
2294		2467
2295	# first deactivate the map and "unlink" it from the core	2468	# first deactivate the map and "unlink" it from the core
2296	$self->deactivate;	2469	$self->deactivate;
2297	$_->clear_links_to ($self) for values %cf::MAP;	2470	$_->clear_links_to ($self) for values %cf::MAP;
2298	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2299		2472
2300	# then atomically save	2473	# then atomically save
2301	$self->_save;	2474	$self->_save;
2302		2475
2303	# then free the map	2476	# then free the map
…		…
2329		2502
2330	return if $self->players;	2503	return if $self->players;
2331		2504
2332	cf::trace "resetting map ", $self->path, "\n";	2505	cf::trace "resetting map ", $self->path, "\n";
2333		2506
2334	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
2335		2508
2336	# need to save uniques path	2509	# need to save uniques path
2337	unless ($self->{deny_save}) {	2510	unless ($self->{deny_save}) {
2338	my $uniq = $self->uniq_path; utf8::encode $uniq;	2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
2339		2512
…		…
2492		2665
2493	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.
2494		2667
2495	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2496		2669
2497	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,
2498	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2499		2672
2500	=cut	2673	=cut
2501		2674
2502	sub deref {	2675	sub deref {
…		…
2584	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2585		2758
2586	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2587	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2588		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
2589	=cut	2787	=cut
2590		2788
2591	sub cf::object::player::may {	2789	sub cf::object::player::may {
2592	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2593		2791
2594	$self->flag (cf::FLAG_WIZ) ||	2792	$self->flag (cf::FLAG_WIZ) ||
2595	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2596	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2597	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2598	}	2796	}
2599		2797
2600	=item $player_object->enter_link	2798	=item $player_object->enter_link
2601		2799
…		…
2604	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.
2605	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,
2606	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
2607	map.	2805	map.
2608		2806
2609	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.
2610		2814
2611	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2612		2816
2613	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
2614	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
…		…
2669	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2670	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2671	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2672		2876
2673	$map->load;	2877	$map->load;
2674	$map->load_neighbours;
2675		2878
2676	return unless $self->contr->active;	2879	return unless $self->contr->active;
2677		2880
2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679	if ($self->enter_map ($map, $x, $y)) {	2882	if ($self->enter_map ($map, $x, $y)) {
…		…
2735	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2736	}	2939	}
2737	}	2940	}
2738		2941
2739	my $map = eval {	2942	my $map = eval {
2740	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741		2944
2742	if ($map) {	2945	if ($map) {
2743	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2744	$map = $check->($map, $x, $y, $self) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2745	} else {	2948	} else {
…		…
2835	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2836		3039
2837	unless (eval {	3040	unless (eval {
2838	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2839		3042
2840	# random map handling
2841	{
2842	my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844	prepare_random_map $exit
2845	if $exit->slaying eq "/!";
2846	}
2847
2848	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2849	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2850	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	}
2851		3069
2852	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2853		3071
2854	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2855	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2870		3088
2871	=head3 cf::client	3089	=head3 cf::client
2872		3090
2873	=over 4	3091	=over 4
2874		3092
2875	=item $client->send_drawinfo ($text, $flags)
2876
2877	Sends a drawinfo packet to the client. Circumvents output buffering so
2878	should not be used under normal circumstances.
2879
2880	=cut
2881
2882	sub cf::client::send_drawinfo {
2883	my ($self, $text, $flags) = @_;
2884
2885	utf8::encode $text;
2886	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2887	}
2888
2889	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2890		3094
2891	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
2892	them as required.	3096	them as required.
2893		3097
…		…
2911	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2912	}	3116	}
2913		3117
2914	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2915		3119
2916	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
2917	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
2918	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
2919	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2920		3124
2921	=cut	3125	=cut
2922		3126
2923	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
3028	id => "death",	3232	id => "death",
3029	title => "Death",	3233	title => "Death",
3030	reply => undef,	3234	reply => undef,
3031	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
3032	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
3033	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
3034	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
3035	);	3245	);
3036		3246
3037	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3080	=cut	3290	=cut
3081		3291
3082	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3083	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3084		3294
3085	if ($self->extcmd == 2) {
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087	} elsif ($self->extcmd == 1) { # TODO: remove
3088	push @msg, msgtype => "event_$type";
3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090	}
3091	}
3092
3093	=item $client->ext_reply ($msgid, @msg)
3094
3095	Sends an ext reply to the client.
3096
3097	=cut
3098
3099	sub cf::client::ext_reply($$@) {
3100	my ($self, $id, @msg) = @_;
3101
3102	if ($self->extcmd == 2) {
3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104	} elsif ($self->extcmd == 1) {
3105	#TODO: version 1, remove
3106	unshift @msg, msgtype => "reply", msgid => $id;
3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108	}
3109	}	3296	}
3110		3297
3111	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3112		3299
3113	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3133		3320
3134	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3135	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3136		3323
3137	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;
3138	}	3364	}
3139		3365
3140	cf::client->attach (	3366	cf::client->attach (
3141	on_connect => sub {	3367	on_connect => sub {
3142	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3168	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3169		3395
3170	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171		3397
3172	if (ref $msg) {	3398	if (ref $msg) {
3173	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174	"ARRAY" eq ref $msg
3175	? @$msg
3176	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177		3400
3178	my @reply;
3179
3180	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}) {
3181	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3182	}	3419	}
3183
3184	$ns->ext_reply ($reply, @reply)
3185	if $reply;
3186
3187	} else {	3420	} else {
3188	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";
3189	}	3422	}
3190		3423
3191	cf::override;	3424	cf::override;
…		…
3359	=cut	3592	=cut
3360		3593
3361	#############################################################################	3594	#############################################################################
3362	# the server's init and main functions	3595	# the server's init and main functions
3363		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
3364	sub load_facedata($) {	3674	sub load_facedata($) {
3365	my ($path) = @_;	3675	my ($path) = @_;
3366		3676
3367	# HACK to clear player env face cache, we need some signal framework
3368	# for this (global event?)
3369	%ext::player_env::MUSIC_FACE_CACHE = ();
3370
3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372		3678
3373	trace "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3374		3680
3375	my $facedata;	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3376	0 < aio_load $path, $facedata
3377	or die "$path: $!";
3378
3379	$facedata = Coro::Storable::thaw $facedata;
3380		3682
3381	$facedata->{version} == 2	3683	$facedata->{version} == 2
3382	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3383		3685
3384	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3385	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3386	$facedata->{resource}{"res/exp_table"} = {	3688
3387	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3388	data => $exp_table,	3690
3389	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3390	};	3692	# from here on, everything must be atomic - no thread switch allowed
3391	cf::cede_to_tick;	3693	my $t1 = EV::time;
3392		3694
3393	{	3695	{
3394	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3395		3697
3396	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398		3701
3399	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3400	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3401	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};
3402	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};
3403		3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3404	cf::cede_to_tick;	3707	$cf::face::HASH{$info->{hash64}} = $idx;
		3708	delete $cf::face::META[$idx];
3405	}	3709	}
3406		3710
3407	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3408	next unless $info->{smooth};	3712	next unless $info->{smooth};
3409		3713
…		…
3414	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3416	} else {	3720	} else {
3417	error "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3418	}	3722	}
3419
3420	cf::cede_to_tick;
3421	}	3723	}
3422	}	3724	}
3423		3725
3424	{	3726	{
3425	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3426		3728
3427	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3428	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3429	cf::cede_to_tick;
3430	}	3731	}
3431		3732
3432	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3433	}	3734	}
3434		3735
3435	{	3736	{
3436	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3437		3738
3438	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3439	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
3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441		3743
3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443	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;
3444	} else {	3750	} else {
3445	$RESOURCE{$name} = $info; # unused	3751	# $RESOURCE{$name} = $info; # unused
3446	}	3752	}
3447
3448	cf::cede_to_tick;
3449	}	3753	}
3450	}	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;
3451		3765
3452	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
3453		3769
3454	1	3770	1
3455	}	3771	}
3456		3772
3457	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
…		…
3468	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3469	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3470	cf::arch::commit_load;	3786	cf::arch::commit_load;
3471		3787
3472	$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;
3473	}	3803	}
3474		3804
3475	sub reload_regions {	3805	sub reload_regions {
3476	# 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
3477	# for this (global event?)	3807	# for this (global event?)
…		…
3485	if exists $_->{match};	3815	if exists $_->{match};
3486	}	3816	}
3487	}	3817	}
3488		3818
3489	sub reload_facedata {	3819	sub reload_facedata {
3490	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3491	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3492	}	3822	}
3493		3823
3494	sub reload_archetypes {	3824	sub reload_archetypes {
3495	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3496	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;
3497	}	3853	}
3498		3854
3499	sub reload_treasures {	3855	sub reload_treasures {
3500	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3501	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
3502	}	3858	}
3503		3859
3504	sub reload_exp {
3505	cf::init_experience;
3506	}
3507
3508	sub reload_sound {	3860	sub reload_sound {
3509	trace "loading sound config from $DATADIR/sound\n";	3861	trace "loading sound config from $DATADIR/sound\n";
3510		3862
3511	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512	or die "$DATADIR/sound $!";
3513
3514	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3863	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515		3864
3516	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3865	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517	my $sound = $soundconf->{compat}[$_]	3866	my $sound = $soundconf->{compat}[$_]
3518	or next;	3867	or next;
3519		3868
…		…
3529	}	3878	}
3530		3879
3531	sub reload_resources {	3880	sub reload_resources {
3532	trace "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3533		3882
3534	reload_exp;	3883	reload_materials;
3535	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
3536	reload_sound;	3886	reload_sound;
3537	reload_archetypes;	3887	reload_archetypes;
3538	reload_regions;	3888	reload_regions;
3539	reload_treasures;	3889	reload_treasures;
3540		3890
…		…
3542	}	3892	}
3543		3893
3544	sub reload_config {	3894	sub reload_config {
3545	trace "reloading config file...\n";	3895	trace "reloading config file...\n";
3546		3896
3547	open my $fh, "<:utf8", "$CONFDIR/config"	3897	my $config = load_file "$CONFDIR/config";
3548	or return;	3898	utf8::decode $config;
3549		3899	*CFG = decode_yaml $config;
3550	local $/;
3551	*CFG = YAML::XS::Load scalar <$fh>;
3552		3900
3553	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3901	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3554		3902
3555	$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};
3556	$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};
…		…
3560	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3908	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3561	and die "WARNING: m(un)lockall failed: $!\n";	3909	and die "WARNING: m(un)lockall failed: $!\n";
3562	};	3910	};
3563	warn $@ if $@;	3911	warn $@ if $@;
3564	}	3912	}
3565
3566	trace "finished reloading resource files\n";
3567	}	3913	}
3568		3914
3569	sub pidfile() {	3915	sub pidfile() {
3570	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3916	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3571	or die "$PIDFILE: $!";	3917	or die "$PIDFILE: $!";
…		…
3584	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3585	print $fh $$;	3931	print $fh $$;
3586	}	3932	}
3587		3933
3588	sub main_loop {	3934	sub main_loop {
3589	trace "EV::loop starting\n";	3935	trace "EV::run starting\n";
3590	if (1) {	3936	if (1) {
3591	EV::loop;	3937	EV::run;
3592	}	3938	}
3593	trace "EV::loop returned\n";	3939	trace "EV::run returned\n";
3594	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3595	}	3941	}
3596		3942
3597	sub main {	3943	sub main {
3598	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3599		3945
3600	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3601	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.";
3602	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3603	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3604		3950
3605	$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
3606		3952
3607	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3608	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3609	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#
3610	(async {	3956	(async {
3611	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3612	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3613	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3614	};	3960	};
3615		3961
3616	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3617		3963
3618	cf::sync_job {	3964	cf::sync_job {
3619	cf::incloader::init ();	3965	cf::incloader::init ();
		3966
		3967	db_init;
3620		3968
3621	cf::init_anim;	3969	cf::init_anim;
3622	cf::init_attackmess;	3970	cf::init_attackmess;
3623	cf::init_dynamic;	3971	cf::init_dynamic;
3624		3972
3625	cf::load_settings;	3973	cf::load_settings;
3626	cf::load_materials;
3627		3974
3628	reload_resources;	3975	reload_resources;
3629	reload_config;	3976	reload_config;
3630	db_init;
3631		3977
3632	cf::init_uuid;	3978	cf::init_uuid;
3633	cf::init_signals;	3979	cf::init_signals;
3634	cf::init_skills;	3980	cf::init_skills;
3635		3981
…		…
3643		3989
3644	# no (long-running) fork's whatsoever before this point(!)	3990	# no (long-running) fork's whatsoever before this point(!)
3645	use POSIX ();	3991	use POSIX ();
3646	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};
3647		3993
3648	(pop @POST_INIT)->(0) while @POST_INIT;	3994	cf::_post_init 0;
3649	};	3995	};
3650		3996
3651	cf::object::thawer::errors_are_fatal 0;	3997	cf::object::thawer::errors_are_fatal 0;
3652	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";
3653		3999
3654	my $free_main; $free_main = EV::idle sub {	4000	AE::postpone {
3655	undef $free_main;
3656	undef &main; # free gobs of memory :)	4001	undef &main; # free gobs of memory :)
3657	};	4002	};
3658		4003
3659	goto &main_loop;	4004	goto &main_loop;
3660	}	4005	}
…		…
3817		4162
3818	cf::write_runtime_sync; # external watchdog should not bark	4163	cf::write_runtime_sync; # external watchdog should not bark
3819		4164
3820	trace "emergency_perl_save: flushing outstanding aio requests";	4165	trace "emergency_perl_save: flushing outstanding aio requests";
3821	while (IO::AIO::nreqs || BDB::nreqs) {	4166	while (IO::AIO::nreqs || BDB::nreqs) {
3822	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
3823	}	4168	}
3824		4169
3825	cf::write_runtime_sync; # external watchdog should not bark	4170	cf::write_runtime_sync; # external watchdog should not bark
3826	};	4171	};
3827		4172
…		…
3876		4221
3877	my $t1 = AE::time;	4222	my $t1 = AE::time;
3878		4223
3879	while ($RELOAD) {	4224	while ($RELOAD) {
3880	cf::get_slot 0.1, -1, "reload_perl";	4225	cf::get_slot 0.1, -1, "reload_perl";
3881	info "reloading...";	4226	info "perl_reload: reloading...";
3882		4227
3883	trace "entering sync_job";	4228	trace "perl_reload: entering sync_job";
3884		4229
3885	cf::sync_job {	4230	cf::sync_job {
3886	#cf::emergency_save;	4231	#cf::emergency_save;
3887		4232
3888	trace "cancelling all extension coros";	4233	trace "perl_reload: cancelling all extension coros";
3889	$_->cancel for values %EXT_CORO;	4234	$_->cancel for values %EXT_CORO;
3890	%EXT_CORO = ();	4235	%EXT_CORO = ();
3891		4236
3892	trace "removing commands";	4237	trace "perl_reload: removing commands";
3893	%COMMAND = ();	4238	%COMMAND = ();
3894		4239
3895	trace "removing ext/exti commands";	4240	trace "perl_reload: removing ext/exti commands";
3896	%EXTCMD = ();	4241	%EXTCMD = ();
3897	%EXTICMD = ();	4242	%EXTICMD = ();
3898		4243
3899	trace "unloading/nuking all extensions";	4244	trace "perl_reload: unloading/nuking all extensions";
3900	for my $pkg (@EXTS) {	4245	for my $pkg (@EXTS) {
3901	trace "... unloading $pkg";	4246	trace "... unloading $pkg";
3902		4247
3903	if (my $cb = $pkg->can ("unload")) {	4248	if (my $cb = $pkg->can ("unload")) {
3904	eval {	4249	eval {
…		…
3909		4254
3910	trace "... clearing $pkg";	4255	trace "... clearing $pkg";
3911	clear_package $pkg;	4256	clear_package $pkg;
3912	}	4257	}
3913		4258
3914	trace "unloading all perl modules loaded from $LIBDIR";	4259	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915	while (my ($k, $v) = each %INC) {	4260	while (my ($k, $v) = each %INC) {
3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4261	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917		4262
3918	trace "... unloading $k";	4263	trace "... unloading $k";
3919	delete $INC{$k};	4264	delete $INC{$k};
…		…
3926	}	4271	}
3927		4272
3928	clear_package $k;	4273	clear_package $k;
3929	}	4274	}
3930		4275
3931	trace "getting rid of safe::, as good as possible";	4276	trace "perl_reload: getting rid of safe::, as good as possible";
3932	clear_package "safe::$_"	4277	clear_package "safe::$_"
3933	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);
3934		4279
3935	trace "unloading cf.pm \"a bit\"";	4280	trace "perl_reload: unloading cf.pm \"a bit\"";
3936	delete $INC{"cf.pm"};	4281	delete $INC{"cf.pm"};
3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4282	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938		4283
3939	# don't, removes xs symbols, too,	4284	# don't, removes xs symbols, too,
3940	# and global variables created in xs	4285	# and global variables created in xs
3941	#clear_package __PACKAGE__;	4286	#clear_package __PACKAGE__;
3942		4287
3943	info "unload completed, starting to reload now";	4288	info "perl_reload: unload completed, starting to reload now";
3944		4289
3945	trace "reloading cf.pm";	4290	trace "perl_reload: reloading cf.pm";
3946	require cf;	4291	require cf;
3947	cf::_connect_to_perl_1;	4292	cf::_connect_to_perl_1;
3948		4293
3949	trace "loading config and database again";	4294	trace "perl_reload: loading config and database again";
3950	cf::reload_config;	4295	cf::reload_config;
3951		4296
3952	trace "loading extensions";	4297	trace "perl_reload: loading extensions";
3953	cf::load_extensions;	4298	cf::load_extensions;
3954		4299
3955	if ($REATTACH_ON_RELOAD) {	4300	if ($REATTACH_ON_RELOAD) {
3956	trace "reattaching attachments to objects/players";	4301	trace "perl_reload: reattaching attachments to objects/players";
3957	_global_reattach; # objects, sockets	4302	_global_reattach; # objects, sockets
3958	trace "reattaching attachments to maps";	4303	trace "perl_reload: reattaching attachments to maps";
3959	reattach $_ for values %MAP;	4304	reattach $_ for values %MAP;
3960	trace "reattaching attachments to players";	4305	trace "perl_reload: reattaching attachments to players";
3961	reattach $_ for values %PLAYER;	4306	reattach $_ for values %PLAYER;
3962	}	4307	}
3963		4308
3964	trace "running post_init jobs";	4309	cf::_post_init 1;
3965	(pop @POST_INIT)->(1) while @POST_INIT;
3966		4310
3967	trace "leaving sync_job";	4311	trace "perl_reload: leaving sync_job";
3968		4312
3969	1	4313	1
3970	} or do {	4314	} or do {
3971	error $@;	4315	error $@;
3972	cf::cleanup "error while reloading, exiting.";	4316	cf::cleanup "perl_reload: error, exiting.";
3973	};	4317	};
3974		4318
3975	info "reloaded";
3976	--$RELOAD;	4319	--$RELOAD;
3977	}	4320	}
3978		4321
3979	$t1 = AE::time - $t1;	4322	$t1 = AE::time - $t1;
3980	info "reload completed in ${t1}s\n";	4323	info "perl_reload: completed in ${t1}s\n";
3981	};	4324	};
3982		4325
3983	our $RELOAD_WATCHER; # used only during reload	4326	our $RELOAD_WATCHER; # used only during reload
3984		4327
3985	sub reload_perl() {	4328	sub reload_perl() {
…		…
4010		4353
4011	#############################################################################	4354	#############################################################################
4012		4355
4013	my $bug_warning = 0;	4356	my $bug_warning = 0;
4014		4357
4015	our @WAIT_FOR_TICK;
4016	our @WAIT_FOR_TICK_BEGIN;
4017
4018	sub wait_for_tick {	4358	sub wait_for_tick() {
4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020		4360
4021	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
4022	push @WAIT_FOR_TICK, $signal;
4023	$signal->wait;
4024	}	4362	}
4025		4363
4026	sub wait_for_tick_begin {	4364	sub wait_for_tick_begin() {
4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028		4366
4029	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
4030	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
4031	$signal->wait;	4369	$signal->wait;
4032	}	4370	}
…		…
4036	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"
4037	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
4038	return;	4376	return;
4039	}	4377	}
4040		4378
4041	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
4042		4380
4043	#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#
4044		4382
4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046	$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.;
…		…
4052	}	4390	}
4053		4391
4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055	$sig->send;	4393	$sig->send;
4056	}	4394	}
4057	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
4058	$sig->send;
4059	}
4060		4396
4061	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
4062	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063		4399
4064	if (0) {	4400	if (0) {
…		…
4070	}	4406	}
4071	}	4407	}
4072		4408
4073	{	4409	{
4074	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4075		4412
4076	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4077	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4078	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4079		4416
4080	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
4081	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
4082	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083	$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;
…		…
4108	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4109	};	4446	};
4110	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4111	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4112	};	4449	};
		4450
		4451	info "database initialised";
4113	}	4452	}
4114		4453
4115	{	4454	{
4116	# configure IO::AIO	4455	# configure IO::AIO
4117		4456
		4457	info "initialising aio";
4118	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4119	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4120	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4121	}	4462	}
4122		4463
4123	my $_log_backtrace;	4464	our $_log_backtrace;
		4465	our $_log_backtrace_last;
4124		4466
4125	sub _log_backtrace {	4467	sub _log_backtrace {
4126	my ($msg, @addr) = @_;	4468	my ($msg, @addr) = @_;
4127		4469
4128	$msg =~ s/\n//;	4470	$msg =~ s/\n$//;
4129		4471
		4472	if ($_log_backtrace_last eq $msg) {
		4473	LOG llevInfo, "[ABT] $msg\n";
		4474	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130	# limit the # of concurrent backtraces	4475	# limit the # of concurrent backtraces
4131	if ($_log_backtrace < 2) {	4476	} elsif ($_log_backtrace < 2) {
		4477	$_log_backtrace_last = $msg;
4132	++$_log_backtrace;	4478	++$_log_backtrace;
4133	my $perl_bt = Carp::longmess $msg;	4479	my $perl_bt = Carp::longmess $msg;
4134	async {	4480	async {
4135	$Coro::current->{desc} = "abt $msg";	4481	$Coro::current->{desc} = "abt $msg";
4136		4482
…		…
4156	LOG llevInfo, "[ABT] $_\n" for @bt;	4502	LOG llevInfo, "[ABT] $_\n" for @bt;
4157	--$_log_backtrace;	4503	--$_log_backtrace;
4158	};	4504	};
4159	} else {	4505	} else {
4160	LOG llevInfo, "[ABT] $msg\n";	4506	LOG llevInfo, "[ABT] $msg\n";
4161	LOG llevInfo, "[ABT] [suppressed]\n";	4507	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162	}	4508	}
4163	}	4509	}
4164		4510
4165	# load additional modules	4511	# load additional modules
4166	require "cf/$_.pm" for @EXTRA_MODULES;	4512	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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