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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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
…		…
545	}	613	}
546	}	614	}
547		615
548	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
550	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
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
…		…
1954	# {... are special paths that are not being touched	2055	# {... are special paths that are not being touched
1955	# ?xxx/... are special absolute paths	2056	# ?xxx/... are special absolute paths
1956	# ?random/... random maps	2057	# ?random/... random maps
1957	# /... normal maps	2058	# /... normal maps
1958	# ~user/... per-player map of a specific user	2059	# ~user/... per-player map of a specific user
1959	# !up !down for quad maps, or other maps with up/down layers
1960		2060
1961	$path =~ s/$PATH_SEP/\//go;	2061	$path =~ s/$PATH_SEP/\//go;
1962		2062
1963	# treat it as relative path if it starts with	2063	# treat it as relative path if it starts with
1964	# something that looks reasonable	2064	# something that looks reasonable
1965	if ($path =~ m{^(?:\./\|\.\./\|\w)}) {	2065	if ($path =~ m{^(?:\./\|\.\./\|\w)}) {
1966	$base or Carp::carp "normalise called with relative path and no base: '$path'";	2066	$base or Carp::carp "normalise called with relative path and no base: '$path'";
1967		2067
1968	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1969	$path = "$base/$path";	2069	$path = "$base/$path";
1970
1971	} elsif ($path eq '!up') {
1972	$base && ref $base
1973	or Carp::carp "normalise called with relative tile path and no base: '$path'";
1974
1975	my $uppth = $base->tile_path (cf::TILE_UP);
1976	$path = $uppth if $uppth;
1977
1978	} elsif ($path eq '!down') {
1979	$base && ref $base
1980	or Carp::carp "normalise called with relative tile path and no base: '$path'";
1981
1982	my $dpth = $base->tile_path (cf::TILE_DOWN);
1983	$path = $dpth if $dpth;
1984	}	2070	}
1985		2071
1986	for ($path) {	2072	for ($path) {
1987	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1988	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
…		…
2186		2272
2187	{	2273	{
2188	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2189		2275
2190	return unless $self->valid;	2276	return unless $self->valid;
2191	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2192
2193	$self->in_memory (cf::MAP_LOADING);
2194		2278
2195	$self->alloc;	2279	$self->alloc;
2196		2280
2197	$self->pre_load;	2281	$self->pre_load;
2198	cf::cede_to_tick;	2282	cf::cede_to_tick;
…		…
2221	} else {	2305	} else {
2222	$self->post_load_original	2306	$self->post_load_original
2223	if delete $self->{load_original};	2307	if delete $self->{load_original};
2224	}	2308	}
2225		2309
		2310	$self->state (cf::MAP_INACTIVE);
		2311
2226	cf::cede_to_tick;	2312	cf::cede_to_tick;
2227	# now do the right thing for maps	2313	# now do the right thing for maps
2228	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2229	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
2230	unless $self->difficulty;	2316	unless $self->difficulty;
…		…
2233	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2234	$self->decay_objects;	2320	$self->decay_objects;
2235	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2236	$self->update_buttons;	2322	$self->update_buttons;
2237	cf::cede_to_tick;	2323	cf::cede_to_tick;
2238	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2239	}	2325	}
2240		2326
2241	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2242	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2243
2244	$self->in_memory (cf::MAP_ACTIVE);
2245	}	2329	}
2246		2330
2247	$self->post_load;	2331	$self->post_load;
2248		2332
2249	1	2333	1
…		…
2262	# if $self->per_party;	2346	# if $self->per_party;
2263		2347
2264	$self	2348	$self
2265	}	2349	}
2266		2350
2267	# find and load all maps in the 3x3 area around a map
2268	sub load_neighbours {
2269	my ($map) = @_;
2270
2271	my @neigh; # diagonal neighbours
2272
2273	for (0 .. 3) {
2274	my $neigh = $map->tile_path ($_)
2275	or next;
2276	$neigh = find $neigh, $map
2277	or next;
2278	$neigh->load;
2279
2280	# now find the diagonal neighbours
2281	push @neigh,
2282	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2283	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2284	}
2285
2286	for (grep defined $_->[0], @neigh) {
2287	my ($path, $origin) = @$_;
2288	my $neigh = find $path, $origin
2289	or next;
2290	$neigh->load;
2291	}
2292	}
2293
2294	sub find_sync {	2351	sub find_sync {
2295	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2296		2353
		2354	# it's a bug to call this from the main context
2297	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2298	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2299		2357
2300	find $path, $origin	2358	find $path, $origin
2301	}	2359	}
2302		2360
2303	sub do_load_sync {	2361	sub do_load_sync {
2304	my ($map) = @_;	2362	my ($map) = @_;
2305		2363
		2364	# it's a bug to call this from the main context
2306	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2307	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2308		2367
2309	$map->load;	2368	$map->load;
2310	}	2369	}
…		…
2316	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2317		2376
2318	$path = normalise $path, $origin;	2377	$path = normalise $path, $origin;
2319		2378
2320	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2321	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2322	}	2381	}
2323		2382
2324	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2325		2384
2326	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
…		…
2385	sub swap_out {	2444	sub swap_out {
2386	my ($self) = @_;	2445	my ($self) = @_;
2387		2446
2388	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2389		2448
2390	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2391	return if $self->{deny_save};	2450	return if $self->{deny_save};
2392	return if $self->players;	2451	return if $self->players;
2393		2452
2394	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2395	$self->deactivate;	2454	$self->deactivate;
2396	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2397	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2398		2457
2399	# then atomically save	2458	# then atomically save
2400	$self->_save;	2459	$self->_save;
2401		2460
2402	# then free the map	2461	# then free the map
…		…
2428		2487
2429	return if $self->players;	2488	return if $self->players;
2430		2489
2431	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2432		2491
2433	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2434		2493
2435	# need to save uniques path	2494	# need to save uniques path
2436	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2437	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2438		2497
…		…
2591		2650
2592	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.
2593		2652
2594	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2595		2654
2596	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,
2597	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2598		2657
2599	=cut	2658	=cut
2600		2659
2601	sub deref {	2660	sub deref {
…		…
2768	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2769	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2770	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2771		2830
2772	$map->load;	2831	$map->load;
2773	$map->load_neighbours;
2774		2832
2775	return unless $self->contr->active;	2833	return unless $self->contr->active;
2776		2834
2777	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2778	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2934	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2935		2993
2936	unless (eval {	2994	unless (eval {
2937	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2938		2996
2939	# random map handling
2940	{
2941	my $guard = cf::lock_acquire "exit_prepare:$exit";
2942
2943	prepare_random_map $exit
2944	if $exit->slaying eq "/!";
2945	}
2946
2947	my $map = cf::map::normalise $exit->slaying, $exit->map;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2948	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2949	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2950		3023
2951	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2952		3025
2953	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2954	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2969		3042
2970	=head3 cf::client	3043	=head3 cf::client
2971		3044
2972	=over 4	3045	=over 4
2973		3046
2974	=item $client->send_drawinfo ($text, $flags)
2975
2976	Sends a drawinfo packet to the client. Circumvents output buffering so
2977	should not be used under normal circumstances.
2978
2979	=cut
2980
2981	sub cf::client::send_drawinfo {
2982	my ($self, $text, $flags) = @_;
2983
2984	utf8::encode $text;
2985	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2986	}
2987
2988	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2989		3048
2990	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
2991	them as required.	3050	them as required.
2992		3051
…		…
3010	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
3011	}	3070	}
3012		3071
3013	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
3014		3073
3015	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
3016	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
3017	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
3018	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
3019		3078
3020	=cut	3079	=cut
3021		3080
3022	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3127	id => "death",	3186	id => "death",
3128	title => "Death",	3187	title => "Death",
3129	reply => undef,	3188	reply => undef,
3130	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3131	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3132	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3133	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3134	);	3199	);
3135		3200
3136	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3179	=cut	3244	=cut
3180		3245
3181	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3182	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3183		3248
3184	if ($self->extcmd == 2) {
3185	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3186	} elsif ($self->extcmd == 1) { # TODO: remove
3187	push @msg, msgtype => "event_$type";
3188	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3189	}
3190	}
3191
3192	=item $client->ext_reply ($msgid, @msg)
3193
3194	Sends an ext reply to the client.
3195
3196	=cut
3197
3198	sub cf::client::ext_reply($$@) {
3199	my ($self, $id, @msg) = @_;
3200
3201	if ($self->extcmd == 2) {
3202	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3203	} elsif ($self->extcmd == 1) {
3204	#TODO: version 1, remove
3205	unshift @msg, msgtype => "reply", msgid => $id;
3206	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3207	}
3208	}	3250	}
3209		3251
3210	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3211		3253
3212	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3232		3274
3233	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3234	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3235		3277
3236	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our @COMMAND_FACES; # [normal commands, emotes, dm commands]
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = (
		3291	$COMMAND_FACES[0],
		3292	$COMMAND_FACES[1],
		3293	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
		3294	);
		3295
		3296	$self->send_face ($_)
		3297	for @faces;
		3298	$self->flush_fx;
		3299
		3300	$self->ext_msg (command_list => @faces);
		3301	}
		3302
		3303	=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
		3304
		3305	=cut
		3306
		3307	sub cf::client::set_command_faces {
		3308	@COMMAND_FACES = @_;
3237	}	3309	}
3238		3310
3239	cf::client->attach (	3311	cf::client->attach (
3240	on_connect => sub {	3312	on_connect => sub {
3241	my ($ns) = @_;	3313	my ($ns) = @_;
…		…
3267	my ($ns, $buf) = @_;	3339	my ($ns, $buf) = @_;
3268		3340
3269	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3341	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3270		3342
3271	if (ref $msg) {	3343	if (ref $msg) {
3272	my ($type, $reply, @payload) =	3344	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3273	"ARRAY" eq ref $msg
3274	? @$msg
3275	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3276		3345
3277	my @reply;
3278
3279	if (my $cb = $EXTICMD{$type}) {	3346	if (my $cb = $EXTIACMD{$type}) {
		3347	$cb->(
		3348	$ns,
		3349	sub {
		3350	$ns->ext_msg ("reply-$reply", @_)
		3351	if $reply;
		3352	},
		3353	@payload
		3354	);
		3355	} else {
		3356	my @reply;
		3357
		3358	if (my $cb = $EXTICMD{$type}) {
3280	@reply = $cb->($ns, @payload);	3359	@reply = $cb->($ns, @payload);
		3360	}
		3361
		3362	$ns->ext_msg ("reply-$reply", @reply)
		3363	if $reply;
3281	}	3364	}
3282
3283	$ns->ext_reply ($reply, @reply)
3284	if $reply;
3285
3286	} else {	3365	} else {
3287	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3366	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3288	}	3367	}
3289		3368
3290	cf::override;	3369	cf::override;
…		…
3458	=cut	3537	=cut
3459		3538
3460	#############################################################################	3539	#############################################################################
3461	# the server's init and main functions	3540	# the server's init and main functions
3462		3541
		3542	{
		3543	package cf::face;
		3544
		3545	our %HASH; # hash => idx
		3546	our @DATA; # dynamically-created facedata, only faceste 0 used
		3547	our @FOFS; # file offset, if > 0
		3548	our @SIZE; # size of face, in octets
		3549	our @META; # meta hash of face, if any
		3550	our $DATAFH; # facedata filehandle
		3551
		3552	# internal api, not finalised
		3553	sub set {
		3554	my ($name, $type, $data) = @_;
		3555
		3556	my $idx = cf::face::find $name;
		3557
		3558	if ($idx) {
		3559	delete $HASH{cf::face::get_csum $idx};
		3560	} else {
		3561	$idx = cf::face::alloc $name;
		3562	}
		3563
		3564	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3565
		3566	cf::face::set_type $idx, $type;
		3567	cf::face::set_csum $idx, 0, $hash;
		3568
		3569	# we need to destroy the SV itself, not just modify it, as a running ix
		3570	# might hold a reference to it: "delete" achieves that.
		3571	delete $FOFS[0][$idx];
		3572	delete $DATA[0][$idx];
		3573	$DATA[0][$idx] = $data;
		3574	$SIZE[0][$idx] = length $data;
		3575	delete $META[$idx];
		3576	$HASH{$hash} = $idx;#d#
		3577
		3578	$idx
		3579	}
		3580
		3581	sub _get_data($$$) {
		3582	my ($idx, $set, $cb) = @_;
		3583
		3584	if (defined $DATA[$set][$idx]) {
		3585	$cb->($DATA[$set][$idx]);
		3586	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3587	my $size = $SIZE[$set][$idx];
		3588	my $buf;
		3589	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3590	if ($_[0] == $size) {
		3591	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3592	$cb->($buf);
		3593	} else {
		3594	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3595	}
		3596	};
		3597	} else {
		3598	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3599	}
		3600	}
		3601
		3602	# rather ineffient
		3603	sub cf::face::get_data($;$) {
		3604	my ($idx, $set) = @_;
		3605
		3606	_get_data $idx, $set, Coro::rouse_cb;
		3607	Coro::rouse_wait
		3608	}
		3609
		3610	sub cf::face::ix {
		3611	my ($ns, $set, $idx, $pri) = @_;
		3612
		3613	_get_data $idx, $set, sub {
		3614	$ns->ix_send ($idx, $pri, $_[0]);
		3615	};
		3616	}
		3617	}
		3618
3463	sub load_facedata($) {	3619	sub load_facedata($) {
3464	my ($path) = @_;	3620	my ($path) = @_;
3465		3621
3466	# HACK to clear player env face cache, we need some signal framework
3467	# for this (global event?)
3468	%ext::player_env::MUSIC_FACE_CACHE = ();
3469
3470	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3622	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3471		3623
3472	trace "loading facedata from $path\n";	3624	trace "loading facedata from $path\n";
3473		3625
3474	my $facedata = decode_storable load_file $path;	3626	my $facedata = decode_storable load_file "$path/faceinfo";
3475		3627
3476	$facedata->{version} == 2	3628	$facedata->{version} == 2
3477	or cf::cleanup "$path: version mismatch, cannot proceed.";	3629	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3478		3630
3479	# patch in the exptable	3631	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3480	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3632	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3481	$facedata->{resource}{"res/exp_table"} = {	3633
3482	type => FT_RSRC,	3634	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3483	data => $exp_table,	3635
3484	hash => (Digest::MD5::md5 $exp_table),	3636	# BEGIN ATOMIC
3485	};	3637	# from here on, everything must be atomic - no thread switch allowed
3486	cf::cede_to_tick;	3638	my $t1 = EV::time;
3487		3639
3488	{	3640	{
3489	my $faces = $facedata->{faceinfo};	3641	my $faces = $facedata->{faceinfo};
3490		3642
3491	while (my ($face, $info) = each %$faces) {	3643	for my $face (sort keys %$faces) {
		3644	my $info = $faces->{$face};
3492	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3645	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3493		3646
3494	cf::face::set_visibility $idx, $info->{visibility};	3647	cf::face::set_visibility $idx, $info->{visibility};
3495	cf::face::set_magicmap $idx, $info->{magicmap};	3648	cf::face::set_magicmap $idx, $info->{magicmap};
3496	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3649	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3497	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3650	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3498	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3651	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3499		3652	$cf::face::HASH{$info->{hash64}} = $idx;
3500	cf::cede_to_tick;	3653	delete $cf::face::META[$idx];
3501	}	3654	}
3502		3655
3503	while (my ($face, $info) = each %$faces) {	3656	while (my ($face, $info) = each %$faces) {
3504	next unless $info->{smooth};	3657	next unless $info->{smooth};
3505		3658
…		…
3510	cf::face::set_smooth $idx, $smooth;	3663	cf::face::set_smooth $idx, $smooth;
3511	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3664	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3512	} else {	3665	} else {
3513	error "smooth face '$info->{smooth}' not found for face '$face'";	3666	error "smooth face '$info->{smooth}' not found for face '$face'";
3514	}	3667	}
3515
3516	cf::cede_to_tick;
3517	}	3668	}
3518	}	3669	}
3519		3670
3520	{	3671	{
3521	my $anims = $facedata->{animinfo};	3672	my $anims = $facedata->{animinfo};
3522		3673
3523	while (my ($anim, $info) = each %$anims) {	3674	while (my ($anim, $info) = each %$anims) {
3524	cf::anim::set $anim, $info->{frames}, $info->{facings};	3675	cf::anim::set $anim, $info->{frames}, $info->{facings};
3525	cf::cede_to_tick;
3526	}	3676	}
3527		3677
3528	cf::anim::invalidate_all; # d'oh	3678	cf::anim::invalidate_all; # d'oh
3529	}	3679	}
3530		3680
3531	{	3681	{
3532	my $res = $facedata->{resource};	3682	my $res = $facedata->{resource};
3533		3683
3534	while (my ($name, $info) = each %$res) {	3684	while (my ($name, $info) = each %$res) {
3535	if (defined $info->{type}) {	3685	if (defined (my $type = $info->{type})) {
		3686	# TODO: different hash - must free and use new index, or cache ixface data queue
3536	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3687	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3537		3688
3538	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3539	cf::face::set_type $idx, $info->{type};	3689	cf::face::set_type $idx, $type;
		3690	cf::face::set_csum $idx, 0, $info->{hash};
		3691	$cf::face::SIZE[0][$idx] = $info->{size};
		3692	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3693	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3694	$cf::face::HASH{$info->{hash}} = $idx;
3540	} else {	3695	} else {
3541	$RESOURCE{$name} = $info; # unused	3696	# $RESOURCE{$name} = $info; # unused
3542	}	3697	}
3543
3544	cf::cede_to_tick;
3545	}	3698	}
3546	}	3699	}
		3700
		3701	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3702
		3703	# HACK to clear player env face cache, we need some signal framework
		3704	# for this (global event?)
		3705	%ext::player_env::MUSIC_FACE_CACHE = ();
		3706
		3707	# END ATOMIC
		3708
		3709	cf::debug "facedata atomic update time ", EV::time - $t1;
3547		3710
3548	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3711	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3712
		3713	aio_close $fh if $fh; # close old facedata
3549		3714
3550	1	3715	1
3551	}	3716	}
3552		3717
3553	register_exticmd fx_want => sub {	3718	register_exticmd fx_want => sub {
…		…
3564	my $status = load_resource_file_ $_[0];	3729	my $status = load_resource_file_ $_[0];
3565	get_slot 0.1, 100;	3730	get_slot 0.1, 100;
3566	cf::arch::commit_load;	3731	cf::arch::commit_load;
3567		3732
3568	$status	3733	$status
		3734	}
		3735
		3736	sub reload_exp_table {
		3737	_reload_exp_table;
		3738
		3739	cf::face::set
		3740	"res/exp_table" => FT_RSRC,
		3741	JSON::XS->new->utf8->canonical->encode (
		3742	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3743	);
		3744	}
		3745
		3746	sub reload_materials {
		3747	_reload_materials;
3569	}	3748	}
3570		3749
3571	sub reload_regions {	3750	sub reload_regions {
3572	# HACK to clear player env face cache, we need some signal framework	3751	# HACK to clear player env face cache, we need some signal framework
3573	# for this (global event?)	3752	# for this (global event?)
…		…
3581	if exists $_->{match};	3760	if exists $_->{match};
3582	}	3761	}
3583	}	3762	}
3584		3763
3585	sub reload_facedata {	3764	sub reload_facedata {
3586	load_facedata "$DATADIR/facedata"	3765	load_facedata $DATADIR
3587	or die "unable to load facedata\n";	3766	or die "unable to load facedata\n";
3588	}	3767	}
3589		3768
3590	sub reload_archetypes {	3769	sub reload_archetypes {
3591	load_resource_file "$DATADIR/archetypes"	3770	load_resource_file "$DATADIR/archetypes"
3592	or die "unable to load archetypes\n";	3771	or die "unable to load archetypes\n";
		3772
		3773	cf::face::set
		3774	"res/skill_info" => FT_RSRC,
		3775	JSON::XS->new->utf8->canonical->encode (
		3776	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3777	);
		3778
		3779	cf::face::set
		3780	"res/spell_paths" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3783	);
3593	}	3784	}
3594		3785
3595	sub reload_treasures {	3786	sub reload_treasures {
3596	load_resource_file "$DATADIR/treasures"	3787	load_resource_file "$DATADIR/treasures"
3597	or die "unable to load treasurelists\n";	3788	or die "unable to load treasurelists\n";
…		…
3618	}	3809	}
3619		3810
3620	sub reload_resources {	3811	sub reload_resources {
3621	trace "reloading resource files...\n";	3812	trace "reloading resource files...\n";
3622		3813
3623	reload_exp_table;
3624	reload_materials;	3814	reload_materials;
3625	reload_facedata;	3815	reload_facedata;
		3816	reload_exp_table;
3626	reload_sound;	3817	reload_sound;
3627	reload_archetypes;	3818	reload_archetypes;
3628	reload_regions;	3819	reload_regions;
3629	reload_treasures;	3820	reload_treasures;
3630		3821
…		…
3682		3873
3683	sub main {	3874	sub main {
3684	cf::init_globals; # initialise logging	3875	cf::init_globals; # initialise logging
3685		3876
3686	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3877	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3687	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3878	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3688	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3879	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3689	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3880	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3690		3881
3691	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3882	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3692		3883
3693	# we must not ever block the main coroutine	3884	# we must not ever block the main coroutine
3694	local $Coro::idle = sub {	3885	$Coro::idle = sub {
3695	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3886	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3696	(async {	3887	(async {
3697	$Coro::current->{desc} = "IDLE BUG HANDLER";	3888	$Coro::current->{desc} = "IDLE BUG HANDLER";
3698	EV::loop EV::LOOP_ONESHOT;	3889	EV::loop EV::LOOP_ONESHOT;
3699	})->prio (Coro::PRIO_MAX);	3890	})->prio (Coro::PRIO_MAX);
…		…
3702	evthread_start IO::AIO::poll_fileno;	3893	evthread_start IO::AIO::poll_fileno;
3703		3894
3704	cf::sync_job {	3895	cf::sync_job {
3705	cf::incloader::init ();	3896	cf::incloader::init ();
3706		3897
		3898	db_init;
		3899
3707	cf::init_anim;	3900	cf::init_anim;
3708	cf::init_attackmess;	3901	cf::init_attackmess;
3709	cf::init_dynamic;	3902	cf::init_dynamic;
3710		3903
3711	cf::load_settings;	3904	cf::load_settings;
3712		3905
3713	reload_resources;	3906	reload_resources;
3714	reload_config;	3907	reload_config;
3715	db_init;
3716		3908
3717	cf::init_uuid;	3909	cf::init_uuid;
3718	cf::init_signals;	3910	cf::init_signals;
3719	cf::init_skills;	3911	cf::init_skills;
3720		3912
…		…
3734	};	3926	};
3735		3927
3736	cf::object::thawer::errors_are_fatal 0;	3928	cf::object::thawer::errors_are_fatal 0;
3737	info "parse errors in files are no longer fatal from this point on.\n";	3929	info "parse errors in files are no longer fatal from this point on.\n";
3738		3930
3739	my $free_main; $free_main = EV::idle sub {	3931	AE::postpone {
3740	undef $free_main;
3741	undef &main; # free gobs of memory :)	3932	undef &main; # free gobs of memory :)
3742	};	3933	};
3743		3934
3744	goto &main_loop;	3935	goto &main_loop;
3745	}	3936	}
…		…
3902		4093
3903	cf::write_runtime_sync; # external watchdog should not bark	4094	cf::write_runtime_sync; # external watchdog should not bark
3904		4095
3905	trace "emergency_perl_save: flushing outstanding aio requests";	4096	trace "emergency_perl_save: flushing outstanding aio requests";
3906	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4097	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3907	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4098	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3908	}	4099	}
3909		4100
3910	cf::write_runtime_sync; # external watchdog should not bark	4101	cf::write_runtime_sync; # external watchdog should not bark
3911	};	4102	};
3912		4103
…		…
4093		4284
4094	#############################################################################	4285	#############################################################################
4095		4286
4096	my $bug_warning = 0;	4287	my $bug_warning = 0;
4097		4288
4098	our @WAIT_FOR_TICK;
4099	our @WAIT_FOR_TICK_BEGIN;
4100
4101	sub wait_for_tick() {	4289	sub wait_for_tick() {
4102	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4290	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4103		4291
4104	my $signal = new Coro::Signal;	4292	$WAIT_FOR_TICK->wait;
4105	push @WAIT_FOR_TICK, $signal;
4106	$signal->wait;
4107	}	4293	}
4108		4294
4109	sub wait_for_tick_begin() {	4295	sub wait_for_tick_begin() {
4110	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4296	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4111		4297
4112	my $signal = new Coro::Signal;	4298	my $signal = new Coro::Signal;
4113	push @WAIT_FOR_TICK_BEGIN, $signal;	4299	push @WAIT_FOR_TICK_BEGIN, $signal;
4114	$signal->wait;	4300	$signal->wait;
4115	}	4301	}
…		…
4119	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4305	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4120	unless ++$bug_warning > 10;	4306	unless ++$bug_warning > 10;
4121	return;	4307	return;
4122	}	4308	}
4123		4309
4124	cf::server_tick; # one server iteration	4310	cf::one_tick; # one server iteration
4125		4311
4126	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4312	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4127		4313
4128	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4314	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4129	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4315	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4135	}	4321	}
4136		4322
4137	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4323	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4138	$sig->send;	4324	$sig->send;
4139	}	4325	}
4140	while (my $sig = shift @WAIT_FOR_TICK) {	4326	$WAIT_FOR_TICK->broadcast;
4141	$sig->send;
4142	}
4143		4327
4144	$LOAD = ($NOW - $TICK_START) / $TICK;	4328	$LOAD = ($NOW - $TICK_START) / $TICK;
4145	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4329	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4146		4330
4147	if (0) {	4331	if (0) {
…		…
4153	}	4337	}
4154	}	4338	}
4155		4339
4156	{	4340	{
4157	# configure BDB	4341	# configure BDB
		4342	info "initialising database";
4158		4343
4159	BDB::min_parallel 16;	4344	BDB::min_parallel 16;
4160	BDB::max_poll_reqs $TICK * 0.1;	4345	BDB::max_poll_reqs $TICK * 0.1;
4161	$AnyEvent::BDB::WATCHER->priority (1);	4346	#$AnyEvent::BDB::WATCHER->priority (1);
4162		4347
4163	unless ($DB_ENV) {	4348	unless ($DB_ENV) {
4164	$DB_ENV = BDB::db_env_create;	4349	$DB_ENV = BDB::db_env_create;
4165	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4350	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4166	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4351	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4191	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4376	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4192	};	4377	};
4193	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4378	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4194	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4379	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4195	};	4380	};
		4381
		4382	info "database initialised";
4196	}	4383	}
4197		4384
4198	{	4385	{
4199	# configure IO::AIO	4386	# configure IO::AIO
4200		4387
		4388	info "initialising aio";
4201	IO::AIO::min_parallel 8;	4389	IO::AIO::min_parallel 8;
4202	IO::AIO::max_poll_time $TICK * 0.1;	4390	IO::AIO::max_poll_time $TICK * 0.1;
4203	undef $AnyEvent::AIO::WATCHER;	4391	undef $AnyEvent::AIO::WATCHER;
		4392	info "aio initialised";
4204	}	4393	}
4205		4394
4206	our $_log_backtrace;	4395	our $_log_backtrace;
4207	our $_log_backtrace_last;	4396	our $_log_backtrace_last;
4208		4397

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC vs. Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.566 by root, Sun May 1 16:58:16 2011 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC