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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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	}
…		…
620		687
621	while ($busy) {	688	while ($busy) {
622	if (Coro::nready) {	689	if (Coro::nready) {
623	Coro::cede_notself;	690	Coro::cede_notself;
624	} else {	691	} else {
625	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
626	}	693	}
627	}	694	}
628		695
629	my $time = AE::time - $time;	696	my $time = AE::time - $time;
630		697
…		…
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."
…		…
1825	}	1938	}
1826		1939
1827	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828		1941
1829	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1830
1831	=item $player->ext_reply ($msgid, @msg)
1832
1833	Sends an ext reply to the player.
1834
1835	=cut
1836
1837	sub ext_reply($$@) {
1838	my ($self, $id, @msg) = @_;
1839
1840	$self->ns->ext_reply ($id, @msg)
1841	}
1842		1943
1843	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1844		1945
1845	Sends an ext event to the client.	1946	Sends an ext event to the client.
1846		1947
…		…
2069	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2070		2171
2071	1	2172	1
2072	}	2173	}
2073		2174
		2175	# used to laod the header of an original map
2074	sub load_header_orig {	2176	sub load_header_orig {
2075	my ($self) = @_;	2177	my ($self) = @_;
2076		2178
2077	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2078	}	2180	}
2079		2181
		2182	# used to laod the header of an instantiated map
2080	sub load_header_temp {	2183	sub load_header_temp {
2081	my ($self) = @_;	2184	my ($self) = @_;
2082		2185
2083	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2084	}	2187	}
2085		2188
		2189	# called after loading the header from an instantiated map
2086	sub prepare_temp {	2190	sub prepare_temp {
2087	my ($self) = @_;	2191	my ($self) = @_;
2088		2192
2089	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2090	\|\| $cf::RUNTIME); #d#	2194	\|\| $cf::RUNTIME); #d#
2091	# safety	2195	# safety
2092	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2093	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2094	}	2198	}
2095		2199
		2200	# called after loading the header from an original map
2096	sub prepare_orig {	2201	sub prepare_orig {
2097	my ($self) = @_;	2202	my ($self) = @_;
2098		2203
2099	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2100	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2126	sub find {	2231	sub find {
2127	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2128		2233
2129	cf::cede_to_tick;	2234	cf::cede_to_tick;
2130		2235
2131	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2132		2237
2133	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2135		2240
2136	$cf::MAP{$path} \|\| do {	2241	$cf::MAP{$path} \|\| do {
…		…
2167		2272
2168	{	2273	{
2169	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2170		2275
2171	return unless $self->valid;	2276	return unless $self->valid;
2172	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2173
2174	$self->in_memory (cf::MAP_LOADING);
2175		2278
2176	$self->alloc;	2279	$self->alloc;
2177		2280
2178	$self->pre_load;	2281	$self->pre_load;
2179	cf::cede_to_tick;	2282	cf::cede_to_tick;
…		…
2197	}	2300	}
2198	}	2301	}
2199	}	2302	}
2200		2303
2201	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
2202	}	2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2203		2311
2204	cf::cede_to_tick;	2312	cf::cede_to_tick;
2205	# now do the right thing for maps	2313	# now do the right thing for maps
2206	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2207	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2211	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2212	$self->decay_objects;	2320	$self->decay_objects;
2213	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2214	$self->update_buttons;	2322	$self->update_buttons;
2215	cf::cede_to_tick;	2323	cf::cede_to_tick;
2216	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2217	}	2325	}
2218		2326
2219	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2220	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2221
2222	$self->in_memory (cf::MAP_ACTIVE);
2223	}	2329	}
2224		2330
2225	$self->post_load;	2331	$self->post_load;
2226		2332
2227	1	2333	1
…		…
2240	# if $self->per_party;	2346	# if $self->per_party;
2241		2347
2242	$self	2348	$self
2243	}	2349	}
2244		2350
2245	# find and load all maps in the 3x3 area around a map
2246	sub load_neighbours {
2247	my ($map) = @_;
2248
2249	my @neigh; # diagonal neighbours
2250
2251	for (0 .. 3) {
2252	my $neigh = $map->tile_path ($_)
2253	or next;
2254	$neigh = find $neigh, $map
2255	or next;
2256	$neigh->load;
2257
2258	# now find the diagonal neighbours
2259	push @neigh,
2260	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2261	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2262	}
2263
2264	for (grep defined $_->[0], @neigh) {
2265	my ($path, $origin) = @$_;
2266	my $neigh = find $path, $origin
2267	or next;
2268	$neigh->load;
2269	}
2270	}
2271
2272	sub find_sync {	2351	sub find_sync {
2273	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2274		2353
		2354	# it's a bug to call this from the main context
2275	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2276	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2277		2357
2278	find $path, $origin	2358	find $path, $origin
2279	}	2359	}
2280		2360
2281	sub do_load_sync {	2361	sub do_load_sync {
2282	my ($map) = @_;	2362	my ($map) = @_;
2283		2363
		2364	# it's a bug to call this from the main context
2284	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2285	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2286		2367
2287	$map->load;	2368	$map->load;
2288	}	2369	}
…		…
2291	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2292		2373
2293	sub find_async {	2374	sub find_async {
2294	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2295		2376
2296	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2297		2378
2298	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2299	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2300	}	2381	}
2301		2382
2302	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2303		2384
2304	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
2305	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2306		2387
2307	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2308	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2309	if (my $map = find $k) {	2390	if (my $map = find $k) {
2310	$map->load if $v;	2391	$map->load if $v;
2311	}	2392	}
2312		2393
2313	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
…		…
2363	sub swap_out {	2444	sub swap_out {
2364	my ($self) = @_;	2445	my ($self) = @_;
2365		2446
2366	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2367		2448
2368	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2369	return if $self->{deny_save};	2450	return if $self->{deny_save};
2370	return if $self->players;	2451	return if $self->players;
2371		2452
2372	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2373	$self->deactivate;	2454	$self->deactivate;
2374	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2375	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2376		2457
2377	# then atomically save	2458	# then atomically save
2378	$self->_save;	2459	$self->_save;
2379		2460
2380	# then free the map	2461	# then free the map
…		…
2406		2487
2407	return if $self->players;	2488	return if $self->players;
2408		2489
2409	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2410		2491
2411	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2412		2493
2413	# need to save uniques path	2494	# need to save uniques path
2414	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2415	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2416		2497
…		…
2569		2650
2570	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.
2571		2652
2572	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2573		2654
2574	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,
2575	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2576		2657
2577	=cut	2658	=cut
2578		2659
2579	sub deref {	2660	sub deref {
…		…
2661	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2662		2743
2663	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2664	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2665		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2666	=cut	2772	=cut
2667		2773
2668	sub cf::object::player::may {	2774	sub cf::object::player::may {
2669	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2670		2776
2671	$self->flag (cf::FLAG_WIZ) \|\|	2777	$self->flag (cf::FLAG_WIZ) \|\|
2672	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2673	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ \|\| $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2674	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2675	}	2781	}
2676		2782
2677	=item $player_object->enter_link	2783	=item $player_object->enter_link
2678		2784
…		…
2681	The player should be reasonably safe there for short amounts of time (e.g.	2787	The player should be reasonably safe there for short amounts of time (e.g.
2682	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2788	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2683	though, as the player cannot control the character while it is on the link	2789	though, as the player cannot control the character while it is on the link
2684	map.	2790	map.
2685		2791
2686	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2687		2799
2688	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2689		2801
2690	Moves the player out of the special C<{link}> map onto the specified	2802	Moves the player out of the special C<{link}> map onto the specified
2691	map. If the map is not valid (or omitted), the player will be moved back	2803	map. If the map is not valid (or omitted), the player will be moved back
…		…
2746	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2747	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2748	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2749		2861
2750	$map->load;	2862	$map->load;
2751	$map->load_neighbours;
2752		2863
2753	return unless $self->contr->active;	2864	return unless $self->contr->active;
2754		2865
2755	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2812	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2813	}	2924	}
2814	}	2925	}
2815		2926
2816	my $map = eval {	2927	my $map = eval {
2817	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818		2929
2819	if ($map) {	2930	if ($map) {
2820	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2821	$map = $check->($map, $x, $y, $self) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2822	} else {	2933	} else {
…		…
2912	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2913		3024
2914	unless (eval {	3025	unless (eval {
2915	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2916		3027
2917	# random map handling
2918	{
2919	my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921	prepare_random_map $exit
2922	if $exit->slaying eq "/!";
2923	}
2924
2925	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2926	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2927	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2928		3054
2929	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2930		3056
2931	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2932	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2947		3073
2948	=head3 cf::client	3074	=head3 cf::client
2949		3075
2950	=over 4	3076	=over 4
2951		3077
2952	=item $client->send_drawinfo ($text, $flags)
2953
2954	Sends a drawinfo packet to the client. Circumvents output buffering so
2955	should not be used under normal circumstances.
2956
2957	=cut
2958
2959	sub cf::client::send_drawinfo {
2960	my ($self, $text, $flags) = @_;
2961
2962	utf8::encode $text;
2963	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2964	}
2965
2966	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2967		3079
2968	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2969	them as required.	3081	them as required.
2970		3082
…		…
2988	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2989	}	3101	}
2990		3102
2991	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2992		3104
2993	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	Send a msg packet to the client, formatting the msg for the client if
2994	client if neccessary. C<$type> should be a string identifying the type of	3106	necessary. C<$type> should be a string identifying the type of the
2995	the message, with C<log> being the default. If C<$color> is negative, suppress	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2996	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2997		3109
2998	=cut	3110	=cut
2999		3111
3000	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3105	id => "death",	3217	id => "death",
3106	title => "Death",	3218	title => "Death",
3107	reply => undef,	3219	reply => undef,
3108	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3109	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3110	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3111	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3112	);	3230	);
3113		3231
3114	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3157	=cut	3275	=cut
3158		3276
3159	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3160	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3161		3279
3162	if ($self->extcmd == 2) {
3163	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3164	} elsif ($self->extcmd == 1) { # TODO: remove
3165	push @msg, msgtype => "event_$type";
3166	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3167	}
3168	}
3169
3170	=item $client->ext_reply ($msgid, @msg)
3171
3172	Sends an ext reply to the client.
3173
3174	=cut
3175
3176	sub cf::client::ext_reply($$@) {
3177	my ($self, $id, @msg) = @_;
3178
3179	if ($self->extcmd == 2) {
3180	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3181	} elsif ($self->extcmd == 1) {
3182	#TODO: version 1, remove
3183	unshift @msg, msgtype => "reply", msgid => $id;
3184	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185	}
3186	}	3281	}
3187		3282
3188	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3189		3284
3190	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3210		3305
3211	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3212	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3213		3308
3214	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3215	}	3349	}
3216		3350
3217	cf::client->attach (	3351	cf::client->attach (
3218	on_connect => sub {	3352	on_connect => sub {
3219	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3245	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3246		3380
3247	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248		3382
3249	if (ref $msg) {	3383	if (ref $msg) {
3250	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251	"ARRAY" eq ref $msg
3252	? @$msg
3253	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254		3385
3255	my @reply;
3256
3257	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3258	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3259	}	3404	}
3260
3261	$ns->ext_reply ($reply, @reply)
3262	if $reply;
3263
3264	} else {	3405	} else {
3265	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3266	}	3407	}
3267		3408
3268	cf::override;	3409	cf::override;
…		…
3436	=cut	3577	=cut
3437		3578
3438	#############################################################################	3579	#############################################################################
3439	# the server's init and main functions	3580	# the server's init and main functions
3440		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3441	sub load_facedata($) {	3659	sub load_facedata($) {
3442	my ($path) = @_;	3660	my ($path) = @_;
3443		3661
3444	# HACK to clear player env face cache, we need some signal framework
3445	# for this (global event?)
3446	%ext::player_env::MUSIC_FACE_CACHE = ();
3447
3448	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3449		3663
3450	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3451		3665
3452	my $facedata = decode_storable load_file $path;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3453		3667
3454	$facedata->{version} == 2	3668	$facedata->{version} == 2
3455	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3456		3670
3457	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3458	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3459	$facedata->{resource}{"res/exp_table"} = {	3673
3460	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3461	data => $exp_table,	3675
3462	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3463	};	3677	# from here on, everything must be atomic - no thread switch allowed
3464	cf::cede_to_tick;	3678	my $t1 = EV::time;
3465		3679
3466	{	3680	{
3467	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3468		3682
3469	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3470	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3471		3686
3472	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3473	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3474	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3475	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3476	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3477		3692	$cf::face::HASH{$info->{hash64}} = $idx;
3478	cf::cede_to_tick;	3693	delete $cf::face::META[$idx];
3479	}	3694	}
3480		3695
3481	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3482	next unless $info->{smooth};	3697	next unless $info->{smooth};
3483		3698
…		…
3488	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3489	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3490	} else {	3705	} else {
3491	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3492	}	3707	}
3493
3494	cf::cede_to_tick;
3495	}	3708	}
3496	}	3709	}
3497		3710
3498	{	3711	{
3499	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3500		3713
3501	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3502	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3503	cf::cede_to_tick;
3504	}	3716	}
3505		3717
3506	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3507	}	3719	}
3508		3720
3509	{	3721	{
3510	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3511		3723
3512	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3513	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# TODO: different hash - must free and use new index, or cache ixface data queue
3514	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3515		3728
3516	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3518	} else {	3735	} else {
3519	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3520	}	3737	}
3521
3522	cf::cede_to_tick;
3523	}	3738	}
3524	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3525		3750
3526	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3752
		3753	aio_close $fh if $fh; # close old facedata
3527		3754
3528	1	3755	1
3529	}	3756	}
3530		3757
3531	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3542	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3543	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3544	cf::arch::commit_load;	3771	cf::arch::commit_load;
3545		3772
3546	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3547	}	3788	}
3548		3789
3549	sub reload_regions {	3790	sub reload_regions {
3550	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3551	# for this (global event?)	3792	# for this (global event?)
…		…
3559	if exists $_->{match};	3800	if exists $_->{match};
3560	}	3801	}
3561	}	3802	}
3562		3803
3563	sub reload_facedata {	3804	sub reload_facedata {
3564	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3565	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3566	}	3807	}
3567		3808
3568	sub reload_archetypes {	3809	sub reload_archetypes {
3569	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3570	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT \| SF_RANGED \| SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE \| SF_AUTARK \| SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3571	}	3838	}
3572		3839
3573	sub reload_treasures {	3840	sub reload_treasures {
3574	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3575	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
…		…
3596	}	3863	}
3597		3864
3598	sub reload_resources {	3865	sub reload_resources {
3599	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3600		3867
3601	reload_exp_table;
3602	reload_materials;	3868	reload_materials;
3603	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3604	reload_sound;	3871	reload_sound;
3605	reload_archetypes;	3872	reload_archetypes;
3606	reload_regions;	3873	reload_regions;
3607	reload_treasures;	3874	reload_treasures;
3608		3875
…		…
3648	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3649	print $fh $$;	3916	print $fh $$;
3650	}	3917	}
3651		3918
3652	sub main_loop {	3919	sub main_loop {
3653	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3654	if (1) {	3921	if (1) {
3655	EV::loop;	3922	EV::run;
3656	}	3923	}
3657	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3658	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3659	}	3926	}
3660		3927
3661	sub main {	3928	sub main {
3662	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3663		3930
3664	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668		3935
3669	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670		3937
3671	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3672	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3673	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3674	(async {	3941	(async {
3675	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3676	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3677	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3678	};	3945	};
3679		3946
3680	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3681		3948
3682	cf::sync_job {	3949	cf::sync_job {
3683	cf::incloader::init ();	3950	cf::incloader::init ();
		3951
		3952	db_init;
3684		3953
3685	cf::init_anim;	3954	cf::init_anim;
3686	cf::init_attackmess;	3955	cf::init_attackmess;
3687	cf::init_dynamic;	3956	cf::init_dynamic;
3688		3957
3689	cf::load_settings;	3958	cf::load_settings;
3690		3959
3691	reload_resources;	3960	reload_resources;
3692	reload_config;	3961	reload_config;
3693	db_init;
3694		3962
3695	cf::init_uuid;	3963	cf::init_uuid;
3696	cf::init_signals;	3964	cf::init_signals;
3697	cf::init_skills;	3965	cf::init_skills;
3698		3966
…		…
3712	};	3980	};
3713		3981
3714	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3715	info "parse errors in files are no longer fatal from this point on.\n";	3983	info "parse errors in files are no longer fatal from this point on.\n";
3716		3984
3717	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3718	undef $free_main;
3719	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3720	};	3987	};
3721		3988
3722	goto &main_loop;	3989	goto &main_loop;
3723	}	3990	}
…		…
3880		4147
3881	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3882		4149
3883	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3884	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4151	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3885	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3886	}	4153	}
3887		4154
3888	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3889	};	4156	};
3890		4157
…		…
4071		4338
4072	#############################################################################	4339	#############################################################################
4073		4340
4074	my $bug_warning = 0;	4341	my $bug_warning = 0;
4075		4342
4076	our @WAIT_FOR_TICK;
4077	our @WAIT_FOR_TICK_BEGIN;
4078
4079	sub wait_for_tick() {	4343	sub wait_for_tick() {
4080	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4081		4345
4082	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
4083	push @WAIT_FOR_TICK, $signal;
4084	$signal->wait;
4085	}	4347	}
4086		4348
4087	sub wait_for_tick_begin() {	4349	sub wait_for_tick_begin() {
4088	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4089		4351
4090	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
4091	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
4092	$signal->wait;	4354	$signal->wait;
4093	}	4355	}
…		…
4097	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
4099	return;	4361	return;
4100	}	4362	}
4101		4363
4102	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
4103		4365
4104	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105		4367
4106	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4113	}	4375	}
4114		4376
4115	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116	$sig->send;	4378	$sig->send;
4117	}	4379	}
4118	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
4119	$sig->send;
4120	}
4121		4381
4122	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124		4384
4125	if (0) {	4385	if (0) {
…		…
4131	}	4391	}
4132	}	4392	}
4133		4393
4134	{	4394	{
4135	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4136		4397
4137	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4138	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4139	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4140		4401
4141	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4142	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4169	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170	};	4431	};
4171	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173	};	4434	};
		4435
		4436	info "database initialised";
4174	}	4437	}
4175		4438
4176	{	4439	{
4177	# configure IO::AIO	4440	# configure IO::AIO
4178		4441
		4442	info "initialising aio";
4179	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4180	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4181	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4182	}	4447	}
4183		4448
4184	our $_log_backtrace;	4449	our $_log_backtrace;
4185	our $_log_backtrace_last;	4450	our $_log_backtrace_last;
4186		4451

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs. Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC