[ViewVC] Diff of: cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 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
362	=item $ref = cf::yaml_load $scalar	459	=item $ref = cf::decode_yaml $scalar
363		460
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		462
366	=cut	463	=cut
367		464
368	sub fork_call(&@);	465	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	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]
372	}	480	}
373		481
374	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
375		483
376	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,
…		…
460	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
461	}	569	}
462		570
463	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
464		572
465	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
466	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
467	of cpu time till the next tick. The slot is only valid till the next cede.	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 les than zero, interactive jobs
		579	should use 100 or more.
468		580
469	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
470	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
471		583
472	Useful for short background jobs.	584	Useful for short background jobs.
…		…
501	}	613	}
502	}	614	}
503		615
504	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
505	# 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
506	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
507	$signal->wait;
508	} else {	619	} else {
509	$busy = 0;	620	$busy = 0;
510	Coro::schedule;	621	Coro::schedule;
511	}	622	}
512	}	623	}
…		…
767		878
768	my @data;	879	my @data;
769	my $md5;	880	my $md5;
770		881
771	for (0 .. $#$src) {	882	for (0 .. $#$src) {
772	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
773	or Carp::croak "$src->[$_]: $!";
774	}	884	}
775		885
776	# if processing is expensive, check	886	# if processing is expensive, check
777	# checksum first	887	# checksum first
778	if (1) {	888	if (1) {
…		…
791		901
792	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
793	}	903	}
794	}	904	}
795		905
796	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
797	my $data = $process->(\@data);	907	my $data = $process->(\@data);
798	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
799		909
800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801		911
802	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
803	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
…		…
1323	=cut	1433	=cut
1324		1434
1325	#############################################################################	1435	#############################################################################
1326	# command handling &c	1436	# command handling &c
1327		1437
1328	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1329		1439
1330	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1331	$name.	1441	$name.
1332		1442
1333	=cut	1443	=cut
…		…
1339	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1340		1450
1341	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1342	}	1452	}
1343		1453
1344	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1345		1455
1346	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1347	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1348	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1349	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1350	has logged in successfully.	1460	has logged in successfully.
1351		1461
1352	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1353	called.
1354		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1355	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1356		1470
1357	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1358	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1359	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1360	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1361	log-in.	1475	log-in.
1362		1476
1363	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1364	called.
1365		1478
1366	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1368	sub register_extcmd {	1486	sub register_extcmd($$) {
1369	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1370		1488
1371	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1372	}	1490	}
1373		1491
1374	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1375	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1376		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1377	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1378	}	1508	}
1379		1509
1380	use File::Glob ();	1510	use File::Glob ();
1381		1511
1382	cf::player->attach (	1512	cf::player->attach (
…		…
1396	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1397		1527
1398	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399		1529
1400	if (ref $msg) {	1530	if (ref $msg) {
1401	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402	"ARRAY" eq ref $msg
1403	? @$msg
1404	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405		1532
1406	my @reply;
1407
1408	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1409	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1410	}	1551	}
1411
1412	$pl->ext_reply ($reply, @reply)
1413	if $reply;
1414		1552
1415	} else {	1553	} else {
1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417	}	1555	}
1418		1556
…		…
1431	};	1569	};
1432		1570
1433	$grp	1571	$grp
1434	}	1572	}
1435		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1436	sub load_extensions {	1585	sub load_extensions {
1437	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1438		1589
1439	cf::sync_job {	1590	cf::sync_job {
1440	my %todo;	1591	my %todo;
1441		1592
1442	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1485	unless exists $done{$_};	1636	unless exists $done{$_};
1486	}	1637	}
1487		1638
1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1490	my $active = eval $v->{source};	1650	my $active = eval $source;
1491		1651
1492	if (length $@) {	1652	if (length $@) {
1493	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1494		1654
1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1512		1672
1513	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1516	}	1676	}
		1677
		1678	last;
1517	}	1679	}
1518	}	1680	}
1519	};	1681	};
1520	}	1682	}
1521		1683
…		…
1780	}	1942	}
1781		1943
1782	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783		1945
1784	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1785
1786	=item $player->ext_reply ($msgid, @msg)
1787
1788	Sends an ext reply to the player.
1789
1790	=cut
1791
1792	sub ext_reply($$@) {
1793	my ($self, $id, @msg) = @_;
1794
1795	$self->ns->ext_reply ($id, @msg)
1796	}
1797		1947
1798	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1799		1949
1800	Sends an ext event to the client.	1950	Sends an ext event to the client.
1801		1951
…		…
1949		2099
1950	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1951	()	2101	()
1952	}	2102	}
1953		2103
		2104	# may re-bless or do other evil things
1954	sub init {	2105	sub init {
1955	my ($self) = @_;	2106	my ($self) = @_;
1956		2107
1957	$self	2108	$self
1958	}	2109	}
…		…
2023	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2024		2175
2025	1	2176	1
2026	}	2177	}
2027		2178
		2179	# used to laod the header of an original map
2028	sub load_header_orig {	2180	sub load_header_orig {
2029	my ($self) = @_;	2181	my ($self) = @_;
2030		2182
2031	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2032	}	2184	}
2033		2185
		2186	# used to laod the header of an instantiated map
2034	sub load_header_temp {	2187	sub load_header_temp {
2035	my ($self) = @_;	2188	my ($self) = @_;
2036		2189
2037	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2038	}	2191	}
2039		2192
		2193	# called after loading the header from an instantiated map
2040	sub prepare_temp {	2194	sub prepare_temp {
2041	my ($self) = @_;	2195	my ($self) = @_;
2042		2196
2043	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2044	\|\| $cf::RUNTIME); #d#	2198	\|\| $cf::RUNTIME); #d#
2045	# safety	2199	# safety
2046	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2047	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2048	}	2202	}
2049		2203
		2204	# called after loading the header from an original map
2050	sub prepare_orig {	2205	sub prepare_orig {
2051	my ($self) = @_;	2206	my ($self) = @_;
2052		2207
2053	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2054	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2080	sub find {	2235	sub find {
2081	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2082		2237
2083	cf::cede_to_tick;	2238	cf::cede_to_tick;
2084		2239
2085	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2086		2241
2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2089		2244
2090	$cf::MAP{$path} \|\| do {	2245	$cf::MAP{$path} \|\| do {
…		…
2121		2276
2122	{	2277	{
2123	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2124		2279
2125	return unless $self->valid;	2280	return unless $self->valid;
2126	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2127
2128	$self->in_memory (cf::MAP_LOADING);
2129		2282
2130	$self->alloc;	2283	$self->alloc;
2131		2284
2132	$self->pre_load;	2285	$self->pre_load;
2133	cf::cede_to_tick;	2286	cf::cede_to_tick;
2134		2287
		2288	if (exists $self->{load_path}) {
2135	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2136	$f->skip_block;	2290	$f->skip_block;
2137	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2138	or return;	2292	or return;
2139		2293
2140	$self->post_load_original	2294	$self->post_load_original
2141	if delete $self->{load_original};	2295	if delete $self->{load_original};
2142		2296
2143	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2144	utf8::encode $uniq;	2298	utf8::encode $uniq;
2145	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2146	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2147	$self->clear_unique_items;	2301	$self->clear_unique_items;
2148	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2149	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2150	}	2305	}
2151	}	2306	}
2152	}
2153		2307
2154	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2155		2315
2156	cf::cede_to_tick;	2316	cf::cede_to_tick;
2157	# now do the right thing for maps	2317	# now do the right thing for maps
2158	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2159	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2163	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2164	$self->decay_objects;	2324	$self->decay_objects;
2165	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2166	$self->update_buttons;	2326	$self->update_buttons;
2167	cf::cede_to_tick;	2327	cf::cede_to_tick;
2168	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2169	}	2329	}
2170		2330
2171	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2172	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2173
2174	$self->in_memory (cf::MAP_ACTIVE);
2175	}	2333	}
2176		2334
2177	$self->post_load;	2335	$self->post_load;
2178		2336
2179	1	2337	1
…		…
2192	# if $self->per_party;	2350	# if $self->per_party;
2193		2351
2194	$self	2352	$self
2195	}	2353	}
2196		2354
2197	# find and load all maps in the 3x3 area around a map
2198	sub load_neighbours {
2199	my ($map) = @_;
2200
2201	my @neigh; # diagonal neighbours
2202
2203	for (0 .. 3) {
2204	my $neigh = $map->tile_path ($_)
2205	or next;
2206	$neigh = find $neigh, $map
2207	or next;
2208	$neigh->load;
2209
2210	# now find the diagonal neighbours
2211	push @neigh,
2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2214	}
2215
2216	for (grep defined $_->[0], @neigh) {
2217	my ($path, $origin) = @$_;
2218	my $neigh = find $path, $origin
2219	or next;
2220	$neigh->load;
2221	}
2222	}
2223
2224	sub find_sync {	2355	sub find_sync {
2225	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2226		2357
		2358	# it's a bug to call this from the main context
2227	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2228	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2229		2361
2230	find $path, $origin	2362	find $path, $origin
2231	}	2363	}
2232		2364
2233	sub do_load_sync {	2365	sub do_load_sync {
2234	my ($map) = @_;	2366	my ($map) = @_;
2235		2367
		2368	# it's a bug to call this from the main context
2236	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2237	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2238		2371
2239	$map->load;	2372	$map->load;
2240	}	2373	}
…		…
2243	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2244		2377
2245	sub find_async {	2378	sub find_async {
2246	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2247		2380
2248	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2249		2382
2250	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2251	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load \|\| $map->linkable;
2252	}	2385	}
2253		2386
2254	$MAP_PREFETCH{$path} \|= $load;	2387	$MAP_PREFETCH{$path} \|= $load;
2255		2388
2256	$MAP_PREFETCHER \|\|= cf::async {	2389	$MAP_PREFETCHER \|\|= cf::async {
…		…
2315	sub swap_out {	2448	sub swap_out {
2316	my ($self) = @_;	2449	my ($self) = @_;
2317		2450
2318	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2319		2452
2320	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2321	return if $self->{deny_save};	2454	return if $self->{deny_save};
2322	return if $self->players;	2455	return if $self->players;
2323		2456
2324	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2325	$self->deactivate;	2458	$self->deactivate;
2326	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2327	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2328		2461
2329	# then atomically save	2462	# then atomically save
2330	$self->_save;	2463	$self->_save;
2331		2464
2332	# then free the map	2465	# then free the map
…		…
2358		2491
2359	return if $self->players;	2492	return if $self->players;
2360		2493
2361	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2362		2495
2363	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2364		2497
2365	# need to save uniques path	2498	# need to save uniques path
2366	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2367	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2368		2501
…		…
2698	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2699	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2700	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2701		2834
2702	$map->load;	2835	$map->load;
2703	$map->load_neighbours;
2704		2836
2705	return unless $self->contr->active;	2837	return unless $self->contr->active;
2706		2838
2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2764	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2765	}	2897	}
2766	}	2898	}
2767		2899
2768	my $map = eval {	2900	my $map = eval {
2769	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770		2902
2771	if ($map) {	2903	if ($map) {
2772	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2773	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2774	} else {	2906	} else {
…		…
2864	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2865		2997
2866	unless (eval {	2998	unless (eval {
2867	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2868		3000
2869	# random map handling
2870	{
2871	my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873	prepare_random_map $exit
2874	if $exit->slaying eq "/!";
2875	}
2876
2877	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2878	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2879	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2880		3027
2881	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2882		3029
2883	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2884	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3109	=cut	3256	=cut
3110		3257
3111	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3112	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3113		3260
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116	} elsif ($self->extcmd == 1) { # TODO: remove
3117	push @msg, msgtype => "event_$type";
3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119	}
3120	}
3121
3122	=item $client->ext_reply ($msgid, @msg)
3123
3124	Sends an ext reply to the client.
3125
3126	=cut
3127
3128	sub cf::client::ext_reply($$@) {
3129	my ($self, $id, @msg) = @_;
3130
3131	if ($self->extcmd == 2) {
3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133	} elsif ($self->extcmd == 1) {
3134	#TODO: version 1, remove
3135	unshift @msg, msgtype => "reply", msgid => $id;
3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137	}
3138	}	3262	}
3139		3263
3140	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3141		3265
3142	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3197	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3198		3322
3199	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200		3324
3201	if (ref $msg) {	3325	if (ref $msg) {
3202	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203	"ARRAY" eq ref $msg
3204	? @$msg
3205	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206		3327
3207	my @reply;
3208
3209	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3210	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3211	}	3346	}
3212
3213	$ns->ext_reply ($reply, @reply)
3214	if $reply;
3215
3216	} else {	3347	} else {
3217	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218	}	3349	}
3219		3350
3220	cf::override;	3351	cf::override;
…		…
3388	=cut	3519	=cut
3389		3520
3390	#############################################################################	3521	#############################################################################
3391	# the server's init and main functions	3522	# the server's init and main functions
3392		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3393	sub load_facedata($) {	3596	sub load_facedata($) {
3394	my ($path) = @_;	3597	my ($path) = @_;
3395		3598
3396	# HACK to clear player env face cache, we need some signal framework
3397	# for this (global event?)
3398	%ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401		3600
3402	trace "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3403		3602
3404	0 < aio_load $path, my $facedata	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3405	or die "$path: $!";
3406
3407	$facedata = Coro::Storable::thaw $facedata;
3408		3604
3409	$facedata->{version} == 2	3605	$facedata->{version} == 2
3410	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3411		3607
3412	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3414	$facedata->{resource}{"res/exp_table"} = {	3610
3415	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3416	data => $exp_table,	3612
3417	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3418	};	3614	# from here on, everything must be atomic - no thread switch allowed
3419	cf::cede_to_tick;	3615	my $t1 = EV::time;
3420		3616
3421	{	3617	{
3422	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3423		3619
3424	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3425	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3426		3623
3427	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3428	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3431		3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3432	cf::cede_to_tick;	3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3433	}	3630	}
3434		3631
3435	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3436	next unless $info->{smooth};	3633	next unless $info->{smooth};
3437		3634
…		…
3442	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3443	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3444	} else {	3641	} else {
3445	error "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3446	}	3643	}
3447
3448	cf::cede_to_tick;
3449	}	3644	}
3450	}	3645	}
3451		3646
3452	{	3647	{
3453	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3454		3649
3455	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3456	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3457	cf::cede_to_tick;
3458	}	3652	}
3459		3653
3460	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3461	}	3655	}
3462		3656
3463	{	3657	{
3464	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3465		3659
3466	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3467	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3468	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3469		3664
3470	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3471	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3472	} else {	3669	} else {
3473	$RESOURCE{$name} = $info; # unused	3670	# $RESOURCE{$name} = $info; # unused
3474	}	3671	}
3475
3476	cf::cede_to_tick;
3477	}	3672	}
3478	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3479		3684
3480	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3686
		3687	aio_close $fh if $fh; # close old facedata
3481		3688
3482	1	3689	1
3483	}	3690	}
3484		3691
3485	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
…		…
3496	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3497	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3498	cf::arch::commit_load;	3705	cf::arch::commit_load;
3499		3706
3500	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3501	}	3721	}
3502		3722
3503	sub reload_regions {	3723	sub reload_regions {
3504	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3505	# for this (global event?)	3725	# for this (global event?)
…		…
3513	if exists $_->{match};	3733	if exists $_->{match};
3514	}	3734	}
3515	}	3735	}
3516		3736
3517	sub reload_facedata {	3737	sub reload_facedata {
3518	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3519	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3520	}	3740	}
3521		3741
3522	sub reload_archetypes {	3742	sub reload_archetypes {
3523	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3524	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3525	}	3754	}
3526		3755
3527	sub reload_treasures {	3756	sub reload_treasures {
3528	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3529	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
3530	}	3759	}
3531		3760
3532	sub reload_sound {	3761	sub reload_sound {
3533	trace "loading sound config from $DATADIR/sound\n";	3762	trace "loading sound config from $DATADIR/sound\n";
3534		3763
3535	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3536	or die "$DATADIR/sound $!";
3537
3538	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3764	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3539		3765
3540	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3766	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3541	my $sound = $soundconf->{compat}[$_]	3767	my $sound = $soundconf->{compat}[$_]
3542	or next;	3768	or next;
3543		3769
…		…
3553	}	3779	}
3554		3780
3555	sub reload_resources {	3781	sub reload_resources {
3556	trace "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3557		3783
3558	reload_exp_table;
3559	reload_materials;	3784	reload_materials;
3560	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
3561	reload_sound;	3787	reload_sound;
3562	reload_archetypes;	3788	reload_archetypes;
3563	reload_regions;	3789	reload_regions;
3564	reload_treasures;	3790	reload_treasures;
3565		3791
…		…
3567	}	3793	}
3568		3794
3569	sub reload_config {	3795	sub reload_config {
3570	trace "reloading config file...\n";	3796	trace "reloading config file...\n";
3571		3797
3572	0 < aio_load "$CONFDIR/config", my $config	3798	my $config = load_file "$CONFDIR/config";
3573	or die "$CONFDIR/config: $!";
3574
3575	utf8::decode $config;	3799	utf8::decode $config;
3576	*CFG = yaml_load $config;	3800	*CFG = decode_yaml $config;
3577		3801
3578	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];	3802	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];
3579		3803
3580	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3804	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3581	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3805	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3619		3843
3620	sub main {	3844	sub main {
3621	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3622		3846
3623	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3624	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3625	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3626	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3627		3851
3628	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3629		3853
3630	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3631	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3632	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3633	(async {	3857	(async {
3634	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3635	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3636	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
…		…
3639	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3640		3864
3641	cf::sync_job {	3865	cf::sync_job {
3642	cf::incloader::init ();	3866	cf::incloader::init ();
3643		3867
		3868	db_init;
		3869
3644	cf::init_anim;	3870	cf::init_anim;
3645	cf::init_attackmess;	3871	cf::init_attackmess;
3646	cf::init_dynamic;	3872	cf::init_dynamic;
3647		3873
3648	cf::load_settings;	3874	cf::load_settings;
3649		3875
3650	reload_resources;	3876	reload_resources;
3651	reload_config;	3877	reload_config;
3652	db_init;
3653		3878
3654	cf::init_uuid;	3879	cf::init_uuid;
3655	cf::init_signals;	3880	cf::init_signals;
3656	cf::init_skills;	3881	cf::init_skills;
3657		3882
…		…
3671	};	3896	};
3672		3897
3673	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3674	info "parse errors in files are no longer fatal from this point on.\n";	3899	info "parse errors in files are no longer fatal from this point on.\n";
3675		3900
3676	my $free_main; $free_main = EV::idle sub {	3901	AE::postpone {
3677	undef $free_main;
3678	undef &main; # free gobs of memory :)	3902	undef &main; # free gobs of memory :)
3679	};	3903	};
3680		3904
3681	goto &main_loop;	3905	goto &main_loop;
3682	}	3906	}
…		…
3839		4063
3840	cf::write_runtime_sync; # external watchdog should not bark	4064	cf::write_runtime_sync; # external watchdog should not bark
3841		4065
3842	trace "emergency_perl_save: flushing outstanding aio requests";	4066	trace "emergency_perl_save: flushing outstanding aio requests";
3843	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4067	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3844	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3845	}	4069	}
3846		4070
3847	cf::write_runtime_sync; # external watchdog should not bark	4071	cf::write_runtime_sync; # external watchdog should not bark
3848	};	4072	};
3849		4073
…		…
4030		4254
4031	#############################################################################	4255	#############################################################################
4032		4256
4033	my $bug_warning = 0;	4257	my $bug_warning = 0;
4034		4258
4035	our @WAIT_FOR_TICK;
4036	our @WAIT_FOR_TICK_BEGIN;
4037
4038	sub wait_for_tick() {	4259	sub wait_for_tick() {
4039	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4040		4261
4041	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
4042	push @WAIT_FOR_TICK, $signal;
4043	$signal->wait;
4044	}	4263	}
4045		4264
4046	sub wait_for_tick_begin() {	4265	sub wait_for_tick_begin() {
4047	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4048		4267
4049	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
4050	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
4051	$signal->wait;	4270	$signal->wait;
4052	}	4271	}
…		…
4056	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4057	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
4058	return;	4277	return;
4059	}	4278	}
4060		4279
4061	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
4062		4281
4063	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4064		4283
4065	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4066	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4072	}	4291	}
4073		4292
4074	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4075	$sig->send;	4294	$sig->send;
4076	}	4295	}
4077	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
4078	$sig->send;
4079	}
4080		4297
4081	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
4082	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4083		4300
4084	if (0) {	4301	if (0) {
…		…
4090	}	4307	}
4091	}	4308	}
4092		4309
4093	{	4310	{
4094	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4095		4313
4096	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4097	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4098	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4099		4317
4100	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4101	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4102	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4103	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4128	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4129	};	4347	};
4130	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4131	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4132	};	4350	};
		4351
		4352	info "database initialised";
4133	}	4353	}
4134		4354
4135	{	4355	{
4136	# configure IO::AIO	4356	# configure IO::AIO
4137		4357
		4358	info "initialising aio";
4138	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4139	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4140	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4141	}	4363	}
4142		4364
4143	our $_log_backtrace;	4365	our $_log_backtrace;
4144	our $_log_backtrace_last;	4366	our $_log_backtrace_last;
4145		4367

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC vs. Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.556 by root, Sat Jul 3 01:49:18 2010 UTC vs.
Revision 1.599 by root, Sun Nov 11 04:29:11 2012 UTC