ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.554 by root, Sat Jun 26 22:10:18 2010 UTC vs.
Revision 1.611 by root, Tue Nov 20 14:54:17 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,
1869	$rmp->{wall_name}, $rmp->{monsterstyle},
1870	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1871	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{this_map},
1872	$rmp->{exit_on_final_map},
1873	$rmp->{xsize}, $rmp->{ysize},
1874	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1875	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1876	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1877	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1878	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1879	(cf::region::find $rmp->{region})
1880	)
1881	}	2013	}
1882		2014
1883	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1884		2016
1885	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
…		…
1963		2095
1964	Carp::cluck "unable to resolve path '$path' (base '$base')";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1965	()	2097	()
1966	}	2098	}
1967		2099
		2100	# may re-bless or do other evil things
1968	sub init {	2101	sub init {
1969	my ($self) = @_;	2102	my ($self) = @_;
1970		2103
1971	$self	2104	$self
1972	}	2105	}
…		…
2037	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
2038		2171
2039	1	2172	1
2040	}	2173	}
2041		2174
		2175	# used to laod the header of an original map
2042	sub load_header_orig {	2176	sub load_header_orig {
2043	my ($self) = @_;	2177	my ($self) = @_;
2044		2178
2045	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2046	}	2180	}
2047		2181
		2182	# used to laod the header of an instantiated map
2048	sub load_header_temp {	2183	sub load_header_temp {
2049	my ($self) = @_;	2184	my ($self) = @_;
2050		2185
2051	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2052	}	2187	}
2053		2188
		2189	# called after loading the header from an instantiated map
2054	sub prepare_temp {	2190	sub prepare_temp {
2055	my ($self) = @_;	2191	my ($self) = @_;
2056		2192
2057	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2058	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2059	# safety	2195	# safety
2060	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2061	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2062	}	2198	}
2063		2199
		2200	# called after loading the header from an original map
2064	sub prepare_orig {	2201	sub prepare_orig {
2065	my ($self) = @_;	2202	my ($self) = @_;
2066		2203
2067	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2068	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2094	sub find {	2231	sub find {
2095	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2096		2233
2097	cf::cede_to_tick;	2234	cf::cede_to_tick;
2098		2235
2099	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2100		2237
2101	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2102	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2103		2240
2104	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2135		2272
2136	{	2273	{
2137	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2138		2275
2139	return unless $self->valid;	2276	return unless $self->valid;
2140	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2141
2142	$self->in_memory (cf::MAP_LOADING);
2143		2278
2144	$self->alloc;	2279	$self->alloc;
2145		2280
2146	$self->pre_load;	2281	$self->pre_load;
2147	cf::cede_to_tick;	2282	cf::cede_to_tick;
2148		2283
		2284	if (exists $self->{load_path}) {
2149	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2150	$f->skip_block;	2286	$f->skip_block;
2151	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2152	or return;	2288	or return;
2153		2289
2154	$self->post_load_original	2290	$self->post_load_original
2155	if delete $self->{load_original};	2291	if delete $self->{load_original};
2156		2292
2157	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2158	utf8::encode $uniq;	2294	utf8::encode $uniq;
2159	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2160	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2161	$self->clear_unique_items;	2297	$self->clear_unique_items;
2162	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2163	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2164	}	2301	}
2165	}	2302	}
2166	}
2167		2303
2168	$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);
2169		2311
2170	cf::cede_to_tick;	2312	cf::cede_to_tick;
2171	# now do the right thing for maps	2313	# now do the right thing for maps
2172	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2173	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2177	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2178	$self->decay_objects;	2320	$self->decay_objects;
2179	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2180	$self->update_buttons;	2322	$self->update_buttons;
2181	cf::cede_to_tick;	2323	cf::cede_to_tick;
2182	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2183	}	2325	}
2184		2326
2185	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2186	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2187
2188	$self->in_memory (cf::MAP_ACTIVE);
2189	}	2329	}
2190		2330
2191	$self->post_load;	2331	$self->post_load;
2192		2332
2193	1	2333	1
…		…
2206	# if $self->per_party;	2346	# if $self->per_party;
2207		2347
2208	$self	2348	$self
2209	}	2349	}
2210		2350
2211	# find and load all maps in the 3x3 area around a map
2212	sub load_neighbours {
2213	my ($map) = @_;
2214
2215	my @neigh; # diagonal neighbours
2216
2217	for (0 .. 3) {
2218	my $neigh = $map->tile_path ($_)
2219	or next;
2220	$neigh = find $neigh, $map
2221	or next;
2222	$neigh->load;
2223
2224	# now find the diagonal neighbours
2225	push @neigh,
2226	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2227	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2228	}
2229
2230	for (grep defined $_->[0], @neigh) {
2231	my ($path, $origin) = @$_;
2232	my $neigh = find $path, $origin
2233	or next;
2234	$neigh->load;
2235	}
2236	}
2237
2238	sub find_sync {	2351	sub find_sync {
2239	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2240		2353
		2354	# it's a bug to call this from the main context
2241	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2242	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2243		2357
2244	find $path, $origin	2358	find $path, $origin
2245	}	2359	}
2246		2360
2247	sub do_load_sync {	2361	sub do_load_sync {
2248	my ($map) = @_;	2362	my ($map) = @_;
2249		2363
		2364	# it's a bug to call this from the main context
2250	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2251	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2252		2367
2253	$map->load;	2368	$map->load;
2254	}	2369	}
…		…
2257	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2258		2373
2259	sub find_async {	2374	sub find_async {
2260	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2261		2376
2262	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2263		2378
2264	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2265	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2266	}	2381	}
2267		2382
2268	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2269		2384
2270	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2329	sub swap_out {	2444	sub swap_out {
2330	my ($self) = @_;	2445	my ($self) = @_;
2331		2446
2332	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2333		2448
2334	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2335	return if $self->{deny_save};	2450	return if $self->{deny_save};
2336	return if $self->players;	2451	return if $self->players;
2337		2452
2338	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2339	$self->deactivate;	2454	$self->deactivate;
2340	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2341	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2342		2457
2343	# then atomically save	2458	# then atomically save
2344	$self->_save;	2459	$self->_save;
2345		2460
2346	# then free the map	2461	# then free the map
…		…
2372		2487
2373	return if $self->players;	2488	return if $self->players;
2374		2489
2375	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2376		2491
2377	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2378		2493
2379	# need to save uniques path	2494	# need to save uniques path
2380	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2381	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2382		2497
…		…
2535		2650
2536	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.
2537		2652
2538	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2539		2654
2540	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,
2541	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2542		2657
2543	=cut	2658	=cut
2544		2659
2545	sub deref {	2660	sub deref {
…		…
2712	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2713	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2714	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2715		2830
2716	$map->load;	2831	$map->load;
2717	$map->load_neighbours;
2718		2832
2719	return unless $self->contr->active;	2833	return unless $self->contr->active;
2720		2834
2721	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2722	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2778	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2779	}	2893	}
2780	}	2894	}
2781		2895
2782	my $map = eval {	2896	my $map = eval {
2783	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2784		2898
2785	if ($map) {	2899	if ($map) {
2786	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2787	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2788	} else {	2902	} else {
…		…
2878	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2879		2993
2880	unless (eval {	2994	unless (eval {
2881	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2882		2996
2883	# random map handling
2884	{
2885	my $guard = cf::lock_acquire "exit_prepare:$exit";
2886
2887	prepare_random_map $exit
2888	if $exit->slaying eq "/!";
2889	}
2890
2891	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2892	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2893	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	}
2894		3023
2895	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2896		3025
2897	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2898	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2913		3042
2914	=head3 cf::client	3043	=head3 cf::client
2915		3044
2916	=over 4	3045	=over 4
2917		3046
2918	=item $client->send_drawinfo ($text, $flags)
2919
2920	Sends a drawinfo packet to the client. Circumvents output buffering so
2921	should not be used under normal circumstances.
2922
2923	=cut
2924
2925	sub cf::client::send_drawinfo {
2926	my ($self, $text, $flags) = @_;
2927
2928	utf8::encode $text;
2929	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2930	}
2931
2932	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2933		3048
2934	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
2935	them as required.	3050	them as required.
2936		3051
…		…
2954	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2955	}	3070	}
2956		3071
2957	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2958		3073
2959	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
2960	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
2961	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
2962	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2963		3078
2964	=cut	3079	=cut
2965		3080
2966	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
3071	id => "death",	3186	id => "death",
3072	title => "Death",	3187	title => "Death",
3073	reply => undef,	3188	reply => undef,
3074	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
3075	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
3076	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
3077	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
3078	);	3199	);
3079		3200
3080	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3123	=cut	3244	=cut
3124		3245
3125	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3126	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3127		3248
3128	if ($self->extcmd == 2) {
3129	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3130	} elsif ($self->extcmd == 1) { # TODO: remove
3131	push @msg, msgtype => "event_$type";
3132	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3133	}
3134	}
3135
3136	=item $client->ext_reply ($msgid, @msg)
3137
3138	Sends an ext reply to the client.
3139
3140	=cut
3141
3142	sub cf::client::ext_reply($$@) {
3143	my ($self, $id, @msg) = @_;
3144
3145	if ($self->extcmd == 2) {
3146	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3147	} elsif ($self->extcmd == 1) {
3148	#TODO: version 1, remove
3149	unshift @msg, msgtype => "reply", msgid => $id;
3150	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3151	}
3152	}	3250	}
3153		3251
3154	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3155		3253
3156	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3176		3274
3177	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3178	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3179		3277
3180	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3181	}	3317	}
3182		3318
3183	cf::client->attach (	3319	cf::client->attach (
3184	on_connect => sub {	3320	on_connect => sub {
3185	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3211	my ($ns, $buf) = @_;	3347	my ($ns, $buf) = @_;
3212		3348
3213	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3214		3350
3215	if (ref $msg) {	3351	if (ref $msg) {
3216	my ($type, $reply, @payload) =	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3217	"ARRAY" eq ref $msg
3218	? @$msg
3219	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3220		3353
3221	my @reply;
3222
3223	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3224	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3225	}	3372	}
3226
3227	$ns->ext_reply ($reply, @reply)
3228	if $reply;
3229
3230	} else {	3373	} else {
3231	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3232	}	3375	}
3233		3376
3234	cf::override;	3377	cf::override;
…		…
3402	=cut	3545	=cut
3403		3546
3404	#############################################################################	3547	#############################################################################
3405	# the server's init and main functions	3548	# the server's init and main functions
3406		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3407	sub load_facedata($) {	3627	sub load_facedata($) {
3408	my ($path) = @_;	3628	my ($path) = @_;
3409		3629
3410	# HACK to clear player env face cache, we need some signal framework
3411	# for this (global event?)
3412	%ext::player_env::MUSIC_FACE_CACHE = ();
3413
3414	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3415		3631
3416	trace "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3417		3633
3418	0 < aio_load $path, my $facedata	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3419	or die "$path: $!";
3420
3421	$facedata = Coro::Storable::thaw $facedata;
3422		3635
3423	$facedata->{version} == 2	3636	$facedata->{version} == 2
3424	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3425		3638
3426	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3427	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3428	$facedata->{resource}{"res/exp_table"} = {	3641
3429	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3430	data => $exp_table,	3643
3431	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3432	};	3645	# from here on, everything must be atomic - no thread switch allowed
3433	cf::cede_to_tick;	3646	my $t1 = EV::time;
3434		3647
3435	{	3648	{
3436	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3437		3650
3438	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3439	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440		3654
3441	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3442	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3443	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3444	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3445		3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3446	cf::cede_to_tick;	3660	$cf::face::HASH{$info->{hash64}} = $idx;
		3661	delete $cf::face::META[$idx];
3447	}	3662	}
3448		3663
3449	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3450	next unless $info->{smooth};	3665	next unless $info->{smooth};
3451		3666
…		…
3456	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3457	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3458	} else {	3673	} else {
3459	error "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3460	}	3675	}
3461
3462	cf::cede_to_tick;
3463	}	3676	}
3464	}	3677	}
3465		3678
3466	{	3679	{
3467	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3468		3681
3469	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3470	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3471	cf::cede_to_tick;
3472	}	3684	}
3473		3685
3474	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3475	}	3687	}
3476		3688
3477	{	3689	{
3478	my $res = $facedata->{resource};	3690	my $res = $facedata->{resource};
3479		3691
3480	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3481	if (defined $info->{type}) {	3693	if (defined (my $type = $info->{type})) {
		3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3482	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3483		3696
3484	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3485	cf::face::set_type $idx, $info->{type};	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3486	} else {	3703	} else {
3487	$RESOURCE{$name} = $info; # unused	3704	# $RESOURCE{$name} = $info; # unused
3488	}	3705	}
3489
3490	cf::cede_to_tick;
3491	}	3706	}
3492	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3493		3718
3494	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3720
		3721	aio_close $fh if $fh; # close old facedata
3495		3722
3496	1	3723	1
3497	}	3724	}
3498		3725
3499	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
…		…
3510	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3511	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3512	cf::arch::commit_load;	3739	cf::arch::commit_load;
3513		3740
3514	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3515	}	3756	}
3516		3757
3517	sub reload_regions {	3758	sub reload_regions {
3518	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3519	# for this (global event?)	3760	# for this (global event?)
…		…
3527	if exists $_->{match};	3768	if exists $_->{match};
3528	}	3769	}
3529	}	3770	}
3530		3771
3531	sub reload_facedata {	3772	sub reload_facedata {
3532	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3533	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3534	}	3775	}
3535		3776
3536	sub reload_archetypes {	3777	sub reload_archetypes {
3537	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3538	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
		3792
		3793	# command completion
		3794	my @commands;
		3795
		3796	for (0..cf::arch::skillvec_size - 1) {
		3797	my $skill = cf::arch::skillvec $_;
		3798	my $name = $skill->name;
		3799	my $flags = cf::skill_flags $skill->subtype;
		3800
		3801	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3802	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3803	}
		3804
		3805	cf::client::set_command_face skill => \@commands;
3539	}	3806	}
3540		3807
3541	sub reload_treasures {	3808	sub reload_treasures {
3542	load_resource_file "$DATADIR/treasures"	3809	load_resource_file "$DATADIR/treasures"
3543	or die "unable to load treasurelists\n";	3810	or die "unable to load treasurelists\n";
3544	}	3811	}
3545		3812
3546	sub reload_sound {	3813	sub reload_sound {
3547	trace "loading sound config from $DATADIR/sound\n";	3814	trace "loading sound config from $DATADIR/sound\n";
3548		3815
3549	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550	or die "$DATADIR/sound $!";
3551
3552	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3816	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3553		3817
3554	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3818	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555	my $sound = $soundconf->{compat}[$_]	3819	my $sound = $soundconf->{compat}[$_]
3556	or next;	3820	or next;
3557		3821
…		…
3567	}	3831	}
3568		3832
3569	sub reload_resources {	3833	sub reload_resources {
3570	trace "reloading resource files...\n";	3834	trace "reloading resource files...\n";
3571		3835
3572	reload_exp_table;
3573	reload_materials;	3836	reload_materials;
3574	reload_facedata;	3837	reload_facedata;
		3838	reload_exp_table;
3575	reload_sound;	3839	reload_sound;
3576	reload_archetypes;	3840	reload_archetypes;
3577	reload_regions;	3841	reload_regions;
3578	reload_treasures;	3842	reload_treasures;
3579		3843
…		…
3581	}	3845	}
3582		3846
3583	sub reload_config {	3847	sub reload_config {
3584	trace "reloading config file...\n";	3848	trace "reloading config file...\n";
3585		3849
3586	0 < aio_load "$CONFDIR/config", my $config	3850	my $config = load_file "$CONFDIR/config";
3587	or die "$CONFDIR/config: $!";
3588
3589	utf8::decode $config;	3851	utf8::decode $config;
3590	*CFG = yaml_load $config;	3852	*CFG = decode_yaml $config;
3591		3853
3592	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3854	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3593		3855
3594	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3856	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3595	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3857	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3633		3895
3634	sub main {	3896	sub main {
3635	cf::init_globals; # initialise logging	3897	cf::init_globals; # initialise logging
3636		3898
3637	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3899	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3900	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3639	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3901	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3902	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641		3903
3642	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3904	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3643		3905
3644	# we must not ever block the main coroutine	3906	# we must not ever block the main coroutine
3645	local $Coro::idle = sub {	3907	$Coro::idle = sub {
3646	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3908	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3647	(async {	3909	(async {
3648	$Coro::current->{desc} = "IDLE BUG HANDLER";	3910	$Coro::current->{desc} = "IDLE BUG HANDLER";
3649	EV::loop EV::LOOP_ONESHOT;	3911	EV::loop EV::LOOP_ONESHOT;
3650	})->prio (Coro::PRIO_MAX);	3912	})->prio (Coro::PRIO_MAX);
…		…
3653	evthread_start IO::AIO::poll_fileno;	3915	evthread_start IO::AIO::poll_fileno;
3654		3916
3655	cf::sync_job {	3917	cf::sync_job {
3656	cf::incloader::init ();	3918	cf::incloader::init ();
3657		3919
		3920	db_init;
		3921
3658	cf::init_anim;	3922	cf::init_anim;
3659	cf::init_attackmess;	3923	cf::init_attackmess;
3660	cf::init_dynamic;	3924	cf::init_dynamic;
3661		3925
3662	cf::load_settings;	3926	cf::load_settings;
3663		3927
3664	reload_resources;	3928	reload_resources;
3665	reload_config;	3929	reload_config;
3666	db_init;
3667		3930
3668	cf::init_uuid;	3931	cf::init_uuid;
3669	cf::init_signals;	3932	cf::init_signals;
3670	cf::init_skills;	3933	cf::init_skills;
3671		3934
…		…
3685	};	3948	};
3686		3949
3687	cf::object::thawer::errors_are_fatal 0;	3950	cf::object::thawer::errors_are_fatal 0;
3688	info "parse errors in files are no longer fatal from this point on.\n";	3951	info "parse errors in files are no longer fatal from this point on.\n";
3689		3952
3690	my $free_main; $free_main = EV::idle sub {	3953	AE::postpone {
3691	undef $free_main;
3692	undef &main; # free gobs of memory :)	3954	undef &main; # free gobs of memory :)
3693	};	3955	};
3694		3956
3695	goto &main_loop;	3957	goto &main_loop;
3696	}	3958	}
…		…
3853		4115
3854	cf::write_runtime_sync; # external watchdog should not bark	4116	cf::write_runtime_sync; # external watchdog should not bark
3855		4117
3856	trace "emergency_perl_save: flushing outstanding aio requests";	4118	trace "emergency_perl_save: flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {	4119	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4120	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859	}	4121	}
3860		4122
3861	cf::write_runtime_sync; # external watchdog should not bark	4123	cf::write_runtime_sync; # external watchdog should not bark
3862	};	4124	};
3863		4125
…		…
4044		4306
4045	#############################################################################	4307	#############################################################################
4046		4308
4047	my $bug_warning = 0;	4309	my $bug_warning = 0;
4048		4310
4049	our @WAIT_FOR_TICK;
4050	our @WAIT_FOR_TICK_BEGIN;
4051
4052	sub wait_for_tick() {	4311	sub wait_for_tick() {
4053	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4312	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4054		4313
4055	my $signal = new Coro::Signal;	4314	$WAIT_FOR_TICK->wait;
4056	push @WAIT_FOR_TICK, $signal;
4057	$signal->wait;
4058	}	4315	}
4059		4316
4060	sub wait_for_tick_begin() {	4317	sub wait_for_tick_begin() {
4061	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4318	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4062		4319
4063	my $signal = new Coro::Signal;	4320	my $signal = new Coro::Signal;
4064	push @WAIT_FOR_TICK_BEGIN, $signal;	4321	push @WAIT_FOR_TICK_BEGIN, $signal;
4065	$signal->wait;	4322	$signal->wait;
4066	}	4323	}
…		…
4070	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4327	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4071	unless ++$bug_warning > 10;	4328	unless ++$bug_warning > 10;
4072	return;	4329	return;
4073	}	4330	}
4074		4331
4075	cf::server_tick; # one server iteration	4332	cf::one_tick; # one server iteration
4076		4333
4077	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4334	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4078		4335
4079	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4336	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4080	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4337	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4086	}	4343	}
4087		4344
4088	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4345	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4089	$sig->send;	4346	$sig->send;
4090	}	4347	}
4091	while (my $sig = shift @WAIT_FOR_TICK) {	4348	$WAIT_FOR_TICK->broadcast;
4092	$sig->send;
4093	}
4094		4349
4095	$LOAD = ($NOW - $TICK_START) / $TICK;	4350	$LOAD = ($NOW - $TICK_START) / $TICK;
4096	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4351	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4097		4352
4098	if (0) {	4353	if (0) {
…		…
4104	}	4359	}
4105	}	4360	}
4106		4361
4107	{	4362	{
4108	# configure BDB	4363	# configure BDB
		4364	info "initialising database";
4109		4365
4110	BDB::min_parallel 16;	4366	BDB::min_parallel 16;
4111	BDB::max_poll_reqs $TICK * 0.1;	4367	BDB::max_poll_reqs $TICK * 0.1;
4112	$AnyEvent::BDB::WATCHER->priority (1);	4368	#$AnyEvent::BDB::WATCHER->priority (1);
4113		4369
4114	unless ($DB_ENV) {	4370	unless ($DB_ENV) {
4115	$DB_ENV = BDB::db_env_create;	4371	$DB_ENV = BDB::db_env_create;
4116	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4372	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4117	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4373	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4142	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4398	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4143	};	4399	};
4144	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4400	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4145	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4401	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4146	};	4402	};
		4403
		4404	info "database initialised";
4147	}	4405	}
4148		4406
4149	{	4407	{
4150	# configure IO::AIO	4408	# configure IO::AIO
4151		4409
		4410	info "initialising aio";
4152	IO::AIO::min_parallel 8;	4411	IO::AIO::min_parallel 8;
4153	IO::AIO::max_poll_time $TICK * 0.1;	4412	IO::AIO::max_poll_time $TICK * 0.1;
4154	undef $AnyEvent::AIO::WATCHER;	4413	undef $AnyEvent::AIO::WATCHER;
		4414	info "aio initialised";
4155	}	4415	}
4156		4416
4157	our $_log_backtrace;	4417	our $_log_backtrace;
4158	our $_log_backtrace_last;	4418	our $_log_backtrace_last;
4159		4419

Diff Legend

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