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.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.616 by root, Mon Aug 10 03:05:30 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_ONESHOT;
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.
…		…
599	}	739	}
600		740
601	sub fork_call(&@) {	741	sub fork_call(&@) {
602	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
603		743
604	# we seemingly have to make a local copy of the whole thing,
605	# otherwise perl prematurely frees the stuff :/
606	# TODO: investigate and fix (likely this will be rather laborious)
607
608	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
609	cf::post_fork;	745	cf::post_fork;
610	&$cb	746	&$cb
611	}, @args;	747	} @args;
612		748
613	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
614	}	750	}
615		751
616	sub objinfo {	752	sub objinfo {
…		…
738		874
739	my @data;	875	my @data;
740	my $md5;	876	my $md5;
741		877
742	for (0 .. $#$src) {	878	for (0 .. $#$src) {
743	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
744	or Carp::croak "$src->[$_]: $!";
745	}	880	}
746		881
747	# if processing is expensive, check	882	# if processing is expensive, check
748	# checksum first	883	# checksum first
749	if (1) {	884	if (1) {
…		…
762		897
763	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
764	}	899	}
765	}	900	}
766		901
767	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
768	my $data = $process->(\@data);	903	my $data = $process->(\@data);
769	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
770		905
771	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
772		907
773	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
774	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1294	=cut	1429	=cut
1295		1430
1296	#############################################################################	1431	#############################################################################
1297	# command handling &c	1432	# command handling &c
1298		1433
1299	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1300		1435
1301	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
1302	$name.	1437	$name.
1303		1438
1304	=cut	1439	=cut
…		…
1310	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1311		1446
1312	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1313	}	1448	}
1314		1449
1315	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1316		1451
1317	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1318	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
1319	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
1320	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
1321	has logged in successfully.	1456	has logged in successfully.
1322		1457
1323	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1324	called.
1325		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
1326	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1327		1466
1328	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1329	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
1330	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
1331	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
1332	log-in.	1471	log-in.
1333		1472
1334	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1335	called.
1336		1474
1337	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1338		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
1339	sub register_extcmd {	1482	sub register_extcmd($$) {
1340	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1341		1484
1342	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1343	}	1486	}
1344		1487
1345	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1346	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1347		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1348	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1349	}	1504	}
1350		1505
1351	use File::Glob ();	1506	use File::Glob ();
1352		1507
1353	cf::player->attach (	1508	cf::player->attach (
…		…
1367	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1368		1523
1369	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370		1525
1371	if (ref $msg) {	1526	if (ref $msg) {
1372	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373	"ARRAY" eq ref $msg
1374	? @$msg
1375	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376		1528
1377	my @reply;
1378
1379	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}) {
1380	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1381	}	1547	}
1382
1383	$pl->ext_reply ($reply, @reply)
1384	if $reply;
1385		1548
1386	} else {	1549	} else {
1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1388	}	1551	}
1389		1552
…		…
1402	};	1565	};
1403		1566
1404	$grp	1567	$grp
1405	}	1568	}
1406		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
1407	sub load_extensions {	1581	sub load_extensions {
1408	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1409		1585
1410	cf::sync_job {	1586	cf::sync_job {
1411	my %todo;	1587	my %todo;
1412		1588
1413	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1456	unless exists $done{$_};	1632	unless exists $done{$_};
1457	}	1633	}
1458		1634
1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460		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
1461	my $active = eval $v->{source};	1646	my $active = eval $source;
1462		1647
1463	if (length $@) {	1648	if (length $@) {
1464	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1465		1650
1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1483		1668
1484	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1487	}	1672	}
		1673
		1674	last;
1488	}	1675	}
1489	}	1676	}
1490	};	1677	};
1491	}	1678	}
1492		1679
…		…
1650	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1651		1838
1652	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1653	$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
1654		1841
1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656	$pl->deactivate;	1843	$pl->deactivate;
1657		1844
1658	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;
		1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659	ext::highscore::check ($pl->ob);	1847	ext::highscore::check ($pl->ob);
1660		1848
1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1662	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1663		1850
1664	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1665	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1666	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1752		1939
1753	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754		1941
1755	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1756		1943
1757	=item $player->ext_reply ($msgid, @msg)
1758
1759	Sends an ext reply to the player.
1760
1761	=cut
1762
1763	sub ext_reply($$@) {
1764	my ($self, $id, @msg) = @_;
1765
1766	$self->ns->ext_reply ($id, @msg)
1767	}
1768
1769	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1770		1945
1771	Sends an ext event to the client.	1946	Sends an ext event to the client.
1772		1947
1773	=cut	1948	=cut
…		…
1832	sub generate_random_map {	2007	sub generate_random_map {
1833	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1834		2009
1835	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
1836		2011
1837	# mit "rum" bekleckern, nicht
1838	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842	$rmp->{exit_on_final_map},
1843	$rmp->{xsize}, $rmp->{ysize},
1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849	(cf::region::find $rmp->{region}), $rmp->{custom}
1850	)
1851	}	2013	}
1852		2014
1853	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1854		2016
1855	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
…		…
1906	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1907	$path = "$base/$path";	2069	$path = "$base/$path";
1908	}	2070	}
1909		2071
1910	for ($path) {	2072	for ($path) {
1911	redo if s{//}{/};
1912	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1913	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1914	}	2075	}
1915		2076
1916	$path	2077	$path
…		…
1934		2095
1935	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1936	()	2097	()
1937	}	2098	}
1938		2099
		2100	# may re-bless or do other evil things
1939	sub init {	2101	sub init {
1940	my ($self) = @_;	2102	my ($self) = @_;
1941		2103
1942	$self	2104	$self
1943	}	2105	}
…		…
2008	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2009		2171
2010	1	2172	1
2011	}	2173	}
2012		2174
		2175	# used to laod the header of an original map
2013	sub load_header_orig {	2176	sub load_header_orig {
2014	my ($self) = @_;	2177	my ($self) = @_;
2015		2178
2016	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2017	}	2180	}
2018		2181
		2182	# used to laod the header of an instantiated map
2019	sub load_header_temp {	2183	sub load_header_temp {
2020	my ($self) = @_;	2184	my ($self) = @_;
2021		2185
2022	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2023	}	2187	}
2024		2188
		2189	# called after loading the header from an instantiated map
2025	sub prepare_temp {	2190	sub prepare_temp {
2026	my ($self) = @_;	2191	my ($self) = @_;
2027		2192
2028	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2029	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2030	# safety	2195	# safety
2031	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2032	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2033	}	2198	}
2034		2199
		2200	# called after loading the header from an original map
2035	sub prepare_orig {	2201	sub prepare_orig {
2036	my ($self) = @_;	2202	my ($self) = @_;
2037		2203
2038	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2039	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2065	sub find {	2231	sub find {
2066	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2067		2233
2068	cf::cede_to_tick;	2234	cf::cede_to_tick;
2069		2235
2070	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2071		2237
2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2074		2240
2075	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2106		2272
2107	{	2273	{
2108	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2109		2275
2110	return unless $self->valid;	2276	return unless $self->valid;
2111	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2112
2113	$self->in_memory (cf::MAP_LOADING);
2114		2278
2115	$self->alloc;	2279	$self->alloc;
2116		2280
2117	$self->pre_load;	2281	$self->pre_load;
2118	cf::cede_to_tick;	2282	cf::cede_to_tick;
2119		2283
		2284	if (exists $self->{load_path}) {
2120	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2121	$f->skip_block;	2286	$f->skip_block;
2122	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2123	or return;	2288	or return;
2124		2289
2125	$self->post_load_original	2290	$self->post_load_original
2126	if delete $self->{load_original};	2291	if delete $self->{load_original};
2127		2292
2128	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2129	utf8::encode $uniq;	2294	utf8::encode $uniq;
2130	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2131	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2132	$self->clear_unique_items;	2297	$self->clear_unique_items;
2133	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2134	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2135	}	2301	}
2136	}	2302	}
2137	}
2138		2303
2139	$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);
2140		2311
2141	cf::cede_to_tick;	2312	cf::cede_to_tick;
2142	# now do the right thing for maps	2313	# now do the right thing for maps
2143	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2144	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2148	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2149	$self->decay_objects;	2320	$self->decay_objects;
2150	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2151	$self->update_buttons;	2322	$self->update_buttons;
2152	cf::cede_to_tick;	2323	cf::cede_to_tick;
2153	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2154	}	2325	}
2155		2326
2156	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2157	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2158
2159	$self->in_memory (cf::MAP_ACTIVE);
2160	}	2329	}
2161		2330
2162	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2163	}	2334	}
2164		2335
2165	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2166	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2167	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2175	# if $self->per_party;	2346	# if $self->per_party;
2176		2347
2177	$self	2348	$self
2178	}	2349	}
2179		2350
2180	# find and load all maps in the 3x3 area around a map
2181	sub load_neighbours {
2182	my ($map) = @_;
2183
2184	my @neigh; # diagonal neighbours
2185
2186	for (0 .. 3) {
2187	my $neigh = $map->tile_path ($_)
2188	or next;
2189	$neigh = find $neigh, $map
2190	or next;
2191	$neigh->load;
2192
2193	# now find the diagonal neighbours
2194	push @neigh,
2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2197	}
2198
2199	for (grep defined $_->[0], @neigh) {
2200	my ($path, $origin) = @$_;
2201	my $neigh = find $path, $origin
2202	or next;
2203	$neigh->load;
2204	}
2205	}
2206
2207	sub find_sync {	2351	sub find_sync {
2208	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2209		2353
		2354	# it's a bug to call this from the main context
2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2212		2357
2213	find $path, $origin	2358	find $path, $origin
2214	}	2359	}
2215		2360
2216	sub do_load_sync {	2361	sub do_load_sync {
2217	my ($map) = @_;	2362	my ($map) = @_;
2218		2363
		2364	# it's a bug to call this from the main context
2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2221		2367
2222	$map->load;	2368	$map->load;
2223	}	2369	}
…		…
2226	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2227		2373
2228	sub find_async {	2374	sub find_async {
2229	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2230		2376
2231	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2232		2378
2233	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2234	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2235	}	2381	}
2236		2382
2237	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2238		2384
2239	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2298	sub swap_out {	2444	sub swap_out {
2299	my ($self) = @_;	2445	my ($self) = @_;
2300		2446
2301	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2302		2448
2303	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2304	return if $self->{deny_save};	2450	return if $self->{deny_save};
2305	return if $self->players;	2451	return if $self->players;
2306		2452
2307	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2308	$self->deactivate;	2454	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2311		2457
2312	# then atomically save	2458	# then atomically save
2313	$self->_save;	2459	$self->_save;
2314		2460
2315	# then free the map	2461	# then free the map
…		…
2341		2487
2342	return if $self->players;	2488	return if $self->players;
2343		2489
2344	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2345		2491
2346	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2347		2493
2348	# need to save uniques path	2494	# need to save uniques path
2349	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2350	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2351		2497
…		…
2504		2650
2505	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.
2506		2652
2507	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2508		2654
2509	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,
2510	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2511		2657
2512	=cut	2658	=cut
2513		2659
2514	sub deref {	2660	sub deref {
…		…
2596	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2597		2743
2598	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2599	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2600		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
2601	=cut	2772	=cut
2602		2773
2603	sub cf::object::player::may {	2774	sub cf::object::player::may {
2604	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2605		2776
2606	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2607	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2608	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2609	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2610	}	2781	}
2611		2782
2612	=item $player_object->enter_link	2783	=item $player_object->enter_link
2613		2784
…		…
2616	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.
2617	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,
2618	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
2619	map.	2790	map.
2620		2791
2621	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.
2622		2799
2623	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2624		2801
2625	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
2626	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
…		…
2681	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2682	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2683	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2684		2861
2685	$map->load;	2862	$map->load;
2686	$map->load_neighbours;
2687		2863
2688	return unless $self->contr->active;	2864	return unless $self->contr->active;
2689		2865
2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2747	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2748	}	2924	}
2749	}	2925	}
2750		2926
2751	my $map = eval {	2927	my $map = eval {
2752	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753		2929
2754	if ($map) {	2930	if ($map) {
2755	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2756	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2757	} else {	2933	} else {
…		…
2847	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2848		3024
2849	unless (eval {	3025	unless (eval {
2850	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2851		3027
2852	# random map handling
2853	{
2854	my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856	prepare_random_map $exit
2857	if $exit->slaying eq "/!";
2858	}
2859
2860	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2861	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2862	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	}
2863		3054
2864	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2865		3056
2866	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2867	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2882		3073
2883	=head3 cf::client	3074	=head3 cf::client
2884		3075
2885	=over 4	3076	=over 4
2886		3077
2887	=item $client->send_drawinfo ($text, $flags)
2888
2889	Sends a drawinfo packet to the client. Circumvents output buffering so
2890	should not be used under normal circumstances.
2891
2892	=cut
2893
2894	sub cf::client::send_drawinfo {
2895	my ($self, $text, $flags) = @_;
2896
2897	utf8::encode $text;
2898	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899	}
2900
2901	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2902		3079
2903	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
2904	them as required.	3081	them as required.
2905		3082
…		…
2923	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2924	}	3101	}
2925		3102
2926	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2927		3104
2928	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
2929	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
2930	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
2931	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2932		3109
2933	=cut	3110	=cut
2934		3111
2935	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3040	id => "death",	3217	id => "death",
3041	title => "Death",	3218	title => "Death",
3042	reply => undef,	3219	reply => undef,
3043	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3044	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3045	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3046	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3047	);	3230	);
3048		3231
3049	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3092	=cut	3275	=cut
3093		3276
3094	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3095	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3096		3279
3097	if ($self->extcmd == 2) {
3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099	} elsif ($self->extcmd == 1) { # TODO: remove
3100	push @msg, msgtype => "event_$type";
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}
3104
3105	=item $client->ext_reply ($msgid, @msg)
3106
3107	Sends an ext reply to the client.
3108
3109	=cut
3110
3111	sub cf::client::ext_reply($$@) {
3112	my ($self, $id, @msg) = @_;
3113
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116	} elsif ($self->extcmd == 1) {
3117	#TODO: version 1, remove
3118	unshift @msg, msgtype => "reply", msgid => $id;
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120	}
3121	}	3281	}
3122		3282
3123	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3124		3284
3125	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3145		3305
3146	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3147	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3148		3308
3149	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;
3150	}	3349	}
3151		3350
3152	cf::client->attach (	3351	cf::client->attach (
3153	on_connect => sub {	3352	on_connect => sub {
3154	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3180	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3181		3380
3182	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183		3382
3184	if (ref $msg) {	3383	if (ref $msg) {
3185	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186	"ARRAY" eq ref $msg
3187	? @$msg
3188	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189		3385
3190	my @reply;
3191
3192	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}) {
3193	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3194	}	3404	}
3195
3196	$ns->ext_reply ($reply, @reply)
3197	if $reply;
3198
3199	} else {	3405	} else {
3200	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";
3201	}	3407	}
3202		3408
3203	cf::override;	3409	cf::override;
…		…
3371	=cut	3577	=cut
3372		3578
3373	#############################################################################	3579	#############################################################################
3374	# the server's init and main functions	3580	# the server's init and main functions
3375		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
3376	sub load_facedata($) {	3659	sub load_facedata($) {
3377	my ($path) = @_;	3660	my ($path) = @_;
3378		3661
3379	# HACK to clear player env face cache, we need some signal framework
3380	# for this (global event?)
3381	%ext::player_env::MUSIC_FACE_CACHE = ();
3382
3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384		3663
3385	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3386		3665
3387	0 < aio_load $path, my $facedata	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3388	or die "$path: $!";
3389
3390	$facedata = Coro::Storable::thaw $facedata;
3391		3667
3392	$facedata->{version} == 2	3668	$facedata->{version} == 2
3393	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3394		3670
3395	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3397	$facedata->{resource}{"res/exp_table"} = {	3673
3398	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3399	data => $exp_table,	3675
3400	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3401	};	3677	# from here on, everything must be atomic - no thread switch allowed
3402	cf::cede_to_tick;	3678	my $t1 = EV::time;
3403		3679
3404	{	3680	{
3405	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3406		3682
3407	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409		3686
3410	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3411	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3412	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};
3413	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};
3414		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3415	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3416	}	3694	}
3417		3695
3418	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3419	next unless $info->{smooth};	3697	next unless $info->{smooth};
3420		3698
…		…
3425	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3426	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3427	} else {	3705	} else {
3428	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3429	}	3707	}
3430
3431	cf::cede_to_tick;
3432	}	3708	}
3433	}	3709	}
3434		3710
3435	{	3711	{
3436	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3437		3713
3438	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3439	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3440	cf::cede_to_tick;
3441	}	3716	}
3442		3717
3443	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3444	}	3719	}
3445		3720
3446	{	3721	{
3447	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3448		3723
3449	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3450	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
3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452		3728
3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454	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;
3455	} else {	3735	} else {
3456	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3457	}	3737	}
3458
3459	cf::cede_to_tick;
3460	}	3738	}
3461	}	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;
3462		3750
3463	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
3464		3754
3465	1	3755	1
3466	}	3756	}
3467		3757
3468	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3479	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3480	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3481	cf::arch::commit_load;	3771	cf::arch::commit_load;
3482		3772
3483	$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;
3484	}	3788	}
3485		3789
3486	sub reload_regions {	3790	sub reload_regions {
3487	# 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
3488	# for this (global event?)	3792	# for this (global event?)
…		…
3496	if exists $_->{match};	3800	if exists $_->{match};
3497	}	3801	}
3498	}	3802	}
3499		3803
3500	sub reload_facedata {	3804	sub reload_facedata {
3501	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3502	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3503	}	3807	}
3504		3808
3505	sub reload_archetypes {	3809	sub reload_archetypes {
3506	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3507	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;
3508	}	3838	}
3509		3839
3510	sub reload_treasures {	3840	sub reload_treasures {
3511	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3512	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3513	}	3843	}
3514		3844
3515	sub reload_sound {	3845	sub reload_sound {
3516	trace "loading sound config from $DATADIR/sound\n";	3846	trace "loading sound config from $DATADIR/sound\n";
3517		3847
3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519	or die "$DATADIR/sound $!";
3520
3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522		3849
3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524	my $sound = $soundconf->{compat}[$_]	3851	my $sound = $soundconf->{compat}[$_]
3525	or next;	3852	or next;
3526		3853
…		…
3536	}	3863	}
3537		3864
3538	sub reload_resources {	3865	sub reload_resources {
3539	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3540		3867
3541	reload_exp_table;
3542	reload_materials;	3868	reload_materials;
3543	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3544	reload_sound;	3871	reload_sound;
3545	reload_archetypes;	3872	reload_archetypes;
3546	reload_regions;	3873	reload_regions;
3547	reload_treasures;	3874	reload_treasures;
3548		3875
…		…
3550	}	3877	}
3551		3878
3552	sub reload_config {	3879	sub reload_config {
3553	trace "reloading config file...\n";	3880	trace "reloading config file...\n";
3554		3881
3555	0 < aio_load "$CONFDIR/config", my $config	3882	my $config = load_file "$CONFDIR/config";
3556	or die "$CONFDIR/config: $!";
3557
3558	utf8::decode $config;	3883	utf8::decode $config;
3559		3884	*CFG = decode_yaml $config;
3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561	*CFG = YAML::XS::Load $config;
3562		3885
3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564		3887
3565	$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};
3566	$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};
…		…
3592	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3593	print $fh $$;	3916	print $fh $$;
3594	}	3917	}
3595		3918
3596	sub main_loop {	3919	sub main_loop {
3597	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3598	if (1) {	3921	if (1) {
3599	EV::loop;	3922	EV::run;
3600	}	3923	}
3601	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3602	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3603	}	3926	}
3604		3927
3605	sub main {	3928	sub main {
3606	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3607		3930
3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609	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.";
3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612		3935
3613	$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
3614		3937
3615	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3616	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3617	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#
3618	(async {	3941	(async {
3619	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3620	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONESHOT;
3621	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3622	};	3945	};
3623		3946
3624	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3625		3948
3626	cf::sync_job {	3949	cf::sync_job {
3627	cf::incloader::init ();	3950	cf::incloader::init ();
		3951
		3952	db_init;
3628		3953
3629	cf::init_anim;	3954	cf::init_anim;
3630	cf::init_attackmess;	3955	cf::init_attackmess;
3631	cf::init_dynamic;	3956	cf::init_dynamic;
3632		3957
3633	cf::load_settings;	3958	cf::load_settings;
3634		3959
3635	reload_resources;	3960	reload_resources;
3636	reload_config;	3961	reload_config;
3637	db_init;
3638		3962
3639	cf::init_uuid;	3963	cf::init_uuid;
3640	cf::init_signals;	3964	cf::init_signals;
3641	cf::init_skills;	3965	cf::init_skills;
3642		3966
…		…
3650		3974
3651	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3652	use POSIX ();	3976	use POSIX ();
3653	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};
3654		3978
3655	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3656	};	3980	};
3657		3981
3658	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3659	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";
3660		3984
3661	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3662	undef $free_main;
3663	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3664	};	3987	};
3665		3988
3666	goto &main_loop;	3989	goto &main_loop;
3667	}	3990	}
…		…
3824		4147
3825	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3826		4149
3827	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3828	while (IO::AIO::nreqs || BDB::nreqs) {	4151	while (IO::AIO::nreqs || BDB::nreqs) {
3829	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
3830	}	4153	}
3831		4154
3832	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3833	};	4156	};
3834		4157
…		…
3883		4206
3884	my $t1 = AE::time;	4207	my $t1 = AE::time;
3885		4208
3886	while ($RELOAD) {	4209	while ($RELOAD) {
3887	cf::get_slot 0.1, -1, "reload_perl";	4210	cf::get_slot 0.1, -1, "reload_perl";
3888	info "reloading...";	4211	info "perl_reload: reloading...";
3889		4212
3890	trace "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3891		4214
3892	cf::sync_job {	4215	cf::sync_job {
3893	#cf::emergency_save;	4216	#cf::emergency_save;
3894		4217
3895	trace "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3896	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3897	%EXT_CORO = ();	4220	%EXT_CORO = ();
3898		4221
3899	trace "removing commands";	4222	trace "perl_reload: removing commands";
3900	%COMMAND = ();	4223	%COMMAND = ();
3901		4224
3902	trace "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3903	%EXTCMD = ();	4226	%EXTCMD = ();
3904	%EXTICMD = ();	4227	%EXTICMD = ();
3905		4228
3906	trace "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3907	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3908	trace "... unloading $pkg";	4231	trace "... unloading $pkg";
3909		4232
3910	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3911	eval {	4234	eval {
…		…
3916		4239
3917	trace "... clearing $pkg";	4240	trace "... clearing $pkg";
3918	clear_package $pkg;	4241	clear_package $pkg;
3919	}	4242	}
3920		4243
3921	trace "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924		4247
3925	trace "... unloading $k";	4248	trace "... unloading $k";
3926	delete $INC{$k};	4249	delete $INC{$k};
…		…
3933	}	4256	}
3934		4257
3935	clear_package $k;	4258	clear_package $k;
3936	}	4259	}
3937		4260
3938	trace "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3939	clear_package "safe::$_"	4262	clear_package "safe::$_"
3940	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);
3941		4264
3942	trace "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3943	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945		4268
3946	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3947	# and global variables created in xs	4270	# and global variables created in xs
3948	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3949		4272
3950	info "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3951		4274
3952	trace "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3953	require cf;	4276	require cf;
3954	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3955		4278
3956	trace "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3957	cf::reload_config;	4280	cf::reload_config;
3958		4281
3959	trace "loading extensions";	4282	trace "perl_reload: loading extensions";
3960	cf::load_extensions;	4283	cf::load_extensions;
3961		4284
3962	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3963	trace "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3964	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3965	trace "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3966	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3967	trace "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3968	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3969	}	4292	}
3970		4293
3971	trace "running post_init jobs";	4294	cf::_post_init 1;
3972	(pop @POST_INIT)->(1) while @POST_INIT;
3973		4295
3974	trace "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3975		4297
3976	1	4298	1
3977	} or do {	4299	} or do {
3978	error $@;	4300	error $@;
3979	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3980	};	4302	};
3981		4303
3982	info "reloaded";
3983	--$RELOAD;	4304	--$RELOAD;
3984	}	4305	}
3985		4306
3986	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3987	info "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3988	};	4309	};
3989		4310
3990	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3991		4312
3992	sub reload_perl() {	4313	sub reload_perl() {
…		…
4017		4338
4018	#############################################################################	4339	#############################################################################
4019		4340
4020	my $bug_warning = 0;	4341	my $bug_warning = 0;
4021		4342
4022	our @WAIT_FOR_TICK;
4023	our @WAIT_FOR_TICK_BEGIN;
4024
4025	sub wait_for_tick() {	4343	sub wait_for_tick() {
4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027		4345
4028	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4029	push @WAIT_FOR_TICK, $signal;
4030	$signal->wait;
4031	}	4347	}
4032		4348
4033	sub wait_for_tick_begin() {	4349	sub wait_for_tick_begin() {
4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035		4351
4036	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4037	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4038	$signal->wait;	4354	$signal->wait;
4039	}	4355	}
…		…
4043	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"
4044	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4045	return;	4361	return;
4046	}	4362	}
4047		4363
4048	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4049		4365
4050	#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#
4051		4367
4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053	$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.;
…		…
4059	}	4375	}
4060		4376
4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062	$sig->send;	4378	$sig->send;
4063	}	4379	}
4064	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4065	$sig->send;
4066	}
4067		4381
4068	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070		4384
4071	if (0) {	4385	if (0) {
…		…
4077	}	4391	}
4078	}	4392	}
4079		4393
4080	{	4394	{
4081	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4082		4397
4083	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4084	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4085	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4086		4401
4087	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4088	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4089	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090	$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;
…		…
4115	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116	};	4431	};
4117	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119	};	4434	};
		4435
		4436	info "database initialised";
4120	}	4437	}
4121		4438
4122	{	4439	{
4123	# configure IO::AIO	4440	# configure IO::AIO
4124		4441
		4442	info "initialising aio";
4125	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4126	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4127	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4128	}	4447	}
4129		4448
4130	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4131		4451
4132	sub _log_backtrace {	4452	sub _log_backtrace {
4133	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4134		4454
4135	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4136		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4138	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4139	++$_log_backtrace;	4463	++$_log_backtrace;
4140	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4141	async {	4465	async {
4142	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4143		4467
…		…
4163	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4164	--$_log_backtrace;	4488	--$_log_backtrace;
4165	};	4489	};
4166	} else {	4490	} else {
4167	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4168	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169	}	4493	}
4170	}	4494	}
4171		4495
4172	# load additional modules	4496	# load additional modules
4173	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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