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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

…		…
1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
…		…
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.
…		…
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	}
…		…
834		901
835	return db_get cache => "$id/data";	902	return db_get cache => "$id/data";
836	}	903	}
837	}	904	}
838		905
839	my $t1 = Time::HiRes::time;	906	my $t1 = EV::time;
840	my $data = $process->(\@data);	907	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	908	my $t2 = EV::time;
842		909
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	910	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		911
845	db_put cache => "$id/data", $data;	912	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	913	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1433	=cut
1367		1434
1368	#############################################################################	1435	#############################################################################
1369	# command handling &c	1436	# command handling &c
1370		1437
1371	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1372		1439
1373	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1374	$name.	1441	$name.
1375		1442
1376	=cut	1443	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1383		1450
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1452	}
1386		1453
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1455
1389	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1390	extcmd packet. Ext commands will be processed in the order they are	1457	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	1458	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	1459	the logged-in player. Ext commands can only be processed after a player
1393	has logged in successfully.	1460	has logged in successfully.
1394		1461
1395	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1396	called.
1397		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1470
1400	Register a callback for execution when the client sends an (asynchronous)	1471	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	1472	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	1473	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	1474	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1475	log-in.
1405		1476
1406	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1407	called.
1408		1478
1409	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1411	sub register_extcmd {	1486	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1413		1488
1414	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1415	}	1490	}
1416		1491
1417	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1419		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1420	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1421	}	1508	}
1422		1509
1423	use File::Glob ();	1510	use File::Glob ();
1424		1511
1425	cf::player->attach (	1512	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1440		1527
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1529
1443	if (ref $msg) {	1530	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1531	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		1532
1449	my @reply;
1450
1451	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1452	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1453	}	1551	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1552
1458	} else {	1553	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1555	}
1461		1556
…		…
1474	};	1569	};
1475		1570
1476	$grp	1571	$grp
1477	}	1572	}
1478		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1479	sub load_extensions {	1585	sub load_extensions {
1480	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1481		1589
1482	cf::sync_job {	1590	cf::sync_job {
1483	my %todo;	1591	my %todo;
1484		1592
1485	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1636	unless exists $done{$_};
1529	}	1637	}
1530		1638
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1533	my $active = eval $v->{source};	1650	my $active = eval $source;
1534		1651
1535	if (length $@) {	1652	if (length $@) {
1536	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1537		1654
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1825	}	1942	}
1826		1943
1827	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828		1945
1829	Expand deliantra pod fragments into protocol xml.	1946	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		1947
1843	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1844		1949
1845	Sends an ext event to the client.	1950	Sends an ext event to the client.
1846		1951
…		…
2069	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2070		2175
2071	1	2176	1
2072	}	2177	}
2073		2178
		2179	# used to laod the header of an original map
2074	sub load_header_orig {	2180	sub load_header_orig {
2075	my ($self) = @_;	2181	my ($self) = @_;
2076		2182
2077	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2078	}	2184	}
2079		2185
		2186	# used to laod the header of an instantiated map
2080	sub load_header_temp {	2187	sub load_header_temp {
2081	my ($self) = @_;	2188	my ($self) = @_;
2082		2189
2083	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2084	}	2191	}
2085		2192
		2193	# called after loading the header from an instantiated map
2086	sub prepare_temp {	2194	sub prepare_temp {
2087	my ($self) = @_;	2195	my ($self) = @_;
2088		2196
2089	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2090	\|\| $cf::RUNTIME); #d#	2198	\|\| $cf::RUNTIME); #d#
2091	# safety	2199	# safety
2092	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2093	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2094	}	2202	}
2095		2203
		2204	# called after loading the header from an original map
2096	sub prepare_orig {	2205	sub prepare_orig {
2097	my ($self) = @_;	2206	my ($self) = @_;
2098		2207
2099	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2100	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2126	sub find {	2235	sub find {
2127	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2128		2237
2129	cf::cede_to_tick;	2238	cf::cede_to_tick;
2130		2239
2131	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2132		2241
2133	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2135		2244
2136	$cf::MAP{$path} \|\| do {	2245	$cf::MAP{$path} \|\| do {
…		…
2167		2276
2168	{	2277	{
2169	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2170		2279
2171	return unless $self->valid;	2280	return unless $self->valid;
2172	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2173
2174	$self->in_memory (cf::MAP_LOADING);
2175		2282
2176	$self->alloc;	2283	$self->alloc;
2177		2284
2178	$self->pre_load;	2285	$self->pre_load;
2179	cf::cede_to_tick;	2286	cf::cede_to_tick;
…		…
2197	}	2304	}
2198	}	2305	}
2199	}	2306	}
2200		2307
2201	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
2202	}	2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2203		2315
2204	cf::cede_to_tick;	2316	cf::cede_to_tick;
2205	# now do the right thing for maps	2317	# now do the right thing for maps
2206	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2207	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2211	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2212	$self->decay_objects;	2324	$self->decay_objects;
2213	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2214	$self->update_buttons;	2326	$self->update_buttons;
2215	cf::cede_to_tick;	2327	cf::cede_to_tick;
2216	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2217	}	2329	}
2218		2330
2219	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2220	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2221
2222	$self->in_memory (cf::MAP_ACTIVE);
2223	}	2333	}
2224		2334
2225	$self->post_load;	2335	$self->post_load;
2226		2336
2227	1	2337	1
…		…
2240	# if $self->per_party;	2350	# if $self->per_party;
2241		2351
2242	$self	2352	$self
2243	}	2353	}
2244		2354
2245	# find and load all maps in the 3x3 area around a map
2246	sub load_neighbours {
2247	my ($map) = @_;
2248
2249	my @neigh; # diagonal neighbours
2250
2251	for (0 .. 3) {
2252	my $neigh = $map->tile_path ($_)
2253	or next;
2254	$neigh = find $neigh, $map
2255	or next;
2256	$neigh->load;
2257
2258	# now find the diagonal neighbours
2259	push @neigh,
2260	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2261	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2262	}
2263
2264	for (grep defined $_->[0], @neigh) {
2265	my ($path, $origin) = @$_;
2266	my $neigh = find $path, $origin
2267	or next;
2268	$neigh->load;
2269	}
2270	}
2271
2272	sub find_sync {	2355	sub find_sync {
2273	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2274		2357
		2358	# it's a bug to call this from the main context
2275	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2276	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2277		2361
2278	find $path, $origin	2362	find $path, $origin
2279	}	2363	}
2280		2364
2281	sub do_load_sync {	2365	sub do_load_sync {
2282	my ($map) = @_;	2366	my ($map) = @_;
2283		2367
		2368	# it's a bug to call this from the main context
2284	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2285	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2286		2371
2287	$map->load;	2372	$map->load;
2288	}	2373	}
…		…
2291	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2292		2377
2293	sub find_async {	2378	sub find_async {
2294	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2295		2380
2296	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2297		2382
2298	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2299	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load \|\| $map->linkable;
2300	}	2385	}
2301		2386
2302	$MAP_PREFETCH{$path} \|= $load;	2387	$MAP_PREFETCH{$path} \|= $load;
2303		2388
2304	$MAP_PREFETCHER \|\|= cf::async {	2389	$MAP_PREFETCHER \|\|= cf::async {
…		…
2363	sub swap_out {	2448	sub swap_out {
2364	my ($self) = @_;	2449	my ($self) = @_;
2365		2450
2366	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2367		2452
2368	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2369	return if $self->{deny_save};	2454	return if $self->{deny_save};
2370	return if $self->players;	2455	return if $self->players;
2371		2456
2372	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2373	$self->deactivate;	2458	$self->deactivate;
2374	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2375	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2376		2461
2377	# then atomically save	2462	# then atomically save
2378	$self->_save;	2463	$self->_save;
2379		2464
2380	# then free the map	2465	# then free the map
…		…
2406		2491
2407	return if $self->players;	2492	return if $self->players;
2408		2493
2409	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2410		2495
2411	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2412		2497
2413	# need to save uniques path	2498	# need to save uniques path
2414	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2415	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2416		2501
…		…
2569		2654
2570	Creates and returns a persistent reference to an object that can be stored as a string.	2655	Creates and returns a persistent reference to an object that can be stored as a string.
2571		2656
2572	=item $ob = cf::object::deref ($refstring)	2657	=item $ob = cf::object::deref ($refstring)
2573		2658
2574	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2659	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2575	even if the object actually exists. May block.	2660	even if the object actually exists. May block.
2576		2661
2577	=cut	2662	=cut
2578		2663
2579	sub deref {	2664	sub deref {
…		…
2746	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2747	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2748	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2749		2834
2750	$map->load;	2835	$map->load;
2751	$map->load_neighbours;
2752		2836
2753	return unless $self->contr->active;	2837	return unless $self->contr->active;
2754		2838
2755	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2756	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2812	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2813	}	2897	}
2814	}	2898	}
2815		2899
2816	my $map = eval {	2900	my $map = eval {
2817	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2818		2902
2819	if ($map) {	2903	if ($map) {
2820	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2821	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2822	} else {	2906	} else {
…		…
2912	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2913		2997
2914	unless (eval {	2998	unless (eval {
2915	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2916		3000
2917	# random map handling
2918	{
2919	my $guard = cf::lock_acquire "exit_prepare:$exit";
2920
2921	prepare_random_map $exit
2922	if $exit->slaying eq "/!";
2923	}
2924
2925	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2926	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2927	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2928		3027
2929	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2930		3029
2931	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2932	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3157	=cut	3256	=cut
3158		3257
3159	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3160	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3161		3260
3162	if ($self->extcmd == 2) {
3163	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3164	} elsif ($self->extcmd == 1) { # TODO: remove
3165	push @msg, msgtype => "event_$type";
3166	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3167	}
3168	}
3169
3170	=item $client->ext_reply ($msgid, @msg)
3171
3172	Sends an ext reply to the client.
3173
3174	=cut
3175
3176	sub cf::client::ext_reply($$@) {
3177	my ($self, $id, @msg) = @_;
3178
3179	if ($self->extcmd == 2) {
3180	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3181	} elsif ($self->extcmd == 1) {
3182	#TODO: version 1, remove
3183	unshift @msg, msgtype => "reply", msgid => $id;
3184	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3185	}
3186	}	3262	}
3187		3263
3188	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3189		3265
3190	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3245	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3246		3322
3247	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3248		3324
3249	if (ref $msg) {	3325	if (ref $msg) {
3250	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3251	"ARRAY" eq ref $msg
3252	? @$msg
3253	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3254		3327
3255	my @reply;
3256
3257	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3258	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3259	}	3346	}
3260
3261	$ns->ext_reply ($reply, @reply)
3262	if $reply;
3263
3264	} else {	3347	} else {
3265	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3266	}	3349	}
3267		3350
3268	cf::override;	3351	cf::override;
…		…
3436	=cut	3519	=cut
3437		3520
3438	#############################################################################	3521	#############################################################################
3439	# the server's init and main functions	3522	# the server's init and main functions
3440		3523
		3524	{
		3525	package cf::face;
		3526
		3527	our %HASH; # hash => idx
		3528	our @DATA; # dynamically-created facedata, only faceste 0 used
		3529	our @FOFS; # file offset, if > 0
		3530	our @SIZE; # size of face, in octets
		3531	our @META; # meta hash of face, if any
		3532	our $DATAFH; # facedata filehandle
		3533
		3534	# internal api, not finalised
		3535	sub set {
		3536	my ($name, $type, $data) = @_;
		3537
		3538	my $idx = cf::face::find $name;
		3539
		3540	if ($idx) {
		3541	delete $HASH{cf::face::get_chksum $idx};
		3542	} else {
		3543	$idx = cf::face::alloc $name;
		3544	}
		3545
		3546	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3547
		3548	cf::face::set_type $idx, $type;
		3549	cf::face::set_csum $idx, 0, $hash;
		3550
		3551	# we need to destroy the SV itself, not just modify it, as a running ix
		3552	# might hold a reference to it: "delete" achieves that.
		3553	delete $FOFS[0][$idx];
		3554	delete $DATA[0][$idx];
		3555	$DATA[0][$idx] = $data;
		3556	$SIZE[0][$idx] = length $data;
		3557	delete $META[$idx];
		3558	$HASH{$hash} = $idx;#d#
		3559
		3560	$idx
		3561	}
		3562
		3563	sub _get_data($$$) {
		3564	my ($idx, $set, $cb) = @_;
		3565
		3566	if (defined $DATA[$set][$idx]) {
		3567	$cb->($DATA[$set][$idx]);
		3568	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3569	my $size = $SIZE[$set][$idx];
		3570	my $buf;
		3571	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3572	if ($_[0] == $size) {
		3573	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3574	$cb->($buf);
		3575	} else {
		3576	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3577	}
		3578	};
		3579	} else {
		3580	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3581	}
		3582	}
		3583
		3584	# rather ineffient
		3585	sub cf::face::get_data($;$) {
		3586	my ($idx, $set) = @_;
		3587
		3588	_get_data $idx, $set, Coro::rouse_cb;
		3589	Coro::rouse_wait
		3590	}
		3591
		3592	sub cf::face::ix {
		3593	my ($ns, $set, $idx, $pri) = @_;
		3594
		3595	_get_data $idx, $set, sub {
		3596	$ns->ix_send ($idx, $pri, $_[0]);
		3597	};
		3598	}
		3599	}
		3600
3441	sub load_facedata($) {	3601	sub load_facedata($) {
3442	my ($path) = @_;	3602	my ($path) = @_;
3443		3603
3444	# HACK to clear player env face cache, we need some signal framework
3445	# for this (global event?)
3446	%ext::player_env::MUSIC_FACE_CACHE = ();
3447
3448	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3604	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3449		3605
3450	trace "loading facedata from $path\n";	3606	trace "loading facedata from $path\n";
3451		3607
3452	my $facedata = decode_storable load_file $path;	3608	my $facedata = decode_storable load_file "$path/faceinfo";
3453		3609
3454	$facedata->{version} == 2	3610	$facedata->{version} == 2
3455	or cf::cleanup "$path: version mismatch, cannot proceed.";	3611	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3456		3612
3457	# patch in the exptable	3613	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3458	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3614	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3459	$facedata->{resource}{"res/exp_table"} = {	3615
3460	type => FT_RSRC,	3616	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3461	data => $exp_table,	3617
3462	hash => (Digest::MD5::md5 $exp_table),	3618	# BEGIN ATOMIC
3463	};	3619	# from here on, everything must be atomic - no thread switch allowed
3464	cf::cede_to_tick;	3620	my $t1 = EV::time;
3465		3621
3466	{	3622	{
3467	my $faces = $facedata->{faceinfo};	3623	my $faces = $facedata->{faceinfo};
3468		3624
3469	while (my ($face, $info) = each %$faces) {	3625	for my $face (sort keys %$faces) {
		3626	my $info = $faces->{$face};
3470	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3627	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3471		3628
3472	cf::face::set_visibility $idx, $info->{visibility};	3629	cf::face::set_visibility $idx, $info->{visibility};
3473	cf::face::set_magicmap $idx, $info->{magicmap};	3630	cf::face::set_magicmap $idx, $info->{magicmap};
3474	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3631	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3475	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3632	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3476	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3633	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3477		3634	$cf::face::HASH{$info->{hash64}} = $idx;
3478	cf::cede_to_tick;	3635	delete $cf::face::META[$idx];
3479	}	3636	}
3480		3637
3481	while (my ($face, $info) = each %$faces) {	3638	while (my ($face, $info) = each %$faces) {
3482	next unless $info->{smooth};	3639	next unless $info->{smooth};
3483		3640
…		…
3488	cf::face::set_smooth $idx, $smooth;	3645	cf::face::set_smooth $idx, $smooth;
3489	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3646	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3490	} else {	3647	} else {
3491	error "smooth face '$info->{smooth}' not found for face '$face'";	3648	error "smooth face '$info->{smooth}' not found for face '$face'";
3492	}	3649	}
3493
3494	cf::cede_to_tick;
3495	}	3650	}
3496	}	3651	}
3497		3652
3498	{	3653	{
3499	my $anims = $facedata->{animinfo};	3654	my $anims = $facedata->{animinfo};
3500		3655
3501	while (my ($anim, $info) = each %$anims) {	3656	while (my ($anim, $info) = each %$anims) {
3502	cf::anim::set $anim, $info->{frames}, $info->{facings};	3657	cf::anim::set $anim, $info->{frames}, $info->{facings};
3503	cf::cede_to_tick;
3504	}	3658	}
3505		3659
3506	cf::anim::invalidate_all; # d'oh	3660	cf::anim::invalidate_all; # d'oh
3507	}	3661	}
3508		3662
3509	{	3663	{
3510	my $res = $facedata->{resource};	3664	my $res = $facedata->{resource};
3511		3665
3512	while (my ($name, $info) = each %$res) {	3666	while (my ($name, $info) = each %$res) {
3513	if (defined $info->{type}) {	3667	if (defined (my $type = $info->{type})) {
		3668	# TODO: different hash - must free and use new index, or cache ixface data queue
3514	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3669	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3515		3670
3516	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3517	cf::face::set_type $idx, $info->{type};	3671	cf::face::set_type $idx, $type;
		3672	cf::face::set_csum $idx, 0, $info->{hash};
		3673	$cf::face::SIZE[0][$idx] = $info->{size};
		3674	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3675	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3676	$cf::face::HASH{$info->{hash}} = $idx;
3518	} else {	3677	} else {
3519	$RESOURCE{$name} = $info; # unused	3678	# $RESOURCE{$name} = $info; # unused
3520	}	3679	}
3521
3522	cf::cede_to_tick;
3523	}	3680	}
3524	}	3681	}
		3682
		3683	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3684
		3685	# HACK to clear player env face cache, we need some signal framework
		3686	# for this (global event?)
		3687	%ext::player_env::MUSIC_FACE_CACHE = ();
		3688
		3689	# END ATOMIC
		3690
		3691	cf::debug "facedata atomic update time ", EV::time - $t1;
3525		3692
3526	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3693	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3694
		3695	aio_close $fh if $fh; # close old facedata
3527		3696
3528	1	3697	1
3529	}	3698	}
3530		3699
3531	register_exticmd fx_want => sub {	3700	register_exticmd fx_want => sub {
…		…
3542	my $status = load_resource_file_ $_[0];	3711	my $status = load_resource_file_ $_[0];
3543	get_slot 0.1, 100;	3712	get_slot 0.1, 100;
3544	cf::arch::commit_load;	3713	cf::arch::commit_load;
3545		3714
3546	$status	3715	$status
		3716	}
		3717
		3718	sub reload_exp_table {
		3719	_reload_exp_table;
		3720
		3721	cf::face::set
		3722	"res/exp_table" => FT_RSRC,
		3723	JSON::XS->new->utf8->canonical->encode (
		3724	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3725	);
		3726	}
		3727
		3728	sub reload_materials {
		3729	_reload_materials;
3547	}	3730	}
3548		3731
3549	sub reload_regions {	3732	sub reload_regions {
3550	# HACK to clear player env face cache, we need some signal framework	3733	# HACK to clear player env face cache, we need some signal framework
3551	# for this (global event?)	3734	# for this (global event?)
…		…
3559	if exists $_->{match};	3742	if exists $_->{match};
3560	}	3743	}
3561	}	3744	}
3562		3745
3563	sub reload_facedata {	3746	sub reload_facedata {
3564	load_facedata "$DATADIR/facedata"	3747	load_facedata $DATADIR
3565	or die "unable to load facedata\n";	3748	or die "unable to load facedata\n";
3566	}	3749	}
3567		3750
3568	sub reload_archetypes {	3751	sub reload_archetypes {
3569	load_resource_file "$DATADIR/archetypes"	3752	load_resource_file "$DATADIR/archetypes"
3570	or die "unable to load archetypes\n";	3753	or die "unable to load archetypes\n";
		3754
		3755	cf::face::set
		3756	"res/skill_info" => FT_RSRC,
		3757	JSON::XS->new->utf8->canonical->encode (
		3758	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3759	);
		3760
		3761	cf::face::set
		3762	"res/spell_paths" => FT_RSRC,
		3763	JSON::XS->new->utf8->canonical->encode (
		3764	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3765	);
3571	}	3766	}
3572		3767
3573	sub reload_treasures {	3768	sub reload_treasures {
3574	load_resource_file "$DATADIR/treasures"	3769	load_resource_file "$DATADIR/treasures"
3575	or die "unable to load treasurelists\n";	3770	or die "unable to load treasurelists\n";
…		…
3596	}	3791	}
3597		3792
3598	sub reload_resources {	3793	sub reload_resources {
3599	trace "reloading resource files...\n";	3794	trace "reloading resource files...\n";
3600		3795
3601	reload_exp_table;
3602	reload_materials;	3796	reload_materials;
3603	reload_facedata;	3797	reload_facedata;
		3798	reload_exp_table;
3604	reload_sound;	3799	reload_sound;
3605	reload_archetypes;	3800	reload_archetypes;
3606	reload_regions;	3801	reload_regions;
3607	reload_treasures;	3802	reload_treasures;
3608		3803
…		…
3660		3855
3661	sub main {	3856	sub main {
3662	cf::init_globals; # initialise logging	3857	cf::init_globals; # initialise logging
3663		3858
3664	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3859	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3665	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3860	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3666	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3861	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3667	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3862	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3668		3863
3669	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3864	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3670		3865
3671	# we must not ever block the main coroutine	3866	# we must not ever block the main coroutine
3672	local $Coro::idle = sub {	3867	$Coro::idle = sub {
3673	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3868	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3674	(async {	3869	(async {
3675	$Coro::current->{desc} = "IDLE BUG HANDLER";	3870	$Coro::current->{desc} = "IDLE BUG HANDLER";
3676	EV::loop EV::LOOP_ONESHOT;	3871	EV::loop EV::LOOP_ONESHOT;
3677	})->prio (Coro::PRIO_MAX);	3872	})->prio (Coro::PRIO_MAX);
…		…
3680	evthread_start IO::AIO::poll_fileno;	3875	evthread_start IO::AIO::poll_fileno;
3681		3876
3682	cf::sync_job {	3877	cf::sync_job {
3683	cf::incloader::init ();	3878	cf::incloader::init ();
3684		3879
		3880	db_init;
		3881
3685	cf::init_anim;	3882	cf::init_anim;
3686	cf::init_attackmess;	3883	cf::init_attackmess;
3687	cf::init_dynamic;	3884	cf::init_dynamic;
3688		3885
3689	cf::load_settings;	3886	cf::load_settings;
3690		3887
3691	reload_resources;	3888	reload_resources;
3692	reload_config;	3889	reload_config;
3693	db_init;
3694		3890
3695	cf::init_uuid;	3891	cf::init_uuid;
3696	cf::init_signals;	3892	cf::init_signals;
3697	cf::init_skills;	3893	cf::init_skills;
3698		3894
…		…
3712	};	3908	};
3713		3909
3714	cf::object::thawer::errors_are_fatal 0;	3910	cf::object::thawer::errors_are_fatal 0;
3715	info "parse errors in files are no longer fatal from this point on.\n";	3911	info "parse errors in files are no longer fatal from this point on.\n";
3716		3912
3717	my $free_main; $free_main = EV::idle sub {	3913	AE::postpone {
3718	undef $free_main;
3719	undef &main; # free gobs of memory :)	3914	undef &main; # free gobs of memory :)
3720	};	3915	};
3721		3916
3722	goto &main_loop;	3917	goto &main_loop;
3723	}	3918	}
…		…
3880		4075
3881	cf::write_runtime_sync; # external watchdog should not bark	4076	cf::write_runtime_sync; # external watchdog should not bark
3882		4077
3883	trace "emergency_perl_save: flushing outstanding aio requests";	4078	trace "emergency_perl_save: flushing outstanding aio requests";
3884	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4079	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3885	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4080	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3886	}	4081	}
3887		4082
3888	cf::write_runtime_sync; # external watchdog should not bark	4083	cf::write_runtime_sync; # external watchdog should not bark
3889	};	4084	};
3890		4085
…		…
4071		4266
4072	#############################################################################	4267	#############################################################################
4073		4268
4074	my $bug_warning = 0;	4269	my $bug_warning = 0;
4075		4270
4076	our @WAIT_FOR_TICK;
4077	our @WAIT_FOR_TICK_BEGIN;
4078
4079	sub wait_for_tick() {	4271	sub wait_for_tick() {
4080	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4272	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4081		4273
4082	my $signal = new Coro::Signal;	4274	$WAIT_FOR_TICK->wait;
4083	push @WAIT_FOR_TICK, $signal;
4084	$signal->wait;
4085	}	4275	}
4086		4276
4087	sub wait_for_tick_begin() {	4277	sub wait_for_tick_begin() {
4088	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4278	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4089		4279
4090	my $signal = new Coro::Signal;	4280	my $signal = new Coro::Signal;
4091	push @WAIT_FOR_TICK_BEGIN, $signal;	4281	push @WAIT_FOR_TICK_BEGIN, $signal;
4092	$signal->wait;	4282	$signal->wait;
4093	}	4283	}
…		…
4097	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4287	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4098	unless ++$bug_warning > 10;	4288	unless ++$bug_warning > 10;
4099	return;	4289	return;
4100	}	4290	}
4101		4291
4102	cf::server_tick; # one server iteration	4292	cf::one_tick; # one server iteration
4103		4293
4104	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4294	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4105		4295
4106	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4296	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4107	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4297	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4113	}	4303	}
4114		4304
4115	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4305	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4116	$sig->send;	4306	$sig->send;
4117	}	4307	}
4118	while (my $sig = shift @WAIT_FOR_TICK) {	4308	$WAIT_FOR_TICK->broadcast;
4119	$sig->send;
4120	}
4121		4309
4122	$LOAD = ($NOW - $TICK_START) / $TICK;	4310	$LOAD = ($NOW - $TICK_START) / $TICK;
4123	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4311	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4124		4312
4125	if (0) {	4313	if (0) {
…		…
4131	}	4319	}
4132	}	4320	}
4133		4321
4134	{	4322	{
4135	# configure BDB	4323	# configure BDB
		4324	info "initialising database";
4136		4325
4137	BDB::min_parallel 16;	4326	BDB::min_parallel 16;
4138	BDB::max_poll_reqs $TICK * 0.1;	4327	BDB::max_poll_reqs $TICK * 0.1;
4139	$AnyEvent::BDB::WATCHER->priority (1);	4328	#$AnyEvent::BDB::WATCHER->priority (1);
4140		4329
4141	unless ($DB_ENV) {	4330	unless ($DB_ENV) {
4142	$DB_ENV = BDB::db_env_create;	4331	$DB_ENV = BDB::db_env_create;
4143	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4332	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4144	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4333	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4169	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4358	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4170	};	4359	};
4171	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4360	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4172	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4361	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4173	};	4362	};
		4363
		4364	info "database initialised";
4174	}	4365	}
4175		4366
4176	{	4367	{
4177	# configure IO::AIO	4368	# configure IO::AIO
4178		4369
		4370	info "initialising aio";
4179	IO::AIO::min_parallel 8;	4371	IO::AIO::min_parallel 8;
4180	IO::AIO::max_poll_time $TICK * 0.1;	4372	IO::AIO::max_poll_time $TICK * 0.1;
4181	undef $AnyEvent::AIO::WATCHER;	4373	undef $AnyEvent::AIO::WATCHER;
		4374	info "aio initialised";
4182	}	4375	}
4183		4376
4184	our $_log_backtrace;	4377	our $_log_backtrace;
4185	our $_log_backtrace_last;	4378	our $_log_backtrace_last;
4186		4379

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs. Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.562 by root, Sat Apr 23 04:46:26 2011 UTC vs.
Revision 1.602 by root, Sun Nov 11 18:21:21 2012 UTC