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.543 by root, Wed May 5 23:23:29 2010 UTC vs.
Revision 1.597 by root, Sun Nov 11 02:14:37 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 ();
…		…
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE; # unused	119	#our %RESOURCE; # unused
112		120
113	our $OUTPUT_RATE_MIN = 3000;	121	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	122	our $OUTPUT_RATE_MAX = 1000000;
115		123
116	our $MAX_LINKS = 32; # how many chained exits to follow	124	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
127	our $DB_ENV;	135	our $DB_ENV;
128		136
129	our @EXTRA_MODULES = qw(pod match mapscript incloader);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		138
131	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		141
133	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
135	our $NOW;	145	our $NOW;
136		146
137	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		158
149	our @POST_INIT;	159	our @POST_INIT;
150		160
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
153		166
154	binmode STDOUT;	167	binmode STDOUT;
155	binmode STDERR;	168	binmode STDERR;
156		169
157	# read virtual server time, if available	170	# read virtual server time, if available
…		…
191		204
192	=over 4	205	=over 4
193		206
194	=item $cf::UPTIME	207	=item $cf::UPTIME
195		208
196	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
197		225
198	=item $cf::RUNTIME	226	=item $cf::RUNTIME
199		227
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	229	every server tick.
202		230
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		234
207	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
210	database environment.	238	database environment.
211		239
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	240	=item $cf::LOADAVG
221		241
222	The current CPU load on the server (alpha-smoothed), as a value between 0	242	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	243	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	253	from wherever your confdir points to.
234		254
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		256
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	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 process	258	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.	259	per tick), while 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.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
240		277
241	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
242		279
243	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	342	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	344	}
308		345
309	$EV::DIED = sub {	346	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
311	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
312		354
313	#############################################################################	355	#############################################################################
314		356
315	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
316		358
…		…
337	$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;
338	$d	380	$d
339	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
340	}	382	}
341		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
342	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
343		437
344	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
345		439
346	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
352	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
353		447
354	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
356		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
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		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]
		480	}
		481
357	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
358		483
359	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,
360	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
361		486
362	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	488	is a reload or not.
364		489
365	=cut	490	=cut
366		491
367	sub post_init(&) {	492	sub post_init(&) {
368	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
369	}	511	}
370		512
371	=item cf::lock_wait $string	513	=item cf::lock_wait $string
372		514
373	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
427	}	569	}
428		570
429	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
430		572
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	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
433	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 les than zero, interactive jobs
		579	should use 100 or more.
434		580
435	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
436	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
437		583
438	Useful for short background jobs.	584	Useful for short background jobs.
…		…
467	}	613	}
468	}	614	}
469		615
470	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
471	# 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
472	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	619	} else {
475	$busy = 0;	620	$busy = 0;
476	Coro::schedule;	621	Coro::schedule;
477	}	622	}
478	}	623	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
579		724
580	$coro	725	$coro
581	}	726	}
582		727
583	=item fork_call { }, $args	728	=item fork_call { }, @args
584		729
585	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
589		734
590	=cut	735	=cut
591		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
592	sub fork_call(&@) {	741	sub fork_call(&@) {
593	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
594		743
595	# we seemingly have to make a local copy of the whole thing,	744	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
598		747
599	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
600	reset_signals;	749	cf::post_fork;
601	&$cb	750	&$cb
602	}, @args;	751	} @args;
603		752
604	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
605	}	754	}
606		755
607	sub objinfo {	756	sub objinfo {
…		…
729		878
730	my @data;	879	my @data;
731	my $md5;	880	my $md5;
732		881
733	for (0 .. $#$src) {	882	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	884	}
737		885
738	# if processing is expensive, check	886	# if processing is expensive, check
739	# checksum first	887	# checksum first
740	if (1) {	888	if (1) {
…		…
1285	=cut	1433	=cut
1286		1434
1287	#############################################################################	1435	#############################################################################
1288	# command handling &c	1436	# command handling &c
1289		1437
1290	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1291		1439
1292	Register a callback for execution when the client sends the user command	1440	Register a callback for execution when the client sends the user command
1293	$name.	1441	$name.
1294		1442
1295	=cut	1443	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1302		1450
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1452	}
1305		1453
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1455
1308	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1457	extcmd packet. Ext commands will be processed in the order they are
1310	received by the server, like other user commands. The first argument is	1458	received by the server, like other user commands. The first argument is
1311	the logged-in player. Ext commands can only be processed after a player	1459	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1460	has logged in successfully.
1313		1461
1314	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1315	called.
1316		1463
		1464	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1465
		1466	Same as C<cf::register_extcmd>, but instead of returning values, the
		1467	callback needs to clal the C<$reply> function.
		1468
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1470
1319	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1320	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1321	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1322	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1475	log-in.
1324		1476
1325	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1326	called.
1327		1478
1328	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1480
		1481	Same as C<cf::register_extcmd>, but instead of returning values, the
		1482	callback needs to clal the C<$reply> function.
		1483
		1484	=cut
		1485
1330	sub register_extcmd {	1486	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1332		1488
1333	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1334	}	1490	}
1335		1491
1336	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1338		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1339	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1340	}	1508	}
1341		1509
1342	use File::Glob ();	1510	use File::Glob ();
1343		1511
1344	cf::player->attach (	1512	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1359		1527
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1529
1362	if (ref $msg) {	1530	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1532
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1533	if (my $cb = $EXTACMD{$type}) {
		1534	$cb->(
		1535	$pl,
		1536	sub {
		1537	$pl->ext_msg ("reply-$reply", @_)
		1538	if $reply;
		1539	},
		1540	@payload
		1541	);
		1542	} else {
		1543	my @reply;
		1544
		1545	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1372	}	1551	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1552
1377	} else {	1553	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1555	}
1380		1556
…		…
1393	};	1569	};
1394		1570
1395	$grp	1571	$grp
1396	}	1572	}
1397		1573
		1574	sub _ext_cfg_reg($$$$) {
		1575	my ($rvar, $varname, $cfgname, $default) = @_;
		1576
		1577	$cfgname = lc $varname
		1578	unless length $cfgname;
		1579
		1580	$EXT_CFG{$cfgname} = [$rvar, $default];
		1581
		1582	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1583	}
		1584
1398	sub load_extensions {	1585	sub load_extensions {
1399	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1400		1589
1401	cf::sync_job {	1590	cf::sync_job {
1402	my %todo;	1591	my %todo;
1403		1592
1404	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1636	unless exists $done{$_};
1448	}	1637	}
1449		1638
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1640
		1641	my $source = $v->{source};
		1642
		1643	# support "CONF varname :confname = default" pseudo-statements
		1644	$source =~ s{
		1645	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1646	}{
		1647	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1648	}gmxe;
		1649
1452	my $active = eval $v->{source};	1650	my $active = eval $source;
1453		1651
1454	if (length $@) {	1652	if (length $@) {
1455	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1456		1654
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1672
1475	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1478	}	1676	}
		1677
		1678	last;
1479	}	1679	}
1480	}	1680	}
1481	};	1681	};
1482	}	1682	}
1483		1683
…		…
1641	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1642		1842
1643	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1844	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1645		1845
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1847	$pl->deactivate;
		1848
1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1849	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1650	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1651		1854
1652	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1740		1943
1741	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742		1945
1743	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1744		1947
1745	=item $player->ext_reply ($msgid, @msg)
1746
1747	Sends an ext reply to the player.
1748
1749	=cut
1750
1751	sub ext_reply($$@) {
1752	my ($self, $id, @msg) = @_;
1753
1754	$self->ns->ext_reply ($id, @msg)
1755	}
1756
1757	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1758		1949
1759	Sends an ext event to the client.	1950	Sends an ext event to the client.
1760		1951
1761	=cut	1952	=cut
…		…
1820	sub generate_random_map {	2011	sub generate_random_map {
1821	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1822		2013
1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2014	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824		2015
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830	$rmp->{exit_on_final_map},
1831	$rmp->{xsize}, $rmp->{ysize},
1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837	(cf::region::find $rmp->{region}), $rmp->{custom}
1838	)
1839	}	2017	}
1840		2018
1841	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1842		2020
1843	Register a handler for the map path matching the given regex at the	2021	Register a handler for the map path matching the given regex at the
…		…
1894	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2073	$path = "$base/$path";
1896	}	2074	}
1897		2075
1898	for ($path) {	2076	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1902	}	2079	}
1903		2080
1904	$path	2081	$path
…		…
1922		2099
1923	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2101	()
1925	}	2102	}
1926		2103
		2104	# may re-bless or do other evil things
1927	sub init {	2105	sub init {
1928	my ($self) = @_;	2106	my ($self) = @_;
1929		2107
1930	$self	2108	$self
1931	}	2109	}
…		…
1996	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
1997		2175
1998	1	2176	1
1999	}	2177	}
2000		2178
		2179	# used to laod the header of an original map
2001	sub load_header_orig {	2180	sub load_header_orig {
2002	my ($self) = @_;	2181	my ($self) = @_;
2003		2182
2004	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2005	}	2184	}
2006		2185
		2186	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2187	sub load_header_temp {
2008	my ($self) = @_;	2188	my ($self) = @_;
2009		2189
2010	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2011	}	2191	}
2012		2192
		2193	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2194	sub prepare_temp {
2014	my ($self) = @_;	2195	my ($self) = @_;
2015		2196
2016	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2017	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2018	# safety	2199	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2202	}
2022		2203
		2204	# called after loading the header from an original map
2023	sub prepare_orig {	2205	sub prepare_orig {
2024	my ($self) = @_;	2206	my ($self) = @_;
2025		2207
2026	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2053	sub find {	2235	sub find {
2054	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2055		2237
2056	cf::cede_to_tick;	2238	cf::cede_to_tick;
2057		2239
2058	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2059		2241
2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2062		2244
2063	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2094		2276
2095	{	2277	{
2096	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2097		2279
2098	return unless $self->valid;	2280	return unless $self->valid;
2099	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2100
2101	$self->in_memory (cf::MAP_LOADING);
2102		2282
2103	$self->alloc;	2283	$self->alloc;
2104		2284
2105	$self->pre_load;	2285	$self->pre_load;
2106	cf::cede_to_tick;	2286	cf::cede_to_tick;
2107		2287
		2288	if (exists $self->{load_path}) {
2108	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2109	$f->skip_block;	2290	$f->skip_block;
2110	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2111	or return;	2292	or return;
2112		2293
2113	$self->post_load_original	2294	$self->post_load_original
2114	if delete $self->{load_original};	2295	if delete $self->{load_original};
2115		2296
2116	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2117	utf8::encode $uniq;	2298	utf8::encode $uniq;
2118	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2119	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2120	$self->clear_unique_items;	2301	$self->clear_unique_items;
2121	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2122	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2123	}	2305	}
2124	}	2306	}
2125	}
2126		2307
2127	$f->resolve_delayed_derefs;	2308	$f->resolve_delayed_derefs;
		2309	} else {
		2310	$self->post_load_original
		2311	if delete $self->{load_original};
		2312	}
		2313
		2314	$self->state (cf::MAP_INACTIVE);
2128		2315
2129	cf::cede_to_tick;	2316	cf::cede_to_tick;
2130	# now do the right thing for maps	2317	# now do the right thing for maps
2131	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2132	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2136	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2137	$self->decay_objects;	2324	$self->decay_objects;
2138	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2139	$self->update_buttons;	2326	$self->update_buttons;
2140	cf::cede_to_tick;	2327	cf::cede_to_tick;
2141	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2142	}	2329	}
2143		2330
2144	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2145	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2146
2147	$self->in_memory (cf::MAP_ACTIVE);
2148	}	2333	}
2149		2334
2150	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2151	}	2338	}
2152		2339
2153	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2154	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2155	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2163	# if $self->per_party;	2350	# if $self->per_party;
2164		2351
2165	$self	2352	$self
2166	}	2353	}
2167		2354
2168	# find and load all maps in the 3x3 area around a map
2169	sub load_neighbours {
2170	my ($map) = @_;
2171
2172	my @neigh; # diagonal neighbours
2173
2174	for (0 .. 3) {
2175	my $neigh = $map->tile_path ($_)
2176	or next;
2177	$neigh = find $neigh, $map
2178	or next;
2179	$neigh->load;
2180
2181	# now find the diagonal neighbours
2182	push @neigh,
2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2185	}
2186
2187	for (grep defined $_->[0], @neigh) {
2188	my ($path, $origin) = @$_;
2189	my $neigh = find $path, $origin
2190	or next;
2191	$neigh->load;
2192	}
2193	}
2194
2195	sub find_sync {	2355	sub find_sync {
2196	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2197		2357
		2358	# it's a bug to call this from the main context
2198	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2200		2361
2201	find $path, $origin	2362	find $path, $origin
2202	}	2363	}
2203		2364
2204	sub do_load_sync {	2365	sub do_load_sync {
2205	my ($map) = @_;	2366	my ($map) = @_;
2206		2367
		2368	# it's a bug to call this from the main context
2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2209		2371
2210	$map->load;	2372	$map->load;
2211	}	2373	}
…		…
2214	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2215		2377
2216	sub find_async {	2378	sub find_async {
2217	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2218		2380
2219	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2220		2382
2221	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2222	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2223	}	2385	}
2224		2386
2225	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2226		2388
2227	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2286	sub swap_out {	2448	sub swap_out {
2287	my ($self) = @_;	2449	my ($self) = @_;
2288		2450
2289	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2290		2452
2291	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2292	return if $self->{deny_save};	2454	return if $self->{deny_save};
2293	return if $self->players;	2455	return if $self->players;
2294		2456
2295	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2296	$self->deactivate;	2458	$self->deactivate;
2297	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2298	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2299		2461
2300	# then atomically save	2462	# then atomically save
2301	$self->_save;	2463	$self->_save;
2302		2464
2303	# then free the map	2465	# then free the map
…		…
2329		2491
2330	return if $self->players;	2492	return if $self->players;
2331		2493
2332	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2333		2495
2334	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2335		2497
2336	# need to save uniques path	2498	# need to save uniques path
2337	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2338	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2339		2501
…		…
2669	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2670	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2671	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2672		2834
2673	$map->load;	2835	$map->load;
2674	$map->load_neighbours;
2675		2836
2676	return unless $self->contr->active;	2837	return unless $self->contr->active;
2677		2838
2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2735	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2736	}	2897	}
2737	}	2898	}
2738		2899
2739	my $map = eval {	2900	my $map = eval {
2740	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741		2902
2742	if ($map) {	2903	if ($map) {
2743	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2744	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2745	} else {	2906	} else {
…		…
2835	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2836		2997
2837	unless (eval {	2998	unless (eval {
2838	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2839		3000
2840	# random map handling
2841	{
2842	my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844	prepare_random_map $exit
2845	if $exit->slaying eq "/!";
2846	}
2847
2848	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2849	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2850	my $y = $exit->stats->sp;	3003	my $y = $exit->stats->sp;
		3004
		3005	# special map handling
		3006	my $slaying = $exit->slaying;
		3007
		3008	# special map handling
		3009	if ($slaying eq "/!") {
		3010	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3011
		3012	prepare_random_map $exit
		3013	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3014
		3015	$map = $exit->slaying;
		3016
		3017	} elsif ($slaying eq '!up') {
		3018	$map = $exit->map->tile_path (cf::TILE_UP);
		3019	$x = $exit->x;
		3020	$y = $exit->y;
		3021
		3022	} elsif ($slaying eq '!down') {
		3023	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3024	$x = $exit->x;
		3025	$y = $exit->y;
		3026	}
2851		3027
2852	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2853		3029
2854	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2855	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3080	=cut	3256	=cut
3081		3257
3082	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3083	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3084		3260
3085	if ($self->extcmd == 2) {
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087	} elsif ($self->extcmd == 1) { # TODO: remove
3088	push @msg, msgtype => "event_$type";
3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090	}
3091	}
3092
3093	=item $client->ext_reply ($msgid, @msg)
3094
3095	Sends an ext reply to the client.
3096
3097	=cut
3098
3099	sub cf::client::ext_reply($$@) {
3100	my ($self, $id, @msg) = @_;
3101
3102	if ($self->extcmd == 2) {
3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104	} elsif ($self->extcmd == 1) {
3105	#TODO: version 1, remove
3106	unshift @msg, msgtype => "reply", msgid => $id;
3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108	}
3109	}	3262	}
3110		3263
3111	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3112		3265
3113	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3168	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3169		3322
3170	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171		3324
3172	if (ref $msg) {	3325	if (ref $msg) {
3173	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174	"ARRAY" eq ref $msg
3175	? @$msg
3176	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177		3327
3178	my @reply;
3179
3180	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTIACMD{$type}) {
		3329	$cb->(
		3330	$ns,
		3331	sub {
		3332	$ns->ext_msg ("reply-$reply", @_)
		3333	if $reply;
		3334	},
		3335	@payload
		3336	);
		3337	} else {
		3338	my @reply;
		3339
		3340	if (my $cb = $EXTICMD{$type}) {
3181	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3182	}	3346	}
3183
3184	$ns->ext_reply ($reply, @reply)
3185	if $reply;
3186
3187	} else {	3347	} else {
3188	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3348	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3189	}	3349	}
3190		3350
3191	cf::override;	3351	cf::override;
…		…
3359	=cut	3519	=cut
3360		3520
3361	#############################################################################	3521	#############################################################################
3362	# the server's init and main functions	3522	# the server's init and main functions
3363		3523
		3524	our %FACEHASH; # hash => idx, #d# HACK for http server
		3525
		3526	# internal api, not fianlised
		3527	sub set_face {
		3528	my ($name, $type, $data) = @_;
		3529
		3530	my $idx = cf::face::find $name;
		3531
		3532	if ($idx) {
		3533	delete $FACEHASH{cf::face::get_chksum $idx};
		3534	} else {
		3535	$idx = cf::face::alloc $name;
		3536	}
		3537
		3538	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3539
		3540	cf::face::set_type $idx, $type;
		3541	cf::face::set_data $idx, 0, $data, $hash;
		3542	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3543	$FACEHASH{$hash} = $idx;#d#
		3544
		3545	$idx
		3546	}
		3547
3364	sub load_facedata($) {	3548	sub load_facedata($) {
3365	my ($path) = @_;	3549	my ($path) = @_;
3366		3550
3367	# HACK to clear player env face cache, we need some signal framework	3551	# HACK to clear player env face cache, we need some signal framework
3368	# for this (global event?)	3552	# for this (global event?)
…		…
3370		3554
3371	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3555	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3372		3556
3373	trace "loading facedata from $path\n";	3557	trace "loading facedata from $path\n";
3374		3558
3375	my $facedata;	3559	my $facedata = decode_storable load_file $path;
3376	0 < aio_load $path, $facedata
3377	or die "$path: $!";
3378
3379	$facedata = Coro::Storable::thaw $facedata;
3380		3560
3381	$facedata->{version} == 2	3561	$facedata->{version} == 2
3382	or cf::cleanup "$path: version mismatch, cannot proceed.";	3562	or cf::cleanup "$path: version mismatch, cannot proceed.";
3383		3563
3384	# patch in the exptable
3385	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3386	$facedata->{resource}{"res/exp_table"} = {
3387	type => FT_RSRC,
3388	data => $exp_table,
3389	hash => (Digest::MD5::md5 $exp_table),
3390	};
3391	cf::cede_to_tick;	3564	cf::cede_to_tick;
3392		3565
3393	{	3566	{
3394	my $faces = $facedata->{faceinfo};	3567	my $faces = delete $facedata->{faceinfo};
3395		3568
3396	while (my ($face, $info) = each %$faces) {	3569	for my $face (sort keys %$faces) {
		3570	my $info = $faces->{$face};
3397	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3571	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3398		3572
3399	cf::face::set_visibility $idx, $info->{visibility};	3573	cf::face::set_visibility $idx, $info->{visibility};
3400	cf::face::set_magicmap $idx, $info->{magicmap};	3574	cf::face::set_magicmap $idx, $info->{magicmap};
3401	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3575	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3402	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3576	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3403		3577	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3578	$FACEHASH{$info->{hash64}} = $idx;#d#
		3579
3404	cf::cede_to_tick;	3580	cf::cede_to_tick;
3405	}	3581	}
3406		3582
3407	while (my ($face, $info) = each %$faces) {	3583	while (my ($face, $info) = each %$faces) {
3408	next unless $info->{smooth};	3584	next unless $info->{smooth};
…		…
3420	cf::cede_to_tick;	3596	cf::cede_to_tick;
3421	}	3597	}
3422	}	3598	}
3423		3599
3424	{	3600	{
3425	my $anims = $facedata->{animinfo};	3601	my $anims = delete $facedata->{animinfo};
3426		3602
3427	while (my ($anim, $info) = each %$anims) {	3603	while (my ($anim, $info) = each %$anims) {
3428	cf::anim::set $anim, $info->{frames}, $info->{facings};	3604	cf::anim::set $anim, $info->{frames}, $info->{facings};
3429	cf::cede_to_tick;	3605	cf::cede_to_tick;
3430	}	3606	}
3431		3607
3432	cf::anim::invalidate_all; # d'oh	3608	cf::anim::invalidate_all; # d'oh
3433	}	3609	}
3434		3610
3435	{	3611	{
3436	my $res = $facedata->{resource};	3612	my $res = delete $facedata->{resource};
3437		3613
3438	while (my ($name, $info) = each %$res) {	3614	while (my ($name, $info) = each %$res) {
3439	if (defined $info->{type}) {	3615	if (defined (my $type = $info->{type})) {
		3616	# TODO: different hash - must free and use new index, or cache ixface data queue
3440	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3617	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3441		3618
		3619	cf::face::set_type $idx, $type;
3442	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3620	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3443	cf::face::set_type $idx, $info->{type};	3621	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3622	$FACEHASH{$info->{hash}} = $idx;#d#
3444	} else {	3623	} else {
3445	$RESOURCE{$name} = $info; # unused	3624	# $RESOURCE{$name} = $info; # unused
3446	}	3625	}
3447		3626
3448	cf::cede_to_tick;	3627	cf::cede_to_tick;
3449	}	3628	}
3450	}	3629	}
…		…
3468	my $status = load_resource_file_ $_[0];	3647	my $status = load_resource_file_ $_[0];
3469	get_slot 0.1, 100;	3648	get_slot 0.1, 100;
3470	cf::arch::commit_load;	3649	cf::arch::commit_load;
3471		3650
3472	$status	3651	$status
		3652	}
		3653
		3654	sub reload_exp_table {
		3655	_reload_exp_table;
		3656
		3657	set_face "res/exp_table" => FT_RSRC,
		3658	JSON::XS->new->utf8->canonical->encode (
		3659	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3660	);
		3661	}
		3662
		3663	sub reload_materials {
		3664	_reload_materials;
3473	}	3665	}
3474		3666
3475	sub reload_regions {	3667	sub reload_regions {
3476	# HACK to clear player env face cache, we need some signal framework	3668	# HACK to clear player env face cache, we need some signal framework
3477	# for this (global event?)	3669	# for this (global event?)
…		…
3492	}	3684	}
3493		3685
3494	sub reload_archetypes {	3686	sub reload_archetypes {
3495	load_resource_file "$DATADIR/archetypes"	3687	load_resource_file "$DATADIR/archetypes"
3496	or die "unable to load archetypes\n";	3688	or die "unable to load archetypes\n";
		3689
		3690	set_face "res/skill_info" => FT_RSRC,
		3691	JSON::XS->new->utf8->canonical->encode (
		3692	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3693	);
		3694	set_face "res/spell_paths" => FT_RSRC,
		3695	JSON::XS->new->utf8->canonical->encode (
		3696	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3697	);
3497	}	3698	}
3498		3699
3499	sub reload_treasures {	3700	sub reload_treasures {
3500	load_resource_file "$DATADIR/treasures"	3701	load_resource_file "$DATADIR/treasures"
3501	or die "unable to load treasurelists\n";	3702	or die "unable to load treasurelists\n";
3502	}	3703	}
3503		3704
3504	sub reload_sound {	3705	sub reload_sound {
3505	trace "loading sound config from $DATADIR/sound\n";	3706	trace "loading sound config from $DATADIR/sound\n";
3506		3707
3507	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3508	or die "$DATADIR/sound $!";
3509
3510	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3708	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3511		3709
3512	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3710	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3513	my $sound = $soundconf->{compat}[$_]	3711	my $sound = $soundconf->{compat}[$_]
3514	or next;	3712	or next;
3515		3713
…		…
3525	}	3723	}
3526		3724
3527	sub reload_resources {	3725	sub reload_resources {
3528	trace "reloading resource files...\n";	3726	trace "reloading resource files...\n";
3529		3727
		3728	reload_materials;
3530	reload_facedata;	3729	reload_facedata;
		3730	reload_exp_table;
3531	reload_sound;	3731	reload_sound;
3532	reload_archetypes;	3732	reload_archetypes;
3533	reload_regions;	3733	reload_regions;
3534	reload_treasures;	3734	reload_treasures;
3535		3735
…		…
3537	}	3737	}
3538		3738
3539	sub reload_config {	3739	sub reload_config {
3540	trace "reloading config file...\n";	3740	trace "reloading config file...\n";
3541		3741
3542	open my $fh, "<:utf8", "$CONFDIR/config"	3742	my $config = load_file "$CONFDIR/config";
3543	or return;	3743	utf8::decode $config;
3544		3744	*CFG = decode_yaml $config;
3545	local $/;
3546	*CFG = YAML::XS::Load scalar <$fh>;
3547		3745
3548	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3746	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3549		3747
3550	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3748	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3551	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3749	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3555	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3753	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3556	and die "WARNING: m(un)lockall failed: $!\n";	3754	and die "WARNING: m(un)lockall failed: $!\n";
3557	};	3755	};
3558	warn $@ if $@;	3756	warn $@ if $@;
3559	}	3757	}
3560
3561	trace "finished reloading resource files\n";
3562	}	3758	}
3563		3759
3564	sub pidfile() {	3760	sub pidfile() {
3565	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3761	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3566	or die "$PIDFILE: $!";	3762	or die "$PIDFILE: $!";
…		…
3591		3787
3592	sub main {	3788	sub main {
3593	cf::init_globals; # initialise logging	3789	cf::init_globals; # initialise logging
3594		3790
3595	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3791	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3596	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3792	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3597	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3793	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3598	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3794	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3599		3795
3600	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3796	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3601		3797
3602	# we must not ever block the main coroutine	3798	# we must not ever block the main coroutine
3603	local $Coro::idle = sub {	3799	$Coro::idle = sub {
3604	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3800	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3605	(async {	3801	(async {
3606	$Coro::current->{desc} = "IDLE BUG HANDLER";	3802	$Coro::current->{desc} = "IDLE BUG HANDLER";
3607	EV::loop EV::LOOP_ONESHOT;	3803	EV::loop EV::LOOP_ONESHOT;
3608	})->prio (Coro::PRIO_MAX);	3804	})->prio (Coro::PRIO_MAX);
…		…
3611	evthread_start IO::AIO::poll_fileno;	3807	evthread_start IO::AIO::poll_fileno;
3612		3808
3613	cf::sync_job {	3809	cf::sync_job {
3614	cf::incloader::init ();	3810	cf::incloader::init ();
3615		3811
3616	cf::init_experience;	3812	db_init;
		3813
3617	cf::init_anim;	3814	cf::init_anim;
3618	cf::init_attackmess;	3815	cf::init_attackmess;
3619	cf::init_dynamic;	3816	cf::init_dynamic;
3620		3817
3621	cf::load_settings;	3818	cf::load_settings;
3622	cf::load_materials;
3623		3819
3624	reload_resources;	3820	reload_resources;
3625	reload_config;	3821	reload_config;
3626	db_init;
3627		3822
3628	cf::init_uuid;	3823	cf::init_uuid;
3629	cf::init_signals;	3824	cf::init_signals;
3630	cf::init_skills;	3825	cf::init_skills;
3631		3826
…		…
3639		3834
3640	# no (long-running) fork's whatsoever before this point(!)	3835	# no (long-running) fork's whatsoever before this point(!)
3641	use POSIX ();	3836	use POSIX ();
3642	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3837	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3643		3838
3644	(pop @POST_INIT)->(0) while @POST_INIT;	3839	cf::_post_init 0;
3645	};	3840	};
3646		3841
3647	cf::object::thawer::errors_are_fatal 0;	3842	cf::object::thawer::errors_are_fatal 0;
3648	info "parse errors in files are no longer fatal from this point on.\n";	3843	info "parse errors in files are no longer fatal from this point on.\n";
3649		3844
3650	my $free_main; $free_main = EV::idle sub {	3845	AE::postpone {
3651	undef $free_main;
3652	undef &main; # free gobs of memory :)	3846	undef &main; # free gobs of memory :)
3653	};	3847	};
3654		3848
3655	goto &main_loop;	3849	goto &main_loop;
3656	}	3850	}
…		…
3813		4007
3814	cf::write_runtime_sync; # external watchdog should not bark	4008	cf::write_runtime_sync; # external watchdog should not bark
3815		4009
3816	trace "emergency_perl_save: flushing outstanding aio requests";	4010	trace "emergency_perl_save: flushing outstanding aio requests";
3817	while (IO::AIO::nreqs || BDB::nreqs) {	4011	while (IO::AIO::nreqs || BDB::nreqs) {
3818	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4012	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3819	}	4013	}
3820		4014
3821	cf::write_runtime_sync; # external watchdog should not bark	4015	cf::write_runtime_sync; # external watchdog should not bark
3822	};	4016	};
3823		4017
…		…
3872		4066
3873	my $t1 = AE::time;	4067	my $t1 = AE::time;
3874		4068
3875	while ($RELOAD) {	4069	while ($RELOAD) {
3876	cf::get_slot 0.1, -1, "reload_perl";	4070	cf::get_slot 0.1, -1, "reload_perl";
3877	info "reloading...";	4071	info "perl_reload: reloading...";
3878		4072
3879	trace "entering sync_job";	4073	trace "perl_reload: entering sync_job";
3880		4074
3881	cf::sync_job {	4075	cf::sync_job {
3882	#cf::emergency_save;	4076	#cf::emergency_save;
3883		4077
3884	trace "cancelling all extension coros";	4078	trace "perl_reload: cancelling all extension coros";
3885	$_->cancel for values %EXT_CORO;	4079	$_->cancel for values %EXT_CORO;
3886	%EXT_CORO = ();	4080	%EXT_CORO = ();
3887		4081
3888	trace "removing commands";	4082	trace "perl_reload: removing commands";
3889	%COMMAND = ();	4083	%COMMAND = ();
3890		4084
3891	trace "removing ext/exti commands";	4085	trace "perl_reload: removing ext/exti commands";
3892	%EXTCMD = ();	4086	%EXTCMD = ();
3893	%EXTICMD = ();	4087	%EXTICMD = ();
3894		4088
3895	trace "unloading/nuking all extensions";	4089	trace "perl_reload: unloading/nuking all extensions";
3896	for my $pkg (@EXTS) {	4090	for my $pkg (@EXTS) {
3897	trace "... unloading $pkg";	4091	trace "... unloading $pkg";
3898		4092
3899	if (my $cb = $pkg->can ("unload")) {	4093	if (my $cb = $pkg->can ("unload")) {
3900	eval {	4094	eval {
…		…
3905		4099
3906	trace "... clearing $pkg";	4100	trace "... clearing $pkg";
3907	clear_package $pkg;	4101	clear_package $pkg;
3908	}	4102	}
3909		4103
3910	trace "unloading all perl modules loaded from $LIBDIR";	4104	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3911	while (my ($k, $v) = each %INC) {	4105	while (my ($k, $v) = each %INC) {
3912	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4106	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3913		4107
3914	trace "... unloading $k";	4108	trace "... unloading $k";
3915	delete $INC{$k};	4109	delete $INC{$k};
…		…
3922	}	4116	}
3923		4117
3924	clear_package $k;	4118	clear_package $k;
3925	}	4119	}
3926		4120
3927	trace "getting rid of safe::, as good as possible";	4121	trace "perl_reload: getting rid of safe::, as good as possible";
3928	clear_package "safe::$_"	4122	clear_package "safe::$_"
3929	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4123	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3930		4124
3931	trace "unloading cf.pm \"a bit\"";	4125	trace "perl_reload: unloading cf.pm \"a bit\"";
3932	delete $INC{"cf.pm"};	4126	delete $INC{"cf.pm"};
3933	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4127	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3934		4128
3935	# don't, removes xs symbols, too,	4129	# don't, removes xs symbols, too,
3936	# and global variables created in xs	4130	# and global variables created in xs
3937	#clear_package __PACKAGE__;	4131	#clear_package __PACKAGE__;
3938		4132
3939	info "unload completed, starting to reload now";	4133	info "perl_reload: unload completed, starting to reload now";
3940		4134
3941	trace "reloading cf.pm";	4135	trace "perl_reload: reloading cf.pm";
3942	require cf;	4136	require cf;
3943	cf::_connect_to_perl_1;	4137	cf::_connect_to_perl_1;
3944		4138
3945	trace "loading config and database again";	4139	trace "perl_reload: loading config and database again";
3946	cf::reload_config;	4140	cf::reload_config;
3947		4141
3948	trace "loading extensions";	4142	trace "perl_reload: loading extensions";
3949	cf::load_extensions;	4143	cf::load_extensions;
3950		4144
3951	if ($REATTACH_ON_RELOAD) {	4145	if ($REATTACH_ON_RELOAD) {
3952	trace "reattaching attachments to objects/players";	4146	trace "perl_reload: reattaching attachments to objects/players";
3953	_global_reattach; # objects, sockets	4147	_global_reattach; # objects, sockets
3954	trace "reattaching attachments to maps";	4148	trace "perl_reload: reattaching attachments to maps";
3955	reattach $_ for values %MAP;	4149	reattach $_ for values %MAP;
3956	trace "reattaching attachments to players";	4150	trace "perl_reload: reattaching attachments to players";
3957	reattach $_ for values %PLAYER;	4151	reattach $_ for values %PLAYER;
3958	}	4152	}
3959		4153
3960	trace "running post_init jobs";	4154	cf::_post_init 1;
3961	(pop @POST_INIT)->(1) while @POST_INIT;
3962		4155
3963	trace "leaving sync_job";	4156	trace "perl_reload: leaving sync_job";
3964		4157
3965	1	4158	1
3966	} or do {	4159	} or do {
3967	error $@;	4160	error $@;
3968	cf::cleanup "error while reloading, exiting.";	4161	cf::cleanup "perl_reload: error, exiting.";
3969	};	4162	};
3970		4163
3971	info "reloaded";
3972	--$RELOAD;	4164	--$RELOAD;
3973	}	4165	}
3974		4166
3975	$t1 = AE::time - $t1;	4167	$t1 = AE::time - $t1;
3976	info "reload completed in ${t1}s\n";	4168	info "perl_reload: completed in ${t1}s\n";
3977	};	4169	};
3978		4170
3979	our $RELOAD_WATCHER; # used only during reload	4171	our $RELOAD_WATCHER; # used only during reload
3980		4172
3981	sub reload_perl() {	4173	sub reload_perl() {
…		…
4006		4198
4007	#############################################################################	4199	#############################################################################
4008		4200
4009	my $bug_warning = 0;	4201	my $bug_warning = 0;
4010		4202
4011	our @WAIT_FOR_TICK;
4012	our @WAIT_FOR_TICK_BEGIN;
4013
4014	sub wait_for_tick {	4203	sub wait_for_tick() {
4015	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4204	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4016		4205
4017	my $signal = new Coro::Signal;	4206	$WAIT_FOR_TICK->wait;
4018	push @WAIT_FOR_TICK, $signal;
4019	$signal->wait;
4020	}	4207	}
4021		4208
4022	sub wait_for_tick_begin {	4209	sub wait_for_tick_begin() {
4023	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4210	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4024		4211
4025	my $signal = new Coro::Signal;	4212	my $signal = new Coro::Signal;
4026	push @WAIT_FOR_TICK_BEGIN, $signal;	4213	push @WAIT_FOR_TICK_BEGIN, $signal;
4027	$signal->wait;	4214	$signal->wait;
4028	}	4215	}
…		…
4032	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4219	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4033	unless ++$bug_warning > 10;	4220	unless ++$bug_warning > 10;
4034	return;	4221	return;
4035	}	4222	}
4036		4223
4037	cf::server_tick; # one server iteration	4224	cf::one_tick; # one server iteration
4038		4225
4039	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4226	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4040		4227
4041	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4228	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4042	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4229	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4048	}	4235	}
4049		4236
4050	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4237	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4051	$sig->send;	4238	$sig->send;
4052	}	4239	}
4053	while (my $sig = shift @WAIT_FOR_TICK) {	4240	$WAIT_FOR_TICK->broadcast;
4054	$sig->send;
4055	}
4056		4241
4057	$LOAD = ($NOW - $TICK_START) / $TICK;	4242	$LOAD = ($NOW - $TICK_START) / $TICK;
4058	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4243	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4059		4244
4060	if (0) {	4245	if (0) {
…		…
4066	}	4251	}
4067	}	4252	}
4068		4253
4069	{	4254	{
4070	# configure BDB	4255	# configure BDB
		4256	info "initialising database";
4071		4257
4072	BDB::min_parallel 16;	4258	BDB::min_parallel 16;
4073	BDB::max_poll_reqs $TICK * 0.1;	4259	BDB::max_poll_reqs $TICK * 0.1;
4074	$AnyEvent::BDB::WATCHER->priority (1);	4260	#$AnyEvent::BDB::WATCHER->priority (1);
4075		4261
4076	unless ($DB_ENV) {	4262	unless ($DB_ENV) {
4077	$DB_ENV = BDB::db_env_create;	4263	$DB_ENV = BDB::db_env_create;
4078	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4264	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4079	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4265	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4104	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4290	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4105	};	4291	};
4106	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4292	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4107	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4293	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4108	};	4294	};
		4295
		4296	info "database initialised";
4109	}	4297	}
4110		4298
4111	{	4299	{
4112	# configure IO::AIO	4300	# configure IO::AIO
4113		4301
		4302	info "initialising aio";
4114	IO::AIO::min_parallel 8;	4303	IO::AIO::min_parallel 8;
4115	IO::AIO::max_poll_time $TICK * 0.1;	4304	IO::AIO::max_poll_time $TICK * 0.1;
4116	undef $AnyEvent::AIO::WATCHER;	4305	undef $AnyEvent::AIO::WATCHER;
		4306	info "aio initialised";
4117	}	4307	}
4118		4308
4119	my $_log_backtrace;	4309	our $_log_backtrace;
		4310	our $_log_backtrace_last;
4120		4311
4121	sub _log_backtrace {	4312	sub _log_backtrace {
4122	my ($msg, @addr) = @_;	4313	my ($msg, @addr) = @_;
4123		4314
4124	$msg =~ s/\n//;	4315	$msg =~ s/\n$//;
4125		4316
		4317	if ($_log_backtrace_last eq $msg) {
		4318	LOG llevInfo, "[ABT] $msg\n";
		4319	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4126	# limit the # of concurrent backtraces	4320	# limit the # of concurrent backtraces
4127	if ($_log_backtrace < 2) {	4321	} elsif ($_log_backtrace < 2) {
		4322	$_log_backtrace_last = $msg;
4128	++$_log_backtrace;	4323	++$_log_backtrace;
4129	my $perl_bt = Carp::longmess $msg;	4324	my $perl_bt = Carp::longmess $msg;
4130	async {	4325	async {
4131	$Coro::current->{desc} = "abt $msg";	4326	$Coro::current->{desc} = "abt $msg";
4132		4327
…		…
4152	LOG llevInfo, "[ABT] $_\n" for @bt;	4347	LOG llevInfo, "[ABT] $_\n" for @bt;
4153	--$_log_backtrace;	4348	--$_log_backtrace;
4154	};	4349	};
4155	} else {	4350	} else {
4156	LOG llevInfo, "[ABT] $msg\n";	4351	LOG llevInfo, "[ABT] $msg\n";
4157	LOG llevInfo, "[ABT] [suppressed]\n";	4352	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4158	}	4353	}
4159	}	4354	}
4160		4355
4161	# load additional modules	4356	# load additional modules
4162	require "cf/$_.pm" for @EXTRA_MODULES;	4357	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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