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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 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.
…		…
234	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
235	from wherever your confdir points to.	252	from wherever your confdir points to.
236		253
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.
240	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
241	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.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
242		272
243	=cut	273	=cut
244		274
245	sub wait_for_tick();	275	sub wait_for_tick();
246	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
312	)) {	342	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	344	}
315		345
316	$EV::DIED = sub {	346	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
318	};	348	};
319		349
320	#############################################################################	350	#############################################################################
321		351
322	sub fork_call(&@);	352	sub fork_call(&@);
…		…
349	$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;
350	$d	380	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
352	}	382	}
353		383
354	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
355		385
356	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
357	and can block.	387	and can block.
358		388
359	=cut	389	=cut
…		…
361	sub load_file($) {	391	sub load_file($) {
362	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
363	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
364		394
365	$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
366	}	434	}
367		435
368	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
369		437
370	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
505	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
506	(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
507	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
508	till the next cede.	576	till the next cede.
509		577
510	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
511	should use 100 or more.	579	should use 100 or more.
512		580
513	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
514	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
515		583
…		…
528	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
529	my $busy;	597	my $busy;
530		598
531	while () {	599	while () {
532	next_job:	600	next_job:
		601
		602	Coro::cede;
533		603
534	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
535		605
536	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
537	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
538	$busy = 0;	608	$busy = 0;
539	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
540	$job->[2]->send;	610	$job->[2]->send;
541	Coro::cede;
542	goto next_job;	611	goto next_job;
543	} else {	612	} else {
544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545	}	614	}
546	}	615	}
547		616
548	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
550	push @cf::WAIT_FOR_TICK, $signal;
551	$signal->wait;
552	} else {	619	} else {
553	$busy = 0;	620	$busy = 0;
554	Coro::schedule;	621	Coro::schedule;
555	}	622	}
556	}	623	}
…		…
671	reset_signals;	738	reset_signals;
672	}	739	}
673		740
674	sub fork_call(&@) {	741	sub fork_call(&@) {
675	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
676
677	# we seemingly have to make a local copy of the whole thing,
678	# otherwise perl prematurely frees the stuff :/
679	# TODO: investigate and fix (likely this will be rather laborious)
680		743
681	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
682	cf::post_fork;	745	cf::post_fork;
683	&$cb	746	&$cb
684	} @args;	747	} @args;
…		…
834		897
835	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
836	}	899	}
837	}	900	}
838		901
839	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
840	my $data = $process->(\@data);	903	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
842		905
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		907
845	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1429	=cut
1367		1430
1368	#############################################################################	1431	#############################################################################
1369	# command handling &c	1432	# command handling &c
1370		1433
1371	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1372		1435
1373	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
1374	$name.	1437	$name.
1375		1438
1376	=cut	1439	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1383		1446
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1448	}
1386		1449
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1451
1389	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1390	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
1391	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
1392	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
1393	has logged in successfully.	1456	has logged in successfully.
1394		1457
1395	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1396	called.
1397		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
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1466
1400	Register a callback for execution when the client sends an (asynchronous)	1467	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	1468	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	1469	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	1470	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1471	log-in.
1405		1472
1406	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1407	called.
1408		1474
1409	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		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
1411	sub register_extcmd {	1482	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1413		1484
1414	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1415	}	1486	}
1416		1487
1417	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1419		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1420	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1421	}	1504	}
1422		1505
1423	use File::Glob ();	1506	use File::Glob ();
1424		1507
1425	cf::player->attach (	1508	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1440		1523
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1525
1443	if (ref $msg) {	1526	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1527	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		1528
1449	my @reply;
1450
1451	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}) {
1452	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1453	}	1547	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1548
1458	} else {	1549	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1551	}
1461		1552
…		…
1474	};	1565	};
1475		1566
1476	$grp	1567	$grp
1477	}	1568	}
1478		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
1479	sub load_extensions {	1581	sub load_extensions {
1480	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1481		1585
1482	cf::sync_job {	1586	cf::sync_job {
1483	my %todo;	1587	my %todo;
1484		1588
1485	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1632	unless exists $done{$_};
1529	}	1633	}
1530		1634
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		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
1533	my $active = eval $v->{source};	1646	my $active = eval $source;
1534		1647
1535	if (length $@) {	1648	if (length $@) {
1536	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1537		1650
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1555		1668
1556	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1559	}	1672	}
		1673
		1674	last;
1560	}	1675	}
1561	}	1676	}
1562	};	1677	};
1563	}	1678	}
1564		1679
…		…
1823	}	1938	}
1824		1939
1825	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1826		1941
1827	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1828
1829	=item $player->ext_reply ($msgid, @msg)
1830
1831	Sends an ext reply to the player.
1832
1833	=cut
1834
1835	sub ext_reply($$@) {
1836	my ($self, $id, @msg) = @_;
1837
1838	$self->ns->ext_reply ($id, @msg)
1839	}
1840		1943
1841	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1842		1945
1843	Sends an ext event to the client.	1946	Sends an ext event to the client.
1844		1947
…		…
1992		2095
1993	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1994	()	2097	()
1995	}	2098	}
1996		2099
		2100	# may re-bless or do other evil things
1997	sub init {	2101	sub init {
1998	my ($self) = @_;	2102	my ($self) = @_;
1999		2103
2000	$self	2104	$self
2001	}	2105	}
…		…
2066	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2067		2171
2068	1	2172	1
2069	}	2173	}
2070		2174
		2175	# used to laod the header of an original map
2071	sub load_header_orig {	2176	sub load_header_orig {
2072	my ($self) = @_;	2177	my ($self) = @_;
2073		2178
2074	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2075	}	2180	}
2076		2181
		2182	# used to laod the header of an instantiated map
2077	sub load_header_temp {	2183	sub load_header_temp {
2078	my ($self) = @_;	2184	my ($self) = @_;
2079		2185
2080	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2081	}	2187	}
2082		2188
		2189	# called after loading the header from an instantiated map
2083	sub prepare_temp {	2190	sub prepare_temp {
2084	my ($self) = @_;	2191	my ($self) = @_;
2085		2192
2086	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2087	\|\| $cf::RUNTIME); #d#	2194	\|\| $cf::RUNTIME); #d#
2088	# safety	2195	# safety
2089	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2090	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2091	}	2198	}
2092		2199
		2200	# called after loading the header from an original map
2093	sub prepare_orig {	2201	sub prepare_orig {
2094	my ($self) = @_;	2202	my ($self) = @_;
2095		2203
2096	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2097	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2123	sub find {	2231	sub find {
2124	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2125		2233
2126	cf::cede_to_tick;	2234	cf::cede_to_tick;
2127		2235
2128	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2129		2237
2130	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2131	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2132		2240
2133	$cf::MAP{$path} \|\| do {	2241	$cf::MAP{$path} \|\| do {
…		…
2164		2272
2165	{	2273	{
2166	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2167		2275
2168	return unless $self->valid;	2276	return unless $self->valid;
2169	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2170
2171	$self->in_memory (cf::MAP_LOADING);
2172		2278
2173	$self->alloc;	2279	$self->alloc;
2174		2280
2175	$self->pre_load;	2281	$self->pre_load;
2176	cf::cede_to_tick;	2282	cf::cede_to_tick;
2177		2283
		2284	if (exists $self->{load_path}) {
2178	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2179	$f->skip_block;	2286	$f->skip_block;
2180	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2181	or return;	2288	or return;
2182		2289
2183	$self->post_load_original	2290	$self->post_load_original
2184	if delete $self->{load_original};	2291	if delete $self->{load_original};
2185		2292
2186	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2187	utf8::encode $uniq;	2294	utf8::encode $uniq;
2188	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2189	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2190	$self->clear_unique_items;	2297	$self->clear_unique_items;
2191	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2192	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2193	}	2301	}
2194	}	2302	}
2195	}
2196		2303
2197	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2198		2311
2199	cf::cede_to_tick;	2312	cf::cede_to_tick;
2200	# now do the right thing for maps	2313	# now do the right thing for maps
2201	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2202	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2206	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2207	$self->decay_objects;	2320	$self->decay_objects;
2208	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2209	$self->update_buttons;	2322	$self->update_buttons;
2210	cf::cede_to_tick;	2323	cf::cede_to_tick;
2211	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2212	}	2325	}
2213		2326
2214	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2215	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2216
2217	$self->in_memory (cf::MAP_ACTIVE);
2218	}	2329	}
2219		2330
2220	$self->post_load;	2331	$self->post_load;
2221		2332
2222	1	2333	1
…		…
2235	# if $self->per_party;	2346	# if $self->per_party;
2236		2347
2237	$self	2348	$self
2238	}	2349	}
2239		2350
2240	# find and load all maps in the 3x3 area around a map
2241	sub load_neighbours {
2242	my ($map) = @_;
2243
2244	my @neigh; # diagonal neighbours
2245
2246	for (0 .. 3) {
2247	my $neigh = $map->tile_path ($_)
2248	or next;
2249	$neigh = find $neigh, $map
2250	or next;
2251	$neigh->load;
2252
2253	# now find the diagonal neighbours
2254	push @neigh,
2255	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2256	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2257	}
2258
2259	for (grep defined $_->[0], @neigh) {
2260	my ($path, $origin) = @$_;
2261	my $neigh = find $path, $origin
2262	or next;
2263	$neigh->load;
2264	}
2265	}
2266
2267	sub find_sync {	2351	sub find_sync {
2268	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2269		2353
		2354	# it's a bug to call this from the main context
2270	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2271	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2272		2357
2273	find $path, $origin	2358	find $path, $origin
2274	}	2359	}
2275		2360
2276	sub do_load_sync {	2361	sub do_load_sync {
2277	my ($map) = @_;	2362	my ($map) = @_;
2278		2363
		2364	# it's a bug to call this from the main context
2279	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2280	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2281		2367
2282	$map->load;	2368	$map->load;
2283	}	2369	}
…		…
2286	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2287		2373
2288	sub find_async {	2374	sub find_async {
2289	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2290		2376
2291	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2292		2378
2293	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2294	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2295	}	2381	}
2296		2382
2297	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2298		2384
2299	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
…		…
2358	sub swap_out {	2444	sub swap_out {
2359	my ($self) = @_;	2445	my ($self) = @_;
2360		2446
2361	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2362		2448
2363	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2364	return if $self->{deny_save};	2450	return if $self->{deny_save};
2365	return if $self->players;	2451	return if $self->players;
2366		2452
2367	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2368	$self->deactivate;	2454	$self->deactivate;
2369	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2370	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2371		2457
2372	# then atomically save	2458	# then atomically save
2373	$self->_save;	2459	$self->_save;
2374		2460
2375	# then free the map	2461	# then free the map
…		…
2401		2487
2402	return if $self->players;	2488	return if $self->players;
2403		2489
2404	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2405		2491
2406	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2407		2493
2408	# need to save uniques path	2494	# need to save uniques path
2409	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2410	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2411		2497
…		…
2564		2650
2565	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.
2566		2652
2567	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2568		2654
2569	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,
2570	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2571		2657
2572	=cut	2658	=cut
2573		2659
2574	sub deref {	2660	sub deref {
…		…
2741	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2742	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2743	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2744		2830
2745	$map->load;	2831	$map->load;
2746	$map->load_neighbours;
2747		2832
2748	return unless $self->contr->active;	2833	return unless $self->contr->active;
2749		2834
2750	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2751	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2807	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2808	}	2893	}
2809	}	2894	}
2810		2895
2811	my $map = eval {	2896	my $map = eval {
2812	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2813		2898
2814	if ($map) {	2899	if ($map) {
2815	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2816	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2817	} else {	2902	} else {
…		…
2907	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2908		2993
2909	unless (eval {	2994	unless (eval {
2910	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2911		2996
2912	# random map handling
2913	{
2914	my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916	prepare_random_map $exit
2917	if $exit->slaying eq "/!";
2918	}
2919
2920	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2921	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2922	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2923		3023
2924	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2925		3025
2926	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2927	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2942		3042
2943	=head3 cf::client	3043	=head3 cf::client
2944		3044
2945	=over 4	3045	=over 4
2946		3046
2947	=item $client->send_drawinfo ($text, $flags)
2948
2949	Sends a drawinfo packet to the client. Circumvents output buffering so
2950	should not be used under normal circumstances.
2951
2952	=cut
2953
2954	sub cf::client::send_drawinfo {
2955	my ($self, $text, $flags) = @_;
2956
2957	utf8::encode $text;
2958	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2959	}
2960
2961	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2962		3048
2963	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
2964	them as required.	3050	them as required.
2965		3051
…		…
2983	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2984	}	3070	}
2985		3071
2986	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2987		3073
2988	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
2989	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
2990	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
2991	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2992		3078
2993	=cut	3079	=cut
2994		3080
2995	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3100	id => "death",	3186	id => "death",
3101	title => "Death",	3187	title => "Death",
3102	reply => undef,	3188	reply => undef,
3103	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3104	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3105	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3106	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3107	);	3199	);
3108		3200
3109	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3152	=cut	3244	=cut
3153		3245
3154	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3155	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3156		3248
3157	if ($self->extcmd == 2) {
3158	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3159	} elsif ($self->extcmd == 1) { # TODO: remove
3160	push @msg, msgtype => "event_$type";
3161	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3162	}
3163	}
3164
3165	=item $client->ext_reply ($msgid, @msg)
3166
3167	Sends an ext reply to the client.
3168
3169	=cut
3170
3171	sub cf::client::ext_reply($$@) {
3172	my ($self, $id, @msg) = @_;
3173
3174	if ($self->extcmd == 2) {
3175	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3176	} elsif ($self->extcmd == 1) {
3177	#TODO: version 1, remove
3178	unshift @msg, msgtype => "reply", msgid => $id;
3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180	}
3181	}	3250	}
3182		3251
3183	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3184		3253
3185	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3205		3274
3206	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3207	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3208		3277
3209	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3210	}	3317	}
3211		3318
3212	cf::client->attach (	3319	cf::client->attach (
3213	on_connect => sub {	3320	on_connect => sub {
3214	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3240	my ($ns, $buf) = @_;	3347	my ($ns, $buf) = @_;
3241		3348
3242	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3243		3350
3244	if (ref $msg) {	3351	if (ref $msg) {
3245	my ($type, $reply, @payload) =	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3246	"ARRAY" eq ref $msg
3247	? @$msg
3248	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3249		3353
3250	my @reply;
3251
3252	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3253	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3254	}	3372	}
3255
3256	$ns->ext_reply ($reply, @reply)
3257	if $reply;
3258
3259	} else {	3373	} else {
3260	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3261	}	3375	}
3262		3376
3263	cf::override;	3377	cf::override;
…		…
3431	=cut	3545	=cut
3432		3546
3433	#############################################################################	3547	#############################################################################
3434	# the server's init and main functions	3548	# the server's init and main functions
3435		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3436	sub load_facedata($) {	3627	sub load_facedata($) {
3437	my ($path) = @_;	3628	my ($path) = @_;
3438		3629
3439	# HACK to clear player env face cache, we need some signal framework
3440	# for this (global event?)
3441	%ext::player_env::MUSIC_FACE_CACHE = ();
3442
3443	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3444		3631
3445	trace "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3446		3633
3447	my $facedata = decode_storable load_file $path;	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3448		3635
3449	$facedata->{version} == 2	3636	$facedata->{version} == 2
3450	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3451		3638
3452	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3453	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3454	$facedata->{resource}{"res/exp_table"} = {	3641
3455	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3456	data => $exp_table,	3643
3457	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3458	};	3645	# from here on, everything must be atomic - no thread switch allowed
3459	cf::cede_to_tick;	3646	my $t1 = EV::time;
3460		3647
3461	{	3648	{
3462	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3463		3650
3464	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3465	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3466		3654
3467	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3468	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3469	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3470	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3471	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3472		3660	$cf::face::HASH{$info->{hash64}} = $idx;
3473	cf::cede_to_tick;	3661	delete $cf::face::META[$idx];
3474	}	3662	}
3475		3663
3476	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3477	next unless $info->{smooth};	3665	next unless $info->{smooth};
3478		3666
…		…
3483	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3484	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3485	} else {	3673	} else {
3486	error "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3487	}	3675	}
3488
3489	cf::cede_to_tick;
3490	}	3676	}
3491	}	3677	}
3492		3678
3493	{	3679	{
3494	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3495		3681
3496	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3497	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3498	cf::cede_to_tick;
3499	}	3684	}
3500		3685
3501	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3502	}	3687	}
3503		3688
3504	{	3689	{
3505	my $res = $facedata->{resource};	3690	my $res = $facedata->{resource};
3506		3691
3507	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3508	if (defined $info->{type}) {	3693	if (defined (my $type = $info->{type})) {
		3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3509	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3510		3696
3511	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3512	cf::face::set_type $idx, $info->{type};	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3513	} else {	3703	} else {
3514	$RESOURCE{$name} = $info; # unused	3704	# $RESOURCE{$name} = $info; # unused
3515	}	3705	}
3516
3517	cf::cede_to_tick;
3518	}	3706	}
3519	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3520		3718
3521	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3720
		3721	aio_close $fh if $fh; # close old facedata
3522		3722
3523	1	3723	1
3524	}	3724	}
3525		3725
3526	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
…		…
3537	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3538	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3539	cf::arch::commit_load;	3739	cf::arch::commit_load;
3540		3740
3541	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3542	}	3756	}
3543		3757
3544	sub reload_regions {	3758	sub reload_regions {
3545	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3546	# for this (global event?)	3760	# for this (global event?)
…		…
3554	if exists $_->{match};	3768	if exists $_->{match};
3555	}	3769	}
3556	}	3770	}
3557		3771
3558	sub reload_facedata {	3772	sub reload_facedata {
3559	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3560	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3561	}	3775	}
3562		3776
3563	sub reload_archetypes {	3777	sub reload_archetypes {
3564	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3565	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
		3792
		3793	# command completion
		3794	my @commands;
		3795
		3796	for (0..cf::arch::skillvec_size - 1) {
		3797	my $skill = cf::arch::skillvec $_;
		3798	my $name = $skill->name;
		3799	my $flags = cf::skill_flags $skill->subtype;
		3800
		3801	push @commands, "ready_skill $name" if $flags & (SF_COMBAT \| SF_RANGED \| SF_GRACE);
		3802	push @commands, "use_skill $name" if $flags & (SF_USE \| SF_AUTARK \| SF_GRACE);
		3803	}
		3804
		3805	cf::client::set_command_face skill => \@commands;
3566	}	3806	}
3567		3807
3568	sub reload_treasures {	3808	sub reload_treasures {
3569	load_resource_file "$DATADIR/treasures"	3809	load_resource_file "$DATADIR/treasures"
3570	or die "unable to load treasurelists\n";	3810	or die "unable to load treasurelists\n";
…		…
3591	}	3831	}
3592		3832
3593	sub reload_resources {	3833	sub reload_resources {
3594	trace "reloading resource files...\n";	3834	trace "reloading resource files...\n";
3595		3835
3596	reload_exp_table;
3597	reload_materials;	3836	reload_materials;
3598	reload_facedata;	3837	reload_facedata;
		3838	reload_exp_table;
3599	reload_sound;	3839	reload_sound;
3600	reload_archetypes;	3840	reload_archetypes;
3601	reload_regions;	3841	reload_regions;
3602	reload_treasures;	3842	reload_treasures;
3603		3843
…		…
3655		3895
3656	sub main {	3896	sub main {
3657	cf::init_globals; # initialise logging	3897	cf::init_globals; # initialise logging
3658		3898
3659	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3899	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3900	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3901	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3902	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663		3903
3664	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3904	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665		3905
3666	# we must not ever block the main coroutine	3906	# we must not ever block the main coroutine
3667	local $Coro::idle = sub {	3907	$Coro::idle = sub {
3668	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3908	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3669	(async {	3909	(async {
3670	$Coro::current->{desc} = "IDLE BUG HANDLER";	3910	$Coro::current->{desc} = "IDLE BUG HANDLER";
3671	EV::loop EV::LOOP_ONESHOT;	3911	EV::loop EV::LOOP_ONESHOT;
3672	})->prio (Coro::PRIO_MAX);	3912	})->prio (Coro::PRIO_MAX);
…		…
3675	evthread_start IO::AIO::poll_fileno;	3915	evthread_start IO::AIO::poll_fileno;
3676		3916
3677	cf::sync_job {	3917	cf::sync_job {
3678	cf::incloader::init ();	3918	cf::incloader::init ();
3679		3919
		3920	db_init;
		3921
3680	cf::init_anim;	3922	cf::init_anim;
3681	cf::init_attackmess;	3923	cf::init_attackmess;
3682	cf::init_dynamic;	3924	cf::init_dynamic;
3683		3925
3684	cf::load_settings;	3926	cf::load_settings;
3685		3927
3686	reload_resources;	3928	reload_resources;
3687	reload_config;	3929	reload_config;
3688	db_init;
3689		3930
3690	cf::init_uuid;	3931	cf::init_uuid;
3691	cf::init_signals;	3932	cf::init_signals;
3692	cf::init_skills;	3933	cf::init_skills;
3693		3934
…		…
3707	};	3948	};
3708		3949
3709	cf::object::thawer::errors_are_fatal 0;	3950	cf::object::thawer::errors_are_fatal 0;
3710	info "parse errors in files are no longer fatal from this point on.\n";	3951	info "parse errors in files are no longer fatal from this point on.\n";
3711		3952
3712	my $free_main; $free_main = EV::idle sub {	3953	AE::postpone {
3713	undef $free_main;
3714	undef &main; # free gobs of memory :)	3954	undef &main; # free gobs of memory :)
3715	};	3955	};
3716		3956
3717	goto &main_loop;	3957	goto &main_loop;
3718	}	3958	}
…		…
3875		4115
3876	cf::write_runtime_sync; # external watchdog should not bark	4116	cf::write_runtime_sync; # external watchdog should not bark
3877		4117
3878	trace "emergency_perl_save: flushing outstanding aio requests";	4118	trace "emergency_perl_save: flushing outstanding aio requests";
3879	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4119	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3880	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4120	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3881	}	4121	}
3882		4122
3883	cf::write_runtime_sync; # external watchdog should not bark	4123	cf::write_runtime_sync; # external watchdog should not bark
3884	};	4124	};
3885		4125
…		…
4066		4306
4067	#############################################################################	4307	#############################################################################
4068		4308
4069	my $bug_warning = 0;	4309	my $bug_warning = 0;
4070		4310
4071	our @WAIT_FOR_TICK;
4072	our @WAIT_FOR_TICK_BEGIN;
4073
4074	sub wait_for_tick() {	4311	sub wait_for_tick() {
4075	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4312	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4076		4313
4077	my $signal = new Coro::Signal;	4314	$WAIT_FOR_TICK->wait;
4078	push @WAIT_FOR_TICK, $signal;
4079	$signal->wait;
4080	}	4315	}
4081		4316
4082	sub wait_for_tick_begin() {	4317	sub wait_for_tick_begin() {
4083	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4318	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4084		4319
4085	my $signal = new Coro::Signal;	4320	my $signal = new Coro::Signal;
4086	push @WAIT_FOR_TICK_BEGIN, $signal;	4321	push @WAIT_FOR_TICK_BEGIN, $signal;
4087	$signal->wait;	4322	$signal->wait;
4088	}	4323	}
…		…
4092	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4327	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4093	unless ++$bug_warning > 10;	4328	unless ++$bug_warning > 10;
4094	return;	4329	return;
4095	}	4330	}
4096		4331
4097	cf::server_tick; # one server iteration	4332	cf::one_tick; # one server iteration
4098		4333
4099	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4334	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100		4335
4101	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4336	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4102	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4337	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4108	}	4343	}
4109		4344
4110	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4345	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4111	$sig->send;	4346	$sig->send;
4112	}	4347	}
4113	while (my $sig = shift @WAIT_FOR_TICK) {	4348	$WAIT_FOR_TICK->broadcast;
4114	$sig->send;
4115	}
4116		4349
4117	$LOAD = ($NOW - $TICK_START) / $TICK;	4350	$LOAD = ($NOW - $TICK_START) / $TICK;
4118	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4351	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4119		4352
4120	if (0) {	4353	if (0) {
…		…
4126	}	4359	}
4127	}	4360	}
4128		4361
4129	{	4362	{
4130	# configure BDB	4363	# configure BDB
		4364	info "initialising database";
4131		4365
4132	BDB::min_parallel 16;	4366	BDB::min_parallel 16;
4133	BDB::max_poll_reqs $TICK * 0.1;	4367	BDB::max_poll_reqs $TICK * 0.1;
4134	$AnyEvent::BDB::WATCHER->priority (1);	4368	#$AnyEvent::BDB::WATCHER->priority (1);
4135		4369
4136	unless ($DB_ENV) {	4370	unless ($DB_ENV) {
4137	$DB_ENV = BDB::db_env_create;	4371	$DB_ENV = BDB::db_env_create;
4138	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4372	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4139	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4373	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4164	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4398	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4165	};	4399	};
4166	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4400	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4167	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4401	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4168	};	4402	};
		4403
		4404	info "database initialised";
4169	}	4405	}
4170		4406
4171	{	4407	{
4172	# configure IO::AIO	4408	# configure IO::AIO
4173		4409
		4410	info "initialising aio";
4174	IO::AIO::min_parallel 8;	4411	IO::AIO::min_parallel 8;
4175	IO::AIO::max_poll_time $TICK * 0.1;	4412	IO::AIO::max_poll_time $TICK * 0.1;
4176	undef $AnyEvent::AIO::WATCHER;	4413	undef $AnyEvent::AIO::WATCHER;
		4414	info "aio initialised";
4177	}	4415	}
4178		4416
4179	our $_log_backtrace;	4417	our $_log_backtrace;
4180	our $_log_backtrace_last;	4418	our $_log_backtrace_last;
4181		4419

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs. Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC