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.541 by root, Tue May 4 23:33:16 2010 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	342	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	344	}
308		345
309	$EV::DIED = sub {	346	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
311	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
312		354
313	#############################################################################	355	#############################################################################
314		356
315	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
316		358
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	380	$d
339	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
340	}	382	}
341		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
342	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
343		437
344	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
345		439
346	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		447
354	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
356		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
357	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
358		483
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
361		486
362	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	488	is a reload or not.
364		489
365	=cut	490	=cut
366		491
367	sub post_init(&) {	492	sub post_init(&) {
368	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
369	}	511	}
370		512
371	=item cf::lock_wait $string	513	=item cf::lock_wait $string
372		514
373	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
427	}	569	}
428		570
429	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
430		572
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
433	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
434		580
435	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
436	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
437		583
438	Useful for short background jobs.	584	Useful for short background jobs.
…		…
467	}	613	}
468	}	614	}
469		615
470	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	619	} else {
475	$busy = 0;	620	$busy = 0;
476	Coro::schedule;	621	Coro::schedule;
477	}	622	}
478	}	623	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
579		724
580	$coro	725	$coro
581	}	726	}
582		727
583	=item fork_call { }, $args	728	=item fork_call { }, @args
584		729
585	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
589		734
590	=cut	735	=cut
591		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
592	sub fork_call(&@) {	741	sub fork_call(&@) {
593	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
594		743
595	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)
598
599	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
600	reset_signals;	745	cf::post_fork;
601	&$cb	746	&$cb
602	}, @args;	747	} @args;
603		748
604	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
605	}	750	}
606		751
607	sub objinfo {	752	sub objinfo {
…		…
729		874
730	my @data;	875	my @data;
731	my $md5;	876	my $md5;
732		877
733	for (0 .. $#$src) {	878	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	880	}
737		881
738	# if processing is expensive, check	882	# if processing is expensive, check
739	# checksum first	883	# checksum first
740	if (1) {	884	if (1) {
…		…
753		897
754	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
755	}	899	}
756	}	900	}
757		901
758	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
759	my $data = $process->(\@data);	903	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
761		905
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		907
764	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1429	=cut
1286		1430
1287	#############################################################################	1431	#############################################################################
1288	# command handling &c	1432	# command handling &c
1289		1433
1290	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1291		1435
1292	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1293	$name.	1437	$name.
1294		1438
1295	=cut	1439	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1302		1446
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1448	}
1305		1449
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1451
1308	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1310	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1311	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1456	has logged in successfully.
1313		1457
1314	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1315	called.
1316		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1466
1319	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1320	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1321	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1322	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1471	log-in.
1324		1472
1325	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1326	called.
1327		1474
1328	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1330	sub register_extcmd {	1482	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1332		1484
1333	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1334	}	1486	}
1335		1487
1336	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1338		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1339	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1340	}	1504	}
1341		1505
1342	use File::Glob ();	1506	use File::Glob ();
1343		1507
1344	cf::player->attach (	1508	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1359		1523
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1525
1362	if (ref $msg) {	1526	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1528
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1372	}	1547	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1548
1377	} else {	1549	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1551	}
1380		1552
…		…
1393	};	1565	};
1394		1566
1395	$grp	1567	$grp
1396	}	1568	}
1397		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1398	sub load_extensions {	1581	sub load_extensions {
1399	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1400		1585
1401	cf::sync_job {	1586	cf::sync_job {
1402	my %todo;	1587	my %todo;
1403		1588
1404	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1632	unless exists $done{$_};
1448	}	1633	}
1449		1634
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1452	my $active = eval $v->{source};	1646	my $active = eval $source;
1453		1647
1454	if (length $@) {	1648	if (length $@) {
1455	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1456	undef $@; # work around perl 5.10.0 utf-8 caching bug
1457		1650
1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
1460		1653
1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1475		1668
1476	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1479	}	1672	}
		1673
		1674	last;
1480	}	1675	}
1481	}	1676	}
1482	};	1677	};
1483	}	1678	}
1484		1679
…		…
1642	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1643		1838
1644	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1645	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1646		1841
1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648	$pl->deactivate;	1843	$pl->deactivate;
		1844
1649	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1651	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1652		1850
1653	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1654	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1655	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1741		1939
1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1743		1941
1744	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1745		1943
1746	=item $player->ext_reply ($msgid, @msg)
1747
1748	Sends an ext reply to the player.
1749
1750	=cut
1751
1752	sub ext_reply($$@) {
1753	my ($self, $id, @msg) = @_;
1754
1755	$self->ns->ext_reply ($id, @msg)
1756	}
1757
1758	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1759		1945
1760	Sends an ext event to the client.	1946	Sends an ext event to the client.
1761		1947
1762	=cut	1948	=cut
…		…
1821	sub generate_random_map {	2007	sub generate_random_map {
1822	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1823		2009
1824	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825		2011
1826	# mit "rum" bekleckern, nicht
1827	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1828	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831	$rmp->{exit_on_final_map},
1832	$rmp->{xsize}, $rmp->{ysize},
1833	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838	(cf::region::find $rmp->{region}), $rmp->{custom}
1839	)
1840	}	2013	}
1841		2014
1842	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1843		2016
1844	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1870	}	2043	}
1871		2044
1872	sub normalise {	2045	sub normalise {
1873	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1874		2047
1875	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1876		2049
1877	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1878		2051
1879	# map plan:	2052	# map plan:
1880	#	2053	#
…		…
1895	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1896	$path = "$base/$path";	2069	$path = "$base/$path";
1897	}	2070	}
1898		2071
1899	for ($path) {	2072	for ($path) {
1900	redo if s{//}{/};
1901	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1902	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1903	}	2075	}
1904		2076
1905	$path	2077	$path
…		…
1919	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1920	return $self;	2092	return $self;
1921	}	2093	}
1922	}	2094	}
1923		2095
1924	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1925	()	2097	()
1926	}	2098	}
1927		2099
		2100	# may re-bless or do other evil things
1928	sub init {	2101	sub init {
1929	my ($self) = @_;	2102	my ($self) = @_;
1930		2103
1931	$self	2104	$self
1932	}	2105	}
…		…
1997	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1998		2171
1999	1	2172	1
2000	}	2173	}
2001		2174
		2175	# used to laod the header of an original map
2002	sub load_header_orig {	2176	sub load_header_orig {
2003	my ($self) = @_;	2177	my ($self) = @_;
2004		2178
2005	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2006	}	2180	}
2007		2181
		2182	# used to laod the header of an instantiated map
2008	sub load_header_temp {	2183	sub load_header_temp {
2009	my ($self) = @_;	2184	my ($self) = @_;
2010		2185
2011	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2012	}	2187	}
2013		2188
		2189	# called after loading the header from an instantiated map
2014	sub prepare_temp {	2190	sub prepare_temp {
2015	my ($self) = @_;	2191	my ($self) = @_;
2016		2192
2017	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2018	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2019	# safety	2195	# safety
2020	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2021	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2022	}	2198	}
2023		2199
		2200	# called after loading the header from an original map
2024	sub prepare_orig {	2201	sub prepare_orig {
2025	my ($self) = @_;	2202	my ($self) = @_;
2026		2203
2027	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2028	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2052		2229
2053	sub find;	2230	sub find;
2054	sub find {	2231	sub find {
2055	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2056		2233
		2234	cf::cede_to_tick;
		2235
2057	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2058		2237
2059	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2061		2240
2062	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2093		2272
2094	{	2273	{
2095	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2096		2275
2097	return unless $self->valid;	2276	return unless $self->valid;
2098	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2099
2100	$self->in_memory (cf::MAP_LOADING);
2101		2278
2102	$self->alloc;	2279	$self->alloc;
2103		2280
2104	$self->pre_load;	2281	$self->pre_load;
2105	cf::cede_to_tick;	2282	cf::cede_to_tick;
2106		2283
		2284	if (exists $self->{load_path}) {
2107	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2108	$f->skip_block;	2286	$f->skip_block;
2109	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2110	or return;	2288	or return;
2111		2289
2112	$self->post_load_original	2290	$self->post_load_original
2113	if delete $self->{load_original};	2291	if delete $self->{load_original};
2114		2292
2115	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2116	utf8::encode $uniq;	2294	utf8::encode $uniq;
2117	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2118	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2119	$self->clear_unique_items;	2297	$self->clear_unique_items;
2120	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2121	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2122	}	2301	}
2123	}	2302	}
2124	}
2125		2303
2126	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2127		2311
2128	cf::cede_to_tick;	2312	cf::cede_to_tick;
2129	# now do the right thing for maps	2313	# now do the right thing for maps
2130	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2131	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2135	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2136	$self->decay_objects;	2320	$self->decay_objects;
2137	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2138	$self->update_buttons;	2322	$self->update_buttons;
2139	cf::cede_to_tick;	2323	cf::cede_to_tick;
2140	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2141	}	2325	}
2142		2326
2143	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2144	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2145
2146	$self->in_memory (cf::MAP_ACTIVE);
2147	}	2329	}
2148		2330
2149	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2150	}	2334	}
2151		2335
2152	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2153	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2154	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2162	# if $self->per_party;	2346	# if $self->per_party;
2163		2347
2164	$self	2348	$self
2165	}	2349	}
2166		2350
2167	# find and load all maps in the 3x3 area around a map
2168	sub load_neighbours {
2169	my ($map) = @_;
2170
2171	my @neigh; # diagonal neighbours
2172
2173	for (0 .. 3) {
2174	my $neigh = $map->tile_path ($_)
2175	or next;
2176	$neigh = find $neigh, $map
2177	or next;
2178	$neigh->load;
2179
2180	# now find the diagonal neighbours
2181	push @neigh,
2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2184	}
2185
2186	for (grep defined $_->[0], @neigh) {
2187	my ($path, $origin) = @$_;
2188	my $neigh = find $path, $origin
2189	or next;
2190	$neigh->load;
2191	}
2192	}
2193
2194	sub find_sync {	2351	sub find_sync {
2195	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2196		2353
		2354	# it's a bug to call this from the main context
2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2199		2357
2200	find $path, $origin	2358	find $path, $origin
2201	}	2359	}
2202		2360
2203	sub do_load_sync {	2361	sub do_load_sync {
2204	my ($map) = @_;	2362	my ($map) = @_;
2205		2363
		2364	# it's a bug to call this from the main context
2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2208		2367
2209	$map->load;	2368	$map->load;
2210	}	2369	}
…		…
2213	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2214		2373
2215	sub find_async {	2374	sub find_async {
2216	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2217		2376
2218	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2219		2378
2220	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2221	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2222	}	2381	}
2223		2382
2224	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2225		2384
2226	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2285	sub swap_out {	2444	sub swap_out {
2286	my ($self) = @_;	2445	my ($self) = @_;
2287		2446
2288	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2289		2448
2290	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2291	return if $self->{deny_save};	2450	return if $self->{deny_save};
2292	return if $self->players;	2451	return if $self->players;
2293		2452
2294	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2295	$self->deactivate;	2454	$self->deactivate;
2296	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2297	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2298		2457
2299	# then atomically save	2458	# then atomically save
2300	$self->_save;	2459	$self->_save;
2301		2460
2302	# then free the map	2461	# then free the map
…		…
2328		2487
2329	return if $self->players;	2488	return if $self->players;
2330		2489
2331	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2332		2491
2333	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2334		2493
2335	# need to save uniques path	2494	# need to save uniques path
2336	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2337	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2338		2497
…		…
2491		2650
2492	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2493		2652
2494	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2495		2654
2496	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2497	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2498		2657
2499	=cut	2658	=cut
2500		2659
2501	sub deref {	2660	sub deref {
…		…
2668	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2669	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2670	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2671		2830
2672	$map->load;	2831	$map->load;
2673	$map->load_neighbours;
2674		2832
2675	return unless $self->contr->active;	2833	return unless $self->contr->active;
2676		2834
2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2734	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2735	}	2893	}
2736	}	2894	}
2737		2895
2738	my $map = eval {	2896	my $map = eval {
2739	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740		2898
2741	if ($map) {	2899	if ($map) {
2742	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2743	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2744	} else {	2902	} else {
…		…
2834	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2835		2993
2836	unless (eval {	2994	unless (eval {
2837	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2838		2996
2839	# random map handling
2840	{
2841	my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843	prepare_random_map $exit
2844	if $exit->slaying eq "/!";
2845	}
2846
2847	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2848	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2849	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2850		3023
2851	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2852		3025
2853	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2854	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2880		3053
2881	sub cf::client::send_drawinfo {	3054	sub cf::client::send_drawinfo {
2882	my ($self, $text, $flags) = @_;	3055	my ($self, $text, $flags) = @_;
2883		3056
2884	utf8::encode $text;	3057	utf8::encode $text;
2885	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3058	$self->send_packet (sprintf "msg %d log %s", $flags || cf::NDI_BLACK, $text);
2886	}	3059	}
2887		3060
2888	=item $client->send_big_packet ($pkt)	3061	=item $client->send_big_packet ($pkt)
2889		3062
2890	Like C<send_packet>, but tries to compress large packets, and fragments	3063	Like C<send_packet>, but tries to compress large packets, and fragments
…		…
2910	$self->send_packet ($pkt);	3083	$self->send_packet ($pkt);
2911	}	3084	}
2912		3085
2913	=item $client->send_msg ($channel, $msg, $color, [extra...])	3086	=item $client->send_msg ($channel, $msg, $color, [extra...])
2914		3087
2915	Send a drawinfo or msg packet to the client, formatting the msg for the	3088	Send a msg packet to the client, formatting the msg for the client if
2916	client if neccessary. C<$type> should be a string identifying the type of	3089	necessary. C<$type> should be a string identifying the type of the
2917	the message, with C<log> being the default. If C<$color> is negative, suppress	3090	message, with C<log> being the default. If C<$color> is negative, suppress
2918	the message unless the client supports the msg packet.	3091	the message unless the client supports the msg packet.
2919		3092
2920	=cut	3093	=cut
2921		3094
2922	# non-persistent channels (usually the info channel)	3095	# non-persistent channels (usually the info channel)
…		…
3027	id => "death",	3200	id => "death",
3028	title => "Death",	3201	title => "Death",
3029	reply => undef,	3202	reply => undef,
3030	tooltip => "Reason for and more info about your most recent death",	3203	tooltip => "Reason for and more info about your most recent death",
3031	},	3204	},
		3205	"c/fatal" => {
		3206	id => "fatal",
		3207	title => "Fatal Error",
		3208	reply => undef,
		3209	tooltip => "Reason for the server disconnect",
		3210	},
3032	"c/say" => $SAY_CHANNEL,	3211	"c/say" => $SAY_CHANNEL,
3033	"c/chat" => $CHAT_CHANNEL,	3212	"c/chat" => $CHAT_CHANNEL,
3034	);	3213	);
3035		3214
3036	sub cf::client::send_msg {	3215	sub cf::client::send_msg {
…		…
3079	=cut	3258	=cut
3080		3259
3081	sub cf::client::ext_msg($$@) {	3260	sub cf::client::ext_msg($$@) {
3082	my ($self, $type, @msg) = @_;	3261	my ($self, $type, @msg) = @_;
3083		3262
3084	if ($self->extcmd == 2) {
3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3263	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086	} elsif ($self->extcmd == 1) { # TODO: remove
3087	push @msg, msgtype => "event_$type";
3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089	}
3090	}
3091
3092	=item $client->ext_reply ($msgid, @msg)
3093
3094	Sends an ext reply to the client.
3095
3096	=cut
3097
3098	sub cf::client::ext_reply($$@) {
3099	my ($self, $id, @msg) = @_;
3100
3101	if ($self->extcmd == 2) {
3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103	} elsif ($self->extcmd == 1) {
3104	#TODO: version 1, remove
3105	unshift @msg, msgtype => "reply", msgid => $id;
3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107	}
3108	}	3264	}
3109		3265
3110	=item $success = $client->query ($flags, "text", \&cb)	3266	=item $success = $client->query ($flags, "text", \&cb)
3111		3267
3112	Queues a query to the client, calling the given callback with	3268	Queues a query to the client, calling the given callback with
…		…
3167	my ($ns, $buf) = @_;	3323	my ($ns, $buf) = @_;
3168		3324
3169	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3325	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170		3326
3171	if (ref $msg) {	3327	if (ref $msg) {
3172	my ($type, $reply, @payload) =	3328	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173	"ARRAY" eq ref $msg
3174	? @$msg
3175	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176		3329
3177	my @reply;
3178
3179	if (my $cb = $EXTICMD{$type}) {	3330	if (my $cb = $EXTIACMD{$type}) {
		3331	$cb->(
		3332	$ns,
		3333	sub {
		3334	$ns->ext_msg ("reply-$reply", @_)
		3335	if $reply;
		3336	},
		3337	@payload
		3338	);
		3339	} else {
		3340	my @reply;
		3341
		3342	if (my $cb = $EXTICMD{$type}) {
3180	@reply = $cb->($ns, @payload);	3343	@reply = $cb->($ns, @payload);
		3344	}
		3345
		3346	$ns->ext_msg ("reply-$reply", @reply)
		3347	if $reply;
3181	}	3348	}
3182
3183	$ns->ext_reply ($reply, @reply)
3184	if $reply;
3185
3186	} else {	3349	} else {
3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3350	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3188	}	3351	}
3189		3352
3190	cf::override;	3353	cf::override;
…		…
3358	=cut	3521	=cut
3359		3522
3360	#############################################################################	3523	#############################################################################
3361	# the server's init and main functions	3524	# the server's init and main functions
3362		3525
3363	# async inc loader. yay.	3526	{
3364	sub inc_loader {	3527	package cf::face;
3365	my $mod = $_[1];
3366		3528
3367	if (in_main && !tick_inhibit) {	3529	our %HASH; # hash => idx
3368	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3530	our @DATA; # dynamically-created facedata, only faceste 0 used
		3531	our @FOFS; # file offset, if > 0
		3532	our @SIZE; # size of face, in octets
		3533	our @META; # meta hash of face, if any
		3534	our $DATAFH; # facedata filehandle
		3535
		3536	# internal api, not finalised
		3537	sub set {
		3538	my ($name, $type, $data) = @_;
		3539
		3540	my $idx = cf::face::find $name;
		3541
		3542	if ($idx) {
		3543	delete $HASH{cf::face::get_csum $idx};
3369	} else {	3544	} else {
3370	debug "loading perl module $mod\n";	3545	$idx = cf::face::alloc $name;
3371	}	3546	}
3372		3547
3373	# 1. find real file	3548	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
3374	for my $dir (@ORIG_INC) {
3375	ref $dir and next;
3376	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377	or next;
3378		3549
3379	$data = "#line 1 $dir/$mod\n$data";	3550	cf::face::set_type $idx, $type;
		3551	cf::face::set_csum $idx, 0, $hash;
3380		3552
3381	open my $fh, "<", \$data or die;	3553	# we need to destroy the SV itself, not just modify it, as a running ix
		3554	# might hold a reference to it: "delete" achieves that.
		3555	delete $FOFS[0][$idx];
		3556	delete $DATA[0][$idx];
		3557	$DATA[0][$idx] = $data;
		3558	$SIZE[0][$idx] = length $data;
		3559	delete $META[$idx];
		3560	$HASH{$hash} = $idx;#d#
3382		3561
3383	return $fh;	3562	$idx
3384	}	3563	}
3385		3564
3386	()	3565	sub _get_data($$$) {
3387	}	3566	my ($idx, $set, $cb) = @_;
3388		3567
3389	sub init_inc {	3568	if (defined $DATA[$set][$idx]) {
3390	# save original @INC	3569	$cb->($DATA[$set][$idx]);
3391	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;	3570	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3571	my $size = $SIZE[$set][$idx];
		3572	my $buf;
		3573	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3574	if ($_[0] == $size) {
		3575	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3576	$cb->($buf);
		3577	} else {
		3578	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3579	}
		3580	};
		3581	} else {
		3582	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3583	}
		3584	}
3392		3585
3393	# make sure we can do scalar-opens	3586	# rather ineffient
3394	open my $dummy, "<", \my $dummy2;	3587	sub cf::face::get_data($;$) {
		3588	my ($idx, $set) = @_;
3395		3589
3396	# execute some stuff so perl load's some of the core modules	3590	_get_data $idx, $set, Coro::rouse_cb;
3397	/Ü/ =~ /ü/i;	3591	Coro::rouse_wait
3398	eval { &Storable::nstore_fd };	3592	}
3399		3593
3400	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.	3594	sub cf::face::ix {
		3595	my ($ns, $set, $idx, $pri) = @_;
3401		3596
3402	debug "module loading will be asynchronous from this point on.";	3597	_get_data $idx, $set, sub {
		3598	$ns->ix_send ($idx, $pri, $_[0]);
		3599	};
		3600	}
3403	}	3601	}
3404		3602
3405	sub load_facedata($) {	3603	sub load_facedata($) {
3406	my ($path) = @_;	3604	my ($path) = @_;
3407		3605
3408	# HACK to clear player env face cache, we need some signal framework
3409	# for this (global event?)
3410	%ext::player_env::MUSIC_FACE_CACHE = ();
3411
3412	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3606	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413		3607
3414	trace "loading facedata from $path\n";	3608	trace "loading facedata from $path\n";
3415		3609
3416	my $facedata;	3610	my $facedata = decode_storable load_file "$path/faceinfo";
3417	0 < aio_load $path, $facedata
3418	or die "$path: $!";
3419
3420	$facedata = Coro::Storable::thaw $facedata;
3421		3611
3422	$facedata->{version} == 2	3612	$facedata->{version} == 2
3423	or cf::cleanup "$path: version mismatch, cannot proceed.";	3613	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3424		3614
3425	# patch in the exptable	3615	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3426	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3616	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3427	$facedata->{resource}{"res/exp_table"} = {	3617
3428	type => FT_RSRC,	3618	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3429	data => $exp_table,	3619
3430	hash => (Digest::MD5::md5 $exp_table),	3620	# BEGIN ATOMIC
3431	};	3621	# from here on, everything must be atomic - no thread switch allowed
3432	cf::cede_to_tick;	3622	my $t1 = EV::time;
3433		3623
3434	{	3624	{
3435	my $faces = $facedata->{faceinfo};	3625	my $faces = $facedata->{faceinfo};
3436		3626
3437	while (my ($face, $info) = each %$faces) {	3627	for my $face (sort keys %$faces) {
		3628	my $info = $faces->{$face};
3438	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3629	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439		3630
3440	cf::face::set_visibility $idx, $info->{visibility};	3631	cf::face::set_visibility $idx, $info->{visibility};
3441	cf::face::set_magicmap $idx, $info->{magicmap};	3632	cf::face::set_magicmap $idx, $info->{magicmap};
3442	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3633	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3443	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3634	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3444		3635	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3445	cf::cede_to_tick;	3636	$cf::face::HASH{$info->{hash64}} = $idx;
		3637	delete $cf::face::META[$idx];
3446	}	3638	}
3447		3639
3448	while (my ($face, $info) = each %$faces) {	3640	while (my ($face, $info) = each %$faces) {
3449	next unless $info->{smooth};	3641	next unless $info->{smooth};
3450		3642
…		…
3455	cf::face::set_smooth $idx, $smooth;	3647	cf::face::set_smooth $idx, $smooth;
3456	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3648	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3457	} else {	3649	} else {
3458	error "smooth face '$info->{smooth}' not found for face '$face'";	3650	error "smooth face '$info->{smooth}' not found for face '$face'";
3459	}	3651	}
3460
3461	cf::cede_to_tick;
3462	}	3652	}
3463	}	3653	}
3464		3654
3465	{	3655	{
3466	my $anims = $facedata->{animinfo};	3656	my $anims = $facedata->{animinfo};
3467		3657
3468	while (my ($anim, $info) = each %$anims) {	3658	while (my ($anim, $info) = each %$anims) {
3469	cf::anim::set $anim, $info->{frames}, $info->{facings};	3659	cf::anim::set $anim, $info->{frames}, $info->{facings};
3470	cf::cede_to_tick;
3471	}	3660	}
3472		3661
3473	cf::anim::invalidate_all; # d'oh	3662	cf::anim::invalidate_all; # d'oh
3474	}	3663	}
3475		3664
3476	{	3665	{
3477	my $res = $facedata->{resource};	3666	my $res = $facedata->{resource};
3478		3667
3479	while (my ($name, $info) = each %$res) {	3668	while (my ($name, $info) = each %$res) {
3480	if (defined $info->{type}) {	3669	if (defined (my $type = $info->{type})) {
		3670	# TODO: different hash - must free and use new index, or cache ixface data queue
3481	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3671	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3482		3672
3483	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3484	cf::face::set_type $idx, $info->{type};	3673	cf::face::set_type $idx, $type;
		3674	cf::face::set_csum $idx, 0, $info->{hash};
		3675	$cf::face::SIZE[0][$idx] = $info->{size};
		3676	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3677	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3678	$cf::face::HASH{$info->{hash}} = $idx;
3485	} else {	3679	} else {
3486	$RESOURCE{$name} = $info; # unused	3680	# $RESOURCE{$name} = $info; # unused
3487	}	3681	}
3488
3489	cf::cede_to_tick;
3490	}	3682	}
3491	}	3683	}
		3684
		3685	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3686
		3687	# HACK to clear player env face cache, we need some signal framework
		3688	# for this (global event?)
		3689	%ext::player_env::MUSIC_FACE_CACHE = ();
		3690
		3691	# END ATOMIC
		3692
		3693	cf::debug "facedata atomic update time ", EV::time - $t1;
3492		3694
3493	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3695	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3696
		3697	aio_close $fh if $fh; # close old facedata
3494		3698
3495	1	3699	1
3496	}	3700	}
3497		3701
3498	register_exticmd fx_want => sub {	3702	register_exticmd fx_want => sub {
…		…
3509	my $status = load_resource_file_ $_[0];	3713	my $status = load_resource_file_ $_[0];
3510	get_slot 0.1, 100;	3714	get_slot 0.1, 100;
3511	cf::arch::commit_load;	3715	cf::arch::commit_load;
3512		3716
3513	$status	3717	$status
		3718	}
		3719
		3720	sub reload_exp_table {
		3721	_reload_exp_table;
		3722
		3723	cf::face::set
		3724	"res/exp_table" => FT_RSRC,
		3725	JSON::XS->new->utf8->canonical->encode (
		3726	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3727	);
		3728	}
		3729
		3730	sub reload_materials {
		3731	_reload_materials;
3514	}	3732	}
3515		3733
3516	sub reload_regions {	3734	sub reload_regions {
3517	# HACK to clear player env face cache, we need some signal framework	3735	# HACK to clear player env face cache, we need some signal framework
3518	# for this (global event?)	3736	# for this (global event?)
…		…
3526	if exists $_->{match};	3744	if exists $_->{match};
3527	}	3745	}
3528	}	3746	}
3529		3747
3530	sub reload_facedata {	3748	sub reload_facedata {
3531	load_facedata "$DATADIR/facedata"	3749	load_facedata $DATADIR
3532	or die "unable to load facedata\n";	3750	or die "unable to load facedata\n";
3533	}	3751	}
3534		3752
3535	sub reload_archetypes {	3753	sub reload_archetypes {
3536	load_resource_file "$DATADIR/archetypes"	3754	load_resource_file "$DATADIR/archetypes"
3537	or die "unable to load archetypes\n";	3755	or die "unable to load archetypes\n";
		3756
		3757	cf::face::set
		3758	"res/skill_info" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3761	);
		3762
		3763	cf::face::set
		3764	"res/spell_paths" => FT_RSRC,
		3765	JSON::XS->new->utf8->canonical->encode (
		3766	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3767	);
3538	}	3768	}
3539		3769
3540	sub reload_treasures {	3770	sub reload_treasures {
3541	load_resource_file "$DATADIR/treasures"	3771	load_resource_file "$DATADIR/treasures"
3542	or die "unable to load treasurelists\n";	3772	or die "unable to load treasurelists\n";
3543	}	3773	}
3544		3774
3545	sub reload_sound {	3775	sub reload_sound {
3546	trace "loading sound config from $DATADIR/sound\n";	3776	trace "loading sound config from $DATADIR/sound\n";
3547		3777
3548	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549	or die "$DATADIR/sound $!";
3550
3551	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3778	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3552		3779
3553	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3780	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554	my $sound = $soundconf->{compat}[$_]	3781	my $sound = $soundconf->{compat}[$_]
3555	or next;	3782	or next;
3556		3783
…		…
3566	}	3793	}
3567		3794
3568	sub reload_resources {	3795	sub reload_resources {
3569	trace "reloading resource files...\n";	3796	trace "reloading resource files...\n";
3570		3797
		3798	reload_materials;
3571	reload_facedata;	3799	reload_facedata;
		3800	reload_exp_table;
3572	reload_sound;	3801	reload_sound;
3573	reload_archetypes;	3802	reload_archetypes;
3574	reload_regions;	3803	reload_regions;
3575	reload_treasures;	3804	reload_treasures;
3576		3805
…		…
3578	}	3807	}
3579		3808
3580	sub reload_config {	3809	sub reload_config {
3581	trace "reloading config file...\n";	3810	trace "reloading config file...\n";
3582		3811
3583	open my $fh, "<:utf8", "$CONFDIR/config"	3812	my $config = load_file "$CONFDIR/config";
3584	or return;	3813	utf8::decode $config;
3585		3814	*CFG = decode_yaml $config;
3586	local $/;
3587	*CFG = YAML::XS::Load scalar <$fh>;
3588		3815
3589	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3816	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590		3817
3591	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3818	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3592	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3819	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3596	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3823	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3597	and die "WARNING: m(un)lockall failed: $!\n";	3824	and die "WARNING: m(un)lockall failed: $!\n";
3598	};	3825	};
3599	warn $@ if $@;	3826	warn $@ if $@;
3600	}	3827	}
3601
3602	trace "finished reloading resource files\n";
3603	}	3828	}
3604		3829
3605	sub pidfile() {	3830	sub pidfile() {
3606	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3831	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607	or die "$PIDFILE: $!";	3832	or die "$PIDFILE: $!";
…		…
3632		3857
3633	sub main {	3858	sub main {
3634	cf::init_globals; # initialise logging	3859	cf::init_globals; # initialise logging
3635		3860
3636	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3861	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3862	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3863	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3864	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640		3865
3641	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3866	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642		3867
3643	# we must not ever block the main coroutine	3868	# we must not ever block the main coroutine
3644	local $Coro::idle = sub {	3869	$Coro::idle = sub {
3645	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3870	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3646	(async {	3871	(async {
3647	$Coro::current->{desc} = "IDLE BUG HANDLER";	3872	$Coro::current->{desc} = "IDLE BUG HANDLER";
3648	EV::loop EV::LOOP_ONESHOT;	3873	EV::loop EV::LOOP_ONESHOT;
3649	})->prio (Coro::PRIO_MAX);	3874	})->prio (Coro::PRIO_MAX);
3650	};	3875	};
3651		3876
3652	evthread_start IO::AIO::poll_fileno;	3877	evthread_start IO::AIO::poll_fileno;
3653		3878
3654	cf::sync_job {	3879	cf::sync_job {
		3880	cf::incloader::init ();
		3881
3655	init_inc;	3882	db_init;
3656		3883
3657	cf::init_experience;
3658	cf::init_anim;	3884	cf::init_anim;
3659	cf::init_attackmess;	3885	cf::init_attackmess;
3660	cf::init_dynamic;	3886	cf::init_dynamic;
3661		3887
3662	cf::load_settings;	3888	cf::load_settings;
3663	cf::load_materials;
3664		3889
3665	reload_resources;	3890	reload_resources;
3666	reload_config;	3891	reload_config;
3667	db_init;
3668		3892
3669	cf::init_uuid;	3893	cf::init_uuid;
3670	cf::init_signals;	3894	cf::init_signals;
3671	cf::init_skills;	3895	cf::init_skills;
3672		3896
…		…
3680		3904
3681	# no (long-running) fork's whatsoever before this point(!)	3905	# no (long-running) fork's whatsoever before this point(!)
3682	use POSIX ();	3906	use POSIX ();
3683	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3907	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684		3908
3685	(pop @POST_INIT)->(0) while @POST_INIT;	3909	cf::_post_init 0;
3686	};	3910	};
3687		3911
3688	cf::object::thawer::errors_are_fatal 0;	3912	cf::object::thawer::errors_are_fatal 0;
3689	info "parse errors in files are no longer fatal from this point on.\n";	3913	info "parse errors in files are no longer fatal from this point on.\n";
3690		3914
3691	my $free_main; $free_main = EV::idle sub {	3915	AE::postpone {
3692	undef $free_main;
3693	undef &main; # free gobs of memory :)	3916	undef &main; # free gobs of memory :)
3694	};	3917	};
3695		3918
3696	goto &main_loop;	3919	goto &main_loop;
3697	}	3920	}
…		…
3854		4077
3855	cf::write_runtime_sync; # external watchdog should not bark	4078	cf::write_runtime_sync; # external watchdog should not bark
3856		4079
3857	trace "emergency_perl_save: flushing outstanding aio requests";	4080	trace "emergency_perl_save: flushing outstanding aio requests";
3858	while (IO::AIO::nreqs || BDB::nreqs) {	4081	while (IO::AIO::nreqs || BDB::nreqs) {
3859	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4082	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3860	}	4083	}
3861		4084
3862	cf::write_runtime_sync; # external watchdog should not bark	4085	cf::write_runtime_sync; # external watchdog should not bark
3863	};	4086	};
3864		4087
…		…
3902	}	4125	}
3903	}	4126	}
3904		4127
3905	sub do_reload_perl() {	4128	sub do_reload_perl() {
3906	# can/must only be called in main	4129	# can/must only be called in main
3907	if (in_main) {	4130	unless (in_main) {
3908	error "can only reload from main coroutine";	4131	error "can only reload from main coroutine";
3909	return;	4132	return;
3910	}	4133	}
3911		4134
3912	return if $RELOAD++;	4135	return if $RELOAD++;
3913		4136
3914	my $t1 = AE::time;	4137	my $t1 = AE::time;
3915		4138
3916	while ($RELOAD) {	4139	while ($RELOAD) {
		4140	cf::get_slot 0.1, -1, "reload_perl";
3917	info "reloading...";	4141	info "perl_reload: reloading...";
3918		4142
3919	trace "entering sync_job";	4143	trace "perl_reload: entering sync_job";
3920		4144
3921	cf::sync_job {	4145	cf::sync_job {
3922	cf::emergency_save;	4146	#cf::emergency_save;
3923		4147
3924	trace "cancelling all extension coros";	4148	trace "perl_reload: cancelling all extension coros";
3925	$_->cancel for values %EXT_CORO;	4149	$_->cancel for values %EXT_CORO;
3926	%EXT_CORO = ();	4150	%EXT_CORO = ();
3927		4151
3928	trace "removing commands";	4152	trace "perl_reload: removing commands";
3929	%COMMAND = ();	4153	%COMMAND = ();
3930		4154
3931	trace "removing ext/exti commands";	4155	trace "perl_reload: removing ext/exti commands";
3932	%EXTCMD = ();	4156	%EXTCMD = ();
3933	%EXTICMD = ();	4157	%EXTICMD = ();
3934		4158
3935	trace "unloading/nuking all extensions";	4159	trace "perl_reload: unloading/nuking all extensions";
3936	for my $pkg (@EXTS) {	4160	for my $pkg (@EXTS) {
3937	trace "... unloading $pkg";	4161	trace "... unloading $pkg";
3938		4162
3939	if (my $cb = $pkg->can ("unload")) {	4163	if (my $cb = $pkg->can ("unload")) {
3940	eval {	4164	eval {
…		…
3945		4169
3946	trace "... clearing $pkg";	4170	trace "... clearing $pkg";
3947	clear_package $pkg;	4171	clear_package $pkg;
3948	}	4172	}
3949		4173
3950	trace "unloading all perl modules loaded from $LIBDIR";	4174	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3951	while (my ($k, $v) = each %INC) {	4175	while (my ($k, $v) = each %INC) {
3952	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4176	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3953		4177
3954	trace "... unloading $k";	4178	trace "... unloading $k";
3955	delete $INC{$k};	4179	delete $INC{$k};
…		…
3962	}	4186	}
3963		4187
3964	clear_package $k;	4188	clear_package $k;
3965	}	4189	}
3966		4190
3967	trace "getting rid of safe::, as good as possible";	4191	trace "perl_reload: getting rid of safe::, as good as possible";
3968	clear_package "safe::$_"	4192	clear_package "safe::$_"
3969	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4193	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3970		4194
3971	trace "unloading cf.pm \"a bit\"";	4195	trace "perl_reload: unloading cf.pm \"a bit\"";
3972	delete $INC{"cf.pm"};	4196	delete $INC{"cf.pm"};
3973	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4197	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3974		4198
3975	# don't, removes xs symbols, too,	4199	# don't, removes xs symbols, too,
3976	# and global variables created in xs	4200	# and global variables created in xs
3977	#clear_package __PACKAGE__;	4201	#clear_package __PACKAGE__;
3978		4202
3979	info "unload completed, starting to reload now";	4203	info "perl_reload: unload completed, starting to reload now";
3980		4204
3981	trace "reloading cf.pm";	4205	trace "perl_reload: reloading cf.pm";
3982	require cf;	4206	require cf;
3983	cf::_connect_to_perl_1;	4207	cf::_connect_to_perl_1;
3984		4208
3985	trace "loading config and database again";	4209	trace "perl_reload: loading config and database again";
3986	cf::reload_config;	4210	cf::reload_config;
3987		4211
3988	trace "loading extensions";	4212	trace "perl_reload: loading extensions";
3989	cf::load_extensions;	4213	cf::load_extensions;
3990		4214
3991	if ($REATTACH_ON_RELOAD) {	4215	if ($REATTACH_ON_RELOAD) {
3992	trace "reattaching attachments to objects/players";	4216	trace "perl_reload: reattaching attachments to objects/players";
3993	_global_reattach; # objects, sockets	4217	_global_reattach; # objects, sockets
3994	trace "reattaching attachments to maps";	4218	trace "perl_reload: reattaching attachments to maps";
3995	reattach $_ for values %MAP;	4219	reattach $_ for values %MAP;
3996	trace "reattaching attachments to players";	4220	trace "perl_reload: reattaching attachments to players";
3997	reattach $_ for values %PLAYER;	4221	reattach $_ for values %PLAYER;
3998	}	4222	}
3999		4223
4000	trace "running post_init jobs";	4224	cf::_post_init 1;
4001	(pop @POST_INIT)->(1) while @POST_INIT;
4002		4225
4003	trace "leaving sync_job";	4226	trace "perl_reload: leaving sync_job";
4004		4227
4005	1	4228	1
4006	} or do {	4229	} or do {
4007	error $@;	4230	error $@;
4008	cf::cleanup "error while reloading, exiting.";	4231	cf::cleanup "perl_reload: error, exiting.";
4009	};	4232	};
4010		4233
4011	info "reloaded";
4012	--$RELOAD;	4234	--$RELOAD;
4013	}	4235	}
4014		4236
4015	$t1 = AE::time - $t1;	4237	$t1 = AE::time - $t1;
4016	info "reload completed in ${t1}s\n";	4238	info "perl_reload: completed in ${t1}s\n";
4017	};	4239	};
4018		4240
4019	our $RELOAD_WATCHER; # used only during reload	4241	our $RELOAD_WATCHER; # used only during reload
4020		4242
4021	sub reload_perl() {	4243	sub reload_perl() {
…		…
4046		4268
4047	#############################################################################	4269	#############################################################################
4048		4270
4049	my $bug_warning = 0;	4271	my $bug_warning = 0;
4050		4272
4051	our @WAIT_FOR_TICK;
4052	our @WAIT_FOR_TICK_BEGIN;
4053
4054	sub wait_for_tick {	4273	sub wait_for_tick() {
4055	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4056		4275
4057	my $signal = new Coro::Signal;	4276	$WAIT_FOR_TICK->wait;
4058	push @WAIT_FOR_TICK, $signal;
4059	$signal->wait;
4060	}	4277	}
4061		4278
4062	sub wait_for_tick_begin {	4279	sub wait_for_tick_begin() {
4063	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4280	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4064		4281
4065	my $signal = new Coro::Signal;	4282	my $signal = new Coro::Signal;
4066	push @WAIT_FOR_TICK_BEGIN, $signal;	4283	push @WAIT_FOR_TICK_BEGIN, $signal;
4067	$signal->wait;	4284	$signal->wait;
4068	}	4285	}
…		…
4072	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4289	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4073	unless ++$bug_warning > 10;	4290	unless ++$bug_warning > 10;
4074	return;	4291	return;
4075	}	4292	}
4076		4293
4077	cf::server_tick; # one server iteration	4294	cf::one_tick; # one server iteration
4078		4295
4079	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4296	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080		4297
4081	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4298	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4082	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4299	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4088	}	4305	}
4089		4306
4090	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4307	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4091	$sig->send;	4308	$sig->send;
4092	}	4309	}
4093	while (my $sig = shift @WAIT_FOR_TICK) {	4310	$WAIT_FOR_TICK->broadcast;
4094	$sig->send;
4095	}
4096		4311
4097	$LOAD = ($NOW - $TICK_START) / $TICK;	4312	$LOAD = ($NOW - $TICK_START) / $TICK;
4098	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4313	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4099		4314
4100	if (0) {	4315	if (0) {
…		…
4106	}	4321	}
4107	}	4322	}
4108		4323
4109	{	4324	{
4110	# configure BDB	4325	# configure BDB
		4326	info "initialising database";
4111		4327
4112	BDB::min_parallel 16;	4328	BDB::min_parallel 16;
4113	BDB::max_poll_reqs $TICK * 0.1;	4329	BDB::max_poll_reqs $TICK * 0.1;
4114	$AnyEvent::BDB::WATCHER->priority (1);	4330	#$AnyEvent::BDB::WATCHER->priority (1);
4115		4331
4116	unless ($DB_ENV) {	4332	unless ($DB_ENV) {
4117	$DB_ENV = BDB::db_env_create;	4333	$DB_ENV = BDB::db_env_create;
4118	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4334	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4119	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4335	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4144	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4360	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4145	};	4361	};
4146	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4362	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4147	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4363	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4148	};	4364	};
		4365
		4366	info "database initialised";
4149	}	4367	}
4150		4368
4151	{	4369	{
4152	# configure IO::AIO	4370	# configure IO::AIO
4153		4371
		4372	info "initialising aio";
4154	IO::AIO::min_parallel 8;	4373	IO::AIO::min_parallel 8;
4155	IO::AIO::max_poll_time $TICK * 0.1;	4374	IO::AIO::max_poll_time $TICK * 0.1;
4156	undef $AnyEvent::AIO::WATCHER;	4375	undef $AnyEvent::AIO::WATCHER;
		4376	info "aio initialised";
4157	}	4377	}
4158		4378
4159	my $_log_backtrace;	4379	our $_log_backtrace;
		4380	our $_log_backtrace_last;
4160		4381
4161	sub _log_backtrace {	4382	sub _log_backtrace {
4162	my ($msg, @addr) = @_;	4383	my ($msg, @addr) = @_;
4163		4384
4164	$msg =~ s/\n//;	4385	$msg =~ s/\n$//;
4165		4386
		4387	if ($_log_backtrace_last eq $msg) {
		4388	LOG llevInfo, "[ABT] $msg\n";
		4389	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4166	# limit the # of concurrent backtraces	4390	# limit the # of concurrent backtraces
4167	if ($_log_backtrace < 2) {	4391	} elsif ($_log_backtrace < 2) {
		4392	$_log_backtrace_last = $msg;
4168	++$_log_backtrace;	4393	++$_log_backtrace;
4169	my $perl_bt = Carp::longmess $msg;	4394	my $perl_bt = Carp::longmess $msg;
4170	async {	4395	async {
4171	$Coro::current->{desc} = "abt $msg";	4396	$Coro::current->{desc} = "abt $msg";
4172		4397
…		…
4192	LOG llevInfo, "[ABT] $_\n" for @bt;	4417	LOG llevInfo, "[ABT] $_\n" for @bt;
4193	--$_log_backtrace;	4418	--$_log_backtrace;
4194	};	4419	};
4195	} else {	4420	} else {
4196	LOG llevInfo, "[ABT] $msg\n";	4421	LOG llevInfo, "[ABT] $msg\n";
4197	LOG llevInfo, "[ABT] [suppressed]\n";	4422	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4198	}	4423	}
4199	}	4424	}
4200		4425
4201	# load additional modules	4426	# load additional modules
4202	require "cf/$_.pm" for @EXTRA_MODULES;	4427	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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