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.546 by root, Thu May 6 22:57:49 2010 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
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; # unused	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
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	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 thread	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.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$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;
343	$d	380	$d
344	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
345	}	382	}
346		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
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	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
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		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
362	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
363		483
364	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,
365	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
366		486
367	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
368	is a reload or not.	488	is a reload or not.
369		489
370	=cut	490	=cut
371		491
372	sub post_init(&) {	492	sub post_init(&) {
373	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	}
374	}	511	}
375		512
376	=item cf::lock_wait $string	513	=item cf::lock_wait $string
377		514
378	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
431	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
432	}	569	}
433		570
434	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
435		572
436	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
437	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
438	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.
439		580
440	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
441	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
442		583
443	Useful for short background jobs.	584	Useful for short background jobs.
…		…
455	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
456	my $busy;	597	my $busy;
457		598
458	while () {	599	while () {
459	next_job:	600	next_job:
		601
		602	Coro::cede;
460		603
461	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
462		605
463	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
464	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
465	$busy = 0;	608	$busy = 0;
466	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
467	$job->[2]->send;	610	$job->[2]->send;
468	Coro::cede;
469	goto next_job;	611	goto next_job;
470	} else {	612	} else {
471	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
472	}	614	}
473	}	615	}
474		616
475	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
476	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
477	push @cf::WAIT_FOR_TICK, $signal;
478	$signal->wait;
479	} else {	619	} else {
480	$busy = 0;	620	$busy = 0;
481	Coro::schedule;	621	Coro::schedule;
482	}	622	}
483	}	623	}
…		…
547		687
548	while ($busy) {	688	while ($busy) {
549	if (Coro::nready) {	689	if (Coro::nready) {
550	Coro::cede_notself;	690	Coro::cede_notself;
551	} else {	691	} else {
552	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
553	}	693	}
554	}	694	}
555		695
556	my $time = AE::time - $time;	696	my $time = AE::time - $time;
557		697
…		…
583	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
584		724
585	$coro	725	$coro
586	}	726	}
587		727
588	=item fork_call { }, $args	728	=item fork_call { }, @args
589		729
590	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
591	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
592	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
593	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
594		734
595	=cut	735	=cut
596		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
597	sub fork_call(&@) {	741	sub fork_call(&@) {
598	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
599		743
600	# we seemingly have to make a local copy of the whole thing,
601	# otherwise perl prematurely frees the stuff :/
602	# TODO: investigate and fix (likely this will be rather laborious)
603
604	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
605	reset_signals;	745	cf::post_fork;
606	&$cb	746	&$cb
607	}, @args;	747	} @args;
608		748
609	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
610	}	750	}
611		751
612	sub objinfo {	752	sub objinfo {
…		…
734		874
735	my @data;	875	my @data;
736	my $md5;	876	my $md5;
737		877
738	for (0 .. $#$src) {	878	for (0 .. $#$src) {
739	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
740	or Carp::croak "$src->[$_]: $!";
741	}	880	}
742		881
743	# if processing is expensive, check	882	# if processing is expensive, check
744	# checksum first	883	# checksum first
745	if (1) {	884	if (1) {
…		…
758		897
759	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
760	}	899	}
761	}	900	}
762		901
763	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
764	my $data = $process->(\@data);	903	my $data = $process->(\@data);
765	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
766		905
767	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
768		907
769	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
770	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1290	=cut	1429	=cut
1291		1430
1292	#############################################################################	1431	#############################################################################
1293	# command handling &c	1432	# command handling &c
1294		1433
1295	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1296		1435
1297	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
1298	$name.	1437	$name.
1299		1438
1300	=cut	1439	=cut
…		…
1306	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1307		1446
1308	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1309	}	1448	}
1310		1449
1311	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1312		1451
1313	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1314	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
1315	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
1316	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
1317	has logged in successfully.	1456	has logged in successfully.
1318		1457
1319	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1320	called.
1321		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
1322	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1323		1466
1324	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1325	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
1326	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
1327	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
1328	log-in.	1471	log-in.
1329		1472
1330	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1331	called.
1332		1474
1333	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1334		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
1335	sub register_extcmd {	1482	sub register_extcmd($$) {
1336	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1337		1484
1338	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1339	}	1486	}
1340		1487
1341	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1342	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1343		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1344	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1345	}	1504	}
1346		1505
1347	use File::Glob ();	1506	use File::Glob ();
1348		1507
1349	cf::player->attach (	1508	cf::player->attach (
…		…
1363	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1364		1523
1365	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1366		1525
1367	if (ref $msg) {	1526	if (ref $msg) {
1368	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1369	"ARRAY" eq ref $msg
1370	? @$msg
1371	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1372		1528
1373	my @reply;
1374
1375	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}) {
1376	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1377	}	1547	}
1378
1379	$pl->ext_reply ($reply, @reply)
1380	if $reply;
1381		1548
1382	} else {	1549	} else {
1383	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1384	}	1551	}
1385		1552
…		…
1398	};	1565	};
1399		1566
1400	$grp	1567	$grp
1401	}	1568	}
1402		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
1403	sub load_extensions {	1581	sub load_extensions {
1404	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1405		1585
1406	cf::sync_job {	1586	cf::sync_job {
1407	my %todo;	1587	my %todo;
1408		1588
1409	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1452	unless exists $done{$_};	1632	unless exists $done{$_};
1453	}	1633	}
1454		1634
1455	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1456		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
1457	my $active = eval $v->{source};	1646	my $active = eval $source;
1458		1647
1459	if (length $@) {	1648	if (length $@) {
1460	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1461		1650
1462	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1479		1668
1480	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1481	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1483	}	1672	}
		1673
		1674	last;
1484	}	1675	}
1485	}	1676	}
1486	};	1677	};
1487	}	1678	}
1488		1679
…		…
1646	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1647		1838
1648	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1649	$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
1650		1841
1651	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1652	$pl->deactivate;	1843	$pl->deactivate;
		1844
1653	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;
1654	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1655	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1656		1850
1657	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1658	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1659	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1745		1939
1746	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1747		1941
1748	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1749		1943
1750	=item $player->ext_reply ($msgid, @msg)
1751
1752	Sends an ext reply to the player.
1753
1754	=cut
1755
1756	sub ext_reply($$@) {
1757	my ($self, $id, @msg) = @_;
1758
1759	$self->ns->ext_reply ($id, @msg)
1760	}
1761
1762	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1763		1945
1764	Sends an ext event to the client.	1946	Sends an ext event to the client.
1765		1947
1766	=cut	1948	=cut
…		…
1825	sub generate_random_map {	2007	sub generate_random_map {
1826	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1827		2009
1828	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
1829		2011
1830	# mit "rum" bekleckern, nicht
1831	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1832	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1833	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1834	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1835	$rmp->{exit_on_final_map},
1836	$rmp->{xsize}, $rmp->{ysize},
1837	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1838	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1839	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1840	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1841	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1842	(cf::region::find $rmp->{region}), $rmp->{custom}
1843	)
1844	}	2013	}
1845		2014
1846	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1847		2016
1848	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
…		…
1899	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1900	$path = "$base/$path";	2069	$path = "$base/$path";
1901	}	2070	}
1902		2071
1903	for ($path) {	2072	for ($path) {
1904	redo if s{//}{/};
1905	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1906	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1907	}	2075	}
1908		2076
1909	$path	2077	$path
…		…
1927		2095
1928	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1929	()	2097	()
1930	}	2098	}
1931		2099
		2100	# may re-bless or do other evil things
1932	sub init {	2101	sub init {
1933	my ($self) = @_;	2102	my ($self) = @_;
1934		2103
1935	$self	2104	$self
1936	}	2105	}
…		…
2001	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2002		2171
2003	1	2172	1
2004	}	2173	}
2005		2174
		2175	# used to laod the header of an original map
2006	sub load_header_orig {	2176	sub load_header_orig {
2007	my ($self) = @_;	2177	my ($self) = @_;
2008		2178
2009	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2010	}	2180	}
2011		2181
		2182	# used to laod the header of an instantiated map
2012	sub load_header_temp {	2183	sub load_header_temp {
2013	my ($self) = @_;	2184	my ($self) = @_;
2014		2185
2015	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2016	}	2187	}
2017		2188
		2189	# called after loading the header from an instantiated map
2018	sub prepare_temp {	2190	sub prepare_temp {
2019	my ($self) = @_;	2191	my ($self) = @_;
2020		2192
2021	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2022	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2023	# safety	2195	# safety
2024	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2025	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2026	}	2198	}
2027		2199
		2200	# called after loading the header from an original map
2028	sub prepare_orig {	2201	sub prepare_orig {
2029	my ($self) = @_;	2202	my ($self) = @_;
2030		2203
2031	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2032	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2058	sub find {	2231	sub find {
2059	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2060		2233
2061	cf::cede_to_tick;	2234	cf::cede_to_tick;
2062		2235
2063	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2064		2237
2065	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2066	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2067		2240
2068	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2099		2272
2100	{	2273	{
2101	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2102		2275
2103	return unless $self->valid;	2276	return unless $self->valid;
2104	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2105
2106	$self->in_memory (cf::MAP_LOADING);
2107		2278
2108	$self->alloc;	2279	$self->alloc;
2109		2280
2110	$self->pre_load;	2281	$self->pre_load;
2111	cf::cede_to_tick;	2282	cf::cede_to_tick;
2112		2283
		2284	if (exists $self->{load_path}) {
2113	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2114	$f->skip_block;	2286	$f->skip_block;
2115	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2116	or return;	2288	or return;
2117		2289
2118	$self->post_load_original	2290	$self->post_load_original
2119	if delete $self->{load_original};	2291	if delete $self->{load_original};
2120		2292
2121	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2122	utf8::encode $uniq;	2294	utf8::encode $uniq;
2123	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2124	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2125	$self->clear_unique_items;	2297	$self->clear_unique_items;
2126	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2127	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2128	}	2301	}
2129	}	2302	}
2130	}
2131		2303
2132	$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);
2133		2311
2134	cf::cede_to_tick;	2312	cf::cede_to_tick;
2135	# now do the right thing for maps	2313	# now do the right thing for maps
2136	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2137	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2141	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2142	$self->decay_objects;	2320	$self->decay_objects;
2143	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2144	$self->update_buttons;	2322	$self->update_buttons;
2145	cf::cede_to_tick;	2323	cf::cede_to_tick;
2146	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2147	}	2325	}
2148		2326
2149	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2150	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2151
2152	$self->in_memory (cf::MAP_ACTIVE);
2153	}	2329	}
2154		2330
2155	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2156	}	2334	}
2157		2335
2158	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2159	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2160	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2168	# if $self->per_party;	2346	# if $self->per_party;
2169		2347
2170	$self	2348	$self
2171	}	2349	}
2172		2350
2173	# find and load all maps in the 3x3 area around a map
2174	sub load_neighbours {
2175	my ($map) = @_;
2176
2177	my @neigh; # diagonal neighbours
2178
2179	for (0 .. 3) {
2180	my $neigh = $map->tile_path ($_)
2181	or next;
2182	$neigh = find $neigh, $map
2183	or next;
2184	$neigh->load;
2185
2186	# now find the diagonal neighbours
2187	push @neigh,
2188	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2189	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2190	}
2191
2192	for (grep defined $_->[0], @neigh) {
2193	my ($path, $origin) = @$_;
2194	my $neigh = find $path, $origin
2195	or next;
2196	$neigh->load;
2197	}
2198	}
2199
2200	sub find_sync {	2351	sub find_sync {
2201	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2202		2353
		2354	# it's a bug to call this from the main context
2203	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2205		2357
2206	find $path, $origin	2358	find $path, $origin
2207	}	2359	}
2208		2360
2209	sub do_load_sync {	2361	sub do_load_sync {
2210	my ($map) = @_;	2362	my ($map) = @_;
2211		2363
		2364	# it's a bug to call this from the main context
2212	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2213	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2214		2367
2215	$map->load;	2368	$map->load;
2216	}	2369	}
…		…
2219	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2220		2373
2221	sub find_async {	2374	sub find_async {
2222	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2223		2376
2224	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2225		2378
2226	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2227	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2228	}	2381	}
2229		2382
2230	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2231		2384
2232	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2233	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2234		2387
2235	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2236	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2237	if (my $map = find $k) {	2390	if (my $map = find $k) {
2238	$map->load if $v;	2391	$map->load if $v;
2239	}	2392	}
2240		2393
2241	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
…		…
2291	sub swap_out {	2444	sub swap_out {
2292	my ($self) = @_;	2445	my ($self) = @_;
2293		2446
2294	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2295		2448
2296	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2297	return if $self->{deny_save};	2450	return if $self->{deny_save};
2298	return if $self->players;	2451	return if $self->players;
2299		2452
2300	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2301	$self->deactivate;	2454	$self->deactivate;
2302	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2303	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2304		2457
2305	# then atomically save	2458	# then atomically save
2306	$self->_save;	2459	$self->_save;
2307		2460
2308	# then free the map	2461	# then free the map
…		…
2334		2487
2335	return if $self->players;	2488	return if $self->players;
2336		2489
2337	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2338		2491
2339	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2340		2493
2341	# need to save uniques path	2494	# need to save uniques path
2342	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2343	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2344		2497
…		…
2497		2650
2498	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.
2499		2652
2500	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2501		2654
2502	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,
2503	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2504		2657
2505	=cut	2658	=cut
2506		2659
2507	sub deref {	2660	sub deref {
…		…
2589	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2590		2743
2591	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2592	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2593		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2594	=cut	2772	=cut
2595		2773
2596	sub cf::object::player::may {	2774	sub cf::object::player::may {
2597	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2598		2776
2599	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2600	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2601	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2602	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2603	}	2781	}
2604		2782
2605	=item $player_object->enter_link	2783	=item $player_object->enter_link
2606		2784
…		…
2609	The player should be reasonably safe there for short amounts of time (e.g.	2787	The player should be reasonably safe there for short amounts of time (e.g.
2610	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2788	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2611	though, as the player cannot control the character while it is on the link	2789	though, as the player cannot control the character while it is on the link
2612	map.	2790	map.
2613		2791
2614	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2615		2799
2616	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2617		2801
2618	Moves the player out of the special C<{link}> map onto the specified	2802	Moves the player out of the special C<{link}> map onto the specified
2619	map. If the map is not valid (or omitted), the player will be moved back	2803	map. If the map is not valid (or omitted), the player will be moved back
…		…
2674	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2675	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2676	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2677		2861
2678	$map->load;	2862	$map->load;
2679	$map->load_neighbours;
2680		2863
2681	return unless $self->contr->active;	2864	return unless $self->contr->active;
2682		2865
2683	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2684	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2740	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2741	}	2924	}
2742	}	2925	}
2743		2926
2744	my $map = eval {	2927	my $map = eval {
2745	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2746		2929
2747	if ($map) {	2930	if ($map) {
2748	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2749	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2750	} else {	2933	} else {
…		…
2840	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2841		3024
2842	unless (eval {	3025	unless (eval {
2843	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2844		3027
2845	# random map handling
2846	{
2847	my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849	prepare_random_map $exit
2850	if $exit->slaying eq "/!";
2851	}
2852
2853	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2854	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2855	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2856		3054
2857	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2858		3056
2859	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2860	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2875		3073
2876	=head3 cf::client	3074	=head3 cf::client
2877		3075
2878	=over 4	3076	=over 4
2879		3077
2880	=item $client->send_drawinfo ($text, $flags)
2881
2882	Sends a drawinfo packet to the client. Circumvents output buffering so
2883	should not be used under normal circumstances.
2884
2885	=cut
2886
2887	sub cf::client::send_drawinfo {
2888	my ($self, $text, $flags) = @_;
2889
2890	utf8::encode $text;
2891	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2892	}
2893
2894	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2895		3079
2896	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2897	them as required.	3081	them as required.
2898		3082
…		…
2916	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2917	}	3101	}
2918		3102
2919	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2920		3104
2921	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	Send a msg packet to the client, formatting the msg for the client if
2922	client if neccessary. C<$type> should be a string identifying the type of	3106	necessary. C<$type> should be a string identifying the type of the
2923	the message, with C<log> being the default. If C<$color> is negative, suppress	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2924	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2925		3109
2926	=cut	3110	=cut
2927		3111
2928	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3033	id => "death",	3217	id => "death",
3034	title => "Death",	3218	title => "Death",
3035	reply => undef,	3219	reply => undef,
3036	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3037	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3038	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3039	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3040	);	3230	);
3041		3231
3042	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3085	=cut	3275	=cut
3086		3276
3087	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3088	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3089		3279
3090	if ($self->extcmd == 2) {
3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3092	} elsif ($self->extcmd == 1) { # TODO: remove
3093	push @msg, msgtype => "event_$type";
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}
3097
3098	=item $client->ext_reply ($msgid, @msg)
3099
3100	Sends an ext reply to the client.
3101
3102	=cut
3103
3104	sub cf::client::ext_reply($$@) {
3105	my ($self, $id, @msg) = @_;
3106
3107	if ($self->extcmd == 2) {
3108	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3109	} elsif ($self->extcmd == 1) {
3110	#TODO: version 1, remove
3111	unshift @msg, msgtype => "reply", msgid => $id;
3112	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3113	}
3114	}	3281	}
3115		3282
3116	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3117		3284
3118	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3138		3305
3139	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3140	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3141		3308
3142	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3143	}	3349	}
3144		3350
3145	cf::client->attach (	3351	cf::client->attach (
3146	on_connect => sub {	3352	on_connect => sub {
3147	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3173	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3174		3380
3175	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3176		3382
3177	if (ref $msg) {	3383	if (ref $msg) {
3178	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3179	"ARRAY" eq ref $msg
3180	? @$msg
3181	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3182		3385
3183	my @reply;
3184
3185	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3186	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3187	}	3404	}
3188
3189	$ns->ext_reply ($reply, @reply)
3190	if $reply;
3191
3192	} else {	3405	} else {
3193	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3194	}	3407	}
3195		3408
3196	cf::override;	3409	cf::override;
…		…
3364	=cut	3577	=cut
3365		3578
3366	#############################################################################	3579	#############################################################################
3367	# the server's init and main functions	3580	# the server's init and main functions
3368		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3369	sub load_facedata($) {	3659	sub load_facedata($) {
3370	my ($path) = @_;	3660	my ($path) = @_;
3371		3661
3372	# HACK to clear player env face cache, we need some signal framework
3373	# for this (global event?)
3374	%ext::player_env::MUSIC_FACE_CACHE = ();
3375
3376	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3377		3663
3378	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3379		3665
3380	0 < aio_load $path, my $facedata	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3381	or die "$path: $!";
3382
3383	$facedata = Coro::Storable::thaw $facedata;
3384		3667
3385	$facedata->{version} == 2	3668	$facedata->{version} == 2
3386	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3387		3670
3388	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3389	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3390	$facedata->{resource}{"res/exp_table"} = {	3673
3391	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3392	data => $exp_table,	3675
3393	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3394	};	3677	# from here on, everything must be atomic - no thread switch allowed
3395	cf::cede_to_tick;	3678	my $t1 = EV::time;
3396		3679
3397	{	3680	{
3398	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3399		3682
3400	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3401	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402		3686
3403	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3404	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3405	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3406	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3407		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3408	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3409	}	3694	}
3410		3695
3411	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3412	next unless $info->{smooth};	3697	next unless $info->{smooth};
3413		3698
…		…
3418	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3419	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3420	} else {	3705	} else {
3421	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3422	}	3707	}
3423
3424	cf::cede_to_tick;
3425	}	3708	}
3426	}	3709	}
3427		3710
3428	{	3711	{
3429	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3430		3713
3431	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3432	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3433	cf::cede_to_tick;
3434	}	3716	}
3435		3717
3436	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3437	}	3719	}
3438		3720
3439	{	3721	{
3440	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3441		3723
3442	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3443	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# TODO: different hash - must free and use new index, or cache ixface data queue
3444	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3445		3728
3446	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3447	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3448	} else {	3735	} else {
3449	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3450	}	3737	}
3451
3452	cf::cede_to_tick;
3453	}	3738	}
3454	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3455		3750
3456	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3752
		3753	aio_close $fh if $fh; # close old facedata
3457		3754
3458	1	3755	1
3459	}	3756	}
3460		3757
3461	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3472	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3473	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3474	cf::arch::commit_load;	3771	cf::arch::commit_load;
3475		3772
3476	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3477	}	3788	}
3478		3789
3479	sub reload_regions {	3790	sub reload_regions {
3480	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3481	# for this (global event?)	3792	# for this (global event?)
…		…
3489	if exists $_->{match};	3800	if exists $_->{match};
3490	}	3801	}
3491	}	3802	}
3492		3803
3493	sub reload_facedata {	3804	sub reload_facedata {
3494	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3495	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3496	}	3807	}
3497		3808
3498	sub reload_archetypes {	3809	sub reload_archetypes {
3499	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3500	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3501	}	3838	}
3502		3839
3503	sub reload_treasures {	3840	sub reload_treasures {
3504	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3505	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3506	}	3843	}
3507		3844
3508	sub reload_sound {	3845	sub reload_sound {
3509	trace "loading sound config from $DATADIR/sound\n";	3846	trace "loading sound config from $DATADIR/sound\n";
3510		3847
3511	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512	or die "$DATADIR/sound $!";
3513
3514	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515		3849
3516	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517	my $sound = $soundconf->{compat}[$_]	3851	my $sound = $soundconf->{compat}[$_]
3518	or next;	3852	or next;
3519		3853
…		…
3529	}	3863	}
3530		3864
3531	sub reload_resources {	3865	sub reload_resources {
3532	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3533		3867
3534	reload_exp_table;
3535	reload_materials;	3868	reload_materials;
3536	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3537	reload_sound;	3871	reload_sound;
3538	reload_archetypes;	3872	reload_archetypes;
3539	reload_regions;	3873	reload_regions;
3540	reload_treasures;	3874	reload_treasures;
3541		3875
…		…
3543	}	3877	}
3544		3878
3545	sub reload_config {	3879	sub reload_config {
3546	trace "reloading config file...\n";	3880	trace "reloading config file...\n";
3547		3881
3548	0 < aio_load "$CONFDIR/config", my $config	3882	my $config = load_file "$CONFDIR/config";
3549	or die "$CONFDIR/config: $!";
3550
3551	utf8::decode $config;	3883	utf8::decode $config;
3552		3884	*CFG = decode_yaml $config;
3553	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3554	*CFG = YAML::XS::Load $config;
3555		3885
3556	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3557		3887
3558	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3888	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3559	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3889	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3585	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3586	print $fh $$;	3916	print $fh $$;
3587	}	3917	}
3588		3918
3589	sub main_loop {	3919	sub main_loop {
3590	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3591	if (1) {	3921	if (1) {
3592	EV::loop;	3922	EV::run;
3593	}	3923	}
3594	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3595	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3596	}	3926	}
3597		3927
3598	sub main {	3928	sub main {
3599	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3600		3930
3601	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3603	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605		3935
3606	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3607		3937
3608	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3609	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3610	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3611	(async {	3941	(async {
3612	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3613	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3614	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3615	};	3945	};
3616		3946
3617	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3618		3948
3619	cf::sync_job {	3949	cf::sync_job {
3620	cf::incloader::init ();	3950	cf::incloader::init ();
		3951
		3952	db_init;
3621		3953
3622	cf::init_anim;	3954	cf::init_anim;
3623	cf::init_attackmess;	3955	cf::init_attackmess;
3624	cf::init_dynamic;	3956	cf::init_dynamic;
3625		3957
3626	cf::load_settings;	3958	cf::load_settings;
3627		3959
3628	reload_resources;	3960	reload_resources;
3629	reload_config;	3961	reload_config;
3630	db_init;
3631		3962
3632	cf::init_uuid;	3963	cf::init_uuid;
3633	cf::init_signals;	3964	cf::init_signals;
3634	cf::init_skills;	3965	cf::init_skills;
3635		3966
…		…
3643		3974
3644	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3645	use POSIX ();	3976	use POSIX ();
3646	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3977	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3647		3978
3648	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3649	};	3980	};
3650		3981
3651	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3652	info "parse errors in files are no longer fatal from this point on.\n";	3983	info "parse errors in files are no longer fatal from this point on.\n";
3653		3984
3654	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3655	undef $free_main;
3656	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3657	};	3987	};
3658		3988
3659	goto &main_loop;	3989	goto &main_loop;
3660	}	3990	}
…		…
3817		4147
3818	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3819		4149
3820	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3821	while (IO::AIO::nreqs || BDB::nreqs) {	4151	while (IO::AIO::nreqs || BDB::nreqs) {
3822	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3823	}	4153	}
3824		4154
3825	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3826	};	4156	};
3827		4157
…		…
3876		4206
3877	my $t1 = AE::time;	4207	my $t1 = AE::time;
3878		4208
3879	while ($RELOAD) {	4209	while ($RELOAD) {
3880	cf::get_slot 0.1, -1, "reload_perl";	4210	cf::get_slot 0.1, -1, "reload_perl";
3881	info "reloading...";	4211	info "perl_reload: reloading...";
3882		4212
3883	trace "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3884		4214
3885	cf::sync_job {	4215	cf::sync_job {
3886	#cf::emergency_save;	4216	#cf::emergency_save;
3887		4217
3888	trace "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3889	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3890	%EXT_CORO = ();	4220	%EXT_CORO = ();
3891		4221
3892	trace "removing commands";	4222	trace "perl_reload: removing commands";
3893	%COMMAND = ();	4223	%COMMAND = ();
3894		4224
3895	trace "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3896	%EXTCMD = ();	4226	%EXTCMD = ();
3897	%EXTICMD = ();	4227	%EXTICMD = ();
3898		4228
3899	trace "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3900	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3901	trace "... unloading $pkg";	4231	trace "... unloading $pkg";
3902		4232
3903	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3904	eval {	4234	eval {
…		…
3909		4239
3910	trace "... clearing $pkg";	4240	trace "... clearing $pkg";
3911	clear_package $pkg;	4241	clear_package $pkg;
3912	}	4242	}
3913		4243
3914	trace "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917		4247
3918	trace "... unloading $k";	4248	trace "... unloading $k";
3919	delete $INC{$k};	4249	delete $INC{$k};
…		…
3926	}	4256	}
3927		4257
3928	clear_package $k;	4258	clear_package $k;
3929	}	4259	}
3930		4260
3931	trace "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3932	clear_package "safe::$_"	4262	clear_package "safe::$_"
3933	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4263	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3934		4264
3935	trace "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3936	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938		4268
3939	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3940	# and global variables created in xs	4270	# and global variables created in xs
3941	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3942		4272
3943	info "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3944		4274
3945	trace "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3946	require cf;	4276	require cf;
3947	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3948		4278
3949	trace "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3950	cf::reload_config;	4280	cf::reload_config;
3951		4281
3952	trace "loading extensions";	4282	trace "perl_reload: loading extensions";
3953	cf::load_extensions;	4283	cf::load_extensions;
3954		4284
3955	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3956	trace "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3957	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3958	trace "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3959	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3960	trace "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3961	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3962	}	4292	}
3963		4293
3964	trace "running post_init jobs";	4294	cf::_post_init 1;
3965	(pop @POST_INIT)->(1) while @POST_INIT;
3966		4295
3967	trace "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3968		4297
3969	1	4298	1
3970	} or do {	4299	} or do {
3971	error $@;	4300	error $@;
3972	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3973	};	4302	};
3974		4303
3975	info "reloaded";
3976	--$RELOAD;	4304	--$RELOAD;
3977	}	4305	}
3978		4306
3979	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3980	info "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3981	};	4309	};
3982		4310
3983	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3984		4312
3985	sub reload_perl() {	4313	sub reload_perl() {
…		…
4010		4338
4011	#############################################################################	4339	#############################################################################
4012		4340
4013	my $bug_warning = 0;	4341	my $bug_warning = 0;
4014		4342
4015	our @WAIT_FOR_TICK;
4016	our @WAIT_FOR_TICK_BEGIN;
4017
4018	sub wait_for_tick() {	4343	sub wait_for_tick() {
4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020		4345
4021	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4022	push @WAIT_FOR_TICK, $signal;
4023	$signal->wait;
4024	}	4347	}
4025		4348
4026	sub wait_for_tick_begin() {	4349	sub wait_for_tick_begin() {
4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028		4351
4029	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4030	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4031	$signal->wait;	4354	$signal->wait;
4032	}	4355	}
…		…
4036	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4037	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4038	return;	4361	return;
4039	}	4362	}
4040		4363
4041	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4042		4365
4043	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4044		4367
4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4052	}	4375	}
4053		4376
4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055	$sig->send;	4378	$sig->send;
4056	}	4379	}
4057	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4058	$sig->send;
4059	}
4060		4381
4061	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4062	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063		4384
4064	if (0) {	4385	if (0) {
…		…
4070	}	4391	}
4071	}	4392	}
4072		4393
4073	{	4394	{
4074	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4075		4397
4076	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4077	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4078	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4079		4401
4080	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4081	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4082	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4108	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4109	};	4431	};
4110	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4111	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4112	};	4434	};
		4435
		4436	info "database initialised";
4113	}	4437	}
4114		4438
4115	{	4439	{
4116	# configure IO::AIO	4440	# configure IO::AIO
4117		4441
		4442	info "initialising aio";
4118	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4119	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4120	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4121	}	4447	}
4122		4448
4123	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4124		4451
4125	sub _log_backtrace {	4452	sub _log_backtrace {
4126	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4127		4454
4128	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4129		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4131	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4132	++$_log_backtrace;	4463	++$_log_backtrace;
4133	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4134	async {	4465	async {
4135	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4136		4467
…		…
4156	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4157	--$_log_backtrace;	4488	--$_log_backtrace;
4158	};	4489	};
4159	} else {	4490	} else {
4160	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4161	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162	}	4493	}
4163	}	4494	}
4164		4495
4165	# load additional modules	4496	# load additional modules
4166	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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