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

Diff Legend

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