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

Diff Legend

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