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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010,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;
…		…
129	our $DB_ENV;	134	our $DB_ENV;
130		135
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		137
133	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		140
135	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
136	our $RUNTIME = 0;	142	our $RUNTIME = 0;
137	our $SERVER_TICK = 0;	143	our $SERVER_TICK = 0;
138	our $NOW;	144	our $NOW;
…		…
219	=item $cf::RUNTIME	225	=item $cf::RUNTIME
220		226
221	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
222	every server tick.	228	every server tick.
223		229
224	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227		233
228	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
231	database environment.	237	database environment.
…		…
245	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
246	from wherever your confdir points to.	252	from wherever your confdir points to.
247		253
248	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
249		255
250	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.
251	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
252	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.
253		260
254	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
255	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
256	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>
257	want to wait, use C<$cf::WAIT_FOR_TICK>).	264	want to wait, use C<$cf::WAIT_FOR_TICK>).
258		265
259	=item $cf::WAIT_FOR_TICK	266	=item $cf::WAIT_FOR_TICK
…		…
335	)) {	342	)) {
336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337	}	344	}
338		345
339	$EV::DIED = sub {	346	$EV::DIED = sub {
340	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
341	};	348	};
342		349
343	#############################################################################	350	#############################################################################
344		351
345	sub fork_call(&@);	352	sub fork_call(&@);
…		…
566	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
567	(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
568	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
569	till the next cede.	576	till the next cede.
570		577
571	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
572	should use 100 or more.	579	should use 100 or more.
573		580
574	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
575	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
576		583
…		…
731	reset_signals;	738	reset_signals;
732	}	739	}
733		740
734	sub fork_call(&@) {	741	sub fork_call(&@) {
735	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
736
737	# we seemingly have to make a local copy of the whole thing,
738	# otherwise perl prematurely frees the stuff :/
739	# TODO: investigate and fix (likely this will be rather laborious)
740		743
741	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
742	cf::post_fork;	745	cf::post_fork;
743	&$cb	746	&$cb
744	} @args;	747	} @args;
…		…
894		897
895	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
896	}	899	}
897	}	900	}
898		901
899	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
900	my $data = $process->(\@data);	903	my $data = $process->(\@data);
901	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
902		905
903	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
904		907
905	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
906	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1426	=cut	1429	=cut
1427		1430
1428	#############################################################################	1431	#############################################################################
1429	# command handling &c	1432	# command handling &c
1430		1433
1431	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1432		1435
1433	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
1434	$name.	1437	$name.
1435		1438
1436	=cut	1439	=cut
…		…
1442	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1443		1446
1444	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1445	}	1448	}
1446		1449
1447	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1448		1451
1449	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1450	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
1451	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
1452	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
1453	has logged in successfully.	1456	has logged in successfully.
1454		1457
1455	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1456	called.
1457		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
1458	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1459		1466
1460	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1461	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
1462	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
1463	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
1464	log-in.	1471	log-in.
1465		1472
1466	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1467	called.
1468		1474
1469	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1470		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
1471	sub register_extcmd {	1482	sub register_extcmd($$) {
1472	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1473		1484
1474	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1475	}	1486	}
1476		1487
1477	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1478	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1479		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1480	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1481	}	1504	}
1482		1505
1483	use File::Glob ();	1506	use File::Glob ();
1484		1507
1485	cf::player->attach (	1508	cf::player->attach (
…		…
1501	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1502		1525
1503	if (ref $msg) {	1526	if (ref $msg) {
1504	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1505		1528
1506	my @reply;
1507
1508	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}) {
1509	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1510	}	1547	}
1511
1512	$pl->ext_reply ($reply, @reply)
1513	if $reply;
1514		1548
1515	} else {	1549	} else {
1516	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1517	}	1551	}
1518		1552
…		…
1531	};	1565	};
1532		1566
1533	$grp	1567	$grp
1534	}	1568	}
1535		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1536	sub load_extensions {	1581	sub load_extensions {
1537	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1538		1585
1539	cf::sync_job {	1586	cf::sync_job {
1540	my %todo;	1587	my %todo;
1541		1588
1542	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1585	unless exists $done{$_};	1632	unless exists $done{$_};
1586	}	1633	}
1587		1634
1588	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1589		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1590	my $active = eval $v->{source};	1646	my $active = eval $source;
1591		1647
1592	if (length $@) {	1648	if (length $@) {
1593	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1594		1650
1595	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1882	}	1938	}
1883		1939
1884	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1885		1941
1886	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1887
1888	=item $player->ext_reply ($msgid, @msg)
1889
1890	Sends an ext reply to the player.
1891
1892	=cut
1893
1894	sub ext_reply($$@) {
1895	my ($self, $id, @msg) = @_;
1896
1897	$self->ns->ext_reply ($id, @msg)
1898	}
1899		1943
1900	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1901		1945
1902	Sends an ext event to the client.	1946	Sends an ext event to the client.
1903		1947
…		…
2606		2650
2607	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.
2608		2652
2609	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2610		2654
2611	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,
2612	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2613		2657
2614	=cut	2658	=cut
2615		2659
2616	sub deref {	2660	sub deref {
…		…
2998		3042
2999	=head3 cf::client	3043	=head3 cf::client
3000		3044
3001	=over 4	3045	=over 4
3002		3046
3003	=item $client->send_drawinfo ($text, $flags)
3004
3005	Sends a drawinfo packet to the client. Circumvents output buffering so
3006	should not be used under normal circumstances.
3007
3008	=cut
3009
3010	sub cf::client::send_drawinfo {
3011	my ($self, $text, $flags) = @_;
3012
3013	utf8::encode $text;
3014	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
3015	}
3016
3017	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
3018		3048
3019	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
3020	them as required.	3050	them as required.
3021		3051
…		…
3039	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
3040	}	3070	}
3041		3071
3042	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
3043		3073
3044	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
3045	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
3046	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
3047	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
3048		3078
3049	=cut	3079	=cut
3050		3080
3051	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3156	id => "death",	3186	id => "death",
3157	title => "Death",	3187	title => "Death",
3158	reply => undef,	3188	reply => undef,
3159	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3160	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3161	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3162	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3163	);	3199	);
3164		3200
3165	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3208	=cut	3244	=cut
3209		3245
3210	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3211	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3212		3248
3213	if ($self->extcmd == 2) {
3214	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3215	} elsif ($self->extcmd == 1) { # TODO: remove
3216	push @msg, msgtype => "event_$type";
3217	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3218	}
3219	}
3220
3221	=item $client->ext_reply ($msgid, @msg)
3222
3223	Sends an ext reply to the client.
3224
3225	=cut
3226
3227	sub cf::client::ext_reply($$@) {
3228	my ($self, $id, @msg) = @_;
3229
3230	return unless $self->extcmd == 2;
3231
3232	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3233	}	3250	}
3234		3251
3235	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3236		3253
3237	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3257		3274
3258	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3259	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3260		3277
3261	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our @COMMAND_FACES; # [normal commands, emotes, dm commands]
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = (
		3291	$COMMAND_FACES[0],
		3292	$COMMAND_FACES[1],
		3293	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
		3294	);
		3295
		3296	$self->send_face ($_)
		3297	for @faces;
		3298	$self->flush_fx;
		3299
		3300	$self->ext_msg (command_list => @faces);
		3301	}
		3302
		3303	=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
		3304
		3305	=cut
		3306
		3307	sub cf::client::set_command_faces {
		3308	@COMMAND_FACES = @_;
3262	}	3309	}
3263		3310
3264	cf::client->attach (	3311	cf::client->attach (
3265	on_connect => sub {	3312	on_connect => sub {
3266	my ($ns) = @_;	3313	my ($ns) = @_;
…		…
3294	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3341	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3295		3342
3296	if (ref $msg) {	3343	if (ref $msg) {
3297	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	3344	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3298		3345
3299	my @reply;
3300
3301	if (my $cb = $EXTICMD{$type}) {	3346	if (my $cb = $EXTIACMD{$type}) {
		3347	$cb->(
		3348	$ns,
		3349	sub {
		3350	$ns->ext_msg ("reply-$reply", @_)
		3351	if $reply;
		3352	},
		3353	@payload
		3354	);
		3355	} else {
		3356	my @reply;
		3357
		3358	if (my $cb = $EXTICMD{$type}) {
3302	@reply = $cb->($ns, @payload);	3359	@reply = $cb->($ns, @payload);
		3360	}
		3361
		3362	$ns->ext_msg ("reply-$reply", @reply)
		3363	if $reply;
3303	}	3364	}
3304
3305	$ns->ext_reply ($reply, @reply)
3306	if $reply;
3307
3308	} else {	3365	} else {
3309	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3366	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3310	}	3367	}
3311		3368
3312	cf::override;	3369	cf::override;
…		…
3480	=cut	3537	=cut
3481		3538
3482	#############################################################################	3539	#############################################################################
3483	# the server's init and main functions	3540	# the server's init and main functions
3484		3541
		3542	{
		3543	package cf::face;
		3544
		3545	our %HASH; # hash => idx
		3546	our @DATA; # dynamically-created facedata, only faceste 0 used
		3547	our @FOFS; # file offset, if > 0
		3548	our @SIZE; # size of face, in octets
		3549	our @META; # meta hash of face, if any
		3550	our $DATAFH; # facedata filehandle
		3551
		3552	# internal api, not finalised
		3553	sub set {
		3554	my ($name, $type, $data) = @_;
		3555
		3556	my $idx = cf::face::find $name;
		3557
		3558	if ($idx) {
		3559	delete $HASH{cf::face::get_csum $idx};
		3560	} else {
		3561	$idx = cf::face::alloc $name;
		3562	}
		3563
		3564	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3565
		3566	cf::face::set_type $idx, $type;
		3567	cf::face::set_csum $idx, 0, $hash;
		3568
		3569	# we need to destroy the SV itself, not just modify it, as a running ix
		3570	# might hold a reference to it: "delete" achieves that.
		3571	delete $FOFS[0][$idx];
		3572	delete $DATA[0][$idx];
		3573	$DATA[0][$idx] = $data;
		3574	$SIZE[0][$idx] = length $data;
		3575	delete $META[$idx];
		3576	$HASH{$hash} = $idx;#d#
		3577
		3578	$idx
		3579	}
		3580
		3581	sub _get_data($$$) {
		3582	my ($idx, $set, $cb) = @_;
		3583
		3584	if (defined $DATA[$set][$idx]) {
		3585	$cb->($DATA[$set][$idx]);
		3586	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3587	my $size = $SIZE[$set][$idx];
		3588	my $buf;
		3589	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3590	if ($_[0] == $size) {
		3591	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3592	$cb->($buf);
		3593	} else {
		3594	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3595	}
		3596	};
		3597	} else {
		3598	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3599	}
		3600	}
		3601
		3602	# rather ineffient
		3603	sub cf::face::get_data($;$) {
		3604	my ($idx, $set) = @_;
		3605
		3606	_get_data $idx, $set, Coro::rouse_cb;
		3607	Coro::rouse_wait
		3608	}
		3609
		3610	sub cf::face::ix {
		3611	my ($ns, $set, $idx, $pri) = @_;
		3612
		3613	_get_data $idx, $set, sub {
		3614	$ns->ix_send ($idx, $pri, $_[0]);
		3615	};
		3616	}
		3617	}
		3618
3485	sub load_facedata($) {	3619	sub load_facedata($) {
3486	my ($path) = @_;	3620	my ($path) = @_;
3487		3621
3488	# HACK to clear player env face cache, we need some signal framework
3489	# for this (global event?)
3490	%ext::player_env::MUSIC_FACE_CACHE = ();
3491
3492	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3622	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3493		3623
3494	trace "loading facedata from $path\n";	3624	trace "loading facedata from $path\n";
3495		3625
3496	my $facedata = decode_storable load_file $path;	3626	my $facedata = decode_storable load_file "$path/faceinfo";
3497		3627
3498	$facedata->{version} == 2	3628	$facedata->{version} == 2
3499	or cf::cleanup "$path: version mismatch, cannot proceed.";	3629	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3500		3630
3501	# patch in the exptable	3631	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3502	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3632	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3503	$facedata->{resource}{"res/exp_table"} = {	3633
3504	type => FT_RSRC,	3634	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3505	data => $exp_table,	3635
3506	hash => (Digest::MD5::md5 $exp_table),	3636	# BEGIN ATOMIC
3507	};	3637	# from here on, everything must be atomic - no thread switch allowed
3508	cf::cede_to_tick;	3638	my $t1 = EV::time;
3509		3639
3510	{	3640	{
3511	my $faces = $facedata->{faceinfo};	3641	my $faces = $facedata->{faceinfo};
3512		3642
3513	while (my ($face, $info) = each %$faces) {	3643	for my $face (sort keys %$faces) {
		3644	my $info = $faces->{$face};
3514	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3645	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3515		3646
3516	cf::face::set_visibility $idx, $info->{visibility};	3647	cf::face::set_visibility $idx, $info->{visibility};
3517	cf::face::set_magicmap $idx, $info->{magicmap};	3648	cf::face::set_magicmap $idx, $info->{magicmap};
3518	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3649	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3519	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3650	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3520	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3651	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3521		3652	$cf::face::HASH{$info->{hash64}} = $idx;
3522	cf::cede_to_tick;	3653	delete $cf::face::META[$idx];
3523	}	3654	}
3524		3655
3525	while (my ($face, $info) = each %$faces) {	3656	while (my ($face, $info) = each %$faces) {
3526	next unless $info->{smooth};	3657	next unless $info->{smooth};
3527		3658
…		…
3532	cf::face::set_smooth $idx, $smooth;	3663	cf::face::set_smooth $idx, $smooth;
3533	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3664	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3534	} else {	3665	} else {
3535	error "smooth face '$info->{smooth}' not found for face '$face'";	3666	error "smooth face '$info->{smooth}' not found for face '$face'";
3536	}	3667	}
3537
3538	cf::cede_to_tick;
3539	}	3668	}
3540	}	3669	}
3541		3670
3542	{	3671	{
3543	my $anims = $facedata->{animinfo};	3672	my $anims = $facedata->{animinfo};
3544		3673
3545	while (my ($anim, $info) = each %$anims) {	3674	while (my ($anim, $info) = each %$anims) {
3546	cf::anim::set $anim, $info->{frames}, $info->{facings};	3675	cf::anim::set $anim, $info->{frames}, $info->{facings};
3547	cf::cede_to_tick;
3548	}	3676	}
3549		3677
3550	cf::anim::invalidate_all; # d'oh	3678	cf::anim::invalidate_all; # d'oh
3551	}	3679	}
3552		3680
…		…
3556	while (my ($name, $info) = each %$res) {	3684	while (my ($name, $info) = each %$res) {
3557	if (defined (my $type = $info->{type})) {	3685	if (defined (my $type = $info->{type})) {
3558	# TODO: different hash - must free and use new index, or cache ixface data queue	3686	# TODO: different hash - must free and use new index, or cache ixface data queue
3559	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3687	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3560		3688
3561	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3562	cf::face::set_type $idx, $type;	3689	cf::face::set_type $idx, $type;
		3690	cf::face::set_csum $idx, 0, $info->{hash};
		3691	$cf::face::SIZE[0][$idx] = $info->{size};
		3692	$cf::face::FOFS[0][$idx] = $info->{fofs};
3563	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already	3693	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3694	$cf::face::HASH{$info->{hash}} = $idx;
3564	} else {	3695	} else {
3565	# $RESOURCE{$name} = $info; # unused	3696	# $RESOURCE{$name} = $info; # unused
3566	}	3697	}
3567
3568	cf::cede_to_tick;
3569	}	3698	}
3570	}	3699	}
		3700
		3701	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3702
		3703	# HACK to clear player env face cache, we need some signal framework
		3704	# for this (global event?)
		3705	%ext::player_env::MUSIC_FACE_CACHE = ();
		3706
		3707	# END ATOMIC
		3708
		3709	cf::debug "facedata atomic update time ", EV::time - $t1;
3571		3710
3572	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3711	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3712
		3713	aio_close $fh if $fh; # close old facedata
3573		3714
3574	1	3715	1
3575	}	3716	}
3576		3717
3577	register_exticmd fx_want => sub {	3718	register_exticmd fx_want => sub {
…		…
3588	my $status = load_resource_file_ $_[0];	3729	my $status = load_resource_file_ $_[0];
3589	get_slot 0.1, 100;	3730	get_slot 0.1, 100;
3590	cf::arch::commit_load;	3731	cf::arch::commit_load;
3591		3732
3592	$status	3733	$status
		3734	}
		3735
		3736	sub reload_exp_table {
		3737	_reload_exp_table;
		3738
		3739	cf::face::set
		3740	"res/exp_table" => FT_RSRC,
		3741	JSON::XS->new->utf8->canonical->encode (
		3742	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3743	);
		3744	}
		3745
		3746	sub reload_materials {
		3747	_reload_materials;
3593	}	3748	}
3594		3749
3595	sub reload_regions {	3750	sub reload_regions {
3596	# HACK to clear player env face cache, we need some signal framework	3751	# HACK to clear player env face cache, we need some signal framework
3597	# for this (global event?)	3752	# for this (global event?)
…		…
3605	if exists $_->{match};	3760	if exists $_->{match};
3606	}	3761	}
3607	}	3762	}
3608		3763
3609	sub reload_facedata {	3764	sub reload_facedata {
3610	load_facedata "$DATADIR/facedata"	3765	load_facedata $DATADIR
3611	or die "unable to load facedata\n";	3766	or die "unable to load facedata\n";
3612	}	3767	}
3613		3768
3614	sub reload_archetypes {	3769	sub reload_archetypes {
3615	load_resource_file "$DATADIR/archetypes"	3770	load_resource_file "$DATADIR/archetypes"
3616	or die "unable to load archetypes\n";	3771	or die "unable to load archetypes\n";
		3772
		3773	cf::face::set
		3774	"res/skill_info" => FT_RSRC,
		3775	JSON::XS->new->utf8->canonical->encode (
		3776	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3777	);
		3778
		3779	cf::face::set
		3780	"res/spell_paths" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3783	);
3617	}	3784	}
3618		3785
3619	sub reload_treasures {	3786	sub reload_treasures {
3620	load_resource_file "$DATADIR/treasures"	3787	load_resource_file "$DATADIR/treasures"
3621	or die "unable to load treasurelists\n";	3788	or die "unable to load treasurelists\n";
…		…
3642	}	3809	}
3643		3810
3644	sub reload_resources {	3811	sub reload_resources {
3645	trace "reloading resource files...\n";	3812	trace "reloading resource files...\n";
3646		3813
3647	reload_exp_table;
3648	reload_materials;	3814	reload_materials;
3649	reload_facedata;	3815	reload_facedata;
		3816	reload_exp_table;
3650	reload_sound;	3817	reload_sound;
3651	reload_archetypes;	3818	reload_archetypes;
3652	reload_regions;	3819	reload_regions;
3653	reload_treasures;	3820	reload_treasures;
3654		3821
…		…
3713	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3880	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3714		3881
3715	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3882	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3716		3883
3717	# we must not ever block the main coroutine	3884	# we must not ever block the main coroutine
3718	local $Coro::idle = sub {	3885	$Coro::idle = sub {
3719	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3886	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3720	(async {	3887	(async {
3721	$Coro::current->{desc} = "IDLE BUG HANDLER";	3888	$Coro::current->{desc} = "IDLE BUG HANDLER";
3722	EV::loop EV::LOOP_ONESHOT;	3889	EV::loop EV::LOOP_ONESHOT;
3723	})->prio (Coro::PRIO_MAX);	3890	})->prio (Coro::PRIO_MAX);
…		…
3726	evthread_start IO::AIO::poll_fileno;	3893	evthread_start IO::AIO::poll_fileno;
3727		3894
3728	cf::sync_job {	3895	cf::sync_job {
3729	cf::incloader::init ();	3896	cf::incloader::init ();
3730		3897
		3898	db_init;
		3899
3731	cf::init_anim;	3900	cf::init_anim;
3732	cf::init_attackmess;	3901	cf::init_attackmess;
3733	cf::init_dynamic;	3902	cf::init_dynamic;
3734		3903
3735	cf::load_settings;	3904	cf::load_settings;
3736		3905
3737	reload_resources;	3906	reload_resources;
3738	reload_config;	3907	reload_config;
3739	db_init;
3740		3908
3741	cf::init_uuid;	3909	cf::init_uuid;
3742	cf::init_signals;	3910	cf::init_signals;
3743	cf::init_skills;	3911	cf::init_skills;
3744		3912
…		…
4169	}	4337	}
4170	}	4338	}
4171		4339
4172	{	4340	{
4173	# configure BDB	4341	# configure BDB
		4342	info "initialising database";
4174		4343
4175	BDB::min_parallel 16;	4344	BDB::min_parallel 16;
4176	BDB::max_poll_reqs $TICK * 0.1;	4345	BDB::max_poll_reqs $TICK * 0.1;
4177	#$AnyEvent::BDB::WATCHER->priority (1);	4346	#$AnyEvent::BDB::WATCHER->priority (1);
4178		4347
…		…
4207	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4376	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4208	};	4377	};
4209	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4378	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4210	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4379	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4211	};	4380	};
		4381
		4382	info "database initialised";
4212	}	4383	}
4213		4384
4214	{	4385	{
4215	# configure IO::AIO	4386	# configure IO::AIO
4216		4387
		4388	info "initialising aio";
4217	IO::AIO::min_parallel 8;	4389	IO::AIO::min_parallel 8;
4218	IO::AIO::max_poll_time $TICK * 0.1;	4390	IO::AIO::max_poll_time $TICK * 0.1;
4219	undef $AnyEvent::AIO::WATCHER;	4391	undef $AnyEvent::AIO::WATCHER;
		4392	info "aio initialised";
4220	}	4393	}
4221		4394
4222	our $_log_backtrace;	4395	our $_log_backtrace;
4223	our $_log_backtrace_last;	4396	our $_log_backtrace_last;
4224		4397

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC vs. Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.581 by root, Fri Feb 3 02:04:11 2012 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC