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.543 by root, Wed May 5 23:23:29 2010 UTC vs.
Revision 1.620 by root, Tue Aug 11 02:13:26 2015 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 ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
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	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	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	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	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	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	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.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	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	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	342	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	344	}
308		345
309	$EV::DIED = sub {	346	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
311	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
312		354
313	#############################################################################	355	#############################################################################
314		356
315	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
316		358
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	380	$d
339	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
340	}	382	}
341		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
342	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
343		437
344	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
345		439
346	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		447
354	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
356		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
357	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
358		483
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
361		486
362	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	488	is a reload or not.
364		489
365	=cut	490	=cut
366		491
367	sub post_init(&) {	492	sub post_init(&) {
368	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
369	}	511	}
370		512
371	=item cf::lock_wait $string	513	=item cf::lock_wait $string
372		514
373	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
427	}	569	}
428		570
429	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
430		572
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
434		580
435	The optional C<$name> can be used to identify the job to run. It might be	581	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.	582	used for statistical purposes and should identify the same time-class.
437		583
438	Useful for short background jobs.	584	Useful for short background jobs.
…		…
450	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
451	my $busy;	597	my $busy;
452		598
453	while () {	599	while () {
454	next_job:	600	next_job:
		601
		602	Coro::cede;
455		603
456	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
457		605
458	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
459	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
460	$busy = 0;	608	$busy = 0;
461	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
462	$job->[2]->send;	610	$job->[2]->send;
463	Coro::cede;
464	goto next_job;	611	goto next_job;
465	} else {	612	} else {
466	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
467	}	614	}
468	}	615	}
469		616
470	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
472	push @cf::WAIT_FOR_TICK, $signal;
473	$signal->wait;
474	} else {	619	} else {
475	$busy = 0;	620	$busy = 0;
476	Coro::schedule;	621	Coro::schedule;
477	}	622	}
478	}	623	}
…		…
542		687
543	while ($busy) {	688	while ($busy) {
544	if (Coro::nready) {	689	if (Coro::nready) {
545	Coro::cede_notself;	690	Coro::cede_notself;
546	} else {	691	} else {
547	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
548	}	693	}
549	}	694	}
550		695
551	my $time = AE::time - $time;	696	my $time = AE::time - $time;
552		697
…		…
578	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
579		724
580	$coro	725	$coro
581	}	726	}
582		727
583	=item fork_call { }, $args	728	=item fork_call { }, @args
584		729
585	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
589		734
590	=cut	735	=cut
591		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
592	sub fork_call(&@) {	741	sub fork_call(&@) {
593	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
594		743
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 {	744	my @res = Coro::Util::fork_eval {
600	reset_signals;	745	cf::post_fork;
601	&$cb	746	&$cb
602	}, @args;	747	} @args;
603		748
604	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
605	}	750	}
606		751
607	sub objinfo {	752	sub objinfo {
…		…
729		874
730	my @data;	875	my @data;
731	my $md5;	876	my $md5;
732		877
733	for (0 .. $#$src) {	878	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	880	}
737		881
738	# if processing is expensive, check	882	# if processing is expensive, check
739	# checksum first	883	# checksum first
740	if (1) {	884	if (1) {
…		…
753		897
754	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
755	}	899	}
756	}	900	}
757		901
758	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
759	my $data = $process->(\@data);	903	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
761		905
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		907
764	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1429	=cut
1286		1430
1287	#############################################################################	1431	#############################################################################
1288	# command handling &c	1432	# command handling &c
1289		1433
1290	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1291		1435
1292	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1293	$name.	1437	$name.
1294		1438
1295	=cut	1439	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1302		1446
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1448	}
1305		1449
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1451
1308	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1453	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	1454	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	1455	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1456	has logged in successfully.
1313		1457
1314	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1315	called.
1316		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1466
1319	Register a callback for execution when the client sends an (asynchronous)	1467	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	1468	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	1469	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	1470	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1471	log-in.
1324		1472
1325	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1326	called.
1327		1474
1328	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1330	sub register_extcmd {	1482	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1332		1484
1333	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1334	}	1486	}
1335		1487
1336	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1338		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1339	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1340	}	1504	}
1341		1505
1342	use File::Glob ();	1506	use File::Glob ();
1343		1507
1344	cf::player->attach (	1508	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1359		1523
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1525
1362	if (ref $msg) {	1526	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1527	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		1528
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1372	}	1547	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1548
1377	} else {	1549	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1551	}
1380		1552
…		…
1393	};	1565	};
1394		1566
1395	$grp	1567	$grp
1396	}	1568	}
1397		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1398	sub load_extensions {	1581	sub load_extensions {
1399	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1400		1585
1401	cf::sync_job {	1586	cf::sync_job {
1402	my %todo;	1587	my %todo;
1403		1588
1404	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1632	unless exists $done{$_};
1448	}	1633	}
1449		1634
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1452	my $active = eval $v->{source};	1646	my $active = eval $source;
1453		1647
1454	if (length $@) {	1648	if (length $@) {
1455	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1456		1650
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1668
1475	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1478	}	1672	}
		1673
		1674	last;
1479	}	1675	}
1480	}	1676	}
1481	};	1677	};
1482	}	1678	}
1483		1679
…		…
1641	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1642		1838
1643	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1645		1841
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1843	$pl->deactivate;
		1844
1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1650	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1651		1850
1652	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1740		1939
1741	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742		1941
1743	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1744		1943
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)	1944	=item $player->ext_msg ($type, @msg)
1758		1945
1759	Sends an ext event to the client.	1946	Sends an ext event to the client.
1760		1947
1761	=cut	1948	=cut
…		…
1820	sub generate_random_map {	2007	sub generate_random_map {
1821	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1822		2009
1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824		2011
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	2012	$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	}	2013	}
1840		2014
1841	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1842		2016
1843	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1894	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2069	$path = "$base/$path";
1896	}	2070	}
1897		2071
1898	for ($path) {	2072	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1902	}	2075	}
1903		2076
1904	$path	2077	$path
…		…
1922		2095
1923	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2097	()
1925	}	2098	}
1926		2099
		2100	# may re-bless or do other evil things
1927	sub init {	2101	sub init {
1928	my ($self) = @_;	2102	my ($self) = @_;
1929		2103
1930	$self	2104	$self
1931	}	2105	}
…		…
1996	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1997		2171
1998	1	2172	1
1999	}	2173	}
2000		2174
		2175	# used to laod the header of an original map
2001	sub load_header_orig {	2176	sub load_header_orig {
2002	my ($self) = @_;	2177	my ($self) = @_;
2003		2178
2004	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2005	}	2180	}
2006		2181
		2182	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2183	sub load_header_temp {
2008	my ($self) = @_;	2184	my ($self) = @_;
2009		2185
2010	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2011	}	2187	}
2012		2188
		2189	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2190	sub prepare_temp {
2014	my ($self) = @_;	2191	my ($self) = @_;
2015		2192
2016	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2017	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2018	# safety	2195	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2198	}
2022		2199
		2200	# called after loading the header from an original map
2023	sub prepare_orig {	2201	sub prepare_orig {
2024	my ($self) = @_;	2202	my ($self) = @_;
2025		2203
2026	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2053	sub find {	2231	sub find {
2054	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2055		2233
2056	cf::cede_to_tick;	2234	cf::cede_to_tick;
2057		2235
2058	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2059		2237
2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2062		2240
2063	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2094		2272
2095	{	2273	{
2096	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2097		2275
2098	return unless $self->valid;	2276	return unless $self->valid;
2099	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2100
2101	$self->in_memory (cf::MAP_LOADING);
2102		2278
2103	$self->alloc;	2279	$self->alloc;
2104		2280
2105	$self->pre_load;	2281	$self->pre_load;
2106	cf::cede_to_tick;	2282	cf::cede_to_tick;
2107		2283
		2284	if (exists $self->{load_path}) {
2108	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2109	$f->skip_block;	2286	$f->skip_block;
2110	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2111	or return;	2288	or return;
2112		2289
2113	$self->post_load_original	2290	$self->post_load_original
2114	if delete $self->{load_original};	2291	if delete $self->{load_original};
2115		2292
2116	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2117	utf8::encode $uniq;	2294	utf8::encode $uniq;
2118	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2119	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2120	$self->clear_unique_items;	2297	$self->clear_unique_items;
2121	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2122	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2123	}	2301	}
2124	}	2302	}
2125	}
2126		2303
2127	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2128		2311
2129	cf::cede_to_tick;	2312	cf::cede_to_tick;
2130	# now do the right thing for maps	2313	# now do the right thing for maps
2131	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2132	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2136	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2137	$self->decay_objects;	2320	$self->decay_objects;
2138	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2139	$self->update_buttons;	2322	$self->update_buttons;
2140	cf::cede_to_tick;	2323	cf::cede_to_tick;
2141	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2142	}	2325	}
2143		2326
2144	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2145	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2146
2147	$self->in_memory (cf::MAP_ACTIVE);
2148	}	2329	}
2149		2330
2150	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2151	}	2334	}
2152		2335
2153	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2154	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2155	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2163	# if $self->per_party;	2346	# if $self->per_party;
2164		2347
2165	$self	2348	$self
2166	}	2349	}
2167		2350
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 {	2351	sub find_sync {
2196	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2197		2353
		2354	# it's a bug to call this from the main context
2198	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2200		2357
2201	find $path, $origin	2358	find $path, $origin
2202	}	2359	}
2203		2360
2204	sub do_load_sync {	2361	sub do_load_sync {
2205	my ($map) = @_;	2362	my ($map) = @_;
2206		2363
		2364	# it's a bug to call this from the main context
2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2209		2367
2210	$map->load;	2368	$map->load;
2211	}	2369	}
…		…
2214	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2215		2373
2216	sub find_async {	2374	sub find_async {
2217	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2218		2376
2219	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2220		2378
2221	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2222	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2223	}	2381	}
2224		2382
2225	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2226		2384
2227	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2228	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2229		2387
2230	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2231	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2232	if (my $map = find $k) {	2390	if (my $map = find $k) {
2233	$map->load if $v;	2391	$map->load if $MAP_PREFETCH{$k};
2234	}	2392	}
2235		2393
2236	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
2237	}	2395	}
2238	}	2396	}
…		…
2286	sub swap_out {	2444	sub swap_out {
2287	my ($self) = @_;	2445	my ($self) = @_;
2288		2446
2289	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2290		2448
2291	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2292	return if $self->{deny_save};	2450	return if $self->{deny_save};
2293	return if $self->players;	2451	return if $self->players;
2294		2452
2295	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2296	$self->deactivate;	2454	$self->deactivate;
2297	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2298	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2299		2457
2300	# then atomically save	2458	# then atomically save
2301	$self->_save;	2459	$self->_save;
2302		2460
2303	# then free the map	2461	# then free the map
…		…
2329		2487
2330	return if $self->players;	2488	return if $self->players;
2331		2489
2332	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2333		2491
2334	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2335		2493
2336	# need to save uniques path	2494	# need to save uniques path
2337	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2338	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2339		2497
…		…
2492		2650
2493	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2494		2652
2495	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2496		2654
2497	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2498	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2499		2657
2500	=cut	2658	=cut
2501		2659
2502	sub deref {	2660	sub deref {
…		…
2584	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2585		2743
2586	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2587	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2588		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2589	=cut	2772	=cut
2590		2773
2591	sub cf::object::player::may {	2774	sub cf::object::player::may {
2592	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2593		2776
2594	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2595	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2596	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2597	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2598	}	2781	}
2599		2782
2600	=item $player_object->enter_link	2783	=item $player_object->enter_link
2601		2784
…		…
2604	The player should be reasonably safe there for short amounts of time (e.g.	2787	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,	2788	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	2789	though, as the player cannot control the character while it is on the link
2607	map.	2790	map.
2608		2791
2609	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2610		2799
2611	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2612		2801
2613	Moves the player out of the special C<{link}> map onto the specified	2802	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	2803	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	2858	# use -1 or undef as default coordinates, not 0, 0
2670	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2671	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2672		2861
2673	$map->load;	2862	$map->load;
2674	$map->load_neighbours;
2675		2863
2676	return unless $self->contr->active;	2864	return unless $self->contr->active;
2677		2865
2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2735	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2736	}	2924	}
2737	}	2925	}
2738		2926
2739	my $map = eval {	2927	my $map = eval {
2740	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741		2929
2742	if ($map) {	2930	if ($map) {
2743	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2744	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2745	} else {	2933	} else {
…		…
2835	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2836		3024
2837	unless (eval {	3025	unless (eval {
2838	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2839		3027
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;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2849	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2850	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2851		3054
2852	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2853		3056
2854	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2855	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2870		3073
2871	=head3 cf::client	3074	=head3 cf::client
2872		3075
2873	=over 4	3076	=over 4
2874		3077
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)	3078	=item $client->send_big_packet ($pkt)
2890		3079
2891	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2892	them as required.	3081	them as required.
2893		3082
…		…
2911	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2912	}	3101	}
2913		3102
2914	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2915		3104
2916	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	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	3106	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	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2919	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2920		3109
2921	=cut	3110	=cut
2922		3111
2923	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3028	id => "death",	3217	id => "death",
3029	title => "Death",	3218	title => "Death",
3030	reply => undef,	3219	reply => undef,
3031	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3032	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3033	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3034	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3035	);	3230	);
3036		3231
3037	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3080	=cut	3275	=cut
3081		3276
3082	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3083	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3084		3279
3085	if ($self->extcmd == 2) {
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$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	}	3281	}
3110		3282
3111	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3112		3284
3113	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3133		3305
3134	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3135	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3136		3308
3137	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3138	}	3349	}
3139		3350
3140	cf::client->attach (	3351	cf::client->attach (
3141	on_connect => sub {	3352	on_connect => sub {
3142	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3168	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3169		3380
3170	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171		3382
3172	if (ref $msg) {	3383	if (ref $msg) {
3173	my ($type, $reply, @payload) =	3384	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		3385
3178	my @reply;
3179
3180	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3181	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3182	}	3404	}
3183
3184	$ns->ext_reply ($reply, @reply)
3185	if $reply;
3186
3187	} else {	3405	} else {
3188	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3189	}	3407	}
3190		3408
3191	cf::override;	3409	cf::override;
…		…
3359	=cut	3577	=cut
3360		3578
3361	#############################################################################	3579	#############################################################################
3362	# the server's init and main functions	3580	# the server's init and main functions
3363		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3364	sub load_facedata($) {	3659	sub load_facedata($) {
3365	my ($path) = @_;	3660	my ($path) = @_;
3366		3661
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;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372		3663
3373	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3374		3665
3375	my $facedata;	3666	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		3667
3381	$facedata->{version} == 2	3668	$facedata->{version} == 2
3382	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3383		3670
3384	# patch in the exptable	3671	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]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3386	$facedata->{resource}{"res/exp_table"} = {	3673
3387	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3388	data => $exp_table,	3675
3389	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3390	};	3677	# from here on, everything must be atomic - no thread switch allowed
3391	cf::cede_to_tick;	3678	my $t1 = EV::time;
3392		3679
3393	{	3680	{
3394	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3395		3682
3396	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398		3686
3399	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3400	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	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};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3403		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3404	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3405	}	3694	}
3406		3695
3407	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3408	next unless $info->{smooth};	3697	next unless $info->{smooth};
3409		3698
…		…
3414	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3415	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3416	} else {	3705	} else {
3417	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3418	}	3707	}
3419
3420	cf::cede_to_tick;
3421	}	3708	}
3422	}	3709	}
3423		3710
3424	{	3711	{
3425	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3426		3713
3427	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3428	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3429	cf::cede_to_tick;
3430	}	3716	}
3431		3717
3432	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3433	}	3719	}
3434		3720
3435	{	3721	{
3436	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3437		3723
3438	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3439	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# 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;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441		3728
3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3444	} else {	3735	} else {
3445	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3446	}	3737	}
3447
3448	cf::cede_to_tick;
3449	}	3738	}
3450	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3451		3750
3452	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3752
		3753	aio_close $fh if $fh; # close old facedata
3453		3754
3454	1	3755	1
3455	}	3756	}
3456		3757
3457	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3468	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3469	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3470	cf::arch::commit_load;	3771	cf::arch::commit_load;
3471		3772
3472	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3473	}	3788	}
3474		3789
3475	sub reload_regions {	3790	sub reload_regions {
3476	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3477	# for this (global event?)	3792	# for this (global event?)
…		…
3485	if exists $_->{match};	3800	if exists $_->{match};
3486	}	3801	}
3487	}	3802	}
3488		3803
3489	sub reload_facedata {	3804	sub reload_facedata {
3490	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3491	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3492	}	3807	}
3493		3808
3494	sub reload_archetypes {	3809	sub reload_archetypes {
3495	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3496	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3497	}	3838	}
3498		3839
3499	sub reload_treasures {	3840	sub reload_treasures {
3500	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3501	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3502	}	3843	}
3503		3844
3504	sub reload_sound {	3845	sub reload_sound {
3505	trace "loading sound config from $DATADIR/sound\n";	3846	trace "loading sound config from $DATADIR/sound\n";
3506		3847
3507	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508	or die "$DATADIR/sound $!";
3509
3510	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511		3849
3512	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513	my $sound = $soundconf->{compat}[$_]	3851	my $sound = $soundconf->{compat}[$_]
3514	or next;	3852	or next;
3515		3853
…		…
3525	}	3863	}
3526		3864
3527	sub reload_resources {	3865	sub reload_resources {
3528	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3529		3867
		3868	reload_materials;
3530	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3531	reload_sound;	3871	reload_sound;
3532	reload_archetypes;	3872	reload_archetypes;
3533	reload_regions;	3873	reload_regions;
3534	reload_treasures;	3874	reload_treasures;
3535		3875
…		…
3537	}	3877	}
3538		3878
3539	sub reload_config {	3879	sub reload_config {
3540	trace "reloading config file...\n";	3880	trace "reloading config file...\n";
3541		3881
3542	open my $fh, "<:utf8", "$CONFDIR/config"	3882	my $config = load_file "$CONFDIR/config";
3543	or return;	3883	utf8::decode $config;
3544		3884	*CFG = decode_yaml $config;
3545	local $/;
3546	*CFG = YAML::XS::Load scalar <$fh>;
3547		3885
3548	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549		3887
3550	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3888	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3889	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3555	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3893	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556	and die "WARNING: m(un)lockall failed: $!\n";	3894	and die "WARNING: m(un)lockall failed: $!\n";
3557	};	3895	};
3558	warn $@ if $@;	3896	warn $@ if $@;
3559	}	3897	}
3560
3561	trace "finished reloading resource files\n";
3562	}	3898	}
3563		3899
3564	sub pidfile() {	3900	sub pidfile() {
3565	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3901	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566	or die "$PIDFILE: $!";	3902	or die "$PIDFILE: $!";
…		…
3579	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3580	print $fh $$;	3916	print $fh $$;
3581	}	3917	}
3582		3918
3583	sub main_loop {	3919	sub main_loop {
3584	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3585	if (1) {	3921	if (1) {
3586	EV::loop;	3922	EV::run;
3587	}	3923	}
3588	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3589	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3590	}	3926	}
3591		3927
3592	sub main {	3928	sub main {
3593	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3594		3930
3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599		3935
3600	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601		3937
3602	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3603	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3604	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605	(async {	3941	(async {
3606	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3607	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3608	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3609	};	3945	};
3610		3946
3611	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3612		3948
3613	cf::sync_job {	3949	cf::sync_job {
3614	cf::incloader::init ();	3950	cf::incloader::init ();
3615		3951
3616	cf::init_experience;	3952	db_init;
		3953
3617	cf::init_anim;	3954	cf::init_anim;
3618	cf::init_attackmess;	3955	cf::init_attackmess;
3619	cf::init_dynamic;	3956	cf::init_dynamic;
3620		3957
3621	cf::load_settings;	3958	cf::load_settings;
3622	cf::load_materials;
3623		3959
3624	reload_resources;	3960	reload_resources;
3625	reload_config;	3961	reload_config;
3626	db_init;
3627		3962
3628	cf::init_uuid;	3963	cf::init_uuid;
3629	cf::init_signals;	3964	cf::init_signals;
3630	cf::init_skills;	3965	cf::init_skills;
3631		3966
…		…
3639		3974
3640	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3641	use POSIX ();	3976	use POSIX ();
3642	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3977	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643		3978
3644	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3645	};	3980	};
3646		3981
3647	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3648	info "parse errors in files are no longer fatal from this point on.\n";	3983	info "parse errors in files are no longer fatal from this point on.\n";
3649		3984
3650	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3651	undef $free_main;
3652	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3653	};	3987	};
3654		3988
3655	goto &main_loop;	3989	goto &main_loop;
3656	}	3990	}
…		…
3813		4147
3814	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3815		4149
3816	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3817	while (IO::AIO::nreqs || BDB::nreqs) {	4151	while (IO::AIO::nreqs || BDB::nreqs) {
3818	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3819	}	4153	}
3820		4154
3821	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3822	};	4156	};
3823		4157
…		…
3872		4206
3873	my $t1 = AE::time;	4207	my $t1 = AE::time;
3874		4208
3875	while ($RELOAD) {	4209	while ($RELOAD) {
3876	cf::get_slot 0.1, -1, "reload_perl";	4210	cf::get_slot 0.1, -1, "reload_perl";
3877	info "reloading...";	4211	info "perl_reload: reloading...";
3878		4212
3879	trace "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3880		4214
3881	cf::sync_job {	4215	cf::sync_job {
3882	#cf::emergency_save;	4216	#cf::emergency_save;
3883		4217
3884	trace "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3885	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3886	%EXT_CORO = ();	4220	%EXT_CORO = ();
3887		4221
3888	trace "removing commands";	4222	trace "perl_reload: removing commands";
3889	%COMMAND = ();	4223	%COMMAND = ();
3890		4224
3891	trace "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3892	%EXTCMD = ();	4226	%EXTCMD = ();
3893	%EXTICMD = ();	4227	%EXTICMD = ();
3894		4228
3895	trace "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3896	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3897	trace "... unloading $pkg";	4231	trace "... unloading $pkg";
3898		4232
3899	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3900	eval {	4234	eval {
…		…
3905		4239
3906	trace "... clearing $pkg";	4240	trace "... clearing $pkg";
3907	clear_package $pkg;	4241	clear_package $pkg;
3908	}	4242	}
3909		4243
3910	trace "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3911	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3912	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3913		4247
3914	trace "... unloading $k";	4248	trace "... unloading $k";
3915	delete $INC{$k};	4249	delete $INC{$k};
…		…
3922	}	4256	}
3923		4257
3924	clear_package $k;	4258	clear_package $k;
3925	}	4259	}
3926		4260
3927	trace "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3928	clear_package "safe::$_"	4262	clear_package "safe::$_"
3929	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4263	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3930		4264
3931	trace "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3932	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3933	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3934		4268
3935	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3936	# and global variables created in xs	4270	# and global variables created in xs
3937	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3938		4272
3939	info "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3940		4274
3941	trace "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3942	require cf;	4276	require cf;
3943	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3944		4278
3945	trace "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3946	cf::reload_config;	4280	cf::reload_config;
3947		4281
3948	trace "loading extensions";	4282	trace "perl_reload: loading extensions";
3949	cf::load_extensions;	4283	cf::load_extensions;
3950		4284
3951	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3952	trace "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3953	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3954	trace "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3955	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3956	trace "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3957	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3958	}	4292	}
3959		4293
3960	trace "running post_init jobs";	4294	cf::_post_init 1;
3961	(pop @POST_INIT)->(1) while @POST_INIT;
3962		4295
3963	trace "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3964		4297
3965	1	4298	1
3966	} or do {	4299	} or do {
3967	error $@;	4300	error $@;
3968	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3969	};	4302	};
3970		4303
3971	info "reloaded";
3972	--$RELOAD;	4304	--$RELOAD;
3973	}	4305	}
3974		4306
3975	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3976	info "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3977	};	4309	};
3978		4310
3979	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3980		4312
3981	sub reload_perl() {	4313	sub reload_perl() {
…		…
4006		4338
4007	#############################################################################	4339	#############################################################################
4008		4340
4009	my $bug_warning = 0;	4341	my $bug_warning = 0;
4010		4342
4011	our @WAIT_FOR_TICK;
4012	our @WAIT_FOR_TICK_BEGIN;
4013
4014	sub wait_for_tick {	4343	sub wait_for_tick() {
4015	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4016		4345
4017	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4018	push @WAIT_FOR_TICK, $signal;
4019	$signal->wait;
4020	}	4347	}
4021		4348
4022	sub wait_for_tick_begin {	4349	sub wait_for_tick_begin() {
4023	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4024		4351
4025	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4026	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4027	$signal->wait;	4354	$signal->wait;
4028	}	4355	}
…		…
4032	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4033	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4034	return;	4361	return;
4035	}	4362	}
4036		4363
4037	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4038		4365
4039	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4040		4367
4041	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4042	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4048	}	4375	}
4049		4376
4050	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4051	$sig->send;	4378	$sig->send;
4052	}	4379	}
4053	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4054	$sig->send;
4055	}
4056		4381
4057	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4058	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4059		4384
4060	if (0) {	4385	if (0) {
…		…
4066	}	4391	}
4067	}	4392	}
4068		4393
4069	{	4394	{
4070	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4071		4397
4072	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4073	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4074	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4075		4401
4076	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4077	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4078	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4079	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4104	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4105	};	4431	};
4106	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4107	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4108	};	4434	};
		4435
		4436	info "database initialised";
4109	}	4437	}
4110		4438
4111	{	4439	{
4112	# configure IO::AIO	4440	# configure IO::AIO
4113		4441
		4442	info "initialising aio";
4114	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4115	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4116	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4117	}	4447	}
4118		4448
4119	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4120		4451
4121	sub _log_backtrace {	4452	sub _log_backtrace {
4122	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4123		4454
4124	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4125		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4126	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4127	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4128	++$_log_backtrace;	4463	++$_log_backtrace;
4129	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4130	async {	4465	async {
4131	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4132		4467
…		…
4152	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4153	--$_log_backtrace;	4488	--$_log_backtrace;
4154	};	4489	};
4155	} else {	4490	} else {
4156	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4157	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4158	}	4493	}
4159	}	4494	}
4160		4495
4161	# load additional modules	4496	# load additional modules
4162	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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