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.485 by root, Mon Oct 12 14:12:54 2009 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008 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;
33	use Opcode;	31	use Opcode;
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37
38	use Guard ();	35	use Carp ();
		36
		37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
39	use Coro ();	41	use Coro ();
40	use Coro::State;	42	use Coro::State;
41	use Coro::Handle;	43	use Coro::Handle;
42	use Coro::EV;	44	use Coro::EV;
43	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
49	use Coro::AIO;	51	use Coro::AIO;
50	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
51	use Coro::Storable;	53	use Coro::Storable;
52	use Coro::Util ();	54	use Coro::Util ();
53		55
		56	use Guard ();
54	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
55	use BDB ();	58	use BDB ();
56	use Data::Dumper;	59	use Data::Dumper;
57	use Digest::MD5;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
		119
		120	our $OUTPUT_RATE_MIN = 3000;
		121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
112		125
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	128	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	134	our $DB_ENV;
122		135
123	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		137
125	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		140
127	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
129	our $NOW;	144	our $NOW;
130		145
131	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		157
143	our @POST_INIT;	158	our @POST_INIT;
144		159
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
147		165
148	binmode STDOUT;	166	binmode STDOUT;
149	binmode STDERR;	167	binmode STDERR;
150		168
151	# read virtual server time, if available	169	# read virtual server time, if available
…		…
162		180
163	our $EMERGENCY_POSITION;	181	our $EMERGENCY_POSITION;
164		182
165	sub cf::map::normalise;	183	sub cf::map::normalise;
166		184
		185	sub in_main() {
		186	$Coro::current == $Coro::main
		187	}
		188
167	#############################################################################	189	#############################################################################
168		190
169	%REFLECT = ();	191	%REFLECT = ();
170	for (@REFLECT) {	192	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	193	my $reflect = JSON::XS::decode_json $_;
…		…
181		203
182	=over 4	204	=over 4
183		205
184	=item $cf::UPTIME	206	=item $cf::UPTIME
185		207
186	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
187		224
188	=item $cf::RUNTIME	225	=item $cf::RUNTIME
189		226
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	228	every server tick.
192		229
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		233
197	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
200	database environment.	237	database environment.
201		238
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	239	=item $cf::LOADAVG
211		240
212	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223	from wherever your confdir points to.	252	from wherever your confdir points to.
224		253
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		255
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
228	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
230		277
231	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
232		279
233	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235	that call.	282	that call.
236		283
237	=item %cf::REFLECT	284	=item %cf::REFLECT
238		285
…		…
242		289
243	=back	290	=back
244		291
245	=cut	292	=cut
246		293
		294	sub error(@) { LOG llevError, join "", @_ }
		295	sub warn (@) { LOG llevWarn , join "", @_ }
		296	sub info (@) { LOG llevInfo , join "", @_ }
		297	sub debug(@) { LOG llevDebug, join "", @_ }
		298	sub trace(@) { LOG llevTrace, join "", @_ }
		299
247	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	301	my $msg = join "", @_;
249		302
250	$msg .= "\n"	303	$msg .= "\n"
251	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
252		305
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	306	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		307
255	LOG llevError, $msg;	308	LOG llevWarn, $msg;
256	};	309	};
257		310
258	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
260		313
261	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
262		315
263	if ($Coro::current == $Coro::main) {#d#	316	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	318	return;#d#
266	}#d#	319	}#d#
267		320
268	# kill coroutine otherwise	321	# kill coroutine otherwise
269	Coro::terminate	322	Coro::terminate
…		…
289	)) {	342	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	344	}
292		345
293	$EV::DIED = sub {	346	$EV::DIED = sub {
294	warn "error in event callback: @_";	347	warn "error in event callback: $@";
295	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
296		354
297	#############################################################################	355	#############################################################################
298		356
299	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
300		358
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	380	$d
323	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
324	}	382	}
325		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
326	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
327		437
328	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
329		439
330	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		447
338	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
340		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
341	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
342		483
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
345		486
346	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	488	is a reload or not.
348		489
349	=cut	490	=cut
350		491
351	sub post_init(&) {	492	sub post_init(&) {
352	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
353	}	511	}
354		512
355	=item cf::lock_wait $string	513	=item cf::lock_wait $string
356		514
357	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	554	}
397		555
398	=item cf::periodic $interval, $cb	556	=item cf::periodic $interval, $cb
399		557
400	Like EV::periodic, but randomly selects a starting point so that the actions	558	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	559	get spread over time.
402		560
403	=cut	561	=cut
404		562
405	sub periodic($$) {	563	sub periodic($$) {
406	my ($interval, $cb) = @_;	564	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
411	}	569	}
412		570
413	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
414		572
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority les than zero, interactive jobs
		579	should use 100 or more.
418		580
419	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
421		583
422	Useful for short background jobs.	584	Useful for short background jobs.
423		585
424	=cut	586	=cut
425		587
426	our @SLOT_QUEUE;	588	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	589	our $SLOT_QUEUE;
		590	our $SLOT_DECAY = 0.9;
428		591
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	592	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	593	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	594	$Coro::current->desc ("timeslot manager");
432		595
433	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
		597	my $busy;
434		598
435	while () {	599	while () {
436	next_job:	600	next_job:
		601
437	my $avail = cf::till_tick;	602	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	603
439	for (0 .. $#SLOT_QUEUE) {	604	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	605	if ($SLOT_QUEUE[$_][0] <= $avail) {
		606	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	607	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	608	$job->[2]->send;
443	Coro::cede;	609	Coro::cede;
444	goto next_job;	610	goto next_job;
445	}	611	} else {
		612	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	613	}
447	}	614	}
448		615
449	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
452	$signal->wait;
453	} else {	619	} else {
		620	$busy = 0;
454	Coro::schedule;	621	Coro::schedule;
455	}	622	}
456	}	623	}
457	};	624	};
458		625
459	sub get_slot($;$$) {	626	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	627	return if tick_inhibit || $Coro::current == $Coro::main;
461		628
462	my ($time, $pri, $name) = @_;	629	my ($time, $pri, $name) = @_;
463		630
464	$time = $TICK * .6 if $time > $TICK * .6;	631	$time = clamp $time, 0.01, $TICK * .6;
		632
465	my $sig = new Coro::Signal;	633	my $sig = new Coro::Signal;
466		634
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	635	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	636	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	637	$SLOT_QUEUE->ready;
…		…
495	=cut	663	=cut
496		664
497	sub sync_job(&) {	665	sub sync_job(&) {
498	my ($job) = @_;	666	my ($job) = @_;
499		667
500	if ($Coro::current == $Coro::main) {	668	if (in_main) {
501	my $time = EV::time;	669	my $time = AE::time;
502		670
503	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
505		673
506	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
507		675
508	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
509		677
510	my $busy = 1;	678	my $busy = 1;
511	my @res;	679	my @res;
512		680
513	(async {	681	(async {
514	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	683	@res = eval { $job->() };
516	warn $@ if $@;	684	error $@ if $@;
517	undef $busy;	685	undef $busy;
518	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
519		687
520	while ($busy) {	688	while ($busy) {
521	if (Coro::nready) {	689	if (Coro::nready) {
…		…
523	} else {	691	} else {
524	EV::loop EV::LOOP_ONESHOT;	692	EV::loop EV::LOOP_ONESHOT;
525	}	693	}
526	}	694	}
527		695
528	my $time = EV::time - $time;	696	my $time = AE::time - $time;
529		697
530	$TICK_START += $time; # do not account sync jobs to server load	698	$TICK_START += $time; # do not account sync jobs to server load
531		699
532	wantarray ? @res : $res[0]	700	wantarray ? @res : $res[0]
533	} else {	701	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
556		724
557	$coro	725	$coro
558	}	726	}
559		727
560	=item fork_call { }, $args	728	=item fork_call { }, @args
561		729
562	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
566		734
567	=cut	735	=cut
568		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
569	sub fork_call(&@) {	741	sub fork_call(&@) {
570	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
571		743
572	# we seemingly have to make a local copy of the whole thing,	744	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
575		747
576	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
577	reset_signals;	749	cf::post_fork;
578	&$cb	750	&$cb
579	}, @args;	751	} @args;
580		752
581	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
		754	}
		755
		756	sub objinfo {
		757	(
		758	"counter value" => cf::object::object_count,
		759	"objects created" => cf::object::create_count,
		760	"objects destroyed" => cf::object::destroy_count,
		761	"freelist size" => cf::object::free_count,
		762	"allocated objects" => cf::object::objects_size,
		763	"active objects" => cf::object::actives_size,
		764	)
582	}	765	}
583		766
584	=item $coin = coin_from_name $name	767	=item $coin = coin_from_name $name
585		768
586	=cut	769	=cut
…		…
623	within each server.	806	within each server.
624		807
625	=cut	808	=cut
626		809
627	sub db_table($) {	810	sub db_table($) {
		811	cf::error "db_get called from main context"
		812	if $Coro::current == $Coro::main;
		813
628	my ($name) = @_;	814	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	815	my $db = BDB::db_create $DB_ENV;
630		816
631	eval {	817	eval {
632	$db->set_flags (BDB::CHKSUM);	818	$db->set_flags (BDB::CHKSUM);
…		…
642	}	828	}
643		829
644	our $DB;	830	our $DB;
645		831
646	sub db_init {	832	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	833	$DB ||= db_table "db";
649	};
650	}	834	}
651		835
652	sub db_get($$) {	836	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	837	my $key = "$_[0]/$_[1]";
654		838
655	cf::sync_job {	839	cf::error "db_get called from main context"
		840	if $Coro::current == $Coro::main;
		841
656	BDB::db_get $DB, undef, $key, my $data;	842	BDB::db_get $DB, undef, $key, my $data;
657		843
658	$! ? ()	844	$! ? ()
659	: $data	845	: $data
660	}
661	}	846	}
662		847
663	sub db_put($$$) {	848	sub db_put($$$) {
664	BDB::dbreq_pri 4;	849	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	850	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
693		878
694	my @data;	879	my @data;
695	my $md5;	880	my $md5;
696		881
697	for (0 .. $#$src) {	882	for (0 .. $#$src) {
698	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
699	or Carp::croak "$src->[$_]: $!";
700	}	884	}
701		885
702	# if processing is expensive, check	886	# if processing is expensive, check
703	# checksum first	887	# checksum first
704	if (1) {	888	if (1) {
…		…
717		901
718	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
719	}	903	}
720	}	904	}
721		905
722	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
723	my $data = $process->(\@data);	907	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
725		909
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		911
728	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	914	db_put cache => "$id/meta", $meta;
731		915
…		…
741		925
742	=cut	926	=cut
743		927
744	sub datalog($@) {	928	sub datalog($@) {
745	my ($type, %kv) = @_;	929	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	930	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	931	}
748		932
749	=back	933	=back
750		934
751	=cut	935	=cut
…		…
946		1130
947	} elsif (exists $cb_id{$type}) {	1131	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1132	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1133
950	} elsif (ref $type) {	1134	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1135	error "attaching objects not supported, ignoring.\n";
952		1136
953	} else {	1137	} else {
954	shift @arg;	1138	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1139	error "attach argument '$type' not supported, ignoring.\n";
956	}	1140	}
957	}	1141	}
958	}	1142	}
959		1143
960	sub _object_attach {	1144	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1154	_attach $registry, $klass, @attach;
971	}	1155	}
972		1156
973	$obj->{$name} = \%arg;	1157	$obj->{$name} = \%arg;
974	} else {	1158	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1159	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1160	}
977		1161
978	$obj->{_attachment}{$name} = undef;	1162	$obj->{_attachment}{$name} = undef;
979	}	1163	}
980		1164
…		…
1039		1223
1040	for (@$callbacks) {	1224	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1225	eval { &{$_->[1]} };
1042		1226
1043	if ($@) {	1227	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1228	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1229	override;
1047	}	1230	}
1048		1231
1049	return 1 if $override;	1232	return 1 if $override;
1050	}	1233	}
…		…
1129	for (@$attach) {	1312	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1313	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1314	_attach $registry, $klass, @attach;
1132	}	1315	}
1133	} else {	1316	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1317	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1318	}
1136	}	1319	}
1137	}	1320	}
1138		1321
1139	cf::attachable->attach (	1322	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1349	my ($filename, $rdata, $objs) = @_;
1167		1350
1168	sync_job {	1351	sync_job {
1169	if (length $$rdata) {	1352	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1353	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1354	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1355	$decname, length $$rdata, scalar @$objs
		1356	if $VERBOSE_IO;
1173		1357
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1358	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1359	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1360	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1361	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1383	aio_rename "$filename~", $filename;
1200		1384
1201	$filename =~ s%/[^/]+$%%;	1385	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1386	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1387	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1388	error "unable to save objects: $filename~: $!\n";
1205	}	1389	}
1206	} else {	1390	} else {
1207	aio_unlink $filename;	1391	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1392	aio_unlink "$filename.pst";
1209	}	1393	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1417	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1418	$av = $st->{objs};
1235	}	1419	}
1236		1420
1237	utf8::decode (my $decname = $filename);	1421	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1422	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1423	$decname, length $data, scalar @{$av || []}
		1424	if $VERBOSE_IO;
1240		1425
1241	($data, $av)	1426	($data, $av)
1242	}	1427	}
1243		1428
1244	=head2 COMMAND CALLBACKS	1429	=head2 COMMAND CALLBACKS
…		…
1248	=cut	1433	=cut
1249		1434
1250	#############################################################################	1435	#############################################################################
1251	# command handling &c	1436	# command handling &c
1252		1437
1253	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1254		1439
1255	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1256	$name.	1441	$name.
1257		1442
1258	=cut	1443	=cut
…		…
1264	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1265		1450
1266	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1267	}	1452	}
1268		1453
1269	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1270		1455
1271	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1272	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1273	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1274	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1275	has logged in successfully.	1460	has logged in successfully.
1276		1461
1277	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1278	called.
1279		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1280	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1281		1470
1282	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1283	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1284	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1285	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1286	log-in.	1475	log-in.
1287		1476
1288	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1289	called.
1290		1478
1291	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1292		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1293	sub register_extcmd {	1486	sub register_extcmd($$) {
1294	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1295		1488
1296	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1297	}	1490	}
1298		1491
1299	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1300	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1301		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1302	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
1303	}	1502	}
1304		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
		1508	}
		1509
1305	use File::Glob ();	1510	use File::Glob ();
1306		1511
1307	cf::player->attach (	1512	cf::player->attach (
1308	on_command => sub {	1513	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1514	my ($pl, $name, $params) = @_;
1310		1515
1311	my $cb = $COMMAND{$name}	1516	my $cb = $COMMAND{$name}
1312	or return;	1517	or return;
1313		1518
…		…
1321	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1322		1527
1323	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324		1529
1325	if (ref $msg) {	1530	if (ref $msg) {
1326	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327	"ARRAY" eq ref $msg
1328	? @$msg
1329	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330		1532
1331	my @reply;
1332
1333	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1334	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1335	}	1551	}
1336		1552
1337	$pl->ext_reply ($reply, @reply)
1338	if $reply;
1339
1340	} else {	1553	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1555	}
1343		1556
1344	cf::override;	1557	cf::override;
1345	},	1558	},
1346	);	1559	);
…		…
1356	};	1569	};
1357		1570
1358	$grp	1571	$grp
1359	}	1572	}
1360		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1361	sub load_extensions {	1585	sub load_extensions {
		1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
		1589
1362	cf::sync_job {	1590	cf::sync_job {
1363	my %todo;	1591	my %todo;
1364		1592
1365	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1594	next unless -r $path;
…		…
1384		1612
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1613	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1614	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1615
1388	$ext{source} =	1616	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1617	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1618	. "#line 1 \"$path\"\n{\n"
1391	. $source	1619	. $source
1392	. "\n};\n1";	1620	. "\n};\n1";
1393		1621
1394	$todo{$base} = \%ext;	1622	$todo{$base} = \%ext;
1395	}	1623	}
1396		1624
		1625	my $pass = 0;
1397	my %done;	1626	my %done;
1398	while (%todo) {	1627	while (%todo) {
1399	my $progress;	1628	my $progress;
1400		1629
		1630	++$pass;
		1631
		1632	ext:
1401	while (my ($k, $v) = each %todo) {	1633	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1634	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1635	next ext
1404	unless exists $done{$_};	1636	unless exists $done{$_};
1405	}	1637	}
1406		1638
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1640
1409	unless (eval $v->{source}) {	1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
		1650	my $active = eval $source;
		1651
		1652	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1653	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1654
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1656	if exists $v->{meta}{mandatory};
1417		1657
1418	warn $msg;	1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1659	delete $todo{$k};
		1660	} else {
		1661	$done{$k} = delete $todo{$k};
		1662	push @EXTS, $v->{pkg};
		1663	$progress = 1;
		1664
		1665	info "$v->{base}: extension inactive.\n"
		1666	unless $active;
1419	}	1667	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1668	}
1425		1669
1426	skip:	1670	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1671	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1672
		1673	while (my ($k, $v) = each %todo) {
		1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1675	if exists $v->{meta}{mandatory};
		1676	}
		1677
		1678	last;
		1679	}
1429	}	1680	}
1430	};	1681	};
1431	}	1682	}
1432		1683
1433	#############################################################################	1684	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1768	$cf::PLAYER{$login} = $pl
1518	}	1769	}
1519	}	1770	}
1520	}	1771	}
1521		1772
		1773	cf::player->attach (
		1774	on_load => sub {
		1775	my ($pl, $path) = @_;
		1776
		1777	# restore slots saved in save, below
		1778	my $slots = delete $pl->{_slots};
		1779
		1780	$pl->ob->current_weapon ($slots->[0]);
		1781	$pl->combat_ob ($slots->[1]);
		1782	$pl->ranged_ob ($slots->[2]);
		1783	},
		1784	);
		1785
1522	sub save($) {	1786	sub save($) {
1523	my ($pl) = @_;	1787	my ($pl) = @_;
1524		1788
1525	return if $pl->{deny_save};	1789	return if $pl->{deny_save};
1526		1790
…		…
1531		1795
1532	aio_mkdir playerdir $pl, 0770;	1796	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1797	$pl->{last_save} = $cf::RUNTIME;
1534		1798
1535	cf::get_slot 0.01;	1799	cf::get_slot 0.01;
		1800
		1801	# save slots, to be restored later
		1802	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1803
1537	$pl->save_pl ($path);	1804	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1805	cf::cede_to_tick;
1539	}	1806	}
1540		1807
…		…
1574	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1575		1842
1576	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1845
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580	$pl->deactivate;	1847	$pl->deactivate;
		1848
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1584	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1585		1854
1586	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1588	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1642	\@logins	1911	\@logins
1643	}	1912	}
1644		1913
1645	=item $player->maps	1914	=item $player->maps
1646		1915
		1916	=item cf::player::maps $login
		1917
1647	Returns an arrayref of map paths that are private for this	1918	Returns an arrayref of map paths that are private for this
1648	player. May block.	1919	player. May block.
1649		1920
1650	=cut	1921	=cut
1651		1922
…		…
1672		1943
1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674		1945
1675	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1676		1947
1677	=item $player->ext_reply ($msgid, @msg)
1678
1679	Sends an ext reply to the player.
1680
1681	=cut
1682
1683	sub ext_reply($$@) {
1684	my ($self, $id, @msg) = @_;
1685
1686	$self->ns->ext_reply ($id, @msg)
1687	}
1688
1689	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1690		1949
1691	Sends an ext event to the client.	1950	Sends an ext event to the client.
1692		1951
1693	=cut	1952	=cut
…		…
1712		1971
1713	=cut	1972	=cut
1714		1973
1715	sub find_by_path($) {	1974	sub find_by_path($) {
1716	my ($path) = @_;	1975	my ($path) = @_;
		1976
		1977	$path =~ s/^~[^\/]*//; # skip ~login
1717		1978
1718	my ($match, $specificity);	1979	my ($match, $specificity);
1719		1980
1720	for my $region (list) {	1981	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1982	if ($region->{match} && $path =~ $region->{match}) {
…		…
1750	sub generate_random_map {	2011	sub generate_random_map {
1751	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1752		2013
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		2015
1755	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767	(cf::region::find $rmp->{region}), $rmp->{custom}
1768	)
1769	}	2017	}
1770		2018
1771	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1772		2020
1773	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1778		2026
1779	sub register {	2027	sub register {
1780	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	2029	my $pkg = caller;
1782		2030
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		2032
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	2034	}
1788		2035
1789	# also paths starting with '/'	2036	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2037	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		2038
1792	sub thawer_merge {	2039	sub thawer_merge {
1793	my ($self, $merge) = @_;	2040	my ($self, $merge) = @_;
1794		2041
1795	# we have to keep some variables in memory intact	2042	# we have to keep some variables in memory intact
…		…
1800	}	2047	}
1801		2048
1802	sub normalise {	2049	sub normalise {
1803	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1804		2051
1805	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1806		2053
1807	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1808		2055
1809	# map plan:	2056	# map plan:
1810	#	2057	#
…		…
1825	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1826	$path = "$base/$path";	2073	$path = "$base/$path";
1827	}	2074	}
1828		2075
1829	for ($path) {	2076	for ($path) {
1830	redo if s{//}{/};
1831	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1832	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1833	}	2079	}
1834		2080
1835	$path	2081	$path
…		…
1849	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1850	return $self;	2096	return $self;
1851	}	2097	}
1852	}	2098	}
1853		2099
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	2101	()
1856	}	2102	}
1857		2103
		2104	# may re-bless or do other evil things
1858	sub init {	2105	sub init {
1859	my ($self) = @_;	2106	my ($self) = @_;
1860		2107
1861	$self	2108	$self
1862	}	2109	}
…		…
1927	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1928		2175
1929	1	2176	1
1930	}	2177	}
1931		2178
		2179	# used to laod the header of an original map
1932	sub load_header_orig {	2180	sub load_header_orig {
1933	my ($self) = @_;	2181	my ($self) = @_;
1934		2182
1935	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1936	}	2184	}
1937		2185
		2186	# used to laod the header of an instantiated map
1938	sub load_header_temp {	2187	sub load_header_temp {
1939	my ($self) = @_;	2188	my ($self) = @_;
1940		2189
1941	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
1942	}	2191	}
1943		2192
		2193	# called after loading the header from an instantiated map
1944	sub prepare_temp {	2194	sub prepare_temp {
1945	my ($self) = @_;	2195	my ($self) = @_;
1946		2196
1947	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
1948	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
1949	# safety	2199	# safety
1950	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
1951	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
1952	}	2202	}
1953		2203
		2204	# called after loading the header from an original map
1954	sub prepare_orig {	2205	sub prepare_orig {
1955	my ($self) = @_;	2206	my ($self) = @_;
1956		2207
1957	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
1958	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1982		2233
1983	sub find;	2234	sub find;
1984	sub find {	2235	sub find {
1985	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
1986		2237
		2238	cf::cede_to_tick;
		2239
1987	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
1988		2241
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
1991		2244
1992	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2009		2262
2010	$cf::MAP{$path} = $map	2263	$cf::MAP{$path} = $map
2011	}	2264	}
2012	}	2265	}
2013		2266
2014	sub pre_load { }	2267	sub pre_load { }
2015	sub post_load { }	2268	#sub post_load { } # XS
2016		2269
2017	sub load {	2270	sub load {
2018	my ($self) = @_;	2271	my ($self) = @_;
2019		2272
2020	local $self->{deny_reset} = 1; # loading can take a long time	2273	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2023		2276
2024	{	2277	{
2025	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2026		2279
2027	return unless $self->valid;	2280	return unless $self->valid;
2028	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2029
2030	$self->in_memory (cf::MAP_LOADING);
2031		2282
2032	$self->alloc;	2283	$self->alloc;
2033		2284
2034	$self->pre_load;	2285	$self->pre_load;
2035	cf::cede_to_tick;	2286	cf::cede_to_tick;
2036		2287
		2288	if (exists $self->{load_path}) {
2037	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2038	$f->skip_block;	2290	$f->skip_block;
2039	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2040	or return;	2292	or return;
2041		2293
2042	$self->post_load_original	2294	$self->post_load_original
2043	if delete $self->{load_original};	2295	if delete $self->{load_original};
2044		2296
2045	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2046	utf8::encode $uniq;	2298	utf8::encode $uniq;
2047	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2048	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2049	$self->clear_unique_items;	2301	$self->clear_unique_items;
2050	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2051	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2052	}	2305	}
2053	}	2306	}
2054	}
2055		2307
2056	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2057		2315
2058	cf::cede_to_tick;	2316	cf::cede_to_tick;
2059	# now do the right thing for maps	2317	# now do the right thing for maps
2060	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2061	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2065	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2066	$self->decay_objects;	2324	$self->decay_objects;
2067	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2068	$self->update_buttons;	2326	$self->update_buttons;
2069	cf::cede_to_tick;	2327	cf::cede_to_tick;
2070	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2071	}	2329	}
2072		2330
2073	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2074	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2075
2076	$self->in_memory (cf::MAP_ACTIVE);
2077	}	2333	}
2078		2334
2079	$self->post_load;	2335	$self->post_load;
2080	}
2081		2336
		2337	1
		2338	}
		2339
		2340	# customize the map for a given player, i.e.
		2341	# return the _real_ map. used by e.g. per-player
		2342	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2343	sub customise_for {
2083	my ($self, $ob) = @_;	2344	my ($self, $ob) = @_;
2084		2345
2085	return find "~" . $ob->name . "/" . $self->{path}	2346	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2347	if $self->per_player;
…		…
2089	# if $self->per_party;	2350	# if $self->per_party;
2090		2351
2091	$self	2352	$self
2092	}	2353	}
2093		2354
2094	# find and load all maps in the 3x3 area around a map
2095	sub load_neighbours {
2096	my ($map) = @_;
2097
2098	my @neigh; # diagonal neighbours
2099
2100	for (0 .. 3) {
2101	my $neigh = $map->tile_path ($_)
2102	or next;
2103	$neigh = find $neigh, $map
2104	or next;
2105	$neigh->load;
2106
2107	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}
2111
2112	for (grep defined $_->[0], @neigh) {
2113	my ($path, $origin) = @$_;
2114	my $neigh = find $path, $origin
2115	or next;
2116	$neigh->load;
2117	}
2118	}
2119
2120	sub find_sync {	2355	sub find_sync {
2121	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2122		2357
2123	cf::sync_job { find $path, $origin }	2358	# it's a bug to call this from the main context
		2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2360	if $Coro::current == $Coro::main;
		2361
		2362	find $path, $origin
2124	}	2363	}
2125		2364
2126	sub do_load_sync {	2365	sub do_load_sync {
2127	my ($map) = @_;	2366	my ($map) = @_;
2128		2367
		2368	# it's a bug to call this from the main context
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2131		2371
2132	cf::sync_job { $map->load };	2372	$map->load;
2133	}	2373	}
2134		2374
2135	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2137		2377
2138	sub find_async {	2378	sub find_async {
2139	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2140		2380
2141	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2142		2382
2143	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2144	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2145	}	2385	}
2146		2386
2147	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2148		2388
2149	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2163	$MAP_PREFETCHER->prio (6);	2403	$MAP_PREFETCHER->prio (6);
2164		2404
2165	()	2405	()
2166	}	2406	}
2167		2407
		2408	# common code, used by both ->save and ->swapout
2168	sub save {	2409	sub _save {
2169	my ($self) = @_;	2410	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2411
2173	$self->{last_save} = $cf::RUNTIME;	2412	$self->{last_save} = $cf::RUNTIME;
2174		2413
2175	return unless $self->dirty;	2414	return unless $self->dirty;
2176		2415
…		…
2196	} else {	2435	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2436	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2437	}
2199	}	2438	}
2200		2439
		2440	sub save {
		2441	my ($self) = @_;
		2442
		2443	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2444
		2445	$self->_save;
		2446	}
		2447
2201	sub swap_out {	2448	sub swap_out {
2202	my ($self) = @_;	2449	my ($self) = @_;
2203		2450
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2452
		2453	return if !$self->linkable;
		2454	return if $self->{deny_save};
2209	return if $self->players;	2455	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2456
		2457	# first deactivate the map and "unlink" it from the core
		2458	$self->deactivate;
		2459	$_->clear_links_to ($self) for values %cf::MAP;
		2460	$self->state (cf::MAP_SWAPPED);
		2461
		2462	# then atomically save
		2463	$self->_save;
		2464
		2465	# then free the map
		2466	$self->clear;
		2467	}
		2468
		2469	sub reset_at {
		2470	my ($self) = @_;
		2471
		2472	# TODO: safety, remove and allow resettable per-player maps
2211	return if $self->{deny_save};	2473	return 1e99 if $self->{deny_reset};
2212		2474
		2475	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2476	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2477
		2478	$time + $to
		2479	}
		2480
		2481	sub should_reset {
		2482	my ($self) = @_;
		2483
		2484	$self->reset_at <= $cf::RUNTIME
		2485	}
		2486
		2487	sub reset {
		2488	my ($self) = @_;
		2489
		2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2491
		2492	return if $self->players;
		2493
		2494	cf::trace "resetting map ", $self->path, "\n";
		2495
2213	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
		2497
		2498	# need to save uniques path
		2499	unless ($self->{deny_save}) {
		2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2501
		2502	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2503	if $uniq;
		2504	}
		2505
		2506	delete $cf::MAP{$self->path};
2214		2507
2215	$self->deactivate;	2508	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2509	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2510	$self->clear;
2218	}
2219
2220	sub reset_at {
2221	my ($self) = @_;
2222
2223	# TODO: safety, remove and allow resettable per-player maps
2224	return 1e99 if $self->{deny_reset};
2225
2226	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229	$time + $to
2230	}
2231
2232	sub should_reset {
2233	my ($self) = @_;
2234
2235	$self->reset_at <= $cf::RUNTIME
2236	}
2237
2238	sub reset {
2239	my ($self) = @_;
2240
2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243	return if $self->players;
2244
2245	warn "resetting map ", $self->path, "\n";
2246
2247	$self->in_memory (cf::MAP_SWAPPED);
2248
2249	# need to save uniques path
2250	unless ($self->{deny_save}) {
2251	my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2254	if $uniq;
2255	}
2256
2257	delete $cf::MAP{$self->path};
2258
2259	$self->deactivate;
2260	$_->clear_links_to ($self) for values %cf::MAP;
2261	$self->clear;
2262		2511
2263	$self->unlink_save;	2512	$self->unlink_save;
2264	$self->destroy;	2513	$self->destroy;
2265	}	2514	}
2266		2515
…		…
2274		2523
2275	delete $cf::MAP{$self->path};	2524	delete $cf::MAP{$self->path};
2276		2525
2277	$self->unlink_save;	2526	$self->unlink_save;
2278		2527
2279	bless $self, "cf::map";	2528	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2529	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2530	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2531	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2532	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2533
…		…
2341	: normalise $_	2590	: normalise $_
2342	} @{ aio_readdir $UNIQUEDIR or [] }	2591	} @{ aio_readdir $UNIQUEDIR or [] }
2343	]	2592	]
2344	}	2593	}
2345		2594
		2595	=item cf::map::static_maps
		2596
		2597	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2598	file in the shared directory excluding F</styles> and F</editor>). May
		2599	block.
		2600
		2601	=cut
		2602
		2603	sub static_maps() {
		2604	my @dirs = "";
		2605	my @maps;
		2606
		2607	while (@dirs) {
		2608	my $dir = shift @dirs;
		2609
		2610	next if $dir eq "/styles" || $dir eq "/editor";
		2611
		2612	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2613	or return;
		2614
		2615	for (@$files) {
		2616	s/\.map$// or next;
		2617	utf8::decode $_;
		2618	push @maps, "$dir/$_";
		2619	}
		2620
		2621	push @dirs, map "$dir/$_", @$dirs;
		2622	}
		2623
		2624	\@maps
		2625	}
		2626
2346	=back	2627	=back
2347		2628
2348	=head3 cf::object	2629	=head3 cf::object
2349		2630
2350	=cut	2631	=cut
…		…
2482		2763
2483	Freezes the player and moves him/her to a special map (C<{link}>).	2764	Freezes the player and moves him/her to a special map (C<{link}>).
2484		2765
2485	The player should be reasonably safe there for short amounts of time (e.g.	2766	The player should be reasonably safe there for short amounts of time (e.g.
2486	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2767	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487	though, as the palyer cannot control the character while it is on the link	2768	though, as the player cannot control the character while it is on the link
2488	map.	2769	map.
2489		2770
2490	Will never block.	2771	Will never block.
2491		2772
2492	=item $player_object->leave_link ($map, $x, $y)	2773	=item $player_object->leave_link ($map, $x, $y)
…		…
2513	sub cf::object::player::enter_link {	2794	sub cf::object::player::enter_link {
2514	my ($self) = @_;	2795	my ($self) = @_;
2515		2796
2516	$self->deactivate_recursive;	2797	$self->deactivate_recursive;
2517		2798
		2799	++$self->{_link_recursion};
		2800
2518	return if UNIVERSAL::isa $self->map, "ext::map_link";	2801	return if UNIVERSAL::isa $self->map, "ext::map_link";
2519		2802
2520	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2803	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521	if $self->map && $self->map->{path} ne "{link}";	2804	if $self->map && $self->map->{path} ne "{link}";
2522		2805
2523	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2806	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2524	}	2807	}
2525		2808
2526	sub cf::object::player::leave_link {	2809	sub cf::object::player::leave_link {
2527	my ($self, $map, $x, $y) = @_;	2810	my ($self, $map, $x, $y) = @_;
2528		2811
…		…
2545	($x, $y) = (-1, -1)	2828	($x, $y) = (-1, -1)
2546	unless (defined $x) && (defined $y);	2829	unless (defined $x) && (defined $y);
2547		2830
2548	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2549	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2550	if $x <=0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2551		2834
2552	$map->load;	2835	$map->load;
2553	$map->load_neighbours;
2554		2836
2555	return unless $self->contr->active;	2837	return unless $self->contr->active;
2556		2838
2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558	$self->enter_map ($map, $x, $y);	2840	if ($self->enter_map ($map, $x, $y)) {
2559		2841	# entering was successful
		2842	delete $self->{_link_recursion};
2560	# only activate afterwards, to support waiting in hooks	2843	# only activate afterwards, to support waiting in hooks
2561	$self->activate_recursive;	2844	$self->activate_recursive;
2562	}	2845	}
2563		2846
		2847	}
		2848
2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2849	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565		2850
2566	Moves the player to the given map-path and coordinates by first freezing	2851	Moves the player to the given map-path and coordinates by first freezing
2567	her, loading and preparing them map, calling the provided $check callback	2852	her, loading and preparing them map, calling the provided $check callback
2568	that has to return the map if sucecssful, and then unfreezes the player on	2853	that has to return the map if sucecssful, and then unfreezes the player on
2569	the new (success) or old (failed) map position. In either case, $done will	2854	the new (success) or old (failed) map position. In either case, $done will
…		…
2576		2861
2577	our $GOTOGEN;	2862	our $GOTOGEN;
2578		2863
2579	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2580	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
		2866
		2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2868	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2869	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2870	($path, $x, $y) = @$EMERGENCY_POSITION;
		2871	}
2581		2872
2582	# do generation counting so two concurrent goto's will be executed in-order	2873	# do generation counting so two concurrent goto's will be executed in-order
2583	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2874	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584		2875
2585	$self->enter_link;	2876	$self->enter_link;
…		…
2605	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2606	}	2897	}
2607	}	2898	}
2608		2899
2609	my $map = eval {	2900	my $map = eval {
2610	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2611		2902
2612	if ($map) {	2903	if ($map) {
2613	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2614	$map = $check->($map) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2615	} else {	2906	} else {
2616	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2907	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617	}	2908	}
2618		2909
2619	$map	2910	$map
…		…
2627	if ($gen == $self->{_goto_generation}) {	2918	if ($gen == $self->{_goto_generation}) {
2628	delete $self->{_goto_generation};	2919	delete $self->{_goto_generation};
2629	$self->leave_link ($map, $x, $y);	2920	$self->leave_link ($map, $x, $y);
2630	}	2921	}
2631		2922
2632	$done->() if $done;	2923	$done->($self) if $done;
2633	})->prio (1);	2924	})->prio (1);
2634	}	2925	}
2635		2926
2636	=item $player_object->enter_exit ($exit_object)	2927	=item $player_object->enter_exit ($exit_object)
2637		2928
…		…
2705	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2706		2997
2707	unless (eval {	2998	unless (eval {
2708	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2709		3000
2710	# random map handling
2711	{
2712	my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714	prepare_random_map $exit
2715	if $exit->slaying eq "/!";
2716	}
2717
2718	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2719	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2720	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2721		3027
2722	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2723		3029
2724	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2725	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2730	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2731	. "I'll try to bring you back to the map you were before. "	3037	. "I'll try to bring you back to the map you were before. "
2732	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2733	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2734		3040
2735	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2736	$self->leave_link;	3042	$self->leave_link;
2737	}	3043	}
2738	})->prio (1);	3044	})->prio (1);
2739	}	3045	}
2740		3046
…		…
2752	sub cf::client::send_drawinfo {	3058	sub cf::client::send_drawinfo {
2753	my ($self, $text, $flags) = @_;	3059	my ($self, $text, $flags) = @_;
2754		3060
2755	utf8::encode $text;	3061	utf8::encode $text;
2756	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3062	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		3063	}
		3064
		3065	=item $client->send_big_packet ($pkt)
		3066
		3067	Like C<send_packet>, but tries to compress large packets, and fragments
		3068	them as required.
		3069
		3070	=cut
		3071
		3072	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		3073
		3074	sub cf::client::send_big_packet {
		3075	my ($self, $pkt) = @_;
		3076
		3077	# try lzf for large packets
		3078	$pkt = "lzf " . Compress::LZF::compress $pkt
		3079	if 1024 <= length $pkt and $self->{can_lzf};
		3080
		3081	# split very large packets
		3082	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3083	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3084	$pkt = "frag";
		3085	}
		3086
		3087	$self->send_packet ($pkt);
2757	}	3088	}
2758		3089
2759	=item $client->send_msg ($channel, $msg, $color, [extra...])	3090	=item $client->send_msg ($channel, $msg, $color, [extra...])
2760		3091
2761	Send a drawinfo or msg packet to the client, formatting the msg for the	3092	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2765		3096
2766	=cut	3097	=cut
2767		3098
2768	# non-persistent channels (usually the info channel)	3099	# non-persistent channels (usually the info channel)
2769	our %CHANNEL = (	3100	our %CHANNEL = (
		3101	"c/motd" => {
		3102	id => "infobox",
		3103	title => "MOTD",
		3104	reply => undef,
		3105	tooltip => "The message of the day",
		3106	},
2770	"c/identify" => {	3107	"c/identify" => {
2771	id => "infobox",	3108	id => "infobox",
2772	title => "Identify",	3109	title => "Identify",
2773	reply => undef,	3110	reply => undef,
2774	tooltip => "Items recently identified",	3111	tooltip => "Items recently identified",
…		…
2776	"c/examine" => {	3113	"c/examine" => {
2777	id => "infobox",	3114	id => "infobox",
2778	title => "Examine",	3115	title => "Examine",
2779	reply => undef,	3116	reply => undef,
2780	tooltip => "Signs and other items you examined",	3117	tooltip => "Signs and other items you examined",
		3118	},
		3119	"c/shopinfo" => {
		3120	id => "infobox",
		3121	title => "Shop Info",
		3122	reply => undef,
		3123	tooltip => "What your bargaining skill tells you about the shop",
2781	},	3124	},
2782	"c/book" => {	3125	"c/book" => {
2783	id => "infobox",	3126	id => "infobox",
2784	title => "Book",	3127	title => "Book",
2785	reply => undef,	3128	reply => undef,
…		…
2901	my $pkt = "msg "	3244	my $pkt = "msg "
2902	. $self->{json_coder}->encode (	3245	. $self->{json_coder}->encode (
2903	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3246	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2904	);	3247	);
2905		3248
2906	# try lzf for large packets
2907	$pkt = "lzf " . Compress::LZF::compress $pkt
2908	if 1024 <= length $pkt and $self->{can_lzf};
2909
2910	# split very large packets
2911	if (8192 < length $pkt and $self->{can_lzf}) {
2912	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2913	$pkt = "frag";
2914	}
2915
2916	$self->send_packet ($pkt);	3249	$self->send_big_packet ($pkt);
2917	}	3250	}
2918		3251
2919	=item $client->ext_msg ($type, @msg)	3252	=item $client->ext_msg ($type, @msg)
2920		3253
2921	Sends an ext event to the client.	3254	Sends an ext event to the client.
…		…
2923	=cut	3256	=cut
2924		3257
2925	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
2926	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
2927		3260
2928	if ($self->extcmd == 2) {
2929	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2930	} elsif ($self->extcmd == 1) { # TODO: remove
2931	push @msg, msgtype => "event_$type";
2932	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2933	}
2934	}
2935
2936	=item $client->ext_reply ($msgid, @msg)
2937
2938	Sends an ext reply to the client.
2939
2940	=cut
2941
2942	sub cf::client::ext_reply($$@) {
2943	my ($self, $id, @msg) = @_;
2944
2945	if ($self->extcmd == 2) {
2946	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2947	} elsif ($self->extcmd == 1) {
2948	#TODO: version 1, remove
2949	unshift @msg, msgtype => "reply", msgid => $id;
2950	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2951	}
2952	}	3262	}
2953		3263
2954	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
2955		3265
2956	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3011	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3012		3322
3013	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3014		3324
3015	if (ref $msg) {	3325	if (ref $msg) {
3016	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3017	"ARRAY" eq ref $msg
3018	? @$msg
3019	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3020		3327
3021	my @reply;
3022
3023	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3024	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3025	}	3346	}
3026
3027	$ns->ext_reply ($reply, @reply)
3028	if $reply;
3029
3030	} else {	3347	} else {
3031	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3032	}	3349	}
3033		3350
3034	cf::override;	3351	cf::override;
3035	},	3352	},
3036	);	3353	);
…		…
3056		3373
3057	$coro	3374	$coro
3058	}	3375	}
3059		3376
3060	cf::client->attach (	3377	cf::client->attach (
3061	on_destroy => sub {	3378	on_client_destroy => sub {
3062	my ($ns) = @_;	3379	my ($ns) = @_;
3063		3380
3064	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3381	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3065	},	3382	},
3066	);	3383	);
…		…
3082	our $safe_hole = new Safe::Hole;	3399	our $safe_hole = new Safe::Hole;
3083		3400
3084	$SIG{FPE} = 'IGNORE';	3401	$SIG{FPE} = 'IGNORE';
3085		3402
3086	$safe->permit_only (Opcode::opset qw(	3403	$safe->permit_only (Opcode::opset qw(
3087	:base_core :base_mem :base_orig :base_math	3404	:base_core :base_mem :base_orig :base_math :base_loop
3088	grepstart grepwhile mapstart mapwhile	3405	grepstart grepwhile mapstart mapwhile
3089	sort time	3406	sort time
3090	));	3407	));
3091		3408
3092	# here we export the classes and methods available to script code	3409	# here we export the classes and methods available to script code
…		…
3117	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3118	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3119	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3120	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3121	) {	3438	) {
3122	no strict 'refs';
3123	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3124	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3125	for @funs;	3441	for @funs;
3126	}	3442	}
3127		3443
…		…
3144	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3460	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3145	$qcode =~ s/\n/\\n/g;	3461	$qcode =~ s/\n/\\n/g;
3146		3462
3147	%vars = (_dummy => 0) unless %vars;	3463	%vars = (_dummy => 0) unless %vars;
3148		3464
		3465	my @res;
3149	local $_;	3466	local $_;
3150	local @safe::cf::_safe_eval_args = values %vars;
3151		3467
3152	my $eval =	3468	my $eval =
3153	"do {\n"	3469	"do {\n"
3154	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3470	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3155	. "#line 0 \"{$qcode}\"\n"	3471	. "#line 0 \"{$qcode}\"\n"
3156	. $code	3472	. $code
3157	. "\n}"	3473	. "\n}"
3158	;	3474	;
3159		3475
		3476	if ($CFG{safe_eval}) {
3160	sub_generation_inc;	3477	sub_generation_inc;
		3478	local @safe::cf::_safe_eval_args = values %vars;
3161	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3479	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3162	sub_generation_inc;	3480	sub_generation_inc;
		3481	} else {
		3482	local @cf::_safe_eval_args = values %vars;
		3483	@res = wantarray ? eval eval : scalar eval $eval;
		3484	}
3163		3485
3164	if ($@) {	3486	if ($@) {
3165	warn "$@";	3487	warn "$@",
3166	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3167	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3168	}	3490	}
3169		3491
3170	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3171	}	3493	}
3172		3494
…		…
3186	=cut	3508	=cut
3187		3509
3188	sub register_script_function {	3510	sub register_script_function {
3189	my ($fun, $cb) = @_;	3511	my ($fun, $cb) = @_;
3190		3512
3191	no strict 'refs';	3513	$fun = "safe::$fun" if $CFG{safe_eval};
3192	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3514	*$fun = $safe_hole->wrap ($cb);
3193	}	3515	}
3194		3516
3195	=back	3517	=back
3196		3518
3197	=cut	3519	=cut
3198		3520
3199	#############################################################################	3521	#############################################################################
3200	# the server's init and main functions	3522	# the server's init and main functions
3201		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3202	sub load_facedata($) {	3596	sub load_facedata($) {
3203	my ($path) = @_;	3597	my ($path) = @_;
3204		3598
3205	# HACK to clear player env face cache, we need some signal framework
3206	# for this (global event?)
3207	%ext::player_env::MUSIC_FACE_CACHE = ();
3208
3209	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3210		3600
3211	warn "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3212		3602
3213	my $facedata;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3214	0 < aio_load $path, $facedata
3215	or die "$path: $!";
3216
3217	$facedata = Coro::Storable::thaw $facedata;
3218		3604
3219	$facedata->{version} == 2	3605	$facedata->{version} == 2
3220	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3221		3607
3222	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3223	$facedata->{resource}{"res/exp_table"} = {	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3224	type => FT_RSRC,	3610
3225	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3226	};	3612
3227	cf::cede_to_tick;	3613	# BEGIN ATOMIC
		3614	# from here on, everything must be atomic - no thread switch allowed
		3615	my $t1 = EV::time;
3228		3616
3229	{	3617	{
3230	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3231		3619
3232	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3233	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3234		3623
3235	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3236	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3237	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3238	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3239		3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3240	cf::cede_to_tick;	3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3241	}	3630	}
3242		3631
3243	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3244	next unless $info->{smooth};	3633	next unless $info->{smooth};
3245		3634
…		…
3248		3637
3249	if (my $smooth = cf::face::find $info->{smooth}) {	3638	if (my $smooth = cf::face::find $info->{smooth}) {
3250	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3251	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3252	} else {	3641	} else {
3253	warn "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3254	}	3643	}
3255
3256	cf::cede_to_tick;
3257	}	3644	}
3258	}	3645	}
3259		3646
3260	{	3647	{
3261	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3262		3649
3263	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3264	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3265	cf::cede_to_tick;
3266	}	3652	}
3267		3653
3268	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3269	}	3655	}
3270		3656
3271	{	3657	{
3272	# TODO: for gcfclient pleasure, we should give resources
3273	# that gcfclient doesn't grok a >10000 face index.
3274	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3275		3659
3276	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3277	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3278	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3279	my $data;
3280		3664
3281	if ($info->{type} & 1) {
3282	# prepend meta info
3283
3284	my $meta = $enc->encode ({
3285	name => $name,
3286	%{ $info->{meta} || {} },
3287	});
3288
3289	$data = pack "(w/a*)*", $meta, $info->{data};
3290	} else {
3291	$data = $info->{data};
3292	}
3293
3294	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3295	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3296	} else {	3669	} else {
3297	$RESOURCE{$name} = $info;	3670	# $RESOURCE{$name} = $info; # unused
3298	}	3671	}
3299
3300	cf::cede_to_tick;
3301	}	3672	}
3302	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3303		3684
3304	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3305		3686
		3687	aio_close $fh if $fh; # close old facedata
		3688
3306	1	3689	1
3307	}	3690	}
3308
3309	cf::global->attach (on_resource_update => sub {
3310	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3311	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3312
3313	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3314	my $sound = $soundconf->{compat}[$_]
3315	or next;
3316
3317	my $face = cf::face::find "sound/$sound->[1]";
3318	cf::sound::set $sound->[0] => $face;
3319	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3320	}
3321
3322	while (my ($k, $v) = each %{$soundconf->{event}}) {
3323	my $face = cf::face::find "sound/$v";
3324	cf::sound::set $k => $face;
3325	}
3326	}
3327	});
3328		3691
3329	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
3330	my ($ns, $want) = @_;	3693	my ($ns, $want) = @_;
3331		3694
3332	while (my ($k, $v) = each %$want) {	3695	while (my ($k, $v) = each %$want) {
…		…
3340	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3341	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3342	cf::arch::commit_load;	3705	cf::arch::commit_load;
3343		3706
3344	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3345	}	3721	}
3346		3722
3347	sub reload_regions {	3723	sub reload_regions {
3348	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3349	# for this (global event?)	3725	# for this (global event?)
…		…
3357	if exists $_->{match};	3733	if exists $_->{match};
3358	}	3734	}
3359	}	3735	}
3360		3736
3361	sub reload_facedata {	3737	sub reload_facedata {
3362	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3363	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3364	}	3740	}
3365		3741
3366	sub reload_archetypes {	3742	sub reload_archetypes {
3367	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3368	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3369	}	3754	}
3370		3755
3371	sub reload_treasures {	3756	sub reload_treasures {
3372	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3373	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
3374	}	3759	}
3375		3760
		3761	sub reload_sound {
		3762	trace "loading sound config from $DATADIR/sound\n";
		3763
		3764	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3765
		3766	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3767	my $sound = $soundconf->{compat}[$_]
		3768	or next;
		3769
		3770	my $face = cf::face::find "sound/$sound->[1]";
		3771	cf::sound::set $sound->[0] => $face;
		3772	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3773	}
		3774
		3775	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3776	my $face = cf::face::find "sound/$v";
		3777	cf::sound::set $k => $face;
		3778	}
		3779	}
		3780
3376	sub reload_resources {	3781	sub reload_resources {
3377	warn "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3378		3783
		3784	reload_materials;
3379	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
		3787	reload_sound;
3380	reload_archetypes;	3788	reload_archetypes;
3381	reload_regions;	3789	reload_regions;
3382	reload_treasures;	3790	reload_treasures;
3383		3791
3384	warn "finished reloading resource files\n";	3792	trace "finished reloading resource files\n";
3385	}	3793	}
3386		3794
3387	sub reload_config {	3795	sub reload_config {
3388	warn "reloading config file...\n";	3796	trace "reloading config file...\n";
3389		3797
3390	open my $fh, "<:utf8", "$CONFDIR/config"	3798	my $config = load_file "$CONFDIR/config";
3391	or return;	3799	utf8::decode $config;
		3800	*CFG = decode_yaml $config;
3392		3801
3393	local $/;
3394	*CFG = YAML::XS::Load scalar <$fh>;
3395
3396	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3802	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3397		3803
3398	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3804	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3399	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3805	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3400		3806
3401	if (exists $CFG{mlockall}) {	3807	if (exists $CFG{mlockall}) {
…		…
3403	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3809	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3404	and die "WARNING: m(un)lockall failed: $!\n";	3810	and die "WARNING: m(un)lockall failed: $!\n";
3405	};	3811	};
3406	warn $@ if $@;	3812	warn $@ if $@;
3407	}	3813	}
3408
3409	warn "finished reloading resource files\n";
3410	}	3814	}
3411		3815
3412	sub pidfile() {	3816	sub pidfile() {
3413	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3817	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3414	or die "$PIDFILE: $!";	3818	or die "$PIDFILE: $!";
…		…
3427	seek $fh, 0, 0;	3831	seek $fh, 0, 0;
3428	print $fh $$;	3832	print $fh $$;
3429	}	3833	}
3430		3834
3431	sub main_loop {	3835	sub main_loop {
3432	warn "EV::loop starting\n";	3836	trace "EV::loop starting\n";
3433	if (1) {	3837	if (1) {
3434	EV::loop;	3838	EV::loop;
3435	}	3839	}
3436	warn "EV::loop returned\n";	3840	trace "EV::loop returned\n";
3437	goto &main_loop unless $REALLY_UNLOOP;	3841	goto &main_loop unless $REALLY_UNLOOP;
3438	}	3842	}
3439		3843
3440	sub main {	3844	sub main {
3441	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3442		3846
3443	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3444	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3445	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3446	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3447		3851
3448	cf::init_experience;
3449	cf::init_anim;
3450	cf::init_attackmess;
3451	cf::init_dynamic;
3452
3453	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3454		3853
3455	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3456	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3457	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3458	(async {	3857	(async {
3459	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3460	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3461	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
3462	};	3861	};
3463		3862
3464	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3465		3864
3466	cf::sync_job {	3865	cf::sync_job {
		3866	cf::incloader::init ();
		3867
		3868	db_init;
		3869
		3870	cf::init_anim;
		3871	cf::init_attackmess;
		3872	cf::init_dynamic;
		3873
		3874	cf::load_settings;
		3875
3467	reload_resources;	3876	reload_resources;
3468	reload_config;	3877	reload_config;
3469	db_init;
3470		3878
3471	cf::load_settings;
3472	cf::load_materials;
3473	cf::init_uuid;	3879	cf::init_uuid;
3474	cf::init_signals;	3880	cf::init_signals;
3475	cf::init_commands;
3476	cf::init_skills;	3881	cf::init_skills;
3477		3882
3478	cf::init_beforeplay;	3883	cf::init_beforeplay;
3479		3884
3480	atomic;	3885	atomic;
…		…
3485		3890
3486	# no (long-running) fork's whatsoever before this point(!)	3891	# no (long-running) fork's whatsoever before this point(!)
3487	use POSIX ();	3892	use POSIX ();
3488	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3893	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3489		3894
3490	(pop @POST_INIT)->(0) while @POST_INIT;	3895	cf::_post_init 0;
3491	};	3896	};
3492		3897
		3898	cf::object::thawer::errors_are_fatal 0;
		3899	info "parse errors in files are no longer fatal from this point on.\n";
		3900
		3901	AE::postpone {
		3902	undef &main; # free gobs of memory :)
		3903	};
		3904
3493	main_loop;	3905	goto &main_loop;
3494	}	3906	}
3495		3907
3496	#############################################################################	3908	#############################################################################
3497	# initialisation and cleanup	3909	# initialisation and cleanup
3498		3910
3499	# install some emergency cleanup handlers	3911	# install some emergency cleanup handlers
3500	BEGIN {	3912	BEGIN {
3501	our %SIGWATCHER = ();	3913	our %SIGWATCHER = ();
3502	for my $signal (qw(INT HUP TERM)) {	3914	for my $signal (qw(INT HUP TERM)) {
3503	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3915	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3504	cf::cleanup "SIG$signal";	3916	cf::cleanup "SIG$signal";
3505	};	3917	};
3506	}	3918	}
3507	}	3919	}
3508		3920
3509	sub write_runtime_sync {	3921	sub write_runtime_sync {
		3922	my $t0 = AE::time;
		3923
3510	# first touch the runtime file to show we are still running:	3924	# first touch the runtime file to show we are still running:
3511	# the fsync below can take a very very long time.	3925	# the fsync below can take a very very long time.
3512		3926
3513	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3927	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3514		3928
3515	my $guard = cf::lock_acquire "write_runtime";	3929	my $guard = cf::lock_acquire "write_runtime";
3516		3930
3517	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3931	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3518	or return;	3932	or return;
3519		3933
3520	my $value = $cf::RUNTIME + 90 + 10;	3934	my $value = $cf::RUNTIME + 90 + 10;
3521	# 10 is the runtime save interval, for a monotonic clock	3935	# 10 is the runtime save interval, for a monotonic clock
3522	# 60 allows for the watchdog to kill the server.	3936	# 60 allows for the watchdog to kill the server.
…		…
3535	or return;	3949	or return;
3536		3950
3537	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3951	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3538	and return;	3952	and return;
3539		3953
3540	warn "runtime file written.\n";	3954	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3541		3955
3542	1	3956	1
3543	}	3957	}
3544		3958
3545	our $uuid_lock;	3959	our $uuid_lock;
…		…
3557	or return;	3971	or return;
3558		3972
3559	my $value = uuid_seq uuid_cur;	3973	my $value = uuid_seq uuid_cur;
3560		3974
3561	unless ($value) {	3975	unless ($value) {
3562	warn "cowardly refusing to write zero uuid value!\n";	3976	info "cowardly refusing to write zero uuid value!\n";
3563	return;	3977	return;
3564	}	3978	}
3565		3979
3566	my $value = uuid_str $value + $uuid_skip;	3980	my $value = uuid_str $value + $uuid_skip;
3567	$uuid_skip = 0;	3981	$uuid_skip = 0;
…		…
3577	or return;	3991	or return;
3578		3992
3579	aio_rename "$uuid~", $uuid	3993	aio_rename "$uuid~", $uuid
3580	and return;	3994	and return;
3581		3995
3582	warn "uuid file written ($value).\n";	3996	trace "uuid file written ($value).\n";
3583		3997
3584	1	3998	1
3585		3999
3586	}	4000	}
3587		4001
…		…
3593	}	4007	}
3594		4008
3595	sub emergency_save() {	4009	sub emergency_save() {
3596	my $freeze_guard = cf::freeze_mainloop;	4010	my $freeze_guard = cf::freeze_mainloop;
3597		4011
3598	warn "emergency_perl_save: enter\n";	4012	info "emergency_perl_save: enter\n";
		4013
		4014	# this is a trade-off: we want to be very quick here, so
		4015	# save all maps without fsync, and later call a global sync
		4016	# (which in turn might be very very slow)
		4017	local $USE_FSYNC = 0;
3599		4018
3600	cf::sync_job {	4019	cf::sync_job {
3601	# this is a trade-off: we want to be very quick here, so	4020	cf::write_runtime_sync; # external watchdog should not bark
3602	# save all maps without fsync, and later call a global sync
3603	# (which in turn might be very very slow)
3604	local $USE_FSYNC = 0;
3605		4021
3606	# use a peculiar iteration method to avoid tripping on perl	4022	# use a peculiar iteration method to avoid tripping on perl
3607	# refcount bugs in for. also avoids problems with players	4023	# refcount bugs in for. also avoids problems with players
3608	# and maps saved/destroyed asynchronously.	4024	# and maps saved/destroyed asynchronously.
3609	warn "emergency_perl_save: begin player save\n";	4025	info "emergency_perl_save: begin player save\n";
3610	for my $login (keys %cf::PLAYER) {	4026	for my $login (keys %cf::PLAYER) {
3611	my $pl = $cf::PLAYER{$login} or next;	4027	my $pl = $cf::PLAYER{$login} or next;
3612	$pl->valid or next;	4028	$pl->valid or next;
3613	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4029	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3614	$pl->save;	4030	$pl->save;
3615	}	4031	}
3616	warn "emergency_perl_save: end player save\n";	4032	info "emergency_perl_save: end player save\n";
3617		4033
		4034	cf::write_runtime_sync; # external watchdog should not bark
		4035
3618	warn "emergency_perl_save: begin map save\n";	4036	info "emergency_perl_save: begin map save\n";
3619	for my $path (keys %cf::MAP) {	4037	for my $path (keys %cf::MAP) {
3620	my $map = $cf::MAP{$path} or next;	4038	my $map = $cf::MAP{$path} or next;
3621	$map->valid or next;	4039	$map->valid or next;
3622	$map->save;	4040	$map->save;
3623	}	4041	}
3624	warn "emergency_perl_save: end map save\n";	4042	info "emergency_perl_save: end map save\n";
3625		4043
		4044	cf::write_runtime_sync; # external watchdog should not bark
		4045
3626	warn "emergency_perl_save: begin database checkpoint\n";	4046	info "emergency_perl_save: begin database checkpoint\n";
3627	BDB::db_env_txn_checkpoint $DB_ENV;	4047	BDB::db_env_txn_checkpoint $DB_ENV;
3628	warn "emergency_perl_save: end database checkpoint\n";	4048	info "emergency_perl_save: end database checkpoint\n";
3629		4049
3630	warn "emergency_perl_save: begin write uuid\n";	4050	info "emergency_perl_save: begin write uuid\n";
3631	write_uuid_sync 1;	4051	write_uuid_sync 1;
3632	warn "emergency_perl_save: end write uuid\n";	4052	info "emergency_perl_save: end write uuid\n";
		4053
		4054	cf::write_runtime_sync; # external watchdog should not bark
		4055
		4056	trace "emergency_perl_save: syncing database to disk";
		4057	BDB::db_env_txn_checkpoint $DB_ENV;
		4058
		4059	info "emergency_perl_save: starting sync\n";
		4060	IO::AIO::aio_sync sub {
		4061	info "emergency_perl_save: finished sync\n";
		4062	};
		4063
		4064	cf::write_runtime_sync; # external watchdog should not bark
		4065
		4066	trace "emergency_perl_save: flushing outstanding aio requests";
		4067	while (IO::AIO::nreqs || BDB::nreqs) {
		4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4069	}
		4070
		4071	cf::write_runtime_sync; # external watchdog should not bark
3633	};	4072	};
3634		4073
3635	warn "emergency_perl_save: starting sync()\n";
3636	IO::AIO::aio_sync sub {
3637	warn "emergency_perl_save: finished sync()\n";
3638	};
3639
3640	warn "emergency_perl_save: leave\n";	4074	info "emergency_perl_save: leave\n";
3641	}	4075	}
3642		4076
3643	sub post_cleanup {	4077	sub post_cleanup {
3644	my ($make_core) = @_;	4078	my ($make_core) = @_;
3645		4079
		4080	IO::AIO::flush;
		4081
3646	warn Carp::longmess "post_cleanup backtrace"	4082	error Carp::longmess "post_cleanup backtrace"
3647	if $make_core;	4083	if $make_core;
3648		4084
3649	my $fh = pidfile;	4085	my $fh = pidfile;
3650	unlink $PIDFILE if <$fh> == $$;	4086	unlink $PIDFILE if <$fh> == $$;
3651	}	4087	}
…		…
3671	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4107	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3672	for my $name (keys %$leaf_symtab) {	4108	for my $name (keys %$leaf_symtab) {
3673	_gv_clear *{"$pkg$name"};	4109	_gv_clear *{"$pkg$name"};
3674	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4110	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3675	}	4111	}
3676	warn "cleared package $pkg\n";#d#
3677	}	4112	}
3678		4113
3679	sub do_reload_perl() {	4114	sub do_reload_perl() {
3680	# can/must only be called in main	4115	# can/must only be called in main
3681	if ($Coro::current != $Coro::main) {	4116	unless (in_main) {
3682	warn "can only reload from main coroutine";	4117	error "can only reload from main coroutine";
3683	return;	4118	return;
3684	}	4119	}
3685		4120
3686	return if $RELOAD++;	4121	return if $RELOAD++;
3687		4122
3688	my $t1 = EV::time;	4123	my $t1 = AE::time;
3689		4124
3690	while ($RELOAD) {	4125	while ($RELOAD) {
3691	warn "reloading...";	4126	cf::get_slot 0.1, -1, "reload_perl";
		4127	info "perl_reload: reloading...";
3692		4128
3693	warn "entering sync_job";	4129	trace "perl_reload: entering sync_job";
3694		4130
3695	cf::sync_job {	4131	cf::sync_job {
3696	cf::write_runtime_sync; # external watchdog should not bark
3697	cf::emergency_save;	4132	#cf::emergency_save;
3698	cf::write_runtime_sync; # external watchdog should not bark
3699		4133
3700	warn "syncing database to disk";
3701	BDB::db_env_txn_checkpoint $DB_ENV;
3702
3703	# if anything goes wrong in here, we should simply crash as we already saved
3704
3705	warn "flushing outstanding aio requests";
3706	while (IO::AIO::nreqs || BDB::nreqs) {
3707	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3708	}
3709
3710	warn "cancelling all extension coros";	4134	trace "perl_reload: cancelling all extension coros";
3711	$_->cancel for values %EXT_CORO;	4135	$_->cancel for values %EXT_CORO;
3712	%EXT_CORO = ();	4136	%EXT_CORO = ();
3713		4137
3714	warn "removing commands";	4138	trace "perl_reload: removing commands";
3715	%COMMAND = ();	4139	%COMMAND = ();
3716		4140
3717	warn "removing ext/exti commands";	4141	trace "perl_reload: removing ext/exti commands";
3718	%EXTCMD = ();	4142	%EXTCMD = ();
3719	%EXTICMD = ();	4143	%EXTICMD = ();
3720		4144
3721	warn "unloading/nuking all extensions";	4145	trace "perl_reload: unloading/nuking all extensions";
3722	for my $pkg (@EXTS) {	4146	for my $pkg (@EXTS) {
3723	warn "... unloading $pkg";	4147	trace "... unloading $pkg";
3724		4148
3725	if (my $cb = $pkg->can ("unload")) {	4149	if (my $cb = $pkg->can ("unload")) {
3726	eval {	4150	eval {
3727	$cb->($pkg);	4151	$cb->($pkg);
3728	1	4152	1
3729	} or warn "$pkg unloaded, but with errors: $@";	4153	} or error "$pkg unloaded, but with errors: $@";
3730	}	4154	}
3731		4155
3732	warn "... clearing $pkg";	4156	trace "... clearing $pkg";
3733	clear_package $pkg;	4157	clear_package $pkg;
3734	}	4158	}
3735		4159
3736	warn "unloading all perl modules loaded from $LIBDIR";	4160	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3737	while (my ($k, $v) = each %INC) {	4161	while (my ($k, $v) = each %INC) {
3738	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4162	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3739		4163
3740	warn "... unloading $k";	4164	trace "... unloading $k";
3741	delete $INC{$k};	4165	delete $INC{$k};
3742		4166
3743	$k =~ s/\.pm$//;	4167	$k =~ s/\.pm$//;
3744	$k =~ s/\//::/g;	4168	$k =~ s/\//::/g;
3745		4169
…		…
3748	}	4172	}
3749		4173
3750	clear_package $k;	4174	clear_package $k;
3751	}	4175	}
3752		4176
3753	warn "getting rid of safe::, as good as possible";	4177	trace "perl_reload: getting rid of safe::, as good as possible";
3754	clear_package "safe::$_"	4178	clear_package "safe::$_"
3755	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4179	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3756		4180
3757	warn "unloading cf.pm \"a bit\"";	4181	trace "perl_reload: unloading cf.pm \"a bit\"";
3758	delete $INC{"cf.pm"};	4182	delete $INC{"cf.pm"};
3759	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4183	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3760		4184
3761	# don't, removes xs symbols, too,	4185	# don't, removes xs symbols, too,
3762	# and global variables created in xs	4186	# and global variables created in xs
3763	#clear_package __PACKAGE__;	4187	#clear_package __PACKAGE__;
3764		4188
3765	warn "unload completed, starting to reload now";	4189	info "perl_reload: unload completed, starting to reload now";
3766		4190
3767	warn "reloading cf.pm";	4191	trace "perl_reload: reloading cf.pm";
3768	require cf;	4192	require cf;
3769	cf::_connect_to_perl_1;	4193	cf::_connect_to_perl_1;
3770		4194
3771	warn "loading config and database again";	4195	trace "perl_reload: loading config and database again";
3772	cf::reload_config;	4196	cf::reload_config;
3773		4197
3774	warn "loading extensions";	4198	trace "perl_reload: loading extensions";
3775	cf::load_extensions;	4199	cf::load_extensions;
3776		4200
3777	if ($REATTACH_ON_RELOAD) {	4201	if ($REATTACH_ON_RELOAD) {
3778	warn "reattaching attachments to objects/players";	4202	trace "perl_reload: reattaching attachments to objects/players";
3779	_global_reattach; # objects, sockets	4203	_global_reattach; # objects, sockets
3780	warn "reattaching attachments to maps";	4204	trace "perl_reload: reattaching attachments to maps";
3781	reattach $_ for values %MAP;	4205	reattach $_ for values %MAP;
3782	warn "reattaching attachments to players";	4206	trace "perl_reload: reattaching attachments to players";
3783	reattach $_ for values %PLAYER;	4207	reattach $_ for values %PLAYER;
3784	}	4208	}
3785		4209
3786	warn "running post_init jobs";	4210	cf::_post_init 1;
3787	(pop @POST_INIT)->(1) while @POST_INIT;
3788		4211
3789	warn "leaving sync_job";	4212	trace "perl_reload: leaving sync_job";
3790		4213
3791	1	4214	1
3792	} or do {	4215	} or do {
3793	warn $@;	4216	error $@;
3794	cf::cleanup "error while reloading, exiting.";	4217	cf::cleanup "perl_reload: error, exiting.";
3795	};	4218	};
3796		4219
3797	warn "reloaded";
3798	--$RELOAD;	4220	--$RELOAD;
3799	}	4221	}
3800		4222
3801	$t1 = EV::time - $t1;	4223	$t1 = AE::time - $t1;
3802	warn "reload completed in ${t1}s\n";	4224	info "perl_reload: completed in ${t1}s\n";
3803	};	4225	};
3804		4226
3805	our $RELOAD_WATCHER; # used only during reload	4227	our $RELOAD_WATCHER; # used only during reload
3806		4228
3807	sub reload_perl() {	4229	sub reload_perl() {
…		…
3809	# coro crashes during coro_state_free->destroy here.	4231	# coro crashes during coro_state_free->destroy here.
3810		4232
3811	$RELOAD_WATCHER ||= cf::async {	4233	$RELOAD_WATCHER ||= cf::async {
3812	Coro::AIO::aio_wait cache_extensions;	4234	Coro::AIO::aio_wait cache_extensions;
3813		4235
3814	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4236	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3815	do_reload_perl;	4237	do_reload_perl;
3816	undef $RELOAD_WATCHER;	4238	undef $RELOAD_WATCHER;
3817	};	4239	};
3818	};	4240	};
3819	}	4241	}
…		…
3828	reload_perl;	4250	reload_perl;
3829	};	4251	};
3830	}	4252	}
3831	};	4253	};
3832		4254
3833	unshift @INC, $LIBDIR;	4255	#############################################################################
3834		4256
3835	my $bug_warning = 0;	4257	my $bug_warning = 0;
3836		4258
3837	our @WAIT_FOR_TICK;
3838	our @WAIT_FOR_TICK_BEGIN;
3839
3840	sub wait_for_tick {	4259	sub wait_for_tick() {
3841	return if tick_inhibit || $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3842		4261
3843	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
3844	push @WAIT_FOR_TICK, $signal;
3845	$signal->wait;
3846	}	4263	}
3847		4264
3848	sub wait_for_tick_begin {	4265	sub wait_for_tick_begin() {
3849	return if tick_inhibit || $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3850		4267
3851	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
3852	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
3853	$signal->wait;	4270	$signal->wait;
3854	}	4271	}
…		…
3858	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3859	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
3860	return;	4277	return;
3861	}	4278	}
3862		4279
3863	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
		4281
		4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3864		4283
