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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.571 by root, Wed May 4 19:04:45 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,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 = 0;	142	our $RUNTIME = 0;
137	our $SERVER_TICK = 0;	143	our $SERVER_TICK = 0;
138	our $NOW;	144	our $NOW;
…		…
219	=item $cf::RUNTIME	225	=item $cf::RUNTIME
220		226
221	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
222	every server tick.	228	every server tick.
223		229
224	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
225	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
226	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
227		233
228	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
230	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
231	database environment.	237	database environment.
…		…
245	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
246	from wherever your confdir points to.	252	from wherever your confdir points to.
247		253
248	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
249		255
250	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.
251	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
252	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.
253		260
254	Note that cf::Wait_for_tick will immediately return when the server is not	261	Note that cf::wait_for_tick will immediately return when the server is not
255	ticking, making it suitable for small pauses in threads that need to run	262	ticking, making it suitable for small pauses in threads that need to run
256	when the server is paused. If that is not applicable (i.e. you I<really>	263	when the server is paused. If that is not applicable (i.e. you I<really>
257	want to wait, use C<$cf::WAIT_FOR_TICK>).	264	want to wait, use C<$cf::WAIT_FOR_TICK>).
258		265
259	=item $cf::WAIT_FOR_TICK	266	=item $cf::WAIT_FOR_TICK
…		…
335	)) {	342	)) {
336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
337	}	344	}
338		345
339	$EV::DIED = sub {	346	$EV::DIED = sub {
340	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
341	};	348	};
342		349
343	#############################################################################	350	#############################################################################
344		351
345	sub fork_call(&@);	352	sub fork_call(&@);
…		…
372	$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;
373	$d	380	$d
374	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
375	}	382	}
376		383
377	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
378		385
379	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
380	and can block.	387	and can block.
381		388
382	=cut	389	=cut
…		…
384	sub load_file($) {	391	sub load_file($) {
385	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
386	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
387		394
388	$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
389	}	434	}
390		435
391	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
392		437
393	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
528	Allocate $time seconds of blocking CPU time at priority C<$priority>	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
529	(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
530	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
531	till the next cede.	576	till the next cede.
532		577
533	Background jobs should use a priority les than zero, interactive jobs	578	Background jobs should use a priority less than zero, interactive jobs
534	should use 100 or more.	579	should use 100 or more.
535		580
536	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
537	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
538		583
…		…
551	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
552	my $busy;	597	my $busy;
553		598
554	while () {	599	while () {
555	next_job:	600	next_job:
		601
		602	Coro::cede;
556		603
557	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
558		605
559	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
560	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
561	$busy = 0;	608	$busy = 0;
562	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
563	$job->[2]->send;	610	$job->[2]->send;
564	Coro::cede;
565	goto next_job;	611	goto next_job;
566	} else {	612	} else {
567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
568	}	614	}
569	}	615	}
570		616
571	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
572	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
573	$WAIT_FOR_TICK->wait;
574	} else {	619	} else {
575	$busy = 0;	620	$busy = 0;
576	Coro::schedule;	621	Coro::schedule;
577	}	622	}
578	}	623	}
…		…
642		687
643	while ($busy) {	688	while ($busy) {
644	if (Coro::nready) {	689	if (Coro::nready) {
645	Coro::cede_notself;	690	Coro::cede_notself;
646	} else {	691	} else {
647	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
648	}	693	}
649	}	694	}
650		695
651	my $time = AE::time - $time;	696	my $time = AE::time - $time;
652		697
…		…
693	reset_signals;	738	reset_signals;
694	}	739	}
695		740
696	sub fork_call(&@) {	741	sub fork_call(&@) {
697	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
698
699	# we seemingly have to make a local copy of the whole thing,
700	# otherwise perl prematurely frees the stuff :/
701	# TODO: investigate and fix (likely this will be rather laborious)
702		743
703	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
704	cf::post_fork;	745	cf::post_fork;
705	&$cb	746	&$cb
706	} @args;	747	} @args;
…		…
856		897
857	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
858	}	899	}
859	}	900	}
860		901
861	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
862	my $data = $process->(\@data);	903	my $data = $process->(\@data);
863	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
864		905
865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
866		907
867	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
868	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1388	=cut	1429	=cut
1389		1430
1390	#############################################################################	1431	#############################################################################
1391	# command handling &c	1432	# command handling &c
1392		1433
1393	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1394		1435
1395	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
1396	$name.	1437	$name.
1397		1438
1398	=cut	1439	=cut
…		…
1404	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1405		1446
1406	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1407	}	1448	}
1408		1449
1409	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1410		1451
1411	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1412	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
1413	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
1414	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
1415	has logged in successfully.	1456	has logged in successfully.
1416		1457
1417	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1418	called.
1419		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
1420	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1421		1466
1422	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1423	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
1424	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
1425	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
1426	log-in.	1471	log-in.
1427		1472
1428	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1429	called.
1430		1474
1431	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1432		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
1433	sub register_extcmd {	1482	sub register_extcmd($$) {
1434	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1435		1484
1436	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1437	}	1486	}
1438		1487
1439	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1440	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1441		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1442	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1443	}	1504	}
1444		1505
1445	use File::Glob ();	1506	use File::Glob ();
1446		1507
1447	cf::player->attach (	1508	cf::player->attach (
…		…
1461	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1462		1523
1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1464		1525
1465	if (ref $msg) {	1526	if (ref $msg) {
1466	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1467	"ARRAY" eq ref $msg
1468	? @$msg
1469	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1470		1528
1471	my @reply;
1472
1473	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}) {
1474	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1475	}	1547	}
1476
1477	$pl->ext_reply ($reply, @reply)
1478	if $reply;
1479		1548
1480	} else {	1549	} else {
1481	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1482	}	1551	}
1483		1552
…		…
1496	};	1565	};
1497		1566
1498	$grp	1567	$grp
1499	}	1568	}
1500		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
1501	sub load_extensions {	1581	sub load_extensions {
1502	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1503		1585
1504	cf::sync_job {	1586	cf::sync_job {
1505	my %todo;	1587	my %todo;
1506		1588
1507	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1550	unless exists $done{$_};	1632	unless exists $done{$_};
1551	}	1633	}
1552		1634
1553	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1554		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
1555	my $active = eval $v->{source};	1646	my $active = eval $source;
1556		1647
1557	if (length $@) {	1648	if (length $@) {
1558	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1559		1650
1560	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1847	}	1938	}
1848		1939
1849	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1850		1941
1851	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1852
1853	=item $player->ext_reply ($msgid, @msg)
1854
1855	Sends an ext reply to the player.
1856
1857	=cut
1858
1859	sub ext_reply($$@) {
1860	my ($self, $id, @msg) = @_;
1861
1862	$self->ns->ext_reply ($id, @msg)
1863	}
1864		1943
1865	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1866		1945
1867	Sends an ext event to the client.	1946	Sends an ext event to the client.
1868		1947
…		…
2239		2318
2240	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2241	$self->decay_objects;	2320	$self->decay_objects;
2242	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2243	$self->update_buttons;	2322	$self->update_buttons;
2244	$self->post_load_physics;
2245	cf::cede_to_tick;	2323	cf::cede_to_tick;
2246	#$self->activate; # no longer activate maps automatically	2324	#$self->activate; # no longer activate maps automatically
2247	}	2325	}
2248		2326
2249	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
…		…
2268	# if $self->per_party;	2346	# if $self->per_party;
2269		2347
2270	$self	2348	$self
2271	}	2349	}
2272		2350
2273	# find and load all maps in the 3x3 area around a map
2274	sub load_neighbours {
2275	my ($map) = @_;
2276
2277	my @neigh; # diagonal neighbours
2278
2279	for (0 .. 3) {
2280	my $neigh = $map->tile_path ($_)
2281	or next;
2282	$neigh = find $neigh, $map
2283	or next;
2284	$neigh->load;
2285
2286	# now find the diagonal neighbours
2287	push @neigh,
2288	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2289	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2290	}
2291
2292	for (grep defined $_->[0], @neigh) {
2293	my ($path, $origin) = @$_;
2294	my $neigh = find $path, $origin
2295	or next;
2296	$neigh->load;
2297	}
2298	}
2299
2300	sub find_sync {	2351	sub find_sync {
2301	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2302		2353
2303	# it's a bug to call this from the main context	2354	# it's a bug to call this from the main context
2304	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
…		…
2322		2373
2323	sub find_async {	2374	sub find_async {
2324	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2325		2376
2326	$path = normalise $path, $origin;	2377	$path = normalise $path, $origin;
2327		2378
2328	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2329	return $map if !$load \|\| $map->linkable;	2380	return $map if !$load \|\| $map->linkable;
2330	}	2381	}
2331		2382
2332	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2333		2384
2334	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
2335	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2336		2387
2337	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2338	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2339	if (my $map = find $k) {	2390	if (my $map = find $k) {
2340	$map->load if $v;	2391	$map->load if $v;
2341	}	2392	}
2342		2393
2343	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
…		…
2599		2650
2600	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.
2601		2652
2602	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2603		2654
2604	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,
2605	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2606		2657
2607	=cut	2658	=cut
2608		2659
2609	sub deref {	2660	sub deref {
…		…
2691	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2692		2743
2693	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2694	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2695		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
2696	=cut	2772	=cut
2697		2773
2698	sub cf::object::player::may {	2774	sub cf::object::player::may {
2699	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2700		2776
2701	$self->flag (cf::FLAG_WIZ) \|\|	2777	$self->flag (cf::FLAG_WIZ) \|\|
2702	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2703	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ \|\| $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2704	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2705	}	2781	}
2706		2782
2707	=item $player_object->enter_link	2783	=item $player_object->enter_link
2708		2784
…		…
2711	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.
2712	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,
2713	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
2714	map.	2790	map.
2715		2791
2716	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.
2717		2799
2718	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2719		2801
2720	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
2721	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
…		…
2776	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2777	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2778	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2779		2861
2780	$map->load;	2862	$map->load;
2781	$map->load_neighbours;
2782		2863
2783	return unless $self->contr->active;	2864	return unless $self->contr->active;
2784		2865
2785	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2786	if ($self->enter_map ($map, $x, $y)) {	2867	if ($self->enter_map ($map, $x, $y)) {
…		…
2992		3073
2993	=head3 cf::client	3074	=head3 cf::client
2994		3075
2995	=over 4	3076	=over 4
2996		3077
2997	=item $client->send_drawinfo ($text, $flags)
2998
2999	Sends a drawinfo packet to the client. Circumvents output buffering so
3000	should not be used under normal circumstances.
3001
3002	=cut
3003
3004	sub cf::client::send_drawinfo {
3005	my ($self, $text, $flags) = @_;
3006
3007	utf8::encode $text;
3008	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
3009	}
3010
3011	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
3012		3079
3013	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
3014	them as required.	3081	them as required.
3015		3082
…		…
3033	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
3034	}	3101	}
3035		3102
3036	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
3037		3104
3038	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
3039	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
3040	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
3041	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
3042		3109
3043	=cut	3110	=cut
3044		3111
3045	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
3150	id => "death",	3217	id => "death",
3151	title => "Death",	3218	title => "Death",
3152	reply => undef,	3219	reply => undef,
3153	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
3154	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
3155	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
3156	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
3157	);	3230	);
3158		3231
3159	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3202	=cut	3275	=cut
3203		3276
3204	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3205	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3206		3279
3207	if ($self->extcmd == 2) {
3208	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3209	} elsif ($self->extcmd == 1) { # TODO: remove
3210	push @msg, msgtype => "event_$type";
3211	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3212	}
3213	}
3214
3215	=item $client->ext_reply ($msgid, @msg)
3216
3217	Sends an ext reply to the client.
3218
3219	=cut
3220
3221	sub cf::client::ext_reply($$@) {
3222	my ($self, $id, @msg) = @_;
3223
3224	if ($self->extcmd == 2) {
3225	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3226	} elsif ($self->extcmd == 1) {
3227	#TODO: version 1, remove
3228	unshift @msg, msgtype => "reply", msgid => $id;
3229	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3230	}
3231	}	3281	}
3232		3282
3233	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3234		3284
3235	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3255		3305
3256	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3257	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3258		3308
3259	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;
3260	}	3349	}
3261		3350
3262	cf::client->attach (	3351	cf::client->attach (
3263	on_connect => sub {	3352	on_connect => sub {
3264	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3290	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3291		3380
3292	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3293		3382
3294	if (ref $msg) {	3383	if (ref $msg) {
3295	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3296	"ARRAY" eq ref $msg
3297	? @$msg
3298	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3299		3385
3300	my @reply;
3301
3302	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}) {
3303	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3304	}	3404	}
3305
3306	$ns->ext_reply ($reply, @reply)
3307	if $reply;
3308
3309	} else {	3405	} else {
3310	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";
3311	}	3407	}
3312		3408
3313	cf::override;	3409	cf::override;
…		…
3481	=cut	3577	=cut
3482		3578
3483	#############################################################################	3579	#############################################################################
3484	# the server's init and main functions	3580	# the server's init and main functions
3485		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
3486	sub load_facedata($) {	3659	sub load_facedata($) {
3487	my ($path) = @_;	3660	my ($path) = @_;
3488		3661
3489	# HACK to clear player env face cache, we need some signal framework
3490	# for this (global event?)
3491	%ext::player_env::MUSIC_FACE_CACHE = ();
3492
3493	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3494		3663
3495	trace "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3496		3665
3497	my $facedata = decode_storable load_file $path;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3498		3667
3499	$facedata->{version} == 2	3668	$facedata->{version} == 2
3500	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3501		3670
3502	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3503	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3504	$facedata->{resource}{"res/exp_table"} = {	3673
3505	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3506	data => $exp_table,	3675
3507	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3508	};	3677	# from here on, everything must be atomic - no thread switch allowed
3509	cf::cede_to_tick;	3678	my $t1 = EV::time;
3510		3679
3511	{	3680	{
3512	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3513		3682
3514	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3515	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3516		3686
3517	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3518	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3519	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};
3520	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};
3521	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};
3522		3692	$cf::face::HASH{$info->{hash64}} = $idx;
3523	cf::cede_to_tick;	3693	delete $cf::face::META[$idx];
3524	}	3694	}
3525		3695
3526	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3527	next unless $info->{smooth};	3697	next unless $info->{smooth};
3528		3698
…		…
3533	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3534	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3535	} else {	3705	} else {
3536	error "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3537	}	3707	}
3538
3539	cf::cede_to_tick;
3540	}	3708	}
3541	}	3709	}
3542		3710
3543	{	3711	{
3544	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3545		3713
3546	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3547	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3548	cf::cede_to_tick;
3549	}	3716	}
3550		3717
3551	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3552	}	3719	}
3553		3720
3554	{	3721	{
3555	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3556		3723
3557	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3558	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
3559	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3560		3728
3561	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3562	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;
3563	} else {	3735	} else {
3564	$RESOURCE{$name} = $info; # unused	3736	# $RESOURCE{$name} = $info; # unused
3565	}	3737	}
3566
3567	cf::cede_to_tick;
3568	}	3738	}
3569	}	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;
3570		3750
3571	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
3572		3754
3573	1	3755	1
3574	}	3756	}
3575		3757
3576	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
…		…
3587	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3588	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3589	cf::arch::commit_load;	3771	cf::arch::commit_load;
3590		3772
3591	$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;
3592	}	3788	}
3593		3789
3594	sub reload_regions {	3790	sub reload_regions {
3595	# 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
3596	# for this (global event?)	3792	# for this (global event?)
…		…
3604	if exists $_->{match};	3800	if exists $_->{match};
3605	}	3801	}
3606	}	3802	}
3607		3803
3608	sub reload_facedata {	3804	sub reload_facedata {
3609	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3610	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3611	}	3807	}
3612		3808
3613	sub reload_archetypes {	3809	sub reload_archetypes {
3614	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3615	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;
3616	}	3838	}
3617		3839
3618	sub reload_treasures {	3840	sub reload_treasures {
3619	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3620	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
…		…
3641	}	3863	}
3642		3864
3643	sub reload_resources {	3865	sub reload_resources {
3644	trace "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3645		3867
3646	reload_exp_table;
3647	reload_materials;	3868	reload_materials;
3648	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
3649	reload_sound;	3871	reload_sound;
3650	reload_archetypes;	3872	reload_archetypes;
3651	reload_regions;	3873	reload_regions;
3652	reload_treasures;	3874	reload_treasures;
3653		3875
…		…
3693	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3694	print $fh $$;	3916	print $fh $$;
3695	}	3917	}
3696		3918
3697	sub main_loop {	3919	sub main_loop {
3698	trace "EV::loop starting\n";	3920	trace "EV::run starting\n";
3699	if (1) {	3921	if (1) {
3700	EV::loop;	3922	EV::run;
3701	}	3923	}
3702	trace "EV::loop returned\n";	3924	trace "EV::run returned\n";
3703	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3704	}	3926	}
3705		3927
3706	sub main {	3928	sub main {
3707	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3708		3930
3709	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3710	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.";
3711	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3712	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3713		3935
3714	$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
3715		3937
3716	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3717	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3718	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#
3719	(async {	3941	(async {
3720	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3721	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3722	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3723	};	3945	};
3724		3946
3725	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3726		3948
3727	cf::sync_job {	3949	cf::sync_job {
3728	cf::incloader::init ();	3950	cf::incloader::init ();
		3951
		3952	db_init;
3729		3953
3730	cf::init_anim;	3954	cf::init_anim;
3731	cf::init_attackmess;	3955	cf::init_attackmess;
3732	cf::init_dynamic;	3956	cf::init_dynamic;
3733		3957
3734	cf::load_settings;	3958	cf::load_settings;
3735		3959
3736	reload_resources;	3960	reload_resources;
3737	reload_config;	3961	reload_config;
3738	db_init;
3739		3962
3740	cf::init_uuid;	3963	cf::init_uuid;
3741	cf::init_signals;	3964	cf::init_signals;
3742	cf::init_skills;	3965	cf::init_skills;
3743		3966
…		…
3757	};	3980	};
3758		3981
3759	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3760	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";
3761		3984
3762	my $free_main; $free_main = EV::idle sub {	3985	AE::postpone {
3763	undef $free_main;
3764	undef &main; # free gobs of memory :)	3986	undef &main; # free gobs of memory :)
3765	};	3987	};
3766		3988
3767	goto &main_loop;	3989	goto &main_loop;
3768	}	3990	}
…		…
3925		4147
3926	cf::write_runtime_sync; # external watchdog should not bark	4148	cf::write_runtime_sync; # external watchdog should not bark
3927		4149
3928	trace "emergency_perl_save: flushing outstanding aio requests";	4150	trace "emergency_perl_save: flushing outstanding aio requests";
3929	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4151	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3930	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
3931	}	4153	}
3932		4154
3933	cf::write_runtime_sync; # external watchdog should not bark	4155	cf::write_runtime_sync; # external watchdog should not bark
3934	};	4156	};
3935		4157
…		…
4169	}	4391	}
4170	}	4392	}
4171		4393
4172	{	4394	{
4173	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4174		4397
4175	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4176	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4177	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4178		4401
4179	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4180	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4181	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4182	$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;
…		…
4207	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4208	};	4431	};
4209	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4210	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4211	};	4434	};
		4435
		4436	info "database initialised";
4212	}	4437	}
4213		4438
4214	{	4439	{
4215	# configure IO::AIO	4440	# configure IO::AIO
4216		4441
		4442	info "initialising aio";
4217	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4218	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4219	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4220	}	4447	}
4221		4448
4222	our $_log_backtrace;	4449	our $_log_backtrace;
4223	our $_log_backtrace_last;	4450	our $_log_backtrace_last;
4224		4451

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.571 by root, Wed May 4 19:04:45 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.571 by root, Wed May 4 19:04:45 2011 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC