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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.600 by root, Sun Nov 11 04:31:57 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."
…		…
1555		1672
1556	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1557	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1558	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1559	}	1676	}
		1677
		1678	last;
1560	}	1679	}
1561	}	1680	}
1562	};	1681	};
1563	}	1682	}
1564		1683
…		…
1823	}	1942	}
1824		1943
1825	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1826		1945
1827	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1828
1829	=item $player->ext_reply ($msgid, @msg)
1830
1831	Sends an ext reply to the player.
1832
1833	=cut
1834
1835	sub ext_reply($$@) {
1836	my ($self, $id, @msg) = @_;
1837
1838	$self->ns->ext_reply ($id, @msg)
1839	}
1840		1947
1841	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1842		1949
1843	Sends an ext event to the client.	1950	Sends an ext event to the client.
1844		1951
…		…
1992		2099
1993	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1994	()	2101	()
1995	}	2102	}
1996		2103
		2104	# may re-bless or do other evil things
1997	sub init {	2105	sub init {
1998	my ($self) = @_;	2106	my ($self) = @_;
1999		2107
2000	$self	2108	$self
2001	}	2109	}
…		…
2066	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2067		2175
2068	1	2176	1
2069	}	2177	}
2070		2178
		2179	# used to laod the header of an original map
2071	sub load_header_orig {	2180	sub load_header_orig {
2072	my ($self) = @_;	2181	my ($self) = @_;
2073		2182
2074	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2075	}	2184	}
2076		2185
		2186	# used to laod the header of an instantiated map
2077	sub load_header_temp {	2187	sub load_header_temp {
2078	my ($self) = @_;	2188	my ($self) = @_;
2079		2189
2080	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2081	}	2191	}
2082		2192
		2193	# called after loading the header from an instantiated map
2083	sub prepare_temp {	2194	sub prepare_temp {
2084	my ($self) = @_;	2195	my ($self) = @_;
2085		2196
2086	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2087	\|\| $cf::RUNTIME); #d#	2198	\|\| $cf::RUNTIME); #d#
2088	# safety	2199	# safety
2089	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2090	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2091	}	2202	}
2092		2203
		2204	# called after loading the header from an original map
2093	sub prepare_orig {	2205	sub prepare_orig {
2094	my ($self) = @_;	2206	my ($self) = @_;
2095		2207
2096	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2097	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2123	sub find {	2235	sub find {
2124	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2125		2237
2126	cf::cede_to_tick;	2238	cf::cede_to_tick;
2127		2239
2128	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2129		2241
2130	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2131	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2132		2244
2133	$cf::MAP{$path} \|\| do {	2245	$cf::MAP{$path} \|\| do {
…		…
2164		2276
2165	{	2277	{
2166	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2167		2279
2168	return unless $self->valid;	2280	return unless $self->valid;
2169	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2170
2171	$self->in_memory (cf::MAP_LOADING);
2172		2282
2173	$self->alloc;	2283	$self->alloc;
2174		2284
2175	$self->pre_load;	2285	$self->pre_load;
2176	cf::cede_to_tick;	2286	cf::cede_to_tick;
2177		2287
		2288	if (exists $self->{load_path}) {
2178	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2179	$f->skip_block;	2290	$f->skip_block;
2180	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2181	or return;	2292	or return;
2182		2293
2183	$self->post_load_original	2294	$self->post_load_original
2184	if delete $self->{load_original};	2295	if delete $self->{load_original};
2185		2296
2186	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2187	utf8::encode $uniq;	2298	utf8::encode $uniq;
2188	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2189	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2190	$self->clear_unique_items;	2301	$self->clear_unique_items;
2191	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2192	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2193	}	2305	}
2194	}	2306	}
2195	}
2196		2307
2197	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2198		2315
2199	cf::cede_to_tick;	2316	cf::cede_to_tick;
2200	# now do the right thing for maps	2317	# now do the right thing for maps
2201	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2202	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2206	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2207	$self->decay_objects;	2324	$self->decay_objects;
2208	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2209	$self->update_buttons;	2326	$self->update_buttons;
2210	cf::cede_to_tick;	2327	cf::cede_to_tick;
2211	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2212	}	2329	}
2213		2330
2214	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2215	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2216
2217	$self->in_memory (cf::MAP_ACTIVE);
2218	}	2333	}
2219		2334
2220	$self->post_load;	2335	$self->post_load;
2221		2336
2222	1	2337	1
…		…
2235	# if $self->per_party;	2350	# if $self->per_party;
2236		2351
2237	$self	2352	$self
2238	}	2353	}
2239		2354
2240	# find and load all maps in the 3x3 area around a map
2241	sub load_neighbours {
2242	my ($map) = @_;
2243
2244	my @neigh; # diagonal neighbours
2245
2246	for (0 .. 3) {
2247	my $neigh = $map->tile_path ($_)
2248	or next;
2249	$neigh = find $neigh, $map
2250	or next;
2251	$neigh->load;
2252
2253	# now find the diagonal neighbours
2254	push @neigh,
2255	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2256	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2257	}
2258
2259	for (grep defined $_->[0], @neigh) {
2260	my ($path, $origin) = @$_;
2261	my $neigh = find $path, $origin
2262	or next;
2263	$neigh->load;
2264	}
2265	}
2266
2267	sub find_sync {	2355	sub find_sync {
2268	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2269		2357
		2358	# it's a bug to call this from the main context
2270	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2271	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2272		2361
2273	find $path, $origin	2362	find $path, $origin
2274	}	2363	}
2275		2364
2276	sub do_load_sync {	2365	sub do_load_sync {
2277	my ($map) = @_;	2366	my ($map) = @_;
2278		2367
		2368	# it's a bug to call this from the main context
2279	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2280	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2281		2371
2282	$map->load;	2372	$map->load;
2283	}	2373	}
…		…
2286	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2287		2377
2288	sub find_async {	2378	sub find_async {
2289	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2290		2380
2291	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2292		2382
2293	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2294	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load \|\| $map->linkable;
2295	}	2385	}
2296		2386
2297	$MAP_PREFETCH{$path} \|= $load;	2387	$MAP_PREFETCH{$path} \|= $load;
2298		2388
2299	$MAP_PREFETCHER \|\|= cf::async {	2389	$MAP_PREFETCHER \|\|= cf::async {
…		…
2358	sub swap_out {	2448	sub swap_out {
2359	my ($self) = @_;	2449	my ($self) = @_;
2360		2450
2361	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2362		2452
2363	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2364	return if $self->{deny_save};	2454	return if $self->{deny_save};
2365	return if $self->players;	2455	return if $self->players;
2366		2456
2367	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2368	$self->deactivate;	2458	$self->deactivate;
2369	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2370	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2371		2461
2372	# then atomically save	2462	# then atomically save
2373	$self->_save;	2463	$self->_save;
2374		2464
2375	# then free the map	2465	# then free the map
…		…
2401		2491
2402	return if $self->players;	2492	return if $self->players;
2403		2493
2404	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2405		2495
2406	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2407		2497
2408	# need to save uniques path	2498	# need to save uniques path
2409	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2410	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2411		2501
…		…
2741	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2742	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2743	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2744		2834
2745	$map->load;	2835	$map->load;
2746	$map->load_neighbours;
2747		2836
2748	return unless $self->contr->active;	2837	return unless $self->contr->active;
2749		2838
2750	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2751	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2807	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2808	}	2897	}
2809	}	2898	}
2810		2899
2811	my $map = eval {	2900	my $map = eval {
2812	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2813		2902
2814	if ($map) {	2903	if ($map) {
2815	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2816	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2817	} else {	2906	} else {
…		…
2907	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2908		2997
2909	unless (eval {	2998	unless (eval {
2910	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2911		3000
2912	# random map handling
2913	{
2914	my $guard = cf::lock_acquire "exit_prepare:$exit";
2915
2916	prepare_random_map $exit
2917	if $exit->slaying eq "/!";
2918	}
2919
2920	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2921	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2922	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	}
2923		3027
2924	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2925		3029
2926	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2927	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3152	=cut	3256	=cut
3153		3257
3154	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3155	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3156		3260
3157	if ($self->extcmd == 2) {
3158	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3159	} elsif ($self->extcmd == 1) { # TODO: remove
3160	push @msg, msgtype => "event_$type";
3161	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3162	}
3163	}
3164
3165	=item $client->ext_reply ($msgid, @msg)
3166
3167	Sends an ext reply to the client.
3168
3169	=cut
3170
3171	sub cf::client::ext_reply($$@) {
3172	my ($self, $id, @msg) = @_;
3173
3174	if ($self->extcmd == 2) {
3175	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3176	} elsif ($self->extcmd == 1) {
3177	#TODO: version 1, remove
3178	unshift @msg, msgtype => "reply", msgid => $id;
3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3180	}
3181	}	3262	}
3182		3263
3183	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3184		3265
3185	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3240	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3241		3322
3242	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3243		3324
3244	if (ref $msg) {	3325	if (ref $msg) {
3245	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3246	"ARRAY" eq ref $msg
3247	? @$msg
3248	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3249		3327
3250	my @reply;
3251
3252	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}) {
3253	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3254	}	3346	}
3255
3256	$ns->ext_reply ($reply, @reply)
3257	if $reply;
3258
3259	} else {	3347	} else {
3260	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";
3261	}	3349	}
3262		3350
3263	cf::override;	3351	cf::override;
…		…
3431	=cut	3519	=cut
3432		3520
3433	#############################################################################	3521	#############################################################################
3434	# the server's init and main functions	3522	# the server's init and main functions
3435		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525	our @FACEDATA; # dynamically-created facedata
		3526
		3527	# internal api, not fianlised
		3528	sub set_face {
		3529	my ($name, $type, $data) = @_;
		3530
		3531	my $idx = cf::face::find $name;
		3532
		3533	if ($idx) {
		3534	delete $FACEHASH{cf::face::get_chksum $idx};
		3535	} else {
		3536	$idx = cf::face::alloc $name;
		3537	}
		3538
		3539	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3540
		3541	cf::face::set_type $idx, $type;
		3542	cf::face::set_data $idx, 0, (length $data), 0, $hash;
		3543	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3544
		3545	# we need to destroy the SV itself, not just overwrite,
		3546	# as a running ix might hold a reference to it.
		3547	# delete achieves that.
		3548	delete $FACEDATA[$idx];
		3549	$FACEDATA[$idx] = $data;
		3550	$FACEHASH{$hash} = $idx;#d#
		3551
		3552	$idx
		3553	}
		3554
		3555	our $FACEDATA; # facedata filehandle
		3556
		3557	sub _face_get_data($$$$) {
		3558	my ($idx, $size, $fofs, $cb) = @_;
		3559
		3560	if (defined $FACEDATA[$idx]) {
		3561	$cb->($FACEDATA[$idx]);
		3562	} elsif ($fofs) {
		3563	my $buf;
		3564	IO::AIO::aio_read $FACEDATA, $fofs, $size, $buf, 0, sub {
		3565	if ($_[0] == $size) {
		3566	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3567	$cb->($buf);
		3568	} else {
		3569	cf::error "INTERNAL ERROR: unable to read facedata for face $idx ($size, $fofs), ignoring request.";
		3570	}
		3571	};
		3572	} else {
		3573	cf::error "requested facedata for unknown face $idx ($size, $fofs), ignoring.";
		3574	}
		3575	}
		3576
		3577	# rather ineffient
		3578	sub cf::face::get_data($;$) {
		3579	my ($idx, $faceset) = @_;
		3580
		3581	my $size = cf::face::get_size $idx, $faceset;
		3582	my $fofs = cf::face::get_fofs $idx, $faceset;
		3583
		3584	_face_get_data $idx, $size, $fofs, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $idx, $pri, $size, $fofs) = @_;
		3590
		3591	_face_get_data $idx, $size, $fofs, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595
3436	sub load_facedata($) {	3596	sub load_facedata($) {
3437	my ($path) = @_;	3597	my ($path) = @_;
3438		3598
3439	# HACK to clear player env face cache, we need some signal framework
3440	# for this (global event?)
3441	%ext::player_env::MUSIC_FACE_CACHE = ();
3442
3443	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3444		3600
3445	trace "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3446		3602
3447	my $facedata = decode_storable load_file $path;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3448		3604
3449	$facedata->{version} == 2	3605	$facedata->{version} == 2
3450	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3451		3607
3452	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3453	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3454	$facedata->{resource}{"res/exp_table"} = {	3610
3455	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3456	data => $exp_table,	3612
3457	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3458	};	3614	# from here on, everything must be atomic - no thread switch allowed
3459	cf::cede_to_tick;	3615	my $t1 = EV::time;
3460		3616
3461	{	3617	{
3462	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3463		3619
3464	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3465	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3466		3623
3467	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3468	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3469	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3470	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3471	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3628	#cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph}; # glyphs no longer downloadable via ix
3472		3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3473	cf::cede_to_tick;
3474	}	3630	}
3475		3631
3476	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3477	next unless $info->{smooth};	3633	next unless $info->{smooth};
3478		3634
…		…
3483	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3484	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3485	} else {	3641	} else {
3486	error "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3487	}	3643	}
3488
3489	cf::cede_to_tick;
3490	}	3644	}
3491	}	3645	}
3492		3646
3493	{	3647	{
3494	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3495		3649
3496	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3497	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3498	cf::cede_to_tick;
3499	}	3652	}
3500		3653
3501	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3502	}	3655	}
3503		3656
3504	{	3657	{
3505	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3506		3659
3507	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3508	if (defined $info->{type}) {	3661	if (defined (my $type = $info->{type})) {
		3662	# TODO: different hash - must free and use new index, or cache ixface data queue
3509	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3510		3664
3511	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3512	cf::face::set_type $idx, $info->{type};	3665	cf::face::set_type $idx, $type;
		3666	cf::face::set_data $idx, 0, $info->{size}, $info->{fofs}, $info->{hash};
		3667	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3668	$FACEHASH{$info->{hash}} = $idx;#d#
3513	} else {	3669	} else {
3514	$RESOURCE{$name} = $info; # unused	3670	# $RESOURCE{$name} = $info; # unused
3515	}	3671	}
3516
3517	cf::cede_to_tick;
3518	}	3672	}
3519	}	3673	}
		3674
		3675	($fh, $FACEDATA) = ($FACEDATA, $fh);
		3676
		3677	# HACK to clear player env face cache, we need some signal framework
		3678	# for this (global event?)
		3679	%ext::player_env::MUSIC_FACE_CACHE = ();
		3680
		3681	# END ATOMIC
		3682
		3683	cf::debug "facedata atomic update time ", EV::time - $t1;
3520		3684
3521	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3685	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3686
		3687	aio_close $fh if $fh; # close old facedata
3522		3688
3523	1	3689	1
3524	}	3690	}
3525		3691
3526	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
…		…
3537	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3538	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3539	cf::arch::commit_load;	3705	cf::arch::commit_load;
3540		3706
3541	$status	3707	$status
		3708	}
		3709
		3710	sub reload_exp_table {
		3711	_reload_exp_table;
		3712
		3713	set_face "res/exp_table" => FT_RSRC,
		3714	JSON::XS->new->utf8->canonical->encode (
		3715	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3716	);
		3717	}
		3718
		3719	sub reload_materials {
		3720	_reload_materials;
3542	}	3721	}
3543		3722
3544	sub reload_regions {	3723	sub reload_regions {
3545	# HACK to clear player env face cache, we need some signal framework	3724	# HACK to clear player env face cache, we need some signal framework
3546	# for this (global event?)	3725	# for this (global event?)
…		…
3554	if exists $_->{match};	3733	if exists $_->{match};
3555	}	3734	}
3556	}	3735	}
3557		3736
3558	sub reload_facedata {	3737	sub reload_facedata {
3559	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3560	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3561	}	3740	}
3562		3741
3563	sub reload_archetypes {	3742	sub reload_archetypes {
3564	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3565	or die "unable to load archetypes\n";	3744	or die "unable to load archetypes\n";
		3745
		3746	set_face "res/skill_info" => FT_RSRC,
		3747	JSON::XS->new->utf8->canonical->encode (
		3748	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3749	);
		3750	set_face "res/spell_paths" => FT_RSRC,
		3751	JSON::XS->new->utf8->canonical->encode (
		3752	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3753	);
3566	}	3754	}
3567		3755
3568	sub reload_treasures {	3756	sub reload_treasures {
3569	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3570	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
…		…
3591	}	3779	}
3592		3780
3593	sub reload_resources {	3781	sub reload_resources {
3594	trace "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3595		3783
3596	reload_exp_table;
3597	reload_materials;	3784	reload_materials;
3598	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
3599	reload_sound;	3787	reload_sound;
3600	reload_archetypes;	3788	reload_archetypes;
3601	reload_regions;	3789	reload_regions;
3602	reload_treasures;	3790	reload_treasures;
3603		3791
…		…
3655		3843
3656	sub main {	3844	sub main {
3657	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3658		3846
3659	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3660	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3661	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3662	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3663		3851
3664	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3852	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3665		3853
3666	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3667	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3668	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3856	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3669	(async {	3857	(async {
3670	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3671	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3672	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
…		…
3675	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3676		3864
3677	cf::sync_job {	3865	cf::sync_job {
3678	cf::incloader::init ();	3866	cf::incloader::init ();
3679		3867
		3868	db_init;
		3869
3680	cf::init_anim;	3870	cf::init_anim;
3681	cf::init_attackmess;	3871	cf::init_attackmess;
3682	cf::init_dynamic;	3872	cf::init_dynamic;
3683		3873
3684	cf::load_settings;	3874	cf::load_settings;
3685		3875
3686	reload_resources;	3876	reload_resources;
3687	reload_config;	3877	reload_config;
3688	db_init;
3689		3878
3690	cf::init_uuid;	3879	cf::init_uuid;
3691	cf::init_signals;	3880	cf::init_signals;
3692	cf::init_skills;	3881	cf::init_skills;
3693		3882
…		…
3707	};	3896	};
3708		3897
3709	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3710	info "parse errors in files are no longer fatal from this point on.\n";	3899	info "parse errors in files are no longer fatal from this point on.\n";
3711		3900
3712	my $free_main; $free_main = EV::idle sub {	3901	AE::postpone {
3713	undef $free_main;
3714	undef &main; # free gobs of memory :)	3902	undef &main; # free gobs of memory :)
3715	};	3903	};
3716		3904
3717	goto &main_loop;	3905	goto &main_loop;
3718	}	3906	}
…		…
3875		4063
3876	cf::write_runtime_sync; # external watchdog should not bark	4064	cf::write_runtime_sync; # external watchdog should not bark
3877		4065
3878	trace "emergency_perl_save: flushing outstanding aio requests";	4066	trace "emergency_perl_save: flushing outstanding aio requests";
3879	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4067	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3880	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4068	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3881	}	4069	}
3882		4070
3883	cf::write_runtime_sync; # external watchdog should not bark	4071	cf::write_runtime_sync; # external watchdog should not bark
3884	};	4072	};
3885		4073
…		…
4066		4254
4067	#############################################################################	4255	#############################################################################
4068		4256
4069	my $bug_warning = 0;	4257	my $bug_warning = 0;
4070		4258
4071	our @WAIT_FOR_TICK;
4072	our @WAIT_FOR_TICK_BEGIN;
4073
4074	sub wait_for_tick() {	4259	sub wait_for_tick() {
4075	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4076		4261
4077	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
4078	push @WAIT_FOR_TICK, $signal;
4079	$signal->wait;
4080	}	4263	}
4081		4264
4082	sub wait_for_tick_begin() {	4265	sub wait_for_tick_begin() {
4083	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4084		4267
4085	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
4086	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
4087	$signal->wait;	4270	$signal->wait;
4088	}	4271	}
…		…
4092	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4275	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4093	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
4094	return;	4277	return;
4095	}	4278	}
4096		4279
4097	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
4098		4281
4099	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4282	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4100		4283
4101	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4102	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4285	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4108	}	4291	}
4109		4292
4110	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4111	$sig->send;	4294	$sig->send;
4112	}	4295	}
4113	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
4114	$sig->send;
4115	}
4116		4297
4117	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
4118	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4119		4300
4120	if (0) {	4301	if (0) {
…		…
4126	}	4307	}
4127	}	4308	}
4128		4309
4129	{	4310	{
4130	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4131		4313
4132	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4133	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4134	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4135		4317
4136	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4137	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4138	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4139	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4321	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4164	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4165	};	4347	};
4166	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4167	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4168	};	4350	};
		4351
		4352	info "database initialised";
4169	}	4353	}
4170		4354
4171	{	4355	{
4172	# configure IO::AIO	4356	# configure IO::AIO
4173		4357
		4358	info "initialising aio";
4174	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4175	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4176	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4177	}	4363	}
4178		4364
4179	our $_log_backtrace;	4365	our $_log_backtrace;
4180	our $_log_backtrace_last;	4366	our $_log_backtrace_last;
4181		4367

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs. Revision 1.600 by root, Sun Nov 11 04:31:57 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.560 by root, Fri Apr 22 02:03:12 2011 UTC vs.
Revision 1.600 by root, Sun Nov 11 04:31:57 2012 UTC