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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.582 by root, Fri Feb 3 03:01:45 2012 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 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;
…		…
220	=item $cf::RUNTIME	225	=item $cf::RUNTIME
221		226
222	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
223	every server tick.	228	every server tick.
224		229
225	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
226	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
227	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
228		233
229	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
230	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
231	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
232	database environment.	237	database environment.
…		…
246	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
247	from wherever your confdir points to.	252	from wherever your confdir points to.
248		253
249	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
250		255
251	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.
252	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
253	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.
254		260
255	Note that cf::Wait_for_tick will immediately return when the server is not	261	Note that cf::wait_for_tick will immediately return when the server is not
256	ticking, making it suitable for small pauses in threads that need to run	262	ticking, making it suitable for small pauses in threads that need to run
257	when the server is paused. If that is not applicable (i.e. you I<really>	263	when the server is paused. If that is not applicable (i.e. you I<really>
258	want to wait, use C<$cf::WAIT_FOR_TICK>).	264	want to wait, use C<$cf::WAIT_FOR_TICK>).
259		265
260	=item $cf::WAIT_FOR_TICK	266	=item $cf::WAIT_FOR_TICK
…		…
336	)) {	342	)) {
337	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
338	}	344	}
339		345
340	$EV::DIED = sub {	346	$EV::DIED = sub {
341	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
342	};	348	};
343		349
344	#############################################################################	350	#############################################################################
345		351
346	sub fork_call(&@);	352	sub fork_call(&@);
…		…
567	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
568	(default: 0): This call blocks and returns only when you have at least	574	(default: 0): This call blocks and returns only when you have at least
569	C<$time> seconds of cpu time till the next tick. The slot is only valid	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
570	till the next cede.	576	till the next cede.
571		577
572	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
573	should use 100 or more.	579	should use 100 or more.
574		580
575	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
576	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
577		583
…		…
732	reset_signals;	738	reset_signals;
733	}	739	}
734		740
735	sub fork_call(&@) {	741	sub fork_call(&@) {
736	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
737
738	# we seemingly have to make a local copy of the whole thing,
739	# otherwise perl prematurely frees the stuff :/
740	# TODO: investigate and fix (likely this will be rather laborious)
741		743
742	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
743	cf::post_fork;	745	cf::post_fork;
744	&$cb	746	&$cb
745	} @args;	747	} @args;
…		…
895		897
896	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
897	}	899	}
898	}	900	}
899		901
900	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
901	my $data = $process->(\@data);	903	my $data = $process->(\@data);
902	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
903		905
904	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
905		907
906	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
907	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1427	=cut	1429	=cut
1428		1430
1429	#############################################################################	1431	#############################################################################
1430	# command handling &c	1432	# command handling &c
1431		1433
1432	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1433		1435
1434	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
1435	$name.	1437	$name.
1436		1438
1437	=cut	1439	=cut
…		…
1443	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1444		1446
1445	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1446	}	1448	}
1447		1449
1448	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1449		1451
1450	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1451	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
1452	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
1453	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
1454	has logged in successfully.	1456	has logged in successfully.
1455		1457
1456	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1457	called.
1458		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
1459	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1460		1466
1461	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1462	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
1463	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
1464	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
1465	log-in.	1471	log-in.
1466		1472
1467	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1468	called.
1469		1474
1470	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1471		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
1472	sub register_extcmd {	1482	sub register_extcmd($$) {
1473	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1474		1484
1475	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1476	}	1486	}
1477		1487
1478	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1479	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1480		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1481	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1482	}	1504	}
1483		1505
1484	use File::Glob ();	1506	use File::Glob ();
1485		1507
1486	cf::player->attach (	1508	cf::player->attach (
…		…
1502	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1503		1525
1504	if (ref $msg) {	1526	if (ref $msg) {
1505	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1506		1528
1507	my @reply;
1508
1509	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}) {
1510	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1511	}	1547	}
1512
1513	$pl->ext_reply ($reply, @reply)
1514	if $reply;
1515		1548
1516	} else {	1549	} else {
1517	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1518	}	1551	}
1519		1552
…		…
1905	}	1938	}
1906		1939
1907	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1908		1941
1909	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1910
1911	=item $player->ext_reply ($msgid, @msg)
1912
1913	Sends an ext reply to the player.
1914
1915	=cut
1916
1917	sub ext_reply($$@) {
1918	my ($self, $id, @msg) = @_;
1919
1920	$self->ns->ext_reply ($id, @msg)
1921	}
1922		1943
1923	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1924		1945
1925	Sends an ext event to the client.	1946	Sends an ext event to the client.
1926		1947
…		…
2629		2650
2630	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.
2631		2652
2632	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2633		2654
2634	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,
2635	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2636		2657
2637	=cut	2658	=cut
2638		2659
2639	sub deref {	2660	sub deref {
…		…
3032		3053
3033	sub cf::client::send_drawinfo {	3054	sub cf::client::send_drawinfo {
3034	my ($self, $text, $flags) = @_;	3055	my ($self, $text, $flags) = @_;
3035		3056
3036	utf8::encode $text;	3057	utf8::encode $text;
3037	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	3058	$self->send_packet (sprintf "msg %d log %s", $flags \|\| cf::NDI_BLACK, $text);
3038	}	3059	}
3039		3060
3040	=item $client->send_big_packet ($pkt)	3061	=item $client->send_big_packet ($pkt)
3041		3062
3042	Like C<send_packet>, but tries to compress large packets, and fragments	3063	Like C<send_packet>, but tries to compress large packets, and fragments
…		…
3062	$self->send_packet ($pkt);	3083	$self->send_packet ($pkt);
3063	}	3084	}
3064		3085
3065	=item $client->send_msg ($channel, $msg, $color, [extra...])	3086	=item $client->send_msg ($channel, $msg, $color, [extra...])
3066		3087
3067	Send a drawinfo or msg packet to the client, formatting the msg for the	3088	Send a msg packet to the client, formatting the msg for the client if
3068	client if neccessary. C<$type> should be a string identifying the type of	3089	necessary. C<$type> should be a string identifying the type of the
3069	the message, with C<log> being the default. If C<$color> is negative, suppress	3090	message, with C<log> being the default. If C<$color> is negative, suppress
3070	the message unless the client supports the msg packet.	3091	the message unless the client supports the msg packet.
3071		3092
3072	=cut	3093	=cut
3073		3094
3074	# non-persistent channels (usually the info channel)	3095	# non-persistent channels (usually the info channel)
…		…
3179	id => "death",	3200	id => "death",
3180	title => "Death",	3201	title => "Death",
3181	reply => undef,	3202	reply => undef,
3182	tooltip => "Reason for and more info about your most recent death",	3203	tooltip => "Reason for and more info about your most recent death",
3183	},	3204	},
		3205	"c/fatal" => {
		3206	id => "fatal",
		3207	title => "Fatal Error",
		3208	reply => undef,
		3209	tooltip => "Reason for the server disconnect",
		3210	},
3184	"c/say" => $SAY_CHANNEL,	3211	"c/say" => $SAY_CHANNEL,
3185	"c/chat" => $CHAT_CHANNEL,	3212	"c/chat" => $CHAT_CHANNEL,
3186	);	3213	);
3187		3214
3188	sub cf::client::send_msg {	3215	sub cf::client::send_msg {
…		…
3231	=cut	3258	=cut
3232		3259
3233	sub cf::client::ext_msg($$@) {	3260	sub cf::client::ext_msg($$@) {
3234	my ($self, $type, @msg) = @_;	3261	my ($self, $type, @msg) = @_;
3235		3262
3236	if ($self->extcmd == 2) {
3237	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3263	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3238	} elsif ($self->extcmd == 1) { # TODO: remove
3239	push @msg, msgtype => "event_$type";
3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3241	}
3242	}
3243
3244	=item $client->ext_reply ($msgid, @msg)
3245
3246	Sends an ext reply to the client.
3247
3248	=cut
3249
3250	sub cf::client::ext_reply($$@) {
3251	my ($self, $id, @msg) = @_;
3252
3253	return unless $self->extcmd == 2;
3254
3255	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3256	}	3264	}
3257		3265
3258	=item $success = $client->query ($flags, "text", \&cb)	3266	=item $success = $client->query ($flags, "text", \&cb)
3259		3267
3260	Queues a query to the client, calling the given callback with	3268	Queues a query to the client, calling the given callback with
…		…
3317	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3325	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3318		3326
3319	if (ref $msg) {	3327	if (ref $msg) {
3320	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	3328	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3321		3329
3322	my @reply;
3323
3324	if (my $cb = $EXTICMD{$type}) {	3330	if (my $cb = $EXTIACMD{$type}) {
		3331	$cb->(
		3332	$ns,
		3333	sub {
		3334	$ns->ext_msg ("reply-$reply", @_)
		3335	if $reply;
		3336	},
		3337	@payload
		3338	);
		3339	} else {
		3340	my @reply;
		3341
		3342	if (my $cb = $EXTICMD{$type}) {
3325	@reply = $cb->($ns, @payload);	3343	@reply = $cb->($ns, @payload);
		3344	}
		3345
		3346	$ns->ext_msg ("reply-$reply", @reply)
		3347	if $reply;
3326	}	3348	}
3327
3328	$ns->ext_reply ($reply, @reply)
3329	if $reply;
3330
3331	} else {	3349	} else {
3332	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3350	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3333	}	3351	}
3334		3352
3335	cf::override;	3353	cf::override;
…		…
3503	=cut	3521	=cut
3504		3522
3505	#############################################################################	3523	#############################################################################
3506	# the server's init and main functions	3524	# the server's init and main functions
3507		3525
		3526	{
		3527	package cf::face;
		3528
		3529	our %HASH; # hash => idx
		3530	our @DATA; # dynamically-created facedata, only faceste 0 used
		3531	our @FOFS; # file offset, if > 0
		3532	our @SIZE; # size of face, in octets
		3533	our @META; # meta hash of face, if any
		3534	our $DATAFH; # facedata filehandle
		3535
		3536	# internal api, not finalised
		3537	sub set {
		3538	my ($name, $type, $data) = @_;
		3539
		3540	my $idx = cf::face::find $name;
		3541
		3542	if ($idx) {
		3543	delete $HASH{cf::face::get_csum $idx};
		3544	} else {
		3545	$idx = cf::face::alloc $name;
		3546	}
		3547
		3548	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3549
		3550	cf::face::set_type $idx, $type;
		3551	cf::face::set_csum $idx, 0, $hash;
		3552
		3553	# we need to destroy the SV itself, not just modify it, as a running ix
		3554	# might hold a reference to it: "delete" achieves that.
		3555	delete $FOFS[0][$idx];
		3556	delete $DATA[0][$idx];
		3557	$DATA[0][$idx] = $data;
		3558	$SIZE[0][$idx] = length $data;
		3559	delete $META[$idx];
		3560	$HASH{$hash} = $idx;#d#
		3561
		3562	$idx
		3563	}
		3564
		3565	sub _get_data($$$) {
		3566	my ($idx, $set, $cb) = @_;
		3567
		3568	if (defined $DATA[$set][$idx]) {
		3569	$cb->($DATA[$set][$idx]);
		3570	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3571	my $size = $SIZE[$set][$idx];
		3572	my $buf;
		3573	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3574	if ($_[0] == $size) {
		3575	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3576	$cb->($buf);
		3577	} else {
		3578	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3579	}
		3580	};
		3581	} else {
		3582	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3583	}
		3584	}
		3585
		3586	# rather ineffient
		3587	sub cf::face::get_data($;$) {
		3588	my ($idx, $set) = @_;
		3589
		3590	_get_data $idx, $set, Coro::rouse_cb;
		3591	Coro::rouse_wait
		3592	}
		3593
		3594	sub cf::face::ix {
		3595	my ($ns, $set, $idx, $pri) = @_;
		3596
		3597	_get_data $idx, $set, sub {
		3598	$ns->ix_send ($idx, $pri, $_[0]);
		3599	};
		3600	}
		3601	}
		3602
3508	sub load_facedata($) {	3603	sub load_facedata($) {
3509	my ($path) = @_;	3604	my ($path) = @_;
3510		3605
3511	# HACK to clear player env face cache, we need some signal framework
3512	# for this (global event?)
3513	%ext::player_env::MUSIC_FACE_CACHE = ();
3514
3515	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3606	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3516		3607
3517	trace "loading facedata from $path\n";	3608	trace "loading facedata from $path\n";
3518		3609
3519	my $facedata = decode_storable load_file $path;	3610	my $facedata = decode_storable load_file "$path/faceinfo";
3520		3611
3521	$facedata->{version} == 2	3612	$facedata->{version} == 2
3522	or cf::cleanup "$path: version mismatch, cannot proceed.";	3613	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3523		3614
3524	# patch in the exptable	3615	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3525	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3616	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3526	$facedata->{resource}{"res/exp_table"} = {	3617
3527	type => FT_RSRC,	3618	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3528	data => $exp_table,	3619
3529	hash => (Digest::MD5::md5 $exp_table),	3620	# BEGIN ATOMIC
3530	};	3621	# from here on, everything must be atomic - no thread switch allowed
3531	cf::cede_to_tick;	3622	my $t1 = EV::time;
3532		3623
3533	{	3624	{
3534	my $faces = $facedata->{faceinfo};	3625	my $faces = $facedata->{faceinfo};
3535		3626
3536	while (my ($face, $info) = each %$faces) {	3627	for my $face (sort keys %$faces) {
		3628	my $info = $faces->{$face};
3537	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3629	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3538		3630
3539	cf::face::set_visibility $idx, $info->{visibility};	3631	cf::face::set_visibility $idx, $info->{visibility};
3540	cf::face::set_magicmap $idx, $info->{magicmap};	3632	cf::face::set_magicmap $idx, $info->{magicmap};
3541	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3633	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3542	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3634	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3543	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3635	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3544		3636	$cf::face::HASH{$info->{hash64}} = $idx;
3545	cf::cede_to_tick;	3637	delete $cf::face::META[$idx];
3546	}	3638	}
3547		3639
3548	while (my ($face, $info) = each %$faces) {	3640	while (my ($face, $info) = each %$faces) {
3549	next unless $info->{smooth};	3641	next unless $info->{smooth};
3550		3642
…		…
3555	cf::face::set_smooth $idx, $smooth;	3647	cf::face::set_smooth $idx, $smooth;
3556	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3648	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3557	} else {	3649	} else {
3558	error "smooth face '$info->{smooth}' not found for face '$face'";	3650	error "smooth face '$info->{smooth}' not found for face '$face'";
3559	}	3651	}
3560
3561	cf::cede_to_tick;
3562	}	3652	}
3563	}	3653	}
3564		3654
3565	{	3655	{
3566	my $anims = $facedata->{animinfo};	3656	my $anims = $facedata->{animinfo};
3567		3657
3568	while (my ($anim, $info) = each %$anims) {	3658	while (my ($anim, $info) = each %$anims) {
3569	cf::anim::set $anim, $info->{frames}, $info->{facings};	3659	cf::anim::set $anim, $info->{frames}, $info->{facings};
3570	cf::cede_to_tick;
3571	}	3660	}
3572		3661
3573	cf::anim::invalidate_all; # d'oh	3662	cf::anim::invalidate_all; # d'oh
3574	}	3663	}
3575		3664
…		…
3579	while (my ($name, $info) = each %$res) {	3668	while (my ($name, $info) = each %$res) {
3580	if (defined (my $type = $info->{type})) {	3669	if (defined (my $type = $info->{type})) {
3581	# TODO: different hash - must free and use new index, or cache ixface data queue	3670	# TODO: different hash - must free and use new index, or cache ixface data queue
3582	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3671	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3583		3672
3584	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3585	cf::face::set_type $idx, $type;	3673	cf::face::set_type $idx, $type;
		3674	cf::face::set_csum $idx, 0, $info->{hash};
		3675	$cf::face::SIZE[0][$idx] = $info->{size};
		3676	$cf::face::FOFS[0][$idx] = $info->{fofs};
3586	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already	3677	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3678	$cf::face::HASH{$info->{hash}} = $idx;
3587	} else {	3679	} else {
3588	# $RESOURCE{$name} = $info; # unused	3680	# $RESOURCE{$name} = $info; # unused
3589	}	3681	}
3590
3591	cf::cede_to_tick;
3592	}	3682	}
3593	}	3683	}
		3684
		3685	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3686
		3687	# HACK to clear player env face cache, we need some signal framework
		3688	# for this (global event?)
		3689	%ext::player_env::MUSIC_FACE_CACHE = ();
		3690
		3691	# END ATOMIC
		3692
		3693	cf::debug "facedata atomic update time ", EV::time - $t1;
3594		3694
3595	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3695	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3696
		3697	aio_close $fh if $fh; # close old facedata
3596		3698
3597	1	3699	1
3598	}	3700	}
3599		3701
3600	register_exticmd fx_want => sub {	3702	register_exticmd fx_want => sub {
…		…
3611	my $status = load_resource_file_ $_[0];	3713	my $status = load_resource_file_ $_[0];
3612	get_slot 0.1, 100;	3714	get_slot 0.1, 100;
3613	cf::arch::commit_load;	3715	cf::arch::commit_load;
3614		3716
3615	$status	3717	$status
		3718	}
		3719
		3720	sub reload_exp_table {
		3721	_reload_exp_table;
		3722
		3723	cf::face::set
		3724	"res/exp_table" => FT_RSRC,
		3725	JSON::XS->new->utf8->canonical->encode (
		3726	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3727	);
		3728	}
		3729
		3730	sub reload_materials {
		3731	_reload_materials;
3616	}	3732	}
3617		3733
3618	sub reload_regions {	3734	sub reload_regions {
3619	# HACK to clear player env face cache, we need some signal framework	3735	# HACK to clear player env face cache, we need some signal framework
3620	# for this (global event?)	3736	# for this (global event?)
…		…
3628	if exists $_->{match};	3744	if exists $_->{match};
3629	}	3745	}
3630	}	3746	}
3631		3747
3632	sub reload_facedata {	3748	sub reload_facedata {
3633	load_facedata "$DATADIR/facedata"	3749	load_facedata $DATADIR
3634	or die "unable to load facedata\n";	3750	or die "unable to load facedata\n";
3635	}	3751	}
3636		3752
3637	sub reload_archetypes {	3753	sub reload_archetypes {
3638	load_resource_file "$DATADIR/archetypes"	3754	load_resource_file "$DATADIR/archetypes"
3639	or die "unable to load archetypes\n";	3755	or die "unable to load archetypes\n";
		3756
		3757	cf::face::set
		3758	"res/skill_info" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3761	);
		3762
		3763	cf::face::set
		3764	"res/spell_paths" => FT_RSRC,
		3765	JSON::XS->new->utf8->canonical->encode (
		3766	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3767	);
3640	}	3768	}
3641		3769
3642	sub reload_treasures {	3770	sub reload_treasures {
3643	load_resource_file "$DATADIR/treasures"	3771	load_resource_file "$DATADIR/treasures"
3644	or die "unable to load treasurelists\n";	3772	or die "unable to load treasurelists\n";
…		…
3665	}	3793	}
3666		3794
3667	sub reload_resources {	3795	sub reload_resources {
3668	trace "reloading resource files...\n";	3796	trace "reloading resource files...\n";
3669		3797
3670	reload_exp_table;
3671	reload_materials;	3798	reload_materials;
3672	reload_facedata;	3799	reload_facedata;
		3800	reload_exp_table;
3673	reload_sound;	3801	reload_sound;
3674	reload_archetypes;	3802	reload_archetypes;
3675	reload_regions;	3803	reload_regions;
3676	reload_treasures;	3804	reload_treasures;
3677		3805
…		…
3736	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3864	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3737		3865
3738	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3866	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3739		3867
3740	# we must not ever block the main coroutine	3868	# we must not ever block the main coroutine
3741	local $Coro::idle = sub {	3869	$Coro::idle = sub {
3742	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3870	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3743	(async {	3871	(async {
3744	$Coro::current->{desc} = "IDLE BUG HANDLER";	3872	$Coro::current->{desc} = "IDLE BUG HANDLER";
3745	EV::loop EV::LOOP_ONESHOT;	3873	EV::loop EV::LOOP_ONESHOT;
3746	})->prio (Coro::PRIO_MAX);	3874	})->prio (Coro::PRIO_MAX);
…		…
3749	evthread_start IO::AIO::poll_fileno;	3877	evthread_start IO::AIO::poll_fileno;
3750		3878
3751	cf::sync_job {	3879	cf::sync_job {
3752	cf::incloader::init ();	3880	cf::incloader::init ();
3753		3881
		3882	db_init;
		3883
3754	cf::init_anim;	3884	cf::init_anim;
3755	cf::init_attackmess;	3885	cf::init_attackmess;
3756	cf::init_dynamic;	3886	cf::init_dynamic;
3757		3887
3758	cf::load_settings;	3888	cf::load_settings;
3759		3889
3760	reload_resources;	3890	reload_resources;
3761	reload_config;	3891	reload_config;
3762	db_init;
3763		3892
3764	cf::init_uuid;	3893	cf::init_uuid;
3765	cf::init_signals;	3894	cf::init_signals;
3766	cf::init_skills;	3895	cf::init_skills;
3767		3896
…		…
4192	}	4321	}
4193	}	4322	}
4194		4323
4195	{	4324	{
4196	# configure BDB	4325	# configure BDB
		4326	info "initialising database";
4197		4327
4198	BDB::min_parallel 16;	4328	BDB::min_parallel 16;
4199	BDB::max_poll_reqs $TICK * 0.1;	4329	BDB::max_poll_reqs $TICK * 0.1;
4200	#$AnyEvent::BDB::WATCHER->priority (1);	4330	#$AnyEvent::BDB::WATCHER->priority (1);
4201		4331
…		…
4230	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4360	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4231	};	4361	};
4232	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4362	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4233	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4363	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4234	};	4364	};
		4365
		4366	info "database initialised";
4235	}	4367	}
4236		4368
4237	{	4369	{
4238	# configure IO::AIO	4370	# configure IO::AIO
4239		4371
		4372	info "initialising aio";
4240	IO::AIO::min_parallel 8;	4373	IO::AIO::min_parallel 8;
4241	IO::AIO::max_poll_time $TICK * 0.1;	4374	IO::AIO::max_poll_time $TICK * 0.1;
4242	undef $AnyEvent::AIO::WATCHER;	4375	undef $AnyEvent::AIO::WATCHER;
		4376	info "aio initialised";
4243	}	4377	}
4244		4378
4245	our $_log_backtrace;	4379	our $_log_backtrace;
4246	our $_log_backtrace_last;	4380	our $_log_backtrace_last;
4247		4381

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.582 by root, Fri Feb 3 03:01:45 2012 UTC vs. Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.582 by root, Fri Feb 3 03:01:45 2012 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC