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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.613 by root, Mon Nov 26 13:12:16 2012 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
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	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	}
…		…
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
…		…
1869	}	2043	}
1870		2044
1871	sub normalise {	2045	sub normalise {
1872	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1873		2047
1874	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1875		2049
1876	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1877		2051
1878	# map plan:	2052	# map plan:
1879	#	2053	#
…		…
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
…		…
1918	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1919	return $self;	2092	return $self;
1920	}	2093	}
1921	}	2094	}
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;
…		…
2051		2229
2052	sub find;	2230	sub find;
2053	sub find {	2231	sub find {
2054	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2055		2233
		2234	cf::cede_to_tick;
		2235
2056	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2057		2237
2058	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2060		2240
2061	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2092		2272
2093	{	2273	{
2094	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2095		2275
2096	return unless $self->valid;	2276	return unless $self->valid;
2097	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2098
2099	$self->in_memory (cf::MAP_LOADING);
2100		2278
2101	$self->alloc;	2279	$self->alloc;
2102		2280
2103	$self->pre_load;	2281	$self->pre_load;
2104	cf::cede_to_tick;	2282	cf::cede_to_tick;
2105		2283
		2284	if (exists $self->{load_path}) {
2106	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2107	$f->skip_block;	2286	$f->skip_block;
2108	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2109	or return;	2288	or return;
2110		2289
2111	$self->post_load_original	2290	$self->post_load_original
2112	if delete $self->{load_original};	2291	if delete $self->{load_original};
2113		2292
2114	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2115	utf8::encode $uniq;	2294	utf8::encode $uniq;
2116	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2117	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2118	$self->clear_unique_items;	2297	$self->clear_unique_items;
2119	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2120	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2121	}	2301	}
2122	}	2302	}
2123	}
2124		2303
2125	$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);
2126		2311
2127	cf::cede_to_tick;	2312	cf::cede_to_tick;
2128	# now do the right thing for maps	2313	# now do the right thing for maps
2129	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2130	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2134	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2135	$self->decay_objects;	2320	$self->decay_objects;
2136	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2137	$self->update_buttons;	2322	$self->update_buttons;
2138	cf::cede_to_tick;	2323	cf::cede_to_tick;
2139	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2140	}	2325	}
2141		2326
2142	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2143	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2144
2145	$self->in_memory (cf::MAP_ACTIVE);
2146	}	2329	}
2147		2330
2148	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2149	}	2334	}
2150		2335
2151	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2152	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2153	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2161	# if $self->per_party;	2346	# if $self->per_party;
2162		2347
2163	$self	2348	$self
2164	}	2349	}
2165		2350
2166	# find and load all maps in the 3x3 area around a map
2167	sub load_neighbours {
2168	my ($map) = @_;
2169
2170	my @neigh; # diagonal neighbours
2171
2172	for (0 .. 3) {
2173	my $neigh = $map->tile_path ($_)
2174	or next;
2175	$neigh = find $neigh, $map
2176	or next;
2177	$neigh->load;
2178
2179	# now find the diagonal neighbours
2180	push @neigh,
2181	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2182	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2183	}
2184
2185	for (grep defined $_->[0], @neigh) {
2186	my ($path, $origin) = @$_;
2187	my $neigh = find $path, $origin
2188	or next;
2189	$neigh->load;
2190	}
2191	}
2192
2193	sub find_sync {	2351	sub find_sync {
2194	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2195		2353
		2354	# it's a bug to call this from the main context
2196	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2198		2357
2199	find $path, $origin	2358	find $path, $origin
2200	}	2359	}
2201		2360
2202	sub do_load_sync {	2361	sub do_load_sync {
2203	my ($map) = @_;	2362	my ($map) = @_;
2204		2363
		2364	# it's a bug to call this from the main context
2205	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2207		2367
2208	$map->load;	2368	$map->load;
2209	}	2369	}
…		…
2212	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2213		2373
2214	sub find_async {	2374	sub find_async {
2215	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2216		2376
2217	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2218		2378
2219	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2220	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2221	}	2381	}
2222		2382
2223	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2224		2384
2225	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2284	sub swap_out {	2444	sub swap_out {
2285	my ($self) = @_;	2445	my ($self) = @_;
2286		2446
2287	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2288		2448
2289	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2290	return if $self->{deny_save};	2450	return if $self->{deny_save};
2291	return if $self->players;	2451	return if $self->players;
2292		2452
2293	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2294	$self->deactivate;	2454	$self->deactivate;
2295	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2296	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2297		2457
2298	# then atomically save	2458	# then atomically save
2299	$self->_save;	2459	$self->_save;
2300		2460
2301	# then free the map	2461	# then free the map
…		…
2327		2487
2328	return if $self->players;	2488	return if $self->players;
2329		2489
2330	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2331		2491
2332	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2333		2493
2334	# need to save uniques path	2494	# need to save uniques path
2335	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2336	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2337		2497
…		…
2490		2650
2491	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.
2492		2652
2493	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2494		2654
2495	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,
2496	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2497		2657
2498	=cut	2658	=cut
2499		2659
2500	sub deref {	2660	sub deref {
…		…
2667	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2668	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2669	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2670		2830
2671	$map->load;	2831	$map->load;
2672	$map->load_neighbours;
2673		2832
2674	return unless $self->contr->active;	2833	return unless $self->contr->active;
2675		2834
2676	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2733	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2734	}	2893	}
2735	}	2894	}
2736		2895
2737	my $map = eval {	2896	my $map = eval {
2738	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739		2898
2740	if ($map) {	2899	if ($map) {
2741	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2742	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2743	} else {	2902	} else {
…		…
2833	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2834		2993
2835	unless (eval {	2994	unless (eval {
2836	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2837		2996
2838	# random map handling
2839	{
2840	my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842	prepare_random_map $exit
2843	if $exit->slaying eq "/!";
2844	}
2845
2846	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2847	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2848	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2849		3023
2850	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2851		3025
2852	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2853	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2868		3042
2869	=head3 cf::client	3043	=head3 cf::client
2870		3044
2871	=over 4	3045	=over 4
2872		3046
2873	=item $client->send_drawinfo ($text, $flags)
2874
2875	Sends a drawinfo packet to the client. Circumvents output buffering so
2876	should not be used under normal circumstances.
2877
2878	=cut
2879
2880	sub cf::client::send_drawinfo {
2881	my ($self, $text, $flags) = @_;
2882
2883	utf8::encode $text;
2884	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2885	}
2886
2887	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2888		3048
2889	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2890	them as required.	3050	them as required.
2891		3051
…		…
2909	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2910	}	3070	}
2911		3071
2912	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2913		3073
2914	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2915	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2916	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2917	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2918		3078
2919	=cut	3079	=cut
2920		3080
2921	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3026	id => "death",	3186	id => "death",
3027	title => "Death",	3187	title => "Death",
3028	reply => undef,	3188	reply => undef,
3029	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3030	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3031	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3032	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3033	);	3199	);
3034		3200
3035	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3078	=cut	3244	=cut
3079		3245
3080	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3081	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3082		3248
3083	if ($self->extcmd == 2) {
3084	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3085	} elsif ($self->extcmd == 1) { # TODO: remove
3086	push @msg, msgtype => "event_$type";
3087	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3088	}
3089	}
3090
3091	=item $client->ext_reply ($msgid, @msg)
3092
3093	Sends an ext reply to the client.
3094
3095	=cut
3096
3097	sub cf::client::ext_reply($$@) {
3098	my ($self, $id, @msg) = @_;
3099
3100	if ($self->extcmd == 2) {
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102	} elsif ($self->extcmd == 1) {
3103	#TODO: version 1, remove
3104	unshift @msg, msgtype => "reply", msgid => $id;
3105	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106	}
3107	}	3250	}
3108		3251
3109	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3110		3253
3111	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3131		3274
3132	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3133	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3134		3277
3135	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{preferred},
		3292	$COMMAND_FACE{standard},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	$COMMAND_FACE{emote},
		3296	;
		3297
		3298	$self->send_face ($_)
		3299	for @faces;
		3300	$self->flush_fx;
		3301
		3302	$self->ext_msg (command_list => @faces);
		3303	}
		3304
		3305	=item cf::client::set_command_face $type, $commands
		3306
		3307	=cut
		3308
		3309	sub cf::client::set_command_face {
		3310	my ($type, $list) = @_;
		3311
		3312	my $idx = &cf::face::set ( #d# ugly forward reference
		3313	"command_list/$type" => cf::FT_RSRC,
		3314	JSON::XS->new->utf8->encode ([ sort @$list ])
		3315	);
		3316
		3317	$COMMAND_FACE{$type} = $idx;
3136	}	3318	}
3137		3319
3138	cf::client->attach (	3320	cf::client->attach (
3139	on_connect => sub {	3321	on_connect => sub {
3140	my ($ns) = @_;	3322	my ($ns) = @_;
…		…
3166	my ($ns, $buf) = @_;	3348	my ($ns, $buf) = @_;
3167		3349
3168	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3350	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169		3351
3170	if (ref $msg) {	3352	if (ref $msg) {
3171	my ($type, $reply, @payload) =	3353	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172	"ARRAY" eq ref $msg
3173	? @$msg
3174	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175		3354
3176	my @reply;
3177
3178	if (my $cb = $EXTICMD{$type}) {	3355	if (my $cb = $EXTIACMD{$type}) {
		3356	$cb->(
		3357	$ns,
		3358	sub {
		3359	$ns->ext_msg ("reply-$reply", @_)
		3360	if $reply;
		3361	},
		3362	@payload
		3363	);
		3364	} else {
		3365	my @reply;
		3366
		3367	if (my $cb = $EXTICMD{$type}) {
3179	@reply = $cb->($ns, @payload);	3368	@reply = $cb->($ns, @payload);
		3369	}
		3370
		3371	$ns->ext_msg ("reply-$reply", @reply)
		3372	if $reply;
3180	}	3373	}
3181
3182	$ns->ext_reply ($reply, @reply)
3183	if $reply;
3184
3185	} else {	3374	} else {
3186	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3375	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3187	}	3376	}
3188		3377
3189	cf::override;	3378	cf::override;
…		…
3357	=cut	3546	=cut
3358		3547
3359	#############################################################################	3548	#############################################################################
3360	# the server's init and main functions	3549	# the server's init and main functions
3361		3550
3362	# async inc loader. yay.	3551	{
3363	sub inc_loader {	3552	package cf::face;
3364	my $mod = $_[1];
3365		3553
3366	if (in_main && !tick_inhibit) {	3554	our %HASH; # hash => idx
3367	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3555	our @DATA; # dynamically-created facedata, only faceste 0 used
		3556	our @FOFS; # file offset, if > 0
		3557	our @SIZE; # size of face, in octets
		3558	our @META; # meta hash of face, if any
		3559	our $DATAFH; # facedata filehandle
		3560
		3561	# internal api, not finalised
		3562	sub set {
		3563	my ($name, $type, $data) = @_;
		3564
		3565	my $idx = cf::face::find $name;
		3566
		3567	if ($idx) {
		3568	delete $HASH{cf::face::get_csum $idx};
3368	} else {	3569	} else {
3369	debug "loading perl module $mod\n";	3570	$idx = cf::face::alloc $name;
3370	}	3571	}
3371		3572
3372	# 1. find real file	3573	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3373	for my $dir (@ORIG_INC) {
3374	ref $dir and next;
3375	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376	or next;
3377		3574
3378	$data = "#line 1 $dir/$mod\n$data";	3575	cf::face::set_type $idx, $type;
		3576	cf::face::set_csum $idx, 0, $hash;
3379		3577
3380	open my $fh, "<", \$data or die;	3578	# we need to destroy the SV itself, not just modify it, as a running ix
		3579	# might hold a reference to it: "delete" achieves that.
		3580	delete $FOFS[0][$idx];
		3581	delete $DATA[0][$idx];
		3582	$DATA[0][$idx] = $data;
		3583	$SIZE[0][$idx] = length $data;
		3584	delete $META[$idx];
		3585	$HASH{$hash} = $idx;#d#
3381		3586
3382	return $fh;	3587	$idx
3383	}	3588	}
3384		3589
3385	()	3590	sub _get_data($$$) {
3386	}	3591	my ($idx, $set, $cb) = @_;
3387		3592
3388	sub init_inc {	3593	if (defined $DATA[$set][$idx]) {
3389	# save original @INC	3594	$cb->($DATA[$set][$idx]);
3390	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;	3595	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3596	my $size = $SIZE[$set][$idx];
		3597	my $buf;
		3598	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3599	if ($_[0] == $size) {
		3600	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3601	$cb->($buf);
		3602	} else {
		3603	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3604	}
		3605	};
		3606	} else {
		3607	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3608	}
		3609	}
3391		3610
3392	# make sure we can do scalar-opens	3611	# rather ineffient
3393	open my $dummy, "<", \my $dummy2;	3612	sub cf::face::get_data($;$) {
		3613	my ($idx, $set) = @_;
3394		3614
3395	# execute some stuff so perl load's some of the core modules	3615	_get_data $idx, $set, Coro::rouse_cb;
3396	/Ü/ =~ /ü/i;	3616	Coro::rouse_wait
3397	eval { &Storable::nstore_fd };	3617	}
3398		3618
3399	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.	3619	sub cf::face::ix {
		3620	my ($ns, $set, $idx, $pri) = @_;
3400		3621
3401	debug "module loading will be asynchronous from this point on.";	3622	_get_data $idx, $set, sub {
		3623	$ns->ix_send ($idx, $pri, $_[0]);
		3624	};
		3625	}
3402	}	3626	}
3403		3627
3404	sub load_facedata($) {	3628	sub load_facedata($) {
3405	my ($path) = @_;	3629	my ($path) = @_;
3406		3630
3407	# HACK to clear player env face cache, we need some signal framework
3408	# for this (global event?)
3409	%ext::player_env::MUSIC_FACE_CACHE = ();
3410
3411	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3631	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412		3632
3413	trace "loading facedata from $path\n";	3633	trace "loading facedata from $path\n";
3414		3634
3415	my $facedata;	3635	my $facedata = decode_storable load_file "$path/faceinfo";
3416	0 < aio_load $path, $facedata
3417	or die "$path: $!";
3418
3419	$facedata = Coro::Storable::thaw $facedata;
3420		3636
3421	$facedata->{version} == 2	3637	$facedata->{version} == 2
3422	or cf::cleanup "$path: version mismatch, cannot proceed.";	3638	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3423		3639
3424	# patch in the exptable	3640	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3425	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3641	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3426	$facedata->{resource}{"res/exp_table"} = {	3642
3427	type => FT_RSRC,	3643	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3428	data => $exp_table,	3644
3429	hash => (Digest::MD5::md5 $exp_table),	3645	# BEGIN ATOMIC
3430	};	3646	# from here on, everything must be atomic - no thread switch allowed
3431	cf::cede_to_tick;	3647	my $t1 = EV::time;
3432		3648
3433	{	3649	{
3434	my $faces = $facedata->{faceinfo};	3650	my $faces = $facedata->{faceinfo};
3435		3651
3436	while (my ($face, $info) = each %$faces) {	3652	for my $face (sort keys %$faces) {
		3653	my $info = $faces->{$face};
3437	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3654	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438		3655
3439	cf::face::set_visibility $idx, $info->{visibility};	3656	cf::face::set_visibility $idx, $info->{visibility};
3440	cf::face::set_magicmap $idx, $info->{magicmap};	3657	cf::face::set_magicmap $idx, $info->{magicmap};
3441	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3658	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3442	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3659	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3443		3660	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3444	cf::cede_to_tick;	3661	$cf::face::HASH{$info->{hash64}} = $idx;
		3662	delete $cf::face::META[$idx];
3445	}	3663	}
3446		3664
3447	while (my ($face, $info) = each %$faces) {	3665	while (my ($face, $info) = each %$faces) {
3448	next unless $info->{smooth};	3666	next unless $info->{smooth};
3449		3667
…		…
3454	cf::face::set_smooth $idx, $smooth;	3672	cf::face::set_smooth $idx, $smooth;
3455	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3673	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3456	} else {	3674	} else {
3457	error "smooth face '$info->{smooth}' not found for face '$face'";	3675	error "smooth face '$info->{smooth}' not found for face '$face'";
3458	}	3676	}
3459
3460	cf::cede_to_tick;
3461	}	3677	}
3462	}	3678	}
3463		3679
3464	{	3680	{
3465	my $anims = $facedata->{animinfo};	3681	my $anims = $facedata->{animinfo};
3466		3682
3467	while (my ($anim, $info) = each %$anims) {	3683	while (my ($anim, $info) = each %$anims) {
3468	cf::anim::set $anim, $info->{frames}, $info->{facings};	3684	cf::anim::set $anim, $info->{frames}, $info->{facings};
3469	cf::cede_to_tick;
3470	}	3685	}
3471		3686
3472	cf::anim::invalidate_all; # d'oh	3687	cf::anim::invalidate_all; # d'oh
3473	}	3688	}
3474		3689
3475	{	3690	{
3476	my $res = $facedata->{resource};	3691	my $res = $facedata->{resource};
3477		3692
3478	while (my ($name, $info) = each %$res) {	3693	while (my ($name, $info) = each %$res) {
3479	if (defined $info->{type}) {	3694	if (defined (my $type = $info->{type})) {
		3695	# TODO: different hash - must free and use new index, or cache ixface data queue
3480	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3696	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481		3697
3482	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483	cf::face::set_type $idx, $info->{type};	3698	cf::face::set_type $idx, $type;
		3699	cf::face::set_csum $idx, 0, $info->{hash};
		3700	$cf::face::SIZE[0][$idx] = $info->{size};
		3701	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3702	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3703	$cf::face::HASH{$info->{hash}} = $idx;
3484	} else {	3704	} else {
3485	$RESOURCE{$name} = $info; # unused	3705	# $RESOURCE{$name} = $info; # unused
3486	}	3706	}
3487
3488	cf::cede_to_tick;
3489	}	3707	}
3490	}	3708	}
		3709
		3710	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3711
		3712	# HACK to clear player env face cache, we need some signal framework
		3713	# for this (global event?)
		3714	%ext::player_env::MUSIC_FACE_CACHE = ();
		3715
		3716	# END ATOMIC
		3717
		3718	cf::debug "facedata atomic update time ", EV::time - $t1;
3491		3719
3492	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3720	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3721
		3722	aio_close $fh if $fh; # close old facedata
3493		3723
3494	1	3724	1
3495	}	3725	}
3496		3726
3497	register_exticmd fx_want => sub {	3727	register_exticmd fx_want => sub {
…		…
3508	my $status = load_resource_file_ $_[0];	3738	my $status = load_resource_file_ $_[0];
3509	get_slot 0.1, 100;	3739	get_slot 0.1, 100;
3510	cf::arch::commit_load;	3740	cf::arch::commit_load;
3511		3741
3512	$status	3742	$status
		3743	}
		3744
		3745	sub reload_exp_table {
		3746	_reload_exp_table;
		3747
		3748	cf::face::set
		3749	"res/exp_table" => FT_RSRC,
		3750	JSON::XS->new->utf8->canonical->encode (
		3751	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3752	);
		3753	}
		3754
		3755	sub reload_materials {
		3756	_reload_materials;
3513	}	3757	}
3514		3758
3515	sub reload_regions {	3759	sub reload_regions {
3516	# HACK to clear player env face cache, we need some signal framework	3760	# HACK to clear player env face cache, we need some signal framework
3517	# for this (global event?)	3761	# for this (global event?)
…		…
3525	if exists $_->{match};	3769	if exists $_->{match};
3526	}	3770	}
3527	}	3771	}
3528		3772
3529	sub reload_facedata {	3773	sub reload_facedata {
3530	load_facedata "$DATADIR/facedata"	3774	load_facedata $DATADIR
3531	or die "unable to load facedata\n";	3775	or die "unable to load facedata\n";
3532	}	3776	}
3533		3777
3534	sub reload_archetypes {	3778	sub reload_archetypes {
3535	load_resource_file "$DATADIR/archetypes"	3779	load_resource_file "$DATADIR/archetypes"
3536	or die "unable to load archetypes\n";	3780	or die "unable to load archetypes\n";
		3781
		3782	cf::face::set
		3783	"res/skill_info" => FT_RSRC,
		3784	JSON::XS->new->utf8->canonical->encode (
		3785	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3786	);
		3787
		3788	cf::face::set
		3789	"res/spell_paths" => FT_RSRC,
		3790	JSON::XS->new->utf8->canonical->encode (
		3791	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3792	);
		3793
		3794	# command completion
		3795	my @commands;
		3796
		3797	for (0..cf::arch::skillvec_size - 1) {
		3798	my $skill = cf::arch::skillvec $_;
		3799	my $name = $skill->name;
		3800	my $flags = cf::skill_flags $skill->subtype;
		3801
		3802	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3803	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3804	}
		3805
		3806	cf::client::set_command_face skill => \@commands;
3537	}	3807	}
3538		3808
3539	sub reload_treasures {	3809	sub reload_treasures {
3540	load_resource_file "$DATADIR/treasures"	3810	load_resource_file "$DATADIR/treasures"
3541	or die "unable to load treasurelists\n";	3811	or die "unable to load treasurelists\n";
3542	}	3812	}
3543		3813
3544	sub reload_sound {	3814	sub reload_sound {
3545	trace "loading sound config from $DATADIR/sound\n";	3815	trace "loading sound config from $DATADIR/sound\n";
3546		3816
3547	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548	or die "$DATADIR/sound $!";
3549
3550	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3817	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551		3818
3552	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3819	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553	my $sound = $soundconf->{compat}[$_]	3820	my $sound = $soundconf->{compat}[$_]
3554	or next;	3821	or next;
3555		3822
…		…
3565	}	3832	}
3566		3833
3567	sub reload_resources {	3834	sub reload_resources {
3568	trace "reloading resource files...\n";	3835	trace "reloading resource files...\n";
3569		3836
		3837	reload_materials;
3570	reload_facedata;	3838	reload_facedata;
		3839	reload_exp_table;
3571	reload_sound;	3840	reload_sound;
3572	reload_archetypes;	3841	reload_archetypes;
3573	reload_regions;	3842	reload_regions;
3574	reload_treasures;	3843	reload_treasures;
3575		3844
…		…
3577	}	3846	}
3578		3847
3579	sub reload_config {	3848	sub reload_config {
3580	trace "reloading config file...\n";	3849	trace "reloading config file...\n";
3581		3850
3582	open my $fh, "<:utf8", "$CONFDIR/config"	3851	my $config = load_file "$CONFDIR/config";
3583	or return;	3852	utf8::decode $config;
3584		3853	*CFG = decode_yaml $config;
3585	local $/;
3586	*CFG = YAML::XS::Load scalar <$fh>;
3587		3854
3588	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3855	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589		3856
3590	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3857	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3858	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3595	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3862	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596	and die "WARNING: m(un)lockall failed: $!\n";	3863	and die "WARNING: m(un)lockall failed: $!\n";
3597	};	3864	};
3598	warn $@ if $@;	3865	warn $@ if $@;
3599	}	3866	}
3600
3601	trace "finished reloading resource files\n";
3602	}	3867	}
3603		3868
3604	sub pidfile() {	3869	sub pidfile() {
3605	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3870	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606	or die "$PIDFILE: $!";	3871	or die "$PIDFILE: $!";
…		…
3631		3896
3632	sub main {	3897	sub main {
3633	cf::init_globals; # initialise logging	3898	cf::init_globals; # initialise logging
3634		3899
3635	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3900	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3901	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3902	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3903	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639		3904
3640	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3905	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641		3906
3642	# we must not ever block the main coroutine	3907	# we must not ever block the main coroutine
3643	local $Coro::idle = sub {	3908	$Coro::idle = sub {
3644	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3909	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3645	(async {	3910	(async {
3646	$Coro::current->{desc} = "IDLE BUG HANDLER";	3911	$Coro::current->{desc} = "IDLE BUG HANDLER";
3647	EV::loop EV::LOOP_ONESHOT;	3912	EV::loop EV::LOOP_ONESHOT;
3648	})->prio (Coro::PRIO_MAX);	3913	})->prio (Coro::PRIO_MAX);
3649	};	3914	};
3650		3915
3651	evthread_start IO::AIO::poll_fileno;	3916	evthread_start IO::AIO::poll_fileno;
3652		3917
3653	cf::sync_job {	3918	cf::sync_job {
		3919	cf::incloader::init ();
		3920
3654	init_inc;	3921	db_init;
3655		3922
3656	cf::init_experience;
3657	cf::init_anim;	3923	cf::init_anim;
3658	cf::init_attackmess;	3924	cf::init_attackmess;
3659	cf::init_dynamic;	3925	cf::init_dynamic;
3660		3926
3661	cf::load_settings;	3927	cf::load_settings;
3662	cf::load_materials;
3663		3928
3664	reload_resources;	3929	reload_resources;
3665	reload_config;	3930	reload_config;
3666	db_init;
3667		3931
3668	cf::init_uuid;	3932	cf::init_uuid;
3669	cf::init_signals;	3933	cf::init_signals;
3670	cf::init_skills;	3934	cf::init_skills;
3671		3935
…		…
3679		3943
3680	# no (long-running) fork's whatsoever before this point(!)	3944	# no (long-running) fork's whatsoever before this point(!)
3681	use POSIX ();	3945	use POSIX ();
3682	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3946	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683		3947
3684	(pop @POST_INIT)->(0) while @POST_INIT;	3948	cf::_post_init 0;
3685	};	3949	};
3686		3950
3687	cf::object::thawer::errors_are_fatal 0;	3951	cf::object::thawer::errors_are_fatal 0;
3688	info "parse errors in files are no longer fatal from this point on.\n";	3952	info "parse errors in files are no longer fatal from this point on.\n";
3689		3953
3690	my $free_main; $free_main = EV::idle sub {	3954	AE::postpone {
3691	undef $free_main;
3692	undef &main; # free gobs of memory :)	3955	undef &main; # free gobs of memory :)
3693	};	3956	};
3694		3957
3695	goto &main_loop;	3958	goto &main_loop;
3696	}	3959	}
…		…
3853		4116
3854	cf::write_runtime_sync; # external watchdog should not bark	4117	cf::write_runtime_sync; # external watchdog should not bark
3855		4118
3856	trace "emergency_perl_save: flushing outstanding aio requests";	4119	trace "emergency_perl_save: flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {	4120	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4121	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859	}	4122	}
3860		4123
3861	cf::write_runtime_sync; # external watchdog should not bark	4124	cf::write_runtime_sync; # external watchdog should not bark
3862	};	4125	};
3863		4126
…		…
3901	}	4164	}
3902	}	4165	}
3903		4166
3904	sub do_reload_perl() {	4167	sub do_reload_perl() {
3905	# can/must only be called in main	4168	# can/must only be called in main
3906	if (in_main) {	4169	unless (in_main) {
3907	error "can only reload from main coroutine";	4170	error "can only reload from main coroutine";
3908	return;	4171	return;
3909	}	4172	}
3910		4173
3911	return if $RELOAD++;	4174	return if $RELOAD++;
3912		4175
3913	my $t1 = AE::time;	4176	my $t1 = AE::time;
3914		4177
3915	while ($RELOAD) {	4178	while ($RELOAD) {
		4179	cf::get_slot 0.1, -1, "reload_perl";
3916	info "reloading...";	4180	info "perl_reload: reloading...";
3917		4181
3918	trace "entering sync_job";	4182	trace "perl_reload: entering sync_job";
3919		4183
3920	cf::sync_job {	4184	cf::sync_job {
3921	cf::emergency_save;	4185	#cf::emergency_save;
3922		4186
3923	trace "cancelling all extension coros";	4187	trace "perl_reload: cancelling all extension coros";
3924	$_->cancel for values %EXT_CORO;	4188	$_->cancel for values %EXT_CORO;
3925	%EXT_CORO = ();	4189	%EXT_CORO = ();
3926		4190
3927	trace "removing commands";	4191	trace "perl_reload: removing commands";
3928	%COMMAND = ();	4192	%COMMAND = ();
3929		4193
3930	trace "removing ext/exti commands";	4194	trace "perl_reload: removing ext/exti commands";
3931	%EXTCMD = ();	4195	%EXTCMD = ();
3932	%EXTICMD = ();	4196	%EXTICMD = ();
3933		4197
3934	trace "unloading/nuking all extensions";	4198	trace "perl_reload: unloading/nuking all extensions";
3935	for my $pkg (@EXTS) {	4199	for my $pkg (@EXTS) {
3936	trace "... unloading $pkg";	4200	trace "... unloading $pkg";
3937		4201
3938	if (my $cb = $pkg->can ("unload")) {	4202	if (my $cb = $pkg->can ("unload")) {
3939	eval {	4203	eval {
…		…
3944		4208
3945	trace "... clearing $pkg";	4209	trace "... clearing $pkg";
3946	clear_package $pkg;	4210	clear_package $pkg;
3947	}	4211	}
3948		4212
3949	trace "unloading all perl modules loaded from $LIBDIR";	4213	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950	while (my ($k, $v) = each %INC) {	4214	while (my ($k, $v) = each %INC) {
3951	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4215	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952		4216
3953	trace "... unloading $k";	4217	trace "... unloading $k";
3954	delete $INC{$k};	4218	delete $INC{$k};
…		…
3961	}	4225	}
3962		4226
3963	clear_package $k;	4227	clear_package $k;
3964	}	4228	}
3965		4229
3966	trace "getting rid of safe::, as good as possible";	4230	trace "perl_reload: getting rid of safe::, as good as possible";
3967	clear_package "safe::$_"	4231	clear_package "safe::$_"
3968	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4232	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969		4233
3970	trace "unloading cf.pm \"a bit\"";	4234	trace "perl_reload: unloading cf.pm \"a bit\"";
3971	delete $INC{"cf.pm"};	4235	delete $INC{"cf.pm"};
3972	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4236	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973		4237
3974	# don't, removes xs symbols, too,	4238	# don't, removes xs symbols, too,
3975	# and global variables created in xs	4239	# and global variables created in xs
3976	#clear_package __PACKAGE__;	4240	#clear_package __PACKAGE__;
3977		4241
3978	info "unload completed, starting to reload now";	4242	info "perl_reload: unload completed, starting to reload now";
3979		4243
3980	trace "reloading cf.pm";	4244	trace "perl_reload: reloading cf.pm";
3981	require cf;	4245	require cf;
3982	cf::_connect_to_perl_1;	4246	cf::_connect_to_perl_1;
3983		4247
3984	trace "loading config and database again";	4248	trace "perl_reload: loading config and database again";
3985	cf::reload_config;	4249	cf::reload_config;
3986		4250
3987	trace "loading extensions";	4251	trace "perl_reload: loading extensions";
3988	cf::load_extensions;	4252	cf::load_extensions;
3989		4253
3990	if ($REATTACH_ON_RELOAD) {	4254	if ($REATTACH_ON_RELOAD) {
3991	trace "reattaching attachments to objects/players";	4255	trace "perl_reload: reattaching attachments to objects/players";
3992	_global_reattach; # objects, sockets	4256	_global_reattach; # objects, sockets
3993	trace "reattaching attachments to maps";	4257	trace "perl_reload: reattaching attachments to maps";
3994	reattach $_ for values %MAP;	4258	reattach $_ for values %MAP;
3995	trace "reattaching attachments to players";	4259	trace "perl_reload: reattaching attachments to players";
3996	reattach $_ for values %PLAYER;	4260	reattach $_ for values %PLAYER;
3997	}	4261	}
3998		4262
3999	trace "running post_init jobs";	4263	cf::_post_init 1;
4000	(pop @POST_INIT)->(1) while @POST_INIT;
4001		4264
4002	trace "leaving sync_job";	4265	trace "perl_reload: leaving sync_job";
4003		4266
4004	1	4267	1
4005	} or do {	4268	} or do {
4006	error $@;	4269	error $@;
4007	cf::cleanup "error while reloading, exiting.";	4270	cf::cleanup "perl_reload: error, exiting.";
4008	};	4271	};
4009		4272
4010	info "reloaded";
4011	--$RELOAD;	4273	--$RELOAD;
4012	}	4274	}
4013		4275
4014	$t1 = AE::time - $t1;	4276	$t1 = AE::time - $t1;
4015	info "reload completed in ${t1}s\n";	4277	info "perl_reload: completed in ${t1}s\n";
4016	};	4278	};
4017		4279
4018	our $RELOAD_WATCHER; # used only during reload	4280	our $RELOAD_WATCHER; # used only during reload
4019		4281
4020	sub reload_perl() {	4282	sub reload_perl() {
…		…
4045		4307
4046	#############################################################################	4308	#############################################################################
4047		4309
4048	my $bug_warning = 0;	4310	my $bug_warning = 0;
4049		4311
4050	our @WAIT_FOR_TICK;
4051	our @WAIT_FOR_TICK_BEGIN;
4052
4053	sub wait_for_tick {	4312	sub wait_for_tick() {
4054	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4313	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055		4314
4056	my $signal = new Coro::Signal;	4315	$WAIT_FOR_TICK->wait;
4057	push @WAIT_FOR_TICK, $signal;
4058	$signal->wait;
4059	}	4316	}
4060		4317
4061	sub wait_for_tick_begin {	4318	sub wait_for_tick_begin() {
4062	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4319	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063		4320
4064	my $signal = new Coro::Signal;	4321	my $signal = new Coro::Signal;
4065	push @WAIT_FOR_TICK_BEGIN, $signal;	4322	push @WAIT_FOR_TICK_BEGIN, $signal;
4066	$signal->wait;	4323	$signal->wait;
4067	}	4324	}
…		…
4071	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4328	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4072	unless ++$bug_warning > 10;	4329	unless ++$bug_warning > 10;
4073	return;	4330	return;
4074	}	4331	}
4075		4332
4076	cf::server_tick; # one server iteration	4333	cf::one_tick; # one server iteration
4077		4334
4078	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4335	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079		4336
4080	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4337	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4338	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4087	}	4344	}
4088		4345
4089	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4346	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090	$sig->send;	4347	$sig->send;
4091	}	4348	}
4092	while (my $sig = shift @WAIT_FOR_TICK) {	4349	$WAIT_FOR_TICK->broadcast;
4093	$sig->send;
4094	}
4095		4350
4096	$LOAD = ($NOW - $TICK_START) / $TICK;	4351	$LOAD = ($NOW - $TICK_START) / $TICK;
4097	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4352	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098		4353
4099	if (0) {	4354	if (0) {
…		…
4105	}	4360	}
4106	}	4361	}
4107		4362
4108	{	4363	{
4109	# configure BDB	4364	# configure BDB
		4365	info "initialising database";
4110		4366
4111	BDB::min_parallel 16;	4367	BDB::min_parallel 16;
4112	BDB::max_poll_reqs $TICK * 0.1;	4368	BDB::max_poll_reqs $TICK * 0.1;
4113	$AnyEvent::BDB::WATCHER->priority (1);	4369	#$AnyEvent::BDB::WATCHER->priority (1);
4114		4370
4115	unless ($DB_ENV) {	4371	unless ($DB_ENV) {
4116	$DB_ENV = BDB::db_env_create;	4372	$DB_ENV = BDB::db_env_create;
4117	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4373	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4374	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4143	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4399	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4144	};	4400	};
4145	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4401	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4146	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4402	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4147	};	4403	};
		4404
		4405	info "database initialised";
