ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
238	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	380	$d
344	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
345	}	382	}
346		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
362	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
363		483
364	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
366		486
367	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
368	is a reload or not.	488	is a reload or not.
369		489
370	=cut	490	=cut
371		491
372	sub post_init(&) {	492	sub post_init(&) {
373	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
374	}	511	}
375		512
376	=item cf::lock_wait $string	513	=item cf::lock_wait $string
377		514
378	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
431	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
432	}	569	}
433		570
434	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
435		572
436	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
437	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
438	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
439		580
440	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
441	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
442		583
443	Useful for short background jobs.	584	Useful for short background jobs.
…		…
472	}	613	}
473	}	614	}
474		615
475	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
476	# 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
477	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
478	$signal->wait;
479	} else {	619	} else {
480	$busy = 0;	620	$busy = 0;
481	Coro::schedule;	621	Coro::schedule;
482	}	622	}
483	}	623	}
…		…
583	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
584		724
585	$coro	725	$coro
586	}	726	}
587		727
588	=item fork_call { }, $args	728	=item fork_call { }, @args
589		729
590	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
591	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
592	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
593	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
…		…
599	}	739	}
600		740
601	sub fork_call(&@) {	741	sub fork_call(&@) {
602	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
603		743
604	# we seemingly have to make a local copy of the whole thing,
605	# otherwise perl prematurely frees the stuff :/
606	# TODO: investigate and fix (likely this will be rather laborious)
607
608	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
609	cf::post_fork;	745	cf::post_fork;
610	&$cb	746	&$cb
611	}, @args;	747	} @args;
612		748
613	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
614	}	750	}
615		751
616	sub objinfo {	752	sub objinfo {
…		…
738		874
739	my @data;	875	my @data;
740	my $md5;	876	my $md5;
741		877
742	for (0 .. $#$src) {	878	for (0 .. $#$src) {
743	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
744	or Carp::croak "$src->[$_]: $!";
745	}	880	}
746		881
747	# if processing is expensive, check	882	# if processing is expensive, check
748	# checksum first	883	# checksum first
749	if (1) {	884	if (1) {
…		…
762		897
763	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
764	}	899	}
765	}	900	}
766		901
767	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
768	my $data = $process->(\@data);	903	my $data = $process->(\@data);
769	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
770		905
771	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
772		907
773	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
774	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1294	=cut	1429	=cut
1295		1430
1296	#############################################################################	1431	#############################################################################
1297	# command handling &c	1432	# command handling &c
1298		1433
1299	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1300		1435
1301	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1302	$name.	1437	$name.
1303		1438
1304	=cut	1439	=cut
…		…
1310	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1311		1446
1312	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1313	}	1448	}
1314		1449
1315	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1316		1451
1317	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1318	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1319	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1320	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1321	has logged in successfully.	1456	has logged in successfully.
1322		1457
1323	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1324	called.
1325		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1326	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1327		1466
1328	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1329	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1330	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1331	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1332	log-in.	1471	log-in.
1333		1472
1334	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1335	called.
1336		1474
1337	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1338		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1339	sub register_extcmd {	1482	sub register_extcmd($$) {
1340	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1341		1484
1342	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1343	}	1486	}
1344		1487
1345	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1346	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1347		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1348	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1349	}	1504	}
1350		1505
1351	use File::Glob ();	1506	use File::Glob ();
1352		1507
1353	cf::player->attach (	1508	cf::player->attach (
…		…
1367	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1368		1523
1369	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370		1525
1371	if (ref $msg) {	1526	if (ref $msg) {
1372	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373	"ARRAY" eq ref $msg
1374	? @$msg
1375	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376		1528
1377	my @reply;
1378
1379	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1380	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1381	}	1547	}
1382
1383	$pl->ext_reply ($reply, @reply)
1384	if $reply;
1385		1548
1386	} else {	1549	} else {
1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1388	}	1551	}
1389		1552
…		…
1402	};	1565	};
1403		1566
1404	$grp	1567	$grp
1405	}	1568	}
1406		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1407	sub load_extensions {	1581	sub load_extensions {
1408	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1409		1585
1410	cf::sync_job {	1586	cf::sync_job {
1411	my %todo;	1587	my %todo;
1412		1588
1413	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1456	unless exists $done{$_};	1632	unless exists $done{$_};
1457	}	1633	}
1458		1634
1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1461	my $active = eval $v->{source};	1646	my $active = eval $source;
1462		1647
1463	if (length $@) {	1648	if (length $@) {
1464	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1465		1650
1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1483		1668
1484	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1487	}	1672	}
		1673
		1674	last;
1488	}	1675	}
1489	}	1676	}
1490	};	1677	};
1491	}	1678	}
1492		1679
…		…
1650	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1651		1838
1652	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1653	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1654		1841
1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656	$pl->deactivate;	1843	$pl->deactivate;
1657		1844
1658	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659	ext::highscore::check ($pl->ob);	1847	ext::highscore::check ($pl->ob);
1660		1848
1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1662	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1663		1850
1664	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1665	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1666	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1752		1939
1753	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754		1941
1755	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1756		1943
1757	=item $player->ext_reply ($msgid, @msg)
1758
1759	Sends an ext reply to the player.
1760
1761	=cut
1762
1763	sub ext_reply($$@) {
1764	my ($self, $id, @msg) = @_;
1765
1766	$self->ns->ext_reply ($id, @msg)
1767	}
1768
1769	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1770		1945
1771	Sends an ext event to the client.	1946	Sends an ext event to the client.
1772		1947
1773	=cut	1948	=cut
…		…
1832	sub generate_random_map {	2007	sub generate_random_map {
1833	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1834		2009
1835	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836		2011
1837	# mit "rum" bekleckern, nicht
1838	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842	$rmp->{exit_on_final_map},
1843	$rmp->{xsize}, $rmp->{ysize},
1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849	(cf::region::find $rmp->{region}), $rmp->{custom}
1850	)
1851	}	2013	}
1852		2014
1853	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1854		2016
1855	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1906	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1907	$path = "$base/$path";	2069	$path = "$base/$path";
1908	}	2070	}
1909		2071
1910	for ($path) {	2072	for ($path) {
1911	redo if s{//}{/};
1912	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1913	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1914	}	2075	}
1915		2076
1916	$path	2077	$path
…		…
1934		2095
1935	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1936	()	2097	()
1937	}	2098	}
1938		2099
		2100	# may re-bless or do other evil things
1939	sub init {	2101	sub init {
1940	my ($self) = @_;	2102	my ($self) = @_;
1941		2103
1942	$self	2104	$self
1943	}	2105	}
…		…
2008	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2009		2171
2010	1	2172	1
2011	}	2173	}
2012		2174
		2175	# used to laod the header of an original map
2013	sub load_header_orig {	2176	sub load_header_orig {
2014	my ($self) = @_;	2177	my ($self) = @_;
2015		2178
2016	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2017	}	2180	}
2018		2181
		2182	# used to laod the header of an instantiated map
2019	sub load_header_temp {	2183	sub load_header_temp {
2020	my ($self) = @_;	2184	my ($self) = @_;
2021		2185
2022	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2023	}	2187	}
2024		2188
		2189	# called after loading the header from an instantiated map
2025	sub prepare_temp {	2190	sub prepare_temp {
2026	my ($self) = @_;	2191	my ($self) = @_;
2027		2192
2028	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2029	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2030	# safety	2195	# safety
2031	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2032	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2033	}	2198	}
2034		2199
		2200	# called after loading the header from an original map
2035	sub prepare_orig {	2201	sub prepare_orig {
2036	my ($self) = @_;	2202	my ($self) = @_;
2037		2203
2038	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2039	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2065	sub find {	2231	sub find {
2066	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2067		2233
2068	cf::cede_to_tick;	2234	cf::cede_to_tick;
2069		2235
2070	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2071		2237
2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2074		2240
2075	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2106		2272
2107	{	2273	{
2108	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2109		2275
2110	return unless $self->valid;	2276	return unless $self->valid;
2111	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2112
2113	$self->in_memory (cf::MAP_LOADING);
2114		2278
2115	$self->alloc;	2279	$self->alloc;
2116		2280
2117	$self->pre_load;	2281	$self->pre_load;
2118	cf::cede_to_tick;	2282	cf::cede_to_tick;
2119		2283
		2284	if (exists $self->{load_path}) {
2120	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2121	$f->skip_block;	2286	$f->skip_block;
2122	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2123	or return;	2288	or return;
2124		2289
2125	$self->post_load_original	2290	$self->post_load_original
2126	if delete $self->{load_original};	2291	if delete $self->{load_original};
2127		2292
2128	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2129	utf8::encode $uniq;	2294	utf8::encode $uniq;
2130	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2131	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2132	$self->clear_unique_items;	2297	$self->clear_unique_items;
2133	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2134	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2135	}	2301	}
2136	}	2302	}
2137	}
2138		2303
2139	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2140		2311
2141	cf::cede_to_tick;	2312	cf::cede_to_tick;
2142	# now do the right thing for maps	2313	# now do the right thing for maps
2143	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2144	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2148	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2149	$self->decay_objects;	2320	$self->decay_objects;
2150	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2151	$self->update_buttons;	2322	$self->update_buttons;
2152	cf::cede_to_tick;	2323	cf::cede_to_tick;
2153	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2154	}	2325	}
2155		2326
2156	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2157	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2158
2159	$self->in_memory (cf::MAP_ACTIVE);
2160	}	2329	}
2161		2330
2162	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2163	}	2334	}
2164		2335
2165	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2166	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2167	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2175	# if $self->per_party;	2346	# if $self->per_party;
2176		2347
2177	$self	2348	$self
2178	}	2349	}
2179		2350
2180	# find and load all maps in the 3x3 area around a map
2181	sub load_neighbours {
2182	my ($map) = @_;
2183
2184	my @neigh; # diagonal neighbours
2185
2186	for (0 .. 3) {
2187	my $neigh = $map->tile_path ($_)
2188	or next;
2189	$neigh = find $neigh, $map
2190	or next;
2191	$neigh->load;
2192
2193	# now find the diagonal neighbours
2194	push @neigh,
2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2197	}
2198
2199	for (grep defined $_->[0], @neigh) {
2200	my ($path, $origin) = @$_;
2201	my $neigh = find $path, $origin
2202	or next;
2203	$neigh->load;
2204	}
2205	}
2206
2207	sub find_sync {	2351	sub find_sync {
2208	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2209		2353
		2354	# it's a bug to call this from the main context
2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2212		2357
2213	find $path, $origin	2358	find $path, $origin
2214	}	2359	}
2215		2360
2216	sub do_load_sync {	2361	sub do_load_sync {
2217	my ($map) = @_;	2362	my ($map) = @_;
2218		2363
		2364	# it's a bug to call this from the main context
2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2221		2367
2222	$map->load;	2368	$map->load;
2223	}	2369	}
…		…
2226	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2227		2373
2228	sub find_async {	2374	sub find_async {
2229	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2230		2376
2231	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2232		2378
2233	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2234	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2235	}	2381	}
2236		2382
2237	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2238		2384
2239	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2298	sub swap_out {	2444	sub swap_out {
2299	my ($self) = @_;	2445	my ($self) = @_;
2300		2446
2301	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2302		2448
2303	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2304	return if $self->{deny_save};	2450	return if $self->{deny_save};
2305	return if $self->players;	2451	return if $self->players;
2306		2452
2307	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2308	$self->deactivate;	2454	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2311		2457
2312	# then atomically save	2458	# then atomically save
2313	$self->_save;	2459	$self->_save;
2314		2460
2315	# then free the map	2461	# then free the map
…		…
2341		2487
2342	return if $self->players;	2488	return if $self->players;
2343		2489
2344	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2345		2491
2346	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2347		2493
2348	# need to save uniques path	2494	# need to save uniques path
2349	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2350	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2351		2497
…		…
2504		2650
2505	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2506		2652
2507	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2508		2654
2509	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2510	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2511		2657
2512	=cut	2658	=cut
2513		2659
2514	sub deref {	2660	sub deref {
…		…
2681	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2682	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2683	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2684		2830
2685	$map->load;	2831	$map->load;
2686	$map->load_neighbours;
2687		2832
2688	return unless $self->contr->active;	2833	return unless $self->contr->active;
2689		2834
2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2747	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2748	}	2893	}
2749	}	2894	}
2750		2895
2751	my $map = eval {	2896	my $map = eval {
2752	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753		2898
2754	if ($map) {	2899	if ($map) {
2755	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2756	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2757	} else {	2902	} else {
…		…
2847	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2848		2993
2849	unless (eval {	2994	unless (eval {
2850	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2851		2996
2852	# random map handling
2853	{
2854	my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856	prepare_random_map $exit
2857	if $exit->slaying eq "/!";
2858	}
2859
2860	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2861	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2862	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	}
2863		3023
2864	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2865		3025
2866	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2867	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2882		3042
2883	=head3 cf::client	3043	=head3 cf::client
2884		3044
2885	=over 4	3045	=over 4
2886		3046
2887	=item $client->send_drawinfo ($text, $flags)
2888
2889	Sends a drawinfo packet to the client. Circumvents output buffering so
2890	should not be used under normal circumstances.
2891
2892	=cut
2893
2894	sub cf::client::send_drawinfo {
2895	my ($self, $text, $flags) = @_;
2896
2897	utf8::encode $text;
2898	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2899	}
2900
2901	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2902		3048
2903	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2904	them as required.	3050	them as required.
2905		3051
…		…
2923	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2924	}	3070	}
2925		3071
2926	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2927		3073
2928	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2929	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2930	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2931	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2932		3078
2933	=cut	3079	=cut
2934		3080
2935	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3040	id => "death",	3186	id => "death",
3041	title => "Death",	3187	title => "Death",
3042	reply => undef,	3188	reply => undef,
3043	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3044	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3045	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3046	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3047	);	3199	);
3048		3200
3049	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3092	=cut	3244	=cut
3093		3245
3094	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3095	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3096		3248
3097	if ($self->extcmd == 2) {
3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099	} elsif ($self->extcmd == 1) { # TODO: remove
3100	push @msg, msgtype => "event_$type";
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}
3104
3105	=item $client->ext_reply ($msgid, @msg)
3106
3107	Sends an ext reply to the client.
3108
3109	=cut
3110
3111	sub cf::client::ext_reply($$@) {
3112	my ($self, $id, @msg) = @_;
3113
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116	} elsif ($self->extcmd == 1) {
3117	#TODO: version 1, remove
3118	unshift @msg, msgtype => "reply", msgid => $id;
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120	}
3121	}	3250	}
3122		3251
3123	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3124		3253
3125	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3145		3274
3146	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3147	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3148		3277
3149	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our @COMMAND_FACES; # [normal commands, emotes, dm commands]
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = (
		3291	$COMMAND_FACES[0],
		3292	$COMMAND_FACES[1],
		3293	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
		3294	);
		3295
		3296	$self->send_face ($_)
		3297	for @faces;
		3298	$self->flush_fx;
		3299
		3300	$self->ext_msg (command_list => @faces);
		3301	}
		3302
		3303	=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
		3304
		3305	=cut
		3306
		3307	sub cf::client::set_command_faces {
		3308	@COMMAND_FACES = @_;
3150	}	3309	}
3151		3310
3152	cf::client->attach (	3311	cf::client->attach (
3153	on_connect => sub {	3312	on_connect => sub {
3154	my ($ns) = @_;	3313	my ($ns) = @_;
…		…
3180	my ($ns, $buf) = @_;	3339	my ($ns, $buf) = @_;
3181		3340
3182	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3341	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183		3342
3184	if (ref $msg) {	3343	if (ref $msg) {
3185	my ($type, $reply, @payload) =	3344	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186	"ARRAY" eq ref $msg
3187	? @$msg
3188	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189		3345
3190	my @reply;
3191
3192	if (my $cb = $EXTICMD{$type}) {	3346	if (my $cb = $EXTIACMD{$type}) {
		3347	$cb->(
		3348	$ns,
		3349	sub {
		3350	$ns->ext_msg ("reply-$reply", @_)
		3351	if $reply;
		3352	},
		3353	@payload
		3354	);
		3355	} else {
		3356	my @reply;
		3357
		3358	if (my $cb = $EXTICMD{$type}) {
3193	@reply = $cb->($ns, @payload);	3359	@reply = $cb->($ns, @payload);
		3360	}
		3361
		3362	$ns->ext_msg ("reply-$reply", @reply)
		3363	if $reply;
3194	}	3364	}
3195
3196	$ns->ext_reply ($reply, @reply)
3197	if $reply;
3198
3199	} else {	3365	} else {
3200	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3366	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3201	}	3367	}
3202		3368
3203	cf::override;	3369	cf::override;
…		…
3371	=cut	3537	=cut
3372		3538
3373	#############################################################################	3539	#############################################################################
3374	# the server's init and main functions	3540	# the server's init and main functions
3375		3541
		3542	{
		3543	package cf::face;
		3544
		3545	our %HASH; # hash => idx
		3546	our @DATA; # dynamically-created facedata, only faceste 0 used
		3547	our @FOFS; # file offset, if > 0
		3548	our @SIZE; # size of face, in octets
		3549	our @META; # meta hash of face, if any
		3550	our $DATAFH; # facedata filehandle
		3551
		3552	# internal api, not finalised
		3553	sub set {
		3554	my ($name, $type, $data) = @_;
		3555
		3556	my $idx = cf::face::find $name;
		3557
		3558	if ($idx) {
		3559	delete $HASH{cf::face::get_csum $idx};
		3560	} else {
		3561	$idx = cf::face::alloc $name;
		3562	}
		3563
		3564	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3565
		3566	cf::face::set_type $idx, $type;
		3567	cf::face::set_csum $idx, 0, $hash;
		3568
		3569	# we need to destroy the SV itself, not just modify it, as a running ix
		3570	# might hold a reference to it: "delete" achieves that.
		3571	delete $FOFS[0][$idx];
		3572	delete $DATA[0][$idx];
		3573	$DATA[0][$idx] = $data;
		3574	$SIZE[0][$idx] = length $data;
		3575	delete $META[$idx];
		3576	$HASH{$hash} = $idx;#d#
		3577
		3578	$idx
		3579	}
		3580
		3581	sub _get_data($$$) {
		3582	my ($idx, $set, $cb) = @_;
		3583
		3584	if (defined $DATA[$set][$idx]) {
		3585	$cb->($DATA[$set][$idx]);
		3586	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3587	my $size = $SIZE[$set][$idx];
		3588	my $buf;
		3589	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3590	if ($_[0] == $size) {
		3591	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3592	$cb->($buf);
		3593	} else {
		3594	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3595	}
		3596	};
		3597	} else {
		3598	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3599	}
		3600	}
		3601
		3602	# rather ineffient
		3603	sub cf::face::get_data($;$) {
		3604	my ($idx, $set) = @_;
		3605
		3606	_get_data $idx, $set, Coro::rouse_cb;
		3607	Coro::rouse_wait
		3608	}
		3609
		3610	sub cf::face::ix {
		3611	my ($ns, $set, $idx, $pri) = @_;
		3612
		3613	_get_data $idx, $set, sub {
		3614	$ns->ix_send ($idx, $pri, $_[0]);
		3615	};
		3616	}
		3617	}
		3618
3376	sub load_facedata($) {	3619	sub load_facedata($) {
3377	my ($path) = @_;	3620	my ($path) = @_;
3378		3621
3379	# HACK to clear player env face cache, we need some signal framework
3380	# for this (global event?)
3381	%ext::player_env::MUSIC_FACE_CACHE = ();
3382
3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3622	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384		3623
3385	trace "loading facedata from $path\n";	3624	trace "loading facedata from $path\n";
3386		3625
3387	0 < aio_load $path, my $facedata	3626	my $facedata = decode_storable load_file "$path/faceinfo";
3388	or die "$path: $!";
3389
3390	$facedata = Coro::Storable::thaw $facedata;
3391		3627
3392	$facedata->{version} == 2	3628	$facedata->{version} == 2
3393	or cf::cleanup "$path: version mismatch, cannot proceed.";	3629	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3394		3630
3395	# patch in the exptable	3631	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3632	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3397	$facedata->{resource}{"res/exp_table"} = {	3633
3398	type => FT_RSRC,	3634	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3399	data => $exp_table,	3635
3400	hash => (Digest::MD5::md5 $exp_table),	3636	# BEGIN ATOMIC
3401	};	3637	# from here on, everything must be atomic - no thread switch allowed
3402	cf::cede_to_tick;	3638	my $t1 = EV::time;
3403		3639
3404	{	3640	{
3405	my $faces = $facedata->{faceinfo};	3641	my $faces = $facedata->{faceinfo};
3406		3642
3407	while (my ($face, $info) = each %$faces) {	3643	for my $face (sort keys %$faces) {
		3644	my $info = $faces->{$face};
3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3645	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409		3646
3410	cf::face::set_visibility $idx, $info->{visibility};	3647	cf::face::set_visibility $idx, $info->{visibility};
3411	cf::face::set_magicmap $idx, $info->{magicmap};	3648	cf::face::set_magicmap $idx, $info->{magicmap};
3412	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3649	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3413	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3650	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3414		3651	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3415	cf::cede_to_tick;	3652	$cf::face::HASH{$info->{hash64}} = $idx;
		3653	delete $cf::face::META[$idx];
3416	}	3654	}
3417		3655
3418	while (my ($face, $info) = each %$faces) {	3656	while (my ($face, $info) = each %$faces) {
3419	next unless $info->{smooth};	3657	next unless $info->{smooth};
3420		3658
…		…
3425	cf::face::set_smooth $idx, $smooth;	3663	cf::face::set_smooth $idx, $smooth;
3426	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3664	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3427	} else {	3665	} else {
3428	error "smooth face '$info->{smooth}' not found for face '$face'";	3666	error "smooth face '$info->{smooth}' not found for face '$face'";
3429	}	3667	}
3430
3431	cf::cede_to_tick;
3432	}	3668	}
3433	}	3669	}
3434		3670
3435	{	3671	{
3436	my $anims = $facedata->{animinfo};	3672	my $anims = $facedata->{animinfo};
3437		3673
3438	while (my ($anim, $info) = each %$anims) {	3674	while (my ($anim, $info) = each %$anims) {
3439	cf::anim::set $anim, $info->{frames}, $info->{facings};	3675	cf::anim::set $anim, $info->{frames}, $info->{facings};
3440	cf::cede_to_tick;
3441	}	3676	}
3442		3677
3443	cf::anim::invalidate_all; # d'oh	3678	cf::anim::invalidate_all; # d'oh
3444	}	3679	}
3445		3680
3446	{	3681	{
3447	my $res = $facedata->{resource};	3682	my $res = $facedata->{resource};
3448		3683
3449	while (my ($name, $info) = each %$res) {	3684	while (my ($name, $info) = each %$res) {
3450	if (defined $info->{type}) {	3685	if (defined (my $type = $info->{type})) {
		3686	# TODO: different hash - must free and use new index, or cache ixface data queue
3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3687	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452		3688
3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454	cf::face::set_type $idx, $info->{type};	3689	cf::face::set_type $idx, $type;
		3690	cf::face::set_csum $idx, 0, $info->{hash};
		3691	$cf::face::SIZE[0][$idx] = $info->{size};
		3692	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3693	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3694	$cf::face::HASH{$info->{hash}} = $idx;
3455	} else {	3695	} else {
3456	$RESOURCE{$name} = $info; # unused	3696	# $RESOURCE{$name} = $info; # unused
3457	}	3697	}
3458
3459	cf::cede_to_tick;
3460	}	3698	}
3461	}	3699	}
		3700
		3701	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3702
		3703	# HACK to clear player env face cache, we need some signal framework
		3704	# for this (global event?)
		3705	%ext::player_env::MUSIC_FACE_CACHE = ();
		3706
		3707	# END ATOMIC
		3708
		3709	cf::debug "facedata atomic update time ", EV::time - $t1;
3462		3710
3463	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3711	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3712
		3713	aio_close $fh if $fh; # close old facedata
3464		3714
3465	1	3715	1
3466	}	3716	}
3467		3717
3468	register_exticmd fx_want => sub {	3718	register_exticmd fx_want => sub {
…		…
3479	my $status = load_resource_file_ $_[0];	3729	my $status = load_resource_file_ $_[0];
3480	get_slot 0.1, 100;	3730	get_slot 0.1, 100;
3481	cf::arch::commit_load;	3731	cf::arch::commit_load;
3482		3732
3483	$status	3733	$status
		3734	}
		3735
		3736	sub reload_exp_table {
		3737	_reload_exp_table;
		3738
		3739	cf::face::set
		3740	"res/exp_table" => FT_RSRC,
		3741	JSON::XS->new->utf8->canonical->encode (
		3742	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3743	);
		3744	}
		3745
		3746	sub reload_materials {
		3747	_reload_materials;
3484	}	3748	}
3485		3749
3486	sub reload_regions {	3750	sub reload_regions {
3487	# HACK to clear player env face cache, we need some signal framework	3751	# HACK to clear player env face cache, we need some signal framework
3488	# for this (global event?)	3752	# for this (global event?)
…		…
3496	if exists $_->{match};	3760	if exists $_->{match};
3497	}	3761	}
3498	}	3762	}
3499		3763
3500	sub reload_facedata {	3764	sub reload_facedata {
3501	load_facedata "$DATADIR/facedata"	3765	load_facedata $DATADIR
3502	or die "unable to load facedata\n";	3766	or die "unable to load facedata\n";
3503	}	3767	}
3504		3768
3505	sub reload_archetypes {	3769	sub reload_archetypes {
3506	load_resource_file "$DATADIR/archetypes"	3770	load_resource_file "$DATADIR/archetypes"
3507	or die "unable to load archetypes\n";	3771	or die "unable to load archetypes\n";
		3772
		3773	cf::face::set
		3774	"res/skill_info" => FT_RSRC,
		3775	JSON::XS->new->utf8->canonical->encode (
		3776	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3777	);
		3778
		3779	cf::face::set
		3780	"res/spell_paths" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3783	);
3508	}	3784	}
3509		3785
3510	sub reload_treasures {	3786	sub reload_treasures {
3511	load_resource_file "$DATADIR/treasures"	3787	load_resource_file "$DATADIR/treasures"
3512	or die "unable to load treasurelists\n";	3788	or die "unable to load treasurelists\n";
3513	}	3789	}
3514		3790
3515	sub reload_sound {	3791	sub reload_sound {
3516	trace "loading sound config from $DATADIR/sound\n";	3792	trace "loading sound config from $DATADIR/sound\n";
3517		3793
3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519	or die "$DATADIR/sound $!";
3520
3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3794	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522		3795
3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3796	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524	my $sound = $soundconf->{compat}[$_]	3797	my $sound = $soundconf->{compat}[$_]
3525	or next;	3798	or next;
3526		3799
…		…
3536	}	3809	}
3537		3810
3538	sub reload_resources {	3811	sub reload_resources {
3539	trace "reloading resource files...\n";	3812	trace "reloading resource files...\n";
3540		3813
3541	reload_exp_table;
3542	reload_materials;	3814	reload_materials;
3543	reload_facedata;	3815	reload_facedata;
		3816	reload_exp_table;
3544	reload_sound;	3817	reload_sound;
3545	reload_archetypes;	3818	reload_archetypes;
3546	reload_regions;	3819	reload_regions;
3547	reload_treasures;	3820	reload_treasures;
3548		3821
…		…
3550	}	3823	}
3551		3824
3552	sub reload_config {	3825	sub reload_config {
3553	trace "reloading config file...\n";	3826	trace "reloading config file...\n";
3554		3827
3555	0 < aio_load "$CONFDIR/config", my $config	3828	my $config = load_file "$CONFDIR/config";
3556	or die "$CONFDIR/config: $!";
3557
3558	utf8::decode $config;	3829	utf8::decode $config;
3559		3830	*CFG = decode_yaml $config;
3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561	*CFG = YAML::XS::Load $config;
3562		3831
3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3832	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564		3833
3565	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3834	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3566	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3835	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3604		3873
3605	sub main {	3874	sub main {
3606	cf::init_globals; # initialise logging	3875	cf::init_globals; # initialise logging
3607		3876
3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3877	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3878	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3879	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3880	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612		3881
3613	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3882	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614		3883
3615	# we must not ever block the main coroutine	3884	# we must not ever block the main coroutine
3616	local $Coro::idle = sub {	3885	$Coro::idle = sub {
3617	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3886	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3618	(async {	3887	(async {
3619	$Coro::current->{desc} = "IDLE BUG HANDLER";	3888	$Coro::current->{desc} = "IDLE BUG HANDLER";
3620	EV::loop EV::LOOP_ONESHOT;	3889	EV::loop EV::LOOP_ONESHOT;
3621	})->prio (Coro::PRIO_MAX);	3890	})->prio (Coro::PRIO_MAX);
…		…
3624	evthread_start IO::AIO::poll_fileno;	3893	evthread_start IO::AIO::poll_fileno;
3625		3894
3626	cf::sync_job {	3895	cf::sync_job {
3627	cf::incloader::init ();	3896	cf::incloader::init ();
3628		3897
		3898	db_init;
		3899
3629	cf::init_anim;	3900	cf::init_anim;
3630	cf::init_attackmess;	3901	cf::init_attackmess;
3631	cf::init_dynamic;	3902	cf::init_dynamic;
3632		3903
3633	cf::load_settings;	3904	cf::load_settings;
3634		3905
3635	reload_resources;	3906	reload_resources;
3636	reload_config;	3907	reload_config;
3637	db_init;
3638		3908
3639	cf::init_uuid;	3909	cf::init_uuid;
3640	cf::init_signals;	3910	cf::init_signals;
3641	cf::init_skills;	3911	cf::init_skills;
3642		3912
…		…
3650		3920
3651	# no (long-running) fork's whatsoever before this point(!)	3921	# no (long-running) fork's whatsoever before this point(!)
3652	use POSIX ();	3922	use POSIX ();
3653	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3923	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654		3924
3655	(pop @POST_INIT)->(0) while @POST_INIT;	3925	cf::_post_init 0;
3656	};	3926	};
3657		3927
3658	cf::object::thawer::errors_are_fatal 0;	3928	cf::object::thawer::errors_are_fatal 0;
3659	info "parse errors in files are no longer fatal from this point on.\n";	3929	info "parse errors in files are no longer fatal from this point on.\n";
3660		3930
3661	my $free_main; $free_main = EV::idle sub {	3931	AE::postpone {
3662	undef $free_main;
3663	undef &main; # free gobs of memory :)	3932	undef &main; # free gobs of memory :)
3664	};	3933	};
3665		3934
3666	goto &main_loop;	3935	goto &main_loop;
3667	}	3936	}
…		…
3824		4093
3825	cf::write_runtime_sync; # external watchdog should not bark	4094	cf::write_runtime_sync; # external watchdog should not bark
3826		4095
3827	trace "emergency_perl_save: flushing outstanding aio requests";	4096	trace "emergency_perl_save: flushing outstanding aio requests";
3828	while (IO::AIO::nreqs || BDB::nreqs) {	4097	while (IO::AIO::nreqs || BDB::nreqs) {
3829	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4098	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3830	}	4099	}
3831		4100
3832	cf::write_runtime_sync; # external watchdog should not bark	4101	cf::write_runtime_sync; # external watchdog should not bark
3833	};	4102	};
3834		4103
…		…
3883		4152
3884	my $t1 = AE::time;	4153	my $t1 = AE::time;
3885		4154
3886	while ($RELOAD) {	4155	while ($RELOAD) {
3887	cf::get_slot 0.1, -1, "reload_perl";	4156	cf::get_slot 0.1, -1, "reload_perl";
3888	info "reloading...";	4157	info "perl_reload: reloading...";
3889		4158
3890	trace "entering sync_job";	4159	trace "perl_reload: entering sync_job";
3891		4160
3892	cf::sync_job {	4161	cf::sync_job {
3893	#cf::emergency_save;	4162	#cf::emergency_save;
3894		4163
3895	trace "cancelling all extension coros";	4164	trace "perl_reload: cancelling all extension coros";
3896	$_->cancel for values %EXT_CORO;	4165	$_->cancel for values %EXT_CORO;
3897	%EXT_CORO = ();	4166	%EXT_CORO = ();
3898		4167
3899	trace "removing commands";	4168	trace "perl_reload: removing commands";
3900	%COMMAND = ();	4169	%COMMAND = ();
3901		4170
3902	trace "removing ext/exti commands";	4171	trace "perl_reload: removing ext/exti commands";
3903	%EXTCMD = ();	4172	%EXTCMD = ();
3904	%EXTICMD = ();	4173	%EXTICMD = ();
3905		4174
3906	trace "unloading/nuking all extensions";	4175	trace "perl_reload: unloading/nuking all extensions";
3907	for my $pkg (@EXTS) {	4176	for my $pkg (@EXTS) {
3908	trace "... unloading $pkg";	4177	trace "... unloading $pkg";
3909		4178
3910	if (my $cb = $pkg->can ("unload")) {	4179	if (my $cb = $pkg->can ("unload")) {
3911	eval {	4180	eval {
…		…
3916		4185
3917	trace "... clearing $pkg";	4186	trace "... clearing $pkg";
3918	clear_package $pkg;	4187	clear_package $pkg;
3919	}	4188	}
3920		4189
3921	trace "unloading all perl modules loaded from $LIBDIR";	4190	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922	while (my ($k, $v) = each %INC) {	4191	while (my ($k, $v) = each %INC) {
3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4192	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924		4193
3925	trace "... unloading $k";	4194	trace "... unloading $k";
3926	delete $INC{$k};	4195	delete $INC{$k};
…		…
3933	}	4202	}
3934		4203
3935	clear_package $k;	4204	clear_package $k;
3936	}	4205	}
3937		4206
3938	trace "getting rid of safe::, as good as possible";	4207	trace "perl_reload: getting rid of safe::, as good as possible";
3939	clear_package "safe::$_"	4208	clear_package "safe::$_"
3940	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4209	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3941		4210
3942	trace "unloading cf.pm \"a bit\"";	4211	trace "perl_reload: unloading cf.pm \"a bit\"";
3943	delete $INC{"cf.pm"};	4212	delete $INC{"cf.pm"};
3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4213	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945		4214
3946	# don't, removes xs symbols, too,	4215	# don't, removes xs symbols, too,
3947	# and global variables created in xs	4216	# and global variables created in xs
3948	#clear_package __PACKAGE__;	4217	#clear_package __PACKAGE__;
3949		4218
3950	info "unload completed, starting to reload now";	4219	info "perl_reload: unload completed, starting to reload now";
3951		4220
3952	trace "reloading cf.pm";	4221	trace "perl_reload: reloading cf.pm";
3953	require cf;	4222	require cf;
3954	cf::_connect_to_perl_1;	4223	cf::_connect_to_perl_1;
3955		4224
3956	trace "loading config and database again";	4225	trace "perl_reload: loading config and database again";
3957	cf::reload_config;	4226	cf::reload_config;
3958		4227
3959	trace "loading extensions";	4228	trace "perl_reload: loading extensions";
3960	cf::load_extensions;	4229	cf::load_extensions;
3961		4230
3962	if ($REATTACH_ON_RELOAD) {	4231	if ($REATTACH_ON_RELOAD) {
3963	trace "reattaching attachments to objects/players";	4232	trace "perl_reload: reattaching attachments to objects/players";
3964	_global_reattach; # objects, sockets	4233	_global_reattach; # objects, sockets
3965	trace "reattaching attachments to maps";	4234	trace "perl_reload: reattaching attachments to maps";
3966	reattach $_ for values %MAP;	4235	reattach $_ for values %MAP;
3967	trace "reattaching attachments to players";	4236	trace "perl_reload: reattaching attachments to players";
3968	reattach $_ for values %PLAYER;	4237	reattach $_ for values %PLAYER;
3969	}	4238	}
3970		4239
3971	trace "running post_init jobs";	4240	cf::_post_init 1;
3972	(pop @POST_INIT)->(1) while @POST_INIT;
3973		4241
3974	trace "leaving sync_job";	4242	trace "perl_reload: leaving sync_job";
3975		4243
3976	1	4244	1
3977	} or do {	4245	} or do {
3978	error $@;	4246	error $@;
3979	cf::cleanup "error while reloading, exiting.";	4247	cf::cleanup "perl_reload: error, exiting.";
3980	};	4248	};
3981		4249
3982	info "reloaded";
3983	--$RELOAD;	4250	--$RELOAD;
3984	}	4251	}
3985		4252
3986	$t1 = AE::time - $t1;	4253	$t1 = AE::time - $t1;
3987	info "reload completed in ${t1}s\n";	4254	info "perl_reload: completed in ${t1}s\n";
3988	};	4255	};
3989		4256
3990	our $RELOAD_WATCHER; # used only during reload	4257	our $RELOAD_WATCHER; # used only during reload
3991		4258
3992	sub reload_perl() {	4259	sub reload_perl() {
…		…
4017		4284
4018	#############################################################################	4285	#############################################################################
4019		4286
4020	my $bug_warning = 0;	4287	my $bug_warning = 0;
4021		4288
4022	our @WAIT_FOR_TICK;
4023	our @WAIT_FOR_TICK_BEGIN;
4024
4025	sub wait_for_tick() {	4289	sub wait_for_tick() {
4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4290	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027		4291
4028	my $signal = new Coro::Signal;	4292	$WAIT_FOR_TICK->wait;
4029	push @WAIT_FOR_TICK, $signal;
4030	$signal->wait;
4031	}	4293	}
4032		4294
4033	sub wait_for_tick_begin() {	4295	sub wait_for_tick_begin() {
4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4296	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035		4297
4036	my $signal = new Coro::Signal;	4298	my $signal = new Coro::Signal;
4037	push @WAIT_FOR_TICK_BEGIN, $signal;	4299	push @WAIT_FOR_TICK_BEGIN, $signal;
4038	$signal->wait;	4300	$signal->wait;
4039	}	4301	}
…		…
4043	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4305	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4044	unless ++$bug_warning > 10;	4306	unless ++$bug_warning > 10;
4045	return;	4307	return;
4046	}	4308	}
4047		4309
4048	cf::server_tick; # one server iteration	4310	cf::one_tick; # one server iteration
4049		4311
4050	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4312	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051		4313
4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4314	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4315	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4059	}	4321	}
4060		4322
4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4323	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062	$sig->send;	4324	$sig->send;
4063	}	4325	}
4064	while (my $sig = shift @WAIT_FOR_TICK) {	4326	$WAIT_FOR_TICK->broadcast;
4065	$sig->send;
4066	}
4067		4327
4068	$LOAD = ($NOW - $TICK_START) / $TICK;	4328	$LOAD = ($NOW - $TICK_START) / $TICK;
4069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4329	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070		4330
4071	if (0) {	4331	if (0) {
…		…
4077	}	4337	}
4078	}	4338	}
4079		4339
4080	{	4340	{
4081	# configure BDB	4341	# configure BDB
		4342	info "initialising database";
4082		4343
4083	BDB::min_parallel 16;	4344	BDB::min_parallel 16;
4084	BDB::max_poll_reqs $TICK * 0.1;	4345	BDB::max_poll_reqs $TICK * 0.1;
4085	$AnyEvent::BDB::WATCHER->priority (1);	4346	#$AnyEvent::BDB::WATCHER->priority (1);
4086		4347
4087	unless ($DB_ENV) {	4348	unless ($DB_ENV) {
4088	$DB_ENV = BDB::db_env_create;	4349	$DB_ENV = BDB::db_env_create;
4089	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4350	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4351	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4115	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4376	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116	};	4377	};
4117	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4378	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4379	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119	};	4380	};
		4381
		4382	info "database initialised";
4120	}	4383	}
4121		4384
4122	{	4385	{
4123	# configure IO::AIO	4386	# configure IO::AIO
4124		4387
		4388	info "initialising aio";
4125	IO::AIO::min_parallel 8;	4389	IO::AIO::min_parallel 8;
4126	IO::AIO::max_poll_time $TICK * 0.1;	4390	IO::AIO::max_poll_time $TICK * 0.1;
4127	undef $AnyEvent::AIO::WATCHER;	4391	undef $AnyEvent::AIO::WATCHER;
		4392	info "aio initialised";
4128	}	4393	}
4129		4394
4130	my $_log_backtrace;	4395	our $_log_backtrace;
		4396	our $_log_backtrace_last;
4131		4397
4132	sub _log_backtrace {	4398	sub _log_backtrace {
4133	my ($msg, @addr) = @_;	4399	my ($msg, @addr) = @_;
4134		4400
4135	$msg =~ s/\n//;	4401	$msg =~ s/\n$//;
4136		4402
		4403	if ($_log_backtrace_last eq $msg) {
		4404	LOG llevInfo, "[ABT] $msg\n";
		4405	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137	# limit the # of concurrent backtraces	4406	# limit the # of concurrent backtraces
4138	if ($_log_backtrace < 2) {	4407	} elsif ($_log_backtrace < 2) {
		4408	$_log_backtrace_last = $msg;
4139	++$_log_backtrace;	4409	++$_log_backtrace;
4140	my $perl_bt = Carp::longmess $msg;	4410	my $perl_bt = Carp::longmess $msg;
4141	async {	4411	async {
4142	$Coro::current->{desc} = "abt $msg";	4412	$Coro::current->{desc} = "abt $msg";
4143		4413
…		…
4163	LOG llevInfo, "[ABT] $_\n" for @bt;	4433	LOG llevInfo, "[ABT] $_\n" for @bt;
4164	--$_log_backtrace;	4434	--$_log_backtrace;
4165	};	4435	};
4166	} else {	4436	} else {
4167	LOG llevInfo, "[ABT] $msg\n";	4437	LOG llevInfo, "[ABT] $msg\n";
4168	LOG llevInfo, "[ABT] [suppressed]\n";	4438	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169	}	4439	}
4170	}	4440	}
4171		4441
4172	# load additional modules	4442	# load additional modules
4173	require "cf/$_.pm" for @EXTRA_MODULES;	4443	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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