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.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 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 ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE; # unused	117	#our %RESOURCE; # unused
112		118
113	our $OUTPUT_RATE_MIN = 3000;	119	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	120	our $OUTPUT_RATE_MAX = 1000000;
115		121
116	our $MAX_LINKS = 32; # how many chained exits to follow	122	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	133	our $DB_ENV;
128		134
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		136
131	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		139
133	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
135	our $NOW;	143	our $NOW;
136		144
137	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		156
149	our @POST_INIT;	157	our @POST_INIT;
150		158
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
153		164
154	binmode STDOUT;	165	binmode STDOUT;
155	binmode STDERR;	166	binmode STDERR;
156		167
157	# read virtual server time, if available	168	# read virtual server time, if available
…		…
191		202
192	=over 4	203	=over 4
193		204
194	=item $cf::UPTIME	205	=item $cf::UPTIME
195		206
196	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
197		223
198	=item $cf::RUNTIME	224	=item $cf::RUNTIME
199		225
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	227	every server tick.
202		228
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	229	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	230	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	231	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		232
207	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
210	database environment.	236	database environment.
211		237
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	238	=item $cf::LOADAVG
221		239
222	The current CPU load on the server (alpha-smoothed), as a value between 0	240	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	241	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		254
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one thread	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
240		270
241	=cut	271	=cut
242		272
243	sub wait_for_tick();	273	sub wait_for_tick();
244	sub wait_for_tick_begin();	274	sub wait_for_tick_begin();
…		…
310	)) {	340	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	342	}
313		343
314	$EV::DIED = sub {	344	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
316	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
317		352
318	#############################################################################	353	#############################################################################
319		354
320	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
321		356
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	378	$d
344	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
345	}	380	}
346		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
347	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
348		435
349	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
350		437
351	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		445
359	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
361		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
362	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
363		481
364	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
365	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
366		484
367	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
368	is a reload or not.	486	is a reload or not.
369		487
370	=cut	488	=cut
371		489
372	sub post_init(&) {	490	sub post_init(&) {
373	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
374	}	509	}
375		510
376	=item cf::lock_wait $string	511	=item cf::lock_wait $string
377		512
378	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
431	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
432	}	567	}
433		568
434	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
435		570
436	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
437	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
438	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
439		578
440	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
441	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
442		581
443	Useful for short background jobs.	582	Useful for short background jobs.
…		…
472	}	611	}
473	}	612	}
474		613
475	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
476	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
477	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
478	$signal->wait;
479	} else {	617	} else {
480	$busy = 0;	618	$busy = 0;
481	Coro::schedule;	619	Coro::schedule;
482	}	620	}
483	}	621	}
…		…
583	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
584		722
585	$coro	723	$coro
586	}	724	}
587		725
588	=item fork_call { }, $args	726	=item fork_call { }, @args
589		727
590	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
591	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
592	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
593	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
…		…
606	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
607		745
608	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
609	cf::post_fork;	747	cf::post_fork;
610	&$cb	748	&$cb
611	}, @args;	749	} @args;
612		750
613	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
614	}	752	}
615		753
616	sub objinfo {	754	sub objinfo {
…		…
738		876
739	my @data;	877	my @data;
740	my $md5;	878	my $md5;
741		879
742	for (0 .. $#$src) {	880	for (0 .. $#$src) {
743	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
744	or Carp::croak "$src->[$_]: $!";
745	}	882	}
746		883
747	# if processing is expensive, check	884	# if processing is expensive, check
748	# checksum first	885	# checksum first
749	if (1) {	886	if (1) {
…		…
1294	=cut	1431	=cut
1295		1432
1296	#############################################################################	1433	#############################################################################
1297	# command handling &c	1434	# command handling &c
1298		1435
1299	=item cf::register_command $name => \&callback($ob,$args);	1436	=item cf::register_command $name => \&callback($ob,$args)
1300		1437
1301	Register a callback for execution when the client sends the user command	1438	Register a callback for execution when the client sends the user command
1302	$name.	1439	$name.
1303		1440
1304	=cut	1441	=cut
…		…
1310	#warn "registering command '$name/$time' to '$caller'";	1447	#warn "registering command '$name/$time' to '$caller'";
1311		1448
1312	push @{ $COMMAND{$name} }, [$caller, $cb];	1449	push @{ $COMMAND{$name} }, [$caller, $cb];
1313	}	1450	}
1314		1451
1315	=item cf::register_extcmd $name => \&callback($pl,$packet);	1452	=item cf::register_extcmd $name => \&callback($pl,$packet)
1316		1453
1317	Register a callback for execution when the client sends an (synchronous)	1454	Register a callback for execution when the client sends an (synchronous)
1318	extcmd packet. Ext commands will be processed in the order they are	1455	extcmd packet. Ext commands will be processed in the order they are
1319	received by the server, like other user commands. The first argument is	1456	received by the server, like other user commands. The first argument is
1320	the logged-in player. Ext commands can only be processed after a player	1457	the logged-in player. Ext commands can only be processed after a player
1321	has logged in successfully.	1458	has logged in successfully.
1322		1459
1323	If the callback returns something, it is sent back as if reply was being	1460	If the callback returns something, it is sent back as if reply was being
1324	called.	1461	called.
1325		1462
1326	=item cf::register_exticmd $name => \&callback($ns,$packet);	1463	=item cf::register_exticmd $name => \&callback($ns,$packet)
1327		1464
1328	Register a callback for execution when the client sends an (asynchronous)	1465	Register a callback for execution when the client sends an (asynchronous)
1329	exticmd packet. Exti commands are processed by the server as soon as they	1466	exticmd packet. Exti commands are processed by the server as soon as they
1330	are received, i.e. out of order w.r.t. other commands. The first argument	1467	are received, i.e. out of order w.r.t. other commands. The first argument
1331	is a client socket. Exti commands can be received anytime, even before	1468	is a client socket. Exti commands can be received anytime, even before
…		…
1367	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1368		1505
1369	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370		1507
1371	if (ref $msg) {	1508	if (ref $msg) {
1372	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373	"ARRAY" eq ref $msg
1374	? @$msg
1375	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376		1510
1377	my @reply;	1511	my @reply;
1378		1512
1379	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1380	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
1381	}	1515	}
1382		1516
1383	$pl->ext_reply ($reply, @reply)	1517	$pl->ext_msg ("reply-$reply", @reply)
1384	if $reply;	1518	if $reply;
1385		1519
1386	} else {	1520	} else {
1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1388	}	1522	}
…		…
1402	};	1536	};
1403		1537
1404	$grp	1538	$grp
1405	}	1539	}
1406		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1407	sub load_extensions {	1552	sub load_extensions {
1408	info "loading extensions...";	1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
1409		1556
1410	cf::sync_job {	1557	cf::sync_job {
1411	my %todo;	1558	my %todo;
1412		1559
1413	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
…		…
1456	unless exists $done{$_};	1603	unless exists $done{$_};
1457	}	1604	}
1458		1605
1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1461	my $active = eval $v->{source};	1617	my $active = eval $source;
1462		1618
1463	if (length $@) {	1619	if (length $@) {
1464	error "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1465		1621
1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1483		1639
1484	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1487	}	1643	}
		1644
		1645	last;
1488	}	1646	}
1489	}	1647	}
1490	};	1648	};
1491	}	1649	}
1492		1650
…		…
1650	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1651		1809
1652	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1653	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1654		1812
1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656	$pl->deactivate;	1814	$pl->deactivate;
1657		1815
1658	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
		1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659	ext::highscore::check ($pl->ob);	1818	ext::highscore::check ($pl->ob);
1660		1819
1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1662	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1663		1821
1664	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1665	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1666	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1752		1910
1753	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1911	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754		1912
1755	Expand deliantra pod fragments into protocol xml.	1913	Expand deliantra pod fragments into protocol xml.
1756		1914
1757	=item $player->ext_reply ($msgid, @msg)
1758
1759	Sends an ext reply to the player.
1760
1761	=cut
1762
1763	sub ext_reply($$@) {
1764	my ($self, $id, @msg) = @_;
1765
1766	$self->ns->ext_reply ($id, @msg)
1767	}
1768
1769	=item $player->ext_msg ($type, @msg)	1915	=item $player->ext_msg ($type, @msg)
1770		1916
1771	Sends an ext event to the client.	1917	Sends an ext event to the client.
1772		1918
1773	=cut	1919	=cut
…		…
1832	sub generate_random_map {	1978	sub generate_random_map {
1833	my ($self, $rmp) = @_;	1979	my ($self, $rmp) = @_;
1834		1980
1835	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1981	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1836		1982
1837	# mit "rum" bekleckern, nicht
1838	$self->_create_random_map (	1983	$self->_create_random_map ($rmp);
1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842	$rmp->{exit_on_final_map},
1843	$rmp->{xsize}, $rmp->{ysize},
1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849	(cf::region::find $rmp->{region}), $rmp->{custom}
1850	)
1851	}	1984	}
1852		1985
1853	=item cf::map->register ($regex, $prio)	1986	=item cf::map->register ($regex, $prio)
1854		1987
1855	Register a handler for the map path matching the given regex at the	1988	Register a handler for the map path matching the given regex at the
…		…
1906	$base =~ s{[^/]+/?$}{};	2039	$base =~ s{[^/]+/?$}{};
1907	$path = "$base/$path";	2040	$path = "$base/$path";
1908	}	2041	}
1909		2042
1910	for ($path) {	2043	for ($path) {
1911	redo if s{//}{/};
1912	redo if s{/\.?/}{/};	2044	redo if s{/\.?/}{/};
1913	redo if s{/[^/]+/\.\./}{/};	2045	redo if s{/[^/]+/\.\./}{/};
1914	}	2046	}
1915		2047
1916	$path	2048	$path
…		…
1934		2066
1935	Carp::cluck "unable to resolve path '$path' (base '$base')";	2067	Carp::cluck "unable to resolve path '$path' (base '$base')";
1936	()	2068	()
1937	}	2069	}
1938		2070
		2071	# may re-bless or do other evil things
1939	sub init {	2072	sub init {
1940	my ($self) = @_;	2073	my ($self) = @_;
1941		2074
1942	$self	2075	$self
1943	}	2076	}
…		…
2008	$self->{load_path} = $path;	2141	$self->{load_path} = $path;
2009		2142
2010	1	2143	1
2011	}	2144	}
2012		2145
		2146	# used to laod the header of an original map
2013	sub load_header_orig {	2147	sub load_header_orig {
2014	my ($self) = @_;	2148	my ($self) = @_;
2015		2149
2016	$self->load_header_from ($self->load_path)	2150	$self->load_header_from ($self->load_path)
2017	}	2151	}
2018		2152
		2153	# used to laod the header of an instantiated map
2019	sub load_header_temp {	2154	sub load_header_temp {
2020	my ($self) = @_;	2155	my ($self) = @_;
2021		2156
2022	$self->load_header_from ($self->save_path)	2157	$self->load_header_from ($self->save_path)
2023	}	2158	}
2024		2159
		2160	# called after loading the header from an instantiated map
2025	sub prepare_temp {	2161	sub prepare_temp {
2026	my ($self) = @_;	2162	my ($self) = @_;
2027		2163
2028	$self->last_access ((delete $self->{last_access})	2164	$self->last_access ((delete $self->{last_access})
2029	|| $cf::RUNTIME); #d#	2165	|| $cf::RUNTIME); #d#
2030	# safety	2166	# safety
2031	$self->{instantiate_time} = $cf::RUNTIME	2167	$self->{instantiate_time} = $cf::RUNTIME
2032	if $self->{instantiate_time} > $cf::RUNTIME;	2168	if $self->{instantiate_time} > $cf::RUNTIME;
2033	}	2169	}
2034		2170
		2171	# called after loading the header from an original map
2035	sub prepare_orig {	2172	sub prepare_orig {
2036	my ($self) = @_;	2173	my ($self) = @_;
2037		2174
2038	$self->{load_original} = 1;	2175	$self->{load_original} = 1;
2039	$self->{instantiate_time} = $cf::RUNTIME;	2176	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2065	sub find {	2202	sub find {
2066	my ($path, $origin) = @_;	2203	my ($path, $origin) = @_;
2067		2204
2068	cf::cede_to_tick;	2205	cf::cede_to_tick;
2069		2206
2070	$path = normalise $path, $origin && $origin->path;	2207	$path = normalise $path, $origin;
2071		2208
2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2209	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073	my $guard2 = cf::lock_acquire "map_find:$path";	2210	my $guard2 = cf::lock_acquire "map_find:$path";
2074		2211
2075	$cf::MAP{$path} || do {	2212	$cf::MAP{$path} || do {
…		…
2106		2243
2107	{	2244	{
2108	my $guard = cf::lock_acquire "map_data:$path";	2245	my $guard = cf::lock_acquire "map_data:$path";
2109		2246
2110	return unless $self->valid;	2247	return unless $self->valid;
2111	return unless $self->in_memory == cf::MAP_SWAPPED;	2248	return unless $self->state == cf::MAP_SWAPPED;
2112
2113	$self->in_memory (cf::MAP_LOADING);
2114		2249
2115	$self->alloc;	2250	$self->alloc;
2116		2251
2117	$self->pre_load;	2252	$self->pre_load;
2118	cf::cede_to_tick;	2253	cf::cede_to_tick;
2119		2254
		2255	if (exists $self->{load_path}) {
2120	my $f = new_from_file cf::object::thawer $self->{load_path};	2256	my $f = new_from_file cf::object::thawer $self->{load_path};
2121	$f->skip_block;	2257	$f->skip_block;
2122	$self->_load_objects ($f)	2258	$self->_load_objects ($f)
2123	or return;	2259	or return;
2124		2260
2125	$self->post_load_original	2261	$self->post_load_original
2126	if delete $self->{load_original};	2262	if delete $self->{load_original};
2127		2263
2128	if (my $uniq = $self->uniq_path) {	2264	if (my $uniq = $self->uniq_path) {
2129	utf8::encode $uniq;	2265	utf8::encode $uniq;
2130	unless (aio_stat $uniq) {	2266	unless (aio_stat $uniq) {
2131	if (my $f = new_from_file cf::object::thawer $uniq) {	2267	if (my $f = new_from_file cf::object::thawer $uniq) {
2132	$self->clear_unique_items;	2268	$self->clear_unique_items;
2133	$self->_load_objects ($f);	2269	$self->_load_objects ($f);
2134	$f->resolve_delayed_derefs;	2270	$f->resolve_delayed_derefs;
		2271	}
2135	}	2272	}
2136	}	2273	}
2137	}
2138		2274
2139	$f->resolve_delayed_derefs;	2275	$f->resolve_delayed_derefs;
		2276	} else {
		2277	$self->post_load_original
		2278	if delete $self->{load_original};
		2279	}
		2280
		2281	$self->state (cf::MAP_INACTIVE);
2140		2282
2141	cf::cede_to_tick;	2283	cf::cede_to_tick;
2142	# now do the right thing for maps	2284	# now do the right thing for maps
2143	$self->link_multipart_objects;	2285	$self->link_multipart_objects;
2144	$self->difficulty ($self->estimate_difficulty)	2286	$self->difficulty ($self->estimate_difficulty)
…		…
2148	unless ($self->{deny_activate}) {	2290	unless ($self->{deny_activate}) {
2149	$self->decay_objects;	2291	$self->decay_objects;
2150	$self->fix_auto_apply;	2292	$self->fix_auto_apply;
2151	$self->update_buttons;	2293	$self->update_buttons;
2152	cf::cede_to_tick;	2294	cf::cede_to_tick;
2153	$self->activate;	2295	#$self->activate; # no longer activate maps automatically
2154	}	2296	}
2155		2297
2156	$self->{last_save} = $cf::RUNTIME;	2298	$self->{last_save} = $cf::RUNTIME;
2157	$self->last_access ($cf::RUNTIME);	2299	$self->last_access ($cf::RUNTIME);
2158
2159	$self->in_memory (cf::MAP_ACTIVE);
2160	}	2300	}
2161		2301
2162	$self->post_load;	2302	$self->post_load;
		2303
		2304	1
2163	}	2305	}
2164		2306
2165	# customize the map for a given player, i.e.	2307	# customize the map for a given player, i.e.
2166	# return the _real_ map. used by e.g. per-player	2308	# return the _real_ map. used by e.g. per-player
2167	# maps to change the path to ~playername/mappath	2309	# maps to change the path to ~playername/mappath
…		…
2175	# if $self->per_party;	2317	# if $self->per_party;
2176		2318
2177	$self	2319	$self
2178	}	2320	}
2179		2321
2180	# find and load all maps in the 3x3 area around a map
2181	sub load_neighbours {
2182	my ($map) = @_;
2183
2184	my @neigh; # diagonal neighbours
2185
2186	for (0 .. 3) {
2187	my $neigh = $map->tile_path ($_)
2188	or next;
2189	$neigh = find $neigh, $map
2190	or next;
2191	$neigh->load;
2192
2193	# now find the diagonal neighbours
2194	push @neigh,
2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2197	}
2198
2199	for (grep defined $_->[0], @neigh) {
2200	my ($path, $origin) = @$_;
2201	my $neigh = find $path, $origin
2202	or next;
2203	$neigh->load;
2204	}
2205	}
2206
2207	sub find_sync {	2322	sub find_sync {
2208	my ($path, $origin) = @_;	2323	my ($path, $origin) = @_;
2209		2324
		2325	# it's a bug to call this from the main context
2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2326	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211	if $Coro::current == $Coro::main;	2327	if $Coro::current == $Coro::main;
2212		2328
2213	find $path, $origin	2329	find $path, $origin
2214	}	2330	}
2215		2331
2216	sub do_load_sync {	2332	sub do_load_sync {
2217	my ($map) = @_;	2333	my ($map) = @_;
2218		2334
		2335	# it's a bug to call this from the main context
2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2336	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220	if $Coro::current == $Coro::main;	2337	if $Coro::current == $Coro::main;
2221		2338
2222	$map->load;	2339	$map->load;
2223	}	2340	}
…		…
2226	our $MAP_PREFETCHER = undef;	2343	our $MAP_PREFETCHER = undef;
2227		2344
2228	sub find_async {	2345	sub find_async {
2229	my ($path, $origin, $load) = @_;	2346	my ($path, $origin, $load) = @_;
2230		2347
2231	$path = normalise $path, $origin && $origin->{path};	2348	$path = normalise $path, $origin;
2232		2349
2233	if (my $map = $cf::MAP{$path}) {	2350	if (my $map = $cf::MAP{$path}) {
2234	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2351	return $map if !$load || $map->linkable;
2235	}	2352	}
2236		2353
2237	$MAP_PREFETCH{$path} |= $load;	2354	$MAP_PREFETCH{$path} |= $load;
2238		2355
2239	$MAP_PREFETCHER ||= cf::async {	2356	$MAP_PREFETCHER ||= cf::async {
…		…
2298	sub swap_out {	2415	sub swap_out {
2299	my ($self) = @_;	2416	my ($self) = @_;
2300		2417
2301	my $lock = cf::lock_acquire "map_data:$self->{path}";	2418	my $lock = cf::lock_acquire "map_data:$self->{path}";
2302		2419
2303	return if $self->in_memory != cf::MAP_ACTIVE;	2420	return if !$self->linkable;
2304	return if $self->{deny_save};	2421	return if $self->{deny_save};
2305	return if $self->players;	2422	return if $self->players;
2306		2423
2307	# first deactivate the map and "unlink" it from the core	2424	# first deactivate the map and "unlink" it from the core
2308	$self->deactivate;	2425	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;	2426	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->in_memory (cf::MAP_SWAPPED);	2427	$self->state (cf::MAP_SWAPPED);
2311		2428
2312	# then atomically save	2429	# then atomically save
2313	$self->_save;	2430	$self->_save;
2314		2431
2315	# then free the map	2432	# then free the map
…		…
2341		2458
2342	return if $self->players;	2459	return if $self->players;
2343		2460
2344	cf::trace "resetting map ", $self->path, "\n";	2461	cf::trace "resetting map ", $self->path, "\n";
2345		2462
2346	$self->in_memory (cf::MAP_SWAPPED);	2463	$self->state (cf::MAP_SWAPPED);
2347		2464
2348	# need to save uniques path	2465	# need to save uniques path
2349	unless ($self->{deny_save}) {	2466	unless ($self->{deny_save}) {
2350	my $uniq = $self->uniq_path; utf8::encode $uniq;	2467	my $uniq = $self->uniq_path; utf8::encode $uniq;
2351		2468
…		…
2681	# use -1 or undef as default coordinates, not 0, 0	2798	# use -1 or undef as default coordinates, not 0, 0
2682	($x, $y) = ($map->enter_x, $map->enter_y)	2799	($x, $y) = ($map->enter_x, $map->enter_y)
2683	if $x <= 0 && $y <= 0;	2800	if $x <= 0 && $y <= 0;
2684		2801
2685	$map->load;	2802	$map->load;
2686	$map->load_neighbours;
2687		2803
2688	return unless $self->contr->active;	2804	return unless $self->contr->active;
2689		2805
2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2806	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691	if ($self->enter_map ($map, $x, $y)) {	2807	if ($self->enter_map ($map, $x, $y)) {
…		…
2747	($path, $x, $y) = (undef, undef, undef);	2863	($path, $x, $y) = (undef, undef, undef);
2748	}	2864	}
2749	}	2865	}
2750		2866
2751	my $map = eval {	2867	my $map = eval {
2752	my $map = defined $path ? cf::map::find $path : undef;	2868	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753		2869
2754	if ($map) {	2870	if ($map) {
2755	$map = $map->customise_for ($self);	2871	$map = $map->customise_for ($self);
2756	$map = $check->($map, $x, $y, $self) if $check && $map;	2872	$map = $check->($map, $x, $y, $self) if $check && $map;
2757	} else {	2873	} else {
…		…
2847	$Coro::current->{desc} = "enter_exit";	2963	$Coro::current->{desc} = "enter_exit";
2848		2964
2849	unless (eval {	2965	unless (eval {
2850	$self->deactivate_recursive; # just to be sure	2966	$self->deactivate_recursive; # just to be sure
2851		2967
2852	# random map handling
2853	{
2854	my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856	prepare_random_map $exit
2857	if $exit->slaying eq "/!";
2858	}
2859
2860	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2968	my $map = cf::map::normalise $exit->slaying, $exit->map;
2861	my $x = $exit->stats->hp;	2969	my $x = $exit->stats->hp;
2862	my $y = $exit->stats->sp;	2970	my $y = $exit->stats->sp;
		2971
		2972	# special map handling
		2973	my $slaying = $exit->slaying;
		2974
		2975	# special map handling
		2976	if ($slaying eq "/!") {
		2977	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2978
		2979	prepare_random_map $exit
		2980	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2981
		2982	$map = $exit->slaying;
		2983
		2984	} elsif ($slaying eq '!up') {
		2985	$map = $exit->map->tile_path (cf::TILE_UP);
		2986	$x = $exit->x;
		2987	$y = $exit->y;
		2988
		2989	} elsif ($slaying eq '!down') {
		2990	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2991	$x = $exit->x;
		2992	$y = $exit->y;
		2993	}
2863		2994
2864	$self->goto ($map, $x, $y);	2995	$self->goto ($map, $x, $y);
2865		2996
2866	# if exit is damned, update players death & WoR home-position	2997	# if exit is damned, update players death & WoR home-position
2867	$self->contr->savebed ($map, $x, $y)	2998	$self->contr->savebed ($map, $x, $y)
…		…
3092	=cut	3223	=cut
3093		3224
3094	sub cf::client::ext_msg($$@) {	3225	sub cf::client::ext_msg($$@) {
3095	my ($self, $type, @msg) = @_;	3226	my ($self, $type, @msg) = @_;
3096		3227
3097	if ($self->extcmd == 2) {
3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3228	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099	} elsif ($self->extcmd == 1) { # TODO: remove
3100	push @msg, msgtype => "event_$type";
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}
3104
3105	=item $client->ext_reply ($msgid, @msg)
3106
3107	Sends an ext reply to the client.
3108
3109	=cut
3110
3111	sub cf::client::ext_reply($$@) {
3112	my ($self, $id, @msg) = @_;
3113
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116	} elsif ($self->extcmd == 1) {
3117	#TODO: version 1, remove
3118	unshift @msg, msgtype => "reply", msgid => $id;
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120	}
3121	}	3229	}
3122		3230
3123	=item $success = $client->query ($flags, "text", \&cb)	3231	=item $success = $client->query ($flags, "text", \&cb)
3124		3232
3125	Queues a query to the client, calling the given callback with	3233	Queues a query to the client, calling the given callback with
…		…
3180	my ($ns, $buf) = @_;	3288	my ($ns, $buf) = @_;
3181		3289
3182	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3290	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183		3291
3184	if (ref $msg) {	3292	if (ref $msg) {
3185	my ($type, $reply, @payload) =	3293	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186	"ARRAY" eq ref $msg
3187	? @$msg
3188	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189		3294
3190	my @reply;	3295	my @reply;
3191		3296
3192	if (my $cb = $EXTICMD{$type}) {	3297	if (my $cb = $EXTICMD{$type}) {
3193	@reply = $cb->($ns, @payload);	3298	@reply = $cb->($ns, @payload);
3194	}	3299	}
3195		3300
3196	$ns->ext_reply ($reply, @reply)	3301	$ns->ext_msg ("reply-$reply", @reply)
3197	if $reply;	3302	if $reply;
3198		3303
3199	} else {	3304	} else {
3200	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3305	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3201	}	3306	}
…		…
3371	=cut	3476	=cut
3372		3477
3373	#############################################################################	3478	#############################################################################
3374	# the server's init and main functions	3479	# the server's init and main functions
3375		3480
		3481	our %FACEHASH; # hash => idx, #d# HACK for http server
		3482
		3483	# internal api, not fianlised
		3484	sub add_face {
		3485	my ($name, $type, $data) = @_;
		3486
		3487	my $idx = cf::face::find $name;
		3488
		3489	if ($idx) {
		3490	delete $FACEHASH{cf::face::get_chksum $idx};
		3491	} else {
		3492	$idx = cf::face::alloc $name;
		3493	}
		3494
		3495	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3496
		3497	cf::face::set_type $idx, $type;
		3498	cf::face::set_data $idx, 0, $data, $hash;
		3499	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3500	$FACEHASH{$hash} = $idx;#d#
		3501
		3502	$idx
		3503	}
		3504
3376	sub load_facedata($) {	3505	sub load_facedata($) {
3377	my ($path) = @_;	3506	my ($path) = @_;
3378		3507
3379	# HACK to clear player env face cache, we need some signal framework	3508	# HACK to clear player env face cache, we need some signal framework
3380	# for this (global event?)	3509	# for this (global event?)
…		…
3382		3511
3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3512	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384		3513
3385	trace "loading facedata from $path\n";	3514	trace "loading facedata from $path\n";
3386		3515
3387	0 < aio_load $path, my $facedata	3516	my $facedata = decode_storable load_file $path;
3388	or die "$path: $!";
3389
3390	$facedata = Coro::Storable::thaw $facedata;
3391		3517
3392	$facedata->{version} == 2	3518	$facedata->{version} == 2
3393	or cf::cleanup "$path: version mismatch, cannot proceed.";	3519	or cf::cleanup "$path: version mismatch, cannot proceed.";
3394		3520
3395	# patch in the exptable
3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3397	$facedata->{resource}{"res/exp_table"} = {
3398	type => FT_RSRC,
3399	data => $exp_table,
3400	hash => (Digest::MD5::md5 $exp_table),
3401	};
3402	cf::cede_to_tick;	3521	cf::cede_to_tick;
3403		3522
3404	{	3523	{
3405	my $faces = $facedata->{faceinfo};	3524	my $faces = $facedata->{faceinfo};
3406		3525
3407	while (my ($face, $info) = each %$faces) {	3526	for my $face (sort keys %$faces) {
		3527	my $info = $faces->{$face};
3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3528	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409		3529
3410	cf::face::set_visibility $idx, $info->{visibility};	3530	cf::face::set_visibility $idx, $info->{visibility};
3411	cf::face::set_magicmap $idx, $info->{magicmap};	3531	cf::face::set_magicmap $idx, $info->{magicmap};
3412	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3532	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3533	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3534	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3535	$FACEHASH{$info->{hash64}} = $idx;#d#
3414		3536
3415	cf::cede_to_tick;	3537	cf::cede_to_tick;
3416	}	3538	}
3417		3539
3418	while (my ($face, $info) = each %$faces) {	3540	while (my ($face, $info) = each %$faces) {
…		…
3445		3567
3446	{	3568	{
3447	my $res = $facedata->{resource};	3569	my $res = $facedata->{resource};
3448		3570
3449	while (my ($name, $info) = each %$res) {	3571	while (my ($name, $info) = each %$res) {
3450	if (defined $info->{type}) {	3572	if (defined (my $type = $info->{type})) {
		3573	# TODO: different hash - must free and use new index, or cache ixface data queue
3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3574	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452		3575
		3576	cf::face::set_type $idx, $type;
3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3577	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454	cf::face::set_type $idx, $info->{type};	3578	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3579	$FACEHASH{$info->{hash}} = $idx;#d#
3455	} else {	3580	} else {
3456	$RESOURCE{$name} = $info; # unused	3581	# $RESOURCE{$name} = $info; # unused
3457	}	3582	}
3458		3583
3459	cf::cede_to_tick;	3584	cf::cede_to_tick;
3460	}	3585	}
3461	}	3586	}
…		…
3479	my $status = load_resource_file_ $_[0];	3604	my $status = load_resource_file_ $_[0];
3480	get_slot 0.1, 100;	3605	get_slot 0.1, 100;
3481	cf::arch::commit_load;	3606	cf::arch::commit_load;
3482		3607
3483	$status	3608	$status
		3609	}
		3610
		3611	sub reload_exp_table {
		3612	_reload_exp_table;
		3613
		3614	add_face "res/exp_table" => FT_RSRC,
		3615	JSON::XS->new->utf8->canonical->encode (
		3616	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3617	);
		3618	}
		3619
		3620	sub reload_materials {
		3621	_reload_materials;
3484	}	3622	}
3485		3623
3486	sub reload_regions {	3624	sub reload_regions {
3487	# HACK to clear player env face cache, we need some signal framework	3625	# HACK to clear player env face cache, we need some signal framework
3488	# for this (global event?)	3626	# for this (global event?)
…		…
3503	}	3641	}
3504		3642
3505	sub reload_archetypes {	3643	sub reload_archetypes {
3506	load_resource_file "$DATADIR/archetypes"	3644	load_resource_file "$DATADIR/archetypes"
3507	or die "unable to load archetypes\n";	3645	or die "unable to load archetypes\n";
		3646
		3647	add_face "res/skill_info" => FT_RSRC,
		3648	JSON::XS->new->utf8->canonical->encode (
		3649	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3650	);
		3651	add_face "res/spell_paths" => FT_RSRC,
		3652	JSON::XS->new->utf8->canonical->encode (
		3653	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3654	);
3508	}	3655	}
3509		3656
3510	sub reload_treasures {	3657	sub reload_treasures {
3511	load_resource_file "$DATADIR/treasures"	3658	load_resource_file "$DATADIR/treasures"
3512	or die "unable to load treasurelists\n";	3659	or die "unable to load treasurelists\n";
3513	}	3660	}
3514		3661
3515	sub reload_sound {	3662	sub reload_sound {
3516	trace "loading sound config from $DATADIR/sound\n";	3663	trace "loading sound config from $DATADIR/sound\n";
3517		3664
3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519	or die "$DATADIR/sound $!";
3520
3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3665	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522		3666
3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3667	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524	my $sound = $soundconf->{compat}[$_]	3668	my $sound = $soundconf->{compat}[$_]
3525	or next;	3669	or next;
3526		3670
…		…
3533	my $face = cf::face::find "sound/$v";	3677	my $face = cf::face::find "sound/$v";
3534	cf::sound::set $k => $face;	3678	cf::sound::set $k => $face;
3535	}	3679	}
3536	}	3680	}
3537		3681
		3682	#d# move docstuff to help or so
		3683	our %DOCSTRING;
		3684
		3685	sub reload_pod {
		3686	trace "loading pods $PODDIR\n";
		3687
		3688	%DOCSTRING = ();
		3689	my @command_list;
		3690
		3691	for (
		3692	[0, "command_help"],
		3693	[1, "emote_help"],
		3694	[2, "dmcommand_help"],
		3695	) {
		3696	my ($type, $path) = @$_;
		3697
		3698	my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
		3699	or die "unable to load $path";
		3700
		3701	my $level = 1e9;
		3702	my $rpar;
		3703
		3704	for my $par (@$paragraphs) {
		3705	if ($par->{type} eq "head2") {
		3706	# this code taken almost verbatim from DC/Protocol.pm
		3707
		3708	if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
		3709	my $cmd = $1;
		3710	my @args = split /\|/, $2;
		3711	@args = (".*") unless @args;
		3712
		3713	$_ = $_ eq ".*" ? "" : " $_"
		3714	for @args;
		3715
		3716	my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
		3717
		3718	$rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
		3719
		3720	push @command_list, [$type, \@variants];
		3721	$level = $par->{level};
		3722	} else {
		3723	error "$par->{markup}: unparsable command heading";
		3724	}
		3725	} elsif ($par->{level} > $level) {
		3726	$$rpar .= &cf::pod::as_cfpod ([$par]);
		3727	}
		3728
		3729	cf::cede_to_tick;
		3730	}
		3731	}
		3732
		3733	@command_list = sort {
		3734	$a->[0] <=> $b->[0]
		3735	or $a->[1] cmp $b->[1]
		3736	} @command_list;
		3737
		3738	cf::cede_to_tick;
		3739
		3740	add_face "res/command_list" => FT_RSRC,
		3741	JSON::XS->new->utf8->encode (\@command_list);
		3742	}
		3743
3538	sub reload_resources {	3744	sub reload_resources {
3539	trace "reloading resource files...\n";	3745	trace "reloading resource files...\n";
3540		3746
3541	reload_exp_table;
3542	reload_materials;	3747	reload_materials;
3543	reload_facedata;	3748	reload_facedata;
		3749	reload_exp_table;
3544	reload_sound;	3750	reload_sound;
3545	reload_archetypes;	3751	reload_archetypes;
3546	reload_regions;	3752	reload_regions;
3547	reload_treasures;	3753	reload_treasures;
		3754	reload_pod;
3548		3755
3549	trace "finished reloading resource files\n";	3756	trace "finished reloading resource files\n";
3550	}	3757	}
3551		3758
3552	sub reload_config {	3759	sub reload_config {
3553	trace "reloading config file...\n";	3760	trace "reloading config file...\n";
3554		3761
3555	0 < aio_load "$CONFDIR/config", my $config	3762	my $config = load_file "$CONFDIR/config";
3556	or die "$CONFDIR/config: $!";
3557
3558	utf8::decode $config;	3763	utf8::decode $config;
3559		3764	*CFG = decode_yaml $config;
3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561	*CFG = YAML::XS::Load $config;
3562		3765
3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3766	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564		3767
3565	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3768	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3566	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3769	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3604		3807
3605	sub main {	3808	sub main {
3606	cf::init_globals; # initialise logging	3809	cf::init_globals; # initialise logging
3607		3810
3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3811	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3812	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3813	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3814	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612		3815
3613	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3816	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3614		3817
3615	# we must not ever block the main coroutine	3818	# we must not ever block the main coroutine
3616	local $Coro::idle = sub {	3819	$Coro::idle = sub {
3617	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3820	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3618	(async {	3821	(async {
3619	$Coro::current->{desc} = "IDLE BUG HANDLER";	3822	$Coro::current->{desc} = "IDLE BUG HANDLER";
3620	EV::loop EV::LOOP_ONESHOT;	3823	EV::loop EV::LOOP_ONESHOT;
3621	})->prio (Coro::PRIO_MAX);	3824	})->prio (Coro::PRIO_MAX);
…		…
3624	evthread_start IO::AIO::poll_fileno;	3827	evthread_start IO::AIO::poll_fileno;
3625		3828
3626	cf::sync_job {	3829	cf::sync_job {
3627	cf::incloader::init ();	3830	cf::incloader::init ();
3628		3831
		3832	db_init;
		3833
3629	cf::init_anim;	3834	cf::init_anim;
3630	cf::init_attackmess;	3835	cf::init_attackmess;
3631	cf::init_dynamic;	3836	cf::init_dynamic;
3632		3837
3633	cf::load_settings;	3838	cf::load_settings;
3634		3839
3635	reload_resources;	3840	reload_resources;
3636	reload_config;	3841	reload_config;
3637	db_init;
3638		3842
3639	cf::init_uuid;	3843	cf::init_uuid;
3640	cf::init_signals;	3844	cf::init_signals;
3641	cf::init_skills;	3845	cf::init_skills;
3642		3846
…		…
3650		3854
3651	# no (long-running) fork's whatsoever before this point(!)	3855	# no (long-running) fork's whatsoever before this point(!)
3652	use POSIX ();	3856	use POSIX ();
3653	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3857	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3654		3858
3655	(pop @POST_INIT)->(0) while @POST_INIT;	3859	cf::_post_init 0;
3656	};	3860	};
3657		3861
3658	cf::object::thawer::errors_are_fatal 0;	3862	cf::object::thawer::errors_are_fatal 0;
3659	info "parse errors in files are no longer fatal from this point on.\n";	3863	info "parse errors in files are no longer fatal from this point on.\n";
3660		3864
3661	my $free_main; $free_main = EV::idle sub {	3865	AE::postpone {
3662	undef $free_main;
3663	undef &main; # free gobs of memory :)	3866	undef &main; # free gobs of memory :)
3664	};	3867	};
3665		3868
3666	goto &main_loop;	3869	goto &main_loop;
3667	}	3870	}
…		…
3824		4027
3825	cf::write_runtime_sync; # external watchdog should not bark	4028	cf::write_runtime_sync; # external watchdog should not bark
3826		4029
3827	trace "emergency_perl_save: flushing outstanding aio requests";	4030	trace "emergency_perl_save: flushing outstanding aio requests";
3828	while (IO::AIO::nreqs || BDB::nreqs) {	4031	while (IO::AIO::nreqs || BDB::nreqs) {
3829	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4032	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3830	}	4033	}
3831		4034
3832	cf::write_runtime_sync; # external watchdog should not bark	4035	cf::write_runtime_sync; # external watchdog should not bark
3833	};	4036	};
3834		4037
…		…
3883		4086
3884	my $t1 = AE::time;	4087	my $t1 = AE::time;
3885		4088
3886	while ($RELOAD) {	4089	while ($RELOAD) {
3887	cf::get_slot 0.1, -1, "reload_perl";	4090	cf::get_slot 0.1, -1, "reload_perl";
3888	info "reloading...";	4091	info "perl_reload: reloading...";
3889		4092
3890	trace "entering sync_job";	4093	trace "perl_reload: entering sync_job";
3891		4094
3892	cf::sync_job {	4095	cf::sync_job {
3893	#cf::emergency_save;	4096	#cf::emergency_save;
3894		4097
3895	trace "cancelling all extension coros";	4098	trace "perl_reload: cancelling all extension coros";
3896	$_->cancel for values %EXT_CORO;	4099	$_->cancel for values %EXT_CORO;
3897	%EXT_CORO = ();	4100	%EXT_CORO = ();
3898		4101
3899	trace "removing commands";	4102	trace "perl_reload: removing commands";
3900	%COMMAND = ();	4103	%COMMAND = ();
3901		4104
3902	trace "removing ext/exti commands";	4105	trace "perl_reload: removing ext/exti commands";
3903	%EXTCMD = ();	4106	%EXTCMD = ();
3904	%EXTICMD = ();	4107	%EXTICMD = ();
3905		4108
3906	trace "unloading/nuking all extensions";	4109	trace "perl_reload: unloading/nuking all extensions";
3907	for my $pkg (@EXTS) {	4110	for my $pkg (@EXTS) {
3908	trace "... unloading $pkg";	4111	trace "... unloading $pkg";
3909		4112
3910	if (my $cb = $pkg->can ("unload")) {	4113	if (my $cb = $pkg->can ("unload")) {
3911	eval {	4114	eval {
…		…
3916		4119
3917	trace "... clearing $pkg";	4120	trace "... clearing $pkg";
3918	clear_package $pkg;	4121	clear_package $pkg;
3919	}	4122	}
3920		4123
3921	trace "unloading all perl modules loaded from $LIBDIR";	4124	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922	while (my ($k, $v) = each %INC) {	4125	while (my ($k, $v) = each %INC) {
3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4126	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924		4127
3925	trace "... unloading $k";	4128	trace "... unloading $k";
3926	delete $INC{$k};	4129	delete $INC{$k};
…		…
3933	}	4136	}
3934		4137
3935	clear_package $k;	4138	clear_package $k;
3936	}	4139	}
3937		4140
3938	trace "getting rid of safe::, as good as possible";	4141	trace "perl_reload: getting rid of safe::, as good as possible";
3939	clear_package "safe::$_"	4142	clear_package "safe::$_"
3940	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4143	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3941		4144
3942	trace "unloading cf.pm \"a bit\"";	4145	trace "perl_reload: unloading cf.pm \"a bit\"";
3943	delete $INC{"cf.pm"};	4146	delete $INC{"cf.pm"};
3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4147	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945		4148
3946	# don't, removes xs symbols, too,	4149	# don't, removes xs symbols, too,
3947	# and global variables created in xs	4150	# and global variables created in xs
3948	#clear_package __PACKAGE__;	4151	#clear_package __PACKAGE__;
3949		4152
3950	info "unload completed, starting to reload now";	4153	info "perl_reload: unload completed, starting to reload now";
3951		4154
3952	trace "reloading cf.pm";	4155	trace "perl_reload: reloading cf.pm";
3953	require cf;	4156	require cf;
3954	cf::_connect_to_perl_1;	4157	cf::_connect_to_perl_1;
3955		4158
3956	trace "loading config and database again";	4159	trace "perl_reload: loading config and database again";
3957	cf::reload_config;	4160	cf::reload_config;
3958		4161
3959	trace "loading extensions";	4162	trace "perl_reload: loading extensions";
3960	cf::load_extensions;	4163	cf::load_extensions;
3961		4164
3962	if ($REATTACH_ON_RELOAD) {	4165	if ($REATTACH_ON_RELOAD) {
3963	trace "reattaching attachments to objects/players";	4166	trace "perl_reload: reattaching attachments to objects/players";
3964	_global_reattach; # objects, sockets	4167	_global_reattach; # objects, sockets
3965	trace "reattaching attachments to maps";	4168	trace "perl_reload: reattaching attachments to maps";
3966	reattach $_ for values %MAP;	4169	reattach $_ for values %MAP;
3967	trace "reattaching attachments to players";	4170	trace "perl_reload: reattaching attachments to players";
3968	reattach $_ for values %PLAYER;	4171	reattach $_ for values %PLAYER;
3969	}	4172	}
3970		4173
3971	trace "running post_init jobs";	4174	cf::_post_init 1;
3972	(pop @POST_INIT)->(1) while @POST_INIT;
3973		4175
3974	trace "leaving sync_job";	4176	trace "perl_reload: leaving sync_job";
3975		4177
3976	1	4178	1
3977	} or do {	4179	} or do {
3978	error $@;	4180	error $@;
3979	cf::cleanup "error while reloading, exiting.";	4181	cf::cleanup "perl_reload: error, exiting.";
3980	};	4182	};
3981		4183
3982	info "reloaded";
3983	--$RELOAD;	4184	--$RELOAD;
3984	}	4185	}
3985		4186
3986	$t1 = AE::time - $t1;	4187	$t1 = AE::time - $t1;
3987	info "reload completed in ${t1}s\n";	4188	info "perl_reload: completed in ${t1}s\n";
3988	};	4189	};
3989		4190
3990	our $RELOAD_WATCHER; # used only during reload	4191	our $RELOAD_WATCHER; # used only during reload
3991		4192
3992	sub reload_perl() {	4193	sub reload_perl() {
…		…
4017		4218
4018	#############################################################################	4219	#############################################################################
4019		4220
4020	my $bug_warning = 0;	4221	my $bug_warning = 0;
4021		4222
4022	our @WAIT_FOR_TICK;
4023	our @WAIT_FOR_TICK_BEGIN;
4024
4025	sub wait_for_tick() {	4223	sub wait_for_tick() {
4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4224	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027		4225
4028	my $signal = new Coro::Signal;	4226	$WAIT_FOR_TICK->wait;
4029	push @WAIT_FOR_TICK, $signal;
4030	$signal->wait;
4031	}	4227	}
4032		4228
4033	sub wait_for_tick_begin() {	4229	sub wait_for_tick_begin() {
4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4230	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035		4231
4036	my $signal = new Coro::Signal;	4232	my $signal = new Coro::Signal;
4037	push @WAIT_FOR_TICK_BEGIN, $signal;	4233	push @WAIT_FOR_TICK_BEGIN, $signal;
4038	$signal->wait;	4234	$signal->wait;
4039	}	4235	}
…		…
4043	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4239	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4044	unless ++$bug_warning > 10;	4240	unless ++$bug_warning > 10;
4045	return;	4241	return;
4046	}	4242	}
4047		4243
4048	cf::server_tick; # one server iteration	4244	cf::one_tick; # one server iteration
4049		4245
4050	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4246	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4051		4247
4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4248	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4249	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4059	}	4255	}
4060		4256
4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4257	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062	$sig->send;	4258	$sig->send;
4063	}	4259	}
4064	while (my $sig = shift @WAIT_FOR_TICK) {	4260	$WAIT_FOR_TICK->broadcast;
4065	$sig->send;
4066	}
4067		4261
4068	$LOAD = ($NOW - $TICK_START) / $TICK;	4262	$LOAD = ($NOW - $TICK_START) / $TICK;
4069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4263	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070		4264
4071	if (0) {	4265	if (0) {
…		…
4077	}	4271	}
4078	}	4272	}
4079		4273
4080	{	4274	{
4081	# configure BDB	4275	# configure BDB
		4276	info "initialising database";
4082		4277
4083	BDB::min_parallel 16;	4278	BDB::min_parallel 16;
4084	BDB::max_poll_reqs $TICK * 0.1;	4279	BDB::max_poll_reqs $TICK * 0.1;
4085	$AnyEvent::BDB::WATCHER->priority (1);	4280	#$AnyEvent::BDB::WATCHER->priority (1);
4086		4281
4087	unless ($DB_ENV) {	4282	unless ($DB_ENV) {
4088	$DB_ENV = BDB::db_env_create;	4283	$DB_ENV = BDB::db_env_create;
4089	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4284	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4285	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4115	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4310	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116	};	4311	};
4117	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4312	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4313	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119	};	4314	};
		4315
		4316	info "database initialised";
4120	}	4317	}
4121		4318
4122	{	4319	{
4123	# configure IO::AIO	4320	# configure IO::AIO
4124		4321
		4322	info "initialising aio";
4125	IO::AIO::min_parallel 8;	4323	IO::AIO::min_parallel 8;
4126	IO::AIO::max_poll_time $TICK * 0.1;	4324	IO::AIO::max_poll_time $TICK * 0.1;
4127	undef $AnyEvent::AIO::WATCHER;	4325	undef $AnyEvent::AIO::WATCHER;
		4326	info "aio initialised";
4128	}	4327	}
4129		4328
4130	my $_log_backtrace;	4329	our $_log_backtrace;
		4330	our $_log_backtrace_last;
4131		4331
4132	sub _log_backtrace {	4332	sub _log_backtrace {
4133	my ($msg, @addr) = @_;	4333	my ($msg, @addr) = @_;
4134		4334
4135	$msg =~ s/\n//;	4335	$msg =~ s/\n$//;
4136		4336
		4337	if ($_log_backtrace_last eq $msg) {
		4338	LOG llevInfo, "[ABT] $msg\n";
		4339	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137	# limit the # of concurrent backtraces	4340	# limit the # of concurrent backtraces
4138	if ($_log_backtrace < 2) {	4341	} elsif ($_log_backtrace < 2) {
		4342	$_log_backtrace_last = $msg;
4139	++$_log_backtrace;	4343	++$_log_backtrace;
4140	my $perl_bt = Carp::longmess $msg;	4344	my $perl_bt = Carp::longmess $msg;
4141	async {	4345	async {
4142	$Coro::current->{desc} = "abt $msg";	4346	$Coro::current->{desc} = "abt $msg";
4143		4347
…		…
4163	LOG llevInfo, "[ABT] $_\n" for @bt;	4367	LOG llevInfo, "[ABT] $_\n" for @bt;
4164	--$_log_backtrace;	4368	--$_log_backtrace;
4165	};	4369	};
4166	} else {	4370	} else {
4167	LOG llevInfo, "[ABT] $msg\n";	4371	LOG llevInfo, "[ABT] $msg\n";
4168	LOG llevInfo, "[ABT] [suppressed]\n";	4372	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169	}	4373	}
4170	}	4374	}
4171		4375
4172	# load additional modules	4376	# load additional modules
4173	require "cf/$_.pm" for @EXTRA_MODULES;	4377	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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