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.523 by root, Sat Apr 17 02:39:46 2010 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 4000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
115		125
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	128	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	134	our $DB_ENV;
125		135
126	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		137
128	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		140
130	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
132	our $NOW;	144	our $NOW;
133		145
134	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		157
146	our @POST_INIT;	158	our @POST_INIT;
147		159
148	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)
149	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;
150		165
151	binmode STDOUT;	166	binmode STDOUT;
152	binmode STDERR;	167	binmode STDERR;
153		168
154	# read virtual server time, if available	169	# read virtual server time, if available
…		…
188		203
189	=over 4	204	=over 4
190		205
191	=item $cf::UPTIME	206	=item $cf::UPTIME
192		207
193	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.
194		224
195	=item $cf::RUNTIME	225	=item $cf::RUNTIME
196		226
197	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
198	every server tick.	228	every server tick.
199		229
200	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203		233
204	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
207	database environment.	237	database environment.
208		238
209	=item $cf::NOW
210
211	The time of the last (current) server tick.
212
213	=item $cf::TICK
214
215	The interval between server ticks, in seconds.
216
217	=item $cf::LOADAVG	239	=item $cf::LOADAVG
218		240
219	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
220	(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
221	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
229	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
230	from wherever your confdir points to.	252	from wherever your confdir points to.
231		253
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		255
234	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.
235	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
236	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();
237		277
238	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
239		279
240	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
241	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
…		…
249		289
250	=back	290	=back
251		291
252	=cut	292	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	301	my $msg = join "", @_;
256		302
257	$msg .= "\n"	303	$msg .= "\n"
258	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
259		305
260	$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;
261		307
262	LOG llevError, $msg;	308	LOG llevWarn, $msg;
263	};	309	};
264		310
265	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
267		313
268	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
269		315
270	if (in_main) {#d#	316	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	318	return;#d#
273	}#d#	319	}#d#
274		320
275	# kill coroutine otherwise	321	# kill coroutine otherwise
276	Coro::terminate	322	Coro::terminate
…		…
296	)) {	342	)) {
297	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298	}	344	}
299		345
300	$EV::DIED = sub {	346	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
302	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
303		354
304	#############################################################################	355	#############################################################################
305		356
306	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
307		358
…		…
328	$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;
329	$d	380	$d
330	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
331	}	382	}
332		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
333	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
334		437
335	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
336		439
337	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
343	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
344		447
345	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
349		483
350	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,
351	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
352		486
353	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
354	is a reload or not.	488	is a reload or not.
355		489
356	=cut	490	=cut
357		491
358	sub post_init(&) {	492	sub post_init(&) {
359	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	}
360	}	511	}
361		512
362	=item cf::lock_wait $string	513	=item cf::lock_wait $string
363		514
364	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
417	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
418	}	569	}
419		570
420	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
421		572
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	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
424	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority les than zero, interactive jobs
		579	should use 100 or more.
425		580
426	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
427	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
428		583
429	Useful for short background jobs.	584	Useful for short background jobs.
…		…
458	}	613	}
459	}	614	}
460		615
461	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
462	# 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
463	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
464	$signal->wait;
465	} else {	619	} else {
466	$busy = 0;	620	$busy = 0;
467	Coro::schedule;	621	Coro::schedule;
468	}	622	}
469	}	623	}
…		…
509	=cut	663	=cut
510		664
511	sub sync_job(&) {	665	sub sync_job(&) {
512	my ($job) = @_;	666	my ($job) = @_;
513		667
514	if ($Coro::current == $Coro::main) {	668	if (in_main) {
515	my $time = AE::time;	669	my $time = AE::time;
516		670
517	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
519		673
520	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
521		675
522	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
523		677
524	my $busy = 1;	678	my $busy = 1;
525	my @res;	679	my @res;
526		680
527	(async {	681	(async {
528	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	683	@res = eval { $job->() };
530	warn $@ if $@;	684	error $@ if $@;
531	undef $busy;	685	undef $busy;
532	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
533		687
534	while ($busy) {	688	while ($busy) {
535	if (Coro::nready) {	689	if (Coro::nready) {
…		…
569	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
570		724
571	$coro	725	$coro
572	}	726	}
573		727
574	=item fork_call { }, $args	728	=item fork_call { }, @args
575		729
576	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
577	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
580		734
581	=cut	735	=cut
582		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
583	sub fork_call(&@) {	741	sub fork_call(&@) {
584	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
585		743
586	# we seemingly have to make a local copy of the whole thing,	744	# we seemingly have to make a local copy of the whole thing,
587	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
589		747
590	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
591	reset_signals;	749	cf::post_fork;
592	&$cb	750	&$cb
593	}, @args;	751	} @args;
594		752
595	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
596	}	754	}
597		755
598	sub objinfo {	756	sub objinfo {
…		…
648	within each server.	806	within each server.
649		807
650	=cut	808	=cut
651		809
652	sub db_table($) {	810	sub db_table($) {
		811	cf::error "db_get called from main context"
		812	if $Coro::current == $Coro::main;
		813
653	my ($name) = @_;	814	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	815	my $db = BDB::db_create $DB_ENV;
655		816
656	eval {	817	eval {
657	$db->set_flags (BDB::CHKSUM);	818	$db->set_flags (BDB::CHKSUM);
…		…
667	}	828	}
668		829
669	our $DB;	830	our $DB;
670		831
671	sub db_init {	832	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	833	$DB ||= db_table "db";
674	};
675	}	834	}
676		835
677	sub db_get($$) {	836	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	837	my $key = "$_[0]/$_[1]";
679		838
680	cf::sync_job {	839	cf::error "db_get called from main context"
		840	if $Coro::current == $Coro::main;
		841
681	BDB::db_get $DB, undef, $key, my $data;	842	BDB::db_get $DB, undef, $key, my $data;
682		843
683	$! ? ()	844	$! ? ()
684	: $data	845	: $data
685	}
686	}	846	}
687		847
688	sub db_put($$$) {	848	sub db_put($$$) {
689	BDB::dbreq_pri 4;	849	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	850	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		878
719	my @data;	879	my @data;
720	my $md5;	880	my $md5;
721		881
722	for (0 .. $#$src) {	882	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	884	}
726		885
727	# if processing is expensive, check	886	# if processing is expensive, check
728	# checksum first	887	# checksum first
729	if (1) {	888	if (1) {
…		…
742		901
743	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
744	}	903	}
745	}	904	}
746		905
747	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
748	my $data = $process->(\@data);	907	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
750		909
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		911
753	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	914	db_put cache => "$id/meta", $meta;
756		915
…		…
766		925
767	=cut	926	=cut
768		927
769	sub datalog($@) {	928	sub datalog($@) {
770	my ($type, %kv) = @_;	929	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	930	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	931	}
773		932
774	=back	933	=back
775		934
776	=cut	935	=cut
…		…
971		1130
972	} elsif (exists $cb_id{$type}) {	1131	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1132	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1133
975	} elsif (ref $type) {	1134	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1135	error "attaching objects not supported, ignoring.\n";
977		1136
978	} else {	1137	} else {
979	shift @arg;	1138	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1139	error "attach argument '$type' not supported, ignoring.\n";
981	}	1140	}
982	}	1141	}
983	}	1142	}
984		1143
985	sub _object_attach {	1144	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1154	_attach $registry, $klass, @attach;
996	}	1155	}
997		1156
998	$obj->{$name} = \%arg;	1157	$obj->{$name} = \%arg;
999	} else {	1158	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1159	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1160	}
1002		1161
1003	$obj->{_attachment}{$name} = undef;	1162	$obj->{_attachment}{$name} = undef;
1004	}	1163	}
1005		1164
…		…
1064		1223
1065	for (@$callbacks) {	1224	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1225	eval { &{$_->[1]} };
1067		1226
1068	if ($@) {	1227	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1228	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1229	override;
1072	}	1230	}
1073		1231
1074	return 1 if $override;	1232	return 1 if $override;
1075	}	1233	}
…		…
1154	for (@$attach) {	1312	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1313	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1314	_attach $registry, $klass, @attach;
1157	}	1315	}
1158	} else {	1316	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1317	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1318	}
1161	}	1319	}
1162	}	1320	}
1163		1321
1164	cf::attachable->attach (	1322	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1349	my ($filename, $rdata, $objs) = @_;
1192		1350
1193	sync_job {	1351	sync_job {
1194	if (length $$rdata) {	1352	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1353	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1354	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1355	$decname, length $$rdata, scalar @$objs
		1356	if $VERBOSE_IO;
1198		1357
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1358	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1359	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1360	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1361	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1383	aio_rename "$filename~", $filename;
1225		1384
1226	$filename =~ s%/[^/]+$%%;	1385	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1386	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1387	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1388	error "unable to save objects: $filename~: $!\n";
1230	}	1389	}
1231	} else {	1390	} else {
1232	aio_unlink $filename;	1391	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1392	aio_unlink "$filename.pst";
1234	}	1393	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1417	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1418	$av = $st->{objs};
1260	}	1419	}
1261		1420
1262	utf8::decode (my $decname = $filename);	1421	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1422	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1423	$decname, length $data, scalar @{$av || []}
		1424	if $VERBOSE_IO;
1265		1425
1266	($data, $av)	1426	($data, $av)
1267	}	1427	}
1268		1428
1269	=head2 COMMAND CALLBACKS	1429	=head2 COMMAND CALLBACKS
…		…
1273	=cut	1433	=cut
1274		1434
1275	#############################################################################	1435	#############################################################################
1276	# command handling &c	1436	# command handling &c
1277		1437
1278	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1279		1439
1280	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1281	$name.	1441	$name.
1282		1442
1283	=cut	1443	=cut
…		…
1289	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1290		1450
1291	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1292	}	1452	}
1293		1453
1294	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1295		1455
1296	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1297	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1298	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1299	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1300	has logged in successfully.	1460	has logged in successfully.
1301		1461
1302	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1303	called.
1304		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1305	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1306		1470
1307	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1308	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1309	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1310	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1311	log-in.	1475	log-in.
1312		1476
1313	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1314	called.
1315		1478
1316	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1317		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1318	sub register_extcmd {	1486	sub register_extcmd($$) {
1319	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1320		1488
1321	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1322	}	1490	}
1323		1491
1324	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1325	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1326		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1327	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1328	}	1508	}
1329		1509
1330	use File::Glob ();	1510	use File::Glob ();
1331		1511
1332	cf::player->attach (	1512	cf::player->attach (
…		…
1346	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1347		1527
1348	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349		1529
1350	if (ref $msg) {	1530	if (ref $msg) {
1351	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352	"ARRAY" eq ref $msg
1353	? @$msg
1354	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355		1532
1356	my @reply;
1357
1358	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1359	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1360	}	1551	}
1361		1552
1362	$pl->ext_reply ($reply, @reply)
1363	if $reply;
1364
1365	} else {	1553	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1555	}
1368		1556
1369	cf::override;	1557	cf::override;
1370	},	1558	},
1371	);	1559	);
…		…
1381	};	1569	};
1382		1570
1383	$grp	1571	$grp
1384	}	1572	}
1385		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1386	sub load_extensions {	1585	sub load_extensions {
		1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
		1589
1387	cf::sync_job {	1590	cf::sync_job {
1388	my %todo;	1591	my %todo;
1389		1592
1390	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1594	next unless -r $path;
…		…
1409		1612
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1613	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1614	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1615
1413	$ext{source} =	1616	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1617	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1618	. "#line 1 \"$path\"\n{\n"
1416	. $source	1619	. $source
1417	. "\n};\n1";	1620	. "\n};\n1";
1418		1621
1419	$todo{$base} = \%ext;	1622	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1634	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1635	next ext
1433	unless exists $done{$_};	1636	unless exists $done{$_};
1434	}	1637	}
1435		1638
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1438	my $active = eval $v->{source};	1650	my $active = eval $source;
1439		1651
1440	if (length $@) {	1652	if (length $@) {
1441	warn "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1442		1654
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1656	if exists $v->{meta}{mandatory};
1445		1657
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1658	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1660	} else {
1449	$done{$k} = delete $todo{$k};	1661	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1662	push @EXTS, $v->{pkg};
1451	$progress = 1;	1663	$progress = 1;
1452		1664
1453	warn "$v->{base}: extension inactive.\n"	1665	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1666	unless $active;
1455	}	1667	}
1456	}	1668	}
1457		1669
1458	unless ($progress) {	1670	unless ($progress) {
…		…
1460		1672
1461	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1464	}	1676	}
		1677
		1678	last;
1465	}	1679	}
1466	}	1680	}
1467	};	1681	};
1468	}	1682	}
1469		1683
…		…
1627	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1628		1842
1629	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1630	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1631		1845
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1847	$pl->deactivate;
		1848
1634	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1637	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1638		1854
1639	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1727		1943
1728	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1729		1945
1730	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1731		1947
1732	=item $player->ext_reply ($msgid, @msg)
1733
1734	Sends an ext reply to the player.
1735
1736	=cut
1737
1738	sub ext_reply($$@) {
1739	my ($self, $id, @msg) = @_;
1740
1741	$self->ns->ext_reply ($id, @msg)
1742	}
1743
1744	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1745		1949
1746	Sends an ext event to the client.	1950	Sends an ext event to the client.
1747		1951
1748	=cut	1952	=cut
…		…
1807	sub generate_random_map {	2011	sub generate_random_map {
1808	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1809		2013
1810	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811		2015
1812	# mit "rum" bekleckern, nicht
1813	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1814	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817	$rmp->{exit_on_final_map},
1818	$rmp->{xsize}, $rmp->{ysize},
1819	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824	(cf::region::find $rmp->{region}), $rmp->{custom}
1825	)
1826	}	2017	}
1827		2018
1828	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1829		2020
1830	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1835		2026
1836	sub register {	2027	sub register {
1837	my (undef, $regex, $prio) = @_;	2028	my (undef, $regex, $prio) = @_;
1838	my $pkg = caller;	2029	my $pkg = caller;
1839		2030
1840	no strict;
1841	push @{"$pkg\::ISA"}, __PACKAGE__;	2031	push @{"$pkg\::ISA"}, __PACKAGE__;
1842		2032
1843	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2033	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844	}	2034	}
1845		2035
1846	# also paths starting with '/'	2036	# also paths starting with '/'
1847	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2037	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1848		2038
1849	sub thawer_merge {	2039	sub thawer_merge {
1850	my ($self, $merge) = @_;	2040	my ($self, $merge) = @_;
1851		2041
1852	# we have to keep some variables in memory intact	2042	# we have to keep some variables in memory intact
…		…
1857	}	2047	}
1858		2048
1859	sub normalise {	2049	sub normalise {
1860	my ($path, $base) = @_;	2050	my ($path, $base) = @_;
1861		2051
1862	$path = "$path"; # make sure its a string	2052	$path = "$path"; # make sure it's a string
1863		2053
1864	$path =~ s/\.map$//;	2054	$path =~ s/\.map$//;
1865		2055
1866	# map plan:	2056	# map plan:
1867	#	2057	#
…		…
1882	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1883	$path = "$base/$path";	2073	$path = "$base/$path";
1884	}	2074	}
1885		2075
1886	for ($path) {	2076	for ($path) {
1887	redo if s{//}{/};
1888	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1889	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1890	}	2079	}
1891		2080
1892	$path	2081	$path
…		…
1906	$self->init; # pass $1 etc.	2095	$self->init; # pass $1 etc.
1907	return $self;	2096	return $self;
1908	}	2097	}
1909	}	2098	}
1910		2099
1911	Carp::cluck "unable to resolve path '$path' (base '$base').";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1912	()	2101	()
1913	}	2102	}
1914		2103
		2104	# may re-bless or do other evil things
1915	sub init {	2105	sub init {
1916	my ($self) = @_;	2106	my ($self) = @_;
1917		2107
1918	$self	2108	$self
1919	}	2109	}
…		…
1984	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1985		2175
1986	1	2176	1
1987	}	2177	}
1988		2178
		2179	# used to laod the header of an original map
1989	sub load_header_orig {	2180	sub load_header_orig {
1990	my ($self) = @_;	2181	my ($self) = @_;
1991		2182
1992	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
1993	}	2184	}
1994		2185
		2186	# used to laod the header of an instantiated map
1995	sub load_header_temp {	2187	sub load_header_temp {
1996	my ($self) = @_;	2188	my ($self) = @_;
1997		2189
1998	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
1999	}	2191	}
2000		2192
		2193	# called after loading the header from an instantiated map
2001	sub prepare_temp {	2194	sub prepare_temp {
2002	my ($self) = @_;	2195	my ($self) = @_;
2003		2196
2004	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2005	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2006	# safety	2199	# safety
2007	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2008	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2009	}	2202	}
2010		2203
		2204	# called after loading the header from an original map
2011	sub prepare_orig {	2205	sub prepare_orig {
2012	my ($self) = @_;	2206	my ($self) = @_;
2013		2207
2014	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2015	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2039		2233
2040	sub find;	2234	sub find;
2041	sub find {	2235	sub find {
2042	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2043		2237
		2238	cf::cede_to_tick;
		2239
2044	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2045		2241
2046	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2048		2244
2049	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2080		2276
2081	{	2277	{
2082	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2083		2279
2084	return unless $self->valid;	2280	return unless $self->valid;
2085	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2086
2087	$self->in_memory (cf::MAP_LOADING);
2088		2282
2089	$self->alloc;	2283	$self->alloc;
2090		2284
2091	$self->pre_load;	2285	$self->pre_load;
2092	cf::cede_to_tick;	2286	cf::cede_to_tick;
2093		2287
		2288	if (exists $self->{load_path}) {
2094	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2095	$f->skip_block;	2290	$f->skip_block;
2096	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2097	or return;	2292	or return;
2098		2293
2099	$self->post_load_original	2294	$self->post_load_original
2100	if delete $self->{load_original};	2295	if delete $self->{load_original};
2101		2296
2102	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2103	utf8::encode $uniq;	2298	utf8::encode $uniq;
2104	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2105	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2106	$self->clear_unique_items;	2301	$self->clear_unique_items;
2107	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2108	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2109	}	2305	}
2110	}	2306	}
2111	}
2112		2307
2113	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2114		2315
2115	cf::cede_to_tick;	2316	cf::cede_to_tick;
2116	# now do the right thing for maps	2317	# now do the right thing for maps
2117	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2118	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2122	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2123	$self->decay_objects;	2324	$self->decay_objects;
2124	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2125	$self->update_buttons;	2326	$self->update_buttons;
2126	cf::cede_to_tick;	2327	cf::cede_to_tick;
2127	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2128	}	2329	}
2129		2330
2130	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2333	}
2135		2334
2136	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2137	}	2338	}
2138		2339
2139	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2149	# if $self->per_party;	2350	# if $self->per_party;
2150		2351
2151	$self	2352	$self
2152	}	2353	}
2153		2354
2154	# find and load all maps in the 3x3 area around a map
2155	sub load_neighbours {
2156	my ($map) = @_;
2157
2158	my @neigh; # diagonal neighbours
2159
2160	for (0 .. 3) {
2161	my $neigh = $map->tile_path ($_)
2162	or next;
2163	$neigh = find $neigh, $map
2164	or next;
2165	$neigh->load;
2166
2167	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}
2171
2172	for (grep defined $_->[0], @neigh) {
2173	my ($path, $origin) = @$_;
2174	my $neigh = find $path, $origin
2175	or next;
2176	$neigh->load;
2177	}
2178	}
2179
2180	sub find_sync {	2355	sub find_sync {
2181	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2182		2357
2183	cf::sync_job { find $path, $origin }	2358	# it's a bug to call this from the main context
		2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2360	if $Coro::current == $Coro::main;
		2361
		2362	find $path, $origin
2184	}	2363	}
2185		2364
2186	sub do_load_sync {	2365	sub do_load_sync {
2187	my ($map) = @_;	2366	my ($map) = @_;
2188		2367
		2368	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2191		2371
2192	cf::sync_job { $map->load };	2372	$map->load;
2193	}	2373	}
2194		2374
2195	our %MAP_PREFETCH;	2375	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2197		2377
2198	sub find_async {	2378	sub find_async {
2199	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2200		2380
2201	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2202		2382
2203	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2205	}	2385	}
2206		2386
2207	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2208		2388
2209	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2268	sub swap_out {	2448	sub swap_out {
2269	my ($self) = @_;	2449	my ($self) = @_;
2270		2450
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2452
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2274	return if $self->{deny_save};	2454	return if $self->{deny_save};
2275	return if $self->players;	2455	return if $self->players;
2276		2456
2277	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2458	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2281		2461
2282	# then atomically save	2462	# then atomically save
2283	$self->_save;	2463	$self->_save;
2284		2464
2285	# then free the map	2465	# then free the map
…		…
2309		2489
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2490	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2491
2312	return if $self->players;	2492	return if $self->players;
2313		2493
2314	warn "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2315		2495
2316	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2317		2497
2318	# need to save uniques path	2498	# need to save uniques path
2319	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2501
…		…
2343		2523
2344	delete $cf::MAP{$self->path};	2524	delete $cf::MAP{$self->path};
2345		2525
2346	$self->unlink_save;	2526	$self->unlink_save;
2347		2527
2348	bless $self, "cf::map";	2528	bless $self, "cf::map::wrap";
2349	delete $self->{deny_reset};	2529	delete $self->{deny_reset};
2350	$self->{deny_save} = 1;	2530	$self->{deny_save} = 1;
2351	$self->reset_timeout (1);	2531	$self->reset_timeout (1);
2352	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2532	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2353		2533
…		…
2583		2763
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2764	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2765
2586	The player should be reasonably safe there for short amounts of time (e.g.	2766	The player should be reasonably safe there for short amounts of time (e.g.
2587	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2767	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588	though, as the palyer cannot control the character while it is on the link	2768	though, as the player cannot control the character while it is on the link
2589	map.	2769	map.
2590		2770
2591	Will never block.	2771	Will never block.
2592		2772
2593	=item $player_object->leave_link ($map, $x, $y)	2773	=item $player_object->leave_link ($map, $x, $y)
…		…
2614	sub cf::object::player::enter_link {	2794	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2795	my ($self) = @_;
2616		2796
2617	$self->deactivate_recursive;	2797	$self->deactivate_recursive;
2618		2798
		2799	++$self->{_link_recursion};
		2800
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2801	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2802
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2803	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2804	if $self->map && $self->map->{path} ne "{link}";
2623		2805
…		…
2649	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2650	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2651	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2652		2834
2653	$map->load;	2835	$map->load;
2654	$map->load_neighbours;
2655		2836
2656	return unless $self->contr->active;	2837	return unless $self->contr->active;
2657		2838
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2840	if ($self->enter_map ($map, $x, $y)) {
2660		2841	# entering was successful
		2842	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2843	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive;	2844	$self->activate_recursive;
2663	}	2845	}
2664		2846
		2847	}
		2848
2665	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2849	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666		2850
2667	Moves the player to the given map-path and coordinates by first freezing	2851	Moves the player to the given map-path and coordinates by first freezing
2668	her, loading and preparing them map, calling the provided $check callback	2852	her, loading and preparing them map, calling the provided $check callback
2669	that has to return the map if sucecssful, and then unfreezes the player on	2853	that has to return the map if sucecssful, and then unfreezes the player on
2670	the new (success) or old (failed) map position. In either case, $done will	2854	the new (success) or old (failed) map position. In either case, $done will
…		…
2677		2861
2678	our $GOTOGEN;	2862	our $GOTOGEN;
2679		2863
2680	sub cf::object::player::goto {	2864	sub cf::object::player::goto {
2681	my ($self, $path, $x, $y, $check, $done) = @_;	2865	my ($self, $path, $x, $y, $check, $done) = @_;
		2866
		2867	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2868	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2869	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2870	($path, $x, $y) = @$EMERGENCY_POSITION;
		2871	}
2682		2872
2683	# do generation counting so two concurrent goto's will be executed in-order	2873	# do generation counting so two concurrent goto's will be executed in-order
2684	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2874	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685		2875
2686	$self->enter_link;	2876	$self->enter_link;
…		…
2706	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2707	}	2897	}
2708	}	2898	}
2709		2899
2710	my $map = eval {	2900	my $map = eval {
2711	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712		2902
2713	if ($map) {	2903	if ($map) {
2714	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2715	$map = $check->($map) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2716	} else {	2906	} else {
2717	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2907	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718	}	2908	}
2719		2909
2720	$map	2910	$map
…		…
2728	if ($gen == $self->{_goto_generation}) {	2918	if ($gen == $self->{_goto_generation}) {
2729	delete $self->{_goto_generation};	2919	delete $self->{_goto_generation};
2730	$self->leave_link ($map, $x, $y);	2920	$self->leave_link ($map, $x, $y);
2731	}	2921	}
2732		2922
2733	$done->() if $done;	2923	$done->($self) if $done;
2734	})->prio (1);	2924	})->prio (1);
2735	}	2925	}
2736		2926
2737	=item $player_object->enter_exit ($exit_object)	2927	=item $player_object->enter_exit ($exit_object)
2738		2928
…		…
2806	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2807		2997
2808	unless (eval {	2998	unless (eval {
2809	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2810		3000
2811	# random map handling
2812	{
2813	my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815	prepare_random_map $exit
2816	if $exit->slaying eq "/!";
2817	}
2818
2819	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2820	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2821	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2822		3027
2823	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2824		3029
2825	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2826	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
2831	$self->message ("Something went wrong deep within the deliantra server. "	3036	$self->message ("Something went wrong deep within the deliantra server. "
2832	. "I'll try to bring you back to the map you were before. "	3037	. "I'll try to bring you back to the map you were before. "
2833	. "Please report this to the dungeon master!",	3038	. "Please report this to the dungeon master!",
2834	cf::NDI_UNIQUE | cf::NDI_RED);	3039	cf::NDI_UNIQUE | cf::NDI_RED);
2835		3040
2836	warn "ERROR in enter_exit: $@";	3041	error "ERROR in enter_exit: $@";
2837	$self->leave_link;	3042	$self->leave_link;
2838	}	3043	}
2839	})->prio (1);	3044	})->prio (1);
2840	}	3045	}
2841		3046
…		…
3051	=cut	3256	=cut
3052		3257
3053	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3054	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3055		3260
3056	if ($self->extcmd == 2) {
3057	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3058	} elsif ($self->extcmd == 1) { # TODO: remove
3059	push @msg, msgtype => "event_$type";
3060	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3061	}
3062	}
3063
3064	=item $client->ext_reply ($msgid, @msg)
3065
3066	Sends an ext reply to the client.
3067
3068	=cut
3069
3070	sub cf::client::ext_reply($$@) {
3071	my ($self, $id, @msg) = @_;
3072
3073	if ($self->extcmd == 2) {
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075	} elsif ($self->extcmd == 1) {
3076	#TODO: version 1, remove
3077	unshift @msg, msgtype => "reply", msgid => $id;
3078	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079	}
3080	}	3262	}
3081		3263
3082	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3083		3265
3084	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3139	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3140		3322
3141	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142		3324
3143	if (ref $msg) {	3325	if (ref $msg) {
3144	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145	"ARRAY" eq ref $msg
3146	? @$msg
3147	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148		3327
3149	my @reply;
3150
3151	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3152	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3153	}	3346	}
3154
3155	$ns->ext_reply ($reply, @reply)
3156	if $reply;
3157
3158	} else {	3347	} else {
3159	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3160	}	3349	}
3161		3350
3162	cf::override;	3351	cf::override;
3163	},	3352	},
3164	);	3353	);
…		…
3245	decrease split destroy change_exp value msg lore send_msg)],	3434	decrease split destroy change_exp value msg lore send_msg)],
3246	["cf::object::player" => qw(player)],	3435	["cf::object::player" => qw(player)],
3247	["cf::player" => qw(peaceful send_msg)],	3436	["cf::player" => qw(peaceful send_msg)],
3248	["cf::map" => qw(trigger)],	3437	["cf::map" => qw(trigger)],
3249	) {	3438	) {
3250	no strict 'refs';
3251	my ($pkg, @funs) = @$_;	3439	my ($pkg, @funs) = @$_;
3252	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3440	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253	for @funs;	3441	for @funs;
3254	}	3442	}
3255		3443
…		…
3294	local @cf::_safe_eval_args = values %vars;	3482	local @cf::_safe_eval_args = values %vars;
3295	@res = wantarray ? eval eval : scalar eval $eval;	3483	@res = wantarray ? eval eval : scalar eval $eval;
3296	}	3484	}
3297		3485
3298	if ($@) {	3486	if ($@) {
3299	warn "$@";	3487	warn "$@",
3300	warn "while executing safe code '$code'\n";	3488	"while executing safe code '$code'\n",
3301	warn "with arguments " . (join " ", %vars) . "\n";	3489	"with arguments " . (join " ", %vars) . "\n";
3302	}	3490	}
3303		3491
3304	wantarray ? @res : $res[0]	3492	wantarray ? @res : $res[0]
3305	}	3493	}
3306		3494
…		…
3331	=cut	3519	=cut
3332		3520
3333	#############################################################################	3521	#############################################################################
3334	# the server's init and main functions	3522	# the server's init and main functions
3335		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3336	sub load_facedata($) {	3596	sub load_facedata($) {
3337	my ($path) = @_;	3597	my ($path) = @_;
3338		3598
3339	# HACK to clear player env face cache, we need some signal framework
3340	# for this (global event?)
3341	%ext::player_env::MUSIC_FACE_CACHE = ();
3342
3343	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344		3600
3345	warn "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3346		3602
3347	my $facedata;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3348	0 < aio_load $path, $facedata
3349	or die "$path: $!";
3350
3351	$facedata = Coro::Storable::thaw $facedata;
3352		3604
3353	$facedata->{version} == 2	3605	$facedata->{version} == 2
3354	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3355		3607
3356	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3357	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3358	$facedata->{resource}{"res/exp_table"} = {	3610
3359	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3360	data => $exp_table,	3612
3361	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3362	};	3614	# from here on, everything must be atomic - no thread switch allowed
3363	cf::cede_to_tick;	3615	my $t1 = EV::time;
3364		3616
3365	{	3617	{
3366	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3367		3619
3368	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3369	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370		3623
3371	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3372	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3373	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3374	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3375		3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3376	cf::cede_to_tick;	3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3377	}	3630	}
3378		3631
3379	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3380	next unless $info->{smooth};	3633	next unless $info->{smooth};
3381		3634
…		…
3384		3637
3385	if (my $smooth = cf::face::find $info->{smooth}) {	3638	if (my $smooth = cf::face::find $info->{smooth}) {
3386	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3387	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388	} else {	3641	} else {
3389	warn "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3390	}	3643	}
3391
3392	cf::cede_to_tick;
3393	}	3644	}
3394	}	3645	}
3395		3646
3396	{	3647	{
3397	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3398		3649
3399	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3400	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3401	cf::cede_to_tick;
3402	}	3652	}
3403		3653
3404	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3405	}	3655	}
3406		3656
3407	{	3657	{
3408	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3409		3659
3410	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3411	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3412	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413		3664
3414	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3416	} else {	3669	} else {
3417	$RESOURCE{$name} = $info;	3670	# $RESOURCE{$name} = $info; # unused
3418	}	3671	}
3419
3420	cf::cede_to_tick;
3421	}	3672	}
3422	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3423		3684
3424	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425		3686
		3687	aio_close $fh if $fh; # close old facedata
		3688
3426	1	3689	1
3427	}	3690	}
3428
3429	cf::global->attach (on_resource_update => sub {
3430	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434	my $sound = $soundconf->{compat}[$_]
3435	or next;
3436
3437	my $face = cf::face::find "sound/$sound->[1]";
3438	cf::sound::set $sound->[0] => $face;
3439	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440	}
3441
3442	while (my ($k, $v) = each %{$soundconf->{event}}) {
3443	my $face = cf::face::find "sound/$v";
3444	cf::sound::set $k => $face;
3445	}
3446	}
3447	});
3448		3691
3449	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
3450	my ($ns, $want) = @_;	3693	my ($ns, $want) = @_;
3451		3694
3452	while (my ($k, $v) = each %$want) {	3695	while (my ($k, $v) = each %$want) {
…		…
3460	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3461	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3462	cf::arch::commit_load;	3705	cf::arch::commit_load;
3463		3706
3464	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3465	}	3721	}
3466		3722
3467	sub reload_regions {	3723	sub reload_regions {
3468	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3469	# for this (global event?)	3725	# for this (global event?)
…		…
3477	if exists $_->{match};	3733	if exists $_->{match};
3478	}	3734	}
3479	}	3735	}
3480		3736
3481	sub reload_facedata {	3737	sub reload_facedata {
3482	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3483	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3484	}	3740	}
3485		3741
3486	sub reload_archetypes {	3742	sub reload_archetypes {
3487	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3488	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3489	}	3754	}
3490		3755
3491	sub reload_treasures {	3756	sub reload_treasures {
3492	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3493	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
3494	}	3759	}
3495		3760
		3761	sub reload_sound {
		3762	trace "loading sound config from $DATADIR/sound\n";
		3763
		3764	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3765
		3766	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3767	my $sound = $soundconf->{compat}[$_]
		3768	or next;
		3769
		3770	my $face = cf::face::find "sound/$sound->[1]";
		3771	cf::sound::set $sound->[0] => $face;
		3772	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3773	}
		3774
		3775	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3776	my $face = cf::face::find "sound/$v";
		3777	cf::sound::set $k => $face;
		3778	}
		3779	}
		3780
3496	sub reload_resources {	3781	sub reload_resources {
3497	warn "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3498		3783
		3784	reload_materials;
3499	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
		3787	reload_sound;
3500	reload_archetypes;	3788	reload_archetypes;
3501	reload_regions;	3789	reload_regions;
3502	reload_treasures;	3790	reload_treasures;
3503		3791
3504	warn "finished reloading resource files\n";	3792	trace "finished reloading resource files\n";
3505	}	3793	}
3506		3794
3507	sub reload_config {	3795	sub reload_config {
3508	warn "reloading config file...\n";	3796	trace "reloading config file...\n";
3509		3797
3510	open my $fh, "<:utf8", "$CONFDIR/config"	3798	my $config = load_file "$CONFDIR/config";
3511	or return;	3799	utf8::decode $config;
		3800	*CFG = decode_yaml $config;
3512		3801
3513	local $/;
3514	*CFG = YAML::XS::Load scalar <$fh>;
3515
3516	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3802	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517		3803
3518	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3804	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3519	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3805	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3520		3806
3521	if (exists $CFG{mlockall}) {	3807	if (exists $CFG{mlockall}) {
…		…
3523	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3809	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524	and die "WARNING: m(un)lockall failed: $!\n";	3810	and die "WARNING: m(un)lockall failed: $!\n";
3525	};	3811	};
3526	warn $@ if $@;	3812	warn $@ if $@;
3527	}	3813	}
3528
3529	warn "finished reloading resource files\n";
3530	}	3814	}
3531		3815
3532	sub pidfile() {	3816	sub pidfile() {
3533	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3817	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534	or die "$PIDFILE: $!";	3818	or die "$PIDFILE: $!";
…		…
3547	seek $fh, 0, 0;	3831	seek $fh, 0, 0;
3548	print $fh $$;	3832	print $fh $$;
3549	}	3833	}
3550		3834
3551	sub main_loop {	3835	sub main_loop {
3552	warn "EV::loop starting\n";	3836	trace "EV::loop starting\n";
3553	if (1) {	3837	if (1) {
3554	EV::loop;	3838	EV::loop;
3555	}	3839	}
3556	warn "EV::loop returned\n";	3840	trace "EV::loop returned\n";
3557	goto &main_loop unless $REALLY_UNLOOP;	3841	goto &main_loop unless $REALLY_UNLOOP;
3558	}	3842	}
3559		3843
3560	sub main {	3844	sub main {
3561	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3562		3846
3563	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567		3851
3568	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569		3853
3570	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3571	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3572	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3573	(async {	3857	(async {
3574	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3575	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3576	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
3577	};	3861	};
3578		3862
3579	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3580		3864
3581	cf::sync_job {	3865	cf::sync_job {
3582	cf::init_experience;	3866	cf::incloader::init ();
		3867
		3868	db_init;
		3869
3583	cf::init_anim;	3870	cf::init_anim;
3584	cf::init_attackmess;	3871	cf::init_attackmess;
3585	cf::init_dynamic;	3872	cf::init_dynamic;
3586		3873
3587	cf::load_settings;	3874	cf::load_settings;
3588	cf::load_materials;
3589		3875
3590	reload_resources;	3876	reload_resources;
3591	reload_config;	3877	reload_config;
3592	db_init;
3593		3878
3594	cf::init_uuid;	3879	cf::init_uuid;
3595	cf::init_signals;	3880	cf::init_signals;
3596	cf::init_skills;	3881	cf::init_skills;
3597		3882
…		…
3605		3890
3606	# no (long-running) fork's whatsoever before this point(!)	3891	# no (long-running) fork's whatsoever before this point(!)
3607	use POSIX ();	3892	use POSIX ();
3608	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3893	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609		3894
3610	(pop @POST_INIT)->(0) while @POST_INIT;	3895	cf::_post_init 0;
3611	};	3896	};
3612		3897
3613	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3614	warn "parse errors in files are no longer fatal from this point on.\n";	3899	info "parse errors in files are no longer fatal from this point on.\n";
3615		3900
		3901	AE::postpone {
		3902	undef &main; # free gobs of memory :)
		3903	};
		3904
3616	main_loop;	3905	goto &main_loop;
3617	}	3906	}
3618		3907
3619	#############################################################################	3908	#############################################################################
3620	# initialisation and cleanup	3909	# initialisation and cleanup
3621		3910
…		…
3660	or return;	3949	or return;
3661		3950
3662	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3951	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663	and return;	3952	and return;
3664		3953
3665	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3954	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666		3955
3667	1	3956	1
3668	}	3957	}
3669		3958
3670	our $uuid_lock;	3959	our $uuid_lock;
…		…
3682	or return;	3971	or return;
3683		3972
3684	my $value = uuid_seq uuid_cur;	3973	my $value = uuid_seq uuid_cur;
3685		3974
3686	unless ($value) {	3975	unless ($value) {
3687	warn "cowardly refusing to write zero uuid value!\n";	3976	info "cowardly refusing to write zero uuid value!\n";
3688	return;	3977	return;
3689	}	3978	}
3690		3979
3691	my $value = uuid_str $value + $uuid_skip;	3980	my $value = uuid_str $value + $uuid_skip;
3692	$uuid_skip = 0;	3981	$uuid_skip = 0;
…		…
3702	or return;	3991	or return;
3703		3992
3704	aio_rename "$uuid~", $uuid	3993	aio_rename "$uuid~", $uuid
3705	and return;	3994	and return;
3706		3995
3707	warn "uuid file written ($value).\n";	3996	trace "uuid file written ($value).\n";
3708		3997
3709	1	3998	1
3710		3999
3711	}	4000	}
3712		4001
…		…
3718	}	4007	}
3719		4008
3720	sub emergency_save() {	4009	sub emergency_save() {
3721	my $freeze_guard = cf::freeze_mainloop;	4010	my $freeze_guard = cf::freeze_mainloop;
3722		4011
3723	warn "emergency_perl_save: enter\n";	4012	info "emergency_perl_save: enter\n";
		4013
		4014	# this is a trade-off: we want to be very quick here, so
		4015	# save all maps without fsync, and later call a global sync
		4016	# (which in turn might be very very slow)
		4017	local $USE_FSYNC = 0;
3724		4018
3725	cf::sync_job {	4019	cf::sync_job {
3726	# this is a trade-off: we want to be very quick here, so	4020	cf::write_runtime_sync; # external watchdog should not bark
3727	# save all maps without fsync, and later call a global sync
3728	# (which in turn might be very very slow)
3729	local $USE_FSYNC = 0;
3730		4021
3731	# use a peculiar iteration method to avoid tripping on perl	4022	# use a peculiar iteration method to avoid tripping on perl
3732	# refcount bugs in for. also avoids problems with players	4023	# refcount bugs in for. also avoids problems with players
3733	# and maps saved/destroyed asynchronously.	4024	# and maps saved/destroyed asynchronously.
3734	warn "emergency_perl_save: begin player save\n";	4025	info "emergency_perl_save: begin player save\n";
3735	for my $login (keys %cf::PLAYER) {	4026	for my $login (keys %cf::PLAYER) {
3736	my $pl = $cf::PLAYER{$login} or next;	4027	my $pl = $cf::PLAYER{$login} or next;
3737	$pl->valid or next;	4028	$pl->valid or next;
3738	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4029	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739	$pl->save;	4030	$pl->save;
3740	}	4031	}
3741	warn "emergency_perl_save: end player save\n";	4032	info "emergency_perl_save: end player save\n";
3742		4033
		4034	cf::write_runtime_sync; # external watchdog should not bark
		4035
3743	warn "emergency_perl_save: begin map save\n";	4036	info "emergency_perl_save: begin map save\n";
3744	for my $path (keys %cf::MAP) {	4037	for my $path (keys %cf::MAP) {
3745	my $map = $cf::MAP{$path} or next;	4038	my $map = $cf::MAP{$path} or next;
3746	$map->valid or next;	4039	$map->valid or next;
3747	$map->save;	4040	$map->save;
3748	}	4041	}
3749	warn "emergency_perl_save: end map save\n";	4042	info "emergency_perl_save: end map save\n";
3750		4043
		4044	cf::write_runtime_sync; # external watchdog should not bark
		4045
3751	warn "emergency_perl_save: begin database checkpoint\n";	4046	info "emergency_perl_save: begin database checkpoint\n";
3752	BDB::db_env_txn_checkpoint $DB_ENV;	4047	BDB::db_env_txn_checkpoint $DB_ENV;
3753	warn "emergency_perl_save: end database checkpoint\n";	4048	info "emergency_perl_save: end database checkpoint\n";
3754		4049
3755	warn "emergency_perl_save: begin write uuid\n";	4050	info "emergency_perl_save: begin write uuid\n";
3756	write_uuid_sync 1;	4051	write_uuid_sync 1;
3757	warn "emergency_perl_save: end write uuid\n";	4052	info "emergency_perl_save: end write uuid\n";
		4053
		4054	cf::write_runtime_sync; # external watchdog should not bark
		4055
		4056	trace "emergency_perl_save: syncing database to disk";
		4057	BDB::db_env_txn_checkpoint $DB_ENV;
		4058
		4059	info "emergency_perl_save: starting sync\n";
		4060	IO::AIO::aio_sync sub {
		4061	info "emergency_perl_save: finished sync\n";
		4062	};
		4063
		4064	cf::write_runtime_sync; # external watchdog should not bark
		4065
		4066	trace "emergency_perl_save: flushing outstanding aio requests";
		4067	while (IO::AIO::nreqs || BDB::nreqs) {
		4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4069	}
		4070
		4071	cf::write_runtime_sync; # external watchdog should not bark
3758	};	4072	};
3759		4073
3760	warn "emergency_perl_save: starting sync()\n";
3761	IO::AIO::aio_sync sub {
3762	warn "emergency_perl_save: finished sync()\n";
3763	};
3764
3765	warn "emergency_perl_save: leave\n";	4074	info "emergency_perl_save: leave\n";
3766	}	4075	}
3767		4076
3768	sub post_cleanup {	4077	sub post_cleanup {
3769	my ($make_core) = @_;	4078	my ($make_core) = @_;
3770		4079
		4080	IO::AIO::flush;
		4081
3771	warn Carp::longmess "post_cleanup backtrace"	4082	error Carp::longmess "post_cleanup backtrace"
3772	if $make_core;	4083	if $make_core;
3773		4084
3774	my $fh = pidfile;	4085	my $fh = pidfile;
3775	unlink $PIDFILE if <$fh> == $$;	4086	unlink $PIDFILE if <$fh> == $$;
3776	}	4087	}
…		…
3800	}	4111	}
3801	}	4112	}
3802		4113
3803	sub do_reload_perl() {	4114	sub do_reload_perl() {
3804	# can/must only be called in main	4115	# can/must only be called in main
3805	if (in_main) {	4116	unless (in_main) {
3806	warn "can only reload from main coroutine";	4117	error "can only reload from main coroutine";
3807	return;	4118	return;
3808	}	4119	}
3809		4120
3810	return if $RELOAD++;	4121	return if $RELOAD++;
3811		4122
3812	my $t1 = AE::time;	4123	my $t1 = AE::time;
3813		4124
3814	while ($RELOAD) {	4125	while ($RELOAD) {
3815	warn "reloading...";	4126	cf::get_slot 0.1, -1, "reload_perl";
		4127	info "perl_reload: reloading...";
3816		4128
3817	warn "entering sync_job";	4129	trace "perl_reload: entering sync_job";
3818		4130
3819	cf::sync_job {	4131	cf::sync_job {
3820	cf::write_runtime_sync; # external watchdog should not bark
3821	cf::emergency_save;	4132	#cf::emergency_save;
3822	cf::write_runtime_sync; # external watchdog should not bark
3823		4133
3824	warn "syncing database to disk";
3825	BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827	# if anything goes wrong in here, we should simply crash as we already saved
3828
3829	warn "flushing outstanding aio requests";
3830	while (IO::AIO::nreqs || BDB::nreqs) {
3831	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832	}
3833
3834	warn "cancelling all extension coros";	4134	trace "perl_reload: cancelling all extension coros";
3835	$_->cancel for values %EXT_CORO;	4135	$_->cancel for values %EXT_CORO;
3836	%EXT_CORO = ();	4136	%EXT_CORO = ();
3837		4137
3838	warn "removing commands";	4138	trace "perl_reload: removing commands";
3839	%COMMAND = ();	4139	%COMMAND = ();
3840		4140
3841	warn "removing ext/exti commands";	4141	trace "perl_reload: removing ext/exti commands";
3842	%EXTCMD = ();	4142	%EXTCMD = ();
3843	%EXTICMD = ();	4143	%EXTICMD = ();
3844		4144
3845	warn "unloading/nuking all extensions";	4145	trace "perl_reload: unloading/nuking all extensions";
3846	for my $pkg (@EXTS) {	4146	for my $pkg (@EXTS) {
3847	warn "... unloading $pkg";	4147	trace "... unloading $pkg";
3848		4148
3849	if (my $cb = $pkg->can ("unload")) {	4149	if (my $cb = $pkg->can ("unload")) {
3850	eval {	4150	eval {
3851	$cb->($pkg);	4151	$cb->($pkg);
3852	1	4152	1
3853	} or warn "$pkg unloaded, but with errors: $@";	4153	} or error "$pkg unloaded, but with errors: $@";
3854	}	4154	}
3855		4155
3856	warn "... clearing $pkg";	4156	trace "... clearing $pkg";
3857	clear_package $pkg;	4157	clear_package $pkg;
3858	}	4158	}
3859		4159
3860	warn "unloading all perl modules loaded from $LIBDIR";	4160	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861	while (my ($k, $v) = each %INC) {	4161	while (my ($k, $v) = each %INC) {
3862	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4162	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863		4163
3864	warn "... unloading $k";	4164	trace "... unloading $k";
3865	delete $INC{$k};	4165	delete $INC{$k};
3866		4166
3867	$k =~ s/\.pm$//;	4167	$k =~ s/\.pm$//;
3868	$k =~ s/\//::/g;	4168	$k =~ s/\//::/g;
3869		4169
…		…
3872	}	4172	}
3873		4173
3874	clear_package $k;	4174	clear_package $k;
3875	}	4175	}
3876		4176
3877	warn "getting rid of safe::, as good as possible";	4177	trace "perl_reload: getting rid of safe::, as good as possible";
3878	clear_package "safe::$_"	4178	clear_package "safe::$_"
3879	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4179	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3880		4180
3881	warn "unloading cf.pm \"a bit\"";	4181	trace "perl_reload: unloading cf.pm \"a bit\"";
3882	delete $INC{"cf.pm"};	4182	delete $INC{"cf.pm"};
3883	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4183	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884		4184
3885	# don't, removes xs symbols, too,	4185	# don't, removes xs symbols, too,
3886	# and global variables created in xs	4186	# and global variables created in xs
3887	#clear_package __PACKAGE__;	4187	#clear_package __PACKAGE__;
3888		4188
3889	warn "unload completed, starting to reload now";	4189	info "perl_reload: unload completed, starting to reload now";
3890		4190
3891	warn "reloading cf.pm";	4191	trace "perl_reload: reloading cf.pm";
3892	require cf;	4192	require cf;
3893	cf::_connect_to_perl_1;	4193	cf::_connect_to_perl_1;
3894		4194
3895	warn "loading config and database again";	4195	trace "perl_reload: loading config and database again";
3896	cf::reload_config;	4196	cf::reload_config;
3897		4197
3898	warn "loading extensions";	4198	trace "perl_reload: loading extensions";
3899	cf::load_extensions;	4199	cf::load_extensions;
3900		4200
3901	if ($REATTACH_ON_RELOAD) {	4201	if ($REATTACH_ON_RELOAD) {
3902	warn "reattaching attachments to objects/players";	4202	trace "perl_reload: reattaching attachments to objects/players";
3903	_global_reattach; # objects, sockets	4203	_global_reattach; # objects, sockets
3904	warn "reattaching attachments to maps";	4204	trace "perl_reload: reattaching attachments to maps";
3905	reattach $_ for values %MAP;	4205	reattach $_ for values %MAP;
3906	warn "reattaching attachments to players";	4206	trace "perl_reload: reattaching attachments to players";
3907	reattach $_ for values %PLAYER;	4207	reattach $_ for values %PLAYER;
3908	}	4208	}
3909		4209
3910	warn "running post_init jobs";	4210	cf::_post_init 1;
3911	(pop @POST_INIT)->(1) while @POST_INIT;
3912		4211
3913	warn "leaving sync_job";	4212	trace "perl_reload: leaving sync_job";
3914		4213
3915	1	4214	1
3916	} or do {	4215	} or do {
3917	warn $@;	4216	error $@;
3918	cf::cleanup "error while reloading, exiting.";	4217	cf::cleanup "perl_reload: error, exiting.";
3919	};	4218	};
3920		4219
3921	warn "reloaded";
3922	--$RELOAD;	4220	--$RELOAD;
3923	}	4221	}
3924		4222
3925	$t1 = AE::time - $t1;	4223	$t1 = AE::time - $t1;
3926	warn "reload completed in ${t1}s\n";	4224	info "perl_reload: completed in ${t1}s\n";
3927	};	4225	};
3928		4226
3929	our $RELOAD_WATCHER; # used only during reload	4227	our $RELOAD_WATCHER; # used only during reload
3930		4228
3931	sub reload_perl() {	4229	sub reload_perl() {
…		…
3952	reload_perl;	4250	reload_perl;
3953	};	4251	};
3954	}	4252	}
3955	};	4253	};
3956		4254
3957	unshift @INC, $LIBDIR;	4255	#############################################################################
3958		4256
3959	my $bug_warning = 0;	4257	my $bug_warning = 0;
3960		4258
3961	our @WAIT_FOR_TICK;
3962	our @WAIT_FOR_TICK_BEGIN;
3963
3964	sub wait_for_tick {	4259	sub wait_for_tick() {
3965	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966		4261
3967	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
3968	push @WAIT_FOR_TICK, $signal;
3969	$signal->wait;
3970	}	4263	}
3971		4264
3972	sub wait_for_tick_begin {	4265	sub wait_for_tick_begin() {
3973	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974		4267
3975	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
3976	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
3977	$signal->wait;	4270	$signal->wait;
3978	}	4271	}
…		…
3982	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3983	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
3984	return;	4277	return;
3985	}	4278	}
3986		4279
3987	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
3988		4281
3989	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3990		4283
3991	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3993	Coro::async_pool {	4286	Coro::async_pool {
3994	$Coro::current->{desc} = "runtime saver";	4287	$Coro::current->{desc} = "runtime saver";
3995	write_runtime_sync	4288	write_runtime_sync
3996	or warn "ERROR: unable to write runtime file: $!";	4289	or error "ERROR: unable to write runtime file: $!";
3997	};	4290	};
3998	}	4291	}
3999		4292
4000	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001	$sig->send;	4294	$sig->send;
4002	}	4295	}
4003	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
4004	$sig->send;
4005	}
4006		4297
4007	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
4008	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009		4300
4010	if (0) {	4301	if (0) {
4011	if ($NEXT_TICK) {	4302	if ($NEXT_TICK) {
4012	my $jitter = $TICK_START - $NEXT_TICK;	4303	my $jitter = $TICK_START - $NEXT_TICK;
4013	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4304	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014	warn "jitter $JITTER\n";#d#	4305	debug "jitter $JITTER\n";#d#
4015	}	4306	}
4016	}	4307	}
4017	}	4308	}
4018		4309
4019	{	4310	{
4020	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4021		4313
4022	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4023	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4024	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4025		4317
4026	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4027	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4028	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4054	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4055	};	4347	};
4056	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4057	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4058	};	4350	};
		4351
		4352	info "database initialised";
4059	}	4353	}
4060		4354
4061	{	4355	{
4062	# configure IO::AIO	4356	# configure IO::AIO
4063		4357
		4358	info "initialising aio";
4064	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4065	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4066	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4067	}	4363	}
4068		4364
4069	my $_log_backtrace;	4365	our $_log_backtrace;
		4366	our $_log_backtrace_last;
4070		4367
4071	sub _log_backtrace {	4368	sub _log_backtrace {
4072	my ($msg, @addr) = @_;	4369	my ($msg, @addr) = @_;
4073		4370
4074	$msg =~ s/\n//;	4371	$msg =~ s/\n$//;
4075		4372
		4373	if ($_log_backtrace_last eq $msg) {
		4374	LOG llevInfo, "[ABT] $msg\n";
		4375	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076	# limit the # of concurrent backtraces	4376	# limit the # of concurrent backtraces
4077	if ($_log_backtrace < 2) {	4377	} elsif ($_log_backtrace < 2) {
		4378	$_log_backtrace_last = $msg;
4078	++$_log_backtrace;	4379	++$_log_backtrace;
4079	my $perl_bt = Carp::longmess $msg;	4380	my $perl_bt = Carp::longmess $msg;
4080	async {	4381	async {
4081	$Coro::current->{desc} = "abt $msg";	4382	$Coro::current->{desc} = "abt $msg";
4082		4383
…		…
4102	LOG llevInfo, "[ABT] $_\n" for @bt;	4403	LOG llevInfo, "[ABT] $_\n" for @bt;
4103	--$_log_backtrace;	4404	--$_log_backtrace;
4104	};	4405	};
4105	} else {	4406	} else {
4106	LOG llevInfo, "[ABT] $msg\n";	4407	LOG llevInfo, "[ABT] $msg\n";
4107	LOG llevInfo, "[ABT] [suppressed]\n";	4408	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108	}	4409	}
4109	}	4410	}
4110		4411
4111	# load additional modules	4412	# load additional modules
4112	require "cf/$_.pm" for @EXTRA_MODULES;	4413	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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