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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 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.
…		…
232	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
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.
238	returns directly I<after> the tick processing (and consequently, can only wake one thread	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	380	$d
344	} \|\| "[unable to dump $_[0]: '$@']";	381	} \|\| "[unable to dump $_[0]: '$@']";
345	}	382	}
346		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY \| Fcntl::O_CREAT \| Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
362	=item $ref = cf::yaml_load $scalar	459	=item $ref = cf::decode_yaml $scalar
363		460
364	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).	461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
365		462
366	=cut	463	=cut
367		464
368	sub fork_call(&@);	465	sub decode_yaml($) {
369
370	sub yaml_load($) {
371	fork_call { YAML::XS::Load $_[0] } @_	466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
372	}	480	}
373		481
374	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
375		483
376	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
…		…
460	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
461	}	569	}
462		570
463	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
464		572
465	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
468		580
469	The optional C<$name> can be used to identify the job to run. It might be	581	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.	582	used for statistical purposes and should identify the same time-class.
471		583
472	Useful for short background jobs.	584	Useful for short background jobs.
…		…
501	}	613	}
502	}	614	}
503		615
504	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
505	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
506	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
507	$signal->wait;
508	} else {	619	} else {
509	$busy = 0;	620	$busy = 0;
510	Coro::schedule;	621	Coro::schedule;
511	}	622	}
512	}	623	}
…		…
627	reset_signals;	738	reset_signals;
628	}	739	}
629		740
630	sub fork_call(&@) {	741	sub fork_call(&@) {
631	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
632
633	# we seemingly have to make a local copy of the whole thing,
634	# otherwise perl prematurely frees the stuff :/
635	# TODO: investigate and fix (likely this will be rather laborious)
636		743
637	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
638	cf::post_fork;	745	cf::post_fork;
639	&$cb	746	&$cb
640	} @args;	747	} @args;
…		…
767		874
768	my @data;	875	my @data;
769	my $md5;	876	my $md5;
770		877
771	for (0 .. $#$src) {	878	for (0 .. $#$src) {
772	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
773	or Carp::croak "$src->[$_]: $!";
774	}	880	}
775		881
776	# if processing is expensive, check	882	# if processing is expensive, check
777	# checksum first	883	# checksum first
778	if (1) {	884	if (1) {
…		…
791		897
792	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
793	}	899	}
794	}	900	}
795		901
796	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
797	my $data = $process->(\@data);	903	my $data = $process->(\@data);
798	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
799		905
800	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
801		907
802	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
803	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1323	=cut	1429	=cut
1324		1430
1325	#############################################################################	1431	#############################################################################
1326	# command handling &c	1432	# command handling &c
1327		1433
1328	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1329		1435
1330	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1331	$name.	1437	$name.
1332		1438
1333	=cut	1439	=cut
…		…
1339	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1340		1446
1341	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1342	}	1448	}
1343		1449
1344	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1345		1451
1346	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1347	extcmd packet. Ext commands will be processed in the order they are	1453	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	1454	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	1455	the logged-in player. Ext commands can only be processed after a player
1350	has logged in successfully.	1456	has logged in successfully.
1351		1457
1352	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1353	called.
1354		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1355	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1356		1466
1357	Register a callback for execution when the client sends an (asynchronous)	1467	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	1468	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	1469	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	1470	is a client socket. Exti commands can be received anytime, even before
1361	log-in.	1471	log-in.
1362		1472
1363	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1364	called.
1365		1474
1366	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1367		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1368	sub register_extcmd {	1482	sub register_extcmd($$) {
1369	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1370		1484
1371	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1372	}	1486	}
1373		1487
1374	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1375	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1376		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1377	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1378	}	1504	}
1379		1505
1380	use File::Glob ();	1506	use File::Glob ();
1381		1507
1382	cf::player->attach (	1508	cf::player->attach (
…		…
1396	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1397		1523
1398	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1399		1525
1400	if (ref $msg) {	1526	if (ref $msg) {
1401	my ($type, $reply, @payload) =	1527	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		1528
1406	my @reply;
1407
1408	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1409	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1410	}	1547	}
1411
1412	$pl->ext_reply ($reply, @reply)
1413	if $reply;
1414		1548
1415	} else {	1549	} else {
1416	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1417	}	1551	}
1418		1552
…		…
1431	};	1565	};
1432		1566
1433	$grp	1567	$grp
1434	}	1568	}
1435		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1436	sub load_extensions {	1581	sub load_extensions {
1437	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1438		1585
1439	cf::sync_job {	1586	cf::sync_job {
1440	my %todo;	1587	my %todo;
1441		1588
1442	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1485	unless exists $done{$_};	1632	unless exists $done{$_};
1486	}	1633	}
1487		1634
1488	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1489		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1490	my $active = eval $v->{source};	1646	my $active = eval $source;
1491		1647
1492	if (length $@) {	1648	if (length $@) {
1493	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1494		1650
1495	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1512		1668
1513	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1514	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1515	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1516	}	1672	}
		1673
		1674	last;
1517	}	1675	}
1518	}	1676	}
1519	};	1677	};
1520	}	1678	}
1521		1679
…		…
1781		1939
1782	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1783		1941
1784	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1785		1943
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
1798	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1799		1945
1800	Sends an ext event to the client.	1946	Sends an ext event to the client.
1801		1947
1802	=cut	1948	=cut
…		…
1861	sub generate_random_map {	2007	sub generate_random_map {
1862	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1863		2009
1864	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1865		2011
1866	# mit "rum" bekleckern, nicht
1867	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1868	$rmp, $rmp->{total_map_hp},
1869	(cf::region::find $rmp->{region})
1870	)
1871	}	2013	}
1872		2014
1873	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1874		2016
1875	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1953		2095
1954	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1955	()	2097	()
1956	}	2098	}
1957		2099
		2100	# may re-bless or do other evil things
1958	sub init {	2101	sub init {
1959	my ($self) = @_;	2102	my ($self) = @_;
1960		2103
1961	$self	2104	$self
1962	}	2105	}
…		…
2027	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2028		2171
2029	1	2172	1
2030	}	2173	}
2031		2174
		2175	# used to laod the header of an original map
2032	sub load_header_orig {	2176	sub load_header_orig {
2033	my ($self) = @_;	2177	my ($self) = @_;
2034		2178
2035	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2036	}	2180	}
2037		2181
		2182	# used to laod the header of an instantiated map
2038	sub load_header_temp {	2183	sub load_header_temp {
2039	my ($self) = @_;	2184	my ($self) = @_;
2040		2185
2041	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2042	}	2187	}
2043		2188
		2189	# called after loading the header from an instantiated map
2044	sub prepare_temp {	2190	sub prepare_temp {
2045	my ($self) = @_;	2191	my ($self) = @_;
2046		2192
2047	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2048	\|\| $cf::RUNTIME); #d#	2194	\|\| $cf::RUNTIME); #d#
2049	# safety	2195	# safety
2050	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2051	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2052	}	2198	}
2053		2199
		2200	# called after loading the header from an original map
2054	sub prepare_orig {	2201	sub prepare_orig {
2055	my ($self) = @_;	2202	my ($self) = @_;
2056		2203
2057	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2058	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2084	sub find {	2231	sub find {
2085	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2086		2233
2087	cf::cede_to_tick;	2234	cf::cede_to_tick;
2088		2235
2089	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2090		2237
2091	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2092	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2093		2240
2094	$cf::MAP{$path} \|\| do {	2241	$cf::MAP{$path} \|\| do {
…		…
2125		2272
2126	{	2273	{
2127	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2128		2275
2129	return unless $self->valid;	2276	return unless $self->valid;
2130	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2131
2132	$self->in_memory (cf::MAP_LOADING);
2133		2278
2134	$self->alloc;	2279	$self->alloc;
2135		2280
2136	$self->pre_load;	2281	$self->pre_load;
2137	cf::cede_to_tick;	2282	cf::cede_to_tick;
2138		2283
		2284	if (exists $self->{load_path}) {
2139	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2140	$f->skip_block;	2286	$f->skip_block;
2141	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2142	or return;	2288	or return;
2143		2289
2144	$self->post_load_original	2290	$self->post_load_original
2145	if delete $self->{load_original};	2291	if delete $self->{load_original};
2146		2292
2147	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2148	utf8::encode $uniq;	2294	utf8::encode $uniq;
2149	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2150	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2151	$self->clear_unique_items;	2297	$self->clear_unique_items;
2152	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2153	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2154	}	2301	}
2155	}	2302	}
2156	}
2157		2303
2158	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2159		2311
2160	cf::cede_to_tick;	2312	cf::cede_to_tick;
2161	# now do the right thing for maps	2313	# now do the right thing for maps
2162	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2163	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2167	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2168	$self->decay_objects;	2320	$self->decay_objects;
2169	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2170	$self->update_buttons;	2322	$self->update_buttons;
2171	cf::cede_to_tick;	2323	cf::cede_to_tick;
2172	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2173	}	2325	}
2174		2326
2175	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2176	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2177
2178	$self->in_memory (cf::MAP_ACTIVE);
2179	}	2329	}
2180		2330
2181	$self->post_load;	2331	$self->post_load;
2182		2332
2183	1	2333	1
…		…
2196	# if $self->per_party;	2346	# if $self->per_party;
2197		2347
2198	$self	2348	$self
2199	}	2349	}
2200		2350
2201	# find and load all maps in the 3x3 area around a map
2202	sub load_neighbours {
2203	my ($map) = @_;
2204
2205	my @neigh; # diagonal neighbours
2206
2207	for (0 .. 3) {
2208	my $neigh = $map->tile_path ($_)
2209	or next;
2210	$neigh = find $neigh, $map
2211	or next;
2212	$neigh->load;
2213
2214	# now find the diagonal neighbours
2215	push @neigh,
2216	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2217	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2218	}
2219
2220	for (grep defined $_->[0], @neigh) {
2221	my ($path, $origin) = @$_;
2222	my $neigh = find $path, $origin
2223	or next;
2224	$neigh->load;
2225	}
2226	}
2227
2228	sub find_sync {	2351	sub find_sync {
2229	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2230		2353
		2354	# it's a bug to call this from the main context
2231	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError \| cf::logBacktrace, "do_find_sync"
2232	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2233		2357
2234	find $path, $origin	2358	find $path, $origin
2235	}	2359	}
2236		2360
2237	sub do_load_sync {	2361	sub do_load_sync {
2238	my ($map) = @_;	2362	my ($map) = @_;
2239		2363
		2364	# it's a bug to call this from the main context
2240	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError \| cf::logBacktrace, "do_load_sync"
2241	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2242		2367
2243	$map->load;	2368	$map->load;
2244	}	2369	}
…		…
2247	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2248		2373
2249	sub find_async {	2374	sub find_async {
2250	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2251		2376
2252	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2253		2378
2254	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2255	return $map if !$load \|\| $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load \|\| $map->linkable;
2256	}	2381	}
2257		2382
2258	$MAP_PREFETCH{$path} \|= $load;	2383	$MAP_PREFETCH{$path} \|= $load;
2259		2384
2260	$MAP_PREFETCHER \|\|= cf::async {	2385	$MAP_PREFETCHER \|\|= cf::async {
…		…
2319	sub swap_out {	2444	sub swap_out {
2320	my ($self) = @_;	2445	my ($self) = @_;
2321		2446
2322	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2323		2448
2324	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2325	return if $self->{deny_save};	2450	return if $self->{deny_save};
2326	return if $self->players;	2451	return if $self->players;
2327		2452
2328	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2329	$self->deactivate;	2454	$self->deactivate;
2330	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2331	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2332		2457
2333	# then atomically save	2458	# then atomically save
2334	$self->_save;	2459	$self->_save;
2335		2460
2336	# then free the map	2461	# then free the map
…		…
2362		2487
2363	return if $self->players;	2488	return if $self->players;
2364		2489
2365	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2366		2491
2367	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2368		2493
2369	# need to save uniques path	2494	# need to save uniques path
2370	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2371	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2372		2497
…		…
2525		2650
2526	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2527		2652
2528	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2529		2654
2530	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2531	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2532		2657
2533	=cut	2658	=cut
2534		2659
2535	sub deref {	2660	sub deref {
…		…
2702	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2703	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2704	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2705		2830
2706	$map->load;	2831	$map->load;
2707	$map->load_neighbours;
2708		2832
2709	return unless $self->contr->active;	2833	return unless $self->contr->active;
2710		2834
2711	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2712	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2768	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2769	}	2893	}
2770	}	2894	}
2771		2895
2772	my $map = eval {	2896	my $map = eval {
2773	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2774		2898
2775	if ($map) {	2899	if ($map) {
2776	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2777	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2778	} else {	2902	} else {
…		…
2868	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2869		2993
2870	unless (eval {	2994	unless (eval {
2871	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2872		2996
2873	# random map handling
2874	{
2875	my $guard = cf::lock_acquire "exit_prepare:$exit";
2876
2877	prepare_random_map $exit
2878	if $exit->slaying eq "/!";
2879	}
2880
2881	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2882	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2883	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2884		3023
2885	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2886		3025
2887	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2888	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2903		3042
2904	=head3 cf::client	3043	=head3 cf::client
2905		3044
2906	=over 4	3045	=over 4
2907		3046
2908	=item $client->send_drawinfo ($text, $flags)
2909
2910	Sends a drawinfo packet to the client. Circumvents output buffering so
2911	should not be used under normal circumstances.
2912
2913	=cut
2914
2915	sub cf::client::send_drawinfo {
2916	my ($self, $text, $flags) = @_;
2917
2918	utf8::encode $text;
2919	$self->send_packet (sprintf "drawinfo %d %s", $flags \|\| cf::NDI_BLACK, $text);
2920	}
2921
2922	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2923		3048
2924	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2925	them as required.	3050	them as required.
2926		3051
…		…
2944	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2945	}	3070	}
2946		3071
2947	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2948		3073
2949	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2950	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2951	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2952	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2953		3078
2954	=cut	3079	=cut
2955		3080
2956	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3061	id => "death",	3186	id => "death",
3062	title => "Death",	3187	title => "Death",
3063	reply => undef,	3188	reply => undef,
3064	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3065	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3066	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3067	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3068	);	3199	);
3069		3200
3070	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3113	=cut	3244	=cut
3114		3245
3115	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3116	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3117		3248
3118	if ($self->extcmd == 2) {
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3120	} elsif ($self->extcmd == 1) { # TODO: remove
3121	push @msg, msgtype => "event_$type";
3122	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3123	}
3124	}
3125
3126	=item $client->ext_reply ($msgid, @msg)
3127
3128	Sends an ext reply to the client.
3129
3130	=cut
3131
3132	sub cf::client::ext_reply($$@) {
3133	my ($self, $id, @msg) = @_;
3134
3135	if ($self->extcmd == 2) {
3136	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3137	} elsif ($self->extcmd == 1) {
3138	#TODO: version 1, remove
3139	unshift @msg, msgtype => "reply", msgid => $id;
3140	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3141	}
3142	}	3250	}
3143		3251
3144	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3145		3253
3146	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3166		3274
3167	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3168	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3169		3277
3170	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our @COMMAND_FACES; # [normal commands, emotes, dm commands]
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = (
		3291	$COMMAND_FACES[0],
		3292	$COMMAND_FACES[1],
		3293	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACES[2] : ()
		3294	);
		3295
		3296	$self->send_face ($_)
		3297	for @faces;
		3298	$self->flush_fx;
		3299
		3300	$self->ext_msg (command_list => @faces);
		3301	}
		3302
		3303	=item cf::client::set_command_faces $normal_commands, $emotes, $dm_commands
		3304
		3305	=cut
		3306
		3307	sub cf::client::set_command_faces {
		3308	@COMMAND_FACES = @_;
3171	}	3309	}
3172		3310
3173	cf::client->attach (	3311	cf::client->attach (
3174	on_connect => sub {	3312	on_connect => sub {
3175	my ($ns) = @_;	3313	my ($ns) = @_;
…		…
3201	my ($ns, $buf) = @_;	3339	my ($ns, $buf) = @_;
3202		3340
3203	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3341	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3204		3342
3205	if (ref $msg) {	3343	if (ref $msg) {
3206	my ($type, $reply, @payload) =	3344	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3207	"ARRAY" eq ref $msg
3208	? @$msg
3209	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3210		3345
3211	my @reply;
3212
3213	if (my $cb = $EXTICMD{$type}) {	3346	if (my $cb = $EXTIACMD{$type}) {
		3347	$cb->(
		3348	$ns,
		3349	sub {
		3350	$ns->ext_msg ("reply-$reply", @_)
		3351	if $reply;
		3352	},
		3353	@payload
		3354	);
		3355	} else {
		3356	my @reply;
		3357
		3358	if (my $cb = $EXTICMD{$type}) {
3214	@reply = $cb->($ns, @payload);	3359	@reply = $cb->($ns, @payload);
		3360	}
		3361
		3362	$ns->ext_msg ("reply-$reply", @reply)
		3363	if $reply;
3215	}	3364	}
3216
3217	$ns->ext_reply ($reply, @reply)
3218	if $reply;
3219
3220	} else {	3365	} else {
3221	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3366	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3222	}	3367	}
3223		3368
3224	cf::override;	3369	cf::override;
…		…
3392	=cut	3537	=cut
3393		3538
3394	#############################################################################	3539	#############################################################################
3395	# the server's init and main functions	3540	# the server's init and main functions
3396		3541
		3542	{
		3543	package cf::face;
		3544
		3545	our %HASH; # hash => idx
		3546	our @DATA; # dynamically-created facedata, only faceste 0 used
		3547	our @FOFS; # file offset, if > 0
		3548	our @SIZE; # size of face, in octets
		3549	our @META; # meta hash of face, if any
		3550	our $DATAFH; # facedata filehandle
		3551
		3552	# internal api, not finalised
		3553	sub set {
		3554	my ($name, $type, $data) = @_;
		3555
		3556	my $idx = cf::face::find $name;
		3557
		3558	if ($idx) {
		3559	delete $HASH{cf::face::get_csum $idx};
		3560	} else {
		3561	$idx = cf::face::alloc $name;
		3562	}
		3563
		3564	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3565
		3566	cf::face::set_type $idx, $type;
		3567	cf::face::set_csum $idx, 0, $hash;
		3568
		3569	# we need to destroy the SV itself, not just modify it, as a running ix
		3570	# might hold a reference to it: "delete" achieves that.
		3571	delete $FOFS[0][$idx];
		3572	delete $DATA[0][$idx];
		3573	$DATA[0][$idx] = $data;
		3574	$SIZE[0][$idx] = length $data;
		3575	delete $META[$idx];
		3576	$HASH{$hash} = $idx;#d#
		3577
		3578	$idx
		3579	}
		3580
		3581	sub _get_data($$$) {
		3582	my ($idx, $set, $cb) = @_;
		3583
		3584	if (defined $DATA[$set][$idx]) {
		3585	$cb->($DATA[$set][$idx]);
		3586	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3587	my $size = $SIZE[$set][$idx];
		3588	my $buf;
		3589	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3590	if ($_[0] == $size) {
		3591	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3592	$cb->($buf);
		3593	} else {
		3594	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3595	}
		3596	};
		3597	} else {
		3598	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3599	}
		3600	}
		3601
		3602	# rather ineffient
		3603	sub cf::face::get_data($;$) {
		3604	my ($idx, $set) = @_;
		3605
		3606	_get_data $idx, $set, Coro::rouse_cb;
		3607	Coro::rouse_wait
		3608	}
		3609
		3610	sub cf::face::ix {
		3611	my ($ns, $set, $idx, $pri) = @_;
		3612
		3613	_get_data $idx, $set, sub {
		3614	$ns->ix_send ($idx, $pri, $_[0]);
		3615	};
		3616	}
		3617	}
		3618
3397	sub load_facedata($) {	3619	sub load_facedata($) {
3398	my ($path) = @_;	3620	my ($path) = @_;
3399		3621
3400	# HACK to clear player env face cache, we need some signal framework
3401	# for this (global event?)
3402	%ext::player_env::MUSIC_FACE_CACHE = ();
3403
3404	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3622	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3405		3623
3406	trace "loading facedata from $path\n";	3624	trace "loading facedata from $path\n";
3407		3625
3408	0 < aio_load $path, my $facedata	3626	my $facedata = decode_storable load_file "$path/faceinfo";
3409	or die "$path: $!";
3410
3411	$facedata = Coro::Storable::thaw $facedata;
3412		3627
3413	$facedata->{version} == 2	3628	$facedata->{version} == 2
3414	or cf::cleanup "$path: version mismatch, cannot proceed.";	3629	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3415		3630
3416	# patch in the exptable	3631	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3417	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3632	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3418	$facedata->{resource}{"res/exp_table"} = {	3633
3419	type => FT_RSRC,	3634	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3420	data => $exp_table,	3635
3421	hash => (Digest::MD5::md5 $exp_table),	3636	# BEGIN ATOMIC
3422	};	3637	# from here on, everything must be atomic - no thread switch allowed
3423	cf::cede_to_tick;	3638	my $t1 = EV::time;
3424		3639
3425	{	3640	{
3426	my $faces = $facedata->{faceinfo};	3641	my $faces = $facedata->{faceinfo};
3427		3642
3428	while (my ($face, $info) = each %$faces) {	3643	for my $face (sort keys %$faces) {
		3644	my $info = $faces->{$face};
3429	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;	3645	my $idx = (cf::face::find $face) \|\| cf::face::alloc $face;
3430		3646
3431	cf::face::set_visibility $idx, $info->{visibility};	3647	cf::face::set_visibility $idx, $info->{visibility};
3432	cf::face::set_magicmap $idx, $info->{magicmap};	3648	cf::face::set_magicmap $idx, $info->{magicmap};
3433	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3649	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3434	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3650	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3435		3651	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3436	cf::cede_to_tick;	3652	$cf::face::HASH{$info->{hash64}} = $idx;
		3653	delete $cf::face::META[$idx];
3437	}	3654	}
3438		3655
3439	while (my ($face, $info) = each %$faces) {	3656	while (my ($face, $info) = each %$faces) {
3440	next unless $info->{smooth};	3657	next unless $info->{smooth};
3441		3658
…		…
3446	cf::face::set_smooth $idx, $smooth;	3663	cf::face::set_smooth $idx, $smooth;
3447	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3664	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3448	} else {	3665	} else {
3449	error "smooth face '$info->{smooth}' not found for face '$face'";	3666	error "smooth face '$info->{smooth}' not found for face '$face'";
3450	}	3667	}
3451
3452	cf::cede_to_tick;
3453	}	3668	}
3454	}	3669	}
3455		3670
3456	{	3671	{
3457	my $anims = $facedata->{animinfo};	3672	my $anims = $facedata->{animinfo};
3458		3673
3459	while (my ($anim, $info) = each %$anims) {	3674	while (my ($anim, $info) = each %$anims) {
3460	cf::anim::set $anim, $info->{frames}, $info->{facings};	3675	cf::anim::set $anim, $info->{frames}, $info->{facings};
3461	cf::cede_to_tick;
3462	}	3676	}
3463		3677
3464	cf::anim::invalidate_all; # d'oh	3678	cf::anim::invalidate_all; # d'oh
3465	}	3679	}
3466		3680
3467	{	3681	{
3468	my $res = $facedata->{resource};	3682	my $res = $facedata->{resource};
3469		3683
3470	while (my ($name, $info) = each %$res) {	3684	while (my ($name, $info) = each %$res) {
3471	if (defined $info->{type}) {	3685	if (defined (my $type = $info->{type})) {
		3686	# TODO: different hash - must free and use new index, or cache ixface data queue
3472	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;	3687	my $idx = (cf::face::find $name) \|\| cf::face::alloc $name;
3473		3688
3474	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3475	cf::face::set_type $idx, $info->{type};	3689	cf::face::set_type $idx, $type;
		3690	cf::face::set_csum $idx, 0, $info->{hash};
		3691	$cf::face::SIZE[0][$idx] = $info->{size};
		3692	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3693	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3694	$cf::face::HASH{$info->{hash}} = $idx;
3476	} else {	3695	} else {
3477	$RESOURCE{$name} = $info; # unused	3696	# $RESOURCE{$name} = $info; # unused
3478	}	3697	}
3479
3480	cf::cede_to_tick;
3481	}	3698	}
3482	}	3699	}
		3700
		3701	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3702
		3703	# HACK to clear player env face cache, we need some signal framework
		3704	# for this (global event?)
		3705	%ext::player_env::MUSIC_FACE_CACHE = ();
		3706
		3707	# END ATOMIC
		3708
		3709	cf::debug "facedata atomic update time ", EV::time - $t1;
3483		3710
3484	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3711	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3712
		3713	aio_close $fh if $fh; # close old facedata
3485		3714
3486	1	3715	1
3487	}	3716	}
3488		3717
3489	register_exticmd fx_want => sub {	3718	register_exticmd fx_want => sub {
…		…
3500	my $status = load_resource_file_ $_[0];	3729	my $status = load_resource_file_ $_[0];
3501	get_slot 0.1, 100;	3730	get_slot 0.1, 100;
3502	cf::arch::commit_load;	3731	cf::arch::commit_load;
3503		3732
3504	$status	3733	$status
		3734	}
		3735
		3736	sub reload_exp_table {
		3737	_reload_exp_table;
		3738
		3739	cf::face::set
		3740	"res/exp_table" => FT_RSRC,
		3741	JSON::XS->new->utf8->canonical->encode (
		3742	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3743	);
		3744	}
		3745
		3746	sub reload_materials {
		3747	_reload_materials;
3505	}	3748	}
3506		3749
3507	sub reload_regions {	3750	sub reload_regions {
3508	# HACK to clear player env face cache, we need some signal framework	3751	# HACK to clear player env face cache, we need some signal framework
3509	# for this (global event?)	3752	# for this (global event?)
…		…
3517	if exists $_->{match};	3760	if exists $_->{match};
3518	}	3761	}
3519	}	3762	}
3520		3763
3521	sub reload_facedata {	3764	sub reload_facedata {
3522	load_facedata "$DATADIR/facedata"	3765	load_facedata $DATADIR
3523	or die "unable to load facedata\n";	3766	or die "unable to load facedata\n";
3524	}	3767	}
3525		3768
3526	sub reload_archetypes {	3769	sub reload_archetypes {
3527	load_resource_file "$DATADIR/archetypes"	3770	load_resource_file "$DATADIR/archetypes"
3528	or die "unable to load archetypes\n";	3771	or die "unable to load archetypes\n";
		3772
		3773	cf::face::set
		3774	"res/skill_info" => FT_RSRC,
		3775	JSON::XS->new->utf8->canonical->encode (
		3776	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3777	);
		3778
		3779	cf::face::set
		3780	"res/spell_paths" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3783	);
3529	}	3784	}
3530		3785
3531	sub reload_treasures {	3786	sub reload_treasures {
3532	load_resource_file "$DATADIR/treasures"	3787	load_resource_file "$DATADIR/treasures"
3533	or die "unable to load treasurelists\n";	3788	or die "unable to load treasurelists\n";
3534	}	3789	}
3535		3790
3536	sub reload_sound {	3791	sub reload_sound {
3537	trace "loading sound config from $DATADIR/sound\n";	3792	trace "loading sound config from $DATADIR/sound\n";
3538		3793
3539	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3540	or die "$DATADIR/sound $!";
3541
3542	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3794	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3543		3795
3544	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3796	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3545	my $sound = $soundconf->{compat}[$_]	3797	my $sound = $soundconf->{compat}[$_]
3546	or next;	3798	or next;
3547		3799
…		…
3557	}	3809	}
3558		3810
3559	sub reload_resources {	3811	sub reload_resources {
3560	trace "reloading resource files...\n";	3812	trace "reloading resource files...\n";
3561		3813
3562	reload_exp_table;
3563	reload_materials;	3814	reload_materials;
3564	reload_facedata;	3815	reload_facedata;
		3816	reload_exp_table;
3565	reload_sound;	3817	reload_sound;
3566	reload_archetypes;	3818	reload_archetypes;
3567	reload_regions;	3819	reload_regions;
3568	reload_treasures;	3820	reload_treasures;
3569		3821
…		…
3571	}	3823	}
3572		3824
3573	sub reload_config {	3825	sub reload_config {
3574	trace "reloading config file...\n";	3826	trace "reloading config file...\n";
3575		3827
3576	0 < aio_load "$CONFDIR/config", my $config	3828	my $config = load_file "$CONFDIR/config";
3577	or die "$CONFDIR/config: $!";
3578
3579	utf8::decode $config;	3829	utf8::decode $config;
3580	*CFG = yaml_load $config;	3830	*CFG = decode_yaml $config;
3581		3831
3582	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];	3832	$EMERGENCY_POSITION = $CFG{emergency_position} \|\| ["/world/world_104_115", 49, 38];
3583		3833
3584	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3834	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3585	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3835	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3623		3873
3624	sub main {	3874	sub main {
3625	cf::init_globals; # initialise logging	3875	cf::init_globals; # initialise logging
3626		3876
3627	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3877	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3628	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3878	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3629	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3879	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3630	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3880	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3631		3881
3632	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3882	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3633		3883
3634	# we must not ever block the main coroutine	3884	# we must not ever block the main coroutine
3635	local $Coro::idle = sub {	3885	$Coro::idle = sub {
3636	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3886	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3637	(async {	3887	(async {
3638	$Coro::current->{desc} = "IDLE BUG HANDLER";	3888	$Coro::current->{desc} = "IDLE BUG HANDLER";
3639	EV::loop EV::LOOP_ONESHOT;	3889	EV::loop EV::LOOP_ONESHOT;
3640	})->prio (Coro::PRIO_MAX);	3890	})->prio (Coro::PRIO_MAX);
…		…
3643	evthread_start IO::AIO::poll_fileno;	3893	evthread_start IO::AIO::poll_fileno;
3644		3894
3645	cf::sync_job {	3895	cf::sync_job {
3646	cf::incloader::init ();	3896	cf::incloader::init ();
3647		3897
		3898	db_init;
		3899
3648	cf::init_anim;	3900	cf::init_anim;
3649	cf::init_attackmess;	3901	cf::init_attackmess;
3650	cf::init_dynamic;	3902	cf::init_dynamic;
3651		3903
3652	cf::load_settings;	3904	cf::load_settings;
3653		3905
3654	reload_resources;	3906	reload_resources;
3655	reload_config;	3907	reload_config;
3656	db_init;
3657		3908
3658	cf::init_uuid;	3909	cf::init_uuid;
3659	cf::init_signals;	3910	cf::init_signals;
3660	cf::init_skills;	3911	cf::init_skills;
3661		3912
…		…
3675	};	3926	};
3676		3927
3677	cf::object::thawer::errors_are_fatal 0;	3928	cf::object::thawer::errors_are_fatal 0;
3678	info "parse errors in files are no longer fatal from this point on.\n";	3929	info "parse errors in files are no longer fatal from this point on.\n";
3679		3930
3680	my $free_main; $free_main = EV::idle sub {	3931	AE::postpone {
3681	undef $free_main;
3682	undef &main; # free gobs of memory :)	3932	undef &main; # free gobs of memory :)
3683	};	3933	};
3684		3934
3685	goto &main_loop;	3935	goto &main_loop;
3686	}	3936	}
…		…
3843		4093
3844	cf::write_runtime_sync; # external watchdog should not bark	4094	cf::write_runtime_sync; # external watchdog should not bark
3845		4095
3846	trace "emergency_perl_save: flushing outstanding aio requests";	4096	trace "emergency_perl_save: flushing outstanding aio requests";
3847	while (IO::AIO::nreqs \|\| BDB::nreqs) {	4097	while (IO::AIO::nreqs \|\| BDB::nreqs) {
3848	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4098	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3849	}	4099	}
3850		4100
3851	cf::write_runtime_sync; # external watchdog should not bark	4101	cf::write_runtime_sync; # external watchdog should not bark
3852	};	4102	};
3853		4103
…		…
4034		4284
4035	#############################################################################	4285	#############################################################################
4036		4286
4037	my $bug_warning = 0;	4287	my $bug_warning = 0;
4038		4288
4039	our @WAIT_FOR_TICK;
4040	our @WAIT_FOR_TICK_BEGIN;
4041
4042	sub wait_for_tick() {	4289	sub wait_for_tick() {
4043	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4290	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4044		4291
4045	my $signal = new Coro::Signal;	4292	$WAIT_FOR_TICK->wait;
4046	push @WAIT_FOR_TICK, $signal;
4047	$signal->wait;
4048	}	4293	}
4049		4294
4050	sub wait_for_tick_begin() {	4295	sub wait_for_tick_begin() {
4051	return Coro::cede if tick_inhibit \|\| $Coro::current == $Coro::main;	4296	return Coro::AnyEvent::poll if tick_inhibit \|\| $Coro::current == $Coro::main;
4052		4297
4053	my $signal = new Coro::Signal;	4298	my $signal = new Coro::Signal;
4054	push @WAIT_FOR_TICK_BEGIN, $signal;	4299	push @WAIT_FOR_TICK_BEGIN, $signal;
4055	$signal->wait;	4300	$signal->wait;
4056	}	4301	}
…		…
4060	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4305	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4061	unless ++$bug_warning > 10;	4306	unless ++$bug_warning > 10;
4062	return;	4307	return;
4063	}	4308	}
4064		4309
4065	cf::server_tick; # one server iteration	4310	cf::one_tick; # one server iteration
4066		4311
4067	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4312	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4068		4313
4069	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4314	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4070	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4315	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4076	}	4321	}
4077		4322
4078	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4323	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4079	$sig->send;	4324	$sig->send;
4080	}	4325	}
4081	while (my $sig = shift @WAIT_FOR_TICK) {	4326	$WAIT_FOR_TICK->broadcast;
4082	$sig->send;
4083	}
4084		4327
4085	$LOAD = ($NOW - $TICK_START) / $TICK;	4328	$LOAD = ($NOW - $TICK_START) / $TICK;
4086	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4329	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4087		4330
4088	if (0) {	4331	if (0) {
…		…
4094	}	4337	}
4095	}	4338	}
4096		4339
4097	{	4340	{
4098	# configure BDB	4341	# configure BDB
		4342	info "initialising database";
4099		4343
4100	BDB::min_parallel 16;	4344	BDB::min_parallel 16;
4101	BDB::max_poll_reqs $TICK * 0.1;	4345	BDB::max_poll_reqs $TICK * 0.1;
4102	$AnyEvent::BDB::WATCHER->priority (1);	4346	#$AnyEvent::BDB::WATCHER->priority (1);
4103		4347
4104	unless ($DB_ENV) {	4348	unless ($DB_ENV) {
4105	$DB_ENV = BDB::db_env_create;	4349	$DB_ENV = BDB::db_env_create;
4106	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);	4350	$DB_ENV->set_flags (BDB::AUTO_COMMIT \| BDB::REGION_INIT);
4107	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4351	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4132	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4376	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4133	};	4377	};
4134	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4378	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4135	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4379	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4136	};	4380	};
		4381
		4382	info "database initialised";
4137	}	4383	}
4138		4384
4139	{	4385	{
4140	# configure IO::AIO	4386	# configure IO::AIO
4141		4387
		4388	info "initialising aio";
4142	IO::AIO::min_parallel 8;	4389	IO::AIO::min_parallel 8;
4143	IO::AIO::max_poll_time $TICK * 0.1;	4390	IO::AIO::max_poll_time $TICK * 0.1;
4144	undef $AnyEvent::AIO::WATCHER;	4391	undef $AnyEvent::AIO::WATCHER;
		4392	info "aio initialised";
4145	}	4393	}
4146		4394
4147	our $_log_backtrace;	4395	our $_log_backtrace;
4148	our $_log_backtrace_last;	4396	our $_log_backtrace_last;
4149		4397

Diff Legend

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

Comparing deliantra/server/lib/cf.pm (file contents): Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC vs. Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC

Diff Legend

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.555 by root, Wed Jun 30 01:32:56 2010 UTC vs.
Revision 1.609 by root, Tue Nov 20 14:30:22 2012 UTC