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.502 by root, Sat Jan 23 20:24:50 2010 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 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
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
		62	use CBOR::XS ();
60	use IO::AIO ();	63	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	64	use Compress::LZF;
63	use Digest::MD5 ();	65	use Digest::MD5 ();
64		66
65	AnyEvent::detect;	67	AnyEvent::detect;
66		68
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE;	119	#our %RESOURCE; # unused
		120
		121	our $OUTPUT_RATE_MIN = 3000;
		122	our $OUTPUT_RATE_MAX = 1000000;
		123
		124	our $MAX_LINKS = 32; # how many chained exits to follow
		125	our $VERBOSE_IO = 1;
112		126
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	127	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	128	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	129	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	130	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	132	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	133	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	134	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	135	our $DB_ENV;
122		136
123	our @EXTRA_MODULES = qw(pod match mapscript);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		138
125	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		141
127	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
129	our $NOW;	145	our $NOW;
130		146
131	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		158
143	our @POST_INIT;	159	our @POST_INIT;
144		160
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
147		166
148	binmode STDOUT;	167	binmode STDOUT;
149	binmode STDERR;	168	binmode STDERR;
150		169
151	# read virtual server time, if available	170	# read virtual server time, if available
…		…
162		181
163	our $EMERGENCY_POSITION;	182	our $EMERGENCY_POSITION;
164		183
165	sub cf::map::normalise;	184	sub cf::map::normalise;
166		185
		186	sub in_main() {
		187	$Coro::current == $Coro::main
		188	}
		189
167	#############################################################################	190	#############################################################################
168		191
169	%REFLECT = ();	192	%REFLECT = ();
170	for (@REFLECT) {	193	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	194	my $reflect = JSON::XS::decode_json $_;
…		…
181		204
182	=over 4	205	=over 4
183		206
184	=item $cf::UPTIME	207	=item $cf::UPTIME
185		208
186	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
187		225
188	=item $cf::RUNTIME	226	=item $cf::RUNTIME
189		227
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	229	every server tick.
192		230
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		234
197	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
200	database environment.	238	database environment.
201		239
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	240	=item $cf::LOADAVG
211		241
212	The current CPU load on the server (alpha-smoothed), as a value between 0	242	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	243	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	252	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223	from wherever your confdir points to.	253	from wherever your confdir points to.
224		254
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		256
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	These are functions that inhibit the current coroutine one tick.
228	returns directly I<after> the tick processing (and consequently, can only wake one process	258	cf::wait_for_tick_begin only returns directly I<after> the tick
		259	processing (and consequently, can only wake one thread per tick), while
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	260	cf::wait_for_tick wakes up all waiters after tick processing.
		261
		262	Note that cf::wait_for_tick will immediately return when the server is not
		263	ticking, making it suitable for small pauses in threads that need to run
		264	when the server is paused. If that is not applicable (i.e. you I<really>
		265	want to wait, use C<$cf::WAIT_FOR_TICK>).
		266
		267	=item $cf::WAIT_FOR_TICK
		268
		269	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		270	variable contains a L<Coro::Signal> that is broadcats after every server
		271	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		272	next server tick.
		273
		274	=cut
		275
		276	sub wait_for_tick();
		277	sub wait_for_tick_begin();
230		278
231	=item @cf::INVOKE_RESULTS	279	=item @cf::INVOKE_RESULTS
232		280
233	This array contains the results of the last C<invoke ()> call. When	281	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	282	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		290
243	=back	291	=back
244		292
245	=cut	293	=cut
246		294
		295	sub error(@) { LOG llevError, join "", @_ }
		296	sub warn (@) { LOG llevWarn , join "", @_ }
		297	sub info (@) { LOG llevInfo , join "", @_ }
		298	sub debug(@) { LOG llevDebug, join "", @_ }
		299	sub trace(@) { LOG llevTrace, join "", @_ }
		300
247	$Coro::State::WARNHOOK = sub {	301	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	302	my $msg = join "", @_;
249		303
250	$msg .= "\n"	304	$msg .= "\n"
251	unless $msg =~ /\n$/;	305	unless $msg =~ /\n$/;
252		306
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	307	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		308
255	LOG llevError, $msg;	309	LOG llevWarn, $msg;
256	};	310	};
257		311
258	$Coro::State::DIEHOOK = sub {	312	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	313	return unless $^S eq 0; # "eq", not "=="
260		314
261	warn Carp::longmess $_[0];	315	error Carp::longmess $_[0];
262		316
263	if ($Coro::current == $Coro::main) {#d#	317	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	318	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	319	return;#d#
266	}#d#	320	}#d#
267		321
268	# kill coroutine otherwise	322	# kill coroutine otherwise
269	Coro::terminate	323	Coro::terminate
…		…
289	)) {	343	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	344	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	345	}
292		346
293	$EV::DIED = sub {	347	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	348	warn "error in event callback: $@";
295	};	349	};
		350
		351	#############################################################################
		352
		353	sub fork_call(&@);
		354	sub get_slot($;$$);
296		355
297	#############################################################################	356	#############################################################################
298		357
299	=head2 UTILITY FUNCTIONS	358	=head2 UTILITY FUNCTIONS
300		359
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	380	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	381	$d
323	} || "[unable to dump $_[0]: '$@']";	382	} || "[unable to dump $_[0]: '$@']";
324	}	383	}
325		384
		385	=item $scalar = cf::load_file $path
		386
		387	Loads the given file from path and returns its contents. Croaks on error
		388	and can block.
		389
		390	=cut
		391
		392	sub load_file($) {
		393	0 <= aio_load $_[0], my $data
		394	or Carp::croak "$_[0]: $!";
		395
		396	$data
		397	}
		398
		399	=item $success = cf::replace_file $path, $data, $sync
		400
		401	Atomically replaces the file at the given $path with new $data, and
		402	optionally $sync the data to disk before replacing the file.
		403
		404	=cut
		405
		406	sub replace_file($$;$) {
		407	my ($path, $data, $sync) = @_;
		408
		409	my $lock = cf::lock_acquire ("replace_file:$path");
		410
		411	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		412	or return;
		413
		414	$data = $data->() if ref $data;
		415
		416	length $data == aio_write $fh, 0, (length $data), $data, 0
		417	or return;
		418
		419	!$sync
		420	or !aio_fsync $fh
		421	or return;
		422
		423	aio_close $fh
		424	and return;
		425
		426	aio_rename "$path~", $path
		427	and return;
		428
		429	if ($sync) {
		430	$path =~ s%/[^/]*$%%;
		431	aio_pathsync $path;
		432	}
		433
		434	1
		435	}
		436
326	=item $ref = cf::decode_json $json	437	=item $ref = cf::decode_json $json
327		438
328	Converts a JSON string into the corresponding perl data structure.	439	Converts a JSON string into the corresponding perl data structure.
329		440
330	=item $json = cf::encode_json $ref	441	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	447	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		448
338	sub encode_json($) { $json_coder->encode ($_[0]) }	449	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	450	sub decode_json($) { $json_coder->decode ($_[0]) }
340		451
		452	=item $ref = cf::decode_storable $scalar
		453
		454	Same as Coro::Storable::thaw, so blocks.
		455
		456	=cut
		457
		458	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		459
		460	=item $ref = cf::decode_yaml $scalar
		461
		462	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		463
		464	=cut
		465
		466	sub decode_yaml($) {
		467	fork_call { YAML::XS::Load $_[0] } @_
		468	}
		469
		470	=item $scalar = cf::decode_cbor $scalar
		471
		472	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		473	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		474	alternative.
		475
		476	=cut
		477
		478	sub decode_cbor($) {
		479	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		480	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		481	CBOR::XS::decode_cbor $_[0]
		482	}
		483
		484	=item $scalar = cf::unlzf $scalar
		485
		486	Same as Compress::LZF::compress, but takes server ticks into account, so
		487	blocks.
		488
		489	=cut
		490
		491	sub unlzf($) {
		492	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		493	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		494	Compress::LZF::decompress $_[0]
		495	}
		496
341	=item cf::post_init { BLOCK }	497	=item cf::post_init { BLOCK }
342		498
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	499	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	500	but I<before> the server starts ticking again.
345		501
346	The cdoeblock will have a single boolean argument to indicate whether this	502	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	503	is a reload or not.
348		504
349	=cut	505	=cut
350		506
351	sub post_init(&) {	507	sub post_init(&) {
352	push @POST_INIT, shift;	508	push @POST_INIT, shift;
353	}	509	}
354		510
		511	sub _post_init {
		512	trace "running post_init jobs";
		513
		514	# run them in parallel...
		515
		516	my @join;
		517
		518	while () {
		519	push @join, map &Coro::async ($_, 0), @POST_INIT;
		520	@POST_INIT = ();
		521
		522	@join or last;
		523
		524	(pop @join)->join;
		525	}
		526	}
		527
355	=item cf::lock_wait $string	528	=item cf::lock_wait $string
356		529
357	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
358		531
359	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
360		533
361	Wait until the given lock is available and then acquires it and returns	534	Wait until the given lock is available and then acquires it and returns
362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	535	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
396	}	569	}
397		570
398	=item cf::periodic $interval, $cb	571	=item cf::periodic $interval, $cb
399		572
400	Like EV::periodic, but randomly selects a starting point so that the actions	573	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	574	get spread over time.
402		575
403	=cut	576	=cut
404		577
405	sub periodic($$) {	578	sub periodic($$) {
406	my ($interval, $cb) = @_;	579	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	583	EV::periodic $start, $interval, 0, $cb
411	}	584	}
412		585
413	=item cf::get_slot $time[, $priority[, $name]]	586	=item cf::get_slot $time[, $priority[, $name]]
414		587
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	588	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	This call blocks and returns only when you have at least C<$time> seconds	589	(default: 0): This call blocks and returns only when you have at least
417	of cpu time till the next tick. The slot is only valid till the next cede.	590	C<$time> seconds of cpu time till the next tick. The slot is only valid
		591	till the next cede.
		592
		593	Background jobs should use a priority less than zero, interactive jobs
		594	should use 100 or more.
418		595
419	The optional C<$name> can be used to identify the job to run. It might be	596	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	597	used for statistical purposes and should identify the same time-class.
421		598
422	Useful for short background jobs.	599	Useful for short background jobs.
…		…
434	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
435	my $busy;	612	my $busy;
436		613
437	while () {	614	while () {
438	next_job:	615	next_job:
		616
		617	Coro::cede;
439		618
440	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
441		620
442	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
443	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
444	$busy = 0;	623	$busy = 0;
445	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
446	$job->[2]->send;	625	$job->[2]->send;
447	Coro::cede;
448	goto next_job;	626	goto next_job;
449	} else {	627	} else {
450	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
451	}	629	}
452	}	630	}
453		631
454	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
455	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
456	push @cf::WAIT_FOR_TICK, $signal;
457	$signal->wait;
458	} else {	634	} else {
459	$busy = 0;	635	$busy = 0;
460	Coro::schedule;	636	Coro::schedule;
461	}	637	}
462	}	638	}
…		…
488	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
489		665
490	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
491		667
492	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
493	is always able to handle events or runnable, as Deliantra is only	669	is always able to handle events or is runnable, as Deliantra is only
494	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	670	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
495	acceptable.	671	acceptable.
496		672
497	If it must be done, put the blocking parts into C<sync_job>. This will run	673	If it must be done, put the blocking parts into C<sync_job>. This will run
498	the given BLOCK in another coroutine while waiting for the result. The	674	the given BLOCK in another coroutine while waiting for the result. The
…		…
502	=cut	678	=cut
503		679
504	sub sync_job(&) {	680	sub sync_job(&) {
505	my ($job) = @_;	681	my ($job) = @_;
506		682
507	if ($Coro::current == $Coro::main) {	683	if (in_main) {
508	my $time = EV::time;	684	my $time = AE::time;
509		685
510	# this is the main coro, too bad, we have to block	686	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	687	# till the operation succeeds, freezing the server :/
512		688
513	LOG llevError, Carp::longmess "sync job";#d#	689	#LOG llevError, Carp::longmess "sync job";#d#
514		690
515	my $freeze_guard = freeze_mainloop;	691	my $freeze_guard = freeze_mainloop;
516		692
517	my $busy = 1;	693	my $busy = 1;
518	my @res;	694	my @res;
519		695
520	(async {	696	(async {
521	$Coro::current->desc ("sync job coro");	697	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	698	@res = eval { $job->() };
523	warn $@ if $@;	699	error $@ if $@;
524	undef $busy;	700	undef $busy;
525	})->prio (Coro::PRIO_MAX);	701	})->prio (Coro::PRIO_MAX);
526		702
527	while ($busy) {	703	while ($busy) {
528	if (Coro::nready) {	704	if (Coro::nready) {
529	Coro::cede_notself;	705	Coro::cede_notself;
530	} else {	706	} else {
531	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
532	}	708	}
533	}	709	}
534		710
535	my $time = EV::time - $time;	711	my $time = AE::time - $time;
536		712
537	$TICK_START += $time; # do not account sync jobs to server load	713	$TICK_START += $time; # do not account sync jobs to server load
538		714
539	wantarray ? @res : $res[0]	715	wantarray ? @res : $res[0]
540	} else {	716	} else {
…		…
562	$EXT_CORO{$coro+0} = $coro;	738	$EXT_CORO{$coro+0} = $coro;
563		739
564	$coro	740	$coro
565	}	741	}
566		742
567	=item fork_call { }, $args	743	=item fork_call { }, @args
568		744
569	Executes the given code block with the given arguments in a seperate	745	Executes the given code block with the given arguments in a seperate
570	process, returning the results. Everything must be serialisable with	746	process, returning the results. Everything must be serialisable with
571	Coro::Storable. May, of course, block. Note that the executed sub may	747	Coro::Storable. May, of course, block. Note that the executed sub may
572	never block itself or use any form of event handling.	748	never block itself or use any form of event handling.
573		749
574	=cut	750	=cut
575		751
		752	sub post_fork {
		753	reset_signals;
		754	}
		755
576	sub fork_call(&@) {	756	sub fork_call(&@) {
577	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
578		758
579	# we seemingly have to make a local copy of the whole thing,
580	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)
582
583	my @res = Coro::Util::fork_eval {	759	my @res = Coro::Util::fork_eval {
584	reset_signals;	760	cf::post_fork;
585	&$cb	761	&$cb
586	}, @args;	762	} @args;
587		763
588	wantarray ? @res : $res[-1]	764	wantarray ? @res : $res[-1]
		765	}
		766
		767	sub objinfo {
		768	(
		769	"counter value" => cf::object::object_count,
		770	"objects created" => cf::object::create_count,
		771	"objects destroyed" => cf::object::destroy_count,
		772	"freelist size" => cf::object::free_count,
		773	"allocated objects" => cf::object::objects_size,
		774	"active objects" => cf::object::actives_size,
		775	)
589	}	776	}
590		777
591	=item $coin = coin_from_name $name	778	=item $coin = coin_from_name $name
592		779
593	=cut	780	=cut
…		…
630	within each server.	817	within each server.
631		818
632	=cut	819	=cut
633		820
634	sub db_table($) {	821	sub db_table($) {
		822	cf::error "db_get called from main context"
		823	if $Coro::current == $Coro::main;
		824
635	my ($name) = @_;	825	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	826	my $db = BDB::db_create $DB_ENV;
637		827
638	eval {	828	eval {
639	$db->set_flags (BDB::CHKSUM);	829	$db->set_flags (BDB::CHKSUM);
…		…
649	}	839	}
650		840
651	our $DB;	841	our $DB;
652		842
653	sub db_init {	843	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	844	$DB ||= db_table "db";
656	};
657	}	845	}
658		846
659	sub db_get($$) {	847	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	848	my $key = "$_[0]/$_[1]";
661		849
662	cf::sync_job {	850	cf::error "db_get called from main context"
		851	if $Coro::current == $Coro::main;
		852
663	BDB::db_get $DB, undef, $key, my $data;	853	BDB::db_get $DB, undef, $key, my $data;
664		854
665	$! ? ()	855	$! ? ()
666	: $data	856	: $data
667	}
668	}	857	}
669		858
670	sub db_put($$$) {	859	sub db_put($$$) {
671	BDB::dbreq_pri 4;	860	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	861	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		889
701	my @data;	890	my @data;
702	my $md5;	891	my $md5;
703		892
704	for (0 .. $#$src) {	893	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	894	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	895	}
708		896
709	# if processing is expensive, check	897	# if processing is expensive, check
710	# checksum first	898	# checksum first
711	if (1) {	899	if (1) {
…		…
724		912
725	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
726	}	914	}
727	}	915	}
728		916
729	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
730	my $data = $process->(\@data);	918	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
732		920
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		922
735	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	925	db_put cache => "$id/meta", $meta;
738		926
…		…
748		936
749	=cut	937	=cut
750		938
751	sub datalog($@) {	939	sub datalog($@) {
752	my ($type, %kv) = @_;	940	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	941	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	942	}
755		943
756	=back	944	=back
757		945
758	=cut	946	=cut
…		…
953		1141
954	} elsif (exists $cb_id{$type}) {	1142	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1143	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1144
957	} elsif (ref $type) {	1145	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1146	error "attaching objects not supported, ignoring.\n";
959		1147
960	} else {	1148	} else {
961	shift @arg;	1149	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1150	error "attach argument '$type' not supported, ignoring.\n";
963	}	1151	}
964	}	1152	}
965	}	1153	}
966		1154
967	sub _object_attach {	1155	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1165	_attach $registry, $klass, @attach;
978	}	1166	}
979		1167
980	$obj->{$name} = \%arg;	1168	$obj->{$name} = \%arg;
981	} else {	1169	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1170	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1171	}
984		1172
985	$obj->{_attachment}{$name} = undef;	1173	$obj->{_attachment}{$name} = undef;
986	}	1174	}
987		1175
…		…
1046		1234
1047	for (@$callbacks) {	1235	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1236	eval { &{$_->[1]} };
1049		1237
1050	if ($@) {	1238	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1239	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1240	override;
1054	}	1241	}
1055		1242
1056	return 1 if $override;	1243	return 1 if $override;
1057	}	1244	}
…		…
1136	for (@$attach) {	1323	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1324	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1325	_attach $registry, $klass, @attach;
1139	}	1326	}
1140	} else {	1327	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1328	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1329	}
1143	}	1330	}
1144	}	1331	}
1145		1332
1146	cf::attachable->attach (	1333	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1360	my ($filename, $rdata, $objs) = @_;
1174		1361
1175	sync_job {	1362	sync_job {
1176	if (length $$rdata) {	1363	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1364	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1365	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1366	$decname, length $$rdata, scalar @$objs
		1367	if $VERBOSE_IO;
1180		1368
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1369	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1370	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1371	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1372	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1394	aio_rename "$filename~", $filename;
1207		1395
1208	$filename =~ s%/[^/]+$%%;	1396	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1397	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1398	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1399	error "unable to save objects: $filename~: $!\n";
1212	}	1400	}
1213	} else {	1401	} else {
1214	aio_unlink $filename;	1402	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1403	aio_unlink "$filename.pst";
1216	}	1404	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1428	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1429	$av = $st->{objs};
1242	}	1430	}
1243		1431
1244	utf8::decode (my $decname = $filename);	1432	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1433	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1434	$decname, length $data, scalar @{$av || []}
		1435	if $VERBOSE_IO;
1247		1436
1248	($data, $av)	1437	($data, $av)
1249	}	1438	}
1250		1439
1251	=head2 COMMAND CALLBACKS	1440	=head2 COMMAND CALLBACKS
…		…
1255	=cut	1444	=cut
1256		1445
1257	#############################################################################	1446	#############################################################################
1258	# command handling &c	1447	# command handling &c
1259		1448
1260	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1261		1450
1262	Register a callback for execution when the client sends the user command	1451	Register a callback for execution when the client sends the user command
1263	$name.	1452	$name.
1264		1453
1265	=cut	1454	=cut
…		…
1271	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1272		1461
1273	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1274	}	1463	}
1275		1464
1276	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1277		1466
1278	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1279	extcmd packet. Ext commands will be processed in the order they are	1468	extcmd packet. Ext commands will be processed in the order they are
1280	received by the server, like other user commands. The first argument is	1469	received by the server, like other user commands. The first argument is
1281	the logged-in player. Ext commands can only be processed after a player	1470	the logged-in player. Ext commands can only be processed after a player
1282	has logged in successfully.	1471	has logged in successfully.
1283		1472
1284	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1285	called.
1286		1474
		1475	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
1287	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1288		1481
1289	Register a callback for execution when the client sends an (asynchronous)	1482	Register a callback for execution when the client sends an (asynchronous)
1290	exticmd packet. Exti commands are processed by the server as soon as they	1483	exticmd packet. Exti commands are processed by the server as soon as they
1291	are received, i.e. out of order w.r.t. other commands. The first argument	1484	are received, i.e. out of order w.r.t. other commands. The first argument
1292	is a client socket. Exti commands can be received anytime, even before	1485	is a client socket. Exti commands can be received anytime, even before
1293	log-in.	1486	log-in.
1294		1487
1295	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1296	called.
1297		1489
1298	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299		1491
		1492	Same as C<cf::register_extcmd>, but instead of returning values, the
		1493	callback needs to clal the C<$reply> function.
		1494
		1495	=cut
		1496
1300	sub register_extcmd {	1497	sub register_extcmd($$) {
1301	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1302		1499
1303	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1304	}	1501	}
1305		1502
1306	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1307	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1308		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1309	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
1310	}	1513	}
1311		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
		1519	}
		1520
1312	use File::Glob ();	1521	use File::Glob ();
1313		1522
1314	cf::player->attach (	1523	cf::player->attach (
1315	on_command => sub {	1524	on_unknown_command => sub {
1316	my ($pl, $name, $params) = @_;	1525	my ($pl, $name, $params) = @_;
1317		1526
1318	my $cb = $COMMAND{$name}	1527	my $cb = $COMMAND{$name}
1319	or return;	1528	or return;
1320		1529
…		…
1328	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1329		1538
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1540
1332	if (ref $msg) {	1541	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1542	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1543
1338	my @reply;
1339
1340	if (my $cb = $EXTCMD{$type}) {	1544	if (my $cb = $EXTACMD{$type}) {
		1545	$cb->(
		1546	$pl,
		1547	sub {
		1548	$pl->ext_msg ("reply-$reply", @_)
		1549	if $reply;
		1550	},
		1551	@payload
		1552	);
		1553	} else {
		1554	my @reply;
		1555
		1556	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1342	}	1562	}
1343		1563
1344	$pl->ext_reply ($reply, @reply)
1345	if $reply;
1346
1347	} else {	1564	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1566	}
1350		1567
1351	cf::override;	1568	cf::override;
1352	},	1569	},
1353	);	1570	);
…		…
1363	};	1580	};
1364		1581
1365	$grp	1582	$grp
1366	}	1583	}
1367		1584
		1585	sub _ext_cfg_reg($$$$) {
		1586	my ($rvar, $varname, $cfgname, $default) = @_;
		1587
		1588	$cfgname = lc $varname
		1589	unless length $cfgname;
		1590
		1591	$EXT_CFG{$cfgname} = [$rvar, $default];
		1592
		1593	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1594	}
		1595
1368	sub load_extensions {	1596	sub load_extensions {
		1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
		1600
1369	cf::sync_job {	1601	cf::sync_job {
1370	my %todo;	1602	my %todo;
1371		1603
1372	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1605	next unless -r $path;
…		…
1391		1623
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1624	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1625	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1626
1395	$ext{source} =	1627	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1628	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1629	. "#line 1 \"$path\"\n{\n"
1398	. $source	1630	. $source
1399	. "\n};\n1";	1631	. "\n};\n1";
1400		1632
1401	$todo{$base} = \%ext;	1633	$todo{$base} = \%ext;
1402	}	1634	}
1403		1635
		1636	my $pass = 0;
1404	my %done;	1637	my %done;
1405	while (%todo) {	1638	while (%todo) {
1406	my $progress;	1639	my $progress;
1407		1640
		1641	++$pass;
		1642
		1643	ext:
1408	while (my ($k, $v) = each %todo) {	1644	while (my ($k, $v) = each %todo) {
1409	for (split /,\s*/, $v->{meta}{depends}) {	1645	for (split /,\s*/, $v->{meta}{depends}) {
1410	goto skip	1646	next ext
1411	unless exists $done{$_};	1647	unless exists $done{$_};
1412	}	1648	}
1413		1649
1414	warn "... loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1415		1651
1416	unless (eval $v->{source}) {	1652	my $source = $v->{source};
		1653
		1654	# support "CONF varname :confname = default" pseudo-statements
		1655	$source =~ s{
		1656	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1657	}{
		1658	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1659	}gmxe;
		1660
		1661	my $active = eval $source;
		1662
		1663	if (length $@) {
1417	my $msg = $@ ? "$v->{path}: $@\n"	1664	error "$v->{path}: $@\n";
1418	: "$v->{base}: extension inactive.\n";
1419		1665
1420	if (exists $v->{meta}{mandatory}) {
1421	warn $msg;
1422	cf::cleanup "mandatory extension failed to load, exiting.";	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1423	}	1667	if exists $v->{meta}{mandatory};
1424		1668
1425	warn $msg;	1669	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1670	delete $todo{$k};
		1671	} else {
		1672	$done{$k} = delete $todo{$k};
		1673	push @EXTS, $v->{pkg};
		1674	$progress = 1;
		1675
		1676	info "$v->{base}: extension inactive.\n"
		1677	unless $active;
1426	}	1678	}
1427
1428	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};
1430	$progress = 1;
1431	}	1679	}
1432		1680
1433	skip:	1681	unless ($progress) {
1434	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1682	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1435	unless $progress;	1683
		1684	while (my ($k, $v) = each %todo) {
		1685	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1686	if exists $v->{meta}{mandatory};
		1687	}
		1688
		1689	last;
		1690	}
1436	}	1691	}
1437	};	1692	};
1438	}	1693	}
1439		1694
1440	#############################################################################	1695	#############################################################################
…		…
1524	$cf::PLAYER{$login} = $pl	1779	$cf::PLAYER{$login} = $pl
1525	}	1780	}
1526	}	1781	}
1527	}	1782	}
1528		1783
		1784	cf::player->attach (
		1785	on_load => sub {
		1786	my ($pl, $path) = @_;
		1787
		1788	# restore slots saved in save, below
		1789	my $slots = delete $pl->{_slots};
		1790
		1791	$pl->ob->current_weapon ($slots->[0]);
		1792	$pl->combat_ob ($slots->[1]);
		1793	$pl->ranged_ob ($slots->[2]);
		1794	},
		1795	);
		1796
1529	sub save($) {	1797	sub save($) {
1530	my ($pl) = @_;	1798	my ($pl) = @_;
1531		1799
1532	return if $pl->{deny_save};	1800	return if $pl->{deny_save};
1533		1801
…		…
1538		1806
1539	aio_mkdir playerdir $pl, 0770;	1807	aio_mkdir playerdir $pl, 0770;
1540	$pl->{last_save} = $cf::RUNTIME;	1808	$pl->{last_save} = $cf::RUNTIME;
1541		1809
1542	cf::get_slot 0.01;	1810	cf::get_slot 0.01;
		1811
		1812	# save slots, to be restored later
		1813	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1543		1814
1544	$pl->save_pl ($path);	1815	$pl->save_pl ($path);
1545	cf::cede_to_tick;	1816	cf::cede_to_tick;
1546	}	1817	}
1547		1818
…		…
1581	my $name = $pl->ob->name;	1852	my $name = $pl->ob->name;
1582		1853
1583	$pl->{deny_save} = 1;	1854	$pl->{deny_save} = 1;
1584	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1855	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1585		1856
1586	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1857	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1587	$pl->deactivate;	1858	$pl->deactivate;
		1859
1588	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1860	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589	$pl->ob->check_score;
1590	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1861	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1862	ext::highscore::check ($pl->ob);
		1863
1591	$pl->ns->destroy if $pl->ns;	1864	$pl->ns->destroy if $pl->ns;
1592		1865
1593	my $path = playerdir $pl;	1866	my $path = playerdir $pl;
1594	my $temp = "$path~$cf::RUNTIME~deleting~";	1867	my $temp = "$path~$cf::RUNTIME~deleting~";
1595	aio_rename $path, $temp;	1868	aio_rename $path, $temp;
…		…
1649	\@logins	1922	\@logins
1650	}	1923	}
1651		1924
1652	=item $player->maps	1925	=item $player->maps
1653		1926
		1927	=item cf::player::maps $login
		1928
1654	Returns an arrayref of map paths that are private for this	1929	Returns an arrayref of map paths that are private for this
1655	player. May block.	1930	player. May block.
1656		1931
1657	=cut	1932	=cut
1658		1933
…		…
1679		1954
1680	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1681		1956
1682	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1683		1958
1684	=item $player->ext_reply ($msgid, @msg)
1685
1686	Sends an ext reply to the player.
1687
1688	=cut
1689
1690	sub ext_reply($$@) {
1691	my ($self, $id, @msg) = @_;
1692
1693	$self->ns->ext_reply ($id, @msg)
1694	}
1695
1696	=item $player->ext_msg ($type, @msg)	1959	=item $player->ext_msg ($type, @msg)
1697		1960
1698	Sends an ext event to the client.	1961	Sends an ext event to the client.
1699		1962
1700	=cut	1963	=cut
…		…
1719		1982
1720	=cut	1983	=cut
1721		1984
1722	sub find_by_path($) {	1985	sub find_by_path($) {
1723	my ($path) = @_;	1986	my ($path) = @_;
		1987
		1988	$path =~ s/^~[^\/]*//; # skip ~login
1724		1989
1725	my ($match, $specificity);	1990	my ($match, $specificity);
1726		1991
1727	for my $region (list) {	1992	for my $region (list) {
1728	if ($region->{match} && $path =~ $region->{match}) {	1993	if ($region->{match} && $path =~ $region->{match}) {
…		…
1757	sub generate_random_map {	2022	sub generate_random_map {
1758	my ($self, $rmp) = @_;	2023	my ($self, $rmp) = @_;
1759		2024
1760	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2025	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1761		2026
1762	# mit "rum" bekleckern, nicht
1763	$self->_create_random_map (	2027	$self->_create_random_map ($rmp);
1764	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1765	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1766	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1767	$rmp->{exit_on_final_map},
1768	$rmp->{xsize}, $rmp->{ysize},
1769	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1770	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1771	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1772	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1773	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1774	(cf::region::find $rmp->{region}), $rmp->{custom}
1775	)
1776	}	2028	}
1777		2029
1778	=item cf::map->register ($regex, $prio)	2030	=item cf::map->register ($regex, $prio)
1779		2031
1780	Register a handler for the map path matching the given regex at the	2032	Register a handler for the map path matching the given regex at the
…		…
1785		2037
1786	sub register {	2038	sub register {
1787	my (undef, $regex, $prio) = @_;	2039	my (undef, $regex, $prio) = @_;
1788	my $pkg = caller;	2040	my $pkg = caller;
1789		2041
1790	no strict;
1791	push @{"$pkg\::ISA"}, __PACKAGE__;	2042	push @{"$pkg\::ISA"}, __PACKAGE__;
1792		2043
1793	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2044	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1794	}	2045	}
1795		2046
1796	# also paths starting with '/'	2047	# also paths starting with '/'
1797	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2048	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1798		2049
1799	sub thawer_merge {	2050	sub thawer_merge {
1800	my ($self, $merge) = @_;	2051	my ($self, $merge) = @_;
1801		2052
1802	# we have to keep some variables in memory intact	2053	# we have to keep some variables in memory intact
…		…
1807	}	2058	}
1808		2059
1809	sub normalise {	2060	sub normalise {
1810	my ($path, $base) = @_;	2061	my ($path, $base) = @_;
1811		2062
1812	$path = "$path"; # make sure its a string	2063	$path = "$path"; # make sure it's a string
1813		2064
1814	$path =~ s/\.map$//;	2065	$path =~ s/\.map$//;
1815		2066
1816	# map plan:	2067	# map plan:
1817	#	2068	#
…		…
1832	$base =~ s{[^/]+/?$}{};	2083	$base =~ s{[^/]+/?$}{};
1833	$path = "$base/$path";	2084	$path = "$base/$path";
1834	}	2085	}
1835		2086
1836	for ($path) {	2087	for ($path) {
1837	redo if s{//}{/};
1838	redo if s{/\.?/}{/};	2088	redo if s{/\.?/}{/};
1839	redo if s{/[^/]+/\.\./}{/};	2089	redo if s{/[^/]+/\.\./}{/};
1840	}	2090	}
1841		2091
1842	$path	2092	$path
…		…
1856	$self->init; # pass $1 etc.	2106	$self->init; # pass $1 etc.
1857	return $self;	2107	return $self;
1858	}	2108	}
1859	}	2109	}
1860		2110
1861	Carp::cluck "unable to resolve path '$path' (base '$base').";	2111	Carp::cluck "unable to resolve path '$path' (base '$base')";
1862	()	2112	()
1863	}	2113	}
1864		2114
		2115	# may re-bless or do other evil things
1865	sub init {	2116	sub init {
1866	my ($self) = @_;	2117	my ($self) = @_;
1867		2118
1868	$self	2119	$self
1869	}	2120	}
…		…
1934	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
1935		2186
1936	1	2187	1
1937	}	2188	}
1938		2189
		2190	# used to laod the header of an original map
1939	sub load_header_orig {	2191	sub load_header_orig {
1940	my ($self) = @_;	2192	my ($self) = @_;
1941		2193
1942	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
1943	}	2195	}
1944		2196
		2197	# used to laod the header of an instantiated map
1945	sub load_header_temp {	2198	sub load_header_temp {
1946	my ($self) = @_;	2199	my ($self) = @_;
1947		2200
1948	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
1949	}	2202	}
1950		2203
		2204	# called after loading the header from an instantiated map
1951	sub prepare_temp {	2205	sub prepare_temp {
1952	my ($self) = @_;	2206	my ($self) = @_;
1953		2207
1954	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
1955	|| $cf::RUNTIME); #d#	2209	|| $cf::RUNTIME); #d#
1956	# safety	2210	# safety
1957	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
1958	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
1959	}	2213	}
1960		2214
		2215	# called after loading the header from an original map
1961	sub prepare_orig {	2216	sub prepare_orig {
1962	my ($self) = @_;	2217	my ($self) = @_;
1963		2218
1964	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
1965	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1989		2244
1990	sub find;	2245	sub find;
1991	sub find {	2246	sub find {
1992	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
1993		2248
		2249	cf::cede_to_tick;
		2250
1994	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
1995		2252
1996	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
1998		2255
1999	$cf::MAP{$path} || do {	2256	$cf::MAP{$path} || do {
…		…
2030		2287
2031	{	2288	{
2032	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2033		2290
2034	return unless $self->valid;	2291	return unless $self->valid;
2035	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2036
2037	$self->in_memory (cf::MAP_LOADING);
2038		2293
2039	$self->alloc;	2294	$self->alloc;
2040		2295
2041	$self->pre_load;	2296	$self->pre_load;
2042	cf::cede_to_tick;	2297	cf::cede_to_tick;
2043		2298
		2299	if (exists $self->{load_path}) {
2044	my $f = new_from_file cf::object::thawer $self->{load_path};	2300	my $f = new_from_file cf::object::thawer $self->{load_path};
2045	$f->skip_block;	2301	$f->skip_block;
2046	$self->_load_objects ($f)	2302	$self->_load_objects ($f)
2047	or return;	2303	or return;
2048		2304
2049	$self->post_load_original	2305	$self->post_load_original
2050	if delete $self->{load_original};	2306	if delete $self->{load_original};
2051		2307
2052	if (my $uniq = $self->uniq_path) {	2308	if (my $uniq = $self->uniq_path) {
2053	utf8::encode $uniq;	2309	utf8::encode $uniq;
2054	unless (aio_stat $uniq) {	2310	unless (aio_stat $uniq) {
2055	if (my $f = new_from_file cf::object::thawer $uniq) {	2311	if (my $f = new_from_file cf::object::thawer $uniq) {
2056	$self->clear_unique_items;	2312	$self->clear_unique_items;
2057	$self->_load_objects ($f);	2313	$self->_load_objects ($f);
2058	$f->resolve_delayed_derefs;	2314	$f->resolve_delayed_derefs;
		2315	}
2059	}	2316	}
2060	}	2317	}
2061	}
2062		2318
2063	$f->resolve_delayed_derefs;	2319	$f->resolve_delayed_derefs;
		2320	} else {
		2321	$self->post_load_original
		2322	if delete $self->{load_original};
		2323	}
		2324
		2325	$self->state (cf::MAP_INACTIVE);
2064		2326
2065	cf::cede_to_tick;	2327	cf::cede_to_tick;
2066	# now do the right thing for maps	2328	# now do the right thing for maps
2067	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2068	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2072	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2073	$self->decay_objects;	2335	$self->decay_objects;
2074	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2075	$self->update_buttons;	2337	$self->update_buttons;
2076	cf::cede_to_tick;	2338	cf::cede_to_tick;
2077	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2078	}	2340	}
2079		2341
2080	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2081	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2082
2083	$self->in_memory (cf::MAP_ACTIVE);
2084	}	2344	}
2085		2345
2086	$self->post_load;	2346	$self->post_load;
2087	}
2088		2347
		2348	1
		2349	}
		2350
		2351	# customize the map for a given player, i.e.
		2352	# return the _real_ map. used by e.g. per-player
		2353	# maps to change the path to ~playername/mappath
2089	sub customise_for {	2354	sub customise_for {
2090	my ($self, $ob) = @_;	2355	my ($self, $ob) = @_;
2091		2356
2092	return find "~" . $ob->name . "/" . $self->{path}	2357	return find "~" . $ob->name . "/" . $self->{path}
2093	if $self->per_player;	2358	if $self->per_player;
…		…
2096	# if $self->per_party;	2361	# if $self->per_party;
2097		2362
2098	$self	2363	$self
2099	}	2364	}
2100		2365
2101	# find and load all maps in the 3x3 area around a map
2102	sub load_neighbours {
2103	my ($map) = @_;
2104
2105	my @neigh; # diagonal neighbours
2106
2107	for (0 .. 3) {
2108	my $neigh = $map->tile_path ($_)
2109	or next;
2110	$neigh = find $neigh, $map
2111	or next;
2112	$neigh->load;
2113
2114	push @neigh,
2115	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2116	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2117	}
2118
2119	for (grep defined $_->[0], @neigh) {
2120	my ($path, $origin) = @$_;
2121	my $neigh = find $path, $origin
2122	or next;
2123	$neigh->load;
2124	}
2125	}
2126
2127	sub find_sync {	2366	sub find_sync {
2128	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2129		2368
2130	cf::sync_job { find $path, $origin }	2369	# it's a bug to call this from the main context
		2370	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2371	if $Coro::current == $Coro::main;
		2372
		2373	find $path, $origin
2131	}	2374	}
2132		2375
2133	sub do_load_sync {	2376	sub do_load_sync {
2134	my ($map) = @_;	2377	my ($map) = @_;
2135		2378
		2379	# it's a bug to call this from the main context
2136	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2137	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2138		2382
2139	cf::sync_job { $map->load };	2383	$map->load;
2140	}	2384	}
2141		2385
2142	our %MAP_PREFETCH;	2386	our %MAP_PREFETCH;
2143	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2144		2388
2145	sub find_async {	2389	sub find_async {
2146	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2147		2391
2148	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2149		2393
2150	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2151	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load || $map->linkable;
2152	}	2396	}
2153		2397
2154	$MAP_PREFETCH{$path} |= $load;	2398	$MAP_PREFETCH{$path} |= $load;
2155		2399
2156	$MAP_PREFETCHER ||= cf::async {	2400	$MAP_PREFETCHER ||= cf::async {
2157	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2158		2402
2159	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2160	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2161	if (my $map = find $k) {	2405	if (my $map = find $k) {
2162	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2163	}	2407	}
2164		2408
2165	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2166	}	2410	}
2167	}	2411	}
…		…
2170	$MAP_PREFETCHER->prio (6);	2414	$MAP_PREFETCHER->prio (6);
2171		2415
2172	()	2416	()
2173	}	2417	}
2174		2418
		2419	# common code, used by both ->save and ->swapout
2175	sub save {	2420	sub _save {
2176	my ($self) = @_;	2421	my ($self) = @_;
2177
2178	my $lock = cf::lock_acquire "map_data:$self->{path}";
2179		2422
2180	$self->{last_save} = $cf::RUNTIME;	2423	$self->{last_save} = $cf::RUNTIME;
2181		2424
2182	return unless $self->dirty;	2425	return unless $self->dirty;
2183		2426
…		…
2203	} else {	2446	} else {
2204	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2447	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2205	}	2448	}
2206	}	2449	}
2207		2450
		2451	sub save {
		2452	my ($self) = @_;
		2453
		2454	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2455
		2456	$self->_save;
		2457	}
		2458
