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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		117
113	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
114		119
115	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
117		122
118	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	134	our $DB_ENV;
130		135
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		137
133	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		140
135	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
136	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
137	our $NOW;	144	our $NOW;
138		145
139	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		157
151	our @POST_INIT;	158	our @POST_INIT;
152		159
153	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
155		165
156	binmode STDOUT;	166	binmode STDOUT;
157	binmode STDERR;	167	binmode STDERR;
158		168
159	# read virtual server time, if available	169	# read virtual server time, if available
…		…
193		203
194	=over 4	204	=over 4
195		205
196	=item $cf::UPTIME	206	=item $cf::UPTIME
197		207
198	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
199		224
200	=item $cf::RUNTIME	225	=item $cf::RUNTIME
201		226
202	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
203	every server tick.	228	every server tick.
204		229
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		233
209	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
212	database environment.	237	database environment.
213		238
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	239	=item $cf::LOADAVG
223		240
224	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
225	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
226	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
234	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235	from wherever your confdir points to.	252	from wherever your confdir points to.
236		253
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		255
239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
242		272
243	=cut	273	=cut
244		274
245	sub wait_for_tick();	275	sub wait_for_tick();
246	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
312	)) {	342	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	344	}
315		345
316	$EV::DIED = sub {	346	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
318	};	348	};
319		349
320	#############################################################################	350	#############################################################################
321		351
322	sub fork_call(&@);	352	sub fork_call(&@);
…		…
349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350	$d	380	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
352	}	382	}
353		383
354	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
355		385
356	Loads the given file from path and returns its contents. Croaks on error	386	Loads the given file from path and returns its contents. Croaks on error
357	and can block.	387	and can block.
358		388
359	=cut	389	=cut
…		…
361	sub load_file($) {	391	sub load_file($) {
362	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
363	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
364		394
365	$data	395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
366	}	434	}
367		435
368	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
369		437
370	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
505	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
506	(default: 0): This call blocks and returns only when you have at least	574	(default: 0): This call blocks and returns only when you have at least
507	C<$time> seconds of cpu time till the next tick. The slot is only valid	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
508	till the next cede.	576	till the next cede.
509		577
510	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
511	should use 100 or more.	579	should use 100 or more.
512		580
513	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
514	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
515		583
…		…
528	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
529	my $busy;	597	my $busy;
530		598
531	while () {	599	while () {
532	next_job:	600	next_job:
		601
		602	Coro::cede;
533		603
534	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
535		605
536	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
537	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
538	$busy = 0;	608	$busy = 0;
539	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
540	$job->[2]->send;	610	$job->[2]->send;
541	Coro::cede;
542	goto next_job;	611	goto next_job;
543	} else {	612	} else {
544	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
545	}	614	}
546	}	615	}
547		616
548	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
550	push @cf::WAIT_FOR_TICK, $signal;
551	$signal->wait;
552	} else {	619	} else {
553	$busy = 0;	620	$busy = 0;
554	Coro::schedule;	621	Coro::schedule;
555	}	622	}
556	}	623	}
…		…
671	reset_signals;	738	reset_signals;
672	}	739	}
673		740
674	sub fork_call(&@) {	741	sub fork_call(&@) {
675	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
676
677	# we seemingly have to make a local copy of the whole thing,
678	# otherwise perl prematurely frees the stuff :/
679	# TODO: investigate and fix (likely this will be rather laborious)
680		743
681	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
682	cf::post_fork;	745	cf::post_fork;
683	&$cb	746	&$cb
684	} @args;	747	} @args;
…		…
834		897
835	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
836	}	899	}
837	}	900	}
838		901
839	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
840	my $data = $process->(\@data);	903	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
842		905
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		907
845	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1429	=cut
1367		1430
1368	#############################################################################	1431	#############################################################################
1369	# command handling &c	1432	# command handling &c
1370		1433
1371	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1372		1435
1373	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1374	$name.	1437	$name.
1375		1438
1376	=cut	1439	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1383		1446
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1448	}
1386		1449
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1451
1389	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1390	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1391	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1392	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1393	has logged in successfully.	1456	has logged in successfully.
1394		1457
1395	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1396	called.
1397		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1466
1400	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1401	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1402	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1403	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1471	log-in.
1405		1472
1406	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1407	called.
1408		1474
1409	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1411	sub register_extcmd {	1482	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1413		1484
1414	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1415	}	1486	}
1416		1487
1417	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1419		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1420	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1421	}	1504	}
1422		1505
1423	use File::Glob ();	1506	use File::Glob ();
1424		1507
1425	cf::player->attach (	1508	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1440		1523
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1525
1443	if (ref $msg) {	1526	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1445	"ARRAY" eq ref $msg
1446	? @$msg
1447	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1448		1528
1449	my @reply;
1450
1451	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1452	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1453	}	1547	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1548
1458	} else {	1549	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1551	}
1461		1552
…		…
1474	};	1565	};
1475		1566
1476	$grp	1567	$grp
1477	}	1568	}
1478		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1479	sub load_extensions {	1581	sub load_extensions {
1480	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1481		1585
1482	cf::sync_job {	1586	cf::sync_job {
1483	my %todo;	1587	my %todo;
1484		1588
1485	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1632	unless exists $done{$_};
1529	}	1633	}
1530		1634
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1533	my $active = eval $v->{source};	1646	my $active = eval $source;
1534		1647
1535	if (length $@) {	1648	if (length $@) {
1536	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1537		1650
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
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
…		…
2171		2272
2172	{	2273	{
2173	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2174		2275
2175	return unless $self->valid;	2276	return unless $self->valid;
2176	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2177
2178	$self->in_memory (cf::MAP_LOADING);
2179		2278
2180	$self->alloc;	2279	$self->alloc;
2181		2280
2182	$self->pre_load;	2281	$self->pre_load;
2183	cf::cede_to_tick;	2282	cf::cede_to_tick;
…		…
2206	} else {	2305	} else {
2207	$self->post_load_original	2306	$self->post_load_original
2208	if delete $self->{load_original};	2307	if delete $self->{load_original};
2209	}	2308	}
2210		2309
		2310	$self->state (cf::MAP_INACTIVE);
		2311
2211	cf::cede_to_tick;	2312	cf::cede_to_tick;
2212	# now do the right thing for maps	2313	# now do the right thing for maps
2213	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2214	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
2215	unless $self->difficulty;	2316	unless $self->difficulty;
…		…
2218	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2219	$self->decay_objects;	2320	$self->decay_objects;
2220	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2221	$self->update_buttons;	2322	$self->update_buttons;
2222	cf::cede_to_tick;	2323	cf::cede_to_tick;
2223	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2224	}	2325	}
2225		2326
2226	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2227	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2228
2229	$self->in_memory (cf::MAP_ACTIVE);
2230	}	2329	}
2231		2330
2232	$self->post_load;	2331	$self->post_load;
2233		2332
2234	1	2333	1
…		…
2247	# if $self->per_party;	2346	# if $self->per_party;
2248		2347
2249	$self	2348	$self
2250	}	2349	}
2251		2350
2252	# find and load all maps in the 3x3 area around a map
2253	sub load_neighbours {
2254	my ($map) = @_;
2255
2256	my @neigh; # diagonal neighbours
2257
2258	for (0 .. 3) {
2259	my $neigh = $map->tile_path ($_)
2260	or next;
2261	$neigh = find $neigh, $map
2262	or next;
2263	$neigh->load;
2264
2265	# now find the diagonal neighbours
2266	push @neigh,
2267	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2268	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2269	}
2270
2271	for (grep defined $_->[0], @neigh) {
2272	my ($path, $origin) = @$_;
2273	my $neigh = find $path, $origin
2274	or next;
2275	$neigh->load;
2276	}
2277	}
2278
2279	sub find_sync {	2351	sub find_sync {
2280	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2281		2353
		2354	# it's a bug to call this from the main context
2282	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2283	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2284		2357
2285	find $path, $origin	2358	find $path, $origin
2286	}	2359	}
2287		2360
2288	sub do_load_sync {	2361	sub do_load_sync {
2289	my ($map) = @_;	2362	my ($map) = @_;
2290		2363
		2364	# it's a bug to call this from the main context
2291	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2292	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2293		2367
2294	$map->load;	2368	$map->load;
2295	}	2369	}
…		…
2301	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2302		2376
2303	$path = normalise $path, $origin;	2377	$path = normalise $path, $origin;
2304		2378
2305	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2306	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2307	}	2381	}
2308		2382
2309	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2310		2384
2311	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
…		…
2370	sub swap_out {	2444	sub swap_out {
2371	my ($self) = @_;	2445	my ($self) = @_;
2372		2446
2373	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2374		2448
2375	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2376	return if $self->{deny_save};	2450	return if $self->{deny_save};
2377	return if $self->players;	2451	return if $self->players;
2378		2452
2379	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2380	$self->deactivate;	2454	$self->deactivate;
2381	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2382	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2383		2457
2384	# then atomically save	2458	# then atomically save
2385	$self->_save;	2459	$self->_save;
2386		2460
2387	# then free the map	2461	# then free the map
…		…
2413		2487
2414	return if $self->players;	2488	return if $self->players;
2415		2489
2416	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2417		2491
2418	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2419		2493
2420	# need to save uniques path	2494	# need to save uniques path
2421	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2422	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2423		2497
…		…
2576		2650
2577	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.
2578		2652
2579	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2580		2654
2581	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,
2582	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2583		2657
2584	=cut	2658	=cut
2585		2659
2586	sub deref {	2660	sub deref {
…		…
2753	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2754	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2755	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2756		2830
2757	$map->load;	2831	$map->load;
2758	$map->load_neighbours;
2759		2832
2760	return unless $self->contr->active;	2833	return unless $self->contr->active;
2761		2834
2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2931	# special map handling	3004	# special map handling
2932	if ($slaying eq "/!") {	3005	if ($slaying eq "/!") {
2933	my $guard = cf::lock_acquire "exit_prepare:$exit";	3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
2934		3007
2935	prepare_random_map $exit	3008	prepare_random_map $exit
2936	if $slaying eq "/!"; # need to re-check after getting the lock	3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
2937		3012
2938	} elsif ($slaying eq '!up') {	3013	} elsif ($slaying eq '!up') {
2939	$map = $exit->map->tile_path (cf::TILE_UP);	3014	$map = $exit->map->tile_path (cf::TILE_UP);
2940	$x = $exit->x;	3015	$x = $exit->x;
2941	$y = $exit->y;	3016	$y = $exit->y;
…		…
2967		3042
2968	=head3 cf::client	3043	=head3 cf::client
2969		3044
2970	=over 4	3045	=over 4
2971		3046
2972	=item $client->send_drawinfo ($text, $flags)
2973
2974	Sends a drawinfo packet to the client. Circumvents output buffering so
2975	should not be used under normal circumstances.
2976
2977	=cut
2978
2979	sub cf::client::send_drawinfo {
2980	my ($self, $text, $flags) = @_;
2981
2982	utf8::encode $text;
2983	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2984	}
2985
2986	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2987		3048
2988	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2989	them as required.	3050	them as required.
2990		3051
…		…
3008	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
3009	}	3070	}
3010		3071
3011	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
3012		3073
3013	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
3014	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
3015	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
3016	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
3017		3078
3018	=cut	3079	=cut
3019		3080
3020	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3125	id => "death",	3186	id => "death",
3126	title => "Death",	3187	title => "Death",
3127	reply => undef,	3188	reply => undef,
3128	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3129	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3130	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3131	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3132	);	3199	);
3133		3200
3134	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3177	=cut	3244	=cut
3178		3245
3179	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3180	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3181		3248
3182	if ($self->extcmd == 2) {
3183	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3184	} elsif ($self->extcmd == 1) { # TODO: remove
3185	push @msg, msgtype => "event_$type";
3186	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3187	}
3188	}
3189
3190	=item $client->ext_reply ($msgid, @msg)
3191
3192	Sends an ext reply to the client.
3193
3194	=cut
3195
3196	sub cf::client::ext_reply($$@) {
3197	my ($self, $id, @msg) = @_;
3198
3199	if ($self->extcmd == 2) {
3200	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3201	} elsif ($self->extcmd == 1) {
3202	#TODO: version 1, remove
3203	unshift @msg, msgtype => "reply", msgid => $id;
3204	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3205	}
3206	}	3250	}
3207		3251
3208	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3209		3253
3210	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3230		3274
3231	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3232	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3233		3277
3234	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3235	}	3317	}
3236		3318
3237	cf::client->attach (	3319	cf::client->attach (
3238	on_connect => sub {	3320	on_connect => sub {
3239	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3265	my ($ns, $buf) = @_;	3347	my ($ns, $buf) = @_;
3266		3348
3267	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3268		3350
3269	if (ref $msg) {	3351	if (ref $msg) {
3270	my ($type, $reply, @payload) =	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3271	"ARRAY" eq ref $msg
3272	? @$msg
3273	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3274		3353
3275	my @reply;
3276
3277	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3278	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3279	}	3372	}
3280
3281	$ns->ext_reply ($reply, @reply)
3282	if $reply;
3283
3284	} else {	3373	} else {
3285	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3286	}	3375	}
3287		3376
3288	cf::override;	3377	cf::override;
…		…
3456	=cut	3545	=cut
3457		3546
3458	#############################################################################	3547	#############################################################################
3459	# the server's init and main functions	3548	# the server's init and main functions
3460		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3461	sub load_facedata($) {	3627	sub load_facedata($) {
3462	my ($path) = @_;	3628	my ($path) = @_;
3463		3629
3464	# HACK to clear player env face cache, we need some signal framework
3465	# for this (global event?)
3466	%ext::player_env::MUSIC_FACE_CACHE = ();
3467
3468	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3469		3631
3470	trace "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3471		3633
3472	my $facedata = decode_storable load_file $path;	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3473		3635
3474	$facedata->{version} == 2	3636	$facedata->{version} == 2
3475	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3476		3638
3477	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3478	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3479	$facedata->{resource}{"res/exp_table"} = {	3641
3480	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3481	data => $exp_table,	3643
3482	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3483	};	3645	# from here on, everything must be atomic - no thread switch allowed
3484	cf::cede_to_tick;	3646	my $t1 = EV::time;
3485		3647
3486	{	3648	{
3487	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3488		3650
3489	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3490	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3491		3654
3492	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3493	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3494	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3495	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3496	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3497		3660	$cf::face::HASH{$info->{hash64}} = $idx;
3498	cf::cede_to_tick;	3661	delete $cf::face::META[$idx];
3499	}	3662	}
3500		3663
3501	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3502	next unless $info->{smooth};	3665	next unless $info->{smooth};
3503		3666
…		…
3508	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3509	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3510	} else {	3673	} else {
3511	error "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3512	}	3675	}
3513
3514	cf::cede_to_tick;
3515	}	3676	}
3516	}	3677	}
3517		3678
3518	{	3679	{
3519	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3520		3681
3521	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3522	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3523	cf::cede_to_tick;
3524	}	3684	}
3525		3685
3526	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3527	}	3687	}
3528		3688
3529	{	3689	{
3530	my $res = $facedata->{resource};	3690	my $res = $facedata->{resource};
3531		3691
3532	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3533	if (defined $info->{type}) {	3693	if (defined (my $type = $info->{type})) {
		3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3534	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3535		3696
3536	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3537	cf::face::set_type $idx, $info->{type};	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3538	} else {	3703	} else {
3539	$RESOURCE{$name} = $info; # unused	3704	# $RESOURCE{$name} = $info; # unused
3540	}	3705	}
3541
3542	cf::cede_to_tick;
3543	}	3706	}
3544	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3545		3718
3546	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3720
		3721	aio_close $fh if $fh; # close old facedata
3547		3722
3548	1	3723	1
3549	}	3724	}
3550		3725
3551	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
…		…
3562	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3563	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3564	cf::arch::commit_load;	3739	cf::arch::commit_load;
3565		3740
3566	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3567	}	3756	}
3568		3757
3569	sub reload_regions {	3758	sub reload_regions {
3570	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3571	# for this (global event?)	3760	# for this (global event?)
…		…
3579	if exists $_->{match};	3768	if exists $_->{match};
3580	}	3769	}
3581	}	3770	}
3582		3771
3583	sub reload_facedata {	3772	sub reload_facedata {
3584	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3585	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3586	}	3775	}
3587		3776
3588	sub reload_archetypes {	3777	sub reload_archetypes {
3589	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3590	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
		3792
		3793	# command completion
		3794	my @commands;
		3795
		3796	for (0..cf::arch::skillvec_size - 1) {
		3797	my $skill = cf::arch::skillvec $_;
		3798	my $name = $skill->name;
		3799	my $flags = cf::skill_flags $skill->subtype;
		3800
		3801	push @commands, "ready_skill $name" if $flags & (SF_COMBAT \| SF_RANGED \| SF_GRACE);
		3802	push @commands, "use_skill $name" if $flags & (SF_USE \| SF_AUTARK \| SF_GRACE);
		3803	}
		3804
		3805	cf::client::set_command_face skill => \@commands;
3591	}	3806	}
3592		3807
3593	sub reload_treasures {	3808	sub reload_treasures {
3594	load_resource_file "$DATADIR/treasures"	3809	load_resource_file "$DATADIR/treasures"
3595	or die "unable to load treasurelists\n";	3810	or die "unable to load treasurelists\n";
…		…
3616	}	3831	}
3617		3832
3618	sub reload_resources {	3833	sub reload_resources {
3619	trace "reloading resource files...\n";	3834	trace "reloading resource files...\n";
3620		3835
3621	reload_exp_table;
3622	reload_materials;	3836	reload_materials;
3623	reload_facedata;	3837	reload_facedata;
		3838	reload_exp_table;
3624	reload_sound;	3839	reload_sound;
3625	reload_archetypes;	3840	reload_archetypes;
3626	reload_regions;	3841	reload_regions;
3627	reload_treasures;	3842	reload_treasures;
3628		3843
…		…
3680		3895
3681	sub main {	3896	sub main {
3682	cf::init_globals; # initialise logging	3897	cf::init_globals; # initialise logging
3683		3898
3684	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3899	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3900	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3901	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3902	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688		3903
3689	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3904	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3690		3905
3691	# we must not ever block the main coroutine	3906	# we must not ever block the main coroutine
3692	local $Coro::idle = sub {	3907	$Coro::idle = sub {
3693	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3908	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3694	(async {	3909	(async {
3695	$Coro::current->{desc} = "IDLE BUG HANDLER";	3910	$Coro::current->{desc} = "IDLE BUG HANDLER";
3696	EV::loop EV::LOOP_ONESHOT;	3911	EV::loop EV::LOOP_ONESHOT;
3697	})->prio (Coro::PRIO_MAX);	3912	})->prio (Coro::PRIO_MAX);
…		…
3700	evthread_start IO::AIO::poll_fileno;	3915	evthread_start IO::AIO::poll_fileno;
3701		3916
3702	cf::sync_job {	3917	cf::sync_job {
3703	cf::incloader::init ();	3918	cf::incloader::init ();
3704		3919
		3920	db_init;
		3921
3705	cf::init_anim;	3922	cf::init_anim;
3706	cf::init_attackmess;	3923	cf::init_attackmess;
3707	cf::init_dynamic;	3924	cf::init_dynamic;
3708		3925
3709	cf::load_settings;	3926	cf::load_settings;
3710		3927
3711	reload_resources;	3928	reload_resources;
3712	reload_config;	3929	reload_config;
3713	db_init;
3714		3930
3715	cf::init_uuid;	3931	cf::init_uuid;
3716	cf::init_signals;	3932	cf::init_signals;
3717	cf::init_skills;	3933	cf::init_skills;
3718		3934
…		…
3732	};	3948	};
3733		3949
3734	cf::object::thawer::errors_are_fatal 0;	3950	cf::object::thawer::errors_are_fatal 0;
3735	info "parse errors in files are no longer fatal from this point on.\n";	3951	info "parse errors in files are no longer fatal from this point on.\n";
3736		3952
3737	my $free_main; $free_main = EV::idle sub {	3953	AE::postpone {
3738	undef $free_main;
3739	undef &main; # free gobs of memory :)	3954	undef &main; # free gobs of memory :)
3740	};	3955	};
3741		3956
3742	goto &main_loop;	3957	goto &main_loop;
3743	}	3958	}
…		…
3900		4115
3901	cf::write_runtime_sync; # external watchdog should not bark	4116	cf::write_runtime_sync; # external watchdog should not bark
3902		4117
3903	trace "emergency_perl_save: flushing outstanding aio requests";	4118	trace "emergency_perl_save: flushing outstanding aio requests";
3904	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4119	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3905	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4120	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3906	}	4121	}
3907		4122
3908	cf::write_runtime_sync; # external watchdog should not bark	4123	cf::write_runtime_sync; # external watchdog should not bark
3909	};	4124	};
3910		4125
…		…
4091		4306
4092	#############################################################################	4307	#############################################################################
4093		4308
4094	my $bug_warning = 0;	4309	my $bug_warning = 0;
4095		4310
4096	our @WAIT_FOR_TICK;
4097	our @WAIT_FOR_TICK_BEGIN;
4098
4099	sub wait_for_tick() {	4311	sub wait_for_tick() {
4100	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4312	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4101		4313
4102	my $signal = new Coro::Signal;	4314	$WAIT_FOR_TICK->wait;
4103	push @WAIT_FOR_TICK, $signal;
4104	$signal->wait;
4105	}	4315	}
4106		4316
4107	sub wait_for_tick_begin() {	4317	sub wait_for_tick_begin() {
4108	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4318	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4109		4319
4110	my $signal = new Coro::Signal;	4320	my $signal = new Coro::Signal;
4111	push @WAIT_FOR_TICK_BEGIN, $signal;	4321	push @WAIT_FOR_TICK_BEGIN, $signal;
4112	$signal->wait;	4322	$signal->wait;
4113	}	4323	}
…		…
4117	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4327	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4118	unless ++$bug_warning > 10;	4328	unless ++$bug_warning > 10;
4119	return;	4329	return;
4120	}	4330	}
4121		4331
4122	cf::server_tick; # one server iteration	4332	cf::one_tick; # one server iteration
4123		4333
4124	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4334	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4125		4335
4126	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4336	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4127	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4337	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4133	}	4343	}
4134		4344
4135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4345	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4136	$sig->send;	4346	$sig->send;
4137	}	4347	}
4138	while (my $sig = shift @WAIT_FOR_TICK) {	4348	$WAIT_FOR_TICK->broadcast;
4139	$sig->send;
4140	}
4141		4349
4142	$LOAD = ($NOW - $TICK_START) / $TICK;	4350	$LOAD = ($NOW - $TICK_START) / $TICK;
4143	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4351	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4144		4352
4145	if (0) {	4353	if (0) {
…		…
4151	}	4359	}
4152	}	4360	}
4153		4361
4154	{	4362	{
4155	# configure BDB	4363	# configure BDB
		4364	info "initialising database";
4156		4365
4157	BDB::min_parallel 16;	4366	BDB::min_parallel 16;
4158	BDB::max_poll_reqs $TICK * 0.1;	4367	BDB::max_poll_reqs $TICK * 0.1;
4159	$AnyEvent::BDB::WATCHER->priority (1);	4368	#$AnyEvent::BDB::WATCHER->priority (1);
4160		4369
4161	unless ($DB_ENV) {	4370	unless ($DB_ENV) {
4162	$DB_ENV = BDB::db_env_create;	4371	$DB_ENV = BDB::db_env_create;
4163	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4372	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4164	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4373	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4189	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4398	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4190	};	4399	};
4191	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4400	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4192	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4401	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4193	};	4402	};
		4403
		4404	info "database initialised";
4194	}	4405	}
4195		4406
4196	{	4407	{
4197	# configure IO::AIO	4408	# configure IO::AIO
4198		4409
		4410	info "initialising aio";
4199	IO::AIO::min_parallel 8;	4411	IO::AIO::min_parallel 8;
4200	IO::AIO::max_poll_time $TICK * 0.1;	4412	IO::AIO::max_poll_time $TICK * 0.1;
4201	undef $AnyEvent::AIO::WATCHER;	4413	undef $AnyEvent::AIO::WATCHER;
		4414	info "aio initialised";
4202	}	4415	}
4203		4416
4204	our $_log_backtrace;	4417	our $_log_backtrace;
4205	our $_log_backtrace_last;	4418	our $_log_backtrace_last;
4206		4419

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC vs. Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.567 by root, Mon May 2 16:16:00 2011 UTC vs.
Revision 1.612 by root, Wed Nov 21 12:47:09 2012 UTC