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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 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 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;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		117
113	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
114		119
115	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
117		122
118	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
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
…		…
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 (
…		…
1461	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1462		1523
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) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467	"ARRAY" eq ref $msg
1468	? @$msg
1469	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470		1528
1471	my @reply;
1472
1473	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}) {
1474	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1475	}	1547	}
1476
1477	$pl->ext_reply ($reply, @reply)
1478	if $reply;
1479		1548
1480	} else {	1549	} else {
1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482	}	1551	}
1483		1552
…		…
1496	};	1565	};
1497		1566
1498	$grp	1567	$grp
1499	}	1568	}
1500		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
1501	sub load_extensions {	1581	sub load_extensions {
1502	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1503		1585
1504	cf::sync_job {	1586	cf::sync_job {
1505	my %todo;	1587	my %todo;
1506		1588
1507	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1550	unless exists $done{$_};	1632	unless exists $done{$_};
1551	}	1633	}
1552		1634
1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554		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
1555	my $active = eval $v->{source};	1646	my $active = eval $source;
1556		1647
1557	if (length $@) {	1648	if (length $@) {
1558	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1559		1650
1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1847	}	1938	}
1848		1939
1849	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850		1941
1851	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1852
1853	=item $player->ext_reply ($msgid, @msg)
1854
1855	Sends an ext reply to the player.
1856
1857	=cut
1858
1859	sub ext_reply($$@) {
1860	my ($self, $id, @msg) = @_;
1861
1862	$self->ns->ext_reply ($id, @msg)
1863	}
1864		1943
1865	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1866		1945
1867	Sends an ext event to the client.	1946	Sends an ext event to the client.
1868		1947
…		…
2571		2650
2572	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.
2573		2652
2574	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2575		2654
2576	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,
2577	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2578		2657
2579	=cut	2658	=cut
2580		2659
2581	sub deref {	2660	sub deref {
…		…
2963		3042
2964	=head3 cf::client	3043	=head3 cf::client
2965		3044
2966	=over 4	3045	=over 4
2967		3046
2968	=item $client->send_drawinfo ($text, $flags)
2969
2970	Sends a drawinfo packet to the client. Circumvents output buffering so
2971	should not be used under normal circumstances.
2972
2973	=cut
2974
2975	sub cf::client::send_drawinfo {
2976	my ($self, $text, $flags) = @_;
2977
2978	utf8::encode $text;
2979	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2980	}
2981
2982	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2983		3048
2984	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
2985	them as required.	3050	them as required.
2986		3051
…		…
3004	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
3005	}	3070	}
3006		3071
3007	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
3008		3073
3009	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
3010	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
3011	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
3012	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
3013		3078
3014	=cut	3079	=cut
3015		3080
3016	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3121	id => "death",	3186	id => "death",
3122	title => "Death",	3187	title => "Death",
3123	reply => undef,	3188	reply => undef,
3124	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3125	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3126	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3127	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3128	);	3199	);
3129		3200
3130	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3173	=cut	3244	=cut
3174		3245
3175	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3176	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3177		3248
3178	if ($self->extcmd == 2) {
3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3180	} elsif ($self->extcmd == 1) { # TODO: remove
3181	push @msg, msgtype => "event_$type";
3182	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183	}
3184	}
3185
3186	=item $client->ext_reply ($msgid, @msg)
3187
3188	Sends an ext reply to the client.
3189
3190	=cut
3191
3192	sub cf::client::ext_reply($$@) {
3193	my ($self, $id, @msg) = @_;
3194
3195	if ($self->extcmd == 2) {
3196	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3197	} elsif ($self->extcmd == 1) {
3198	#TODO: version 1, remove
3199	unshift @msg, msgtype => "reply", msgid => $id;
3200	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3201	}
3202	}	3250	}
3203		3251
3204	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3205		3253
3206	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3261	my ($ns, $buf) = @_;	3309	my ($ns, $buf) = @_;
3262		3310
3263	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3311	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3264		3312
3265	if (ref $msg) {	3313	if (ref $msg) {
3266	my ($type, $reply, @payload) =	3314	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3267	"ARRAY" eq ref $msg
3268	? @$msg
3269	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3270		3315
3271	my @reply;
3272
3273	if (my $cb = $EXTICMD{$type}) {	3316	if (my $cb = $EXTIACMD{$type}) {
		3317	$cb->(
		3318	$ns,
		3319	sub {
		3320	$ns->ext_msg ("reply-$reply", @_)
		3321	if $reply;
		3322	},
		3323	@payload
		3324	);
		3325	} else {
		3326	my @reply;
		3327
		3328	if (my $cb = $EXTICMD{$type}) {
3274	@reply = $cb->($ns, @payload);	3329	@reply = $cb->($ns, @payload);
		3330	}
		3331
		3332	$ns->ext_msg ("reply-$reply", @reply)
		3333	if $reply;
3275	}	3334	}
3276
3277	$ns->ext_reply ($reply, @reply)
3278	if $reply;
3279
3280	} else {	3335	} else {
3281	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3336	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3282	}	3337	}
3283		3338
3284	cf::override;	3339	cf::override;
…		…
3452	=cut	3507	=cut
3453		3508
3454	#############################################################################	3509	#############################################################################
3455	# the server's init and main functions	3510	# the server's init and main functions
3456		3511
		3512	{
		3513	package cf::face;
		3514
		3515	our %HASH; # hash => idx
		3516	our @DATA; # dynamically-created facedata, only faceste 0 used
		3517	our @FOFS; # file offset, if > 0
		3518	our @SIZE; # size of face, in octets
		3519	our @META; # meta hash of face, if any
		3520	our $DATAFH; # facedata filehandle
		3521
		3522	# internal api, not finalised
		3523	sub set {
		3524	my ($name, $type, $data) = @_;
		3525
		3526	my $idx = cf::face::find $name;
		3527
		3528	if ($idx) {
		3529	delete $HASH{cf::face::get_csum $idx};
		3530	} else {
		3531	$idx = cf::face::alloc $name;
		3532	}
		3533
		3534	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3535
		3536	cf::face::set_type $idx, $type;
		3537	cf::face::set_csum $idx, 0, $hash;
		3538
		3539	# we need to destroy the SV itself, not just modify it, as a running ix
		3540	# might hold a reference to it: "delete" achieves that.
		3541	delete $FOFS[0][$idx];
		3542	delete $DATA[0][$idx];
		3543	$DATA[0][$idx] = $data;
		3544	$SIZE[0][$idx] = length $data;
		3545	delete $META[$idx];
		3546	$HASH{$hash} = $idx;#d#
		3547
		3548	$idx
		3549	}
		3550
		3551	sub _get_data($$$) {
		3552	my ($idx, $set, $cb) = @_;
		3553
		3554	if (defined $DATA[$set][$idx]) {
		3555	$cb->($DATA[$set][$idx]);
		3556	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3557	my $size = $SIZE[$set][$idx];
		3558	my $buf;
		3559	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3560	if ($_[0] == $size) {
		3561	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3562	$cb->($buf);
		3563	} else {
		3564	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3565	}
		3566	};
		3567	} else {
		3568	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3569	}
		3570	}
		3571
		3572	# rather ineffient
		3573	sub cf::face::get_data($;$) {
		3574	my ($idx, $set) = @_;
		3575
		3576	_get_data $idx, $set, Coro::rouse_cb;
		3577	Coro::rouse_wait
		3578	}
		3579
		3580	sub cf::face::ix {
		3581	my ($ns, $set, $idx, $pri) = @_;
		3582
		3583	_get_data $idx, $set, sub {
		3584	$ns->ix_send ($idx, $pri, $_[0]);
		3585	};
		3586	}
		3587	}
		3588
3457	sub load_facedata($) {	3589	sub load_facedata($) {
3458	my ($path) = @_;	3590	my ($path) = @_;
3459		3591
3460	# HACK to clear player env face cache, we need some signal framework
3461	# for this (global event?)
3462	%ext::player_env::MUSIC_FACE_CACHE = ();
3463
3464	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3592	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3465		3593
3466	trace "loading facedata from $path\n";	3594	trace "loading facedata from $path\n";
3467		3595
3468	my $facedata = decode_storable load_file $path;	3596	my $facedata = decode_storable load_file "$path/faceinfo";
3469		3597
3470	$facedata->{version} == 2	3598	$facedata->{version} == 2
3471	or cf::cleanup "$path: version mismatch, cannot proceed.";	3599	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3472		3600
3473	# patch in the exptable	3601	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3474	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3602	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3475	$facedata->{resource}{"res/exp_table"} = {	3603
3476	type => FT_RSRC,	3604	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3477	data => $exp_table,	3605
3478	hash => (Digest::MD5::md5 $exp_table),	3606	# BEGIN ATOMIC
3479	};	3607	# from here on, everything must be atomic - no thread switch allowed
3480	cf::cede_to_tick;	3608	my $t1 = EV::time;
3481		3609
3482	{	3610	{
3483	my $faces = $facedata->{faceinfo};	3611	my $faces = $facedata->{faceinfo};
3484		3612
3485	while (my ($face, $info) = each %$faces) {	3613	for my $face (sort keys %$faces) {
		3614	my $info = $faces->{$face};
3486	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3615	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3487		3616
3488	cf::face::set_visibility $idx, $info->{visibility};	3617	cf::face::set_visibility $idx, $info->{visibility};
3489	cf::face::set_magicmap $idx, $info->{magicmap};	3618	cf::face::set_magicmap $idx, $info->{magicmap};
3490	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3619	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3491	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3620	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3492	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3621	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3493		3622	$cf::face::HASH{$info->{hash64}} = $idx;
3494	cf::cede_to_tick;	3623	delete $cf::face::META[$idx];
3495	}	3624	}
3496		3625
3497	while (my ($face, $info) = each %$faces) {	3626	while (my ($face, $info) = each %$faces) {
3498	next unless $info->{smooth};	3627	next unless $info->{smooth};
3499		3628
…		…
3504	cf::face::set_smooth $idx, $smooth;	3633	cf::face::set_smooth $idx, $smooth;
3505	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3634	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3506	} else {	3635	} else {
3507	error "smooth face '$info->{smooth}' not found for face '$face'";	3636	error "smooth face '$info->{smooth}' not found for face '$face'";
3508	}	3637	}
3509
3510	cf::cede_to_tick;
3511	}	3638	}
3512	}	3639	}
3513		3640
3514	{	3641	{
3515	my $anims = $facedata->{animinfo};	3642	my $anims = $facedata->{animinfo};
3516		3643
3517	while (my ($anim, $info) = each %$anims) {	3644	while (my ($anim, $info) = each %$anims) {
3518	cf::anim::set $anim, $info->{frames}, $info->{facings};	3645	cf::anim::set $anim, $info->{frames}, $info->{facings};
3519	cf::cede_to_tick;
3520	}	3646	}
3521		3647
3522	cf::anim::invalidate_all; # d'oh	3648	cf::anim::invalidate_all; # d'oh
3523	}	3649	}
3524		3650
3525	{	3651	{
3526	my $res = $facedata->{resource};	3652	my $res = $facedata->{resource};
3527		3653
3528	while (my ($name, $info) = each %$res) {	3654	while (my ($name, $info) = each %$res) {
3529	if (defined $info->{type}) {	3655	if (defined (my $type = $info->{type})) {
		3656	# TODO: different hash - must free and use new index, or cache ixface data queue
3530	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3657	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3531		3658
3532	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3533	cf::face::set_type $idx, $info->{type};	3659	cf::face::set_type $idx, $type;
		3660	cf::face::set_csum $idx, 0, $info->{hash};
		3661	$cf::face::SIZE[0][$idx] = $info->{size};
		3662	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3663	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3664	$cf::face::HASH{$info->{hash}} = $idx;
3534	} else {	3665	} else {
3535	$RESOURCE{$name} = $info; # unused	3666	# $RESOURCE{$name} = $info; # unused
3536	}	3667	}
3537
3538	cf::cede_to_tick;
3539	}	3668	}
3540	}	3669	}
		3670
		3671	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3672
		3673	# HACK to clear player env face cache, we need some signal framework
		3674	# for this (global event?)
		3675	%ext::player_env::MUSIC_FACE_CACHE = ();
		3676
		3677	# END ATOMIC
		3678
		3679	cf::debug "facedata atomic update time ", EV::time - $t1;
3541		3680
3542	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3681	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3682
		3683	aio_close $fh if $fh; # close old facedata
3543		3684
3544	1	3685	1
3545	}	3686	}
3546		3687
3547	register_exticmd fx_want => sub {	3688	register_exticmd fx_want => sub {
…		…
3558	my $status = load_resource_file_ $_[0];	3699	my $status = load_resource_file_ $_[0];
3559	get_slot 0.1, 100;	3700	get_slot 0.1, 100;
3560	cf::arch::commit_load;	3701	cf::arch::commit_load;
3561		3702
3562	$status	3703	$status
		3704	}
		3705
		3706	sub reload_exp_table {
		3707	_reload_exp_table;
		3708
		3709	cf::face::set
		3710	"res/exp_table" => FT_RSRC,
		3711	JSON::XS->new->utf8->canonical->encode (
		3712	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3713	);
		3714	}
		3715
		3716	sub reload_materials {
		3717	_reload_materials;
3563	}	3718	}
3564		3719
3565	sub reload_regions {	3720	sub reload_regions {
3566	# HACK to clear player env face cache, we need some signal framework	3721	# HACK to clear player env face cache, we need some signal framework
3567	# for this (global event?)	3722	# for this (global event?)
…		…
3575	if exists $_->{match};	3730	if exists $_->{match};
3576	}	3731	}
3577	}	3732	}
3578		3733
3579	sub reload_facedata {	3734	sub reload_facedata {
3580	load_facedata "$DATADIR/facedata"	3735	load_facedata $DATADIR
3581	or die "unable to load facedata\n";	3736	or die "unable to load facedata\n";
3582	}	3737	}
3583		3738
3584	sub reload_archetypes {	3739	sub reload_archetypes {
3585	load_resource_file "$DATADIR/archetypes"	3740	load_resource_file "$DATADIR/archetypes"
3586	or die "unable to load archetypes\n";	3741	or die "unable to load archetypes\n";
		3742
		3743	cf::face::set
		3744	"res/skill_info" => FT_RSRC,
		3745	JSON::XS->new->utf8->canonical->encode (
		3746	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3747	);
		3748
		3749	cf::face::set
		3750	"res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3587	}	3754	}
3588		3755
3589	sub reload_treasures {	3756	sub reload_treasures {
3590	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3591	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
…		…
3612	}	3779	}
3613		3780
3614	sub reload_resources {	3781	sub reload_resources {
3615	trace "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3616		3783
3617	reload_exp_table;
3618	reload_materials;	3784	reload_materials;
3619	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
3620	reload_sound;	3787	reload_sound;
3621	reload_archetypes;	3788	reload_archetypes;
3622	reload_regions;	3789	reload_regions;
3623	reload_treasures;	3790	reload_treasures;
3624		3791
…		…
3676		3843
3677	sub main {	3844	sub main {
3678	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3679		3846
3680	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3681	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3682	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3683	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3684		3851
3685	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3686		3853
3687	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3688	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3689	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3690	(async {	3857	(async {
3691	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3692	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3693	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
…		…
3696	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3697		3864
3698	cf::sync_job {	3865	cf::sync_job {
3699	cf::incloader::init ();	3866	cf::incloader::init ();
3700		3867
		3868	db_init;
		3869
3701	cf::init_anim;	3870	cf::init_anim;
3702	cf::init_attackmess;	3871	cf::init_attackmess;
3703	cf::init_dynamic;	3872	cf::init_dynamic;
3704		3873
3705	cf::load_settings;	3874	cf::load_settings;
3706		3875
3707	reload_resources;	3876	reload_resources;
3708	reload_config;	3877	reload_config;
3709	db_init;
3710		3878
3711	cf::init_uuid;	3879	cf::init_uuid;
3712	cf::init_signals;	3880	cf::init_signals;
3713	cf::init_skills;	3881	cf::init_skills;
3714		3882
…		…
3728	};	3896	};
3729		3897
3730	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3731	info "parse errors in files are no longer fatal from this point on.\n";	3899	info "parse errors in files are no longer fatal from this point on.\n";
3732		3900
3733	my $free_main; $free_main = EV::idle sub {	3901	AE::postpone {
3734	undef $free_main;
3735	undef &main; # free gobs of memory :)	3902	undef &main; # free gobs of memory :)
3736	};	3903	};
3737		3904
3738	goto &main_loop;	3905	goto &main_loop;
3739	}	3906	}
…		…
3896		4063
3897	cf::write_runtime_sync; # external watchdog should not bark	4064	cf::write_runtime_sync; # external watchdog should not bark
3898		4065
3899	trace "emergency_perl_save: flushing outstanding aio requests";	4066	trace "emergency_perl_save: flushing outstanding aio requests";
3900	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4067	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3901	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3902	}	4069	}
3903		4070
3904	cf::write_runtime_sync; # external watchdog should not bark	4071	cf::write_runtime_sync; # external watchdog should not bark
3905	};	4072	};
3906		4073
…		…
4140	}	4307	}
4141	}	4308	}
4142		4309
4143	{	4310	{
4144	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4145		4313
4146	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4147	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4148	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4149		4317
4150	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4151	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4152	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4153	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4178	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4179	};	4347	};
4180	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4181	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4182	};	4350	};
		4351
		4352	info "database initialised";
4183	}	4353	}
4184		4354
4185	{	4355	{
4186	# configure IO::AIO	4356	# configure IO::AIO
4187		4357
		4358	info "initialising aio";
4188	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4189	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4190	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4191	}	4363	}
4192		4364
4193	our $_log_backtrace;	4365	our $_log_backtrace;
4194	our $_log_backtrace_last;	4366	our $_log_backtrace_last;
4195		4367

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC vs. Revision 1.608 by root, Sun Nov 18 09:53:57 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.574 by root, Sun May 8 21:51:27 2011 UTC vs.
Revision 1.608 by root, Sun Nov 18 09:53:57 2012 UTC