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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 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(&@);
…		…
372	$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;
373	$d	380	$d
374	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
375	}	382	}
376		383
377	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
378		385
379	Loads the given file from path and returns its contents. Croaks on error	386	Loads the given file from path and returns its contents. Croaks on error
380	and can block.	387	and can block.
381		388
382	=cut	389	=cut
…		…
384	sub load_file($) {	391	sub load_file($) {
385	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
386	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
387		394
388	$data	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
389	}	434	}
390		435
391	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
392		437
393	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
528	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
529	(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
530	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
531	till the next cede.	576	till the next cede.
532		577
533	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
534	should use 100 or more.	579	should use 100 or more.
535		580
536	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
537	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
538		583
…		…
551	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
552	my $busy;	597	my $busy;
553		598
554	while () {	599	while () {
555	next_job:	600	next_job:
		601
		602	Coro::cede;
556		603
557	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
558		605
559	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
560	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
561	$busy = 0;	608	$busy = 0;
562	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
563	$job->[2]->send;	610	$job->[2]->send;
564	Coro::cede;
565	goto next_job;	611	goto next_job;
566	} else {	612	} else {
567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568	}	614	}
569	}	615	}
570		616
571	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
572	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
573	$WAIT_FOR_TICK->wait;
574	} else {	619	} else {
575	$busy = 0;	620	$busy = 0;
576	Coro::schedule;	621	Coro::schedule;
577	}	622	}
578	}	623	}
…		…
693	reset_signals;	738	reset_signals;
694	}	739	}
695		740
696	sub fork_call(&@) {	741	sub fork_call(&@) {
697	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
698
699	# we seemingly have to make a local copy of the whole thing,
700	# otherwise perl prematurely frees the stuff :/
701	# TODO: investigate and fix (likely this will be rather laborious)
702		743
703	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
704	cf::post_fork;	745	cf::post_fork;
705	&$cb	746	&$cb
706	} @args;	747	} @args;
…		…
856		897
857	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
858	}	899	}
859	}	900	}
860		901
861	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
862	my $data = $process->(\@data);	903	my $data = $process->(\@data);
863	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
864		905
865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866		907
867	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
868	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1388	=cut	1429	=cut
1389		1430
1390	#############################################################################	1431	#############################################################################
1391	# command handling &c	1432	# command handling &c
1392		1433
1393	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1394		1435
1395	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
1396	$name.	1437	$name.
1397		1438
1398	=cut	1439	=cut
…		…
1404	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1405		1446
1406	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1407	}	1448	}
1408		1449
1409	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1410		1451
1411	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1412	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
1413	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
1414	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
1415	has logged in successfully.	1456	has logged in successfully.
1416		1457
1417	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1418	called.
1419		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
1420	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1421		1466
1422	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1423	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
1424	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
1425	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
1426	log-in.	1471	log-in.
1427		1472
1428	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1429	called.
1430		1474
1431	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432		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
1433	sub register_extcmd {	1482	sub register_extcmd($$) {
1434	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1435		1484
1436	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1437	}	1486	}
1438		1487
1439	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1440	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1441		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1442	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1443	}	1504	}
1444		1505
1445	use File::Glob ();	1506	use File::Glob ();
1446		1507
1447	cf::player->attach (	1508	cf::player->attach (
…		…
1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464		1525
1465	if (ref $msg) {	1526	if (ref $msg) {
1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467		1528
1468	my @reply;
1469
1470	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}) {
1471	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1472	}	1547	}
1473
1474	$pl->ext_reply ($reply, @reply)
1475	if $reply;
1476		1548
1477	} else {	1549	} else {
1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1479	}	1551	}
1480		1552
…		…
1493	};	1565	};
1494		1566
1495	$grp	1567	$grp
1496	}	1568	}
1497		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
1498	sub load_extensions {	1581	sub load_extensions {
1499	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1500		1585
1501	cf::sync_job {	1586	cf::sync_job {
1502	my %todo;	1587	my %todo;
1503		1588
1504	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1547	unless exists $done{$_};	1632	unless exists $done{$_};
1548	}	1633	}
1549		1634
1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1551		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
1552	my $active = eval $v->{source};	1646	my $active = eval $source;
1553		1647
1554	if (length $@) {	1648	if (length $@) {
1555	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1556		1650
1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1844	}	1938	}
1845		1939
1846	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1847		1941
1848	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1849
1850	=item $player->ext_reply ($msgid, @msg)
1851
1852	Sends an ext reply to the player.
1853
1854	=cut
1855
1856	sub ext_reply($$@) {
1857	my ($self, $id, @msg) = @_;
1858
1859	$self->ns->ext_reply ($id, @msg)
1860	}
1861		1943
1862	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1863		1945
1864	Sends an ext event to the client.	1946	Sends an ext event to the client.
1865		1947
…		…
2568		2650
2569	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.
2570		2652
2571	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2572		2654
2573	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,
2574	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2575		2657
2576	=cut	2658	=cut
2577		2659
2578	sub deref {	2660	sub deref {
…		…
2960		3042
2961	=head3 cf::client	3043	=head3 cf::client
2962		3044
2963	=over 4	3045	=over 4
2964		3046
2965	=item $client->send_drawinfo ($text, $flags)
2966
2967	Sends a drawinfo packet to the client. Circumvents output buffering so
2968	should not be used under normal circumstances.
2969
2970	=cut
2971
2972	sub cf::client::send_drawinfo {
2973	my ($self, $text, $flags) = @_;
2974
2975	utf8::encode $text;
2976	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2977	}
2978
2979	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2980		3048
2981	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
2982	them as required.	3050	them as required.
2983		3051
…		…
3001	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
3002	}	3070	}
3003		3071
3004	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
3005		3073
3006	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
3007	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
3008	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
3009	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
3010		3078
3011	=cut	3079	=cut
3012		3080
3013	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3118	id => "death",	3186	id => "death",
3119	title => "Death",	3187	title => "Death",
3120	reply => undef,	3188	reply => undef,
3121	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3122	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3123	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3124	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3125	);	3199	);
3126		3200
3127	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3170	=cut	3244	=cut
3171		3245
3172	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3173	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3174		3248
3175	if ($self->extcmd == 2) {
3176	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3177	} elsif ($self->extcmd == 1) { # TODO: remove
3178	push @msg, msgtype => "event_$type";
3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180	}
3181	}
3182
3183	=item $client->ext_reply ($msgid, @msg)
3184
3185	Sends an ext reply to the client.
3186
3187	=cut
3188
3189	sub cf::client::ext_reply($$@) {
3190	my ($self, $id, @msg) = @_;
3191
3192	return unless $self->extcmd == 2;
3193
3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3195	}	3250	}
3196		3251
3197	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3198		3253
3199	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3219		3274
3220	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3221	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3222		3277
3223	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3224	}	3317	}
3225		3318
3226	cf::client->attach (	3319	cf::client->attach (
3227	on_connect => sub {	3320	on_connect => sub {
3228	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3257		3350
3258	if (ref $msg) {	3351	if (ref $msg) {
3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3260		3353
3261	my @reply;
3262
3263	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3264	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3265	}	3372	}
3266
3267	$ns->ext_reply ($reply, @reply)
3268	if $reply;
3269
3270	} else {	3373	} else {
3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3272	}	3375	}
3273		3376
3274	cf::override;	3377	cf::override;
…		…
3442	=cut	3545	=cut
3443		3546
3444	#############################################################################	3547	#############################################################################
3445	# the server's init and main functions	3548	# the server's init and main functions
3446		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3447	sub load_facedata($) {	3627	sub load_facedata($) {
3448	my ($path) = @_;	3628	my ($path) = @_;
3449		3629
3450	# HACK to clear player env face cache, we need some signal framework
3451	# for this (global event?)
3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3453
3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3455		3631
3456	trace "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3457		3633
3458	my $facedata = decode_storable load_file $path;	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3459		3635
3460	$facedata->{version} == 2	3636	$facedata->{version} == 2
3461	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3462		3638
3463	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3464	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3465	$facedata->{resource}{"res/exp_table"} = {	3641
3466	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3467	data => $exp_table,	3643
3468	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3469	};	3645	# from here on, everything must be atomic - no thread switch allowed
3470	cf::cede_to_tick;	3646	my $t1 = EV::time;
3471		3647
3472	{	3648	{
3473	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3474		3650
3475	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3476	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3477		3654
3478	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3479	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3483		3660	$cf::face::HASH{$info->{hash64}} = $idx;
3484	cf::cede_to_tick;	3661	delete $cf::face::META[$idx];
3485	}	3662	}
3486		3663
3487	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3488	next unless $info->{smooth};	3665	next unless $info->{smooth};
3489		3666
…		…
3494	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3496	} else {	3673	} else {
3497	error "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3498	}	3675	}
3499
3500	cf::cede_to_tick;
3501	}	3676	}
3502	}	3677	}
3503		3678
3504	{	3679	{
3505	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3506		3681
3507	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3508	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3509	cf::cede_to_tick;
3510	}	3684	}
3511		3685
3512	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3513	}	3687	}
3514		3688
…		…
3518	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3519	if (defined (my $type = $info->{type})) {	3693	if (defined (my $type = $info->{type})) {
3520	# TODO: different hash - must free and use new index, or cache ixface data queue	3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3521	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3522		3696
3523	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3524	cf::face::set_type $idx, $type;	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
3525	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already	3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3526	} else {	3703	} else {
3527	# $RESOURCE{$name} = $info; # unused	3704	# $RESOURCE{$name} = $info; # unused
3528	}	3705	}
3529
3530	cf::cede_to_tick;
3531	}	3706	}
3532	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3533		3718
3534	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3720
		3721	aio_close $fh if $fh; # close old facedata
3535		3722
3536	1	3723	1
3537	}	3724	}
3538		3725
3539	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
…		…
3550	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3551	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3552	cf::arch::commit_load;	3739	cf::arch::commit_load;
3553		3740
3554	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3555	}	3756	}
3556		3757
3557	sub reload_regions {	3758	sub reload_regions {
3558	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3559	# for this (global event?)	3760	# for this (global event?)
…		…
3567	if exists $_->{match};	3768	if exists $_->{match};
3568	}	3769	}
3569	}	3770	}
3570		3771
3571	sub reload_facedata {	3772	sub reload_facedata {
3572	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3573	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3574	}	3775	}
3575		3776
3576	sub reload_archetypes {	3777	sub reload_archetypes {
3577	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3578	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
		3792
		3793	# command completion
		3794	my @commands;
		3795
		3796	for (0..cf::arch::skillvec_size - 1) {
		3797	my $skill = cf::arch::skillvec $_;
		3798	my $name = $skill->name;
		3799	my $flags = cf::skill_flags $skill->subtype;
		3800
		3801	push @commands, "ready_skill $name" if $flags & (SF_COMBAT \| SF_RANGED \| SF_GRACE);
		3802	push @commands, "use_skill $name" if $flags & (SF_USE \| SF_AUTARK \| SF_GRACE);
		3803	}
		3804
		3805	cf::client::set_command_face skill => \@commands;
3579	}	3806	}
3580		3807
3581	sub reload_treasures {	3808	sub reload_treasures {
3582	load_resource_file "$DATADIR/treasures"	3809	load_resource_file "$DATADIR/treasures"
3583	or die "unable to load treasurelists\n";	3810	or die "unable to load treasurelists\n";
…		…
3604	}	3831	}
3605		3832
3606	sub reload_resources {	3833	sub reload_resources {
3607	trace "reloading resource files...\n";	3834	trace "reloading resource files...\n";
3608		3835
3609	reload_exp_table;
3610	reload_materials;	3836	reload_materials;
3611	reload_facedata;	3837	reload_facedata;
		3838	reload_exp_table;
3612	reload_sound;	3839	reload_sound;
3613	reload_archetypes;	3840	reload_archetypes;
3614	reload_regions;	3841	reload_regions;
3615	reload_treasures;	3842	reload_treasures;
3616		3843
…		…
3675	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3902	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3676		3903
3677	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3904	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3678		3905
3679	# we must not ever block the main coroutine	3906	# we must not ever block the main coroutine
3680	local $Coro::idle = sub {	3907	$Coro::idle = sub {
3681	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3908	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3682	(async {	3909	(async {
3683	$Coro::current->{desc} = "IDLE BUG HANDLER";	3910	$Coro::current->{desc} = "IDLE BUG HANDLER";
3684	EV::loop EV::LOOP_ONESHOT;	3911	EV::loop EV::LOOP_ONESHOT;
3685	})->prio (Coro::PRIO_MAX);	3912	})->prio (Coro::PRIO_MAX);
…		…
3688	evthread_start IO::AIO::poll_fileno;	3915	evthread_start IO::AIO::poll_fileno;
3689		3916
3690	cf::sync_job {	3917	cf::sync_job {
3691	cf::incloader::init ();	3918	cf::incloader::init ();
3692		3919
		3920	db_init;
		3921
3693	cf::init_anim;	3922	cf::init_anim;
3694	cf::init_attackmess;	3923	cf::init_attackmess;
3695	cf::init_dynamic;	3924	cf::init_dynamic;
3696		3925
3697	cf::load_settings;	3926	cf::load_settings;
3698		3927
3699	reload_resources;	3928	reload_resources;
3700	reload_config;	3929	reload_config;
3701	db_init;
3702		3930
3703	cf::init_uuid;	3931	cf::init_uuid;
3704	cf::init_signals;	3932	cf::init_signals;
3705	cf::init_skills;	3933	cf::init_skills;
3706		3934
…		…
4131	}	4359	}
4132	}	4360	}
4133		4361
4134	{	4362	{
4135	# configure BDB	4363	# configure BDB
		4364	info "initialising database";
4136		4365
4137	BDB::min_parallel 16;	4366	BDB::min_parallel 16;
4138	BDB::max_poll_reqs $TICK * 0.1;	4367	BDB::max_poll_reqs $TICK * 0.1;
4139	#$AnyEvent::BDB::WATCHER->priority (1);	4368	#$AnyEvent::BDB::WATCHER->priority (1);
4140		4369
…		…
4169	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4398	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170	};	4399	};
4171	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4400	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4401	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173	};	4402	};
		4403
		4404	info "database initialised";
4174	}	4405	}
4175		4406
4176	{	4407	{
4177	# configure IO::AIO	4408	# configure IO::AIO
4178		4409
		4410	info "initialising aio";
4179	IO::AIO::min_parallel 8;	4411	IO::AIO::min_parallel 8;
4180	IO::AIO::max_poll_time $TICK * 0.1;	4412	IO::AIO::max_poll_time $TICK * 0.1;
4181	undef $AnyEvent::AIO::WATCHER;	4413	undef $AnyEvent::AIO::WATCHER;
		4414	info "aio initialised";
4182	}	4415	}
4183		4416
4184	our $_log_backtrace;	4417	our $_log_backtrace;
4185	our $_log_backtrace_last;	4418	our $_log_backtrace_last;
4186		4419

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC vs. Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.580 by root, Wed Jan 4 03:22:48 2012 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC