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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 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 = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
252		289
253	=back	290	=back
254		291
255	=cut	292	=cut
256		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
257	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
258	my $msg = join "", @_;	301	my $msg = join "", @_;
259		302
260	$msg .= "\n"	303	$msg .= "\n"
261	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
262		305
263	$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;
264		307
265	LOG llevError, $msg;	308	LOG llevWarn, $msg;
266	};	309	};
267		310
268	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
269	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
270		313
271	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
272		315
273	if (in_main) {#d#	316	if (in_main) {#d#
274	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
275	return;#d#	318	return;#d#
276	}#d#	319	}#d#
277		320
278	# kill coroutine otherwise	321	# kill coroutine otherwise
279	Coro::terminate	322	Coro::terminate
…		…
299	)) {	342	)) {
300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301	}	344	}
302		345
303	$EV::DIED = sub {	346	$EV::DIED = sub {
304	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
305	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
306		354
307	#############################################################################	355	#############################################################################
308		356
309	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
310		358
…		…
331	$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;
332	$d	380	$d
333	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
334	}	382	}
335		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
336	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
337		437
338	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
339		439
340	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
346	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
347		447
348	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
349	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
350		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
351	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
352		483
353	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,
354	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
355		486
356	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
357	is a reload or not.	488	is a reload or not.
358		489
359	=cut	490	=cut
360		491
361	sub post_init(&) {	492	sub post_init(&) {
362	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	}
363	}	511	}
364		512
365	=item cf::lock_wait $string	513	=item cf::lock_wait $string
366		514
367	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
420	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
421	}	569	}
422		570
423	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
424		572
425	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
426	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
427	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
428		580
429	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
430	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
431		583
432	Useful for short background jobs.	584	Useful for short background jobs.
…		…
444	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
445	my $busy;	597	my $busy;
446		598
447	while () {	599	while () {
448	next_job:	600	next_job:
		601
		602	Coro::cede;
449		603
450	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
451		605
452	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
453	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
454	$busy = 0;	608	$busy = 0;
455	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
456	$job->[2]->send;	610	$job->[2]->send;
457	Coro::cede;
458	goto next_job;	611	goto next_job;
459	} else {	612	} else {
460	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
461	}	614	}
462	}	615	}
463		616
464	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
465	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
466	push @cf::WAIT_FOR_TICK, $signal;
467	$signal->wait;
468	} else {	619	} else {
469	$busy = 0;	620	$busy = 0;
470	Coro::schedule;	621	Coro::schedule;
471	}	622	}
472	}	623	}
…		…
512	=cut	663	=cut
513		664
514	sub sync_job(&) {	665	sub sync_job(&) {
515	my ($job) = @_;	666	my ($job) = @_;
516		667
517	if ($Coro::current == $Coro::main) {	668	if (in_main) {
518	my $time = AE::time;	669	my $time = AE::time;
519		670
520	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
521	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
522		673
523	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
524		675
525	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
526		677
527	my $busy = 1;	678	my $busy = 1;
528	my @res;	679	my @res;
529		680
530	(async {	681	(async {
531	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
532	@res = eval { $job->() };	683	@res = eval { $job->() };
533	warn $@ if $@;	684	error $@ if $@;
534	undef $busy;	685	undef $busy;
535	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
536		687
537	while ($busy) {	688	while ($busy) {
538	if (Coro::nready) {	689	if (Coro::nready) {
…		…
572	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
573		724
574	$coro	725	$coro
575	}	726	}
576		727
577	=item fork_call { }, $args	728	=item fork_call { }, @args
578		729
579	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
580	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
581	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
582	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
583		734
584	=cut	735	=cut
585		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
586	sub fork_call(&@) {	741	sub fork_call(&@) {
587	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
588		743
589	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)
592
593	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
594	reset_signals;	745	cf::post_fork;
595	&$cb	746	&$cb
596	}, @args;	747	} @args;
597		748
598	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
599	}	750	}
600		751
601	sub objinfo {	752	sub objinfo {
…		…
651	within each server.	802	within each server.
652		803
653	=cut	804	=cut
654		805
655	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
656	my ($name) = @_;	810	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
658		812
659	eval {	813	eval {
660	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
670	}	824	}
671		825
672	our $DB;	826	our $DB;
673		827
674	sub db_init {	828	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	829	$DB ||= db_table "db";
677	};
678	}	830	}
679		831
680	sub db_get($$) {	832	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
682		834
683	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
684	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
685		839
686	$! ? ()	840	$! ? ()
687	: $data	841	: $data
688	}
689	}	842	}
690		843
691	sub db_put($$$) {	844	sub db_put($$$) {
692	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		874
722	my @data;	875	my @data;
723	my $md5;	876	my $md5;
724		877
725	for (0 .. $#$src) {	878	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	880	}
729		881
730	# if processing is expensive, check	882	# if processing is expensive, check
731	# checksum first	883	# checksum first
732	if (1) {	884	if (1) {
…		…
745		897
746	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
747	}	899	}
748	}	900	}
749		901
750	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
751	my $data = $process->(\@data);	903	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
753		905
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		907
756	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
759		911
…		…
769		921
770	=cut	922	=cut
771		923
772	sub datalog($@) {	924	sub datalog($@) {
773	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	927	}
776		928
777	=back	929	=back
778		930
779	=cut	931	=cut
…		…
974		1126
975	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1129
978	} elsif (ref $type) {	1130	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
980		1132
981	} else {	1133	} else {
982	shift @arg;	1134	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
984	}	1136	}
985	}	1137	}
986	}	1138	}
987		1139
988	sub _object_attach {	1140	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
999	}	1151	}
1000		1152
1001	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
1002	} else {	1154	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1156	}
1005		1157
1006	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
1007	}	1159	}
1008		1160
…		…
1067		1219
1068	for (@$callbacks) {	1220	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1070		1222
1071	if ($@) {	1223	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1225	override;
1075	}	1226	}
1076		1227
1077	return 1 if $override;	1228	return 1 if $override;
1078	}	1229	}
…		…
1157	for (@$attach) {	1308	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1160	}	1311	}
1161	} else {	1312	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1314	}
1164	}	1315	}
1165	}	1316	}
1166		1317
1167	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1195		1346
1196	sync_job {	1347	sync_job {
1197	if (length $$rdata) {	1348	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1351	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1352	if $VERBOSE_IO;
1202		1353
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1229		1380
1230	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1383	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1234	}	1385	}
1235	} else {	1386	} else {
1236	aio_unlink $filename;	1387	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1238	}	1389	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1414	$av = $st->{objs};
1264	}	1415	}
1265		1416
1266	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1419	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1420	if $VERBOSE_IO;
1270		1421
1271	($data, $av)	1422	($data, $av)
1272	}	1423	}
1273		1424
…		…
1278	=cut	1429	=cut
1279		1430
1280	#############################################################################	1431	#############################################################################
1281	# command handling &c	1432	# command handling &c
1282		1433
1283	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1284		1435
1285	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1286	$name.	1437	$name.
1287		1438
1288	=cut	1439	=cut
…		…
1294	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1295		1446
1296	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1297	}	1448	}
1298		1449
1299	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1300		1451
1301	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1302	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1303	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1304	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1305	has logged in successfully.	1456	has logged in successfully.
1306		1457
1307	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1308	called.
1309		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1310	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1311		1466
1312	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1313	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1314	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1315	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1316	log-in.	1471	log-in.
1317		1472
1318	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1319	called.
1320		1474
1321	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1322		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1323	sub register_extcmd {	1482	sub register_extcmd($$) {
1324	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1325		1484
1326	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1327	}	1486	}
1328		1487
1329	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1330	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1331		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1332	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1333	}	1504	}
1334		1505
1335	use File::Glob ();	1506	use File::Glob ();
1336		1507
1337	cf::player->attach (	1508	cf::player->attach (
…		…
1351	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1352		1523
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1525
1355	if (ref $msg) {	1526	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357	"ARRAY" eq ref $msg
1358	? @$msg
1359	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360		1528
1361	my @reply;
1362
1363	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1364	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1365	}	1547	}
1366		1548
1367	$pl->ext_reply ($reply, @reply)
1368	if $reply;
1369
1370	} else {	1549	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1551	}
1373		1552
1374	cf::override;	1553	cf::override;
1375	},	1554	},
1376	);	1555	);
…		…
1386	};	1565	};
1387		1566
1388	$grp	1567	$grp
1389	}	1568	}
1390		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1391	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1392	cf::sync_job {	1586	cf::sync_job {
1393	my %todo;	1587	my %todo;
1394		1588
1395	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1590	next unless -r $path;
…		…
1414		1608
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1611
1418	$ext{source} =	1612	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1421	. $source	1615	. $source
1422	. "\n};\n1";	1616	. "\n};\n1";
1423		1617
1424	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1631	next ext
1438	unless exists $done{$_};	1632	unless exists $done{$_};
1439	}	1633	}
1440		1634
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1443	my $active = eval $v->{source};	1646	my $active = eval $source;
1444		1647
1445	if (length $@) {	1648	if (length $@) {
1446	warn "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1447		1650
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
1450		1653
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1656	} else {
1454	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1456	$progress = 1;	1659	$progress = 1;
1457		1660
1458	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1662	unless $active;
1460	}	1663	}
1461	}	1664	}
1462		1665
1463	unless ($progress) {	1666	unless ($progress) {
…		…
1465		1668
1466	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1469	}	1672	}
		1673
		1674	last;
1470	}	1675	}
1471	}	1676	}
1472	};	1677	};
1473	}	1678	}
1474		1679
…		…
1632	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1633		1838
1634	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1636		1841
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1843	$pl->deactivate;
		1844
1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1641	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1642		1850
1643	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1644	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1645	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1731		1939
1732	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1733		1941
1734	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1735		1943
1736	=item $player->ext_reply ($msgid, @msg)
1737
1738	Sends an ext reply to the player.
1739
1740	=cut
1741
1742	sub ext_reply($$@) {
1743	my ($self, $id, @msg) = @_;
1744
1745	$self->ns->ext_reply ($id, @msg)
1746	}
1747
1748	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1749		1945
1750	Sends an ext event to the client.	1946	Sends an ext event to the client.
1751		1947
1752	=cut	1948	=cut
…		…
1811	sub generate_random_map {	2007	sub generate_random_map {
1812	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1813		2009
1814	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815		2011
1816	# mit "rum" bekleckern, nicht
1817	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1818	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821	$rmp->{exit_on_final_map},
1822	$rmp->{xsize}, $rmp->{ysize},
1823	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828	(cf::region::find $rmp->{region}), $rmp->{custom}
1829	)
1830	}	2013	}
1831		2014
1832	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1833		2016
1834	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1839		2022
1840	sub register {	2023	sub register {
1841	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1842	my $pkg = caller;	2025	my $pkg = caller;
1843		2026
1844	no strict;
1845	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1846		2028
1847	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848	}	2030	}
1849		2031
…		…
1861	}	2043	}
1862		2044
1863	sub normalise {	2045	sub normalise {
1864	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1865		2047
1866	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1867		2049
1868	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1869		2051
1870	# map plan:	2052	# map plan:
1871	#	2053	#
…		…
1886	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1887	$path = "$base/$path";	2069	$path = "$base/$path";
1888	}	2070	}
1889		2071
1890	for ($path) {	2072	for ($path) {
1891	redo if s{//}{/};
1892	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1893	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1894	}	2075	}
1895		2076
1896	$path	2077	$path
…		…
1910	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1911	return $self;	2092	return $self;
1912	}	2093	}
1913	}	2094	}
1914		2095
1915	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1916	()	2097	()
1917	}	2098	}
1918		2099
		2100	# may re-bless or do other evil things
1919	sub init {	2101	sub init {
1920	my ($self) = @_;	2102	my ($self) = @_;
1921		2103
1922	$self	2104	$self
1923	}	2105	}
…		…
1988	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1989		2171
1990	1	2172	1
1991	}	2173	}
1992		2174
		2175	# used to laod the header of an original map
1993	sub load_header_orig {	2176	sub load_header_orig {
1994	my ($self) = @_;	2177	my ($self) = @_;
1995		2178
1996	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1997	}	2180	}
1998		2181
		2182	# used to laod the header of an instantiated map
1999	sub load_header_temp {	2183	sub load_header_temp {
2000	my ($self) = @_;	2184	my ($self) = @_;
2001		2185
2002	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2003	}	2187	}
2004		2188
		2189	# called after loading the header from an instantiated map
2005	sub prepare_temp {	2190	sub prepare_temp {
2006	my ($self) = @_;	2191	my ($self) = @_;
2007		2192
2008	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2009	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2010	# safety	2195	# safety
2011	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2012	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2013	}	2198	}
2014		2199
		2200	# called after loading the header from an original map
2015	sub prepare_orig {	2201	sub prepare_orig {
2016	my ($self) = @_;	2202	my ($self) = @_;
2017		2203
2018	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2019	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2043		2229
2044	sub find;	2230	sub find;
2045	sub find {	2231	sub find {
2046	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2047		2233
		2234	cf::cede_to_tick;
		2235
2048	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2049		2237
2050	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2052		2240
2053	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2084		2272
2085	{	2273	{
2086	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2087		2275
2088	return unless $self->valid;	2276	return unless $self->valid;
2089	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2090
2091	$self->in_memory (cf::MAP_LOADING);
2092		2278
2093	$self->alloc;	2279	$self->alloc;
2094		2280
2095	$self->pre_load;	2281	$self->pre_load;
2096	cf::cede_to_tick;	2282	cf::cede_to_tick;
2097		2283
		2284	if (exists $self->{load_path}) {
2098	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2099	$f->skip_block;	2286	$f->skip_block;
2100	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2101	or return;	2288	or return;
2102		2289
2103	$self->post_load_original	2290	$self->post_load_original
2104	if delete $self->{load_original};	2291	if delete $self->{load_original};
2105		2292
2106	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2107	utf8::encode $uniq;	2294	utf8::encode $uniq;
2108	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2109	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2110	$self->clear_unique_items;	2297	$self->clear_unique_items;
2111	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2112	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2113	}	2301	}
2114	}	2302	}
2115	}
2116		2303
2117	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2118		2311
2119	cf::cede_to_tick;	2312	cf::cede_to_tick;
2120	# now do the right thing for maps	2313	# now do the right thing for maps
2121	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2122	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2126	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2127	$self->decay_objects;	2320	$self->decay_objects;
2128	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2129	$self->update_buttons;	2322	$self->update_buttons;
2130	cf::cede_to_tick;	2323	cf::cede_to_tick;
2131	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2132	}	2325	}
2133		2326
2134	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2135	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2136
2137	$self->in_memory (cf::MAP_ACTIVE);
2138	}	2329	}
2139		2330
2140	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2141	}	2334	}
2142		2335
2143	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2144	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2145	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2153	# if $self->per_party;	2346	# if $self->per_party;
2154		2347
2155	$self	2348	$self
2156	}	2349	}
2157		2350
2158	# find and load all maps in the 3x3 area around a map
2159	sub load_neighbours {
2160	my ($map) = @_;
2161
2162	my @neigh; # diagonal neighbours
2163
2164	for (0 .. 3) {
2165	my $neigh = $map->tile_path ($_)
2166	or next;
2167	$neigh = find $neigh, $map
2168	or next;
2169	$neigh->load;
2170
2171	# now find the diagonal neighbours
2172	push @neigh,
2173	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2174	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2175	}
2176
2177	for (grep defined $_->[0], @neigh) {
2178	my ($path, $origin) = @$_;
2179	my $neigh = find $path, $origin
2180	or next;
2181	$neigh->load;
2182	}
2183	}
2184
2185	sub find_sync {	2351	sub find_sync {
2186	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2187		2353
2188	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2189	}	2359	}
2190		2360
2191	sub do_load_sync {	2361	sub do_load_sync {
2192	my ($map) = @_;	2362	my ($map) = @_;
2193		2363
		2364	# it's a bug to call this from the main context
2194	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2196		2367
2197	cf::sync_job { $map->load };	2368	$map->load;
2198	}	2369	}
2199		2370
2200	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2201	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2202		2373
2203	sub find_async {	2374	sub find_async {
2204	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2205		2376
2206	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2207		2378
2208	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2209	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2210	}	2381	}
2211		2382
2212	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2213		2384
2214	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2273	sub swap_out {	2444	sub swap_out {
2274	my ($self) = @_;	2445	my ($self) = @_;
2275		2446
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277		2448
2278	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2279	return if $self->{deny_save};	2450	return if $self->{deny_save};
2280	return if $self->players;	2451	return if $self->players;
2281		2452
2282	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2283	$self->deactivate;	2454	$self->deactivate;
2284	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2285	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2286		2457
2287	# then atomically save	2458	# then atomically save
2288	$self->_save;	2459	$self->_save;
2289		2460
2290	# then free the map	2461	# then free the map
…		…
2314		2485
2315	my $lock = cf::lock_acquire "map_data:$self->{path}";	2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
2316		2487
2317	return if $self->players;	2488	return if $self->players;
2318		2489
2319	warn "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2320		2491
2321	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2322		2493
2323	# need to save uniques path	2494	# need to save uniques path
2324	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2325	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2326		2497
…		…
2479		2650
2480	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2481		2652
2482	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2483		2654
2484	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2485	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2486		2657
2487	=cut	2658	=cut
2488		2659
2489	sub deref {	2660	sub deref {
…		…
2656	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2657	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2658	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2659		2830
2660	$map->load;	2831	$map->load;
2661	$map->load_neighbours;
2662		2832
2663	return unless $self->contr->active;	2833	return unless $self->contr->active;
2664		2834
2665	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2689		2859
2690	sub cf::object::player::goto {	2860	sub cf::object::player::goto {
2691	my ($self, $path, $x, $y, $check, $done) = @_;	2861	my ($self, $path, $x, $y, $check, $done) = @_;
2692		2862
2693	if ($self->{_link_recursion} >= $MAX_LINKS) {	2863	if ($self->{_link_recursion} >= $MAX_LINKS) {
2694	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2864	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2865	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696	($path, $x, $y) = @$EMERGENCY_POSITION;	2866	($path, $x, $y) = @$EMERGENCY_POSITION;
2697	}	2867	}
2698		2868
2699	# do generation counting so two concurrent goto's will be executed in-order	2869	# do generation counting so two concurrent goto's will be executed in-order
…		…
2722	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2723	}	2893	}
2724	}	2894	}
2725		2895
2726	my $map = eval {	2896	my $map = eval {
2727	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728		2898
2729	if ($map) {	2899	if ($map) {
2730	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2731	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2732	} else {	2902	} else {
…		…
2822	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2823		2993
2824	unless (eval {	2994	unless (eval {
2825	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2826		2996
2827	# random map handling
2828	{
2829	my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831	prepare_random_map $exit
2832	if $exit->slaying eq "/!";
2833	}
2834
2835	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2836	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2837	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2838		3023
2839	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2840		3025
2841	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2842	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2847	$self->message ("Something went wrong deep within the deliantra server. "	3032	$self->message ("Something went wrong deep within the deliantra server. "
2848	. "I'll try to bring you back to the map you were before. "	3033	. "I'll try to bring you back to the map you were before. "
2849	. "Please report this to the dungeon master!",	3034	. "Please report this to the dungeon master!",
2850	cf::NDI_UNIQUE | cf::NDI_RED);	3035	cf::NDI_UNIQUE | cf::NDI_RED);
2851		3036
2852	warn "ERROR in enter_exit: $@";	3037	error "ERROR in enter_exit: $@";
2853	$self->leave_link;	3038	$self->leave_link;
2854	}	3039	}
2855	})->prio (1);	3040	})->prio (1);
2856	}	3041	}
2857		3042
2858	=head3 cf::client	3043	=head3 cf::client
2859		3044
2860	=over 4	3045	=over 4
2861
2862	=item $client->send_drawinfo ($text, $flags)
2863
2864	Sends a drawinfo packet to the client. Circumvents output buffering so
2865	should not be used under normal circumstances.
2866
2867	=cut
2868
2869	sub cf::client::send_drawinfo {
2870	my ($self, $text, $flags) = @_;
2871
2872	utf8::encode $text;
2873	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2874	}
2875		3046
2876	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2877		3048
2878	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2879	them as required.	3050	them as required.
…		…
2898	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2899	}	3070	}
2900		3071
2901	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2902		3073
2903	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2904	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2905	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2906	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2907		3078
2908	=cut	3079	=cut
2909		3080
2910	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3015	id => "death",	3186	id => "death",
3016	title => "Death",	3187	title => "Death",
3017	reply => undef,	3188	reply => undef,
3018	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3019	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3020	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3021	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3022	);	3199	);
3023		3200
3024	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3067	=cut	3244	=cut
3068		3245
3069	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3070	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3071		3248
3072	if ($self->extcmd == 2) {
3073	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3074	} elsif ($self->extcmd == 1) { # TODO: remove
3075	push @msg, msgtype => "event_$type";
3076	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3077	}
3078	}
3079
3080	=item $client->ext_reply ($msgid, @msg)
3081
3082	Sends an ext reply to the client.
3083
3084	=cut
3085
3086	sub cf::client::ext_reply($$@) {
3087	my ($self, $id, @msg) = @_;
3088
3089	if ($self->extcmd == 2) {
3090	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091	} elsif ($self->extcmd == 1) {
3092	#TODO: version 1, remove
3093	unshift @msg, msgtype => "reply", msgid => $id;
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}	3250	}
3097		3251
3098	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3099		3253
3100	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3120		3274
3121	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3122	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3123		3277
3124	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3125	}	3317	}
3126		3318
3127	cf::client->attach (	3319	cf::client->attach (
3128	on_connect => sub {	3320	on_connect => sub {
3129	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3155	my ($ns, $buf) = @_;	3347	my ($ns, $buf) = @_;
3156		3348
3157	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158		3350
3159	if (ref $msg) {	3351	if (ref $msg) {
3160	my ($type, $reply, @payload) =	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161	"ARRAY" eq ref $msg
3162	? @$msg
3163	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164		3353
3165	my @reply;
3166
3167	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3168	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3169	}	3372	}
3170
3171	$ns->ext_reply ($reply, @reply)
3172	if $reply;
3173
3174	} else {	3373	} else {
3175	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176	}	3375	}
3177		3376
3178	cf::override;	3377	cf::override;
3179	},	3378	},
3180	);	3379	);
…		…
3261	decrease split destroy change_exp value msg lore send_msg)],	3460	decrease split destroy change_exp value msg lore send_msg)],
3262	["cf::object::player" => qw(player)],	3461	["cf::object::player" => qw(player)],
3263	["cf::player" => qw(peaceful send_msg)],	3462	["cf::player" => qw(peaceful send_msg)],
3264	["cf::map" => qw(trigger)],	3463	["cf::map" => qw(trigger)],
3265	) {	3464	) {
3266	no strict 'refs';
3267	my ($pkg, @funs) = @$_;	3465	my ($pkg, @funs) = @$_;
3268	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3466	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269	for @funs;	3467	for @funs;
3270	}	3468	}
3271		3469
…		…
3310	local @cf::_safe_eval_args = values %vars;	3508	local @cf::_safe_eval_args = values %vars;
3311	@res = wantarray ? eval eval : scalar eval $eval;	3509	@res = wantarray ? eval eval : scalar eval $eval;
3312	}	3510	}
3313		3511
3314	if ($@) {	3512	if ($@) {
3315	warn "$@";	3513	warn "$@",
3316	warn "while executing safe code '$code'\n";	3514	"while executing safe code '$code'\n",
3317	warn "with arguments " . (join " ", %vars) . "\n";	3515	"with arguments " . (join " ", %vars) . "\n";
3318	}	3516	}
3319		3517
3320	wantarray ? @res : $res[0]	3518	wantarray ? @res : $res[0]
3321	}	3519	}
3322		3520
…		…
3347	=cut	3545	=cut
3348		3546
3349	#############################################################################	3547	#############################################################################
3350	# the server's init and main functions	3548	# the server's init and main functions
3351		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3352	sub load_facedata($) {	3627	sub load_facedata($) {
3353	my ($path) = @_;	3628	my ($path) = @_;
3354		3629
3355	# HACK to clear player env face cache, we need some signal framework
3356	# for this (global event?)
3357	%ext::player_env::MUSIC_FACE_CACHE = ();
3358
3359	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360		3631
3361	warn "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3362		3633
3363	my $facedata;	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3364	0 < aio_load $path, $facedata
3365	or die "$path: $!";
3366
3367	$facedata = Coro::Storable::thaw $facedata;
3368		3635
3369	$facedata->{version} == 2	3636	$facedata->{version} == 2
3370	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3371		3638
3372	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3373	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3374	$facedata->{resource}{"res/exp_table"} = {	3641
3375	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3376	data => $exp_table,	3643
3377	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3378	};	3645	# from here on, everything must be atomic - no thread switch allowed
3379	cf::cede_to_tick;	3646	my $t1 = EV::time;
3380		3647
3381	{	3648	{
3382	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3383		3650
3384	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3385	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386		3654
3387	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3388	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3389	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3390	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3391		3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3392	cf::cede_to_tick;	3660	$cf::face::HASH{$info->{hash64}} = $idx;
		3661	delete $cf::face::META[$idx];
3393	}	3662	}
3394		3663
3395	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3396	next unless $info->{smooth};	3665	next unless $info->{smooth};
3397		3666
…		…
3400		3669
3401	if (my $smooth = cf::face::find $info->{smooth}) {	3670	if (my $smooth = cf::face::find $info->{smooth}) {
3402	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3403	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404	} else {	3673	} else {
3405	warn "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3406	}	3675	}
3407
3408	cf::cede_to_tick;
3409	}	3676	}
3410	}	3677	}
3411		3678
3412	{	3679	{
3413	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3414		3681
3415	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3416	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3417	cf::cede_to_tick;
3418	}	3684	}
3419		3685
3420	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3421	}	3687	}
3422		3688
3423	{	3689	{
3424	my $res = $facedata->{resource};	3690	my $res = $facedata->{resource};
3425		3691
3426	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3427	if (defined $info->{type}) {	3693	if (defined (my $type = $info->{type})) {
		3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3428	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429		3696
3430	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431	cf::face::set_type $idx, $info->{type};	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3432	} else {	3703	} else {
3433	$RESOURCE{$name} = $info;	3704	# $RESOURCE{$name} = $info; # unused
3434	}	3705	}
3435
3436	cf::cede_to_tick;
3437	}	3706	}
3438	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3439		3718
3440	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3441		3720
		3721	aio_close $fh if $fh; # close old facedata
		3722
3442	1	3723	1
3443	}	3724	}
3444
3445	cf::global->attach (on_resource_update => sub {
3446	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3447	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3448
3449	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3450	my $sound = $soundconf->{compat}[$_]
3451	or next;
3452
3453	my $face = cf::face::find "sound/$sound->[1]";
3454	cf::sound::set $sound->[0] => $face;
3455	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3456	}
3457
3458	while (my ($k, $v) = each %{$soundconf->{event}}) {
3459	my $face = cf::face::find "sound/$v";
3460	cf::sound::set $k => $face;
3461	}
3462	}
3463	});
3464		3725
3465	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
3466	my ($ns, $want) = @_;	3727	my ($ns, $want) = @_;
3467		3728
3468	while (my ($k, $v) = each %$want) {	3729	while (my ($k, $v) = each %$want) {
…		…
3476	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3477	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3478	cf::arch::commit_load;	3739	cf::arch::commit_load;
3479		3740
3480	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3481	}	3756	}
3482		3757
3483	sub reload_regions {	3758	sub reload_regions {
3484	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3485	# for this (global event?)	3760	# for this (global event?)
…		…
3493	if exists $_->{match};	3768	if exists $_->{match};
3494	}	3769	}
3495	}	3770	}
3496		3771
3497	sub reload_facedata {	3772	sub reload_facedata {
3498	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3499	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3500	}	3775	}
3501		3776
3502	sub reload_archetypes {	3777	sub reload_archetypes {
3503	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3504	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
		3792
		3793	# command completion
		3794	my @commands;
		3795
		3796	for (0..cf::arch::skillvec_size - 1) {
		3797	my $skill = cf::arch::skillvec $_;
		3798	my $name = $skill->name;
		3799	my $flags = cf::skill_flags $skill->subtype;
		3800
		3801	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3802	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3803	}
		3804
		3805	cf::client::set_command_face skill => \@commands;
3505	}	3806	}
3506		3807
3507	sub reload_treasures {	3808	sub reload_treasures {
3508	load_resource_file "$DATADIR/treasures"	3809	load_resource_file "$DATADIR/treasures"
3509	or die "unable to load treasurelists\n";	3810	or die "unable to load treasurelists\n";
3510	}	3811	}
3511		3812
		3813	sub reload_sound {
		3814	trace "loading sound config from $DATADIR/sound\n";
		3815
		3816	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3817
		3818	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3819	my $sound = $soundconf->{compat}[$_]
		3820	or next;
		3821
		3822	my $face = cf::face::find "sound/$sound->[1]";
		3823	cf::sound::set $sound->[0] => $face;
		3824	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3825	}
		3826
		3827	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3828	my $face = cf::face::find "sound/$v";
		3829	cf::sound::set $k => $face;
		3830	}
		3831	}
		3832
3512	sub reload_resources {	3833	sub reload_resources {
3513	warn "reloading resource files...\n";	3834	trace "reloading resource files...\n";
3514		3835
		3836	reload_materials;
3515	reload_facedata;	3837	reload_facedata;
		3838	reload_exp_table;
		3839	reload_sound;
3516	reload_archetypes;	3840	reload_archetypes;
3517	reload_regions;	3841	reload_regions;
3518	reload_treasures;	3842	reload_treasures;
3519		3843
3520	warn "finished reloading resource files\n";	3844	trace "finished reloading resource files\n";
3521	}	3845	}
3522		3846
3523	sub reload_config {	3847	sub reload_config {
3524	warn "reloading config file...\n";	3848	trace "reloading config file...\n";
3525		3849
3526	open my $fh, "<:utf8", "$CONFDIR/config"	3850	my $config = load_file "$CONFDIR/config";
3527	or return;	3851	utf8::decode $config;
3528		3852	*CFG = decode_yaml $config;
3529	local $/;
3530	*CFG = YAML::XS::Load scalar <$fh>;
3531		3853
3532	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3854	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3533		3855
3534	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3856	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3535	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3857	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3539	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3861	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3540	and die "WARNING: m(un)lockall failed: $!\n";	3862	and die "WARNING: m(un)lockall failed: $!\n";
3541	};	3863	};
3542	warn $@ if $@;	3864	warn $@ if $@;
3543	}	3865	}
3544
3545	warn "finished reloading resource files\n";
3546	}	3866	}
3547		3867
3548	sub pidfile() {	3868	sub pidfile() {
3549	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3869	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3550	or die "$PIDFILE: $!";	3870	or die "$PIDFILE: $!";
…		…
3563	seek $fh, 0, 0;	3883	seek $fh, 0, 0;
3564	print $fh $$;	3884	print $fh $$;
3565	}	3885	}
3566		3886
3567	sub main_loop {	3887	sub main_loop {
3568	warn "EV::loop starting\n";	3888	trace "EV::loop starting\n";
3569	if (1) {	3889	if (1) {
3570	EV::loop;	3890	EV::loop;
3571	}	3891	}
3572	warn "EV::loop returned\n";	3892	trace "EV::loop returned\n";
3573	goto &main_loop unless $REALLY_UNLOOP;	3893	goto &main_loop unless $REALLY_UNLOOP;
3574	}	3894	}
3575		3895
3576	sub main {	3896	sub main {
3577	cf::init_globals; # initialise logging	3897	cf::init_globals; # initialise logging
3578		3898
3579	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3899	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3580	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3900	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3581	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3901	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3582	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3902	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3583		3903
3584	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3904	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3585		3905
3586	# we must not ever block the main coroutine	3906	# we must not ever block the main coroutine
3587	local $Coro::idle = sub {	3907	$Coro::idle = sub {
3588	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3908	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3589	(async {	3909	(async {
3590	$Coro::current->{desc} = "IDLE BUG HANDLER";	3910	$Coro::current->{desc} = "IDLE BUG HANDLER";
3591	EV::loop EV::LOOP_ONESHOT;	3911	EV::loop EV::LOOP_ONESHOT;
3592	})->prio (Coro::PRIO_MAX);	3912	})->prio (Coro::PRIO_MAX);
3593	};	3913	};
3594		3914
3595	evthread_start IO::AIO::poll_fileno;	3915	evthread_start IO::AIO::poll_fileno;
3596		3916
3597	cf::sync_job {	3917	cf::sync_job {
3598	cf::init_experience;	3918	cf::incloader::init ();
		3919
		3920	db_init;
		3921
3599	cf::init_anim;	3922	cf::init_anim;
3600	cf::init_attackmess;	3923	cf::init_attackmess;
3601	cf::init_dynamic;	3924	cf::init_dynamic;
3602		3925
3603	cf::load_settings;	3926	cf::load_settings;
3604	cf::load_materials;
3605		3927
3606	reload_resources;	3928	reload_resources;
3607	reload_config;	3929	reload_config;
3608	db_init;
3609		3930
3610	cf::init_uuid;	3931	cf::init_uuid;
3611	cf::init_signals;	3932	cf::init_signals;
3612	cf::init_skills;	3933	cf::init_skills;
3613		3934
…		…
3621		3942
3622	# no (long-running) fork's whatsoever before this point(!)	3943	# no (long-running) fork's whatsoever before this point(!)
3623	use POSIX ();	3944	use POSIX ();
3624	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3945	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3625		3946
3626	(pop @POST_INIT)->(0) while @POST_INIT;	3947	cf::_post_init 0;
3627	};	3948	};
3628		3949
3629	cf::object::thawer::errors_are_fatal 0;	3950	cf::object::thawer::errors_are_fatal 0;
3630	warn "parse errors in files are no longer fatal from this point on.\n";	3951	info "parse errors in files are no longer fatal from this point on.\n";
3631		3952
		3953	AE::postpone {
		3954	undef &main; # free gobs of memory :)
		3955	};
		3956
3632	main_loop;	3957	goto &main_loop;
3633	}	3958	}
3634		3959
3635	#############################################################################	3960	#############################################################################
3636	# initialisation and cleanup	3961	# initialisation and cleanup
3637		3962
…		…
3676	or return;	4001	or return;
3677		4002
3678	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4003	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3679	and return;	4004	and return;
3680		4005
3681	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4006	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3682		4007
3683	1	4008	1
3684	}	4009	}
3685		4010
3686	our $uuid_lock;	4011	our $uuid_lock;
…		…
3698	or return;	4023	or return;
3699		4024
3700	my $value = uuid_seq uuid_cur;	4025	my $value = uuid_seq uuid_cur;
3701		4026
3702	unless ($value) {	4027	unless ($value) {
3703	warn "cowardly refusing to write zero uuid value!\n";	4028	info "cowardly refusing to write zero uuid value!\n";
3704	return;	4029	return;
3705	}	4030	}
3706		4031
3707	my $value = uuid_str $value + $uuid_skip;	4032	my $value = uuid_str $value + $uuid_skip;
3708	$uuid_skip = 0;	4033	$uuid_skip = 0;
…		…
3718	or return;	4043	or return;
3719		4044
3720	aio_rename "$uuid~", $uuid	4045	aio_rename "$uuid~", $uuid
3721	and return;	4046	and return;
3722		4047
3723	warn "uuid file written ($value).\n";	4048	trace "uuid file written ($value).\n";
3724		4049
3725	1	4050	1
3726		4051
3727	}	4052	}
3728		4053
…		…
3734	}	4059	}
3735		4060
3736	sub emergency_save() {	4061	sub emergency_save() {
3737	my $freeze_guard = cf::freeze_mainloop;	4062	my $freeze_guard = cf::freeze_mainloop;
3738		4063
3739	warn "emergency_perl_save: enter\n";	4064	info "emergency_perl_save: enter\n";
		4065
		4066	# this is a trade-off: we want to be very quick here, so
		4067	# save all maps without fsync, and later call a global sync
		4068	# (which in turn might be very very slow)
		4069	local $USE_FSYNC = 0;
3740		4070
3741	cf::sync_job {	4071	cf::sync_job {
3742	# this is a trade-off: we want to be very quick here, so	4072	cf::write_runtime_sync; # external watchdog should not bark
3743	# save all maps without fsync, and later call a global sync
3744	# (which in turn might be very very slow)
3745	local $USE_FSYNC = 0;
3746		4073
3747	# use a peculiar iteration method to avoid tripping on perl	4074	# use a peculiar iteration method to avoid tripping on perl
3748	# refcount bugs in for. also avoids problems with players	4075	# refcount bugs in for. also avoids problems with players
3749	# and maps saved/destroyed asynchronously.	4076	# and maps saved/destroyed asynchronously.
3750	warn "emergency_perl_save: begin player save\n";	4077	info "emergency_perl_save: begin player save\n";
3751	for my $login (keys %cf::PLAYER) {	4078	for my $login (keys %cf::PLAYER) {
3752	my $pl = $cf::PLAYER{$login} or next;	4079	my $pl = $cf::PLAYER{$login} or next;
3753	$pl->valid or next;	4080	$pl->valid or next;
3754	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4081	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3755	$pl->save;	4082	$pl->save;
3756	}	4083	}
3757	warn "emergency_perl_save: end player save\n";	4084	info "emergency_perl_save: end player save\n";
3758		4085
		4086	cf::write_runtime_sync; # external watchdog should not bark
		4087
3759	warn "emergency_perl_save: begin map save\n";	4088	info "emergency_perl_save: begin map save\n";
3760	for my $path (keys %cf::MAP) {	4089	for my $path (keys %cf::MAP) {
3761	my $map = $cf::MAP{$path} or next;	4090	my $map = $cf::MAP{$path} or next;
3762	$map->valid or next;	4091	$map->valid or next;
3763	$map->save;	4092	$map->save;
3764	}	4093	}
3765	warn "emergency_perl_save: end map save\n";	4094	info "emergency_perl_save: end map save\n";
3766		4095
		4096	cf::write_runtime_sync; # external watchdog should not bark
		4097
3767	warn "emergency_perl_save: begin database checkpoint\n";	4098	info "emergency_perl_save: begin database checkpoint\n";
3768	BDB::db_env_txn_checkpoint $DB_ENV;	4099	BDB::db_env_txn_checkpoint $DB_ENV;
3769	warn "emergency_perl_save: end database checkpoint\n";	4100	info "emergency_perl_save: end database checkpoint\n";
3770		4101
3771	warn "emergency_perl_save: begin write uuid\n";	4102	info "emergency_perl_save: begin write uuid\n";
3772	write_uuid_sync 1;	4103	write_uuid_sync 1;
3773	warn "emergency_perl_save: end write uuid\n";	4104	info "emergency_perl_save: end write uuid\n";
		4105
		4106	cf::write_runtime_sync; # external watchdog should not bark
		4107
		4108	trace "emergency_perl_save: syncing database to disk";
		4109	BDB::db_env_txn_checkpoint $DB_ENV;
		4110
		4111	info "emergency_perl_save: starting sync\n";
		4112	IO::AIO::aio_sync sub {
		4113	info "emergency_perl_save: finished sync\n";
		4114	};
		4115
		4116	cf::write_runtime_sync; # external watchdog should not bark
		4117
		4118	trace "emergency_perl_save: flushing outstanding aio requests";
		4119	while (IO::AIO::nreqs || BDB::nreqs) {
		4120	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4121	}
		4122
		4123	cf::write_runtime_sync; # external watchdog should not bark
3774	};	4124	};
3775		4125
3776	warn "emergency_perl_save: starting sync()\n";
3777	IO::AIO::aio_sync sub {
3778	warn "emergency_perl_save: finished sync()\n";
3779	};
3780
3781	warn "emergency_perl_save: leave\n";	4126	info "emergency_perl_save: leave\n";
3782	}	4127	}
3783		4128
3784	sub post_cleanup {	4129	sub post_cleanup {
3785	my ($make_core) = @_;	4130	my ($make_core) = @_;
3786		4131
		4132	IO::AIO::flush;
		4133
3787	warn Carp::longmess "post_cleanup backtrace"	4134	error Carp::longmess "post_cleanup backtrace"
3788	if $make_core;	4135	if $make_core;
3789		4136
3790	my $fh = pidfile;	4137	my $fh = pidfile;
3791	unlink $PIDFILE if <$fh> == $$;	4138	unlink $PIDFILE if <$fh> == $$;
3792	}	4139	}
…		…
3816	}	4163	}
3817	}	4164	}
3818		4165
3819	sub do_reload_perl() {	4166	sub do_reload_perl() {
3820	# can/must only be called in main	4167	# can/must only be called in main
3821	if (in_main) {	4168	unless (in_main) {
3822	warn "can only reload from main coroutine";	4169	error "can only reload from main coroutine";
3823	return;	4170	return;
3824	}	4171	}
3825		4172
3826	return if $RELOAD++;	4173	return if $RELOAD++;
3827		4174
3828	my $t1 = AE::time;	4175	my $t1 = AE::time;
3829		4176
3830	while ($RELOAD) {	4177	while ($RELOAD) {
3831	warn "reloading...";	4178	cf::get_slot 0.1, -1, "reload_perl";
		4179	info "perl_reload: reloading...";
3832		4180
3833	warn "entering sync_job";	4181	trace "perl_reload: entering sync_job";
3834		4182
3835	cf::sync_job {	4183	cf::sync_job {
3836	cf::write_runtime_sync; # external watchdog should not bark
3837	cf::emergency_save;	4184	#cf::emergency_save;
3838	cf::write_runtime_sync; # external watchdog should not bark
3839		4185
3840	warn "syncing database to disk";
3841	BDB::db_env_txn_checkpoint $DB_ENV;
3842
3843	# if anything goes wrong in here, we should simply crash as we already saved
3844
3845	warn "flushing outstanding aio requests";
3846	while (IO::AIO::nreqs || BDB::nreqs) {
3847	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3848	}
3849
3850	warn "cancelling all extension coros";	4186	trace "perl_reload: cancelling all extension coros";
3851	$_->cancel for values %EXT_CORO;	4187	$_->cancel for values %EXT_CORO;
3852	%EXT_CORO = ();	4188	%EXT_CORO = ();
3853		4189
3854	warn "removing commands";	4190	trace "perl_reload: removing commands";
3855	%COMMAND = ();	4191	%COMMAND = ();
3856		4192
3857	warn "removing ext/exti commands";	4193	trace "perl_reload: removing ext/exti commands";
3858	%EXTCMD = ();	4194	%EXTCMD = ();
3859	%EXTICMD = ();	4195	%EXTICMD = ();
3860		4196
3861	warn "unloading/nuking all extensions";	4197	trace "perl_reload: unloading/nuking all extensions";
3862	for my $pkg (@EXTS) {	4198	for my $pkg (@EXTS) {
3863	warn "... unloading $pkg";	4199	trace "... unloading $pkg";
3864		4200
3865	if (my $cb = $pkg->can ("unload")) {	4201	if (my $cb = $pkg->can ("unload")) {
3866	eval {	4202	eval {
3867	$cb->($pkg);	4203	$cb->($pkg);
3868	1	4204	1
3869	} or warn "$pkg unloaded, but with errors: $@";	4205	} or error "$pkg unloaded, but with errors: $@";
3870	}	4206	}
3871		4207
3872	warn "... clearing $pkg";	4208	trace "... clearing $pkg";
3873	clear_package $pkg;	4209	clear_package $pkg;
3874	}	4210	}
3875		4211
3876	warn "unloading all perl modules loaded from $LIBDIR";	4212	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3877	while (my ($k, $v) = each %INC) {	4213	while (my ($k, $v) = each %INC) {
3878	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4214	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3879		4215
3880	warn "... unloading $k";	4216	trace "... unloading $k";
3881	delete $INC{$k};	4217	delete $INC{$k};
3882		4218
3883	$k =~ s/\.pm$//;	4219	$k =~ s/\.pm$//;
3884	$k =~ s/\//::/g;	4220	$k =~ s/\//::/g;
3885		4221
…		…
3888	}	4224	}
3889		4225
3890	clear_package $k;	4226	clear_package $k;
3891	}	4227	}
3892		4228
3893	warn "getting rid of safe::, as good as possible";	4229	trace "perl_reload: getting rid of safe::, as good as possible";
3894	clear_package "safe::$_"	4230	clear_package "safe::$_"
3895	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4231	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3896		4232
3897	warn "unloading cf.pm \"a bit\"";	4233	trace "perl_reload: unloading cf.pm \"a bit\"";
3898	delete $INC{"cf.pm"};	4234	delete $INC{"cf.pm"};
3899	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4235	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3900		4236
3901	# don't, removes xs symbols, too,	4237	# don't, removes xs symbols, too,
3902	# and global variables created in xs	4238	# and global variables created in xs
3903	#clear_package __PACKAGE__;	4239	#clear_package __PACKAGE__;
3904		4240
3905	warn "unload completed, starting to reload now";	4241	info "perl_reload: unload completed, starting to reload now";
3906		4242
3907	warn "reloading cf.pm";	4243	trace "perl_reload: reloading cf.pm";
3908	require cf;	4244	require cf;
3909	cf::_connect_to_perl_1;	4245	cf::_connect_to_perl_1;
3910		4246
3911	warn "loading config and database again";	4247	trace "perl_reload: loading config and database again";
3912	cf::reload_config;	4248	cf::reload_config;
3913		4249
3914	warn "loading extensions";	4250	trace "perl_reload: loading extensions";
3915	cf::load_extensions;	4251	cf::load_extensions;
3916		4252
3917	if ($REATTACH_ON_RELOAD) {	4253	if ($REATTACH_ON_RELOAD) {
3918	warn "reattaching attachments to objects/players";	4254	trace "perl_reload: reattaching attachments to objects/players";
3919	_global_reattach; # objects, sockets	4255	_global_reattach; # objects, sockets
3920	warn "reattaching attachments to maps";	4256	trace "perl_reload: reattaching attachments to maps";
3921	reattach $_ for values %MAP;	4257	reattach $_ for values %MAP;
3922	warn "reattaching attachments to players";	4258	trace "perl_reload: reattaching attachments to players";
3923	reattach $_ for values %PLAYER;	4259	reattach $_ for values %PLAYER;
3924	}	4260	}
3925		4261
3926	warn "running post_init jobs";	4262	cf::_post_init 1;
3927	(pop @POST_INIT)->(1) while @POST_INIT;
3928		4263
3929	warn "leaving sync_job";	4264	trace "perl_reload: leaving sync_job";
3930		4265
3931	1	4266	1
3932	} or do {	4267	} or do {
3933	warn $@;	4268	error $@;
3934	cf::cleanup "error while reloading, exiting.";	4269	cf::cleanup "perl_reload: error, exiting.";
3935	};	4270	};
3936		4271
3937	warn "reloaded";
3938	--$RELOAD;	4272	--$RELOAD;
3939	}	4273	}
3940		4274
3941	$t1 = AE::time - $t1;	4275	$t1 = AE::time - $t1;
3942	warn "reload completed in ${t1}s\n";	4276	info "perl_reload: completed in ${t1}s\n";
3943	};	4277	};
3944		4278
3945	our $RELOAD_WATCHER; # used only during reload	4279	our $RELOAD_WATCHER; # used only during reload
3946		4280
3947	sub reload_perl() {	4281	sub reload_perl() {
…		…
3968	reload_perl;	4302	reload_perl;
3969	};	4303	};
3970	}	4304	}
3971	};	4305	};
3972		4306
3973	unshift @INC, $LIBDIR;	4307	#############################################################################
3974		4308
3975	my $bug_warning = 0;	4309	my $bug_warning = 0;
3976		4310
3977	our @WAIT_FOR_TICK;
3978	our @WAIT_FOR_TICK_BEGIN;
3979
3980	sub wait_for_tick {	4311	sub wait_for_tick() {
3981	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4312	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3982		4313
3983	my $signal = new Coro::Signal;	4314	$WAIT_FOR_TICK->wait;
3984	push @WAIT_FOR_TICK, $signal;
3985	$signal->wait;
3986	}	4315	}
3987		4316
3988	sub wait_for_tick_begin {	4317	sub wait_for_tick_begin() {
3989	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4318	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3990		4319
3991	my $signal = new Coro::Signal;	4320	my $signal = new Coro::Signal;
3992	push @WAIT_FOR_TICK_BEGIN, $signal;	4321	push @WAIT_FOR_TICK_BEGIN, $signal;
3993	$signal->wait;	4322	$signal->wait;
3994	}	4323	}
…		…
3998	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4327	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3999	unless ++$bug_warning > 10;	4328	unless ++$bug_warning > 10;
4000	return;	4329	return;
4001	}	4330	}
4002		4331
4003	cf::server_tick; # one server iteration	4332	cf::one_tick; # one server iteration
4004		4333
4005	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4334	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4006		4335
4007	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4336	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4008	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4337	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4009	Coro::async_pool {	4338	Coro::async_pool {
4010	$Coro::current->{desc} = "runtime saver";	4339	$Coro::current->{desc} = "runtime saver";
4011	write_runtime_sync	4340	write_runtime_sync
4012	or warn "ERROR: unable to write runtime file: $!";	4341	or error "ERROR: unable to write runtime file: $!";
4013	};	4342	};
4014	}	4343	}
4015		4344
4016	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4345	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4017	$sig->send;	4346	$sig->send;
4018	}	4347	}
4019	while (my $sig = shift @WAIT_FOR_TICK) {	4348	$WAIT_FOR_TICK->broadcast;
4020	$sig->send;
4021	}
4022		4349
4023	$LOAD = ($NOW - $TICK_START) / $TICK;	4350	$LOAD = ($NOW - $TICK_START) / $TICK;
4024	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4351	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4025		4352
4026	if (0) {	4353	if (0) {
4027	if ($NEXT_TICK) {	4354	if ($NEXT_TICK) {
4028	my $jitter = $TICK_START - $NEXT_TICK;	4355	my $jitter = $TICK_START - $NEXT_TICK;
4029	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4356	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4030	warn "jitter $JITTER\n";#d#	4357	debug "jitter $JITTER\n";#d#
4031	}	4358	}
4032	}	4359	}
4033	}	4360	}
4034		4361
4035	{	4362	{
4036	# configure BDB	4363	# configure BDB
		4364	info "initialising database";
4037		4365
4038	BDB::min_parallel 16;	4366	BDB::min_parallel 16;
4039	BDB::max_poll_reqs $TICK * 0.1;	4367	BDB::max_poll_reqs $TICK * 0.1;
4040	$AnyEvent::BDB::WATCHER->priority (1);	4368	#$AnyEvent::BDB::WATCHER->priority (1);
4041		4369
4042	unless ($DB_ENV) {	4370	unless ($DB_ENV) {
4043	$DB_ENV = BDB::db_env_create;	4371	$DB_ENV = BDB::db_env_create;
4044	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4372	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4045	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4373	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4070	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4398	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4071	};	4399	};
4072	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4400	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4073	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4401	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4074	};	4402	};
		4403
		4404	info "database initialised";
4075	}	4405	}
4076		4406
4077	{	4407	{
4078	# configure IO::AIO	4408	# configure IO::AIO
4079		4409
		4410	info "initialising aio";
4080	IO::AIO::min_parallel 8;	4411	IO::AIO::min_parallel 8;
4081	IO::AIO::max_poll_time $TICK * 0.1;	4412	IO::AIO::max_poll_time $TICK * 0.1;
4082	undef $AnyEvent::AIO::WATCHER;	4413	undef $AnyEvent::AIO::WATCHER;
		4414	info "aio initialised";
4083	}	4415	}
4084		4416
4085	my $_log_backtrace;	4417	our $_log_backtrace;
		4418	our $_log_backtrace_last;
4086		4419
4087	sub _log_backtrace {	4420	sub _log_backtrace {
4088	my ($msg, @addr) = @_;	4421	my ($msg, @addr) = @_;
4089		4422
4090	$msg =~ s/\n//;	4423	$msg =~ s/\n$//;
4091		4424
		4425	if ($_log_backtrace_last eq $msg) {
		4426	LOG llevInfo, "[ABT] $msg\n";
		4427	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4092	# limit the # of concurrent backtraces	4428	# limit the # of concurrent backtraces
4093	if ($_log_backtrace < 2) {	4429	} elsif ($_log_backtrace < 2) {
		4430	$_log_backtrace_last = $msg;
4094	++$_log_backtrace;	4431	++$_log_backtrace;
4095	my $perl_bt = Carp::longmess $msg;	4432	my $perl_bt = Carp::longmess $msg;
4096	async {	4433	async {
4097	$Coro::current->{desc} = "abt $msg";	4434	$Coro::current->{desc} = "abt $msg";
4098		4435
…		…
4118	LOG llevInfo, "[ABT] $_\n" for @bt;	4455	LOG llevInfo, "[ABT] $_\n" for @bt;
4119	--$_log_backtrace;	4456	--$_log_backtrace;
4120	};	4457	};
4121	} else {	4458	} else {
4122	LOG llevInfo, "[ABT] $msg\n";	4459	LOG llevInfo, "[ABT] $msg\n";
4123	LOG llevInfo, "[ABT] [suppressed]\n";	4460	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4124	}	4461	}
4125	}	4462	}
4126		4463
4127	# load additional modules	4464	# load additional modules
4128	require "cf/$_.pm" for @EXTRA_MODULES;	4465	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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