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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 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.
…		…
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. cf::wait_for_tick_begin only
240	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	returns directly I<after> the tick processing (and consequently, can only wake one thread
241	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	258	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		259
		260	Note that cf::Wait_for_tick will immediately return when the server is not
		261	ticking, making it suitable for small pauses in threads that need to run
		262	when the server is paused. If that is not applicable (i.e. you I<really>
		263	want to wait, use C<$cf::WAIT_FOR_TICK>).
		264
		265	=item $cf::WAIT_FOR_TICK
		266
		267	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		268	variable contains a L<Coro::Signal> that is broadcats after every server
		269	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		270	next server tick.
242		271
243	=cut	272	=cut
244		273
245	sub wait_for_tick();	274	sub wait_for_tick();
246	sub wait_for_tick_begin();	275	sub wait_for_tick_begin();
…		…
312	)) {	341	)) {
313	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
314	}	343	}
315		344
316	$EV::DIED = sub {	345	$EV::DIED = sub {
317	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
318	};	347	};
319		348
320	#############################################################################	349	#############################################################################
321		350
322	sub fork_call(&@);	351	sub fork_call(&@);
…		…
349	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	378	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
350	$d	379	$d
351	} \|\| "[unable to dump $_[0]: '$@']";	380	} \|\| "[unable to dump $_[0]: '$@']";
352	}	381	}
353		382
354	=item $scalar = load_file $path	383	=item $scalar = cf::load_file $path
355		384
356	Loads the given file from path and returns its contents. Croaks on error	385	Loads the given file from path and returns its contents. Croaks on error
357	and can block.	386	and can block.
358		387
359	=cut	388	=cut
…		…
361	sub load_file($) {	390	sub load_file($) {
362	0 <= aio_load $_[0], my $data	391	0 <= aio_load $_[0], my $data
363	or Carp::croak "$_[0]: $!";	392	or Carp::croak "$_[0]: $!";
364		393
365	$data	394	$data
		395	}
		396
		397	=item $success = cf::replace_file $path, $data, $sync
		398
		399	Atomically replaces the file at the given $path with new $data, and
		400	optionally $sync the data to disk before replacing the file.
		401
		402	=cut
		403
		404	sub replace_file($$;$) {
		405	my ($path, $data, $sync) = @_;
		406
		407	my $lock = cf::lock_acquire ("replace_file:$path");
		408
		409	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		410	or return;
		411
		412	$data = $data->() if ref $data;
		413
		414	length $data == aio_write $fh, 0, (length $data), $data, 0
		415	or return;
		416
		417	!$sync
		418	or !aio_fsync $fh
		419	or return;
		420
		421	aio_close $fh
		422	and return;
		423
		424	aio_rename "$path~", $path
		425	and return;
		426
		427	if ($sync) {
		428	$path =~ s%/[^/]*$%%;
		429	aio_pathsync $path;
		430	}
		431
		432	1
366	}	433	}
367		434
368	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
369		436
370	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
…		…
545	}	612	}
546	}	613	}
547		614
548	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
549	# we do not use wait_for_tick() as it returns immediately when tick is inactive	616	# we do not use wait_for_tick() as it returns immediately when tick is inactive
550	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
551	$signal->wait;
552	} else {	618	} else {
553	$busy = 0;	619	$busy = 0;
554	Coro::schedule;	620	Coro::schedule;
555	}	621	}
556	}	622	}
…		…
834		900
835	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
836	}	902	}
837	}	903	}
838		904
839	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
840	my $data = $process->(\@data);	906	my $data = $process->(\@data);
841	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
842		908
843	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
844		910
845	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
846	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1366	=cut	1432	=cut
1367		1433
1368	#############################################################################	1434	#############################################################################
1369	# command handling &c	1435	# command handling &c
1370		1436
1371	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1372		1438
1373	Register a callback for execution when the client sends the user command	1439	Register a callback for execution when the client sends the user command
1374	$name.	1440	$name.
1375		1441
1376	=cut	1442	=cut
…		…
1382	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1383		1449
1384	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1385	}	1451	}
1386		1452
1387	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1388		1454
1389	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1390	extcmd packet. Ext commands will be processed in the order they are	1456	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	1457	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	1458	the logged-in player. Ext commands can only be processed after a player
1393	has logged in successfully.	1459	has logged in successfully.
1394		1460
1395	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1396	called.
1397		1462
		1463	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1464
		1465	Same as C<cf::register_extcmd>, but instead of returning values, the
		1466	callback needs to clal the C<$reply> function.
		1467
1398	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1399		1469
1400	Register a callback for execution when the client sends an (asynchronous)	1470	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	1471	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	1472	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	1473	is a client socket. Exti commands can be received anytime, even before
1404	log-in.	1474	log-in.
1405		1475
1406	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1407	called.
1408		1477
1409	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1410		1479
		1480	Same as C<cf::register_extcmd>, but instead of returning values, the
		1481	callback needs to clal the C<$reply> function.
		1482
		1483	=cut
		1484
1411	sub register_extcmd {	1485	sub register_extcmd($$) {
1412	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1413		1487
1414	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1415	}	1489	}
1416		1490
1417	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1418	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1419		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1420	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1421	}	1507	}
1422		1508
1423	use File::Glob ();	1509	use File::Glob ();
1424		1510
1425	cf::player->attach (	1511	cf::player->attach (
…		…
1439	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1440		1526
1441	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1442		1528
1443	if (ref $msg) {	1529	if (ref $msg) {
1444	my ($type, $reply, @payload) =	1530	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		1531
1449	my @reply;
1450
1451	if (my $cb = $EXTCMD{$type}) {	1532	if (my $cb = $EXTACMD{$type}) {
		1533	$cb->(
		1534	$pl,
		1535	sub {
		1536	$pl->ext_msg ("reply-$reply", @_)
		1537	if $reply;
		1538	},
		1539	@payload
		1540	);
		1541	} else {
		1542	my @reply;
		1543
		1544	if (my $cb = $EXTCMD{$type}) {
1452	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1453	}	1550	}
1454
1455	$pl->ext_reply ($reply, @reply)
1456	if $reply;
1457		1551
1458	} else {	1552	} else {
1459	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1460	}	1554	}
1461		1555
…		…
1474	};	1568	};
1475		1569
1476	$grp	1570	$grp
1477	}	1571	}
1478		1572
		1573	sub _ext_cfg_reg($$$$) {
		1574	my ($rvar, $varname, $cfgname, $default) = @_;
		1575
		1576	$cfgname = lc $varname
		1577	unless length $cfgname;
		1578
		1579	$EXT_CFG{$cfgname} = [$rvar, $default];
		1580
		1581	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1582	}
		1583
1479	sub load_extensions {	1584	sub load_extensions {
1480	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1481		1588
1482	cf::sync_job {	1589	cf::sync_job {
1483	my %todo;	1590	my %todo;
1484		1591
1485	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1528	unless exists $done{$_};	1635	unless exists $done{$_};
1529	}	1636	}
1530		1637
1531	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1532		1639
		1640	my $source = $v->{source};
		1641
		1642	# support "CONF varname :confname = default" pseudo-statements
		1643	$source =~ s{
		1644	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1645	}{
		1646	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1647	}gmxe;
		1648
1533	my $active = eval $v->{source};	1649	my $active = eval $source;
1534		1650
1535	if (length $@) {	1651	if (length $@) {
1536	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1537		1653
1538	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1825	}	1941	}
1826		1942
1827	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1828		1944
1829	Expand deliantra pod fragments into protocol xml.	1945	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		1946
1843	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1844		1948
1845	Sends an ext event to the client.	1949	Sends an ext event to the client.
1846		1950
…		…
2069	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
2070		2174
2071	1	2175	1
2072	}	2176	}
2073		2177
		2178	# used to laod the header of an original map
2074	sub load_header_orig {	2179	sub load_header_orig {
2075	my ($self) = @_;	2180	my ($self) = @_;
2076		2181
2077	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2078	}	2183	}
2079		2184
		2185	# used to laod the header of an instantiated map
2080	sub load_header_temp {	2186	sub load_header_temp {
2081	my ($self) = @_;	2187	my ($self) = @_;
2082		2188
2083	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2084	}	2190	}
2085		2191
		2192	# called after loading the header from an instantiated map
2086	sub prepare_temp {	2193	sub prepare_temp {
2087	my ($self) = @_;	2194	my ($self) = @_;
2088		2195
2089	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2090	\|\| $cf::RUNTIME); #d#	2197	\|\| $cf::RUNTIME); #d#
2091	# safety	2198	# safety
2092	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2093	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2094	}	2201	}
2095		2202
		2203	# called after loading the header from an original map
2096	sub prepare_orig {	2204	sub prepare_orig {
2097	my ($self) = @_;	2205	my ($self) = @_;
2098		2206
2099	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2100	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2126	sub find {	2234	sub find {
2127	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2128		2236
2129	cf::cede_to_tick;	2237	cf::cede_to_tick;
2130		2238
2131	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2132		2240
2133	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2134	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2135		2243
2136	$cf::MAP{$path} \|\| do {	2244	$cf::MAP{$path} \|\| do {
…		…
2167		2275
2168	{	2276	{
2169	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2170		2278
2171	return unless $self->valid;	2279	return unless $self->valid;
2172	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2173
2174	$self->in_memory (cf::MAP_LOADING);
2175		2281
2176	$self->alloc;	2282	$self->alloc;
2177		2283
2178	$self->pre_load;	2284	$self->pre_load;
2179	cf::cede_to_tick;	2285	cf::cede_to_tick;
2180		2286
		2287	if (exists $self->{load_path}) {
2181	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2182	$f->skip_block;	2289	$f->skip_block;
2183	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2184	or return;	2291	or return;
2185		2292
2186	$self->post_load_original	2293	$self->post_load_original
2187	if delete $self->{load_original};	2294	if delete $self->{load_original};
2188		2295
2189	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2190	utf8::encode $uniq;	2297	utf8::encode $uniq;
2191	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2192	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2193	$self->clear_unique_items;	2300	$self->clear_unique_items;
2194	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2195	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2196	}	2304	}
2197	}	2305	}
2198	}
2199		2306
2200	$f->resolve_delayed_derefs;	2307	$f->resolve_delayed_derefs;
		2308	} else {
		2309	$self->post_load_original
		2310	if delete $self->{load_original};
		2311	}
		2312
		2313	$self->state (cf::MAP_INACTIVE);
2201		2314
2202	cf::cede_to_tick;	2315	cf::cede_to_tick;
2203	# now do the right thing for maps	2316	# now do the right thing for maps
2204	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2205	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2209	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2210	$self->decay_objects;	2323	$self->decay_objects;
2211	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2212	$self->update_buttons;	2325	$self->update_buttons;
2213	cf::cede_to_tick;	2326	cf::cede_to_tick;
2214	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2215	}	2328	}
2216		2329
2217	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2218	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2219
2220	$self->in_memory (cf::MAP_ACTIVE);
2221	}	2332	}
2222		2333
2223	$self->post_load;	2334	$self->post_load;
2224		2335
2225	1	2336	1
…		…
2238	# if $self->per_party;	2349	# if $self->per_party;
2239		2350
2240	$self	2351	$self
2241	}	2352	}
2242		2353
2243	# find and load all maps in the 3x3 area around a map
2244	sub load_neighbours {
2245	my ($map) = @_;
2246
2247	my @neigh; # diagonal neighbours
2248
2249	for (0 .. 3) {
2250	my $neigh = $map->tile_path ($_)
2251	or next;
2252	$neigh = find $neigh, $map
2253	or next;
2254	$neigh->load;
2255
2256	# now find the diagonal neighbours
2257	push @neigh,
2258	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2259	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2260	}
2261
2262	for (grep defined $_->[0], @neigh) {
2263	my ($path, $origin) = @$_;
2264	my $neigh = find $path, $origin
2265	or next;
2266	$neigh->load;
2267	}
2268	}
2269
2270	sub find_sync {	2354	sub find_sync {
2271	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2272		2356
		2357	# it's a bug to call this from the main context
2273	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2274	if $Coro::current == $Coro::main;	2359	if $Coro::current == $Coro::main;
2275		2360
2276	find $path, $origin	2361	find $path, $origin
2277	}	2362	}
2278		2363
2279	sub do_load_sync {	2364	sub do_load_sync {
2280	my ($map) = @_;	2365	my ($map) = @_;
2281		2366
		2367	# it's a bug to call this from the main context
2282	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2283	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2284		2370
2285	$map->load;	2371	$map->load;
2286	}	2372	}
…		…
2289	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2290		2376
2291	sub find_async {	2377	sub find_async {
2292	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2293		2379
2294	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2295		2381
2296	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2297	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load \|\| $map->linkable;
2298	}	2384	}
2299		2385
2300	$MAP_PREFETCH{$path} \|= $load;	2386	$MAP_PREFETCH{$path} \|= $load;
2301		2387
2302	$MAP_PREFETCHER \|\|= cf::async {	2388	$MAP_PREFETCHER \|\|= cf::async {
…		…
2361	sub swap_out {	2447	sub swap_out {
2362	my ($self) = @_;	2448	my ($self) = @_;
2363		2449
2364	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2365		2451
2366	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2367	return if $self->{deny_save};	2453	return if $self->{deny_save};
2368	return if $self->players;	2454	return if $self->players;
2369		2455
2370	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2371	$self->deactivate;	2457	$self->deactivate;
2372	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2373	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2374		2460
2375	# then atomically save	2461	# then atomically save
2376	$self->_save;	2462	$self->_save;
2377		2463
2378	# then free the map	2464	# then free the map
…		…
2404		2490
2405	return if $self->players;	2491	return if $self->players;
2406		2492
2407	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2408		2494
2409	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2410		2496
2411	# need to save uniques path	2497	# need to save uniques path
2412	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2413	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2414		2500
…		…
2744	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2745	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2746	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2747		2833
2748	$map->load;	2834	$map->load;
2749	$map->load_neighbours;
2750		2835
2751	return unless $self->contr->active;	2836	return unless $self->contr->active;
2752		2837
2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2754	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2810	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2811	}	2896	}
2812	}	2897	}
2813		2898
2814	my $map = eval {	2899	my $map = eval {
2815	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2816		2901
2817	if ($map) {	2902	if ($map) {
2818	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2819	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2820	} else {	2905	} else {
…		…
2910	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2911		2996
2912	unless (eval {	2997	unless (eval {
2913	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2914		2999
2915	# random map handling
2916	{
2917	my $guard = cf::lock_acquire "exit_prepare:$exit";
2918
2919	prepare_random_map $exit
2920	if $exit->slaying eq "/!";
2921	}
2922
2923	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2924	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2925	my $y = $exit->stats->sp;	3002	my $y = $exit->stats->sp;
		3003
		3004	# special map handling
		3005	my $slaying = $exit->slaying;
		3006
		3007	# special map handling
		3008	if ($slaying eq "/!") {
		3009	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3010
		3011	prepare_random_map $exit
		3012	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3013
		3014	$map = $exit->slaying;
		3015
		3016	} elsif ($slaying eq '!up') {
		3017	$map = $exit->map->tile_path (cf::TILE_UP);
		3018	$x = $exit->x;
		3019	$y = $exit->y;
		3020
		3021	} elsif ($slaying eq '!down') {
		3022	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3023	$x = $exit->x;
		3024	$y = $exit->y;
		3025	}
2926		3026
2927	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2928		3028
2929	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2930	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3155	=cut	3255	=cut
3156		3256
3157	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3158	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3159		3259
3160	if ($self->extcmd == 2) {
3161	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3162	} elsif ($self->extcmd == 1) { # TODO: remove
3163	push @msg, msgtype => "event_$type";
3164	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3165	}
3166	}
3167
3168	=item $client->ext_reply ($msgid, @msg)
3169
3170	Sends an ext reply to the client.
3171
3172	=cut
3173
3174	sub cf::client::ext_reply($$@) {
3175	my ($self, $id, @msg) = @_;
3176
3177	if ($self->extcmd == 2) {
3178	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3179	} elsif ($self->extcmd == 1) {
3180	#TODO: version 1, remove
3181	unshift @msg, msgtype => "reply", msgid => $id;
3182	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3183	}
3184	}	3261	}
3185		3262
3186	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3187		3264
3188	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3243	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3244		3321
3245	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3246		3323
3247	if (ref $msg) {	3324	if (ref $msg) {
3248	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3249	"ARRAY" eq ref $msg
3250	? @$msg
3251	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3252		3326
3253	my @reply;
3254
3255	if (my $cb = $EXTICMD{$type}) {	3327	if (my $cb = $EXTIACMD{$type}) {
		3328	$cb->(
		3329	$ns,
		3330	sub {
		3331	$ns->ext_msg ("reply-$reply", @_)
		3332	if $reply;
		3333	},
		3334	@payload
		3335	);
		3336	} else {
		3337	my @reply;
		3338
		3339	if (my $cb = $EXTICMD{$type}) {
3256	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3257	}	3345	}
3258
3259	$ns->ext_reply ($reply, @reply)
3260	if $reply;
3261
3262	} else {	3346	} else {
3263	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3347	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3264	}	3348	}
3265		3349
3266	cf::override;	3350	cf::override;
…		…
3434	=cut	3518	=cut
3435		3519
3436	#############################################################################	3520	#############################################################################
3437	# the server's init and main functions	3521	# the server's init and main functions
3438		3522
		3523	our %FACEHASH; # hash => idx, #d# HACK for http server
		3524
		3525	# internal api, not fianlised
		3526	sub set_face {
		3527	my ($name, $type, $data) = @_;
		3528
		3529	my $idx = cf::face::find $name;
		3530
		3531	if ($idx) {
		3532	delete $FACEHASH{cf::face::get_chksum $idx};
		3533	} else {
		3534	$idx = cf::face::alloc $name;
		3535	}
		3536
		3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3538
		3539	cf::face::set_type $idx, $type;
		3540	cf::face::set_data $idx, 0, $data, $hash;
		3541	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3542	$FACEHASH{$hash} = $idx;#d#
		3543
		3544	$idx
		3545	}
		3546
3439	sub load_facedata($) {	3547	sub load_facedata($) {
3440	my ($path) = @_;	3548	my ($path) = @_;
3441		3549
3442	# HACK to clear player env face cache, we need some signal framework	3550	# HACK to clear player env face cache, we need some signal framework
3443	# for this (global event?)	3551	# for this (global event?)
…		…
3450	my $facedata = decode_storable load_file $path;	3558	my $facedata = decode_storable load_file $path;
3451		3559
3452	$facedata->{version} == 2	3560	$facedata->{version} == 2
3453	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3454		3562
3455	# patch in the exptable
3456	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3457	$facedata->{resource}{"res/exp_table"} = {
3458	type => FT_RSRC,
3459	data => $exp_table,
3460	hash => (Digest::MD5::md5 $exp_table),
3461	};
3462	cf::cede_to_tick;	3563	cf::cede_to_tick;
3463		3564
3464	{	3565	{
3465	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3466		3567
3467	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3468	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3469		3571
3470	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3471	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3472	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3473	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3474	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3475		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3476	cf::cede_to_tick;	3579	cf::cede_to_tick;
3477	}	3580	}
3478		3581
3479	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3480	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3492	cf::cede_to_tick;	3595	cf::cede_to_tick;
3493	}	3596	}
3494	}	3597	}
3495		3598
3496	{	3599	{
3497	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3498		3601
3499	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3500	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3501	cf::cede_to_tick;	3604	cf::cede_to_tick;
3502	}	3605	}
3503		3606
3504	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3505	}	3608	}
3506		3609
3507	{	3610	{
3508	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3509		3612
3510	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3511	if (defined $info->{type}) {	3614	if (defined (my $type = $info->{type})) {
		3615	# TODO: different hash - must free and use new index, or cache ixface data queue
3512	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3513		3617
		3618	cf::face::set_type $idx, $type;
3514	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3515	cf::face::set_type $idx, $info->{type};	3620	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3621	$FACEHASH{$info->{hash}} = $idx;#d#
3516	} else {	3622	} else {
3517	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3518	}	3624	}
3519		3625
3520	cf::cede_to_tick;	3626	cf::cede_to_tick;
3521	}	3627	}
3522	}	3628	}
…		…
3540	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3541	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3542	cf::arch::commit_load;	3648	cf::arch::commit_load;
3543		3649
3544	$status	3650	$status
		3651	}
		3652
		3653	sub reload_exp_table {
		3654	_reload_exp_table;
		3655
		3656	set_face "res/exp_table" => FT_RSRC,
		3657	JSON::XS->new->utf8->canonical->encode (
		3658	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3659	);
		3660	}
		3661
		3662	sub reload_materials {
		3663	_reload_materials;
3545	}	3664	}
3546		3665
3547	sub reload_regions {	3666	sub reload_regions {
3548	# HACK to clear player env face cache, we need some signal framework	3667	# HACK to clear player env face cache, we need some signal framework
3549	# for this (global event?)	3668	# for this (global event?)
…		…
3564	}	3683	}
3565		3684
3566	sub reload_archetypes {	3685	sub reload_archetypes {
3567	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3568	or die "unable to load archetypes\n";	3687	or die "unable to load archetypes\n";
		3688
		3689	set_face "res/skill_info" => FT_RSRC,
		3690	JSON::XS->new->utf8->canonical->encode (
		3691	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3692	);
		3693	set_face "res/spell_paths" => FT_RSRC,
		3694	JSON::XS->new->utf8->canonical->encode (
		3695	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3696	);
3569	}	3697	}
3570		3698
3571	sub reload_treasures {	3699	sub reload_treasures {
3572	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3573	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
…		…
3594	}	3722	}
3595		3723
3596	sub reload_resources {	3724	sub reload_resources {
3597	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3598		3726
3599	reload_exp_table;
3600	reload_materials;	3727	reload_materials;
3601	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3602	reload_sound;	3730	reload_sound;
3603	reload_archetypes;	3731	reload_archetypes;
3604	reload_regions;	3732	reload_regions;
3605	reload_treasures;	3733	reload_treasures;
3606		3734
…		…
3658		3786
3659	sub main {	3787	sub main {
3660	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3661		3789
3662	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3663	LOG llevInfo, "Copyright (C) 2005-2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3664	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3665	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3666		3794
3667	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3795	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3668		3796
3669	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3670	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3671	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3799	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3672	(async {	3800	(async {
3673	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3674	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3675	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
…		…
3678	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3679		3807
3680	cf::sync_job {	3808	cf::sync_job {
3681	cf::incloader::init ();	3809	cf::incloader::init ();
3682		3810
		3811	db_init;
		3812
3683	cf::init_anim;	3813	cf::init_anim;
3684	cf::init_attackmess;	3814	cf::init_attackmess;
3685	cf::init_dynamic;	3815	cf::init_dynamic;
3686		3816
3687	cf::load_settings;	3817	cf::load_settings;
3688		3818
3689	reload_resources;	3819	reload_resources;
3690	reload_config;	3820	reload_config;
3691	db_init;
3692		3821
3693	cf::init_uuid;	3822	cf::init_uuid;
3694	cf::init_signals;	3823	cf::init_signals;
3695	cf::init_skills;	3824	cf::init_skills;
3696		3825
…		…
3710	};	3839	};
3711		3840
3712	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3713	info "parse errors in files are no longer fatal from this point on.\n";	3842	info "parse errors in files are no longer fatal from this point on.\n";
3714		3843
3715	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3716	undef $free_main;
3717	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3718	};	3846	};
3719		3847
3720	goto &main_loop;	3848	goto &main_loop;
3721	}	3849	}
…		…
3878		4006
3879	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3880		4008
3881	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3882	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4010	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3883	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3884	}	4012	}
3885		4013
3886	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3887	};	4015	};
3888		4016
…		…
4069		4197
4070	#############################################################################	4198	#############################################################################
4071		4199
4072	my $bug_warning = 0;	4200	my $bug_warning = 0;
4073		4201
4074	our @WAIT_FOR_TICK;
4075	our @WAIT_FOR_TICK_BEGIN;
4076
4077	sub wait_for_tick() {	4202	sub wait_for_tick() {
4078	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4079		4204
4080	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4081	push @WAIT_FOR_TICK, $signal;
4082	$signal->wait;
4083	}	4206	}
4084		4207
4085	sub wait_for_tick_begin() {	4208	sub wait_for_tick_begin() {
4086	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4087		4210
4088	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4089	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4090	$signal->wait;	4213	$signal->wait;
4091	}	4214	}
…		…
4095	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4218	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4096	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4097	return;	4220	return;
4098	}	4221	}
4099		4222
4100	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4101		4224
4102	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4225	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4103		4226
4104	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4105	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4228	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4111	}	4234	}
4112		4235
4113	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4114	$sig->send;	4237	$sig->send;
4115	}	4238	}
4116	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4117	$sig->send;
4118	}
4119		4240
4120	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4121	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4122		4243
4123	if (0) {	4244	if (0) {
…		…
4129	}	4250	}
4130	}	4251	}
4131		4252
4132	{	4253	{
4133	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4134		4256
4135	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4136	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4137	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4138		4260
4139	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4140	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4141	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4142	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4264	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4167	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4168	};	4290	};
4169	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4170	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4171	};	4293	};
		4294
		4295	info "database initialised";
4172	}	4296	}
4173		4297
4174	{	4298	{
4175	# configure IO::AIO	4299	# configure IO::AIO
4176		4300
		4301	info "initialising aio";
4177	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4178	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4179	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4180	}	4306	}
4181		4307
4182	our $_log_backtrace;	4308	our $_log_backtrace;
4183	our $_log_backtrace_last;	4309	our $_log_backtrace_last;
4184		4310

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC vs. Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.561 by root, Fri Apr 22 06:10:33 2011 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC