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.557 by root, Tue Oct 5 21:40:05 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	6	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	7	# 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	8	# 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	9	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	10	# option) any later version.
10	#	11	#
11	# This program is distributed in the hope that it will be useful,	12	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	13	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	15	# GNU General Public License for more details.
15	#	16	#
16	# You should have received a copy of the Affero GNU General Public License	17	# 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	18	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	19	# <http://www.gnu.org/licenses/>.
19	#	20	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	21	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	22	#
22		23
23	package cf;	24	package cf;
24		25
…		…
32	use Safe;	33	use Safe;
33	use Safe::Hole;	34	use Safe::Hole;
34	use Storable ();	35	use Storable ();
35	use Carp ();	36	use Carp ();
36		37
37	use Guard ();	38	use AnyEvent ();
		39	use AnyEvent::IO ();
		40	use AnyEvent::DNS ();
		41
38	use Coro ();	42	use Coro ();
39	use Coro::State;	43	use Coro::State;
40	use Coro::Handle;	44	use Coro::Handle;
41	use Coro::EV;	45	use Coro::EV;
42	use Coro::AnyEvent;	46	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	52	use Coro::AIO;
49	use Coro::BDB 1.6;	53	use Coro::BDB 1.6;
50	use Coro::Storable;	54	use Coro::Storable;
51	use Coro::Util ();	55	use Coro::Util ();
52		56
		57	use Guard ();
53	use JSON::XS 2.01 ();	58	use JSON::XS 2.01 ();
54	use BDB ();	59	use BDB ();
55	use Data::Dumper;	60	use Data::Dumper;
56	use Fcntl;	61	use Fcntl;
57	use YAML::XS ();	62	use YAML::XS ();
		63	use CBOR::XS ();
58	use IO::AIO ();	64	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	65	use Compress::LZF;
61	use Digest::MD5 ();	66	use Digest::MD5 ();
62		67
63	AnyEvent::detect;	68	AnyEvent::detect;
64		69
…		…
83	our %COMMAND = ();	88	our %COMMAND = ();
84	our %COMMAND_TIME = ();	89	our %COMMAND_TIME = ();
85		90
86	our @EXTS = (); # list of extension package names	91	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	92	our %EXTCMD = ();
		93	our %EXTACMD = ();
88	our %EXTICMD = ();	94	our %EXTICMD = ();
		95	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	96	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	97	our %EXT_MAP = (); # pluggable maps
91		98
92	our $RELOAD; # number of reloads so far, non-zero while in reload	99	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	100	our @EVENT;
94	our @REFLECT; # set by XS	101	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	102	our %REFLECT; # set by us
96		103
97	our $CONFDIR = confdir;	104	our $CONFDIR = confdir;
		105
98	our $DATADIR = datadir;	106	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	107	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	108	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	109	our $MAPDIR = "$DATADIR/" . mapdir;
		110
102	our $LOCALDIR = localdir;	111	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	112	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	113	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	114	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	115	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	116	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	117	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	118	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		119
111	our %RESOURCE; # unused	120	#our %RESOURCE; # unused
112		121
113	our $OUTPUT_RATE_MIN = 3000;	122	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	123	our $OUTPUT_RATE_MAX = 1000000;
115		124
116	our $MAX_LINKS = 32; # how many chained exits to follow	125	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	136	our $DB_ENV;
128		137
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		139
131	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		142
133	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
135	our $NOW;	146	our $NOW;
136		147
137	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		159
149	our @POST_INIT;	160	our @POST_INIT;
150		161
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	162	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	163	our $REALLY_UNLOOP; # never set to true, please :)
		164
		165	our $WAIT_FOR_TICK = new Coro::Signal;
		166	our @WAIT_FOR_TICK_BEGIN;
153		167
154	binmode STDOUT;	168	binmode STDOUT;
155	binmode STDERR;	169	binmode STDERR;
156		170
157	# read virtual server time, if available	171	# read virtual server time, if available
…		…
191		205
192	=over 4	206	=over 4
193		207
194	=item $cf::UPTIME	208	=item $cf::UPTIME
195		209
196	The timestamp of the server start (so not actually an uptime).	210	The timestamp of the server start (so not actually an "uptime").
		211
		212	=item $cf::SERVER_TICK
		213
		214	An unsigned integer that starts at zero when the server is started and is
		215	incremented on every tick.
		216
		217	=item $cf::NOW
		218
		219	The (real) time of the last (current) server tick - updated before and
		220	after tick processing, so this is useful only as a rough "what time is it
		221	now" estimate.
		222
		223	=item $cf::TICK
		224
		225	The interval between each server tick, in seconds.
197		226
198	=item $cf::RUNTIME	227	=item $cf::RUNTIME
199		228
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	229	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	230	every server tick.
202		231
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		235
207	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
210	database environment.	239	database environment.
211		240
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	241	=item $cf::LOADAVG
221		242
222	The current CPU load on the server (alpha-smoothed), as a value between 0	243	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	244	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	253	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	254	from wherever your confdir points to.
234		255
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		257
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	258	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	259	cf::wait_for_tick_begin only returns directly I<after> the tick
		260	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.	261	cf::wait_for_tick wakes up all waiters after tick processing.
		262
		263	Note that cf::wait_for_tick will immediately return when the server is not
		264	ticking, making it suitable for small pauses in threads that need to run
		265	when the server is paused. If that is not applicable (i.e. you I<really>
		266	want to wait, use C<$cf::WAIT_FOR_TICK>).
		267
		268	=item $cf::WAIT_FOR_TICK
		269
		270	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		271	variable contains a L<Coro::Signal> that is broadcats after every server
		272	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		273	next server tick.
240		274
241	=cut	275	=cut
242		276
243	sub wait_for_tick();	277	sub wait_for_tick();
244	sub wait_for_tick_begin();	278	sub wait_for_tick_begin();
…		…
310	)) {	344	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	346	}
313		347
314	$EV::DIED = sub {	348	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
316	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
317		356
318	#############################################################################	357	#############################################################################
319		358
320	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
321		360
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	381	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	382	$d
344	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
345	}	384	}
346		385
		386	=item $scalar = cf::load_file $path
		387
		388	Loads the given file from path and returns its contents. Croaks on error
		389	and can block.
		390
		391	=cut
		392
		393	sub load_file($) {
		394	0 <= aio_load $_[0], my $data
		395	or Carp::croak "$_[0]: $!";
		396
		397	$data
		398	}
		399
		400	=item $success = cf::replace_file $path, $data, $sync
		401
		402	Atomically replaces the file at the given $path with new $data, and
		403	optionally $sync the data to disk before replacing the file.
		404
		405	=cut
		406
		407	sub replace_file($$;$) {
		408	my ($path, $data, $sync) = @_;
		409
		410	my $lock = cf::lock_acquire ("replace_file:$path");
		411
		412	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		413	or return;
		414
		415	$data = $data->() if ref $data;
		416
		417	length $data == aio_write $fh, 0, (length $data), $data, 0
		418	or return;
		419
		420	!$sync
		421	or !aio_fsync $fh
		422	or return;
		423
		424	aio_close $fh
		425	and return;
		426
		427	aio_rename "$path~", $path
		428	and return;
		429
		430	if ($sync) {
		431	$path =~ s%/[^/]*$%%;
		432	aio_pathsync $path;
		433	}
		434
		435	1
		436	}
		437
347	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
348		439
349	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
350		441
351	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	448	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		449
359	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
361		452
		453	=item $ref = cf::decode_storable $scalar
		454
		455	Same as Coro::Storable::thaw, so blocks.
		456
		457	=cut
		458
		459	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		460
362	=item $ref = cf::yaml_load $scalar	461	=item $ref = cf::decode_yaml $scalar
363		462
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	463	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		464
366	=cut	465	=cut
367		466
368	sub fork_call(&@);	467	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	468	fork_call { YAML::XS::Load $_[0] } @_
		469	}
		470
		471	=item $scalar = cf::decode_cbor $scalar
		472
		473	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		474	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		475	alternative.
		476
		477	=cut
		478
		479	sub decode_cbor($) {
		480	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		481	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		482	CBOR::XS::decode_cbor $_[0]
		483	}
		484
		485	=item $scalar = cf::unlzf $scalar
		486
		487	Same as Compress::LZF::compress, but takes server ticks into account, so
		488	blocks.
		489
		490	=cut
		491
		492	sub unlzf($) {
		493	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		494	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		495	Compress::LZF::decompress $_[0]
372	}	496	}
373		497
374	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
375		499
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	500	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
402	}	526	}
403	}	527	}
404		528
405	=item cf::lock_wait $string	529	=item cf::lock_wait $string
406		530
407	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
408		532
409	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
410		534
411	Wait until the given lock is available and then acquires it and returns	535	Wait until the given lock is available and then acquires it and returns
412	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	536	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
460	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
461	}	585	}
462		586
463	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
464		588
465	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	Allocate $time seconds of blocking CPU time at priority C<$priority>
466	This call blocks and returns only when you have at least C<$time> seconds	590	(default: 0): This call blocks and returns only when you have at least
467	of cpu time till the next tick. The slot is only valid till the next cede.	591	C<$time> seconds of cpu time till the next tick. The slot is only valid
		592	till the next cede.
		593
		594	Background jobs should use a priority less than zero, interactive jobs
		595	should use 100 or more.
468		596
469	The optional C<$name> can be used to identify the job to run. It might be	597	The optional C<$name> can be used to identify the job to run. It might be
470	used for statistical purposes and should identify the same time-class.	598	used for statistical purposes and should identify the same time-class.
471		599
472	Useful for short background jobs.	600	Useful for short background jobs.
…		…
484	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
485	my $busy;	613	my $busy;
486		614
487	while () {	615	while () {
488	next_job:	616	next_job:
		617
		618	Coro::cede;
489		619
490	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
491		621
492	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
493	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
494	$busy = 0;	624	$busy = 0;
495	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
496	$job->[2]->send;	626	$job->[2]->send;
497	Coro::cede;
498	goto next_job;	627	goto next_job;
499	} else {	628	} else {
500	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
501	}	630	}
502	}	631	}
503		632
504	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
505	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
506	push @cf::WAIT_FOR_TICK, $signal;
507	$signal->wait;
508	} else {	635	} else {
509	$busy = 0;	636	$busy = 0;
510	Coro::schedule;	637	Coro::schedule;
511	}	638	}
512	}	639	}
…		…
538	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
539		666
540	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
541		668
542	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
543	is always able to handle events or runnable, as Deliantra is only	670	is always able to handle events or is runnable, as Deliantra is only
544	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	671	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
545	acceptable.	672	acceptable.
546		673
547	If it must be done, put the blocking parts into C<sync_job>. This will run	674	If it must be done, put the blocking parts into C<sync_job>. This will run
548	the given BLOCK in another coroutine while waiting for the result. The	675	the given BLOCK in another coroutine while waiting for the result. The
…		…
576		703
577	while ($busy) {	704	while ($busy) {
578	if (Coro::nready) {	705	if (Coro::nready) {
579	Coro::cede_notself;	706	Coro::cede_notself;
580	} else {	707	} else {
581	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
582	}	709	}
583	}	710	}
584		711
585	my $time = AE::time - $time;	712	my $time = AE::time - $time;
586		713
…		…
627	reset_signals;	754	reset_signals;
628	}	755	}
629		756
630	sub fork_call(&@) {	757	sub fork_call(&@) {
631	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
632
633	# we seemingly have to make a local copy of the whole thing,
634	# otherwise perl prematurely frees the stuff :/
635	# TODO: investigate and fix (likely this will be rather laborious)
636		759
637	my @res = Coro::Util::fork_eval {	760	my @res = Coro::Util::fork_eval {
638	cf::post_fork;	761	cf::post_fork;
639	&$cb	762	&$cb
640	} @args;	763	} @args;
…		…
767		890
768	my @data;	891	my @data;
769	my $md5;	892	my $md5;
770		893
771	for (0 .. $#$src) {	894	for (0 .. $#$src) {
772	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
773	or Carp::croak "$src->[$_]: $!";
774	}	896	}
775		897
776	# if processing is expensive, check	898	# if processing is expensive, check
777	# checksum first	899	# checksum first
778	if (1) {	900	if (1) {
…		…
791		913
792	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
793	}	915	}
794	}	916	}
795		917
796	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
797	my $data = $process->(\@data);	919	my $data = $process->(\@data);
798	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
799		921
800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801		923
802	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
803	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
…		…
1323	=cut	1445	=cut
1324		1446
1325	#############################################################################	1447	#############################################################################
1326	# command handling &c	1448	# command handling &c
1327		1449
1328	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1329		1451
1330	Register a callback for execution when the client sends the user command	1452	Register a callback for execution when the client sends the user command
1331	$name.	1453	$name.
1332		1454
1333	=cut	1455	=cut
…		…
1339	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1340		1462
1341	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1342	}	1464	}
1343		1465
1344	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1345		1467
1346	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1347	extcmd packet. Ext commands will be processed in the order they are	1469	extcmd packet. Ext commands will be processed in the order they are
1348	received by the server, like other user commands. The first argument is	1470	received by the server, like other user commands. The first argument is
1349	the logged-in player. Ext commands can only be processed after a player	1471	the logged-in player. Ext commands can only be processed after a player
1350	has logged in successfully.	1472	has logged in successfully.
1351		1473
1352	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1353	called.
1354		1475
		1476	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1477
		1478	Same as C<cf::register_extcmd>, but instead of returning values, the
		1479	callback needs to clal the C<$reply> function.
		1480
1355	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1356		1482
1357	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1358	exticmd packet. Exti commands are processed by the server as soon as they	1484	exticmd packet. Exti commands are processed by the server as soon as they
1359	are received, i.e. out of order w.r.t. other commands. The first argument	1485	are received, i.e. out of order w.r.t. other commands. The first argument
1360	is a client socket. Exti commands can be received anytime, even before	1486	is a client socket. Exti commands can be received anytime, even before
1361	log-in.	1487	log-in.
1362		1488
1363	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1364	called.
1365		1490
1366	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367		1492
		1493	Same as C<cf::register_extcmd>, but instead of returning values, the
		1494	callback needs to clal the C<$reply> function.
		1495
		1496	=cut
		1497
1368	sub register_extcmd {	1498	sub register_extcmd($$) {
1369	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1370		1500
1371	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1372	}	1502	}
1373		1503
1374	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1375	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1376		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1377	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1378	}	1520	}
1379		1521
1380	use File::Glob ();	1522	use File::Glob ();
1381		1523
1382	cf::player->attach (	1524	cf::player->attach (
…		…
1396	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1397		1539
1398	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399		1541
1400	if (ref $msg) {	1542	if (ref $msg) {
1401	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402	"ARRAY" eq ref $msg
1403	? @$msg
1404	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405		1544
1406	my @reply;
1407
1408	if (my $cb = $EXTCMD{$type}) {	1545	if (my $cb = $EXTACMD{$type}) {
		1546	$cb->(
		1547	$pl,
		1548	sub {
		1549	$pl->ext_msg ("reply-$reply", @_)
		1550	if $reply;
		1551	},
		1552	@payload
		1553	);
		1554	} else {
		1555	my @reply;
		1556
		1557	if (my $cb = $EXTCMD{$type}) {
1409	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1410	}	1563	}
1411
1412	$pl->ext_reply ($reply, @reply)
1413	if $reply;
1414		1564
1415	} else {	1565	} else {
1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417	}	1567	}
1418		1568
…		…
1431	};	1581	};
1432		1582
1433	$grp	1583	$grp
1434	}	1584	}
1435		1585
		1586	sub _ext_cfg_reg($$$$) {
		1587	my ($rvar, $varname, $cfgname, $default) = @_;
		1588
		1589	$cfgname = lc $varname
		1590	unless length $cfgname;
		1591
		1592	$EXT_CFG{$cfgname} = [$rvar, $default];
		1593
		1594	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1595	}
		1596
1436	sub load_extensions {	1597	sub load_extensions {
1437	info "loading extensions...";	1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
1438		1601
1439	cf::sync_job {	1602	cf::sync_job {
1440	my %todo;	1603	my %todo;
1441		1604
1442	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
…		…
1485	unless exists $done{$_};	1648	unless exists $done{$_};
1486	}	1649	}
1487		1650
1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489		1652
		1653	my $source = $v->{source};
		1654
		1655	# support "CONF varname :confname = default" pseudo-statements
		1656	$source =~ s{
		1657	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1658	}{
		1659	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1660	}gmxe;
		1661
1490	my $active = eval $v->{source};	1662	my $active = eval $source;
1491		1663
1492	if (length $@) {	1664	if (length $@) {
1493	error "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1494		1666
1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1512		1684
1513	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1516	}	1688	}
		1689
		1690	last;
1517	}	1691	}
1518	}	1692	}
1519	};	1693	};
1520	}	1694	}
1521		1695
…		…
1780	}	1954	}
1781		1955
1782	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783		1957
1784	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1785
1786	=item $player->ext_reply ($msgid, @msg)
1787
1788	Sends an ext reply to the player.
1789
1790	=cut
1791
1792	sub ext_reply($$@) {
1793	my ($self, $id, @msg) = @_;
1794
1795	$self->ns->ext_reply ($id, @msg)
1796	}
1797		1959
1798	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1799		1961
1800	Sends an ext event to the client.	1962	Sends an ext event to the client.
1801		1963
…		…
1949		2111
1950	Carp::cluck "unable to resolve path '$path' (base '$base')";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1951	()	2113	()
1952	}	2114	}
1953		2115
		2116	# may re-bless or do other evil things
1954	sub init {	2117	sub init {
1955	my ($self) = @_;	2118	my ($self) = @_;
1956		2119
1957	$self	2120	$self
1958	}	2121	}
…		…
2023	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
2024		2187
2025	1	2188	1
2026	}	2189	}
2027		2190
		2191	# used to laod the header of an original map
2028	sub load_header_orig {	2192	sub load_header_orig {
2029	my ($self) = @_;	2193	my ($self) = @_;
2030		2194
2031	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
2032	}	2196	}
2033		2197
		2198	# used to laod the header of an instantiated map
2034	sub load_header_temp {	2199	sub load_header_temp {
2035	my ($self) = @_;	2200	my ($self) = @_;
2036		2201
2037	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
2038	}	2203	}
2039		2204
		2205	# called after loading the header from an instantiated map
2040	sub prepare_temp {	2206	sub prepare_temp {
2041	my ($self) = @_;	2207	my ($self) = @_;
2042		2208
2043	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
2044	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
2045	# safety	2211	# safety
2046	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
2047	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
2048	}	2214	}
2049		2215
		2216	# called after loading the header from an original map
2050	sub prepare_orig {	2217	sub prepare_orig {
2051	my ($self) = @_;	2218	my ($self) = @_;
2052		2219
2053	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
2054	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2080	sub find {	2247	sub find {
2081	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2082		2249
2083	cf::cede_to_tick;	2250	cf::cede_to_tick;
2084		2251
2085	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2086		2253
2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2089		2256
2090	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2121		2288
2122	{	2289	{
2123	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2124		2291
2125	return unless $self->valid;	2292	return unless $self->valid;
2126	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2127
2128	$self->in_memory (cf::MAP_LOADING);
2129		2294
2130	$self->alloc;	2295	$self->alloc;
2131		2296
2132	$self->pre_load;	2297	$self->pre_load;
2133	cf::cede_to_tick;	2298	cf::cede_to_tick;
2134		2299
		2300	if (exists $self->{load_path}) {
2135	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2136	$f->skip_block;	2302	$f->skip_block;
2137	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2138	or return;	2304	or return;
2139		2305
2140	$self->post_load_original	2306	$self->post_load_original
2141	if delete $self->{load_original};	2307	if delete $self->{load_original};
2142		2308
2143	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2144	utf8::encode $uniq;	2310	utf8::encode $uniq;
2145	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2146	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2147	$self->clear_unique_items;	2313	$self->clear_unique_items;
2148	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2149	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2150	}	2317	}
2151	}	2318	}
2152	}
2153		2319
2154	$f->resolve_delayed_derefs;	2320	$f->resolve_delayed_derefs;
		2321	} else {
		2322	$self->post_load_original
		2323	if delete $self->{load_original};
		2324	}
		2325
		2326	$self->state (cf::MAP_INACTIVE);
2155		2327
2156	cf::cede_to_tick;	2328	cf::cede_to_tick;
2157	# now do the right thing for maps	2329	# now do the right thing for maps
2158	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2159	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2163	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2164	$self->decay_objects;	2336	$self->decay_objects;
2165	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2166	$self->update_buttons;	2338	$self->update_buttons;
2167	cf::cede_to_tick;	2339	cf::cede_to_tick;
2168	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2169	}	2341	}
2170		2342
2171	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2172	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2173
2174	$self->in_memory (cf::MAP_ACTIVE);
2175	}	2345	}
2176		2346
2177	$self->post_load;	2347	$self->post_load;
2178		2348
2179	1	2349	1
…		…
2192	# if $self->per_party;	2362	# if $self->per_party;
2193		2363
2194	$self	2364	$self
2195	}	2365	}
2196		2366
2197	# find and load all maps in the 3x3 area around a map
2198	sub load_neighbours {
2199	my ($map) = @_;
2200
2201	my @neigh; # diagonal neighbours
2202
2203	for (0 .. 3) {
2204	my $neigh = $map->tile_path ($_)
2205	or next;
2206	$neigh = find $neigh, $map
2207	or next;
2208	$neigh->load;
2209
2210	# now find the diagonal neighbours
2211	push @neigh,
2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2214	}
2215
2216	for (grep defined $_->[0], @neigh) {
2217	my ($path, $origin) = @$_;
2218	my $neigh = find $path, $origin
2219	or next;
2220	$neigh->load;
2221	}
2222	}
2223
2224	sub find_sync {	2367	sub find_sync {
2225	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2226		2369
		2370	# it's a bug to call this from the main context
2227	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2371	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2228	if $Coro::current == $Coro::main;	2372	if $Coro::current == $Coro::main;
2229		2373
2230	find $path, $origin	2374	find $path, $origin
2231	}	2375	}
2232		2376
2233	sub do_load_sync {	2377	sub do_load_sync {
2234	my ($map) = @_;	2378	my ($map) = @_;
2235		2379
		2380	# it's a bug to call this from the main context
2236	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2237	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2238		2383
2239	$map->load;	2384	$map->load;
2240	}	2385	}
…		…
2243	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2244		2389
2245	sub find_async {	2390	sub find_async {
2246	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2247		2392
2248	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2249		2394
2250	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2251	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2252	}	2397	}
2253		2398
2254	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2255		2400
2256	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2257	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2258		2403
2259	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2260	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2261	if (my $map = find $k) {	2406	if (my $map = find $k) {
2262	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2263	}	2408	}
2264		2409
2265	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2266	}	2411	}
2267	}	2412	}
…		…
2315	sub swap_out {	2460	sub swap_out {
2316	my ($self) = @_;	2461	my ($self) = @_;
2317		2462
2318	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2319		2464
2320	return if $self->in_memory != cf::MAP_ACTIVE;	2465	return if !$self->linkable;
2321	return if $self->{deny_save};	2466	return if $self->{deny_save};
2322	return if $self->players;	2467	return if $self->players;
2323		2468
2324	# first deactivate the map and "unlink" it from the core	2469	# first deactivate the map and "unlink" it from the core
2325	$self->deactivate;	2470	$self->deactivate;
2326	$_->clear_links_to ($self) for values %cf::MAP;	2471	$_->clear_links_to ($self) for values %cf::MAP;
2327	$self->in_memory (cf::MAP_SWAPPED);	2472	$self->state (cf::MAP_SWAPPED);
2328		2473
2329	# then atomically save	2474	# then atomically save
2330	$self->_save;	2475	$self->_save;
2331		2476
2332	# then free the map	2477	# then free the map
…		…
2358		2503
2359	return if $self->players;	2504	return if $self->players;
2360		2505
2361	cf::trace "resetting map ", $self->path, "\n";	2506	cf::trace "resetting map ", $self->path, "\n";
2362		2507
2363	$self->in_memory (cf::MAP_SWAPPED);	2508	$self->state (cf::MAP_SWAPPED);
2364		2509
2365	# need to save uniques path	2510	# need to save uniques path
2366	unless ($self->{deny_save}) {	2511	unless ($self->{deny_save}) {
2367	my $uniq = $self->uniq_path; utf8::encode $uniq;	2512	my $uniq = $self->uniq_path; utf8::encode $uniq;
2368		2513
…		…
2521		2666
2522	Creates and returns a persistent reference to an object that can be stored as a string.	2667	Creates and returns a persistent reference to an object that can be stored as a string.
2523		2668
2524	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2525		2670
2526	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2671	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2527	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2528		2673
2529	=cut	2674	=cut
2530		2675
2531	sub deref {	2676	sub deref {
…		…
2613	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2614		2759
2615	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2616	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2617		2762
		2763	This is implemented by checking a config setting of C<may_access> where
		2764	C<access> is replaced by the access string. The following alternatives are
		2765	possible (and are tested in order):
		2766
		2767	=over 4
		2768
		2769	=item * Player is DM
		2770
		2771	The request will succeed.
		2772
		2773	=item * may_access is an array reference
		2774
		2775	If either the player nickname or UUID is in the array, the request will
		2776	succeed, otherwise it will fail.
		2777
		2778	=item * may_access is a true value
		2779
		2780	The request will succeed.
		2781
		2782	=item * may_access is missing or false
		2783
		2784	The request will fail.
		2785
		2786	=back
		2787
2618	=cut	2788	=cut
2619		2789
2620	sub cf::object::player::may {	2790	sub cf::object::player::may {
2621	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2622		2792
2623	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2624	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2625	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2626	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2627	}	2797	}
2628		2798
2629	=item $player_object->enter_link	2799	=item $player_object->enter_link
2630		2800
…		…
2633	The player should be reasonably safe there for short amounts of time (e.g.	2803	The player should be reasonably safe there for short amounts of time (e.g.
2634	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2804	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2635	though, as the player cannot control the character while it is on the link	2805	though, as the player cannot control the character while it is on the link
2636	map.	2806	map.
2637		2807
2638	Will never block.	2808	This method will never block, which is the whole reaosn for it's
		2809	existance: you can I<always> put a player onto the link map, which is the
		2810	only place to put objects that is guaranteed to exist.
		2811
		2812	A typical usage pattern is to call C<enter_link> synchronously from the
		2813	server, then start a new thread, do your blocking stuff there and then
		2814	call C<leave_link> from that thread.
2639		2815
2640	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2641		2817
2642	Moves the player out of the special C<{link}> map onto the specified	2818	Moves the player out of the special C<{link}> map onto the specified
2643	map. If the map is not valid (or omitted), the player will be moved back	2819	map. If the map is not valid (or omitted), the player will be moved back
…		…
2698	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2699	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2700	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2701		2877
2702	$map->load;	2878	$map->load;
2703	$map->load_neighbours;
2704		2879
2705	return unless $self->contr->active;	2880	return unless $self->contr->active;
2706		2881
2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708	if ($self->enter_map ($map, $x, $y)) {	2883	if ($self->enter_map ($map, $x, $y)) {
…		…
2764	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2765	}	2940	}
2766	}	2941	}
2767		2942
2768	my $map = eval {	2943	my $map = eval {
2769	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770		2945
2771	if ($map) {	2946	if ($map) {
2772	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2773	$map = $check->($map, $x, $y, $self) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2774	} else {	2949	} else {
…		…
2864	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2865		3040
2866	unless (eval {	3041	unless (eval {
2867	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2868		3043
2869	# random map handling
2870	{
2871	my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873	prepare_random_map $exit
2874	if $exit->slaying eq "/!";
2875	}
2876
2877	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2878	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2879	my $y = $exit->stats->sp;	3046	my $y = $exit->stats->sp;
		3047
		3048	# special map handling
		3049	my $slaying = $exit->slaying;
		3050
		3051	# special map handling
		3052	if ($slaying eq "/!") {
		3053	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3054
		3055	prepare_random_map $exit
		3056	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3057
		3058	$map = $exit->slaying;
		3059
		3060	} elsif ($slaying eq '!up') {
		3061	$map = $exit->map->tile_path (cf::TILE_UP);
		3062	$x = $exit->x;
		3063	$y = $exit->y;
		3064
		3065	} elsif ($slaying eq '!down') {
		3066	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3067	$x = $exit->x;
		3068	$y = $exit->y;
		3069	}
2880		3070
2881	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2882		3072
2883	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2884	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2899		3089
2900	=head3 cf::client	3090	=head3 cf::client
2901		3091
2902	=over 4	3092	=over 4
2903		3093
2904	=item $client->send_drawinfo ($text, $flags)
2905
2906	Sends a drawinfo packet to the client. Circumvents output buffering so
2907	should not be used under normal circumstances.
2908
2909	=cut
2910
2911	sub cf::client::send_drawinfo {
2912	my ($self, $text, $flags) = @_;
2913
2914	utf8::encode $text;
2915	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2916	}
2917
2918	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2919		3095
2920	Like C<send_packet>, but tries to compress large packets, and fragments	3096	Like C<send_packet>, but tries to compress large packets, and fragments
2921	them as required.	3097	them as required.
2922		3098
…		…
2940	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2941	}	3117	}
2942		3118
2943	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2944		3120
2945	Send a drawinfo or msg packet to the client, formatting the msg for the	3121	Send a msg packet to the client, formatting the msg for the client if
2946	client if neccessary. C<$type> should be a string identifying the type of	3122	necessary. C<$type> should be a string identifying the type of the
2947	the message, with C<log> being the default. If C<$color> is negative, suppress	3123	message, with C<log> being the default. If C<$color> is negative, suppress
2948	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2949		3125
2950	=cut	3126	=cut
2951		3127
2952	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2995	},	3171	},
2996	"c/body" => {	3172	"c/body" => {
2997	id => "infobox",	3173	id => "infobox",
2998	title => "Body Parts",	3174	title => "Body Parts",
2999	reply => undef,	3175	reply => undef,
3000	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
3001	},	3177	},
3002	"c/statistics" => {	3178	"c/statistics" => {
3003	id => "infobox",	3179	id => "infobox",
3004	title => "Statistics",	3180	title => "Statistics",
3005	reply => undef,	3181	reply => undef,
…		…
3057	id => "death",	3233	id => "death",
3058	title => "Death",	3234	title => "Death",
3059	reply => undef,	3235	reply => undef,
3060	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
3061	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
3062	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
3063	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
3064	);	3246	);
3065		3247
3066	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3109	=cut	3291	=cut
3110		3292
3111	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3112	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3113		3295
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116	} elsif ($self->extcmd == 1) { # TODO: remove
3117	push @msg, msgtype => "event_$type";
3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119	}
3120	}
3121
3122	=item $client->ext_reply ($msgid, @msg)
3123
3124	Sends an ext reply to the client.
3125
3126	=cut
3127
3128	sub cf::client::ext_reply($$@) {
3129	my ($self, $id, @msg) = @_;
3130
3131	if ($self->extcmd == 2) {
3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133	} elsif ($self->extcmd == 1) {
3134	#TODO: version 1, remove
3135	unshift @msg, msgtype => "reply", msgid => $id;
3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137	}
3138	}	3297	}
3139		3298
3140	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3141		3300
3142	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3162		3321
3163	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3164	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3165		3324
3166	1	3325	1
		3326	}
		3327
		3328	=item $client->update_command_faces
		3329
		3330	=cut
		3331
		3332	our %COMMAND_FACE;
		3333
		3334	sub cf::client::update_command_faces {
		3335	my ($self) = @_;
		3336
		3337	my @faces = grep $_,
		3338	$COMMAND_FACE{preferred},
		3339	$COMMAND_FACE{standard},
		3340	$COMMAND_FACE{skill},
		3341	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3342	$COMMAND_FACE{emote},
		3343	;
		3344
		3345	$self->send_face ($_)
		3346	for @faces;
		3347	$self->flush_fx;
		3348
		3349	$self->ext_msg (command_list => @faces);
		3350	}
		3351
		3352	=item cf::client::set_command_face $type, $commands
		3353
		3354	=cut
		3355
		3356	sub cf::client::set_command_face {
		3357	my ($type, $list) = @_;
		3358
		3359	my $idx = &cf::face::set ( #d# ugly forward reference
		3360	"command_list/$type" => cf::FT_RSRC,
		3361	JSON::XS->new->utf8->encode ([ sort @$list ])
		3362	);
		3363
		3364	$COMMAND_FACE{$type} = $idx;
3167	}	3365	}
3168		3366
3169	cf::client->attach (	3367	cf::client->attach (
3170	on_connect => sub {	3368	on_connect => sub {
3171	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3197	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3198		3396
3199	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200		3398
3201	if (ref $msg) {	3399	if (ref $msg) {
3202	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203	"ARRAY" eq ref $msg
3204	? @$msg
3205	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206		3401
3207	my @reply;
3208
3209	if (my $cb = $EXTICMD{$type}) {	3402	if (my $cb = $EXTIACMD{$type}) {
		3403	$cb->(
		3404	$ns,
		3405	sub {
		3406	$ns->ext_msg ("reply-$reply", @_)
		3407	if $reply;
		3408	},
		3409	@payload
		3410	);
		3411	} else {
		3412	my @reply;
		3413
		3414	if (my $cb = $EXTICMD{$type}) {
3210	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3211	}	3420	}
3212
3213	$ns->ext_reply ($reply, @reply)
3214	if $reply;
3215
3216	} else {	3421	} else {
3217	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3422	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218	}	3423	}
3219		3424
3220	cf::override;	3425	cf::override;
…		…
3388	=cut	3593	=cut
3389		3594
3390	#############################################################################	3595	#############################################################################
3391	# the server's init and main functions	3596	# the server's init and main functions
3392		3597
		3598	{
		3599	package cf::face;
		3600
		3601	our %HASH; # hash => idx
		3602	our @DATA; # dynamically-created facedata, only faceste 0 used
		3603	our @FOFS; # file offset, if > 0
		3604	our @SIZE; # size of face, in octets
		3605	our @META; # meta hash of face, if any
		3606	our $DATAFH; # facedata filehandle
		3607
		3608	# internal api, not finalised
		3609	sub set {
		3610	my ($name, $type, $data) = @_;
		3611
		3612	my $idx = cf::face::find $name;
		3613
		3614	if ($idx) {
		3615	delete $HASH{cf::face::get_csum $idx};
		3616	} else {
		3617	$idx = cf::face::alloc $name;
		3618	}
		3619
		3620	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3621
		3622	cf::face::set_type $idx, $type;
		3623	cf::face::set_csum $idx, 0, $hash;
		3624
		3625	# we need to destroy the SV itself, not just modify it, as a running ix
		3626	# might hold a reference to it: "delete" achieves that.
		3627	delete $FOFS[0][$idx];
		3628	delete $DATA[0][$idx];
		3629	$DATA[0][$idx] = $data;
		3630	$SIZE[0][$idx] = length $data;
		3631	delete $META[$idx];
		3632	$HASH{$hash} = $idx;#d#
		3633
		3634	$idx
		3635	}
		3636
		3637	sub _get_data($$$) {
		3638	my ($idx, $set, $cb) = @_;
		3639
		3640	if (defined $DATA[$set][$idx]) {
		3641	$cb->($DATA[$set][$idx]);
		3642	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3643	my $size = $SIZE[$set][$idx];
		3644	my $buf;
		3645	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3646	if ($_[0] == $size) {
		3647	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3648	$cb->($buf);
		3649	} else {
		3650	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3651	}
		3652	};
		3653	} else {
		3654	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3655	}
		3656	}
		3657
		3658	# rather ineffient
		3659	sub cf::face::get_data($;$) {
		3660	my ($idx, $set) = @_;
		3661
		3662	_get_data $idx, $set, Coro::rouse_cb;
		3663	Coro::rouse_wait
		3664	}
		3665
		3666	sub cf::face::ix {
		3667	my ($ns, $set, $idx, $pri) = @_;
		3668
		3669	_get_data $idx, $set, sub {
		3670	$ns->ix_send ($idx, $pri, $_[0]);
		3671	};
		3672	}
		3673	}
		3674
3393	sub load_facedata($) {	3675	sub load_facedata($) {
3394	my ($path) = @_;	3676	my ($path) = @_;
3395		3677
3396	# HACK to clear player env face cache, we need some signal framework
3397	# for this (global event?)
3398	%ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401		3679
3402	trace "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3403		3681
3404	0 < aio_load $path, my $facedata	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3405	or die "$path: $!";
3406
3407	$facedata = Coro::Storable::thaw $facedata;
3408		3683
3409	$facedata->{version} == 2	3684	$facedata->{version} == 2
3410	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3411		3686
3412	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3414	$facedata->{resource}{"res/exp_table"} = {	3689
3415	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3416	data => $exp_table,	3691
3417	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3418	};	3693	# from here on, everything must be atomic - no thread switch allowed
3419	cf::cede_to_tick;	3694	my $t1 = EV::time;
3420		3695
3421	{	3696	{
3422	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3423		3698
3424	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3425	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3426		3702
3427	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3428	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3705	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3706	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3431	cf::face::set_data $idx, 2, "-", chr $idx & 255;	3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3432		3708	$cf::face::HASH{$info->{hash64}} = $idx;
3433	cf::cede_to_tick;	3709	delete $cf::face::META[$idx];
3434	}	3710	}
3435		3711
3436	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3437	next unless $info->{smooth};	3713	next unless $info->{smooth};
3438		3714
…		…
3443	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3444	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3445	} else {	3721	} else {
3446	error "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3447	}	3723	}
3448
3449	cf::cede_to_tick;
3450	}	3724	}
3451	}	3725	}
3452		3726
3453	{	3727	{
3454	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3455		3729
3456	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3457	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3458	cf::cede_to_tick;
3459	}	3732	}
3460		3733
3461	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3462	}	3735	}
3463		3736
3464	{	3737	{
3465	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3466		3739
3467	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3468	if (defined $info->{type}) {	3741	if (defined (my $type = $info->{type})) {
		3742	# TODO: different hash - must free and use new index, or cache ixface data queue
3469	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3470		3744
3471	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472	cf::face::set_type $idx, $info->{type};	3745	cf::face::set_type $idx, $type;
		3746	cf::face::set_csum $idx, 0, $info->{hash};
		3747	$cf::face::SIZE[0][$idx] = $info->{size};
		3748	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3749	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3750	$cf::face::HASH{$info->{hash}} = $idx;
3473	} else {	3751	} else {
3474	$RESOURCE{$name} = $info; # unused	3752	# $RESOURCE{$name} = $info; # unused
3475	}	3753	}
3476
3477	cf::cede_to_tick;
3478	}	3754	}
3479	}	3755	}
		3756
		3757	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3758
		3759	# HACK to clear player env face cache, we need some signal framework
		3760	# for this (global event?)
		3761	%ext::player_env::MUSIC_FACE_CACHE = ();
		3762
		3763	# END ATOMIC
		3764
		3765	cf::debug "facedata atomic update time ", EV::time - $t1;
3480		3766
3481	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3767	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3768
		3769	aio_close $fh if $fh; # close old facedata
3482		3770
3483	1	3771	1
3484	}	3772	}
3485		3773
3486	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
…		…
3497	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3498	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3499	cf::arch::commit_load;	3787	cf::arch::commit_load;
3500		3788
3501	$status	3789	$status
		3790	}
		3791
		3792	sub reload_exp_table {
		3793	_reload_exp_table;
		3794
		3795	cf::face::set
		3796	"res/exp_table" => FT_RSRC,
		3797	JSON::XS->new->utf8->canonical->encode (
		3798	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3799	);
		3800	}
		3801
		3802	sub reload_materials {
		3803	_reload_materials;
3502	}	3804	}
3503		3805
3504	sub reload_regions {	3806	sub reload_regions {
3505	# HACK to clear player env face cache, we need some signal framework	3807	# HACK to clear player env face cache, we need some signal framework
3506	# for this (global event?)	3808	# for this (global event?)
…		…
3514	if exists $_->{match};	3816	if exists $_->{match};
3515	}	3817	}
3516	}	3818	}
3517		3819
3518	sub reload_facedata {	3820	sub reload_facedata {
3519	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3520	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3521	}	3823	}
3522		3824
3523	sub reload_archetypes {	3825	sub reload_archetypes {
3524	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3525	or die "unable to load archetypes\n";	3827	or die "unable to load archetypes\n";
		3828
		3829	cf::face::set
		3830	"res/skill_info" => FT_RSRC,
		3831	JSON::XS->new->utf8->canonical->encode (
		3832	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3833	);
		3834
		3835	cf::face::set
		3836	"res/spell_paths" => FT_RSRC,
		3837	JSON::XS->new->utf8->canonical->encode (
		3838	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3839	);
		3840
		3841	# command completion
		3842	my @commands;
		3843
		3844	for (0..cf::arch::skillvec_size - 1) {
		3845	my $skill = cf::arch::skillvec $_;
		3846	my $name = $skill->name;
		3847	my $flags = cf::skill_flags $skill->subtype;
		3848
		3849	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3850	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3851	}
		3852
		3853	cf::client::set_command_face skill => \@commands;
3526	}	3854	}
3527		3855
3528	sub reload_treasures {	3856	sub reload_treasures {
3529	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3530	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3531	}	3859	}
3532		3860
3533	sub reload_sound {	3861	sub reload_sound {
3534	trace "loading sound config from $DATADIR/sound\n";	3862	trace "loading sound config from $DATADIR/sound\n";
3535		3863
3536	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537	or die "$DATADIR/sound $!";
3538
3539	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3864	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540		3865
3541	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3866	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542	my $sound = $soundconf->{compat}[$_]	3867	my $sound = $soundconf->{compat}[$_]
3543	or next;	3868	or next;
3544		3869
…		…
3554	}	3879	}
3555		3880
3556	sub reload_resources {	3881	sub reload_resources {
3557	trace "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3558		3883
3559	reload_exp_table;
3560	reload_materials;	3884	reload_materials;
3561	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
3562	reload_sound;	3887	reload_sound;
3563	reload_archetypes;	3888	reload_archetypes;
3564	reload_regions;	3889	reload_regions;
3565	reload_treasures;	3890	reload_treasures;
3566		3891
…		…
3568	}	3893	}
3569		3894
3570	sub reload_config {	3895	sub reload_config {
3571	trace "reloading config file...\n";	3896	trace "reloading config file...\n";
3572		3897
3573	0 < aio_load "$CONFDIR/config", my $config	3898	my $config = load_file "$CONFDIR/config";
3574	or die "$CONFDIR/config: $!";
3575
3576	utf8::decode $config;	3899	utf8::decode $config;
3577	*CFG = yaml_load $config;	3900	*CFG = decode_yaml $config;
3578		3901
3579	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3580		3903
3581	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3904	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3905	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3608	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3609	print $fh $$;	3932	print $fh $$;
3610	}	3933	}
3611		3934
3612	sub main_loop {	3935	sub main_loop {
3613	trace "EV::loop starting\n";	3936	trace "EV::run starting\n";
3614	if (1) {	3937	if (1) {
3615	EV::loop;	3938	EV::run;
3616	}	3939	}
3617	trace "EV::loop returned\n";	3940	trace "EV::run returned\n";
3618	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3619	}	3942	}
3620		3943
3621	sub main {	3944	sub main {
3622	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3623		3946
3624	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3947	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3948	LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3625	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3949	LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628		3952
3629	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3953	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630		3954
3631	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3632	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3633	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3957	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3634	(async {	3958	(async {
3635	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3636	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3637	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3638	};	3962	};
3639		3963
3640	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3641		3965
3642	cf::sync_job {	3966	cf::sync_job {
3643	cf::incloader::init ();	3967	cf::incloader::init ();
		3968
		3969	db_init;
3644		3970
3645	cf::init_anim;	3971	cf::init_anim;
3646	cf::init_attackmess;	3972	cf::init_attackmess;
3647	cf::init_dynamic;	3973	cf::init_dynamic;
3648		3974
3649	cf::load_settings;	3975	cf::load_settings;
3650		3976
3651	reload_resources;	3977	reload_resources;
3652	reload_config;	3978	reload_config;
3653	db_init;
3654		3979
3655	cf::init_uuid;	3980	cf::init_uuid;
3656	cf::init_signals;	3981	cf::init_signals;
3657	cf::init_skills;	3982	cf::init_skills;
3658		3983
…		…
3672	};	3997	};
3673		3998
3674	cf::object::thawer::errors_are_fatal 0;	3999	cf::object::thawer::errors_are_fatal 0;
3675	info "parse errors in files are no longer fatal from this point on.\n";	4000	info "parse errors in files are no longer fatal from this point on.\n";
3676		4001
3677	my $free_main; $free_main = EV::idle sub {	4002	AE::postpone {
3678	undef $free_main;
3679	undef &main; # free gobs of memory :)	4003	undef &main; # free gobs of memory :)
3680	};	4004	};
3681		4005
3682	goto &main_loop;	4006	goto &main_loop;
3683	}	4007	}
…		…
3840		4164
3841	cf::write_runtime_sync; # external watchdog should not bark	4165	cf::write_runtime_sync; # external watchdog should not bark
3842		4166
3843	trace "emergency_perl_save: flushing outstanding aio requests";	4167	trace "emergency_perl_save: flushing outstanding aio requests";
3844	while (IO::AIO::nreqs || BDB::nreqs) {	4168	while (IO::AIO::nreqs || BDB::nreqs) {
3845	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4169	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3846	}	4170	}
3847		4171
3848	cf::write_runtime_sync; # external watchdog should not bark	4172	cf::write_runtime_sync; # external watchdog should not bark
3849	};	4173	};
3850		4174
…		…
4031		4355
4032	#############################################################################	4356	#############################################################################
4033		4357
4034	my $bug_warning = 0;	4358	my $bug_warning = 0;
4035		4359
4036	our @WAIT_FOR_TICK;
4037	our @WAIT_FOR_TICK_BEGIN;
4038
4039	sub wait_for_tick() {	4360	sub wait_for_tick() {
4040	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4041		4362
4042	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
4043	push @WAIT_FOR_TICK, $signal;
4044	$signal->wait;
4045	}	4364	}
4046		4365
4047	sub wait_for_tick_begin() {	4366	sub wait_for_tick_begin() {
4048	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4049		4368
4050	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
4051	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
4052	$signal->wait;	4371	$signal->wait;
4053	}	4372	}
…		…
4057	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4376	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4058	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
4059	return;	4378	return;
4060	}	4379	}
4061		4380
4062	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
4063		4382
4064	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4383	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065		4384
4066	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4386	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4073	}	4392	}
4074		4393
4075	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076	$sig->send;	4395	$sig->send;
4077	}	4396	}
4078	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
4079	$sig->send;
4080	}
4081		4398
4082	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
4083	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084		4401
4085	if (0) {	4402	if (0) {
…		…
4091	}	4408	}
4092	}	4409	}
4093		4410
4094	{	4411	{
4095	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
4096		4414
4097	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
4098	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
4099	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
4100		4418
4101	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
4102	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
4103	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4104	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4422	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4129	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130	};	4448	};
4131	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133	};	4451	};
		4452
		4453	info "database initialised";
4134	}	4454	}
4135		4455
4136	{	4456	{
4137	# configure IO::AIO	4457	# configure IO::AIO
4138		4458
		4459	info "initialising aio";
4139	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4140	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4141	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4142	}	4464	}
4143		4465
4144	our $_log_backtrace;	4466	our $_log_backtrace;
4145	our $_log_backtrace_last;	4467	our $_log_backtrace_last;
4146		4468

Diff Legend

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