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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.558 by root, Tue Oct 5 22:35:30 2010 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;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME \|\|= time;	141	our $UPTIME; $UPTIME \|\|= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	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)
152	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;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	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.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	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
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	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
223	(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
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	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
238	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
239	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.
240		271
241	=cut	272	=cut
242		273
243	sub wait_for_tick();	274	sub wait_for_tick();
244	sub wait_for_tick_begin();	275	sub wait_for_tick_begin();
…		…
310	)) {	341	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	343	}
313		344
314	$EV::DIED = sub {	345	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
316	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
317		353
318	#############################################################################	354	#############################################################################
319		355
320	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
321		357
…		…
342	$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;
343	$d	379	$d
344	} \|\| "[unable to dump $_[0]: '$@']";	380	} \|\| "[unable to dump $_[0]: '$@']";
345	}	381	}
346		382
		383	=item $scalar = cf::load_file $path
		384
		385	Loads the given file from path and returns its contents. Croaks on error
		386	and can block.
		387
		388	=cut
		389
		390	sub load_file($) {
		391	0 <= aio_load $_[0], my $data
		392	or Carp::croak "$_[0]: $!";
		393
		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
		433	}
		434
347	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
348		436
349	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
350		438
351	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	445	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		446
359	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
361		449
		450	=item $ref = cf::decode_storable $scalar
		451
		452	Same as Coro::Storable::thaw, so blocks.
		453
		454	=cut
		455
		456	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		457
362	=item $ref = cf::yaml_load $scalar	458	=item $ref = cf::decode_yaml $scalar
363		459
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	460	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		461
366	=cut	462	=cut
367		463
368	sub fork_call(&@);	464	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	465	fork_call { YAML::XS::Load $_[0] } @_
		466	}
		467
		468	=item $scalar = cf::unlzf $scalar
		469
		470	Same as Compress::LZF::compress, but takes server ticks into account, so
		471	blocks.
		472
		473	=cut
		474
		475	sub unlzf($) {
		476	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		477	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		478	Compress::LZF::decompress $_[0]
372	}	479	}
373		480
374	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
375		482
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	483	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
460	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
461	}	568	}
462		569
463	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
464		571
465	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	Allocate $time seconds of blocking CPU time at priority C<$priority>
466	This call blocks and returns only when you have at least C<$time> seconds	573	(default: 0): This call blocks and returns only when you have at least
467	of cpu time till the next tick. The slot is only valid till the next cede.	574	C<$time> seconds of cpu time till the next tick. The slot is only valid
		575	till the next cede.
		576
		577	Background jobs should use a priority les than zero, interactive jobs
		578	should use 100 or more.
468		579
469	The optional C<$name> can be used to identify the job to run. It might be	580	The optional C<$name> can be used to identify the job to run. It might be
470	used for statistical purposes and should identify the same time-class.	581	used for statistical purposes and should identify the same time-class.
471		582
472	Useful for short background jobs.	583	Useful for short background jobs.
…		…
501	}	612	}
502	}	613	}
503		614
504	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
505	# 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
506	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
507	$signal->wait;
508	} else {	618	} else {
509	$busy = 0;	619	$busy = 0;
510	Coro::schedule;	620	Coro::schedule;
511	}	621	}
512	}	622	}
…		…
767		877
768	my @data;	878	my @data;
769	my $md5;	879	my $md5;
770		880
771	for (0 .. $#$src) {	881	for (0 .. $#$src) {
772	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
773	or Carp::croak "$src->[$_]: $!";
774	}	883	}
775		884
776	# if processing is expensive, check	885	# if processing is expensive, check
777	# checksum first	886	# checksum first
778	if (1) {	887	if (1) {
…		…
791		900
792	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
793	}	902	}
794	}	903	}
795		904
796	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
797	my $data = $process->(\@data);	906	my $data = $process->(\@data);
798	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
799		908
800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801		910
802	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
803	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1323	=cut	1432	=cut
1324		1433
1325	#############################################################################	1434	#############################################################################
1326	# command handling &c	1435	# command handling &c
1327		1436
1328	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1329		1438
1330	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
1331	$name.	1440	$name.
1332		1441
1333	=cut	1442	=cut
…		…
1339	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1340		1449
1341	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1342	}	1451	}
1343		1452
1344	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1345		1454
1346	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1347	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
1348	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
1349	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
1350	has logged in successfully.	1459	has logged in successfully.
1351		1460
1352	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1353	called.
1354		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
1355	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1356		1469
1357	Register a callback for execution when the client sends an (asynchronous)	1470	Register a callback for execution when the client sends an (asynchronous)
1358	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
1359	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
1360	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
1361	log-in.	1474	log-in.
1362		1475
1363	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1364	called.
1365		1477
1366	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367		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
1368	sub register_extcmd {	1485	sub register_extcmd($$) {
1369	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1370		1487
1371	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1372	}	1489	}
1373		1490
1374	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1375	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1376		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1377	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1378	}	1507	}
1379		1508
1380	use File::Glob ();	1509	use File::Glob ();
1381		1510
1382	cf::player->attach (	1511	cf::player->attach (
…		…
1396	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1397		1526
1398	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399		1528
1400	if (ref $msg) {	1529	if (ref $msg) {
1401	my ($type, $reply, @payload) =	1530	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1402	"ARRAY" eq ref $msg
1403	? @$msg
1404	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1405		1531
1406	my @reply;
1407
1408	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}) {
1409	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1410	}	1550	}
1411
1412	$pl->ext_reply ($reply, @reply)
1413	if $reply;
1414		1551
1415	} else {	1552	} else {
1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417	}	1554	}
1418		1555
…		…
1431	};	1568	};
1432		1569
1433	$grp	1570	$grp
1434	}	1571	}
1435		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
1436	sub load_extensions {	1584	sub load_extensions {
1437	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1438		1588
1439	cf::sync_job {	1589	cf::sync_job {
1440	my %todo;	1590	my %todo;
1441		1591
1442	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1485	unless exists $done{$_};	1635	unless exists $done{$_};
1486	}	1636	}
1487		1637
1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489		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
1490	my $active = eval $v->{source};	1649	my $active = eval $source;
1491		1650
1492	if (length $@) {	1651	if (length $@) {
1493	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1494		1653
1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1512		1671
1513	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1516	}	1675	}
		1676
		1677	last;
1517	}	1678	}
1518	}	1679	}
1519	};	1680	};
1520	}	1681	}
1521		1682
…		…
1780	}	1941	}
1781		1942
1782	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783		1944
1784	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1785
1786	=item $player->ext_reply ($msgid, @msg)
1787
1788	Sends an ext reply to the player.
1789
1790	=cut
1791
1792	sub ext_reply($$@) {
1793	my ($self, $id, @msg) = @_;
1794
1795	$self->ns->ext_reply ($id, @msg)
1796	}
1797		1946
1798	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1799		1948
1800	Sends an ext event to the client.	1949	Sends an ext event to the client.
1801		1950
…		…
1949		2098
1950	Carp::cluck "unable to resolve path '$path' (base '$base')";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1951	()	2100	()
1952	}	2101	}
1953		2102
		2103	# may re-bless or do other evil things
1954	sub init {	2104	sub init {
1955	my ($self) = @_;	2105	my ($self) = @_;
1956		2106
1957	$self	2107	$self
1958	}	2108	}
…		…
2023	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
2024		2174
2025	1	2175	1
2026	}	2176	}
2027		2177
		2178	# used to laod the header of an original map
2028	sub load_header_orig {	2179	sub load_header_orig {
2029	my ($self) = @_;	2180	my ($self) = @_;
2030		2181
2031	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2032	}	2183	}
2033		2184
		2185	# used to laod the header of an instantiated map
2034	sub load_header_temp {	2186	sub load_header_temp {
2035	my ($self) = @_;	2187	my ($self) = @_;
2036		2188
2037	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2038	}	2190	}
2039		2191
		2192	# called after loading the header from an instantiated map
2040	sub prepare_temp {	2193	sub prepare_temp {
2041	my ($self) = @_;	2194	my ($self) = @_;
2042		2195
2043	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2044	\|\| $cf::RUNTIME); #d#	2197	\|\| $cf::RUNTIME); #d#
2045	# safety	2198	# safety
2046	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2047	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2048	}	2201	}
2049		2202
		2203	# called after loading the header from an original map
2050	sub prepare_orig {	2204	sub prepare_orig {
2051	my ($self) = @_;	2205	my ($self) = @_;
2052		2206
2053	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2054	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2080	sub find {	2234	sub find {
2081	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2082		2236
2083	cf::cede_to_tick;	2237	cf::cede_to_tick;
2084		2238
2085	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2086		2240
2087	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2088	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2089		2243
2090	$cf::MAP{$path} \|\| do {	2244	$cf::MAP{$path} \|\| do {
…		…
2121		2275
2122	{	2276	{
2123	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2124		2278
2125	return unless $self->valid;	2279	return unless $self->valid;
2126	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2127
2128	$self->in_memory (cf::MAP_LOADING);
2129		2281
2130	$self->alloc;	2282	$self->alloc;
2131		2283
2132	$self->pre_load;	2284	$self->pre_load;
2133	cf::cede_to_tick;	2285	cf::cede_to_tick;
2134		2286
		2287	if (exists $self->{load_path}) {
2135	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2136	$f->skip_block;	2289	$f->skip_block;
2137	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2138	or return;	2291	or return;
2139		2292
2140	$self->post_load_original	2293	$self->post_load_original
2141	if delete $self->{load_original};	2294	if delete $self->{load_original};
2142		2295
2143	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2144	utf8::encode $uniq;	2297	utf8::encode $uniq;
2145	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2146	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2147	$self->clear_unique_items;	2300	$self->clear_unique_items;
2148	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2149	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2150	}	2304	}
2151	}	2305	}
2152	}
2153		2306
2154	$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);
2155		2314
2156	cf::cede_to_tick;	2315	cf::cede_to_tick;
2157	# now do the right thing for maps	2316	# now do the right thing for maps
2158	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2159	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2163	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2164	$self->decay_objects;	2323	$self->decay_objects;
2165	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2166	$self->update_buttons;	2325	$self->update_buttons;
2167	cf::cede_to_tick;	2326	cf::cede_to_tick;
2168	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2169	}	2328	}
2170		2329
2171	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2172	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2173
2174	$self->in_memory (cf::MAP_ACTIVE);
2175	}	2332	}
2176		2333
2177	$self->post_load;	2334	$self->post_load;
2178		2335
2179	1	2336	1
…		…
2192	# if $self->per_party;	2349	# if $self->per_party;
2193		2350
2194	$self	2351	$self
2195	}	2352	}
2196		2353
2197	# find and load all maps in the 3x3 area around a map
2198	sub load_neighbours {
2199	my ($map) = @_;
2200
2201	my @neigh; # diagonal neighbours
2202
2203	for (0 .. 3) {
2204	my $neigh = $map->tile_path ($_)
2205	or next;
2206	$neigh = find $neigh, $map
2207	or next;
2208	$neigh->load;
2209
2210	# now find the diagonal neighbours
2211	push @neigh,
2212	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2213	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2214	}
2215
2216	for (grep defined $_->[0], @neigh) {
2217	my ($path, $origin) = @$_;
2218	my $neigh = find $path, $origin
2219	or next;
2220	$neigh->load;
2221	}
2222	}
2223
2224	sub find_sync {	2354	sub find_sync {
2225	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2226		2356
		2357	# it's a bug to call this from the main context
2227	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2228	if $Coro::current == $Coro::main;	2359	if $Coro::current == $Coro::main;
2229		2360
2230	find $path, $origin	2361	find $path, $origin
2231	}	2362	}
2232		2363
2233	sub do_load_sync {	2364	sub do_load_sync {
2234	my ($map) = @_;	2365	my ($map) = @_;
2235		2366
		2367	# it's a bug to call this from the main context
2236	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2237	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2238		2370
2239	$map->load;	2371	$map->load;
2240	}	2372	}
…		…
2243	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2244		2376
2245	sub find_async {	2377	sub find_async {
2246	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2247		2379
2248	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2249		2381
2250	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2251	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load \|\| $map->linkable;
2252	}	2384	}
2253		2385
2254	$MAP_PREFETCH{$path} \|= $load;	2386	$MAP_PREFETCH{$path} \|= $load;
2255		2387
2256	$MAP_PREFETCHER \|\|= cf::async {	2388	$MAP_PREFETCHER \|\|= cf::async {
…		…
2315	sub swap_out {	2447	sub swap_out {
2316	my ($self) = @_;	2448	my ($self) = @_;
2317		2449
2318	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2319		2451
2320	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2321	return if $self->{deny_save};	2453	return if $self->{deny_save};
2322	return if $self->players;	2454	return if $self->players;
2323		2455
2324	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2325	$self->deactivate;	2457	$self->deactivate;
2326	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2327	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2328		2460
2329	# then atomically save	2461	# then atomically save
2330	$self->_save;	2462	$self->_save;
2331		2463
2332	# then free the map	2464	# then free the map
…		…
2358		2490
2359	return if $self->players;	2491	return if $self->players;
2360		2492
2361	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2362		2494
2363	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2364		2496
2365	# need to save uniques path	2497	# need to save uniques path
2366	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2367	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2368		2500
…		…
2698	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2699	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2700	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2701		2833
2702	$map->load;	2834	$map->load;
2703	$map->load_neighbours;
2704		2835
2705	return unless $self->contr->active;	2836	return unless $self->contr->active;
2706		2837
2707	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2708	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2764	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2765	}	2896	}
2766	}	2897	}
2767		2898
2768	my $map = eval {	2899	my $map = eval {
2769	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2770		2901
2771	if ($map) {	2902	if ($map) {
2772	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2773	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2774	} else {	2905	} else {
…		…
2864	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2865		2996
2866	unless (eval {	2997	unless (eval {
2867	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2868		2999
2869	# random map handling
2870	{
2871	my $guard = cf::lock_acquire "exit_prepare:$exit";
2872
2873	prepare_random_map $exit
2874	if $exit->slaying eq "/!";
2875	}
2876
2877	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2878	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2879	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	}
2880		3026
2881	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2882		3028
2883	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2884	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3109	=cut	3255	=cut
3110		3256
3111	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3112	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3113		3259
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3116	} elsif ($self->extcmd == 1) { # TODO: remove
3117	push @msg, msgtype => "event_$type";
3118	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3119	}
3120	}
3121
3122	=item $client->ext_reply ($msgid, @msg)
3123
3124	Sends an ext reply to the client.
3125
3126	=cut
3127
3128	sub cf::client::ext_reply($$@) {
3129	my ($self, $id, @msg) = @_;
3130
3131	if ($self->extcmd == 2) {
3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3133	} elsif ($self->extcmd == 1) {
3134	#TODO: version 1, remove
3135	unshift @msg, msgtype => "reply", msgid => $id;
3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3137	}
3138	}	3261	}
3139		3262
3140	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3141		3264
3142	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3197	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3198		3321
3199	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3200		3323
3201	if (ref $msg) {	3324	if (ref $msg) {
3202	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3203	"ARRAY" eq ref $msg
3204	? @$msg
3205	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3206		3326
3207	my @reply;
3208
3209	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}) {
3210	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3211	}	3345	}
3212
3213	$ns->ext_reply ($reply, @reply)
3214	if $reply;
3215
3216	} else {	3346	} else {
3217	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";
3218	}	3348	}
3219		3349
3220	cf::override;	3350	cf::override;
…		…
3388	=cut	3518	=cut
3389		3519
3390	#############################################################################	3520	#############################################################################
3391	# the server's init and main functions	3521	# the server's init and main functions
3392		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
3393	sub load_facedata($) {	3547	sub load_facedata($) {
3394	my ($path) = @_;	3548	my ($path) = @_;
3395		3549
3396	# 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
3397	# for this (global event?)	3551	# for this (global event?)
…		…
3399		3553
3400	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3401		3555
3402	trace "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3403		3557
3404	0 < aio_load $path, my $facedata	3558	my $facedata = decode_storable load_file $path;
3405	or die "$path: $!";
3406
3407	$facedata = Coro::Storable::thaw $facedata;
3408		3559
3409	$facedata->{version} == 2	3560	$facedata->{version} == 2
3410	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3411		3562
3412	# patch in the exptable
3413	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3414	$facedata->{resource}{"res/exp_table"} = {
3415	type => FT_RSRC,
3416	data => $exp_table,
3417	hash => (Digest::MD5::md5 $exp_table),
3418	};
3419	cf::cede_to_tick;	3563	cf::cede_to_tick;
3420		3564
3421	{	3565	{
3422	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3423		3567
3424	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3425	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3426		3571
3427	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3428	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3429	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3430	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3431	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;	3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3432		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3433	cf::cede_to_tick;	3579	cf::cede_to_tick;
3434	}	3580	}
3435		3581
3436	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3437	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3449	cf::cede_to_tick;	3595	cf::cede_to_tick;
3450	}	3596	}
3451	}	3597	}
3452		3598
3453	{	3599	{
3454	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3455		3601
3456	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3457	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3458	cf::cede_to_tick;	3604	cf::cede_to_tick;
3459	}	3605	}
3460		3606
3461	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3462	}	3608	}
3463		3609
3464	{	3610	{
3465	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3466		3612
3467	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3468	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
3469	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3470		3617
		3618	cf::face::set_type $idx, $type;
3471	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3472	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#
3473	} else {	3622	} else {
3474	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3475	}	3624	}
3476		3625
3477	cf::cede_to_tick;	3626	cf::cede_to_tick;
3478	}	3627	}
3479	}	3628	}
…		…
3497	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3498	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3499	cf::arch::commit_load;	3648	cf::arch::commit_load;
3500		3649
3501	$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;
3502	}	3664	}
3503		3665
3504	sub reload_regions {	3666	sub reload_regions {
3505	# 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
3506	# for this (global event?)	3668	# for this (global event?)
…		…
3521	}	3683	}
3522		3684
3523	sub reload_archetypes {	3685	sub reload_archetypes {
3524	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3525	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	);
3526	}	3697	}
3527		3698
3528	sub reload_treasures {	3699	sub reload_treasures {
3529	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3530	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3531	}	3702	}
3532		3703
3533	sub reload_sound {	3704	sub reload_sound {
3534	trace "loading sound config from $DATADIR/sound\n";	3705	trace "loading sound config from $DATADIR/sound\n";
3535		3706
3536	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3537	or die "$DATADIR/sound $!";
3538
3539	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3540		3708
3541	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3542	my $sound = $soundconf->{compat}[$_]	3710	my $sound = $soundconf->{compat}[$_]
3543	or next;	3711	or next;
3544		3712
…		…
3554	}	3722	}
3555		3723
3556	sub reload_resources {	3724	sub reload_resources {
3557	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3558		3726
3559	reload_exp_table;
3560	reload_materials;	3727	reload_materials;
3561	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3562	reload_sound;	3730	reload_sound;
3563	reload_archetypes;	3731	reload_archetypes;
3564	reload_regions;	3732	reload_regions;
3565	reload_treasures;	3733	reload_treasures;
3566		3734
…		…
3568	}	3736	}
3569		3737
3570	sub reload_config {	3738	sub reload_config {
3571	trace "reloading config file...\n";	3739	trace "reloading config file...\n";
3572		3740
3573	0 < aio_load "$CONFDIR/config", my $config	3741	my $config = load_file "$CONFDIR/config";
3574	or die "$CONFDIR/config: $!";
3575
3576	utf8::decode $config;	3742	utf8::decode $config;
3577	*CFG = yaml_load $config;	3743	*CFG = decode_yaml $config;
3578		3744
3579	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];
3580		3746
3581	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3747	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3582	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3748	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3620		3786
3621	sub main {	3787	sub main {
3622	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3623		3789
3624	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3625	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3626	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3627	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3628		3794
3629	$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
3630		3796
3631	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3632	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3633	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#
3634	(async {	3800	(async {
3635	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3636	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3637	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
…		…
3640	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3641		3807
3642	cf::sync_job {	3808	cf::sync_job {
3643	cf::incloader::init ();	3809	cf::incloader::init ();
3644		3810
		3811	db_init;
		3812
3645	cf::init_anim;	3813	cf::init_anim;
3646	cf::init_attackmess;	3814	cf::init_attackmess;
3647	cf::init_dynamic;	3815	cf::init_dynamic;
3648		3816
3649	cf::load_settings;	3817	cf::load_settings;
3650		3818
3651	reload_resources;	3819	reload_resources;
3652	reload_config;	3820	reload_config;
3653	db_init;
3654		3821
3655	cf::init_uuid;	3822	cf::init_uuid;
3656	cf::init_signals;	3823	cf::init_signals;
3657	cf::init_skills;	3824	cf::init_skills;
3658		3825
…		…
3672	};	3839	};
3673		3840
3674	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3675	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";
3676		3843
3677	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3678	undef $free_main;
3679	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3680	};	3846	};
3681		3847
3682	goto &main_loop;	3848	goto &main_loop;
3683	}	3849	}
…		…
3840		4006
3841	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3842		4008
3843	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3844	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4010	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3845	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
3846	}	4012	}
3847		4013
3848	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3849	};	4015	};
3850		4016
…		…
4031		4197
4032	#############################################################################	4198	#############################################################################
4033		4199
4034	my $bug_warning = 0;	4200	my $bug_warning = 0;
4035		4201
4036	our @WAIT_FOR_TICK;
4037	our @WAIT_FOR_TICK_BEGIN;
4038
4039	sub wait_for_tick() {	4202	sub wait_for_tick() {
4040	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4041		4204
4042	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4043	push @WAIT_FOR_TICK, $signal;
4044	$signal->wait;
4045	}	4206	}
4046		4207
4047	sub wait_for_tick_begin() {	4208	sub wait_for_tick_begin() {
4048	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4049		4210
4050	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4051	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4052	$signal->wait;	4213	$signal->wait;
4053	}	4214	}
…		…
4057	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"
4058	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4059	return;	4220	return;
4060	}	4221	}
4061		4222
4062	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4063		4224
4064	#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#
4065		4226
4066	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4067	$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.;
…		…
4073	}	4234	}
4074		4235
4075	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4076	$sig->send;	4237	$sig->send;
4077	}	4238	}
4078	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4079	$sig->send;
4080	}
4081		4240
4082	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4083	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4084		4243
4085	if (0) {	4244	if (0) {
…		…
4091	}	4250	}
4092	}	4251	}
4093		4252
4094	{	4253	{
4095	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4096		4256
4097	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4098	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4099	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4100		4260
4101	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4102	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4103	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4104	$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;
…		…
4129	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4130	};	4290	};
4131	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4132	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4133	};	4293	};
		4294
		4295	info "database initialised";
4134	}	4296	}
4135		4297
4136	{	4298	{
4137	# configure IO::AIO	4299	# configure IO::AIO
4138		4300
		4301	info "initialising aio";
4139	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4140	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4141	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4142	}	4306	}
4143		4307
4144	our $_log_backtrace;	4308	our $_log_backtrace;
4145	our $_log_backtrace_last;	4309	our $_log_backtrace_last;
4146		4310

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.558 by root, Tue Oct 5 22:35:30 2010 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.558 by root, Tue Oct 5 22:35:30 2010 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 2012 UTC