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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 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;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
137	our $NOW;	144	our $NOW;
138		145
139	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		157
151	our @POST_INIT;	158	our @POST_INIT;
152		159
153	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
155		165
156	binmode STDOUT;	166	binmode STDOUT;
157	binmode STDERR;	167	binmode STDERR;
158		168
159	# read virtual server time, if available	169	# read virtual server time, if available
…		…
193		203
194	=over 4	204	=over 4
195		205
196	=item $cf::UPTIME	206	=item $cf::UPTIME
197		207
198	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
199		224
200	=item $cf::RUNTIME	225	=item $cf::RUNTIME
201		226
202	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
203	every server tick.	228	every server tick.
204		229
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		233
209	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
212	database environment.	237	database environment.
213		238
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	239	=item $cf::LOADAVG
223		240
224	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
225	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
226	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		255
239	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. cf::wait_for_tick_begin only
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	returns directly I<after> the tick processing (and consequently, can only wake one thread
241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	258	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		259
		260	Note that cf::Wait_for_tick will immediately return when the server is not
		261	ticking, making it suitable for small pauses in threads that need to run
		262	when the server is paused. If that is not applicable (i.e. you I<really>
		263	want to wait, use C<$cf::WAIT_FOR_TICK>).
		264
		265	=item $cf::WAIT_FOR_TICK
		266
		267	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		268	variable contains a L<Coro::Signal> that is broadcats after every server
		269	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		270	next server tick.
242		271
243	=cut	272	=cut
244		273
245	sub wait_for_tick();	274	sub wait_for_tick();
246	sub wait_for_tick_begin();	275	sub wait_for_tick_begin();
…		…
312	)) {	341	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	343	}
315		344
316	$EV::DIED = sub {	345	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
318	};	347	};
319		348
320	#############################################################################	349	#############################################################################
321		350
322	sub fork_call(&@);	351	sub fork_call(&@);
…		…
349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	378	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350	$d	379	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	380	} \|\| "[unable to dump $_[0]: '$@']";
352	}	381	}
353		382
354	=item $scalar = load_file $path	383	=item $scalar = cf::load_file $path
355		384
356	Loads the given file from path and returns its contents. Croaks on error	385	Loads the given file from path and returns its contents. Croaks on error
357	and can block.	386	and can block.
358		387
359	=cut	388	=cut
…		…
361	sub load_file($) {	390	sub load_file($) {
362	0 <= aio_load $_[0], my $data	391	0 <= aio_load $_[0], my $data
363	or Carp::croak "$_[0]: $!";	392	or Carp::croak "$_[0]: $!";
364		393
365	$data	394	$data
		395	}
		396
		397	=item $success = cf::replace_file $path, $data, $sync
		398
		399	Atomically replaces the file at the given $path with new $data, and
		400	optionally $sync the data to disk before replacing the file.
		401
		402	=cut
		403
		404	sub replace_file($$;$) {
		405	my ($path, $data, $sync) = @_;
		406
		407	my $lock = cf::lock_acquire ("replace_file:$path");
		408
		409	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		410	or return;
		411
		412	$data = $data->() if ref $data;
		413
		414	length $data == aio_write $fh, 0, (length $data), $data, 0
		415	or return;
		416
		417	!$sync
		418	or !aio_fsync $fh
		419	or return;
		420
		421	aio_close $fh
		422	and return;
		423
		424	aio_rename "$path~", $path
		425	and return;
		426
		427	if ($sync) {
		428	$path =~ s%/[^/]*$%%;
		429	aio_pathsync $path;
		430	}
		431
		432	1
366	}	433	}
367		434
368	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
369		436
370	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
…		…
545	}	612	}
546	}	613	}
547		614
548	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	616	# we do not use wait_for_tick() as it returns immediately when tick is inactive
550	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
551	$signal->wait;
552	} else {	618	} else {
553	$busy = 0;	619	$busy = 0;
554	Coro::schedule;	620	Coro::schedule;
555	}	621	}
556	}	622	}
…		…
834		900
835	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
836	}	902	}
837	}	903	}
838		904
839	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
840	my $data = $process->(\@data);	906	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
842		908
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		910
845	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1432	=cut
1367		1433
1368	#############################################################################	1434	#############################################################################
1369	# command handling &c	1435	# command handling &c
1370		1436
1371	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1372		1438
1373	Register a callback for execution when the client sends the user command	1439	Register a callback for execution when the client sends the user command
1374	$name.	1440	$name.
1375		1441
1376	=cut	1442	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1383		1449
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1451	}
1386		1452
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1454
1389	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1390	extcmd packet. Ext commands will be processed in the order they are	1456	extcmd packet. Ext commands will be processed in the order they are
1391	received by the server, like other user commands. The first argument is	1457	received by the server, like other user commands. The first argument is
1392	the logged-in player. Ext commands can only be processed after a player	1458	the logged-in player. Ext commands can only be processed after a player
1393	has logged in successfully.	1459	has logged in successfully.
1394		1460
1395	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1396	called.
1397		1462
		1463	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1464
		1465	Same as C<cf::register_extcmd>, but instead of returning values, the
		1466	callback needs to clal the C<$reply> function.
		1467
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1469
1400	Register a callback for execution when the client sends an (asynchronous)	1470	Register a callback for execution when the client sends an (asynchronous)
1401	exticmd packet. Exti commands are processed by the server as soon as they	1471	exticmd packet. Exti commands are processed by the server as soon as they
1402	are received, i.e. out of order w.r.t. other commands. The first argument	1472	are received, i.e. out of order w.r.t. other commands. The first argument
1403	is a client socket. Exti commands can be received anytime, even before	1473	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1474	log-in.
1405		1475
1406	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1407	called.
1408		1477
1409	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		1479
		1480	Same as C<cf::register_extcmd>, but instead of returning values, the
		1481	callback needs to clal the C<$reply> function.
		1482
		1483	=cut
		1484
1411	sub register_extcmd {	1485	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1413		1487
1414	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1415	}	1489	}
1416		1490
1417	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1419		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1420	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1421	}	1507	}
1422		1508
1423	use File::Glob ();	1509	use File::Glob ();
1424		1510
1425	cf::player->attach (	1511	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1440		1526
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1528
1443	if (ref $msg) {	1529	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1530	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445	"ARRAY" eq ref $msg
1446	? @$msg
1447	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448		1531
1449	my @reply;
1450
1451	if (my $cb = $EXTCMD{$type}) {	1532	if (my $cb = $EXTACMD{$type}) {
		1533	$cb->(
		1534	$pl,
		1535	sub {
		1536	$pl->ext_msg ("reply-$reply", @_)
		1537	if $reply;
		1538	},
		1539	@payload
		1540	);
		1541	} else {
		1542	my @reply;
		1543
		1544	if (my $cb = $EXTCMD{$type}) {
1452	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1453	}	1550	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1551
1458	} else {	1552	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1554	}
1461		1555
…		…
1474	};	1568	};
1475		1569
1476	$grp	1570	$grp
1477	}	1571	}
1478		1572
		1573	sub _ext_cfg_reg($$$$) {
		1574	my ($rvar, $varname, $cfgname, $default) = @_;
		1575
		1576	$cfgname = lc $varname
		1577	unless length $cfgname;
		1578
		1579	$EXT_CFG{$cfgname} = [$rvar, $default];
		1580
		1581	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1582	}
		1583
1479	sub load_extensions {	1584	sub load_extensions {
1480	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1481		1588
1482	cf::sync_job {	1589	cf::sync_job {
1483	my %todo;	1590	my %todo;
1484		1591
1485	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1635	unless exists $done{$_};
1529	}	1636	}
1530		1637
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		1639
		1640	my $source = $v->{source};
		1641
		1642	# support "CONF varname :confname = default" pseudo-statements
		1643	$source =~ s{
		1644	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1645	}{
		1646	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1647	}gmxe;
		1648
1533	my $active = eval $v->{source};	1649	my $active = eval $source;
1534		1650
1535	if (length $@) {	1651	if (length $@) {
1536	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1537		1653
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1825	}	1941	}
1826		1942
1827	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828		1944
1829	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1830
1831	=item $player->ext_reply ($msgid, @msg)
1832
1833	Sends an ext reply to the player.
1834
1835	=cut
1836
1837	sub ext_reply($$@) {
1838	my ($self, $id, @msg) = @_;
1839
1840	$self->ns->ext_reply ($id, @msg)
1841	}
1842		1946
1843	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1844		1948
1845	Sends an ext event to the client.	1949	Sends an ext event to the client.
1846		1950
…		…
2171		2275
2172	{	2276	{
2173	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2174		2278
2175	return unless $self->valid;	2279	return unless $self->valid;
2176	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2177		2281
2178	$self->alloc;	2282	$self->alloc;
2179		2283
2180	$self->pre_load;	2284	$self->pre_load;
2181	cf::cede_to_tick;	2285	cf::cede_to_tick;
…		…
2204	} else {	2308	} else {
2205	$self->post_load_original	2309	$self->post_load_original
2206	if delete $self->{load_original};	2310	if delete $self->{load_original};
2207	}	2311	}
2208		2312
2209	$self->in_memory (cf::MAP_INACTIVE);	2313	$self->state (cf::MAP_INACTIVE);
2210		2314
2211	cf::cede_to_tick;	2315	cf::cede_to_tick;
2212	# now do the right thing for maps	2316	# now do the right thing for maps
2213	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2214	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2245	# if $self->per_party;	2349	# if $self->per_party;
2246		2350
2247	$self	2351	$self
2248	}	2352	}
2249		2353
2250	# find and load all maps in the 3x3 area around a map
2251	sub load_neighbours {
2252	my ($map) = @_;
2253
2254	my @neigh; # diagonal neighbours
2255
2256	for (0 .. 3) {
2257	my $neigh = $map->tile_path ($_)
2258	or next;
2259	$neigh = find $neigh, $map
2260	or next;
2261	$neigh->load;
2262
2263	# now find the diagonal neighbours
2264	push @neigh,
2265	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2266	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2267	}
2268
2269	for (grep defined $_->[0], @neigh) {
2270	my ($path, $origin) = @$_;
2271	my $neigh = find $path, $origin
2272	or next;
2273	$neigh->load;
2274	}
2275	}
2276
2277	sub find_sync {	2354	sub find_sync {
2278	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2279		2356
2280	# it's a bug to call this from the main context	2357	# it's a bug to call this from the main context
2281	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
…		…
2299		2376
2300	sub find_async {	2377	sub find_async {
2301	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2302		2379
2303	$path = normalise $path, $origin;	2380	$path = normalise $path, $origin;
2304		2381
2305	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2306	return $map if !$load \|\| $map->linkable;	2383	return $map if !$load \|\| $map->linkable;
2307	}	2384	}
2308		2385
2309	$MAP_PREFETCH{$path} \|= $load;	2386	$MAP_PREFETCH{$path} \|= $load;
…		…
2377	return if $self->players;	2454	return if $self->players;
2378		2455
2379	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2380	$self->deactivate;	2457	$self->deactivate;
2381	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2382	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2383		2460
2384	# then atomically save	2461	# then atomically save
2385	$self->_save;	2462	$self->_save;
2386		2463
2387	# then free the map	2464	# then free the map
…		…
2413		2490
2414	return if $self->players;	2491	return if $self->players;
2415		2492
2416	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2417		2494
2418	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2419		2496
2420	# need to save uniques path	2497	# need to save uniques path
2421	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2422	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2423		2500
…		…
2753	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2754	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2755	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2756		2833
2757	$map->load;	2834	$map->load;
2758	$map->load_neighbours;
2759		2835
2760	return unless $self->contr->active;	2836	return unless $self->contr->active;
2761		2837
2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
3179	=cut	3255	=cut
3180		3256
3181	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3182	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3183		3259
3184	if ($self->extcmd == 2) {
3185	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186	} elsif ($self->extcmd == 1) { # TODO: remove
3187	push @msg, msgtype => "event_$type";
3188	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189	}
3190	}
3191
3192	=item $client->ext_reply ($msgid, @msg)
3193
3194	Sends an ext reply to the client.
3195
3196	=cut
3197
3198	sub cf::client::ext_reply($$@) {
3199	my ($self, $id, @msg) = @_;
3200
3201	if ($self->extcmd == 2) {
3202	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203	} elsif ($self->extcmd == 1) {
3204	#TODO: version 1, remove
3205	unshift @msg, msgtype => "reply", msgid => $id;
3206	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207	}
3208	}	3261	}
3209		3262
3210	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3211		3264
3212	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3267	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3268		3321
3269	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270		3323
3271	if (ref $msg) {	3324	if (ref $msg) {
3272	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273	"ARRAY" eq ref $msg
3274	? @$msg
3275	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276		3326
3277	my @reply;
3278
3279	if (my $cb = $EXTICMD{$type}) {	3327	if (my $cb = $EXTIACMD{$type}) {
		3328	$cb->(
		3329	$ns,
		3330	sub {
		3331	$ns->ext_msg ("reply-$reply", @_)
		3332	if $reply;
		3333	},
		3334	@payload
		3335	);
		3336	} else {
		3337	my @reply;
		3338
		3339	if (my $cb = $EXTICMD{$type}) {
3280	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3281	}	3345	}
3282
3283	$ns->ext_reply ($reply, @reply)
3284	if $reply;
3285
3286	} else {	3346	} else {
3287	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3347	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288	}	3348	}
3289		3349
3290	cf::override;	3350	cf::override;
…		…
3458	=cut	3518	=cut
3459		3519
3460	#############################################################################	3520	#############################################################################
3461	# the server's init and main functions	3521	# the server's init and main functions
3462		3522
		3523	our %FACEHASH; # hash => idx, #d# HACK for http server
		3524
		3525	# internal api, not fianlised
		3526	sub set_face {
		3527	my ($name, $type, $data) = @_;
		3528
		3529	my $idx = cf::face::find $name;
		3530
		3531	if ($idx) {
		3532	delete $FACEHASH{cf::face::get_chksum $idx};
		3533	} else {
		3534	$idx = cf::face::alloc $name;
		3535	}
		3536
		3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3538
		3539	cf::face::set_type $idx, $type;
		3540	cf::face::set_data $idx, 0, $data, $hash;
		3541	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3542	$FACEHASH{$hash} = $idx;#d#
		3543
		3544	$idx
		3545	}
		3546
3463	sub load_facedata($) {	3547	sub load_facedata($) {
3464	my ($path) = @_;	3548	my ($path) = @_;
3465		3549
3466	# HACK to clear player env face cache, we need some signal framework	3550	# HACK to clear player env face cache, we need some signal framework
3467	# for this (global event?)	3551	# for this (global event?)
…		…
3474	my $facedata = decode_storable load_file $path;	3558	my $facedata = decode_storable load_file $path;
3475		3559
3476	$facedata->{version} == 2	3560	$facedata->{version} == 2
3477	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3478		3562
3479	# patch in the exptable
3480	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3481	$facedata->{resource}{"res/exp_table"} = {
3482	type => FT_RSRC,
3483	data => $exp_table,
3484	hash => (Digest::MD5::md5 $exp_table),
3485	};
3486	cf::cede_to_tick;	3563	cf::cede_to_tick;
3487		3564
3488	{	3565	{
3489	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3490		3567
3491	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3492	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3493		3571
3494	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3495	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3496	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3497	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3498	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3499		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3500	cf::cede_to_tick;	3579	cf::cede_to_tick;
3501	}	3580	}
3502		3581
3503	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3504	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3516	cf::cede_to_tick;	3595	cf::cede_to_tick;
3517	}	3596	}
3518	}	3597	}
3519		3598
3520	{	3599	{
3521	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3522		3601
3523	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3524	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3525	cf::cede_to_tick;	3604	cf::cede_to_tick;
3526	}	3605	}
3527		3606
3528	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3529	}	3608	}
3530		3609
3531	{	3610	{
3532	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3533		3612
3534	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3535	if (defined $info->{type}) {	3614	if (defined (my $type = $info->{type})) {
		3615	# TODO: different hash - must free and use new index, or cache ixface data queue
3536	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3537		3617
		3618	cf::face::set_type $idx, $type;
3538	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539	cf::face::set_type $idx, $info->{type};	3620	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3621	$FACEHASH{$info->{hash}} = $idx;#d#
3540	} else {	3622	} else {
3541	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3542	}	3624	}
3543		3625
3544	cf::cede_to_tick;	3626	cf::cede_to_tick;
3545	}	3627	}
3546	}	3628	}
…		…
3564	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3565	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3566	cf::arch::commit_load;	3648	cf::arch::commit_load;
3567		3649
3568	$status	3650	$status
		3651	}
		3652
		3653	sub reload_exp_table {
		3654	_reload_exp_table;
		3655
		3656	set_face "res/exp_table" => FT_RSRC,
		3657	JSON::XS->new->utf8->canonical->encode (
		3658	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3659	);
		3660	}
		3661
		3662	sub reload_materials {
		3663	_reload_materials;
3569	}	3664	}
3570		3665
3571	sub reload_regions {	3666	sub reload_regions {
3572	# HACK to clear player env face cache, we need some signal framework	3667	# HACK to clear player env face cache, we need some signal framework
3573	# for this (global event?)	3668	# for this (global event?)
…		…
3588	}	3683	}
3589		3684
3590	sub reload_archetypes {	3685	sub reload_archetypes {
3591	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3592	or die "unable to load archetypes\n";	3687	or die "unable to load archetypes\n";
		3688
		3689	set_face "res/skill_info" => FT_RSRC,
		3690	JSON::XS->new->utf8->canonical->encode (
		3691	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3692	);
		3693	set_face "res/spell_paths" => FT_RSRC,
		3694	JSON::XS->new->utf8->canonical->encode (
		3695	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3696	);
3593	}	3697	}
3594		3698
3595	sub reload_treasures {	3699	sub reload_treasures {
3596	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3597	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
…		…
3618	}	3722	}
3619		3723
3620	sub reload_resources {	3724	sub reload_resources {
3621	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3622		3726
3623	reload_exp_table;
3624	reload_materials;	3727	reload_materials;
3625	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3626	reload_sound;	3730	reload_sound;
3627	reload_archetypes;	3731	reload_archetypes;
3628	reload_regions;	3732	reload_regions;
3629	reload_treasures;	3733	reload_treasures;
3630		3734
…		…
3682		3786
3683	sub main {	3787	sub main {
3684	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3685		3789
3686	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690		3794
3691	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3795	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692		3796
3693	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3694	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3695	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3799	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696	(async {	3800	(async {
3697	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3698	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3699	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
…		…
3702	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3703		3807
3704	cf::sync_job {	3808	cf::sync_job {
3705	cf::incloader::init ();	3809	cf::incloader::init ();
3706		3810
		3811	db_init;
		3812
3707	cf::init_anim;	3813	cf::init_anim;
3708	cf::init_attackmess;	3814	cf::init_attackmess;
3709	cf::init_dynamic;	3815	cf::init_dynamic;
3710		3816
3711	cf::load_settings;	3817	cf::load_settings;
3712		3818
3713	reload_resources;	3819	reload_resources;
3714	reload_config;	3820	reload_config;
3715	db_init;
3716		3821
3717	cf::init_uuid;	3822	cf::init_uuid;
3718	cf::init_signals;	3823	cf::init_signals;
3719	cf::init_skills;	3824	cf::init_skills;
3720		3825
…		…
3734	};	3839	};
3735		3840
3736	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3737	info "parse errors in files are no longer fatal from this point on.\n";	3842	info "parse errors in files are no longer fatal from this point on.\n";
3738		3843
3739	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3740	undef $free_main;
3741	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3742	};	3846	};
3743		3847
3744	goto &main_loop;	3848	goto &main_loop;
3745	}	3849	}
…		…
3902		4006
3903	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3904		4008
3905	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3906	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4010	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3907	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908	}	4012	}
3909		4013
3910	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3911	};	4015	};
3912		4016
…		…
4093		4197
4094	#############################################################################	4198	#############################################################################
4095		4199
4096	my $bug_warning = 0;	4200	my $bug_warning = 0;
4097		4201
4098	our @WAIT_FOR_TICK;
4099	our @WAIT_FOR_TICK_BEGIN;
4100
4101	sub wait_for_tick() {	4202	sub wait_for_tick() {
4102	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4103		4204
4104	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4105	push @WAIT_FOR_TICK, $signal;
4106	$signal->wait;
4107	}	4206	}
4108		4207
4109	sub wait_for_tick_begin() {	4208	sub wait_for_tick_begin() {
4110	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4111		4210
4112	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4113	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4114	$signal->wait;	4213	$signal->wait;
4115	}	4214	}
…		…
4119	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4218	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4121	return;	4220	return;
4122	}	4221	}
4123		4222
4124	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4125		4224
4126	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4225	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127		4226
4128	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4228	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4135	}	4234	}
4136		4235
4137	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138	$sig->send;	4237	$sig->send;
4139	}	4238	}
4140	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4141	$sig->send;
4142	}
4143		4240
4144	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4145	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146		4243
4147	if (0) {	4244	if (0) {
…		…
4153	}	4250	}
4154	}	4251	}
4155		4252
4156	{	4253	{
4157	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4158		4256
4159	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4160	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4161	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4162		4260
4163	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4164	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4165	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4166	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4264	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4191	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192	};	4290	};
4193	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195	};	4293	};
		4294
		4295	info "database initialised";
4196	}	4296	}
4197		4297
4198	{	4298	{
4199	# configure IO::AIO	4299	# configure IO::AIO
4200		4300
		4301	info "initialising aio";
4201	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4202	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4203	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4204	}	4306	}
4205		4307
4206	our $_log_backtrace;	4308	our $_log_backtrace;
4207	our $_log_backtrace_last;	4309	our $_log_backtrace_last;
4208		4310

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC vs. Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.569 by root, Wed May 4 07:36:40 2011 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC