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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010,2011 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
…		…
2267	# if $self->per_party;	2346	# if $self->per_party;
2268		2347
2269	$self	2348	$self
2270	}	2349	}
2271		2350
2272	# find and load all maps in the 3x3 area around a map
2273	sub load_neighbours {
2274	my ($map) = @_;
2275
2276	my @neigh; # diagonal neighbours
2277
2278	for (0 .. 3) {
2279	my $neigh = $map->tile_path ($_)
2280	or next;
2281	$neigh = find $neigh, $map
2282	or next;
2283	$neigh->load;
2284
2285	# now find the diagonal neighbours
2286	push @neigh,
2287	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2288	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2289	}
2290
2291	for (grep defined $_->[0], @neigh) {
2292	my ($path, $origin) = @$_;
2293	my $neigh = find $path, $origin
2294	or next;
2295	$neigh->load;
2296	}
2297	}
2298
2299	sub find_sync {	2351	sub find_sync {
2300	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2301		2353
2302	# it's a bug to call this from the main context	2354	# it's a bug to call this from the main context
2303	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
…		…
2598		2650
2599	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.
2600		2652
2601	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2602		2654
2603	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,
2604	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2605		2657
2606	=cut	2658	=cut
2607		2659
2608	sub deref {	2660	sub deref {
…		…
2775	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2776	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2777	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2778		2830
2779	$map->load;	2831	$map->load;
2780	$map->load_neighbours;
2781		2832
2782	return unless $self->contr->active;	2833	return unless $self->contr->active;
2783		2834
2784	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2785	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
3002		3053
3003	sub cf::client::send_drawinfo {	3054	sub cf::client::send_drawinfo {
3004	my ($self, $text, $flags) = @_;	3055	my ($self, $text, $flags) = @_;
3005		3056
3006	utf8::encode $text;	3057	utf8::encode $text;
3007	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);	3058	$self->send_packet (sprintf "msg %d log %s", $flags \|\| cf::NDI_BLACK, $text);
3008	}	3059	}
3009		3060
3010	=item $client->send_big_packet ($pkt)	3061	=item $client->send_big_packet ($pkt)
3011		3062
3012	Like C<send_packet>, but tries to compress large packets, and fragments	3063	Like C<send_packet>, but tries to compress large packets, and fragments
…		…
3032	$self->send_packet ($pkt);	3083	$self->send_packet ($pkt);
3033	}	3084	}
3034		3085
3035	=item $client->send_msg ($channel, $msg, $color, [extra...])	3086	=item $client->send_msg ($channel, $msg, $color, [extra...])
3036		3087
3037	Send a drawinfo or msg packet to the client, formatting the msg for the	3088	Send a msg packet to the client, formatting the msg for the client if
3038	client if neccessary. C<$type> should be a string identifying the type of	3089	necessary. C<$type> should be a string identifying the type of the
3039	the message, with C<log> being the default. If C<$color> is negative, suppress	3090	message, with C<log> being the default. If C<$color> is negative, suppress
3040	the message unless the client supports the msg packet.	3091	the message unless the client supports the msg packet.
3041		3092
3042	=cut	3093	=cut
3043		3094
3044	# non-persistent channels (usually the info channel)	3095	# non-persistent channels (usually the info channel)
…		…
3149	id => "death",	3200	id => "death",
3150	title => "Death",	3201	title => "Death",
3151	reply => undef,	3202	reply => undef,
3152	tooltip => "Reason for and more info about your most recent death",	3203	tooltip => "Reason for and more info about your most recent death",
3153	},	3204	},
		3205	"c/fatal" => {
		3206	id => "fatal",
		3207	title => "Fatal Error",
		3208	reply => undef,
		3209	tooltip => "Reason for the server disconnect",
		3210	},
3154	"c/say" => $SAY_CHANNEL,	3211	"c/say" => $SAY_CHANNEL,
3155	"c/chat" => $CHAT_CHANNEL,	3212	"c/chat" => $CHAT_CHANNEL,
3156	);	3213	);
3157		3214
3158	sub cf::client::send_msg {	3215	sub cf::client::send_msg {
…		…
3201	=cut	3258	=cut
3202		3259
3203	sub cf::client::ext_msg($$@) {	3260	sub cf::client::ext_msg($$@) {
3204	my ($self, $type, @msg) = @_;	3261	my ($self, $type, @msg) = @_;
3205		3262
3206	if ($self->extcmd == 2) {
3207	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3263	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3208	} elsif ($self->extcmd == 1) { # TODO: remove
3209	push @msg, msgtype => "event_$type";
3210	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3211	}
3212	}
3213
3214	=item $client->ext_reply ($msgid, @msg)
3215
3216	Sends an ext reply to the client.
3217
3218	=cut
3219
3220	sub cf::client::ext_reply($$@) {
3221	my ($self, $id, @msg) = @_;
3222
3223	if ($self->extcmd == 2) {
3224	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3225	} elsif ($self->extcmd == 1) {
3226	#TODO: version 1, remove
3227	unshift @msg, msgtype => "reply", msgid => $id;
3228	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3229	}
3230	}	3264	}
3231		3265
3232	=item $success = $client->query ($flags, "text", \&cb)	3266	=item $success = $client->query ($flags, "text", \&cb)
3233		3267
3234	Queues a query to the client, calling the given callback with	3268	Queues a query to the client, calling the given callback with
…		…
3289	my ($ns, $buf) = @_;	3323	my ($ns, $buf) = @_;
3290		3324
3291	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3325	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3292		3326
3293	if (ref $msg) {	3327	if (ref $msg) {
3294	my ($type, $reply, @payload) =	3328	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3295	"ARRAY" eq ref $msg
3296	? @$msg
3297	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3298		3329
3299	my @reply;
3300
3301	if (my $cb = $EXTICMD{$type}) {	3330	if (my $cb = $EXTIACMD{$type}) {
		3331	$cb->(
		3332	$ns,
		3333	sub {
		3334	$ns->ext_msg ("reply-$reply", @_)
		3335	if $reply;
		3336	},
		3337	@payload
		3338	);
		3339	} else {
		3340	my @reply;
		3341
		3342	if (my $cb = $EXTICMD{$type}) {
3302	@reply = $cb->($ns, @payload);	3343	@reply = $cb->($ns, @payload);
		3344	}
		3345
		3346	$ns->ext_msg ("reply-$reply", @reply)
		3347	if $reply;
3303	}	3348	}
3304
3305	$ns->ext_reply ($reply, @reply)
3306	if $reply;
3307
3308	} else {	3349	} else {
3309	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3350	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3310	}	3351	}
3311		3352
3312	cf::override;	3353	cf::override;
…		…
3480	=cut	3521	=cut
3481		3522
3482	#############################################################################	3523	#############################################################################
3483	# the server's init and main functions	3524	# the server's init and main functions
3484		3525
		3526	{
		3527	package cf::face;
		3528
		3529	our %HASH; # hash => idx
		3530	our @DATA; # dynamically-created facedata, only faceste 0 used
		3531	our @FOFS; # file offset, if > 0
		3532	our @SIZE; # size of face, in octets
		3533	our @META; # meta hash of face, if any
		3534	our $DATAFH; # facedata filehandle
		3535
		3536	# internal api, not finalised
		3537	sub set {
		3538	my ($name, $type, $data) = @_;
		3539
		3540	my $idx = cf::face::find $name;
		3541
		3542	if ($idx) {
		3543	delete $HASH{cf::face::get_csum $idx};
		3544	} else {
		3545	$idx = cf::face::alloc $name;
		3546	}
		3547
		3548	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3549
		3550	cf::face::set_type $idx, $type;
		3551	cf::face::set_csum $idx, 0, $hash;
		3552
		3553	# we need to destroy the SV itself, not just modify it, as a running ix
		3554	# might hold a reference to it: "delete" achieves that.
		3555	delete $FOFS[0][$idx];
		3556	delete $DATA[0][$idx];
		3557	$DATA[0][$idx] = $data;
		3558	$SIZE[0][$idx] = length $data;
		3559	delete $META[$idx];
		3560	$HASH{$hash} = $idx;#d#
		3561
		3562	$idx
		3563	}
		3564
		3565	sub _get_data($$$) {
		3566	my ($idx, $set, $cb) = @_;
		3567
		3568	if (defined $DATA[$set][$idx]) {
		3569	$cb->($DATA[$set][$idx]);
		3570	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3571	my $size = $SIZE[$set][$idx];
		3572	my $buf;
		3573	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3574	if ($_[0] == $size) {
		3575	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3576	$cb->($buf);
		3577	} else {
		3578	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3579	}
		3580	};
		3581	} else {
		3582	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3583	}
		3584	}
		3585
		3586	# rather ineffient
		3587	sub cf::face::get_data($;$) {
		3588	my ($idx, $set) = @_;
		3589
		3590	_get_data $idx, $set, Coro::rouse_cb;
		3591	Coro::rouse_wait
		3592	}
		3593
		3594	sub cf::face::ix {
		3595	my ($ns, $set, $idx, $pri) = @_;
		3596
		3597	_get_data $idx, $set, sub {
		3598	$ns->ix_send ($idx, $pri, $_[0]);
		3599	};
		3600	}
		3601	}
		3602
3485	sub load_facedata($) {	3603	sub load_facedata($) {
3486	my ($path) = @_;	3604	my ($path) = @_;
3487		3605
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;	3606	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3493		3607
3494	trace "loading facedata from $path\n";	3608	trace "loading facedata from $path\n";
3495		3609
3496	my $facedata = decode_storable load_file $path;	3610	my $facedata = decode_storable load_file "$path/faceinfo";
3497		3611
3498	$facedata->{version} == 2	3612	$facedata->{version} == 2
3499	or cf::cleanup "$path: version mismatch, cannot proceed.";	3613	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3500		3614
3501	# patch in the exptable	3615	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]);	3616	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3503	$facedata->{resource}{"res/exp_table"} = {	3617
3504	type => FT_RSRC,	3618	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3505	data => $exp_table,	3619
3506	hash => (Digest::MD5::md5 $exp_table),	3620	# BEGIN ATOMIC
3507	};	3621	# from here on, everything must be atomic - no thread switch allowed
3508	cf::cede_to_tick;	3622	my $t1 = EV::time;
3509		3623
3510	{	3624	{
3511	my $faces = $facedata->{faceinfo};	3625	my $faces = $facedata->{faceinfo};
3512		3626
3513	while (my ($face, $info) = each %$faces) {	3627	for my $face (sort keys %$faces) {
		3628	my $info = $faces->{$face};
3514	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3629	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3515		3630
3516	cf::face::set_visibility $idx, $info->{visibility};	3631	cf::face::set_visibility $idx, $info->{visibility};
3517	cf::face::set_magicmap $idx, $info->{magicmap};	3632	cf::face::set_magicmap $idx, $info->{magicmap};
3518	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3633	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3519	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3634	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3520	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3635	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3521		3636	$cf::face::HASH{$info->{hash64}} = $idx;
3522	cf::cede_to_tick;	3637	delete $cf::face::META[$idx];
3523	}	3638	}
3524		3639
3525	while (my ($face, $info) = each %$faces) {	3640	while (my ($face, $info) = each %$faces) {
3526	next unless $info->{smooth};	3641	next unless $info->{smooth};
3527		3642
…		…
3532	cf::face::set_smooth $idx, $smooth;	3647	cf::face::set_smooth $idx, $smooth;
3533	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3648	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3534	} else {	3649	} else {
3535	error "smooth face '$info->{smooth}' not found for face '$face'";	3650	error "smooth face '$info->{smooth}' not found for face '$face'";
3536	}	3651	}
3537
3538	cf::cede_to_tick;
3539	}	3652	}
3540	}	3653	}
3541		3654
3542	{	3655	{
3543	my $anims = $facedata->{animinfo};	3656	my $anims = $facedata->{animinfo};
3544		3657
3545	while (my ($anim, $info) = each %$anims) {	3658	while (my ($anim, $info) = each %$anims) {
3546	cf::anim::set $anim, $info->{frames}, $info->{facings};	3659	cf::anim::set $anim, $info->{frames}, $info->{facings};
3547	cf::cede_to_tick;
3548	}	3660	}
3549		3661
3550	cf::anim::invalidate_all; # d'oh	3662	cf::anim::invalidate_all; # d'oh
3551	}	3663	}
3552		3664
3553	{	3665	{
3554	my $res = $facedata->{resource};	3666	my $res = $facedata->{resource};
3555		3667
3556	while (my ($name, $info) = each %$res) {	3668	while (my ($name, $info) = each %$res) {
3557	if (defined $info->{type}) {	3669	if (defined (my $type = $info->{type})) {
		3670	# TODO: different hash - must free and use new index, or cache ixface data queue
3558	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3671	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3559		3672
3560	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3561	cf::face::set_type $idx, $info->{type};	3673	cf::face::set_type $idx, $type;
		3674	cf::face::set_csum $idx, 0, $info->{hash};
		3675	$cf::face::SIZE[0][$idx] = $info->{size};
		3676	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3677	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3678	$cf::face::HASH{$info->{hash}} = $idx;
3562	} else {	3679	} else {
3563	$RESOURCE{$name} = $info; # unused	3680	# $RESOURCE{$name} = $info; # unused
3564	}	3681	}
3565
3566	cf::cede_to_tick;
3567	}	3682	}
3568	}	3683	}
		3684
		3685	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3686
		3687	# HACK to clear player env face cache, we need some signal framework
		3688	# for this (global event?)
		3689	%ext::player_env::MUSIC_FACE_CACHE = ();
		3690
		3691	# END ATOMIC
		3692
		3693	cf::debug "facedata atomic update time ", EV::time - $t1;
3569		3694
3570	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3695	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3696
		3697	aio_close $fh if $fh; # close old facedata
3571		3698
3572	1	3699	1
3573	}	3700	}
3574		3701
3575	register_exticmd fx_want => sub {	3702	register_exticmd fx_want => sub {
…		…
3586	my $status = load_resource_file_ $_[0];	3713	my $status = load_resource_file_ $_[0];
3587	get_slot 0.1, 100;	3714	get_slot 0.1, 100;
3588	cf::arch::commit_load;	3715	cf::arch::commit_load;
3589		3716
3590	$status	3717	$status
		3718	}
		3719
		3720	sub reload_exp_table {
		3721	_reload_exp_table;
		3722
		3723	cf::face::set
		3724	"res/exp_table" => FT_RSRC,
		3725	JSON::XS->new->utf8->canonical->encode (
		3726	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3727	);
		3728	}
		3729
		3730	sub reload_materials {
		3731	_reload_materials;
3591	}	3732	}
3592		3733
3593	sub reload_regions {	3734	sub reload_regions {
3594	# HACK to clear player env face cache, we need some signal framework	3735	# HACK to clear player env face cache, we need some signal framework
3595	# for this (global event?)	3736	# for this (global event?)
…		…
3603	if exists $_->{match};	3744	if exists $_->{match};
3604	}	3745	}
3605	}	3746	}
3606		3747
3607	sub reload_facedata {	3748	sub reload_facedata {
3608	load_facedata "$DATADIR/facedata"	3749	load_facedata $DATADIR
3609	or die "unable to load facedata\n";	3750	or die "unable to load facedata\n";
3610	}	3751	}
3611		3752
3612	sub reload_archetypes {	3753	sub reload_archetypes {
3613	load_resource_file "$DATADIR/archetypes"	3754	load_resource_file "$DATADIR/archetypes"
3614	or die "unable to load archetypes\n";	3755	or die "unable to load archetypes\n";
		3756
		3757	cf::face::set
		3758	"res/skill_info" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3761	);
		3762
		3763	cf::face::set
		3764	"res/spell_paths" => FT_RSRC,
		3765	JSON::XS->new->utf8->canonical->encode (
		3766	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3767	);
3615	}	3768	}
3616		3769
3617	sub reload_treasures {	3770	sub reload_treasures {
3618	load_resource_file "$DATADIR/treasures"	3771	load_resource_file "$DATADIR/treasures"
3619	or die "unable to load treasurelists\n";	3772	or die "unable to load treasurelists\n";
…		…
3640	}	3793	}
3641		3794
3642	sub reload_resources {	3795	sub reload_resources {
3643	trace "reloading resource files...\n";	3796	trace "reloading resource files...\n";
3644		3797
3645	reload_exp_table;
3646	reload_materials;	3798	reload_materials;
3647	reload_facedata;	3799	reload_facedata;
		3800	reload_exp_table;
3648	reload_sound;	3801	reload_sound;
3649	reload_archetypes;	3802	reload_archetypes;
3650	reload_regions;	3803	reload_regions;
3651	reload_treasures;	3804	reload_treasures;
3652		3805
…		…
3704		3857
3705	sub main {	3858	sub main {
3706	cf::init_globals; # initialise logging	3859	cf::init_globals; # initialise logging
3707		3860
3708	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3861	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3709	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3862	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3710	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3863	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3711	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3864	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3712		3865
3713	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3866	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3714		3867
3715	# we must not ever block the main coroutine	3868	# we must not ever block the main coroutine
3716	local $Coro::idle = sub {	3869	$Coro::idle = sub {
3717	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3870	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3718	(async {	3871	(async {
3719	$Coro::current->{desc} = "IDLE BUG HANDLER";	3872	$Coro::current->{desc} = "IDLE BUG HANDLER";
3720	EV::loop EV::LOOP_ONESHOT;	3873	EV::loop EV::LOOP_ONESHOT;
3721	})->prio (Coro::PRIO_MAX);	3874	})->prio (Coro::PRIO_MAX);
…		…
3724	evthread_start IO::AIO::poll_fileno;	3877	evthread_start IO::AIO::poll_fileno;
3725		3878
3726	cf::sync_job {	3879	cf::sync_job {
3727	cf::incloader::init ();	3880	cf::incloader::init ();
3728		3881
		3882	db_init;
		3883
3729	cf::init_anim;	3884	cf::init_anim;
3730	cf::init_attackmess;	3885	cf::init_attackmess;
3731	cf::init_dynamic;	3886	cf::init_dynamic;
3732		3887
3733	cf::load_settings;	3888	cf::load_settings;
3734		3889
3735	reload_resources;	3890	reload_resources;
3736	reload_config;	3891	reload_config;
3737	db_init;
3738		3892
3739	cf::init_uuid;	3893	cf::init_uuid;
3740	cf::init_signals;	3894	cf::init_signals;
3741	cf::init_skills;	3895	cf::init_skills;
3742		3896
…		…
3756	};	3910	};
3757		3911
3758	cf::object::thawer::errors_are_fatal 0;	3912	cf::object::thawer::errors_are_fatal 0;
3759	info "parse errors in files are no longer fatal from this point on.\n";	3913	info "parse errors in files are no longer fatal from this point on.\n";
3760		3914
3761	my $free_main; $free_main = EV::idle sub {	3915	AE::postpone {
3762	undef $free_main;
3763	undef &main; # free gobs of memory :)	3916	undef &main; # free gobs of memory :)
3764	};	3917	};
3765		3918
3766	goto &main_loop;	3919	goto &main_loop;
3767	}	3920	}
…		…
3924		4077
3925	cf::write_runtime_sync; # external watchdog should not bark	4078	cf::write_runtime_sync; # external watchdog should not bark
3926		4079
3927	trace "emergency_perl_save: flushing outstanding aio requests";	4080	trace "emergency_perl_save: flushing outstanding aio requests";
3928	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4081	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3929	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4082	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3930	}	4083	}
3931		4084
3932	cf::write_runtime_sync; # external watchdog should not bark	4085	cf::write_runtime_sync; # external watchdog should not bark
3933	};	4086	};
3934		4087
…		…
4168	}	4321	}
4169	}	4322	}
4170		4323
4171	{	4324	{
4172	# configure BDB	4325	# configure BDB
		4326	info "initialising database";
4173		4327
4174	BDB::min_parallel 16;	4328	BDB::min_parallel 16;
4175	BDB::max_poll_reqs $TICK * 0.1;	4329	BDB::max_poll_reqs $TICK * 0.1;
4176	$AnyEvent::BDB::WATCHER->priority (1);	4330	#$AnyEvent::BDB::WATCHER->priority (1);
4177		4331
4178	unless ($DB_ENV) {	4332	unless ($DB_ENV) {
4179	$DB_ENV = BDB::db_env_create;	4333	$DB_ENV = BDB::db_env_create;
4180	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4334	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4181	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4335	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4206	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4360	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4207	};	4361	};
4208	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4362	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4209	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4363	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4210	};	4364	};
		4365
		4366	info "database initialised";
4211	}	4367	}
4212		4368
4213	{	4369	{
4214	# configure IO::AIO	4370	# configure IO::AIO
4215		4371
		4372	info "initialising aio";
4216	IO::AIO::min_parallel 8;	4373	IO::AIO::min_parallel 8;
4217	IO::AIO::max_poll_time $TICK * 0.1;	4374	IO::AIO::max_poll_time $TICK * 0.1;
4218	undef $AnyEvent::AIO::WATCHER;	4375	undef $AnyEvent::AIO::WATCHER;
		4376	info "aio initialised";
4219	}	4377	}
4220		4378
4221	our $_log_backtrace;	4379	our $_log_backtrace;
4222	our $_log_backtrace_last;	4380	our $_log_backtrace_last;
4223		4381

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC vs. Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.573 by root, Sun May 8 12:40:42 2011 UTC vs.
Revision 1.607 by root, Sun Nov 18 09:29:25 2012 UTC