2208	sub swap_out {	2459	sub swap_out {
2209	my ($self) = @_;	2460	my ($self) = @_;
2210		2461
2211	# save first because save cedes
2212	$self->save;
2213
2214	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2215		2463
		2464	return if !$self->linkable;
		2465	return if $self->{deny_save};
2216	return if $self->players;	2466	return if $self->players;
2217	return if $self->in_memory != cf::MAP_ACTIVE;	2467
		2468	# first deactivate the map and "unlink" it from the core
		2469	$self->deactivate;
		2470	$_->clear_links_to ($self) for values %cf::MAP;
		2471	$self->state (cf::MAP_SWAPPED);
		2472
		2473	# then atomically save
		2474	$self->_save;
		2475
		2476	# then free the map
		2477	$self->clear;
		2478	}
		2479
		2480	sub reset_at {
		2481	my ($self) = @_;
		2482
		2483	# TODO: safety, remove and allow resettable per-player maps
2218	return if $self->{deny_save};	2484	return 1e99 if $self->{deny_reset};
2219		2485
		2486	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2487	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2488
		2489	$time + $to
		2490	}
		2491
		2492	sub should_reset {
		2493	my ($self) = @_;
		2494
		2495	$self->reset_at <= $cf::RUNTIME
		2496	}
		2497
		2498	sub reset {
		2499	my ($self) = @_;
		2500
		2501	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2502
		2503	return if $self->players;
		2504
		2505	cf::trace "resetting map ", $self->path, "\n";
		2506
2220	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
		2508
		2509	# need to save uniques path
		2510	unless ($self->{deny_save}) {
		2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2512
		2513	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2514	if $uniq;
		2515	}
		2516
		2517	delete $cf::MAP{$self->path};
2221		2518
2222	$self->deactivate;	2519	$self->deactivate;
2223	$_->clear_links_to ($self) for values %cf::MAP;	2520	$_->clear_links_to ($self) for values %cf::MAP;
2224	$self->clear;	2521	$self->clear;
2225	}
2226
2227	sub reset_at {
2228	my ($self) = @_;
2229
2230	# TODO: safety, remove and allow resettable per-player maps
2231	return 1e99 if $self->{deny_reset};
2232
2233	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2234	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2235
2236	$time + $to
2237	}
2238
2239	sub should_reset {
2240	my ($self) = @_;
2241
2242	$self->reset_at <= $cf::RUNTIME
2243	}
2244
2245	sub reset {
2246	my ($self) = @_;
2247
2248	my $lock = cf::lock_acquire "map_data:$self->{path}";
2249
2250	return if $self->players;
2251
2252	warn "resetting map ", $self->path, "\n";
2253
2254	$self->in_memory (cf::MAP_SWAPPED);
2255
2256	# need to save uniques path
2257	unless ($self->{deny_save}) {
2258	my $uniq = $self->uniq_path; utf8::encode $uniq;
2259
2260	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2261	if $uniq;
2262	}
2263
2264	delete $cf::MAP{$self->path};
2265
2266	$self->deactivate;
2267	$_->clear_links_to ($self) for values %cf::MAP;
2268	$self->clear;
2269		2522
2270	$self->unlink_save;	2523	$self->unlink_save;
2271	$self->destroy;	2524	$self->destroy;
2272	}	2525	}
2273		2526
…		…
2281		2534
2282	delete $cf::MAP{$self->path};	2535	delete $cf::MAP{$self->path};
2283		2536
2284	$self->unlink_save;	2537	$self->unlink_save;
2285		2538
2286	bless $self, "cf::map";	2539	bless $self, "cf::map::wrap";
2287	delete $self->{deny_reset};	2540	delete $self->{deny_reset};
2288	$self->{deny_save} = 1;	2541	$self->{deny_save} = 1;
2289	$self->reset_timeout (1);	2542	$self->reset_timeout (1);
2290	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2543	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2291		2544
…		…
2412		2665
2413	Creates and returns a persistent reference to an object that can be stored as a string.	2666	Creates and returns a persistent reference to an object that can be stored as a string.
2414		2667
2415	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2416		2669
2417	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2670	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2418	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2419		2672
2420	=cut	2673	=cut
2421		2674
2422	sub deref {	2675	sub deref {
…		…
2504	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2505		2758
2506	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2507	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2508		2761
		2762	This is implemented by checking a config setting of C<may_access> where
		2763	C<access> is replaced by the access string. The following alternatives are
		2764	possible (and are tested in order):
		2765
		2766	=over 4
		2767
		2768	=item * Player is DM
		2769
		2770	The request will succeed.
		2771
		2772	=item * may_access is an array reference
		2773
		2774	If either the player nickname or UUID is in the array, the request will
		2775	succeed, otherwise it will fail.
		2776
		2777	=item * may_access is a true value
		2778
		2779	The request will succeed.
		2780
		2781	=item * may_access is missing or false
		2782
		2783	The request will fail.
		2784
		2785	=back
		2786
2509	=cut	2787	=cut
2510		2788
2511	sub cf::object::player::may {	2789	sub cf::object::player::may {
2512	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2513		2791
2514	$self->flag (cf::FLAG_WIZ) ||	2792	$self->flag (cf::FLAG_WIZ) ||
2515	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2516	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2517	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2518	}	2796	}
2519		2797
2520	=item $player_object->enter_link	2798	=item $player_object->enter_link
2521		2799
2522	Freezes the player and moves him/her to a special map (C<{link}>).	2800	Freezes the player and moves him/her to a special map (C<{link}>).
2523		2801
2524	The player should be reasonably safe there for short amounts of time (e.g.	2802	The player should be reasonably safe there for short amounts of time (e.g.
2525	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2803	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526	though, as the palyer cannot control the character while it is on the link	2804	though, as the player cannot control the character while it is on the link
2527	map.	2805	map.
2528		2806
2529	Will never block.	2807	This method will never block, which is the whole reaosn for it's
		2808	existance: you can I<always> put a player onto the link map, which is the
		2809	only place to put objects that is guaranteed to exist.
		2810
		2811	A typical usage pattern is to call C<enter_link> synchronously from the
		2812	server, then start a new thread, do your blocking stuff there and then
		2813	call C<leave_link> from that thread.
2530		2814
2531	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2532		2816
2533	Moves the player out of the special C<{link}> map onto the specified	2817	Moves the player out of the special C<{link}> map onto the specified
2534	map. If the map is not valid (or omitted), the player will be moved back	2818	map. If the map is not valid (or omitted), the player will be moved back
…		…
2552	sub cf::object::player::enter_link {	2836	sub cf::object::player::enter_link {
2553	my ($self) = @_;	2837	my ($self) = @_;
2554		2838
2555	$self->deactivate_recursive;	2839	$self->deactivate_recursive;
2556		2840
		2841	++$self->{_link_recursion};
		2842
2557	return if UNIVERSAL::isa $self->map, "ext::map_link";	2843	return if UNIVERSAL::isa $self->map, "ext::map_link";
2558		2844
2559	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2845	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2560	if $self->map && $self->map->{path} ne "{link}";	2846	if $self->map && $self->map->{path} ne "{link}";
2561		2847
2562	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2848	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2563	}	2849	}
2564		2850
2565	sub cf::object::player::leave_link {	2851	sub cf::object::player::leave_link {
2566	my ($self, $map, $x, $y) = @_;	2852	my ($self, $map, $x, $y) = @_;
2567		2853
…		…
2587	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2588	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2589	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2590		2876
2591	$map->load;	2877	$map->load;
2592	$map->load_neighbours;
2593		2878
2594	return unless $self->contr->active;	2879	return unless $self->contr->active;
2595		2880
2596	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2597	$self->enter_map ($map, $x, $y);	2882	if ($self->enter_map ($map, $x, $y)) {
2598		2883	# entering was successful
		2884	delete $self->{_link_recursion};
2599	# only activate afterwards, to support waiting in hooks	2885	# only activate afterwards, to support waiting in hooks
2600	$self->activate_recursive;	2886	$self->activate_recursive;
2601	}	2887	}
2602		2888
		2889	}
		2890
2603	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2891	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2604		2892
2605	Moves the player to the given map-path and coordinates by first freezing	2893	Moves the player to the given map-path and coordinates by first freezing
2606	her, loading and preparing them map, calling the provided $check callback	2894	her, loading and preparing them map, calling the provided $check callback
2607	that has to return the map if sucecssful, and then unfreezes the player on	2895	that has to return the map if sucecssful, and then unfreezes the player on
2608	the new (success) or old (failed) map position. In either case, $done will	2896	the new (success) or old (failed) map position. In either case, $done will
…		…
2615		2903
2616	our $GOTOGEN;	2904	our $GOTOGEN;
2617		2905
2618	sub cf::object::player::goto {	2906	sub cf::object::player::goto {
2619	my ($self, $path, $x, $y, $check, $done) = @_;	2907	my ($self, $path, $x, $y, $check, $done) = @_;
		2908
		2909	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2910	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2911	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2912	($path, $x, $y) = @$EMERGENCY_POSITION;
		2913	}
2620		2914
2621	# do generation counting so two concurrent goto's will be executed in-order	2915	# do generation counting so two concurrent goto's will be executed in-order
2622	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2916	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2623		2917
2624	$self->enter_link;	2918	$self->enter_link;
…		…
2644	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2645	}	2939	}
2646	}	2940	}
2647		2941
2648	my $map = eval {	2942	my $map = eval {
2649	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2650		2944
2651	if ($map) {	2945	if ($map) {
2652	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2653	$map = $check->($map) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2654	} else {	2948	} else {
2655	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2949	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2656	}	2950	}
2657		2951
2658	$map	2952	$map
…		…
2666	if ($gen == $self->{_goto_generation}) {	2960	if ($gen == $self->{_goto_generation}) {
2667	delete $self->{_goto_generation};	2961	delete $self->{_goto_generation};
2668	$self->leave_link ($map, $x, $y);	2962	$self->leave_link ($map, $x, $y);
2669	}	2963	}
2670		2964
2671	$done->() if $done;	2965	$done->($self) if $done;
2672	})->prio (1);	2966	})->prio (1);
2673	}	2967	}
2674		2968
2675	=item $player_object->enter_exit ($exit_object)	2969	=item $player_object->enter_exit ($exit_object)
2676		2970
…		…
2744	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2745		3039
2746	unless (eval {	3040	unless (eval {
2747	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2748		3042
2749	# random map handling
2750	{
2751	my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753	prepare_random_map $exit
2754	if $exit->slaying eq "/!";
2755	}
2756
2757	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2758	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2759	my $y = $exit->stats->sp;	3045	my $y = $exit->stats->sp;
		3046
		3047	# special map handling
		3048	my $slaying = $exit->slaying;
		3049
		3050	# special map handling
		3051	if ($slaying eq "/!") {
		3052	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3053
		3054	prepare_random_map $exit
		3055	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3056
		3057	$map = $exit->slaying;
		3058
		3059	} elsif ($slaying eq '!up') {
		3060	$map = $exit->map->tile_path (cf::TILE_UP);
		3061	$x = $exit->x;
		3062	$y = $exit->y;
		3063
		3064	} elsif ($slaying eq '!down') {
		3065	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3066	$x = $exit->x;
		3067	$y = $exit->y;
		3068	}
2760		3069
2761	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2762		3071
2763	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2764	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2769	$self->message ("Something went wrong deep within the deliantra server. "	3078	$self->message ("Something went wrong deep within the deliantra server. "
2770	. "I'll try to bring you back to the map you were before. "	3079	. "I'll try to bring you back to the map you were before. "
2771	. "Please report this to the dungeon master!",	3080	. "Please report this to the dungeon master!",
2772	cf::NDI_UNIQUE | cf::NDI_RED);	3081	cf::NDI_UNIQUE | cf::NDI_RED);
2773		3082
2774	warn "ERROR in enter_exit: $@";	3083	error "ERROR in enter_exit: $@";
2775	$self->leave_link;	3084	$self->leave_link;
2776	}	3085	}
2777	})->prio (1);	3086	})->prio (1);
2778	}	3087	}
2779		3088
2780	=head3 cf::client	3089	=head3 cf::client
2781		3090
2782	=over 4	3091	=over 4
2783
2784	=item $client->send_drawinfo ($text, $flags)
2785
2786	Sends a drawinfo packet to the client. Circumvents output buffering so
2787	should not be used under normal circumstances.
2788
2789	=cut
2790
2791	sub cf::client::send_drawinfo {
2792	my ($self, $text, $flags) = @_;
2793
2794	utf8::encode $text;
2795	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796	}
2797		3092
2798	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2799		3094
2800	Like C<send_packet>, but tries to compress large packets, and fragments	3095	Like C<send_packet>, but tries to compress large packets, and fragments
2801	them as required.	3096	them as required.
…		…
2820	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2821	}	3116	}
2822		3117
2823	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2824		3119
2825	Send a drawinfo or msg packet to the client, formatting the msg for the	3120	Send a msg packet to the client, formatting the msg for the client if
2826	client if neccessary. C<$type> should be a string identifying the type of	3121	necessary. C<$type> should be a string identifying the type of the
2827	the message, with C<log> being the default. If C<$color> is negative, suppress	3122	message, with C<log> being the default. If C<$color> is negative, suppress
2828	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2829		3124
2830	=cut	3125	=cut
2831		3126
2832	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
2937	id => "death",	3232	id => "death",
2938	title => "Death",	3233	title => "Death",
2939	reply => undef,	3234	reply => undef,
2940	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
2941	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
2942	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
2943	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
2944	);	3245	);
2945		3246
2946	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
2989	=cut	3290	=cut
2990		3291
2991	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
2992	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
2993		3294
2994	if ($self->extcmd == 2) {
2995	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2996	} elsif ($self->extcmd == 1) { # TODO: remove
2997	push @msg, msgtype => "event_$type";
2998	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2999	}
3000	}
3001
3002	=item $client->ext_reply ($msgid, @msg)
3003
3004	Sends an ext reply to the client.
3005
3006	=cut
3007
3008	sub cf::client::ext_reply($$@) {
3009	my ($self, $id, @msg) = @_;
3010
3011	if ($self->extcmd == 2) {
3012	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3013	} elsif ($self->extcmd == 1) {
3014	#TODO: version 1, remove
3015	unshift @msg, msgtype => "reply", msgid => $id;
3016	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3017	}
3018	}	3296	}
3019		3297
3020	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3021		3299
3022	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3042		3320
3043	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3044	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3045		3323
3046	1	3324	1
		3325	}
		3326
		3327	=item $client->update_command_faces
		3328
		3329	=cut
		3330
		3331	our %COMMAND_FACE;
		3332
		3333	sub cf::client::update_command_faces {
		3334	my ($self) = @_;
		3335
		3336	my @faces = grep $_,
		3337	$COMMAND_FACE{preferred},
		3338	$COMMAND_FACE{standard},
		3339	$COMMAND_FACE{skill},
		3340	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3341	$COMMAND_FACE{emote},
		3342	;
		3343
		3344	$self->send_face ($_)
		3345	for @faces;
		3346	$self->flush_fx;
		3347
		3348	$self->ext_msg (command_list => @faces);
		3349	}
		3350
		3351	=item cf::client::set_command_face $type, $commands
		3352
		3353	=cut
		3354
		3355	sub cf::client::set_command_face {
		3356	my ($type, $list) = @_;
		3357
		3358	my $idx = &cf::face::set ( #d# ugly forward reference
		3359	"command_list/$type" => cf::FT_RSRC,
		3360	JSON::XS->new->utf8->encode ([ sort @$list ])
		3361	);
		3362
		3363	$COMMAND_FACE{$type} = $idx;
3047	}	3364	}
3048		3365
3049	cf::client->attach (	3366	cf::client->attach (
3050	on_connect => sub {	3367	on_connect => sub {
3051	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3077	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3078		3395
3079	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3080		3397
3081	if (ref $msg) {	3398	if (ref $msg) {
3082	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3083	"ARRAY" eq ref $msg
3084	? @$msg
3085	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3086		3400
3087	my @reply;
3088
3089	if (my $cb = $EXTICMD{$type}) {	3401	if (my $cb = $EXTIACMD{$type}) {
		3402	$cb->(
		3403	$ns,
		3404	sub {
		3405	$ns->ext_msg ("reply-$reply", @_)
		3406	if $reply;
		3407	},
		3408	@payload
		3409	);
		3410	} else {
		3411	my @reply;
		3412
		3413	if (my $cb = $EXTICMD{$type}) {
3090	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3091	}	3419	}
3092
3093	$ns->ext_reply ($reply, @reply)
3094	if $reply;
3095
3096	} else {	3420	} else {
3097	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3421	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3098	}	3422	}
3099		3423
3100	cf::override;	3424	cf::override;
3101	},	3425	},
3102	);	3426	);
…		…
3122		3446
3123	$coro	3447	$coro
3124	}	3448	}
3125		3449
3126	cf::client->attach (	3450	cf::client->attach (
3127	on_destroy => sub {	3451	on_client_destroy => sub {
3128	my ($ns) = @_;	3452	my ($ns) = @_;
3129		3453
3130	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3454	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3131	},	3455	},
3132	);	3456	);
…		…
3183	decrease split destroy change_exp value msg lore send_msg)],	3507	decrease split destroy change_exp value msg lore send_msg)],
3184	["cf::object::player" => qw(player)],	3508	["cf::object::player" => qw(player)],
3185	["cf::player" => qw(peaceful send_msg)],	3509	["cf::player" => qw(peaceful send_msg)],
3186	["cf::map" => qw(trigger)],	3510	["cf::map" => qw(trigger)],
3187	) {	3511	) {
3188	no strict 'refs';
3189	my ($pkg, @funs) = @$_;	3512	my ($pkg, @funs) = @$_;
3190	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3513	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3191	for @funs;	3514	for @funs;
3192	}	3515	}
3193		3516
…		…
3232	local @cf::_safe_eval_args = values %vars;	3555	local @cf::_safe_eval_args = values %vars;
3233	@res = wantarray ? eval eval : scalar eval $eval;	3556	@res = wantarray ? eval eval : scalar eval $eval;
3234	}	3557	}
3235		3558
3236	if ($@) {	3559	if ($@) {
3237	warn "$@";	3560	warn "$@",
3238	warn "while executing safe code '$code'\n";	3561	"while executing safe code '$code'\n",
3239	warn "with arguments " . (join " ", %vars) . "\n";	3562	"with arguments " . (join " ", %vars) . "\n";
3240	}	3563	}
3241		3564
3242	wantarray ? @res : $res[0]	3565	wantarray ? @res : $res[0]
3243	}	3566	}
3244		3567
…		…
3269	=cut	3592	=cut
3270		3593
3271	#############################################################################	3594	#############################################################################
3272	# the server's init and main functions	3595	# the server's init and main functions
3273		3596
		3597	{
		3598	package cf::face;
		3599
		3600	our %HASH; # hash => idx
		3601	our @DATA; # dynamically-created facedata, only faceste 0 used
		3602	our @FOFS; # file offset, if > 0
		3603	our @SIZE; # size of face, in octets
		3604	our @META; # meta hash of face, if any
		3605	our $DATAFH; # facedata filehandle
		3606
		3607	# internal api, not finalised
		3608	sub set {
		3609	my ($name, $type, $data) = @_;
		3610
		3611	my $idx = cf::face::find $name;
		3612
		3613	if ($idx) {
		3614	delete $HASH{cf::face::get_csum $idx};
		3615	} else {
		3616	$idx = cf::face::alloc $name;
		3617	}
		3618
		3619	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3620
		3621	cf::face::set_type $idx, $type;
		3622	cf::face::set_csum $idx, 0, $hash;
		3623
		3624	# we need to destroy the SV itself, not just modify it, as a running ix
		3625	# might hold a reference to it: "delete" achieves that.
		3626	delete $FOFS[0][$idx];
		3627	delete $DATA[0][$idx];
		3628	$DATA[0][$idx] = $data;
		3629	$SIZE[0][$idx] = length $data;
		3630	delete $META[$idx];
		3631	$HASH{$hash} = $idx;#d#
		3632
		3633	$idx
		3634	}
		3635
		3636	sub _get_data($$$) {
		3637	my ($idx, $set, $cb) = @_;
		3638
		3639	if (defined $DATA[$set][$idx]) {
		3640	$cb->($DATA[$set][$idx]);
		3641	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3642	my $size = $SIZE[$set][$idx];
		3643	my $buf;
		3644	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3645	if ($_[0] == $size) {
		3646	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3647	$cb->($buf);
		3648	} else {
		3649	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3650	}
		3651	};
		3652	} else {
		3653	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3654	}
		3655	}
		3656
		3657	# rather ineffient
		3658	sub cf::face::get_data($;$) {
		3659	my ($idx, $set) = @_;
		3660
		3661	_get_data $idx, $set, Coro::rouse_cb;
		3662	Coro::rouse_wait
		3663	}
		3664
		3665	sub cf::face::ix {
		3666	my ($ns, $set, $idx, $pri) = @_;
		3667
		3668	_get_data $idx, $set, sub {
		3669	$ns->ix_send ($idx, $pri, $_[0]);
		3670	};
		3671	}
		3672	}
		3673
3274	sub load_facedata($) {	3674	sub load_facedata($) {
3275	my ($path) = @_;	3675	my ($path) = @_;
3276		3676
3277	# HACK to clear player env face cache, we need some signal framework
3278	# for this (global event?)
3279	%ext::player_env::MUSIC_FACE_CACHE = ();
3280
3281	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3282		3678
3283	warn "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3284		3680
3285	my $facedata;	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3286	0 < aio_load $path, $facedata
3287	or die "$path: $!";
3288
3289	$facedata = Coro::Storable::thaw $facedata;
3290		3682
3291	$facedata->{version} == 2	3683	$facedata->{version} == 2
3292	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3293		3685
3294	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3295	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3296	$facedata->{resource}{"res/exp_table"} = {	3688
3297	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3298	data => $exp_table,	3690
3299	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3300	};	3692	# from here on, everything must be atomic - no thread switch allowed
3301	cf::cede_to_tick;	3693	my $t1 = EV::time;
3302		3694
3303	{	3695	{
3304	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3305		3697
3306	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3307	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3308		3701
3309	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3310	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3311	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3704	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3312	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3705	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3313		3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3314	cf::cede_to_tick;	3707	$cf::face::HASH{$info->{hash64}} = $idx;
		3708	delete $cf::face::META[$idx];
3315	}	3709	}
3316		3710
3317	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3318	next unless $info->{smooth};	3712	next unless $info->{smooth};
3319		3713
…		…
3322		3716
3323	if (my $smooth = cf::face::find $info->{smooth}) {	3717	if (my $smooth = cf::face::find $info->{smooth}) {
3324	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3325	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3326	} else {	3720	} else {
3327	warn "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3328	}	3722	}
3329
3330	cf::cede_to_tick;
3331	}	3723	}
3332	}	3724	}
3333		3725
3334	{	3726	{
3335	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3336		3728
3337	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3338	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3339	cf::cede_to_tick;
3340	}	3731	}
3341		3732
3342	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3343	}	3734	}
3344		3735
3345	{	3736	{
3346	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3347		3738
3348	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3349	if (defined $info->{type}) {	3740	if (defined (my $type = $info->{type})) {
		3741	# TODO: different hash - must free and use new index, or cache ixface data queue
3350	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3351		3743
3352	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3353	cf::face::set_type $idx, $info->{type};	3744	cf::face::set_type $idx, $type;
		3745	cf::face::set_csum $idx, 0, $info->{hash};
		3746	$cf::face::SIZE[0][$idx] = $info->{size};
		3747	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3748	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3749	$cf::face::HASH{$info->{hash}} = $idx;
3354	} else {	3750	} else {
3355	$RESOURCE{$name} = $info;	3751	# $RESOURCE{$name} = $info; # unused
3356	}	3752	}
3357
3358	cf::cede_to_tick;
3359	}	3753	}
3360	}	3754	}
		3755
		3756	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3757
		3758	# HACK to clear player env face cache, we need some signal framework
		3759	# for this (global event?)
		3760	%ext::player_env::MUSIC_FACE_CACHE = ();
		3761
		3762	# END ATOMIC
		3763
		3764	cf::debug "facedata atomic update time ", EV::time - $t1;
3361		3765
3362	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3766	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3363		3767
		3768	aio_close $fh if $fh; # close old facedata
		3769
3364	1	3770	1
3365	}	3771	}
3366
3367	cf::global->attach (on_resource_update => sub {
3368	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3369	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3370
3371	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3372	my $sound = $soundconf->{compat}[$_]
3373	or next;
3374
3375	my $face = cf::face::find "sound/$sound->[1]";
3376	cf::sound::set $sound->[0] => $face;
3377	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3378	}
3379
3380	while (my ($k, $v) = each %{$soundconf->{event}}) {
3381	my $face = cf::face::find "sound/$v";
3382	cf::sound::set $k => $face;
3383	}
3384	}
3385	});
3386		3772
3387	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
3388	my ($ns, $want) = @_;	3774	my ($ns, $want) = @_;
3389		3775
3390	while (my ($k, $v) = each %$want) {	3776	while (my ($k, $v) = each %$want) {
…		…
3398	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3399	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3400	cf::arch::commit_load;	3786	cf::arch::commit_load;
3401		3787
3402	$status	3788	$status
		3789	}
		3790
		3791	sub reload_exp_table {
		3792	_reload_exp_table;
		3793
		3794	cf::face::set
		3795	"res/exp_table" => FT_RSRC,
		3796	JSON::XS->new->utf8->canonical->encode (
		3797	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3798	);
		3799	}
		3800
		3801	sub reload_materials {
		3802	_reload_materials;
3403	}	3803	}
3404		3804
3405	sub reload_regions {	3805	sub reload_regions {
3406	# HACK to clear player env face cache, we need some signal framework	3806	# HACK to clear player env face cache, we need some signal framework
3407	# for this (global event?)	3807	# for this (global event?)
…		…
3415	if exists $_->{match};	3815	if exists $_->{match};
3416	}	3816	}
3417	}	3817	}
3418		3818
3419	sub reload_facedata {	3819	sub reload_facedata {
3420	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3421	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3422	}	3822	}
3423		3823
3424	sub reload_archetypes {	3824	sub reload_archetypes {
3425	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3426	or die "unable to load archetypes\n";	3826	or die "unable to load archetypes\n";
		3827
		3828	cf::face::set
		3829	"res/skill_info" => FT_RSRC,
		3830	JSON::XS->new->utf8->canonical->encode (
		3831	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3832	);
		3833
		3834	cf::face::set
		3835	"res/spell_paths" => FT_RSRC,
		3836	JSON::XS->new->utf8->canonical->encode (
		3837	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3838	);
		3839
		3840	# command completion
		3841	my @commands;
		3842
		3843	for (0..cf::arch::skillvec_size - 1) {
		3844	my $skill = cf::arch::skillvec $_;
		3845	my $name = $skill->name;
		3846	my $flags = cf::skill_flags $skill->subtype;
		3847
		3848	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3849	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3850	}
		3851
		3852	cf::client::set_command_face skill => \@commands;
3427	}	3853	}
3428		3854
3429	sub reload_treasures {	3855	sub reload_treasures {
3430	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3431	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
3432	}	3858	}
3433		3859
		3860	sub reload_sound {
		3861	trace "loading sound config from $DATADIR/sound\n";
		3862
		3863	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3864
		3865	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3866	my $sound = $soundconf->{compat}[$_]
		3867	or next;
		3868
		3869	my $face = cf::face::find "sound/$sound->[1]";
		3870	cf::sound::set $sound->[0] => $face;
		3871	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3872	}
		3873
		3874	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3875	my $face = cf::face::find "sound/$v";
		3876	cf::sound::set $k => $face;
		3877	}
		3878	}
		3879
3434	sub reload_resources {	3880	sub reload_resources {
3435	warn "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3436		3882
		3883	reload_materials;
3437	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
		3886	reload_sound;
3438	reload_archetypes;	3887	reload_archetypes;
3439	reload_regions;	3888	reload_regions;
3440	reload_treasures;	3889	reload_treasures;
3441		3890
3442	warn "finished reloading resource files\n";	3891	trace "finished reloading resource files\n";
3443	}	3892	}
3444		3893
3445	sub reload_config {	3894	sub reload_config {
3446	warn "reloading config file...\n";	3895	trace "reloading config file...\n";
3447		3896
3448	open my $fh, "<:utf8", "$CONFDIR/config"	3897	my $config = load_file "$CONFDIR/config";
3449	or return;	3898	utf8::decode $config;
		3899	*CFG = decode_yaml $config;
3450		3900
3451	local $/;
3452	*CFG = YAML::XS::Load scalar <$fh>;
3453
3454	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3901	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3455		3902
3456	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3903	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3457	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3904	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3458		3905
3459	if (exists $CFG{mlockall}) {	3906	if (exists $CFG{mlockall}) {
…		…
3461	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3908	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3462	and die "WARNING: m(un)lockall failed: $!\n";	3909	and die "WARNING: m(un)lockall failed: $!\n";
3463	};	3910	};
3464	warn $@ if $@;	3911	warn $@ if $@;
3465	}	3912	}
3466
3467	warn "finished reloading resource files\n";
3468	}	3913	}
3469		3914
3470	sub pidfile() {	3915	sub pidfile() {
3471	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3916	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472	or die "$PIDFILE: $!";	3917	or die "$PIDFILE: $!";
…		…
3485	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3486	print $fh $$;	3931	print $fh $$;
3487	}	3932	}
3488		3933
3489	sub main_loop {	3934	sub main_loop {
3490	warn "EV::loop starting\n";	3935	trace "EV::run starting\n";
3491	if (1) {	3936	if (1) {
3492	EV::loop;	3937	EV::run;
3493	}	3938	}
3494	warn "EV::loop returned\n";	3939	trace "EV::run returned\n";
3495	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3496	}	3941	}
3497		3942
3498	sub main {	3943	sub main {
3499	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3500		3945
3501	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3947	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505		3950
3506	cf::init_experience;
3507	cf::init_anim;
3508	cf::init_attackmess;
3509	cf::init_dynamic;
3510
3511	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3951	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512		3952
3513	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3514	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3515	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3955	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3516	(async {	3956	(async {
3517	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3518	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3519	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3520	};	3960	};
3521		3961
3522	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3523		3963
3524	cf::sync_job {	3964	cf::sync_job {
		3965	cf::incloader::init ();
		3966
		3967	db_init;
		3968
		3969	cf::init_anim;
		3970	cf::init_attackmess;
		3971	cf::init_dynamic;
		3972
3525	cf::load_settings;	3973	cf::load_settings;
3526	cf::load_materials;
3527		3974
3528	reload_resources;	3975	reload_resources;
3529	reload_config;	3976	reload_config;
3530	db_init;
3531		3977
3532	cf::init_uuid;	3978	cf::init_uuid;
3533	cf::init_signals;	3979	cf::init_signals;
3534	cf::init_commands;
3535	cf::init_skills;	3980	cf::init_skills;
3536		3981
3537	cf::init_beforeplay;	3982	cf::init_beforeplay;
3538		3983
3539	atomic;	3984	atomic;
…		…
3544		3989
3545	# no (long-running) fork's whatsoever before this point(!)	3990	# no (long-running) fork's whatsoever before this point(!)
3546	use POSIX ();	3991	use POSIX ();
3547	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3992	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548		3993
3549	(pop @POST_INIT)->(0) while @POST_INIT;	3994	cf::_post_init 0;
3550	};	3995	};
3551		3996
		3997	cf::object::thawer::errors_are_fatal 0;
		3998	info "parse errors in files are no longer fatal from this point on.\n";
		3999
		4000	AE::postpone {
		4001	undef &main; # free gobs of memory :)
		4002	};
		4003
3552	main_loop;	4004	goto &main_loop;
3553	}	4005	}
3554		4006
3555	#############################################################################	4007	#############################################################################
3556	# initialisation and cleanup	4008	# initialisation and cleanup
3557		4009
3558	# install some emergency cleanup handlers	4010	# install some emergency cleanup handlers
3559	BEGIN {	4011	BEGIN {
3560	our %SIGWATCHER = ();	4012	our %SIGWATCHER = ();
3561	for my $signal (qw(INT HUP TERM)) {	4013	for my $signal (qw(INT HUP TERM)) {
3562	$SIGWATCHER{$signal} = EV::signal $signal, sub {	4014	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3563	cf::cleanup "SIG$signal";	4015	cf::cleanup "SIG$signal";
3564	};	4016	};
3565	}	4017	}
3566	}	4018	}
3567		4019
3568	sub write_runtime_sync {	4020	sub write_runtime_sync {
		4021	my $t0 = AE::time;
		4022
3569	# first touch the runtime file to show we are still running:	4023	# first touch the runtime file to show we are still running:
3570	# the fsync below can take a very very long time.	4024	# the fsync below can take a very very long time.
3571		4025
3572	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	4026	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3573		4027
3574	my $guard = cf::lock_acquire "write_runtime";	4028	my $guard = cf::lock_acquire "write_runtime";
3575		4029
3576	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	4030	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3577	or return;	4031	or return;
3578		4032
3579	my $value = $cf::RUNTIME + 90 + 10;	4033	my $value = $cf::RUNTIME + 90 + 10;
3580	# 10 is the runtime save interval, for a monotonic clock	4034	# 10 is the runtime save interval, for a monotonic clock
3581	# 60 allows for the watchdog to kill the server.	4035	# 60 allows for the watchdog to kill the server.
…		…
3594	or return;	4048	or return;
3595		4049
3596	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4050	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3597	and return;	4051	and return;
3598		4052
3599	warn "runtime file written.\n";	4053	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3600		4054
3601	1	4055	1
3602	}	4056	}
3603		4057
3604	our $uuid_lock;	4058	our $uuid_lock;
…		…
3616	or return;	4070	or return;
3617		4071
3618	my $value = uuid_seq uuid_cur;	4072	my $value = uuid_seq uuid_cur;
3619		4073
3620	unless ($value) {	4074	unless ($value) {
3621	warn "cowardly refusing to write zero uuid value!\n";	4075	info "cowardly refusing to write zero uuid value!\n";
3622	return;	4076	return;
3623	}	4077	}
3624		4078
3625	my $value = uuid_str $value + $uuid_skip;	4079	my $value = uuid_str $value + $uuid_skip;
3626	$uuid_skip = 0;	4080	$uuid_skip = 0;
…		…
3636	or return;	4090	or return;
3637		4091
3638	aio_rename "$uuid~", $uuid	4092	aio_rename "$uuid~", $uuid
3639	and return;	4093	and return;
3640		4094
3641	warn "uuid file written ($value).\n";	4095	trace "uuid file written ($value).\n";
3642		4096
3643	1	4097	1
3644		4098
3645	}	4099	}
3646		4100
…		…
3652	}	4106	}
3653		4107
3654	sub emergency_save() {	4108	sub emergency_save() {
3655	my $freeze_guard = cf::freeze_mainloop;	4109	my $freeze_guard = cf::freeze_mainloop;
3656		4110
3657	warn "emergency_perl_save: enter\n";	4111	info "emergency_perl_save: enter\n";
		4112
		4113	# this is a trade-off: we want to be very quick here, so
		4114	# save all maps without fsync, and later call a global sync
		4115	# (which in turn might be very very slow)
		4116	local $USE_FSYNC = 0;
3658		4117
3659	cf::sync_job {	4118	cf::sync_job {
3660	# this is a trade-off: we want to be very quick here, so	4119	cf::write_runtime_sync; # external watchdog should not bark
3661	# save all maps without fsync, and later call a global sync
3662	# (which in turn might be very very slow)
3663	local $USE_FSYNC = 0;
3664		4120
3665	# use a peculiar iteration method to avoid tripping on perl	4121	# use a peculiar iteration method to avoid tripping on perl
3666	# refcount bugs in for. also avoids problems with players	4122	# refcount bugs in for. also avoids problems with players
3667	# and maps saved/destroyed asynchronously.	4123	# and maps saved/destroyed asynchronously.
3668	warn "emergency_perl_save: begin player save\n";	4124	info "emergency_perl_save: begin player save\n";
3669	for my $login (keys %cf::PLAYER) {	4125	for my $login (keys %cf::PLAYER) {
3670	my $pl = $cf::PLAYER{$login} or next;	4126	my $pl = $cf::PLAYER{$login} or next;
3671	$pl->valid or next;	4127	$pl->valid or next;
3672	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4128	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3673	$pl->save;	4129	$pl->save;
3674	}	4130	}
3675	warn "emergency_perl_save: end player save\n";	4131	info "emergency_perl_save: end player save\n";
3676		4132
		4133	cf::write_runtime_sync; # external watchdog should not bark
		4134
3677	warn "emergency_perl_save: begin map save\n";	4135	info "emergency_perl_save: begin map save\n";
3678	for my $path (keys %cf::MAP) {	4136	for my $path (keys %cf::MAP) {
3679	my $map = $cf::MAP{$path} or next;	4137	my $map = $cf::MAP{$path} or next;
3680	$map->valid or next;	4138	$map->valid or next;
3681	$map->save;	4139	$map->save;
3682	}	4140	}
3683	warn "emergency_perl_save: end map save\n";	4141	info "emergency_perl_save: end map save\n";
3684		4142
		4143	cf::write_runtime_sync; # external watchdog should not bark
		4144
3685	warn "emergency_perl_save: begin database checkpoint\n";	4145	info "emergency_perl_save: begin database checkpoint\n";
3686	BDB::db_env_txn_checkpoint $DB_ENV;	4146	BDB::db_env_txn_checkpoint $DB_ENV;
3687	warn "emergency_perl_save: end database checkpoint\n";	4147	info "emergency_perl_save: end database checkpoint\n";
3688		4148
3689	warn "emergency_perl_save: begin write uuid\n";	4149	info "emergency_perl_save: begin write uuid\n";
3690	write_uuid_sync 1;	4150	write_uuid_sync 1;
3691	warn "emergency_perl_save: end write uuid\n";	4151	info "emergency_perl_save: end write uuid\n";
		4152
		4153	cf::write_runtime_sync; # external watchdog should not bark
		4154
		4155	trace "emergency_perl_save: syncing database to disk";
		4156	BDB::db_env_txn_checkpoint $DB_ENV;
		4157
		4158	info "emergency_perl_save: starting sync\n";
		4159	IO::AIO::aio_sync sub {
		4160	info "emergency_perl_save: finished sync\n";
		4161	};
		4162
		4163	cf::write_runtime_sync; # external watchdog should not bark
		4164
		4165	trace "emergency_perl_save: flushing outstanding aio requests";
		4166	while (IO::AIO::nreqs || BDB::nreqs) {
		4167	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4168	}
		4169
		4170	cf::write_runtime_sync; # external watchdog should not bark
3692	};	4171	};
3693		4172
3694	warn "emergency_perl_save: starting sync()\n";
3695	IO::AIO::aio_sync sub {
3696	warn "emergency_perl_save: finished sync()\n";
3697	};
3698
3699	warn "emergency_perl_save: leave\n";	4173	info "emergency_perl_save: leave\n";
3700	}	4174	}
3701		4175
3702	sub post_cleanup {	4176	sub post_cleanup {
3703	my ($make_core) = @_;	4177	my ($make_core) = @_;
3704		4178
		4179	IO::AIO::flush;
		4180
3705	warn Carp::longmess "post_cleanup backtrace"	4181	error Carp::longmess "post_cleanup backtrace"
3706	if $make_core;	4182	if $make_core;
3707		4183
3708	my $fh = pidfile;	4184	my $fh = pidfile;
3709	unlink $PIDFILE if <$fh> == $$;	4185	unlink $PIDFILE if <$fh> == $$;
3710	}	4186	}
…		…
3730	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4206	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731	for my $name (keys %$leaf_symtab) {	4207	for my $name (keys %$leaf_symtab) {
3732	_gv_clear *{"$pkg$name"};	4208	_gv_clear *{"$pkg$name"};
3733	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4209	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734	}	4210	}
3735	warn "cleared package $pkg\n";#d#
3736	}	4211	}
3737		4212
3738	sub do_reload_perl() {	4213	sub do_reload_perl() {
3739	# can/must only be called in main	4214	# can/must only be called in main
3740	if ($Coro::current != $Coro::main) {	4215	unless (in_main) {
3741	warn "can only reload from main coroutine";	4216	error "can only reload from main coroutine";
3742	return;	4217	return;
3743	}	4218	}
3744		4219
3745	return if $RELOAD++;	4220	return if $RELOAD++;
3746		4221
3747	my $t1 = EV::time;	4222	my $t1 = AE::time;
3748		4223
3749	while ($RELOAD) {	4224	while ($RELOAD) {
3750	warn "reloading...";	4225	cf::get_slot 0.1, -1, "reload_perl";
		4226	info "perl_reload: reloading...";
3751		4227
3752	warn "entering sync_job";	4228	trace "perl_reload: entering sync_job";
3753		4229
3754	cf::sync_job {	4230	cf::sync_job {
3755	cf::write_runtime_sync; # external watchdog should not bark
3756	cf::emergency_save;	4231	#cf::emergency_save;
3757	cf::write_runtime_sync; # external watchdog should not bark
3758		4232
3759	warn "syncing database to disk";
3760	BDB::db_env_txn_checkpoint $DB_ENV;
3761
3762	# if anything goes wrong in here, we should simply crash as we already saved
3763
3764	warn "flushing outstanding aio requests";
3765	while (IO::AIO::nreqs || BDB::nreqs) {
3766	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3767	}
3768
3769	warn "cancelling all extension coros";	4233	trace "perl_reload: cancelling all extension coros";
3770	$_->cancel for values %EXT_CORO;	4234	$_->cancel for values %EXT_CORO;
3771	%EXT_CORO = ();	4235	%EXT_CORO = ();
3772		4236
3773	warn "removing commands";	4237	trace "perl_reload: removing commands";
3774	%COMMAND = ();	4238	%COMMAND = ();
3775		4239
3776	warn "removing ext/exti commands";	4240	trace "perl_reload: removing ext/exti commands";
3777	%EXTCMD = ();	4241	%EXTCMD = ();
3778	%EXTICMD = ();	4242	%EXTICMD = ();
3779		4243
3780	warn "unloading/nuking all extensions";	4244	trace "perl_reload: unloading/nuking all extensions";
3781	for my $pkg (@EXTS) {	4245	for my $pkg (@EXTS) {
3782	warn "... unloading $pkg";	4246	trace "... unloading $pkg";
3783		4247
3784	if (my $cb = $pkg->can ("unload")) {	4248	if (my $cb = $pkg->can ("unload")) {
3785	eval {	4249	eval {
3786	$cb->($pkg);	4250	$cb->($pkg);
3787	1	4251	1
3788	} or warn "$pkg unloaded, but with errors: $@";	4252	} or error "$pkg unloaded, but with errors: $@";
3789	}	4253	}
3790		4254
3791	warn "... clearing $pkg";	4255	trace "... clearing $pkg";
3792	clear_package $pkg;	4256	clear_package $pkg;
3793	}	4257	}
3794		4258
3795	warn "unloading all perl modules loaded from $LIBDIR";	4259	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3796	while (my ($k, $v) = each %INC) {	4260	while (my ($k, $v) = each %INC) {
3797	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4261	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798		4262
3799	warn "... unloading $k";	4263	trace "... unloading $k";
3800	delete $INC{$k};	4264	delete $INC{$k};
3801		4265
3802	$k =~ s/\.pm$//;	4266	$k =~ s/\.pm$//;
3803	$k =~ s/\//::/g;	4267	$k =~ s/\//::/g;
3804		4268
…		…
3807	}	4271	}
3808		4272
3809	clear_package $k;	4273	clear_package $k;
3810	}	4274	}
3811		4275
3812	warn "getting rid of safe::, as good as possible";	4276	trace "perl_reload: getting rid of safe::, as good as possible";
3813	clear_package "safe::$_"	4277	clear_package "safe::$_"
3814	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4278	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3815		4279
3816	warn "unloading cf.pm \"a bit\"";	4280	trace "perl_reload: unloading cf.pm \"a bit\"";
3817	delete $INC{"cf.pm"};	4281	delete $INC{"cf.pm"};
3818	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4282	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3819		4283
3820	# don't, removes xs symbols, too,	4284	# don't, removes xs symbols, too,
3821	# and global variables created in xs	4285	# and global variables created in xs
3822	#clear_package __PACKAGE__;	4286	#clear_package __PACKAGE__;
3823		4287
3824	warn "unload completed, starting to reload now";	4288	info "perl_reload: unload completed, starting to reload now";
3825		4289
3826	warn "reloading cf.pm";	4290	trace "perl_reload: reloading cf.pm";
3827	require cf;	4291	require cf;
3828	cf::_connect_to_perl_1;	4292	cf::_connect_to_perl_1;
3829		4293
3830	warn "loading config and database again";	4294	trace "perl_reload: loading config and database again";
3831	cf::reload_config;	4295	cf::reload_config;
3832		4296
3833	warn "loading extensions";	4297	trace "perl_reload: loading extensions";
3834	cf::load_extensions;	4298	cf::load_extensions;
3835		4299
3836	if ($REATTACH_ON_RELOAD) {	4300	if ($REATTACH_ON_RELOAD) {
3837	warn "reattaching attachments to objects/players";	4301	trace "perl_reload: reattaching attachments to objects/players";
3838	_global_reattach; # objects, sockets	4302	_global_reattach; # objects, sockets
3839	warn "reattaching attachments to maps";	4303	trace "perl_reload: reattaching attachments to maps";
3840	reattach $_ for values %MAP;	4304	reattach $_ for values %MAP;
3841	warn "reattaching attachments to players";	4305	trace "perl_reload: reattaching attachments to players";
3842	reattach $_ for values %PLAYER;	4306	reattach $_ for values %PLAYER;
3843	}	4307	}
3844		4308
3845	warn "running post_init jobs";	4309	cf::_post_init 1;
3846	(pop @POST_INIT)->(1) while @POST_INIT;
3847		4310
3848	warn "leaving sync_job";	4311	trace "perl_reload: leaving sync_job";
3849		4312
3850	1	4313	1
3851	} or do {	4314	} or do {
3852	warn $@;	4315	error $@;
3853	cf::cleanup "error while reloading, exiting.";	4316	cf::cleanup "perl_reload: error, exiting.";
3854	};	4317	};
3855		4318
3856	warn "reloaded";
3857	--$RELOAD;	4319	--$RELOAD;
3858	}	4320	}
3859		4321
3860	$t1 = EV::time - $t1;	4322	$t1 = AE::time - $t1;
3861	warn "reload completed in ${t1}s\n";	4323	info "perl_reload: completed in ${t1}s\n";
3862	};	4324	};
3863		4325
3864	our $RELOAD_WATCHER; # used only during reload	4326	our $RELOAD_WATCHER; # used only during reload
3865		4327
3866	sub reload_perl() {	4328	sub reload_perl() {
…		…
3868	# coro crashes during coro_state_free->destroy here.	4330	# coro crashes during coro_state_free->destroy here.
3869		4331
3870	$RELOAD_WATCHER ||= cf::async {	4332	$RELOAD_WATCHER ||= cf::async {
3871	Coro::AIO::aio_wait cache_extensions;	4333	Coro::AIO::aio_wait cache_extensions;
3872		4334
3873	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4335	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3874	do_reload_perl;	4336	do_reload_perl;
3875	undef $RELOAD_WATCHER;	4337	undef $RELOAD_WATCHER;
3876	};	4338	};
3877	};	4339	};
3878	}	4340	}
…		…
3887	reload_perl;	4349	reload_perl;
3888	};	4350	};
3889	}	4351	}
3890	};	4352	};
3891		4353
3892	unshift @INC, $LIBDIR;	4354	#############################################################################
3893		4355
3894	my $bug_warning = 0;	4356	my $bug_warning = 0;
3895		4357
3896	our @WAIT_FOR_TICK;
3897	our @WAIT_FOR_TICK_BEGIN;
3898
3899	sub wait_for_tick {	4358	sub wait_for_tick() {
3900	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3901		4360
3902	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
3903	push @WAIT_FOR_TICK, $signal;
3904	$signal->wait;
3905	}	4362	}
3906		4363
3907	sub wait_for_tick_begin {	4364	sub wait_for_tick_begin() {
3908	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3909		4366
3910	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
3911	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
3912	$signal->wait;	4369	$signal->wait;
3913	}	4370	}
…		…
3917	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4374	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3918	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
3919	return;	4376	return;
3920	}	4377	}
3921		4378
3922	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
3923		4380
3924	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4381	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3925		4382
3926	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3927	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4384	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3928	Coro::async_pool {	4385	Coro::async_pool {
3929	$Coro::current->{desc} = "runtime saver";	4386	$Coro::current->{desc} = "runtime saver";
3930	write_runtime_sync	4387	write_runtime_sync
3931	or warn "ERROR: unable to write runtime file: $!";	4388	or error "ERROR: unable to write runtime file: $!";
3932	};	4389	};
3933	}	4390	}
3934		4391
3935	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3936	$sig->send;	4393	$sig->send;
3937	}	4394	}
3938	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
3939	$sig->send;
3940	}
3941		4396
3942	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
3943	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3944		4399
3945	if (0) {	4400	if (0) {
3946	if ($NEXT_TICK) {	4401	if ($NEXT_TICK) {
3947	my $jitter = $TICK_START - $NEXT_TICK;	4402	my $jitter = $TICK_START - $NEXT_TICK;
3948	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4403	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3949	warn "jitter $JITTER\n";#d#	4404	debug "jitter $JITTER\n";#d#
3950	}	4405	}
3951	}	4406	}
3952	}	4407	}
3953		4408
3954	{	4409	{
3955	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
3956		4412
3957	BDB::min_parallel 8;	4413	BDB::min_parallel 16;
3958	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
3959	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
3960		4416
3961	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
3962	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
3963	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3964	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4420	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3989	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3990	};	4446	};
3991	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3992	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3993	};	4449	};
		4450
		4451	info "database initialised";
3994	}	4452	}
3995		4453
3996	{	4454	{
3997	# configure IO::AIO	4455	# configure IO::AIO
3998		4456
		4457	info "initialising aio";
3999	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4000	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4001	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4002	}	4462	}
4003		4463
4004	my $_log_backtrace;	4464	our $_log_backtrace;
		4465	our $_log_backtrace_last;
4005		4466
4006	sub _log_backtrace {	4467	sub _log_backtrace {
4007	my ($msg, @addr) = @_;	4468	my ($msg, @addr) = @_;
4008		4469
4009	$msg =~ s/\n//;	4470	$msg =~ s/\n$//;
4010		4471
		4472	if ($_log_backtrace_last eq $msg) {
		4473	LOG llevInfo, "[ABT] $msg\n";
		4474	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4011	# limit the # of concurrent backtraces	4475	# limit the # of concurrent backtraces
4012	if ($_log_backtrace < 2) {	4476	} elsif ($_log_backtrace < 2) {
		4477	$_log_backtrace_last = $msg;
4013	++$_log_backtrace;	4478	++$_log_backtrace;
4014	my $perl_bt = Carp::longmess $msg;	4479	my $perl_bt = Carp::longmess $msg;
4015	async {	4480	async {
4016	$Coro::current->{desc} = "abt $msg";	4481	$Coro::current->{desc} = "abt $msg";
4017		4482
…		…
4037	LOG llevInfo, "[ABT] $_\n" for @bt;	4502	LOG llevInfo, "[ABT] $_\n" for @bt;
4038	--$_log_backtrace;	4503	--$_log_backtrace;
4039	};	4504	};
4040	} else {	4505	} else {
4041	LOG llevInfo, "[ABT] $msg\n";	4506	LOG llevInfo, "[ABT] $msg\n";
4042	LOG llevInfo, "[ABT] [suppressed]\n";	4507	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4043	}	4508	}
4044	}	4509	}
4045		4510
4046	# load additional modules	4511	# load additional modules
4047	require "cf/$_.pm" for @EXTRA_MODULES;	4512	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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