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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	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)
152	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;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	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.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	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
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	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
223	(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
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
232	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
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	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.
238	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
239	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.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$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;
343	$d	380	$d
344	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
345	}	382	}
346		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		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
		434	}
		435
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
362	=item $ref = cf::yaml_load $scalar	459	=item $ref = cf::decode_yaml $scalar
363		460
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		462
366	=cut	463	=cut
367		464
368	sub fork_call(&@);	465	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
372	}	480	}
373		481
374	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
375		483
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
460	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
461	}	569	}
462		570
463	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
464		572
465	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
466	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
467	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
468		580
469	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
470	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
471		583
472	Useful for short background jobs.	584	Useful for short background jobs.
…		…
501	}	613	}
502	}	614	}
503		615
504	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
505	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
506	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
507	$signal->wait;
508	} else {	619	} else {
509	$busy = 0;	620	$busy = 0;
510	Coro::schedule;	621	Coro::schedule;
511	}	622	}
512	}	623	}
…		…
627	reset_signals;	738	reset_signals;
628	}	739	}
629		740
630	sub fork_call(&@) {	741	sub fork_call(&@) {
631	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
632
633	# we seemingly have to make a local copy of the whole thing,
634	# otherwise perl prematurely frees the stuff :/
635	# TODO: investigate and fix (likely this will be rather laborious)
636		743
637	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
638	cf::post_fork;	745	cf::post_fork;
639	&$cb	746	&$cb
640	} @args;	747	} @args;
…		…
767		874
768	my @data;	875	my @data;
769	my $md5;	876	my $md5;
770		877
771	for (0 .. $#$src) {	878	for (0 .. $#$src) {
772	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
773	or Carp::croak "$src->[$_]: $!";
774	}	880	}
775		881
776	# if processing is expensive, check	882	# if processing is expensive, check
777	# checksum first	883	# checksum first
778	if (1) {	884	if (1) {
…		…
791		897
792	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
793	}	899	}
794	}	900	}
795		901
796	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
797	my $data = $process->(\@data);	903	my $data = $process->(\@data);
798	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
799		905
800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801		907
802	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
803	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1323	=cut	1429	=cut
1324		1430
1325	#############################################################################	1431	#############################################################################
1326	# command handling &c	1432	# command handling &c
1327		1433
1328	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1329		1435
1330	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
1331	$name.	1437	$name.
1332		1438
1333	=cut	1439	=cut
…		…
1339	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1340		1446
1341	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1342	}	1448	}
1343		1449
1344	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1345		1451
1346	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1347	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
1348	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
1349	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
1350	has logged in successfully.	1456	has logged in successfully.
1351		1457
1352	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1353	called.
1354		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
1355	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1356		1466
1357	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1358	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
1359	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
1360	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
1361	log-in.	1471	log-in.
1362		1472
1363	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1364	called.
1365		1474
1366	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367		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
1368	sub register_extcmd {	1482	sub register_extcmd($$) {
1369	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1370		1484
1371	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1372	}	1486	}
1373		1487
1374	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1375	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1376		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1377	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1378	}	1504	}
1379		1505
1380	use File::Glob ();	1506	use File::Glob ();
1381		1507
1382	cf::player->attach (	1508	cf::player->attach (
…		…
1396	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1397		1523
1398	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399		1525
1400	if (ref $msg) {	1526	if (ref $msg) {
1401	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402	"ARRAY" eq ref $msg
1403	? @$msg
1404	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405		1528
1406	my @reply;
1407
1408	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}) {
1409	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1410	}	1547	}
1411
1412	$pl->ext_reply ($reply, @reply)
1413	if $reply;
1414		1548
1415	} else {	1549	} else {
1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417	}	1551	}
1418		1552
…		…
1431	};	1565	};
1432		1566
1433	$grp	1567	$grp
1434	}	1568	}
1435		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
1436	sub load_extensions {	1581	sub load_extensions {
1437	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1438		1585
1439	cf::sync_job {	1586	cf::sync_job {
1440	my %todo;	1587	my %todo;
1441		1588
1442	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1485	unless exists $done{$_};	1632	unless exists $done{$_};
1486	}	1633	}
1487		1634
1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489		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
1490	my $active = eval $v->{source};	1646	my $active = eval $source;
1491		1647
1492	if (length $@) {	1648	if (length $@) {
1493	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1494		1650
1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1512		1668
1513	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1516	}	1672	}
		1673
		1674	last;
1517	}	1675	}
1518	}	1676	}
1519	};	1677	};
1520	}	1678	}
1521		1679
…		…
1780	}	1938	}
1781		1939
1782	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783		1941
1784	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1785
1786	=item $player->ext_reply ($msgid, @msg)
1787
1788	Sends an ext reply to the player.
1789
1790	=cut
1791
1792	sub ext_reply($$@) {
1793	my ($self, $id, @msg) = @_;
1794
1795	$self->ns->ext_reply ($id, @msg)
1796	}
1797		1943
1798	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1799		1945
1800	Sends an ext event to the client.	1946	Sends an ext event to the client.
1801		1947
…		…
1949		2095
1950	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1951	()	2097	()
1952	}	2098	}
1953		2099
		2100	# may re-bless or do other evil things
1954	sub init {	2101	sub init {
1955	my ($self) = @_;	2102	my ($self) = @_;
1956		2103
1957	$self	2104	$self
1958	}	2105	}
…		…
2023	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2024		2171
2025	1	2172	1
2026	}	2173	}
2027		2174
		2175	# used to laod the header of an original map
2028	sub load_header_orig {	2176	sub load_header_orig {
2029	my ($self) = @_;	2177	my ($self) = @_;
2030		2178
2031	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2032	}	2180	}
2033		2181
		2182	# used to laod the header of an instantiated map
2034	sub load_header_temp {	2183	sub load_header_temp {
2035	my ($self) = @_;	2184	my ($self) = @_;
2036		2185
2037	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2038	}	2187	}
2039		2188
		2189	# called after loading the header from an instantiated map
2040	sub prepare_temp {	2190	sub prepare_temp {
2041	my ($self) = @_;	2191	my ($self) = @_;
2042		2192
2043	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2044	\|\| $cf::RUNTIME); #d#	2194	\|\| $cf::RUNTIME); #d#
2045	# safety	2195	# safety
2046	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2047	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2048	}	2198	}
2049		2199
		2200	# called after loading the header from an original map
2050	sub prepare_orig {	2201	sub prepare_orig {
2051	my ($self) = @_;	2202	my ($self) = @_;
2052		2203
2053	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2054	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2080	sub find {	2231	sub find {
2081	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2082		2233
2083	cf::cede_to_tick;	2234	cf::cede_to_tick;
2084		2235
2085	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2086		2237
2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2089		2240
2090	$cf::MAP{$path} \|\| do {	2241	$cf::MAP{$path} \|\| do {
…		…
2121		2272
2122	{	2273	{
2123	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2124		2275
2125	return unless $self->valid;	2276	return unless $self->valid;
2126	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2127
2128	$self->in_memory (cf::MAP_LOADING);
2129		2278
2130	$self->alloc;	2279	$self->alloc;
2131		2280
2132	$self->pre_load;	2281	$self->pre_load;
2133	cf::cede_to_tick;	2282	cf::cede_to_tick;
2134		2283
		2284	if (exists $self->{load_path}) {
2135	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2136	$f->skip_block;	2286	$f->skip_block;
2137	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2138	or return;	2288	or return;
2139		2289
2140	$self->post_load_original	2290	$self->post_load_original
2141	if delete $self->{load_original};	2291	if delete $self->{load_original};
2142		2292
2143	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2144	utf8::encode $uniq;	2294	utf8::encode $uniq;
2145	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2146	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2147	$self->clear_unique_items;	2297	$self->clear_unique_items;
2148	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2149	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2150	}	2301	}
2151	}	2302	}
2152	}
2153		2303
2154	$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);
2155		2311
2156	cf::cede_to_tick;	2312	cf::cede_to_tick;
2157	# now do the right thing for maps	2313	# now do the right thing for maps
2158	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2159	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2163	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2164	$self->decay_objects;	2320	$self->decay_objects;
2165	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2166	$self->update_buttons;	2322	$self->update_buttons;
2167	cf::cede_to_tick;	2323	cf::cede_to_tick;
2168	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2169	}	2325	}
2170		2326
2171	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2172	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2173
2174	$self->in_memory (cf::MAP_ACTIVE);
2175	}	2329	}
2176		2330
2177	$self->post_load;	2331	$self->post_load;
2178		2332
2179	1	2333	1
…		…
2192	# if $self->per_party;	2346	# if $self->per_party;
2193		2347
2194	$self	2348	$self
2195	}	2349	}
2196		2350
2197	# find and load all maps in the 3x3 area around a map
2198	sub load_neighbours {
2199	my ($map) = @_;
2200
2201	my @neigh; # diagonal neighbours
2202
2203	for (0 .. 3) {
2204	my $neigh = $map->tile_path ($_)
2205	or next;
2206	$neigh = find $neigh, $map
2207	or next;
2208	$neigh->load;
2209
2210	# now find the diagonal neighbours
2211	push @neigh,
2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2214	}
2215
2216	for (grep defined $_->[0], @neigh) {
2217	my ($path, $origin) = @$_;
2218	my $neigh = find $path, $origin
2219	or next;
2220	$neigh->load;
2221	}
2222	}
2223
2224	sub find_sync {	2351	sub find_sync {
2225	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2226		2353
		2354	# it's a bug to call this from the main context
2227	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2228	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2229		2357
2230	find $path, $origin	2358	find $path, $origin
2231	}	2359	}
2232		2360
2233	sub do_load_sync {	2361	sub do_load_sync {
2234	my ($map) = @_;	2362	my ($map) = @_;
2235		2363
		2364	# it's a bug to call this from the main context
2236	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2237	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2238		2367
2239	$map->load;	2368	$map->load;
2240	}	2369	}
…		…
2243	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2244		2373
2245	sub find_async {	2374	sub find_async {
2246	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2247		2376
2248	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2249		2378
2250	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2251	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2252	}	2381	}
2253		2382
2254	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2255		2384
2256	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
…		…
2315	sub swap_out {	2444	sub swap_out {
2316	my ($self) = @_;	2445	my ($self) = @_;
2317		2446
2318	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2319		2448
2320	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2321	return if $self->{deny_save};	2450	return if $self->{deny_save};
2322	return if $self->players;	2451	return if $self->players;
2323		2452
2324	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2325	$self->deactivate;	2454	$self->deactivate;
2326	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2327	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2328		2457
2329	# then atomically save	2458	# then atomically save
2330	$self->_save;	2459	$self->_save;
2331		2460
2332	# then free the map	2461	# then free the map
…		…
2358		2487
2359	return if $self->players;	2488	return if $self->players;
2360		2489
2361	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2362		2491
2363	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2364		2493
2365	# need to save uniques path	2494	# need to save uniques path
2366	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2367	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2368		2497
…		…
2521		2650
2522	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.
2523		2652
2524	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2525		2654
2526	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,
2527	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2528		2657
2529	=cut	2658	=cut
2530		2659
2531	sub deref {	2660	sub deref {
…		…
2698	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2699	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2700	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2701		2830
2702	$map->load;	2831	$map->load;
2703	$map->load_neighbours;
2704		2832
2705	return unless $self->contr->active;	2833	return unless $self->contr->active;
2706		2834
2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2764	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2765	}	2893	}
2766	}	2894	}
2767		2895
2768	my $map = eval {	2896	my $map = eval {
2769	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770		2898
2771	if ($map) {	2899	if ($map) {
2772	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2773	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2774	} else {	2902	} else {
…		…
2864	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2865		2993
2866	unless (eval {	2994	unless (eval {
2867	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2868		2996
2869	# random map handling
2870	{
2871	my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873	prepare_random_map $exit
2874	if $exit->slaying eq "/!";
2875	}
2876
2877	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2878	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2879	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	}
2880		3023
2881	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2882		3025
2883	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2884	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
3109	=cut	3252	=cut
3110		3253
3111	sub cf::client::ext_msg($$@) {	3254	sub cf::client::ext_msg($$@) {
3112	my ($self, $type, @msg) = @_;	3255	my ($self, $type, @msg) = @_;
3113		3256
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3257	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116	} elsif ($self->extcmd == 1) { # TODO: remove
3117	push @msg, msgtype => "event_$type";
3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119	}
3120	}
3121
3122	=item $client->ext_reply ($msgid, @msg)
3123
3124	Sends an ext reply to the client.
3125
3126	=cut
3127
3128	sub cf::client::ext_reply($$@) {
3129	my ($self, $id, @msg) = @_;
3130
3131	if ($self->extcmd == 2) {
3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133	} elsif ($self->extcmd == 1) {
3134	#TODO: version 1, remove
3135	unshift @msg, msgtype => "reply", msgid => $id;
3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137	}
3138	}	3258	}
3139		3259
3140	=item $success = $client->query ($flags, "text", \&cb)	3260	=item $success = $client->query ($flags, "text", \&cb)
3141		3261
3142	Queues a query to the client, calling the given callback with	3262	Queues a query to the client, calling the given callback with
…		…
3197	my ($ns, $buf) = @_;	3317	my ($ns, $buf) = @_;
3198		3318
3199	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3319	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200		3320
3201	if (ref $msg) {	3321	if (ref $msg) {
3202	my ($type, $reply, @payload) =	3322	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203	"ARRAY" eq ref $msg
3204	? @$msg
3205	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206		3323
3207	my @reply;
3208
3209	if (my $cb = $EXTICMD{$type}) {	3324	if (my $cb = $EXTIACMD{$type}) {
		3325	$cb->(
		3326	$ns,
		3327	sub {
		3328	$ns->ext_msg ("reply-$reply", @_)
		3329	if $reply;
		3330	},
		3331	@payload
		3332	);
		3333	} else {
		3334	my @reply;
		3335
		3336	if (my $cb = $EXTICMD{$type}) {
3210	@reply = $cb->($ns, @payload);	3337	@reply = $cb->($ns, @payload);
		3338	}
		3339
		3340	$ns->ext_msg ("reply-$reply", @reply)
		3341	if $reply;
3211	}	3342	}
3212
3213	$ns->ext_reply ($reply, @reply)
3214	if $reply;
3215
3216	} else {	3343	} else {
3217	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3344	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3218	}	3345	}
3219		3346
3220	cf::override;	3347	cf::override;
…		…
3388	=cut	3515	=cut
3389		3516
3390	#############################################################################	3517	#############################################################################
3391	# the server's init and main functions	3518	# the server's init and main functions
3392		3519
		3520	{
		3521	package cf::face;
		3522
		3523	our %HASH; # hash => idx
		3524	our @DATA; # dynamically-created facedata, only faceste 0 used
		3525	our @FOFS; # file offset, if > 0
		3526	our @SIZE; # size of face, in octets
		3527	our @META; # meta hash of face, if any
		3528	our $DATAFH; # facedata filehandle
		3529
		3530	# internal api, not finalised
		3531	sub set {
		3532	my ($name, $type, $data) = @_;
		3533
		3534	my $idx = cf::face::find $name;
		3535
		3536	if ($idx) {
		3537	delete $HASH{cf::face::get_chksum $idx};
		3538	} else {
		3539	$idx = cf::face::alloc $name;
		3540	}
		3541
		3542	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3543
		3544	cf::face::set_type $idx, $type;
		3545	cf::face::set_csum $idx, 0, $hash;
		3546
		3547	# we need to destroy the SV itself, not just modify it, as a running ix
		3548	# might hold a reference to it: "delete" achieves that.
		3549	delete $FOFS[0][$idx];
		3550	delete $DATA[0][$idx];
		3551	$DATA[0][$idx] = $data;
		3552	$SIZE[0][$idx] = length $data;
		3553	delete $META[$idx];
		3554	$HASH{$hash} = $idx;#d#
		3555
		3556	$idx
		3557	}
		3558
		3559	sub _get_data($$$) {
		3560	my ($idx, $set, $cb) = @_;
		3561
		3562	if (defined $DATA[$set][$idx]) {
		3563	$cb->($DATA[$set][$idx]);
		3564	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3565	my $size = $SIZE[$set][$idx];
		3566	my $buf;
		3567	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3568	if ($_[0] == $size) {
		3569	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3570	$cb->($buf);
		3571	} else {
		3572	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3573	}
		3574	};
		3575	} else {
		3576	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3577	}
		3578	}
		3579
		3580	# rather ineffient
		3581	sub cf::face::get_data($;$) {
		3582	my ($idx, $set) = @_;
		3583
		3584	_get_data $idx, $set, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $set, $idx, $pri) = @_;
		3590
		3591	_get_data $idx, $set, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595	}
		3596
3393	sub load_facedata($) {	3597	sub load_facedata($) {
3394	my ($path) = @_;	3598	my ($path) = @_;
3395		3599
3396	# HACK to clear player env face cache, we need some signal framework
3397	# for this (global event?)
3398	%ext::player_env::MUSIC_FACE_CACHE = ();
3399
3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3600	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401		3601
3402	trace "loading facedata from $path\n";	3602	trace "loading facedata from $path\n";
3403		3603
3404	0 < aio_load $path, my $facedata	3604	my $facedata = decode_storable load_file "$path/faceinfo";
3405	or die "$path: $!";
3406
3407	$facedata = Coro::Storable::thaw $facedata;
3408		3605
3409	$facedata->{version} == 2	3606	$facedata->{version} == 2
3410	or cf::cleanup "$path: version mismatch, cannot proceed.";	3607	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3411		3608
3412	# patch in the exptable	3609	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3610	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3414	$facedata->{resource}{"res/exp_table"} = {	3611
3415	type => FT_RSRC,	3612	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3416	data => $exp_table,	3613
3417	hash => (Digest::MD5::md5 $exp_table),	3614	# BEGIN ATOMIC
3418	};	3615	# from here on, everything must be atomic - no thread switch allowed
3419	cf::cede_to_tick;	3616	my $t1 = EV::time;
3420		3617
3421	{	3618	{
3422	my $faces = $facedata->{faceinfo};	3619	my $faces = $facedata->{faceinfo};
3423		3620
3424	while (my ($face, $info) = each %$faces) {	3621	for my $face (sort keys %$faces) {
		3622	my $info = $faces->{$face};
3425	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3623	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3426		3624
3427	cf::face::set_visibility $idx, $info->{visibility};	3625	cf::face::set_visibility $idx, $info->{visibility};
3428	cf::face::set_magicmap $idx, $info->{magicmap};	3626	cf::face::set_magicmap $idx, $info->{magicmap};
3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3627	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3628	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3431	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3629	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3432		3630	$cf::face::HASH{$info->{hash64}} = $idx;
3433	cf::cede_to_tick;	3631	delete $cf::face::META[$idx];
3434	}	3632	}
3435		3633
3436	while (my ($face, $info) = each %$faces) {	3634	while (my ($face, $info) = each %$faces) {
3437	next unless $info->{smooth};	3635	next unless $info->{smooth};
3438		3636
…		…
3443	cf::face::set_smooth $idx, $smooth;	3641	cf::face::set_smooth $idx, $smooth;
3444	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3642	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3445	} else {	3643	} else {
3446	error "smooth face '$info->{smooth}' not found for face '$face'";	3644	error "smooth face '$info->{smooth}' not found for face '$face'";
3447	}	3645	}
3448
3449	cf::cede_to_tick;
3450	}	3646	}
3451	}	3647	}
3452		3648
3453	{	3649	{
3454	my $anims = $facedata->{animinfo};	3650	my $anims = $facedata->{animinfo};
3455		3651
3456	while (my ($anim, $info) = each %$anims) {	3652	while (my ($anim, $info) = each %$anims) {
3457	cf::anim::set $anim, $info->{frames}, $info->{facings};	3653	cf::anim::set $anim, $info->{frames}, $info->{facings};
3458	cf::cede_to_tick;
3459	}	3654	}
3460		3655
3461	cf::anim::invalidate_all; # d'oh	3656	cf::anim::invalidate_all; # d'oh
3462	}	3657	}
3463		3658
3464	{	3659	{
3465	my $res = $facedata->{resource};	3660	my $res = $facedata->{resource};
3466		3661
3467	while (my ($name, $info) = each %$res) {	3662	while (my ($name, $info) = each %$res) {
3468	if (defined $info->{type}) {	3663	if (defined (my $type = $info->{type})) {
		3664	# TODO: different hash - must free and use new index, or cache ixface data queue
3469	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3665	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3470		3666
3471	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472	cf::face::set_type $idx, $info->{type};	3667	cf::face::set_type $idx, $type;
		3668	cf::face::set_csum $idx, 0, $info->{hash};
		3669	$cf::face::SIZE[0][$idx] = $info->{size};
		3670	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3671	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3672	$cf::face::HASH{$info->{hash}} = $idx;
3473	} else {	3673	} else {
3474	$RESOURCE{$name} = $info; # unused	3674	# $RESOURCE{$name} = $info; # unused
3475	}	3675	}
3476
3477	cf::cede_to_tick;
3478	}	3676	}
3479	}	3677	}
		3678
		3679	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3680
		3681	# HACK to clear player env face cache, we need some signal framework
		3682	# for this (global event?)
		3683	%ext::player_env::MUSIC_FACE_CACHE = ();
		3684
		3685	# END ATOMIC
		3686
		3687	cf::debug "facedata atomic update time ", EV::time - $t1;
3480		3688
3481	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3689	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3690
		3691	aio_close $fh if $fh; # close old facedata
3482		3692
3483	1	3693	1
3484	}	3694	}
3485		3695
3486	register_exticmd fx_want => sub {	3696	register_exticmd fx_want => sub {
…		…
3497	my $status = load_resource_file_ $_[0];	3707	my $status = load_resource_file_ $_[0];
3498	get_slot 0.1, 100;	3708	get_slot 0.1, 100;
3499	cf::arch::commit_load;	3709	cf::arch::commit_load;
3500		3710
3501	$status	3711	$status
		3712	}
		3713
		3714	sub reload_exp_table {
		3715	_reload_exp_table;
		3716
		3717	cf::face::set
		3718	"res/exp_table" => FT_RSRC,
		3719	JSON::XS->new->utf8->canonical->encode (
		3720	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3721	);
		3722	}
		3723
		3724	sub reload_materials {
		3725	_reload_materials;
3502	}	3726	}
3503		3727
3504	sub reload_regions {	3728	sub reload_regions {
3505	# HACK to clear player env face cache, we need some signal framework	3729	# HACK to clear player env face cache, we need some signal framework
3506	# for this (global event?)	3730	# for this (global event?)
…		…
3514	if exists $_->{match};	3738	if exists $_->{match};
3515	}	3739	}
3516	}	3740	}
3517		3741
3518	sub reload_facedata {	3742	sub reload_facedata {
3519	load_facedata "$DATADIR/facedata"	3743	load_facedata $DATADIR
3520	or die "unable to load facedata\n";	3744	or die "unable to load facedata\n";
3521	}	3745	}
3522		3746
3523	sub reload_archetypes {	3747	sub reload_archetypes {
3524	load_resource_file "$DATADIR/archetypes"	3748	load_resource_file "$DATADIR/archetypes"
3525	or die "unable to load archetypes\n";	3749	or die "unable to load archetypes\n";
		3750
		3751	cf::face::set
		3752	"res/skill_info" => FT_RSRC,
		3753	JSON::XS->new->utf8->canonical->encode (
		3754	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3755	);
		3756
		3757	cf::face::set
		3758	"res/spell_paths" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3761	);
3526	}	3762	}
3527		3763
3528	sub reload_treasures {	3764	sub reload_treasures {
3529	load_resource_file "$DATADIR/treasures"	3765	load_resource_file "$DATADIR/treasures"
3530	or die "unable to load treasurelists\n";	3766	or die "unable to load treasurelists\n";
3531	}	3767	}
3532		3768
3533	sub reload_sound {	3769	sub reload_sound {
3534	trace "loading sound config from $DATADIR/sound\n";	3770	trace "loading sound config from $DATADIR/sound\n";
3535		3771
3536	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537	or die "$DATADIR/sound $!";
3538
3539	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3772	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540		3773
3541	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3774	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542	my $sound = $soundconf->{compat}[$_]	3775	my $sound = $soundconf->{compat}[$_]
3543	or next;	3776	or next;
3544		3777
…		…
3554	}	3787	}
3555		3788
3556	sub reload_resources {	3789	sub reload_resources {
3557	trace "reloading resource files...\n";	3790	trace "reloading resource files...\n";
3558		3791
3559	reload_exp_table;
3560	reload_materials;	3792	reload_materials;
3561	reload_facedata;	3793	reload_facedata;
		3794	reload_exp_table;
3562	reload_sound;	3795	reload_sound;
3563	reload_archetypes;	3796	reload_archetypes;
3564	reload_regions;	3797	reload_regions;
3565	reload_treasures;	3798	reload_treasures;
3566		3799
…		…
3568	}	3801	}
3569		3802
3570	sub reload_config {	3803	sub reload_config {
3571	trace "reloading config file...\n";	3804	trace "reloading config file...\n";
3572		3805
3573	0 < aio_load "$CONFDIR/config", my $config	3806	my $config = load_file "$CONFDIR/config";
3574	or die "$CONFDIR/config: $!";
3575
3576	utf8::decode $config;	3807	utf8::decode $config;
3577	*CFG = yaml_load $config;	3808	*CFG = decode_yaml $config;
3578		3809
3579	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];	3810	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];
3580		3811
3581	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3812	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3813	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3620		3851
3621	sub main {	3852	sub main {
3622	cf::init_globals; # initialise logging	3853	cf::init_globals; # initialise logging
3623		3854
3624	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3855	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3856	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3857	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3858	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628		3859
3629	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3860	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3630		3861
3631	# we must not ever block the main coroutine	3862	# we must not ever block the main coroutine
3632	local $Coro::idle = sub {	3863	$Coro::idle = sub {
3633	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3864	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3634	(async {	3865	(async {
3635	$Coro::current->{desc} = "IDLE BUG HANDLER";	3866	$Coro::current->{desc} = "IDLE BUG HANDLER";
3636	EV::loop EV::LOOP_ONESHOT;	3867	EV::loop EV::LOOP_ONESHOT;
3637	})->prio (Coro::PRIO_MAX);	3868	})->prio (Coro::PRIO_MAX);
…		…
3640	evthread_start IO::AIO::poll_fileno;	3871	evthread_start IO::AIO::poll_fileno;
3641		3872
3642	cf::sync_job {	3873	cf::sync_job {
3643	cf::incloader::init ();	3874	cf::incloader::init ();
3644		3875
		3876	db_init;
		3877
3645	cf::init_anim;	3878	cf::init_anim;
3646	cf::init_attackmess;	3879	cf::init_attackmess;
3647	cf::init_dynamic;	3880	cf::init_dynamic;
3648		3881
3649	cf::load_settings;	3882	cf::load_settings;
3650		3883
3651	reload_resources;	3884	reload_resources;
3652	reload_config;	3885	reload_config;
3653	db_init;
3654		3886
3655	cf::init_uuid;	3887	cf::init_uuid;
3656	cf::init_signals;	3888	cf::init_signals;
3657	cf::init_skills;	3889	cf::init_skills;
3658		3890
…		…
3672	};	3904	};
3673		3905
3674	cf::object::thawer::errors_are_fatal 0;	3906	cf::object::thawer::errors_are_fatal 0;
3675	info "parse errors in files are no longer fatal from this point on.\n";	3907	info "parse errors in files are no longer fatal from this point on.\n";
3676		3908
3677	my $free_main; $free_main = EV::idle sub {	3909	AE::postpone {
3678	undef $free_main;
3679	undef &main; # free gobs of memory :)	3910	undef &main; # free gobs of memory :)
3680	};	3911	};
3681		3912
3682	goto &main_loop;	3913	goto &main_loop;
3683	}	3914	}
…		…
3840		4071
3841	cf::write_runtime_sync; # external watchdog should not bark	4072	cf::write_runtime_sync; # external watchdog should not bark
3842		4073
3843	trace "emergency_perl_save: flushing outstanding aio requests";	4074	trace "emergency_perl_save: flushing outstanding aio requests";
3844	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4075	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3845	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4076	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3846	}	4077	}
3847		4078
3848	cf::write_runtime_sync; # external watchdog should not bark	4079	cf::write_runtime_sync; # external watchdog should not bark
3849	};	4080	};
3850		4081
…		…
4031		4262
4032	#############################################################################	4263	#############################################################################
4033		4264
4034	my $bug_warning = 0;	4265	my $bug_warning = 0;
4035		4266
4036	our @WAIT_FOR_TICK;
4037	our @WAIT_FOR_TICK_BEGIN;
4038
4039	sub wait_for_tick() {	4267	sub wait_for_tick() {
4040	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4268	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4041		4269
4042	my $signal = new Coro::Signal;	4270	$WAIT_FOR_TICK->wait;
4043	push @WAIT_FOR_TICK, $signal;
4044	$signal->wait;
4045	}	4271	}
4046		4272
4047	sub wait_for_tick_begin() {	4273	sub wait_for_tick_begin() {
4048	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4049		4275
4050	my $signal = new Coro::Signal;	4276	my $signal = new Coro::Signal;
4051	push @WAIT_FOR_TICK_BEGIN, $signal;	4277	push @WAIT_FOR_TICK_BEGIN, $signal;
4052	$signal->wait;	4278	$signal->wait;
4053	}	4279	}
…		…
4057	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4283	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4058	unless ++$bug_warning > 10;	4284	unless ++$bug_warning > 10;
4059	return;	4285	return;
4060	}	4286	}
4061		4287
4062	cf::server_tick; # one server iteration	4288	cf::one_tick; # one server iteration
4063		4289
4064	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4290	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4065		4291
4066	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4292	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4293	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4073	}	4299	}
4074		4300
4075	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4301	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076	$sig->send;	4302	$sig->send;
4077	}	4303	}
4078	while (my $sig = shift @WAIT_FOR_TICK) {	4304	$WAIT_FOR_TICK->broadcast;
4079	$sig->send;
4080	}
4081		4305
4082	$LOAD = ($NOW - $TICK_START) / $TICK;	4306	$LOAD = ($NOW - $TICK_START) / $TICK;
4083	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4307	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084		4308
4085	if (0) {	4309	if (0) {
…		…
4091	}	4315	}
4092	}	4316	}
4093		4317
4094	{	4318	{
4095	# configure BDB	4319	# configure BDB
		4320	info "initialising database";
4096		4321
4097	BDB::min_parallel 16;	4322	BDB::min_parallel 16;
4098	BDB::max_poll_reqs $TICK * 0.1;	4323	BDB::max_poll_reqs $TICK * 0.1;
4099	$AnyEvent::BDB::WATCHER->priority (1);	4324	#$AnyEvent::BDB::WATCHER->priority (1);
4100		4325
4101	unless ($DB_ENV) {	4326	unless ($DB_ENV) {
4102	$DB_ENV = BDB::db_env_create;	4327	$DB_ENV = BDB::db_env_create;
4103	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4328	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4104	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4329	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4129	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4354	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130	};	4355	};
4131	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4356	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4357	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133	};	4358	};
		4359
		4360	info "database initialised";
4134	}	4361	}
4135		4362
4136	{	4363	{
4137	# configure IO::AIO	4364	# configure IO::AIO
4138		4365
		4366	info "initialising aio";
4139	IO::AIO::min_parallel 8;	4367	IO::AIO::min_parallel 8;
4140	IO::AIO::max_poll_time $TICK * 0.1;	4368	IO::AIO::max_poll_time $TICK * 0.1;
4141	undef $AnyEvent::AIO::WATCHER;	4369	undef $AnyEvent::AIO::WATCHER;
		4370	info "aio initialised";
4142	}	4371	}
4143		4372
4144	our $_log_backtrace;	4373	our $_log_backtrace;
4145	our $_log_backtrace_last;	4374	our $_log_backtrace_last;
4146		4375

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC vs. Revision 1.603 by root, Tue Nov 13 01:12:23 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 2012 UTC