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.559 by root, Sat Feb 26 12:50:27 2011 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;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	115	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	116	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	117	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	118	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		119
113	our %RESOURCE; # unused	120	#our %RESOURCE; # unused
114		121
115	our $OUTPUT_RATE_MIN = 3000;	122	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	123	our $OUTPUT_RATE_MAX = 1000000;
117		124
118	our $MAX_LINKS = 32; # how many chained exits to follow	125	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	136	our $DB_ENV;
130		137
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		139
133	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		142
135	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
136	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
137	our $NOW;	146	our $NOW;
138		147
139	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		159
151	our @POST_INIT;	160	our @POST_INIT;
152		161
153	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)
154	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;
155		167
156	binmode STDOUT;	168	binmode STDOUT;
157	binmode STDERR;	169	binmode STDERR;
158		170
159	# read virtual server time, if available	171	# read virtual server time, if available
…		…
193		205
194	=over 4	206	=over 4
195		207
196	=item $cf::UPTIME	208	=item $cf::UPTIME
197		209
198	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.
199		226
200	=item $cf::RUNTIME	227	=item $cf::RUNTIME
201		228
202	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
203	every server tick.	230	every server tick.
204		231
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		235
209	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
212	database environment.	239	database environment.
213		240
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	241	=item $cf::LOADAVG
223		242
224	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
225	(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
226	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
234	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
235	from wherever your confdir points to.	254	from wherever your confdir points to.
236		255
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		257
239	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.
240	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
241	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.
242		274
243	=cut	275	=cut
244		276
245	sub wait_for_tick();	277	sub wait_for_tick();
246	sub wait_for_tick_begin();	278	sub wait_for_tick_begin();
…		…
312	)) {	344	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	346	}
315		347
316	$EV::DIED = sub {	348	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
318	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
319		356
320	#############################################################################	357	#############################################################################
321		358
322	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
323		360
…		…
344	$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;
345	$d	382	$d
346	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
347	}	384	}
348		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
349	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
350		439
351	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
352		441
353	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
359	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
360		449
361	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
362	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
363		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
364	=item $ref = cf::yaml_load $scalar	461	=item $ref = cf::decode_yaml $scalar
365		462
366	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).
367		464
368	=cut	465	=cut
369		466
370	sub fork_call(&@);	467	sub decode_yaml($) {
371
372	sub yaml_load($) {
373	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]
374	}	496	}
375		497
376	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
377		499
378	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,
…		…
404	}	526	}
405	}	527	}
406		528
407	=item cf::lock_wait $string	529	=item cf::lock_wait $string
408		530
409	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
410		532
411	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
412		534
413	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
414	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,
…		…
462	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
463	}	585	}
464		586
465	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
466		588
467	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	Allocate $time seconds of blocking CPU time at priority C<$priority>
468	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
469	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.
470		596
471	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
472	used for statistical purposes and should identify the same time-class.	598	used for statistical purposes and should identify the same time-class.
473		599
474	Useful for short background jobs.	600	Useful for short background jobs.
…		…
486	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
487	my $busy;	613	my $busy;
488		614
489	while () {	615	while () {
490	next_job:	616	next_job:
		617
		618	Coro::cede;
491		619
492	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
493		621
494	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
495	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
496	$busy = 0;	624	$busy = 0;
497	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
498	$job->[2]->send;	626	$job->[2]->send;
499	Coro::cede;
500	goto next_job;	627	goto next_job;
501	} else {	628	} else {
502	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
503	}	630	}
504	}	631	}
505		632
506	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
507	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
508	push @cf::WAIT_FOR_TICK, $signal;
509	$signal->wait;
510	} else {	635	} else {
511	$busy = 0;	636	$busy = 0;
512	Coro::schedule;	637	Coro::schedule;
513	}	638	}
514	}	639	}
…		…
540	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
541		666
542	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
543		668
544	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
545	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
546	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
547	acceptable.	672	acceptable.
548		673
549	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
550	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
…		…
578		703
579	while ($busy) {	704	while ($busy) {
580	if (Coro::nready) {	705	if (Coro::nready) {
581	Coro::cede_notself;	706	Coro::cede_notself;
582	} else {	707	} else {
583	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
584	}	709	}
585	}	710	}
586		711
587	my $time = AE::time - $time;	712	my $time = AE::time - $time;
588		713
…		…
629	reset_signals;	754	reset_signals;
630	}	755	}
631		756
632	sub fork_call(&@) {	757	sub fork_call(&@) {
633	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
634
635	# we seemingly have to make a local copy of the whole thing,
636	# otherwise perl prematurely frees the stuff :/
637	# TODO: investigate and fix (likely this will be rather laborious)
638		759
639	my @res = Coro::Util::fork_eval {	760	my @res = Coro::Util::fork_eval {
640	cf::post_fork;	761	cf::post_fork;
641	&$cb	762	&$cb
642	} @args;	763	} @args;
…		…
769		890
770	my @data;	891	my @data;
771	my $md5;	892	my $md5;
772		893
773	for (0 .. $#$src) {	894	for (0 .. $#$src) {
774	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
775	or Carp::croak "$src->[$_]: $!";
776	}	896	}
777		897
778	# if processing is expensive, check	898	# if processing is expensive, check
779	# checksum first	899	# checksum first
780	if (1) {	900	if (1) {
…		…
793		913
794	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
795	}	915	}
796	}	916	}
797		917
798	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
799	my $data = $process->(\@data);	919	my $data = $process->(\@data);
800	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
801		921
802	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
803		923
804	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
805	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
…		…
1325	=cut	1445	=cut
1326		1446
1327	#############################################################################	1447	#############################################################################
1328	# command handling &c	1448	# command handling &c
1329		1449
1330	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1331		1451
1332	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
1333	$name.	1453	$name.
1334		1454
1335	=cut	1455	=cut
…		…
1341	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1342		1462
1343	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1344	}	1464	}
1345		1465
1346	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1347		1467
1348	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1349	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
1350	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
1351	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
1352	has logged in successfully.	1472	has logged in successfully.
1353		1473
1354	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1355	called.
1356		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
1357	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1358		1482
1359	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1360	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
1361	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
1362	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
1363	log-in.	1487	log-in.
1364		1488
1365	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1366	called.
1367		1490
1368	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1369		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
1370	sub register_extcmd {	1498	sub register_extcmd($$) {
1371	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1372		1500
1373	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1374	}	1502	}
1375		1503
1376	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1377	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1378		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1379	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1380	}	1520	}
1381		1521
1382	use File::Glob ();	1522	use File::Glob ();
1383		1523
1384	cf::player->attach (	1524	cf::player->attach (
…		…
1398	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1399		1539
1400	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1401		1541
1402	if (ref $msg) {	1542	if (ref $msg) {
1403	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1404	"ARRAY" eq ref $msg
1405	? @$msg
1406	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1407		1544
1408	my @reply;
1409
1410	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}) {
1411	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1412	}	1563	}
1413
1414	$pl->ext_reply ($reply, @reply)
1415	if $reply;
1416		1564
1417	} else {	1565	} else {
1418	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1419	}	1567	}
1420		1568
…		…
1433	};	1581	};
1434		1582
1435	$grp	1583	$grp
1436	}	1584	}
1437		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
1438	sub load_extensions {	1597	sub load_extensions {
1439	info "loading extensions...";	1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
1440		1601
1441	cf::sync_job {	1602	cf::sync_job {
1442	my %todo;	1603	my %todo;
1443		1604
1444	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
…		…
1487	unless exists $done{$_};	1648	unless exists $done{$_};
1488	}	1649	}
1489		1650
1490	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1491		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
1492	my $active = eval $v->{source};	1662	my $active = eval $source;
1493		1663
1494	if (length $@) {	1664	if (length $@) {
1495	error "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1496		1666
1497	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1514		1684
1515	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1516	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1517	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1518	}	1688	}
		1689
		1690	last;
1519	}	1691	}
1520	}	1692	}
1521	};	1693	};
1522	}	1694	}
1523		1695
…		…
1782	}	1954	}
1783		1955
1784	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1785		1957
1786	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1787
1788	=item $player->ext_reply ($msgid, @msg)
1789
1790	Sends an ext reply to the player.
1791
1792	=cut
1793
1794	sub ext_reply($$@) {
1795	my ($self, $id, @msg) = @_;
1796
1797	$self->ns->ext_reply ($id, @msg)
1798	}
1799		1959
1800	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1801		1961
1802	Sends an ext event to the client.	1962	Sends an ext event to the client.
1803		1963
…		…
1951		2111
1952	Carp::cluck "unable to resolve path '$path' (base '$base')";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1953	()	2113	()
1954	}	2114	}
1955		2115
		2116	# may re-bless or do other evil things
1956	sub init {	2117	sub init {
1957	my ($self) = @_;	2118	my ($self) = @_;
1958		2119
1959	$self	2120	$self
1960	}	2121	}
…		…
2025	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
2026		2187
2027	1	2188	1
2028	}	2189	}
2029		2190
		2191	# used to laod the header of an original map
2030	sub load_header_orig {	2192	sub load_header_orig {
2031	my ($self) = @_;	2193	my ($self) = @_;
2032		2194
2033	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
2034	}	2196	}
2035		2197
		2198	# used to laod the header of an instantiated map
2036	sub load_header_temp {	2199	sub load_header_temp {
2037	my ($self) = @_;	2200	my ($self) = @_;
2038		2201
2039	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
2040	}	2203	}
2041		2204
		2205	# called after loading the header from an instantiated map
2042	sub prepare_temp {	2206	sub prepare_temp {
2043	my ($self) = @_;	2207	my ($self) = @_;
2044		2208
2045	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
2046	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
2047	# safety	2211	# safety
2048	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
2049	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
2050	}	2214	}
2051		2215
		2216	# called after loading the header from an original map
2052	sub prepare_orig {	2217	sub prepare_orig {
2053	my ($self) = @_;	2218	my ($self) = @_;
2054		2219
2055	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
2056	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2082	sub find {	2247	sub find {
2083	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2084		2249
2085	cf::cede_to_tick;	2250	cf::cede_to_tick;
2086		2251
2087	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2088		2253
2089	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2090	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2091		2256
2092	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2123		2288
2124	{	2289	{
2125	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2126		2291
2127	return unless $self->valid;	2292	return unless $self->valid;
2128	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2129
2130	$self->in_memory (cf::MAP_LOADING);
2131		2294
2132	$self->alloc;	2295	$self->alloc;
2133		2296
2134	$self->pre_load;	2297	$self->pre_load;
2135	cf::cede_to_tick;	2298	cf::cede_to_tick;
2136		2299
		2300	if (exists $self->{load_path}) {
2137	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2138	$f->skip_block;	2302	$f->skip_block;
2139	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2140	or return;	2304	or return;
2141		2305
2142	$self->post_load_original	2306	$self->post_load_original
2143	if delete $self->{load_original};	2307	if delete $self->{load_original};
2144		2308
2145	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2146	utf8::encode $uniq;	2310	utf8::encode $uniq;
2147	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2148	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2149	$self->clear_unique_items;	2313	$self->clear_unique_items;
2150	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2151	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2152	}	2317	}
2153	}	2318	}
2154	}
2155		2319
2156	$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);
2157		2327
2158	cf::cede_to_tick;	2328	cf::cede_to_tick;
2159	# now do the right thing for maps	2329	# now do the right thing for maps
2160	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2161	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2165	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2166	$self->decay_objects;	2336	$self->decay_objects;
2167	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2168	$self->update_buttons;	2338	$self->update_buttons;
2169	cf::cede_to_tick;	2339	cf::cede_to_tick;
2170	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2171	}	2341	}
2172		2342
2173	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2174	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2175
2176	$self->in_memory (cf::MAP_ACTIVE);
2177	}	2345	}
2178		2346
2179	$self->post_load;	2347	$self->post_load;
2180		2348
2181	1	2349	1
…		…
2194	# if $self->per_party;	2362	# if $self->per_party;
2195		2363
2196	$self	2364	$self
2197	}	2365	}
2198		2366
2199	# find and load all maps in the 3x3 area around a map
2200	sub load_neighbours {
2201	my ($map) = @_;
2202
2203	my @neigh; # diagonal neighbours
2204
2205	for (0 .. 3) {
2206	my $neigh = $map->tile_path ($_)
2207	or next;
2208	$neigh = find $neigh, $map
2209	or next;
2210	$neigh->load;
2211
2212	# now find the diagonal neighbours
2213	push @neigh,
2214	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2215	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2216	}
2217
2218	for (grep defined $_->[0], @neigh) {
2219	my ($path, $origin) = @$_;
2220	my $neigh = find $path, $origin
2221	or next;
2222	$neigh->load;
2223	}
2224	}
2225
2226	sub find_sync {	2367	sub find_sync {
2227	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2228		2369
		2370	# it's a bug to call this from the main context
2229	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2371	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2230	if $Coro::current == $Coro::main;	2372	if $Coro::current == $Coro::main;
2231		2373
2232	find $path, $origin	2374	find $path, $origin
2233	}	2375	}
2234		2376
2235	sub do_load_sync {	2377	sub do_load_sync {
2236	my ($map) = @_;	2378	my ($map) = @_;
2237		2379
		2380	# it's a bug to call this from the main context
2238	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2239	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2240		2383
2241	$map->load;	2384	$map->load;
2242	}	2385	}
…		…
2245	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2246		2389
2247	sub find_async {	2390	sub find_async {
2248	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2249		2392
2250	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2251		2394
2252	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2253	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2254	}	2397	}
2255		2398
2256	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2257		2400
2258	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2259	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2260		2403
2261	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2262	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2263	if (my $map = find $k) {	2406	if (my $map = find $k) {
2264	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2265	}	2408	}
2266		2409
2267	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2268	}	2411	}
2269	}	2412	}
…		…
2317	sub swap_out {	2460	sub swap_out {
2318	my ($self) = @_;	2461	my ($self) = @_;
2319		2462
2320	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2321		2464
2322	return if $self->in_memory != cf::MAP_ACTIVE;	2465	return if !$self->linkable;
2323	return if $self->{deny_save};	2466	return if $self->{deny_save};
2324	return if $self->players;	2467	return if $self->players;
2325		2468
2326	# first deactivate the map and "unlink" it from the core	2469	# first deactivate the map and "unlink" it from the core
2327	$self->deactivate;	2470	$self->deactivate;
2328	$_->clear_links_to ($self) for values %cf::MAP;	2471	$_->clear_links_to ($self) for values %cf::MAP;
2329	$self->in_memory (cf::MAP_SWAPPED);	2472	$self->state (cf::MAP_SWAPPED);
2330		2473
2331	# then atomically save	2474	# then atomically save
2332	$self->_save;	2475	$self->_save;
2333		2476
2334	# then free the map	2477	# then free the map
…		…
2360		2503
2361	return if $self->players;	2504	return if $self->players;
2362		2505
2363	cf::trace "resetting map ", $self->path, "\n";	2506	cf::trace "resetting map ", $self->path, "\n";
2364		2507
2365	$self->in_memory (cf::MAP_SWAPPED);	2508	$self->state (cf::MAP_SWAPPED);
2366		2509
2367	# need to save uniques path	2510	# need to save uniques path
2368	unless ($self->{deny_save}) {	2511	unless ($self->{deny_save}) {
2369	my $uniq = $self->uniq_path; utf8::encode $uniq;	2512	my $uniq = $self->uniq_path; utf8::encode $uniq;
2370		2513
…		…
2523		2666
2524	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.
2525		2668
2526	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2527		2670
2528	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,
2529	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2530		2673
2531	=cut	2674	=cut
2532		2675
2533	sub deref {	2676	sub deref {
…		…
2615	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2616		2759
2617	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2618	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2619		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
2620	=cut	2788	=cut
2621		2789
2622	sub cf::object::player::may {	2790	sub cf::object::player::may {
2623	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2624		2792
2625	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2626	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2627	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2628	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2629	}	2797	}
2630		2798
2631	=item $player_object->enter_link	2799	=item $player_object->enter_link
2632		2800
…		…
2635	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.
2636	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,
2637	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
2638	map.	2806	map.
2639		2807
2640	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.
2641		2815
2642	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2643		2817
2644	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
2645	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
…		…
2700	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2701	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2702	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2703		2877
2704	$map->load;	2878	$map->load;
2705	$map->load_neighbours;
2706		2879
2707	return unless $self->contr->active;	2880	return unless $self->contr->active;
2708		2881
2709	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2710	if ($self->enter_map ($map, $x, $y)) {	2883	if ($self->enter_map ($map, $x, $y)) {
…		…
2766	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2767	}	2940	}
2768	}	2941	}
2769		2942
2770	my $map = eval {	2943	my $map = eval {
2771	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2772		2945
2773	if ($map) {	2946	if ($map) {
2774	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2775	$map = $check->($map, $x, $y, $self) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2776	} else {	2949	} else {
…		…
2866	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2867		3040
2868	unless (eval {	3041	unless (eval {
2869	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2870		3043
2871	# random map handling
2872	{
2873	my $guard = cf::lock_acquire "exit_prepare:$exit";
2874
2875	prepare_random_map $exit
2876	if $exit->slaying eq "/!";
2877	}
2878
2879	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2880	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2881	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	}
2882		3070
2883	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2884		3072
2885	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2886	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2901		3089
2902	=head3 cf::client	3090	=head3 cf::client
2903		3091
2904	=over 4	3092	=over 4
2905		3093
2906	=item $client->send_drawinfo ($text, $flags)
2907
2908	Sends a drawinfo packet to the client. Circumvents output buffering so
2909	should not be used under normal circumstances.
2910
2911	=cut
2912
2913	sub cf::client::send_drawinfo {
2914	my ($self, $text, $flags) = @_;
2915
2916	utf8::encode $text;
2917	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2918	}
2919
2920	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2921		3095
2922	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
2923	them as required.	3097	them as required.
2924		3098
…		…
2942	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2943	}	3117	}
2944		3118
2945	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2946		3120
2947	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
2948	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
2949	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
2950	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2951		3125
2952	=cut	3126	=cut
2953		3127
2954	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2997	},	3171	},
2998	"c/body" => {	3172	"c/body" => {
2999	id => "infobox",	3173	id => "infobox",
3000	title => "Body Parts",	3174	title => "Body Parts",
3001	reply => undef,	3175	reply => undef,
3002	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
3003	},	3177	},
3004	"c/statistics" => {	3178	"c/statistics" => {
3005	id => "infobox",	3179	id => "infobox",
3006	title => "Statistics",	3180	title => "Statistics",
3007	reply => undef,	3181	reply => undef,
…		…
3059	id => "death",	3233	id => "death",
3060	title => "Death",	3234	title => "Death",
3061	reply => undef,	3235	reply => undef,
3062	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
3063	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
3064	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
3065	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
3066	);	3246	);
3067		3247
3068	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3111	=cut	3291	=cut
3112		3292
3113	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3114	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3115		3295
3116	if ($self->extcmd == 2) {
3117	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3118	} elsif ($self->extcmd == 1) { # TODO: remove
3119	push @msg, msgtype => "event_$type";
3120	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3121	}
3122	}
3123
3124	=item $client->ext_reply ($msgid, @msg)
3125
3126	Sends an ext reply to the client.
3127
3128	=cut
3129
3130	sub cf::client::ext_reply($$@) {
3131	my ($self, $id, @msg) = @_;
3132
3133	if ($self->extcmd == 2) {
3134	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3135	} elsif ($self->extcmd == 1) {
3136	#TODO: version 1, remove
3137	unshift @msg, msgtype => "reply", msgid => $id;
3138	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3139	}
3140	}	3297	}
3141		3298
3142	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3143		3300
3144	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3164		3321
3165	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3166	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3167		3324
3168	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;
3169	}	3365	}
3170		3366
3171	cf::client->attach (	3367	cf::client->attach (
3172	on_connect => sub {	3368	on_connect => sub {
3173	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3199	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3200		3396
3201	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3202		3398
3203	if (ref $msg) {	3399	if (ref $msg) {
3204	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3205	"ARRAY" eq ref $msg
3206	? @$msg
3207	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3208		3401
3209	my @reply;
3210
3211	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}) {
3212	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3213	}	3420	}
3214
3215	$ns->ext_reply ($reply, @reply)
3216	if $reply;
3217
3218	} else {	3421	} else {
3219	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";
3220	}	3423	}
3221		3424
3222	cf::override;	3425	cf::override;
…		…
3390	=cut	3593	=cut
3391		3594
3392	#############################################################################	3595	#############################################################################
3393	# the server's init and main functions	3596	# the server's init and main functions
3394		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
3395	sub load_facedata($) {	3675	sub load_facedata($) {
3396	my ($path) = @_;	3676	my ($path) = @_;
3397		3677
3398	# HACK to clear player env face cache, we need some signal framework
3399	# for this (global event?)
3400	%ext::player_env::MUSIC_FACE_CACHE = ();
3401
3402	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3403		3679
3404	trace "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3405		3681
3406	0 < aio_load $path, my $facedata	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3407	or die "$path: $!";
3408
3409	$facedata = Coro::Storable::thaw $facedata;
3410		3683
3411	$facedata->{version} == 2	3684	$facedata->{version} == 2
3412	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3413		3686
3414	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3415	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3416	$facedata->{resource}{"res/exp_table"} = {	3689
3417	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3418	data => $exp_table,	3691
3419	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3420	};	3693	# from here on, everything must be atomic - no thread switch allowed
3421	cf::cede_to_tick;	3694	my $t1 = EV::time;
3422		3695
3423	{	3696	{
3424	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3425		3698
3426	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3427	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3428		3702
3429	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3430	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3431	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};
3432	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};
3433	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3434		3708	$cf::face::HASH{$info->{hash64}} = $idx;
3435	cf::cede_to_tick;	3709	delete $cf::face::META[$idx];
3436	}	3710	}
3437		3711
3438	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3439	next unless $info->{smooth};	3713	next unless $info->{smooth};
3440		3714
…		…
3445	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3446	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3447	} else {	3721	} else {
3448	error "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3449	}	3723	}
3450
3451	cf::cede_to_tick;
3452	}	3724	}
3453	}	3725	}
3454		3726
3455	{	3727	{
3456	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3457		3729
3458	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3459	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3460	cf::cede_to_tick;
3461	}	3732	}
3462		3733
3463	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3464	}	3735	}
3465		3736
3466	{	3737	{
3467	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3468		3739
3469	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3470	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
3471	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3472		3744
3473	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3474	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;
3475	} else {	3751	} else {
3476	$RESOURCE{$name} = $info; # unused	3752	# $RESOURCE{$name} = $info; # unused
3477	}	3753	}
3478
3479	cf::cede_to_tick;
3480	}	3754	}
3481	}	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;
3482		3766
3483	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
3484		3770
3485	1	3771	1
3486	}	3772	}
3487		3773
3488	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
…		…
3499	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3500	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3501	cf::arch::commit_load;	3787	cf::arch::commit_load;
3502		3788
3503	$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;
3504	}	3804	}
3505		3805
3506	sub reload_regions {	3806	sub reload_regions {
3507	# 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
3508	# for this (global event?)	3808	# for this (global event?)
…		…
3516	if exists $_->{match};	3816	if exists $_->{match};
3517	}	3817	}
3518	}	3818	}
3519		3819
3520	sub reload_facedata {	3820	sub reload_facedata {
3521	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3522	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3523	}	3823	}
3524		3824
3525	sub reload_archetypes {	3825	sub reload_archetypes {
3526	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3527	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;
3528	}	3854	}
3529		3855
3530	sub reload_treasures {	3856	sub reload_treasures {
3531	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3532	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3533	}	3859	}
3534		3860
3535	sub reload_sound {	3861	sub reload_sound {
3536	trace "loading sound config from $DATADIR/sound\n";	3862	trace "loading sound config from $DATADIR/sound\n";
3537		3863
3538	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3539	or die "$DATADIR/sound $!";
3540
3541	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3864	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3542		3865
3543	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3866	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3544	my $sound = $soundconf->{compat}[$_]	3867	my $sound = $soundconf->{compat}[$_]
3545	or next;	3868	or next;
3546		3869
…		…
3556	}	3879	}
3557		3880
3558	sub reload_resources {	3881	sub reload_resources {
3559	trace "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3560		3883
3561	reload_exp_table;
3562	reload_materials;	3884	reload_materials;
3563	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
3564	reload_sound;	3887	reload_sound;
3565	reload_archetypes;	3888	reload_archetypes;
3566	reload_regions;	3889	reload_regions;
3567	reload_treasures;	3890	reload_treasures;
3568		3891
…		…
3570	}	3893	}
3571		3894
3572	sub reload_config {	3895	sub reload_config {
3573	trace "reloading config file...\n";	3896	trace "reloading config file...\n";
3574		3897
3575	0 < aio_load "$CONFDIR/config", my $config	3898	my $config = load_file "$CONFDIR/config";
3576	or die "$CONFDIR/config: $!";
3577
3578	utf8::decode $config;	3899	utf8::decode $config;
3579	*CFG = yaml_load $config;	3900	*CFG = decode_yaml $config;
3580		3901
3581	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3582		3903
3583	$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};
3584	$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};
…		…
3610	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3611	print $fh $$;	3932	print $fh $$;
3612	}	3933	}
3613		3934
3614	sub main_loop {	3935	sub main_loop {
3615	trace "EV::loop starting\n";	3936	trace "EV::run starting\n";
3616	if (1) {	3937	if (1) {
3617	EV::loop;	3938	EV::run;
3618	}	3939	}
3619	trace "EV::loop returned\n";	3940	trace "EV::run returned\n";
3620	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3621	}	3942	}
3622		3943
3623	sub main {	3944	sub main {
3624	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3625		3946
3626	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.";
3627	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.";
3628	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3629	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3630		3952
3631	$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
3632		3954
3633	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3634	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3635	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#
3636	(async {	3958	(async {
3637	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3638	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3639	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3640	};	3962	};
3641		3963
3642	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3643		3965
3644	cf::sync_job {	3966	cf::sync_job {
3645	cf::incloader::init ();	3967	cf::incloader::init ();
		3968
		3969	db_init;
3646		3970
3647	cf::init_anim;	3971	cf::init_anim;
3648	cf::init_attackmess;	3972	cf::init_attackmess;
3649	cf::init_dynamic;	3973	cf::init_dynamic;
3650		3974
3651	cf::load_settings;	3975	cf::load_settings;
3652		3976
3653	reload_resources;	3977	reload_resources;
3654	reload_config;	3978	reload_config;
3655	db_init;
3656		3979
3657	cf::init_uuid;	3980	cf::init_uuid;
3658	cf::init_signals;	3981	cf::init_signals;
3659	cf::init_skills;	3982	cf::init_skills;
3660		3983
…		…
3674	};	3997	};
3675		3998
3676	cf::object::thawer::errors_are_fatal 0;	3999	cf::object::thawer::errors_are_fatal 0;
3677	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";
3678		4001
3679	my $free_main; $free_main = EV::idle sub {	4002	AE::postpone {
3680	undef $free_main;
3681	undef &main; # free gobs of memory :)	4003	undef &main; # free gobs of memory :)
3682	};	4004	};
3683		4005
3684	goto &main_loop;	4006	goto &main_loop;
3685	}	4007	}
…		…
3842		4164
3843	cf::write_runtime_sync; # external watchdog should not bark	4165	cf::write_runtime_sync; # external watchdog should not bark
3844		4166
3845	trace "emergency_perl_save: flushing outstanding aio requests";	4167	trace "emergency_perl_save: flushing outstanding aio requests";
3846	while (IO::AIO::nreqs || BDB::nreqs) {	4168	while (IO::AIO::nreqs || BDB::nreqs) {
3847	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
3848	}	4170	}
3849		4171
3850	cf::write_runtime_sync; # external watchdog should not bark	4172	cf::write_runtime_sync; # external watchdog should not bark
3851	};	4173	};
3852		4174
…		…
4033		4355
4034	#############################################################################	4356	#############################################################################
4035		4357
4036	my $bug_warning = 0;	4358	my $bug_warning = 0;
4037		4359
4038	our @WAIT_FOR_TICK;
4039	our @WAIT_FOR_TICK_BEGIN;
4040
4041	sub wait_for_tick() {	4360	sub wait_for_tick() {
4042	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4043		4362
4044	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
4045	push @WAIT_FOR_TICK, $signal;
4046	$signal->wait;
4047	}	4364	}
4048		4365
4049	sub wait_for_tick_begin() {	4366	sub wait_for_tick_begin() {
4050	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4051		4368
4052	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
4053	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
4054	$signal->wait;	4371	$signal->wait;
4055	}	4372	}
…		…
4059	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"
4060	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
4061	return;	4378	return;
4062	}	4379	}
4063		4380
4064	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
4065		4382
4066	#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#
4067		4384
4068	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4069	$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.;
…		…
4075	}	4392	}
4076		4393
4077	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4078	$sig->send;	4395	$sig->send;
4079	}	4396	}
4080	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
4081	$sig->send;
4082	}
4083		4398
4084	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
4085	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4086		4401
4087	if (0) {	4402	if (0) {
…		…
4093	}	4408	}
4094	}	4409	}
4095		4410
4096	{	4411	{
4097	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
4098		4414
4099	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
4100	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
4101	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
4102		4418
4103	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
4104	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
4105	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4106	$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;
…		…
4131	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4132	};	4448	};
4133	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4134	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4135	};	4451	};
		4452
		4453	info "database initialised";
4136	}	4454	}
4137		4455
4138	{	4456	{
4139	# configure IO::AIO	4457	# configure IO::AIO
4140		4458
		4459	info "initialising aio";
4141	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4142	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4143	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4144	}	4464	}
4145		4465
4146	our $_log_backtrace;	4466	our $_log_backtrace;
4147	our $_log_backtrace_last;	4467	our $_log_backtrace_last;
4148		4468

Diff Legend

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