3865	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3866	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3867	Coro::async_pool {	4286	Coro::async_pool {
3868	$Coro::current->{desc} = "runtime saver";	4287	$Coro::current->{desc} = "runtime saver";
3869	write_runtime_sync	4288	write_runtime_sync
3870	or warn "ERROR: unable to write runtime file: $!";	4289	or error "ERROR: unable to write runtime file: $!";
3871	};	4290	};
3872	}	4291	}
3873		4292
3874	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3875	$sig->send;	4294	$sig->send;
3876	}	4295	}
3877	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
3878	$sig->send;
3879	}
3880		4297
3881	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
3882	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3883		4300
3884	if (0) {	4301	if (0) {
3885	if ($NEXT_TICK) {	4302	if ($NEXT_TICK) {
3886	my $jitter = $TICK_START - $NEXT_TICK;	4303	my $jitter = $TICK_START - $NEXT_TICK;
3887	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4304	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3888	warn "jitter $JITTER\n";#d#	4305	debug "jitter $JITTER\n";#d#
3889	}	4306	}
3890	}	4307	}
3891	}	4308	}
3892		4309
3893	{	4310	{
3894	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
3895		4313
3896	BDB::min_parallel 8;	4314	BDB::min_parallel 16;
3897	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
3898	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
3899		4317
3900	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
3901	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
3902	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3903	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3928	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3929	};	4347	};
3930	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3931	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3932	};	4350	};
		4351
		4352	info "database initialised";
3933	}	4353	}
3934		4354
3935	{	4355	{
3936	# configure IO::AIO	4356	# configure IO::AIO
3937		4357
		4358	info "initialising aio";
3938	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
3939	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
3940	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
3941	}	4363	}
3942		4364
3943	my $_log_backtrace;	4365	our $_log_backtrace;
		4366	our $_log_backtrace_last;
3944		4367
3945	sub _log_backtrace {	4368	sub _log_backtrace {
3946	my ($msg, @addr) = @_;	4369	my ($msg, @addr) = @_;
3947		4370
3948	$msg =~ s/\n//;	4371	$msg =~ s/\n$//;
3949		4372
		4373	if ($_log_backtrace_last eq $msg) {
		4374	LOG llevInfo, "[ABT] $msg\n";
		4375	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3950	# limit the # of concurrent backtraces	4376	# limit the # of concurrent backtraces
3951	if ($_log_backtrace < 2) {	4377	} elsif ($_log_backtrace < 2) {
		4378	$_log_backtrace_last = $msg;
3952	++$_log_backtrace;	4379	++$_log_backtrace;
3953	my $perl_bt = Carp::longmess $msg;	4380	my $perl_bt = Carp::longmess $msg;
3954	async {	4381	async {
3955	$Coro::current->{desc} = "abt $msg";	4382	$Coro::current->{desc} = "abt $msg";
3956		4383
…		…
3976	LOG llevInfo, "[ABT] $_\n" for @bt;	4403	LOG llevInfo, "[ABT] $_\n" for @bt;
3977	--$_log_backtrace;	4404	--$_log_backtrace;
3978	};	4405	};
3979	} else {	4406	} else {
3980	LOG llevInfo, "[ABT] $msg\n";	4407	LOG llevInfo, "[ABT] $msg\n";
3981	LOG llevInfo, "[ABT] [suppressed]\n";	4408	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3982	}	4409	}
3983	}	4410	}
3984		4411
3985	# load additional modules	4412	# load additional modules
3986	require "cf/$_.pm" for @EXTRA_MODULES;	4413	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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