4148	}	4406	}
4149		4407
4150	{	4408	{
4151	# configure IO::AIO	4409	# configure IO::AIO
4152		4410
		4411	info "initialising aio";
4153	IO::AIO::min_parallel 8;	4412	IO::AIO::min_parallel 8;
4154	IO::AIO::max_poll_time $TICK * 0.1;	4413	IO::AIO::max_poll_time $TICK * 0.1;
4155	undef $AnyEvent::AIO::WATCHER;	4414	undef $AnyEvent::AIO::WATCHER;
		4415	info "aio initialised";
4156	}	4416	}
4157		4417
4158	my $_log_backtrace;	4418	our $_log_backtrace;
		4419	our $_log_backtrace_last;
4159		4420
4160	sub _log_backtrace {	4421	sub _log_backtrace {
4161	my ($msg, @addr) = @_;	4422	my ($msg, @addr) = @_;
4162		4423
4163	$msg =~ s/\n//;	4424	$msg =~ s/\n$//;
4164		4425
		4426	if ($_log_backtrace_last eq $msg) {
		4427	LOG llevInfo, "[ABT] $msg\n";
		4428	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165	# limit the # of concurrent backtraces	4429	# limit the # of concurrent backtraces
4166	if ($_log_backtrace < 2) {	4430	} elsif ($_log_backtrace < 2) {
		4431	$_log_backtrace_last = $msg;
4167	++$_log_backtrace;	4432	++$_log_backtrace;
4168	my $perl_bt = Carp::longmess $msg;	4433	my $perl_bt = Carp::longmess $msg;
4169	async {	4434	async {
4170	$Coro::current->{desc} = "abt $msg";	4435	$Coro::current->{desc} = "abt $msg";
4171		4436
…		…
4191	LOG llevInfo, "[ABT] $_\n" for @bt;	4456	LOG llevInfo, "[ABT] $_\n" for @bt;
4192	--$_log_backtrace;	4457	--$_log_backtrace;
4193	};	4458	};
4194	} else {	4459	} else {
4195	LOG llevInfo, "[ABT] $msg\n";	4460	LOG llevInfo, "[ABT] $msg\n";
4196	LOG llevInfo, "[ABT] [suppressed]\n";	4461	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197	}	4462	}
4198	}	4463	}
4199		4464
4200	# load additional modules	4465	# load additional modules
4201	require "cf/$_.pm" for @EXTRA_MODULES;	4466	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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