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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.568 by root, Tue May 3 17:12:14 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,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
58	use IO::AIO ();	62	use IO::AIO ();
59	use Time::HiRes;
60	use Compress::LZF;	63	use Compress::LZF;
61	use Digest::MD5 ();	64	use Digest::MD5 ();
62		65
63	AnyEvent::detect;	66	AnyEvent::detect;
64		67
…		…
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
…		…
108	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
109	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
110	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
111	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
112		117
113	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
114		119
115	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
116	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
117		122
118	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
129	our $DB_ENV;	134	our $DB_ENV;
130		135
131	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
132		137
133	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
134		140
135	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
136	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
137	our $NOW;	144	our $NOW;
138		145
139	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
140	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
141	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
150		157
151	our @POST_INIT;	158	our @POST_INIT;
152		159
153	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
154	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
155		165
156	binmode STDOUT;	166	binmode STDOUT;
157	binmode STDERR;	167	binmode STDERR;
158		168
159	# read virtual server time, if available	169	# read virtual server time, if available
…		…
193		203
194	=over 4	204	=over 4
195		205
196	=item $cf::UPTIME	206	=item $cf::UPTIME
197		207
198	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
199		224
200	=item $cf::RUNTIME	225	=item $cf::RUNTIME
201		226
202	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
203	every server tick.	228	every server tick.
204		229
205	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
206	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
207	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
208		233
209	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
210	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
211	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
212	database environment.	237	database environment.
213		238
214	=item $cf::NOW
215
216	The time of the last (current) server tick.
217
218	=item $cf::TICK
219
220	The interval between server ticks, in seconds.
221
222	=item $cf::LOADAVG	239	=item $cf::LOADAVG
223		240
224	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
225	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
226	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
234	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
235	from wherever your confdir points to.	252	from wherever your confdir points to.
236		253
237	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
238		255
239	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
242		272
243	=cut	273	=cut
244		274
245	sub wait_for_tick();	275	sub wait_for_tick();
246	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
312	)) {	342	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	344	}
315		345
316	$EV::DIED = sub {	346	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
318	};	348	};
319		349
320	#############################################################################	350	#############################################################################
321		351
322	sub fork_call(&@);	352	sub fork_call(&@);
…		…
349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350	$d	380	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
352	}	382	}
353		383
354	=item $scalar = load_file $path	384	=item $scalar = cf::load_file $path
355		385
356	Loads the given file from path and returns its contents. Croaks on error	386	Loads the given file from path and returns its contents. Croaks on error
357	and can block.	387	and can block.
358		388
359	=cut	389	=cut
…		…
361	sub load_file($) {	391	sub load_file($) {
362	0 <= aio_load $_[0], my $data	392	0 <= aio_load $_[0], my $data
363	or Carp::croak "$_[0]: $!";	393	or Carp::croak "$_[0]: $!";
364		394
365	$data	395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
366	}	434	}
367		435
368	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
369		437
370	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
…		…
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
…		…
2171		2276
2172	{	2277	{
2173	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2174		2279
2175	return unless $self->valid;	2280	return unless $self->valid;
2176	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2177
2178	$self->in_memory (cf::MAP_LOADING);
2179		2282
2180	$self->alloc;	2283	$self->alloc;
2181		2284
2182	$self->pre_load;	2285	$self->pre_load;
2183	cf::cede_to_tick;	2286	cf::cede_to_tick;
…		…
2206	} else {	2309	} else {
2207	$self->post_load_original	2310	$self->post_load_original
2208	if delete $self->{load_original};	2311	if delete $self->{load_original};
2209	}	2312	}
2210		2313
		2314	$self->state (cf::MAP_INACTIVE);
		2315
2211	cf::cede_to_tick;	2316	cf::cede_to_tick;
2212	# now do the right thing for maps	2317	# now do the right thing for maps
2213	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2214	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
2215	unless $self->difficulty;	2320	unless $self->difficulty;
…		…
2223	#$self->activate; # no longer activate maps automatically	2328	#$self->activate; # no longer activate maps automatically
2224	}	2329	}
2225		2330
2226	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2227	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2228
2229	$self->in_memory (cf::MAP_ACTIVE);
2230	}	2333	}
2231		2334
2232	$self->post_load;	2335	$self->post_load;
2233		2336
2234	1	2337	1
…		…
2247	# if $self->per_party;	2350	# if $self->per_party;
2248		2351
2249	$self	2352	$self
2250	}	2353	}
2251		2354
2252	# find and load all maps in the 3x3 area around a map
2253	sub load_neighbours {
2254	my ($map) = @_;
2255
2256	my @neigh; # diagonal neighbours
2257
2258	for (0 .. 3) {
2259	my $neigh = $map->tile_path ($_)
2260	or next;
2261	$neigh = find $neigh, $map
2262	or next;
2263	$neigh->load;
2264
2265	# now find the diagonal neighbours
2266	push @neigh,
2267	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2268	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2269	}
2270
2271	for (grep defined $_->[0], @neigh) {
2272	my ($path, $origin) = @$_;
2273	my $neigh = find $path, $origin
2274	or next;
2275	$neigh->load;
2276	}
2277	}
2278
2279	sub find_sync {	2355	sub find_sync {
2280	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2281		2357
		2358	# it's a bug to call this from the main context
2282	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2283	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2284		2361
2285	find $path, $origin	2362	find $path, $origin
2286	}	2363	}
2287		2364
2288	sub do_load_sync {	2365	sub do_load_sync {
2289	my ($map) = @_;	2366	my ($map) = @_;
2290		2367
		2368	# it's a bug to call this from the main context
2291	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2292	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2293		2371
2294	$map->load;	2372	$map->load;
2295	}	2373	}
…		…
2301	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2302		2380
2303	$path = normalise $path, $origin;	2381	$path = normalise $path, $origin;
2304		2382
2305	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2306	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load \|\| $map->linkable;
2307	}	2385	}
2308		2386
2309	$MAP_PREFETCH{$path} \|= $load;	2387	$MAP_PREFETCH{$path} \|= $load;
2310		2388
2311	$MAP_PREFETCHER \|\|= cf::async {	2389	$MAP_PREFETCHER \|\|= cf::async {
…		…
2370	sub swap_out {	2448	sub swap_out {
2371	my ($self) = @_;	2449	my ($self) = @_;
2372		2450
2373	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2374		2452
2375	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2376	return if $self->{deny_save};	2454	return if $self->{deny_save};
2377	return if $self->players;	2455	return if $self->players;
2378		2456
2379	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2380	$self->deactivate;	2458	$self->deactivate;
2381	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2382	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2383		2461
2384	# then atomically save	2462	# then atomically save
2385	$self->_save;	2463	$self->_save;
2386		2464
2387	# then free the map	2465	# then free the map
…		…
2413		2491
2414	return if $self->players;	2492	return if $self->players;
2415		2493
2416	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2417		2495
2418	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2419		2497
2420	# need to save uniques path	2498	# need to save uniques path
2421	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2422	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2423		2501
…		…
2753	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2754	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2755	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2756		2834
2757	$map->load;	2835	$map->load;
2758	$map->load_neighbours;
2759		2836
2760	return unless $self->contr->active;	2837	return unless $self->contr->active;
2761		2838
2762	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2763	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2931	# special map handling	3008	# special map handling
2932	if ($slaying eq "/!") {	3009	if ($slaying eq "/!") {
2933	my $guard = cf::lock_acquire "exit_prepare:$exit";	3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
2934		3011
2935	prepare_random_map $exit	3012	prepare_random_map $exit
2936	if $slaying eq "/!"; # need to re-check after getting the lock	3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
2937		3016
2938	} elsif ($slaying eq '!up') {	3017	} elsif ($slaying eq '!up') {
2939	$map = $exit->map->tile_path (cf::TILE_UP);	3018	$map = $exit->map->tile_path (cf::TILE_UP);
2940	$x = $exit->x;	3019	$x = $exit->x;
2941	$y = $exit->y;	3020	$y = $exit->y;
…		…
3177	=cut	3256	=cut
3178		3257
3179	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3180	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3181		3260
3182	if ($self->extcmd == 2) {
3183	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3184	} elsif ($self->extcmd == 1) { # TODO: remove
3185	push @msg, msgtype => "event_$type";
3186	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3187	}
3188	}
3189
3190	=item $client->ext_reply ($msgid, @msg)
3191
3192	Sends an ext reply to the client.
3193
3194	=cut
3195
3196	sub cf::client::ext_reply($$@) {
3197	my ($self, $id, @msg) = @_;
3198
3199	if ($self->extcmd == 2) {
3200	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3201	} elsif ($self->extcmd == 1) {
3202	#TODO: version 1, remove
3203	unshift @msg, msgtype => "reply", msgid => $id;
3204	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3205	}
3206	}	3262	}
3207		3263
3208	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3209		3265
3210	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3265	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3266		3322
3267	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3268		3324
3269	if (ref $msg) {	3325	if (ref $msg) {
3270	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3271	"ARRAY" eq ref $msg
3272	? @$msg
3273	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3274		3327
3275	my @reply;
3276
3277	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}) {
3278	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3279	}	3346	}
3280
3281	$ns->ext_reply ($reply, @reply)
3282	if $reply;
3283
3284	} else {	3347	} else {
3285	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";
3286	}	3349	}
3287		3350
3288	cf::override;	3351	cf::override;
…		…
3456	=cut	3519	=cut
3457		3520
3458	#############################################################################	3521	#############################################################################
3459	# the server's init and main functions	3522	# the server's init and main functions
3460		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
3461	sub load_facedata($) {	3596	sub load_facedata($) {
3462	my ($path) = @_;	3597	my ($path) = @_;
3463		3598
3464	# HACK to clear player env face cache, we need some signal framework
3465	# for this (global event?)
3466	%ext::player_env::MUSIC_FACE_CACHE = ();
3467
3468	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3599	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3469		3600
3470	trace "loading facedata from $path\n";	3601	trace "loading facedata from $path\n";
3471		3602
3472	my $facedata = decode_storable load_file $path;	3603	my $facedata = decode_storable load_file "$path/faceinfo";
3473		3604
3474	$facedata->{version} == 2	3605	$facedata->{version} == 2
3475	or cf::cleanup "$path: version mismatch, cannot proceed.";	3606	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3476		3607
3477	# patch in the exptable	3608	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3478	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3609	or cf::cleanup "$path/facedata: $!, cnanot proceed.";
3479	$facedata->{resource}{"res/exp_table"} = {	3610
3480	type => FT_RSRC,	3611	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3481	data => $exp_table,	3612
3482	hash => (Digest::MD5::md5 $exp_table),	3613	# BEGIN ATOMIC
3483	};	3614	# from here on, everything must be atomic - no thread switch allowed
3484	cf::cede_to_tick;	3615	my $t1 = EV::time;
3485		3616
3486	{	3617	{
3487	my $faces = $facedata->{faceinfo};	3618	my $faces = $facedata->{faceinfo};
3488		3619
3489	while (my ($face, $info) = each %$faces) {	3620	for my $face (sort keys %$faces) {
		3621	my $info = $faces->{$face};
3490	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3622	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3491		3623
3492	cf::face::set_visibility $idx, $info->{visibility};	3624	cf::face::set_visibility $idx, $info->{visibility};
3493	cf::face::set_magicmap $idx, $info->{magicmap};	3625	cf::face::set_magicmap $idx, $info->{magicmap};
3494	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3626	cf::face::set_data $idx, 0, $info->{size32}, $info->{fofs32}, $info->{hash32};
3495	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3627	cf::face::set_data $idx, 1, $info->{size64}, $info->{fofs64}, $info->{hash64};
3496	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
3497		3629	$FACEHASH{$info->{hash64}} = $idx;#d#
3498	cf::cede_to_tick;
3499	}	3630	}
3500		3631
3501	while (my ($face, $info) = each %$faces) {	3632	while (my ($face, $info) = each %$faces) {
3502	next unless $info->{smooth};	3633	next unless $info->{smooth};
3503		3634
…		…
3508	cf::face::set_smooth $idx, $smooth;	3639	cf::face::set_smooth $idx, $smooth;
3509	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3640	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3510	} else {	3641	} else {
3511	error "smooth face '$info->{smooth}' not found for face '$face'";	3642	error "smooth face '$info->{smooth}' not found for face '$face'";
3512	}	3643	}
3513
3514	cf::cede_to_tick;
3515	}	3644	}
3516	}	3645	}
3517		3646
3518	{	3647	{
3519	my $anims = $facedata->{animinfo};	3648	my $anims = $facedata->{animinfo};
3520		3649
3521	while (my ($anim, $info) = each %$anims) {	3650	while (my ($anim, $info) = each %$anims) {
3522	cf::anim::set $anim, $info->{frames}, $info->{facings};	3651	cf::anim::set $anim, $info->{frames}, $info->{facings};
3523	cf::cede_to_tick;
3524	}	3652	}
3525		3653
3526	cf::anim::invalidate_all; # d'oh	3654	cf::anim::invalidate_all; # d'oh
3527	}	3655	}
3528		3656
3529	{	3657	{
3530	my $res = $facedata->{resource};	3658	my $res = $facedata->{resource};
3531		3659
3532	while (my ($name, $info) = each %$res) {	3660	while (my ($name, $info) = each %$res) {
3533	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
3534	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3663	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3535		3664
3536	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3537	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#
3538	} else {	3669	} else {
3539	$RESOURCE{$name} = $info; # unused	3670	# $RESOURCE{$name} = $info; # unused
3540	}	3671	}
3541
3542	cf::cede_to_tick;
3543	}	3672	}
3544	}	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;
3545		3684
3546	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
3547		3688
3548	1	3689	1
3549	}	3690	}
3550		3691
3551	register_exticmd fx_want => sub {	3692	register_exticmd fx_want => sub {
…		…
3562	my $status = load_resource_file_ $_[0];	3703	my $status = load_resource_file_ $_[0];
3563	get_slot 0.1, 100;	3704	get_slot 0.1, 100;
3564	cf::arch::commit_load;	3705	cf::arch::commit_load;
3565		3706
3566	$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;
3567	}	3721	}
3568		3722
3569	sub reload_regions {	3723	sub reload_regions {
3570	# 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
3571	# for this (global event?)	3725	# for this (global event?)
…		…
3579	if exists $_->{match};	3733	if exists $_->{match};
3580	}	3734	}
3581	}	3735	}
3582		3736
3583	sub reload_facedata {	3737	sub reload_facedata {
3584	load_facedata "$DATADIR/facedata"	3738	load_facedata $DATADIR
3585	or die "unable to load facedata\n";	3739	or die "unable to load facedata\n";
3586	}	3740	}
3587		3741
3588	sub reload_archetypes {	3742	sub reload_archetypes {
3589	load_resource_file "$DATADIR/archetypes"	3743	load_resource_file "$DATADIR/archetypes"
3590	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	);
3591	}	3754	}
3592		3755
3593	sub reload_treasures {	3756	sub reload_treasures {
3594	load_resource_file "$DATADIR/treasures"	3757	load_resource_file "$DATADIR/treasures"
3595	or die "unable to load treasurelists\n";	3758	or die "unable to load treasurelists\n";
…		…
3616	}	3779	}
3617		3780
3618	sub reload_resources {	3781	sub reload_resources {
3619	trace "reloading resource files...\n";	3782	trace "reloading resource files...\n";
3620		3783
3621	reload_exp_table;
3622	reload_materials;	3784	reload_materials;
3623	reload_facedata;	3785	reload_facedata;
		3786	reload_exp_table;
3624	reload_sound;	3787	reload_sound;
3625	reload_archetypes;	3788	reload_archetypes;
3626	reload_regions;	3789	reload_regions;
3627	reload_treasures;	3790	reload_treasures;
3628		3791
…		…
3680		3843
3681	sub main {	3844	sub main {
3682	cf::init_globals; # initialise logging	3845	cf::init_globals; # initialise logging
3683		3846
3684	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3847	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3685	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3848	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3686	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3849	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3687	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3850	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3688		3851
3689	$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
3690		3853
3691	# we must not ever block the main coroutine	3854	# we must not ever block the main coroutine
3692	local $Coro::idle = sub {	3855	$Coro::idle = sub {
3693	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#
3694	(async {	3857	(async {
3695	$Coro::current->{desc} = "IDLE BUG HANDLER";	3858	$Coro::current->{desc} = "IDLE BUG HANDLER";
3696	EV::loop EV::LOOP_ONESHOT;	3859	EV::loop EV::LOOP_ONESHOT;
3697	})->prio (Coro::PRIO_MAX);	3860	})->prio (Coro::PRIO_MAX);
…		…
3700	evthread_start IO::AIO::poll_fileno;	3863	evthread_start IO::AIO::poll_fileno;
3701		3864
3702	cf::sync_job {	3865	cf::sync_job {
3703	cf::incloader::init ();	3866	cf::incloader::init ();
3704		3867
		3868	db_init;
		3869
3705	cf::init_anim;	3870	cf::init_anim;
3706	cf::init_attackmess;	3871	cf::init_attackmess;
3707	cf::init_dynamic;	3872	cf::init_dynamic;
3708		3873
3709	cf::load_settings;	3874	cf::load_settings;
3710		3875
3711	reload_resources;	3876	reload_resources;
3712	reload_config;	3877	reload_config;
3713	db_init;
3714		3878
3715	cf::init_uuid;	3879	cf::init_uuid;
3716	cf::init_signals;	3880	cf::init_signals;
3717	cf::init_skills;	3881	cf::init_skills;
3718		3882
…		…
3732	};	3896	};
3733		3897
3734	cf::object::thawer::errors_are_fatal 0;	3898	cf::object::thawer::errors_are_fatal 0;
3735	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";
3736		3900
3737	my $free_main; $free_main = EV::idle sub {	3901	AE::postpone {
3738	undef $free_main;
3739	undef &main; # free gobs of memory :)	3902	undef &main; # free gobs of memory :)
3740	};	3903	};
3741		3904
3742	goto &main_loop;	3905	goto &main_loop;
3743	}	3906	}
…		…
3900		4063
3901	cf::write_runtime_sync; # external watchdog should not bark	4064	cf::write_runtime_sync; # external watchdog should not bark
3902		4065
3903	trace "emergency_perl_save: flushing outstanding aio requests";	4066	trace "emergency_perl_save: flushing outstanding aio requests";
3904	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4067	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3905	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
3906	}	4069	}
3907		4070
3908	cf::write_runtime_sync; # external watchdog should not bark	4071	cf::write_runtime_sync; # external watchdog should not bark
3909	};	4072	};
3910		4073
…		…
4091		4254
4092	#############################################################################	4255	#############################################################################
4093		4256
4094	my $bug_warning = 0;	4257	my $bug_warning = 0;
4095		4258
4096	our @WAIT_FOR_TICK;
4097	our @WAIT_FOR_TICK_BEGIN;
4098
4099	sub wait_for_tick() {	4259	sub wait_for_tick() {
4100	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4260	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4101		4261
4102	my $signal = new Coro::Signal;	4262	$WAIT_FOR_TICK->wait;
4103	push @WAIT_FOR_TICK, $signal;
4104	$signal->wait;
4105	}	4263	}
4106		4264
4107	sub wait_for_tick_begin() {	4265	sub wait_for_tick_begin() {
4108	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4266	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4109		4267
4110	my $signal = new Coro::Signal;	4268	my $signal = new Coro::Signal;
4111	push @WAIT_FOR_TICK_BEGIN, $signal;	4269	push @WAIT_FOR_TICK_BEGIN, $signal;
4112	$signal->wait;	4270	$signal->wait;
4113	}	4271	}
…		…
4117	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"
4118	unless ++$bug_warning > 10;	4276	unless ++$bug_warning > 10;
4119	return;	4277	return;
4120	}	4278	}
4121		4279
4122	cf::server_tick; # one server iteration	4280	cf::one_tick; # one server iteration
4123		4281
4124	#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#
4125		4283
4126	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4284	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4127	$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.;
…		…
4133	}	4291	}
4134		4292
4135	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4293	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4136	$sig->send;	4294	$sig->send;
4137	}	4295	}
4138	while (my $sig = shift @WAIT_FOR_TICK) {	4296	$WAIT_FOR_TICK->broadcast;
4139	$sig->send;
4140	}
4141		4297
4142	$LOAD = ($NOW - $TICK_START) / $TICK;	4298	$LOAD = ($NOW - $TICK_START) / $TICK;
4143	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4299	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4144		4300
4145	if (0) {	4301	if (0) {
…		…
4151	}	4307	}
4152	}	4308	}
4153		4309
4154	{	4310	{
4155	# configure BDB	4311	# configure BDB
		4312	info "initialising database";
4156		4313
4157	BDB::min_parallel 16;	4314	BDB::min_parallel 16;
4158	BDB::max_poll_reqs $TICK * 0.1;	4315	BDB::max_poll_reqs $TICK * 0.1;
4159	$AnyEvent::BDB::WATCHER->priority (1);	4316	#$AnyEvent::BDB::WATCHER->priority (1);
4160		4317
4161	unless ($DB_ENV) {	4318	unless ($DB_ENV) {
4162	$DB_ENV = BDB::db_env_create;	4319	$DB_ENV = BDB::db_env_create;
4163	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4320	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4164	$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;
…		…
4189	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4346	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4190	};	4347	};
4191	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4348	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4192	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4349	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4193	};	4350	};
		4351
		4352	info "database initialised";
4194	}	4353	}
4195		4354
4196	{	4355	{
4197	# configure IO::AIO	4356	# configure IO::AIO
4198		4357
		4358	info "initialising aio";
4199	IO::AIO::min_parallel 8;	4359	IO::AIO::min_parallel 8;
4200	IO::AIO::max_poll_time $TICK * 0.1;	4360	IO::AIO::max_poll_time $TICK * 0.1;
4201	undef $AnyEvent::AIO::WATCHER;	4361	undef $AnyEvent::AIO::WATCHER;
		4362	info "aio initialised";
4202	}	4363	}
4203		4364
4204	our $_log_backtrace;	4365	our $_log_backtrace;
4205	our $_log_backtrace_last;	4366	our $_log_backtrace_last;
4206		4367

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.568 by root, Tue May 3 17:12:14 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.568 by root, Tue May 3 17:12:14 2011 UTC vs.
Revision 1.600 by root, Sun Nov 11 04:31:57 2012 UTC