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.546 by root, Thu May 6 22:57:49 2010 UTC vs.
Revision 1.596 by root, Fri Nov 9 20:37:57 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.
…		…
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 thread	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.
240		272
241	=cut	273	=cut
242		274
243	sub wait_for_tick();	275	sub wait_for_tick();
244	sub wait_for_tick_begin();	276	sub wait_for_tick_begin();
…		…
310	)) {	342	)) {
311	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
312	}	344	}
313		345
314	$EV::DIED = sub {	346	$EV::DIED = sub {
315	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
316	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
317		354
318	#############################################################################	355	#############################################################################
319		356
320	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
321		358
…		…
342	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
343	$d	380	$d
344	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
345	}	382	}
346		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
347	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
348		437
349	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
350		439
351	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
357	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
358		447
359	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
360	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
361		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		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
362	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
363		483
364	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,
365	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
366		486
367	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
368	is a reload or not.	488	is a reload or not.
369		489
370	=cut	490	=cut
371		491
372	sub post_init(&) {	492	sub post_init(&) {
373	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	}
374	}	511	}
375		512
376	=item cf::lock_wait $string	513	=item cf::lock_wait $string
377		514
378	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
431	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
432	}	569	}
433		570
434	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
435		572
436	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	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.
439		580
440	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
441	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
442		583
443	Useful for short background jobs.	584	Useful for short background jobs.
…		…
472	}	613	}
473	}	614	}
474		615
475	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
476	# 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
477	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
478	$signal->wait;
479	} else {	619	} else {
480	$busy = 0;	620	$busy = 0;
481	Coro::schedule;	621	Coro::schedule;
482	}	622	}
483	}	623	}
…		…
583	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
584		724
585	$coro	725	$coro
586	}	726	}
587		727
588	=item fork_call { }, $args	728	=item fork_call { }, @args
589		729
590	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
591	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
592	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
593	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
594		734
595	=cut	735	=cut
596		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
597	sub fork_call(&@) {	741	sub fork_call(&@) {
598	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
599		743
600	# 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,
601	# otherwise perl prematurely frees the stuff :/	745	# otherwise perl prematurely frees the stuff :/
602	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
603		747
604	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
605	reset_signals;	749	cf::post_fork;
606	&$cb	750	&$cb
607	}, @args;	751	} @args;
608		752
609	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
610	}	754	}
611		755
612	sub objinfo {	756	sub objinfo {
…		…
734		878
735	my @data;	879	my @data;
736	my $md5;	880	my $md5;
737		881
738	for (0 .. $#$src) {	882	for (0 .. $#$src) {
739	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
740	or Carp::croak "$src->[$_]: $!";
741	}	884	}
742		885
743	# if processing is expensive, check	886	# if processing is expensive, check
744	# checksum first	887	# checksum first
745	if (1) {	888	if (1) {
…		…
1290	=cut	1433	=cut
1291		1434
1292	#############################################################################	1435	#############################################################################
1293	# command handling &c	1436	# command handling &c
1294		1437
1295	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1296		1439
1297	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
1298	$name.	1441	$name.
1299		1442
1300	=cut	1443	=cut
…		…
1306	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1307		1450
1308	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1309	}	1452	}
1310		1453
1311	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1312		1455
1313	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1314	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
1315	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
1316	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
1317	has logged in successfully.	1460	has logged in successfully.
1318		1461
1319	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1320	called.
1321		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
1322	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1323		1470
1324	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1325	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
1326	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
1327	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
1328	log-in.	1475	log-in.
1329		1476
1330	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1331	called.
1332		1478
1333	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1334		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
1335	sub register_extcmd {	1486	sub register_extcmd($$) {
1336	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1337		1488
1338	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1339	}	1490	}
1340		1491
1341	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1342	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1343		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1344	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1345	}	1508	}
1346		1509
1347	use File::Glob ();	1510	use File::Glob ();
1348		1511
1349	cf::player->attach (	1512	cf::player->attach (
…		…
1363	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1364		1527
1365	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1366		1529
1367	if (ref $msg) {	1530	if (ref $msg) {
1368	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1369	"ARRAY" eq ref $msg
1370	? @$msg
1371	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1372		1532
1373	my @reply;
1374
1375	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}) {
1376	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1377	}	1551	}
1378
1379	$pl->ext_reply ($reply, @reply)
1380	if $reply;
1381		1552
1382	} else {	1553	} else {
1383	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1384	}	1555	}
1385		1556
…		…
1398	};	1569	};
1399		1570
1400	$grp	1571	$grp
1401	}	1572	}
1402		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
1403	sub load_extensions {	1585	sub load_extensions {
1404	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1405		1589
1406	cf::sync_job {	1590	cf::sync_job {
1407	my %todo;	1591	my %todo;
1408		1592
1409	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1452	unless exists $done{$_};	1636	unless exists $done{$_};
1453	}	1637	}
1454		1638
1455	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1456		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
1457	my $active = eval $v->{source};	1650	my $active = eval $source;
1458		1651
1459	if (length $@) {	1652	if (length $@) {
1460	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1461		1654
1462	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1479		1672
1480	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1481	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1482	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1483	}	1676	}
		1677
		1678	last;
1484	}	1679	}
1485	}	1680	}
1486	};	1681	};
1487	}	1682	}
1488		1683
…		…
1646	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1647		1842
1648	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1649	$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
1650		1845
1651	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1652	$pl->deactivate;	1847	$pl->deactivate;
		1848
1653	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;
1654	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1851	ext::highscore::check ($pl->ob);
		1852
1655	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1656		1854
1657	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1658	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1659	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1745		1943
1746	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1747		1945
1748	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1749		1947
1750	=item $player->ext_reply ($msgid, @msg)
1751
1752	Sends an ext reply to the player.
1753
1754	=cut
1755
1756	sub ext_reply($$@) {
1757	my ($self, $id, @msg) = @_;
1758
1759	$self->ns->ext_reply ($id, @msg)
1760	}
1761
1762	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1763		1949
1764	Sends an ext event to the client.	1950	Sends an ext event to the client.
1765		1951
1766	=cut	1952	=cut
…		…
1825	sub generate_random_map {	2011	sub generate_random_map {
1826	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1827		2013
1828	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
1829		2015
1830	# mit "rum" bekleckern, nicht
1831	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1832	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1833	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1834	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1835	$rmp->{exit_on_final_map},
1836	$rmp->{xsize}, $rmp->{ysize},
1837	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1838	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1839	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1840	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1841	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1842	(cf::region::find $rmp->{region}), $rmp->{custom}
1843	)
1844	}	2017	}
1845		2018
1846	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1847		2020
1848	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
…		…
1899	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1900	$path = "$base/$path";	2073	$path = "$base/$path";
1901	}	2074	}
1902		2075
1903	for ($path) {	2076	for ($path) {
1904	redo if s{//}{/};
1905	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1906	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1907	}	2079	}
1908		2080
1909	$path	2081	$path
…		…
1927		2099
1928	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1929	()	2101	()
1930	}	2102	}
1931		2103
		2104	# may re-bless or do other evil things
1932	sub init {	2105	sub init {
1933	my ($self) = @_;	2106	my ($self) = @_;
1934		2107
1935	$self	2108	$self
1936	}	2109	}
…		…
2001	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2002		2175
2003	1	2176	1
2004	}	2177	}
2005		2178
		2179	# used to laod the header of an original map
2006	sub load_header_orig {	2180	sub load_header_orig {
2007	my ($self) = @_;	2181	my ($self) = @_;
2008		2182
2009	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2010	}	2184	}
2011		2185
		2186	# used to laod the header of an instantiated map
2012	sub load_header_temp {	2187	sub load_header_temp {
2013	my ($self) = @_;	2188	my ($self) = @_;
2014		2189
2015	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2016	}	2191	}
2017		2192
		2193	# called after loading the header from an instantiated map
2018	sub prepare_temp {	2194	sub prepare_temp {
2019	my ($self) = @_;	2195	my ($self) = @_;
2020		2196
2021	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2022	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2023	# safety	2199	# safety
2024	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2025	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2026	}	2202	}
2027		2203
		2204	# called after loading the header from an original map
2028	sub prepare_orig {	2205	sub prepare_orig {
2029	my ($self) = @_;	2206	my ($self) = @_;
2030		2207
2031	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2032	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2058	sub find {	2235	sub find {
2059	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2060		2237
2061	cf::cede_to_tick;	2238	cf::cede_to_tick;
2062		2239
2063	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2064		2241
2065	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2066	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2067		2244
2068	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2099		2276
2100	{	2277	{
2101	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2102		2279
2103	return unless $self->valid;	2280	return unless $self->valid;
2104	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2105
2106	$self->in_memory (cf::MAP_LOADING);
2107		2282
2108	$self->alloc;	2283	$self->alloc;
2109		2284
2110	$self->pre_load;	2285	$self->pre_load;
2111	cf::cede_to_tick;	2286	cf::cede_to_tick;
2112		2287
		2288	if (exists $self->{load_path}) {
2113	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2114	$f->skip_block;	2290	$f->skip_block;
2115	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2116	or return;	2292	or return;
2117		2293
2118	$self->post_load_original	2294	$self->post_load_original
2119	if delete $self->{load_original};	2295	if delete $self->{load_original};
2120		2296
2121	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2122	utf8::encode $uniq;	2298	utf8::encode $uniq;
2123	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2124	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2125	$self->clear_unique_items;	2301	$self->clear_unique_items;
2126	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2127	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2128	}	2305	}
2129	}	2306	}
2130	}
2131		2307
2132	$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);
2133		2315
2134	cf::cede_to_tick;	2316	cf::cede_to_tick;
2135	# now do the right thing for maps	2317	# now do the right thing for maps
2136	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2137	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2141	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2142	$self->decay_objects;	2324	$self->decay_objects;
2143	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2144	$self->update_buttons;	2326	$self->update_buttons;
2145	cf::cede_to_tick;	2327	cf::cede_to_tick;
2146	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2147	}	2329	}
2148		2330
2149	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2150	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2151
2152	$self->in_memory (cf::MAP_ACTIVE);
2153	}	2333	}
2154		2334
2155	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2156	}	2338	}
2157		2339
2158	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2159	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2160	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2168	# if $self->per_party;	2350	# if $self->per_party;
2169		2351
2170	$self	2352	$self
2171	}	2353	}
2172		2354
2173	# find and load all maps in the 3x3 area around a map
2174	sub load_neighbours {
2175	my ($map) = @_;
2176
2177	my @neigh; # diagonal neighbours
2178
2179	for (0 .. 3) {
2180	my $neigh = $map->tile_path ($_)
2181	or next;
2182	$neigh = find $neigh, $map
2183	or next;
2184	$neigh->load;
2185
2186	# now find the diagonal neighbours
2187	push @neigh,
2188	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2189	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2190	}
2191
2192	for (grep defined $_->[0], @neigh) {
2193	my ($path, $origin) = @$_;
2194	my $neigh = find $path, $origin
2195	or next;
2196	$neigh->load;
2197	}
2198	}
2199
2200	sub find_sync {	2355	sub find_sync {
2201	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2202		2357
		2358	# it's a bug to call this from the main context
2203	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2204	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2205		2361
2206	find $path, $origin	2362	find $path, $origin
2207	}	2363	}
2208		2364
2209	sub do_load_sync {	2365	sub do_load_sync {
2210	my ($map) = @_;	2366	my ($map) = @_;
2211		2367
		2368	# it's a bug to call this from the main context
2212	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2213	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2214		2371
2215	$map->load;	2372	$map->load;
2216	}	2373	}
…		…
2219	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2220		2377
2221	sub find_async {	2378	sub find_async {
2222	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2223		2380
2224	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2225		2382
2226	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2227	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2228	}	2385	}
2229		2386
2230	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2231		2388
2232	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2291	sub swap_out {	2448	sub swap_out {
2292	my ($self) = @_;	2449	my ($self) = @_;
2293		2450
2294	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2295		2452
2296	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2297	return if $self->{deny_save};	2454	return if $self->{deny_save};
2298	return if $self->players;	2455	return if $self->players;
2299		2456
2300	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2301	$self->deactivate;	2458	$self->deactivate;
2302	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2303	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2304		2461
2305	# then atomically save	2462	# then atomically save
2306	$self->_save;	2463	$self->_save;
2307		2464
2308	# then free the map	2465	# then free the map
…		…
2334		2491
2335	return if $self->players;	2492	return if $self->players;
2336		2493
2337	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2338		2495
2339	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2340		2497
2341	# need to save uniques path	2498	# need to save uniques path
2342	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2343	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2344		2501
…		…
2674	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2675	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2676	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2677		2834
2678	$map->load;	2835	$map->load;
2679	$map->load_neighbours;
2680		2836
2681	return unless $self->contr->active;	2837	return unless $self->contr->active;
2682		2838
2683	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2684	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2740	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2741	}	2897	}
2742	}	2898	}
2743		2899
2744	my $map = eval {	2900	my $map = eval {
2745	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2746		2902
2747	if ($map) {	2903	if ($map) {
2748	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2749	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2750	} else {	2906	} else {
…		…
2840	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2841		2997
2842	unless (eval {	2998	unless (eval {
2843	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2844		3000
2845	# random map handling
2846	{
2847	my $guard = cf::lock_acquire "exit_prepare:$exit";
2848
2849	prepare_random_map $exit
2850	if $exit->slaying eq "/!";
2851	}
2852
2853	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2854	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2855	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	}
2856		3027
2857	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2858		3029
2859	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2860	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3085	=cut	3256	=cut
3086		3257
3087	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3088	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3089		3260
3090	if ($self->extcmd == 2) {
3091	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3092	} elsif ($self->extcmd == 1) { # TODO: remove
3093	push @msg, msgtype => "event_$type";
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}
3097
3098	=item $client->ext_reply ($msgid, @msg)
3099
3100	Sends an ext reply to the client.
3101
3102	=cut
3103
3104	sub cf::client::ext_reply($$@) {
3105	my ($self, $id, @msg) = @_;
3106
3107	if ($self->extcmd == 2) {
3108	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3109	} elsif ($self->extcmd == 1) {
3110	#TODO: version 1, remove
3111	unshift @msg, msgtype => "reply", msgid => $id;
3112	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3113	}
3114	}	3262	}
3115		3263
3116	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3117		3265
3118	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3173	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3174		3322
3175	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3176		3324
3177	if (ref $msg) {	3325	if (ref $msg) {
3178	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3179	"ARRAY" eq ref $msg
3180	? @$msg
3181	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3182		3327
3183	my @reply;
3184
3185	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}) {
3186	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3187	}	3346	}
3188
3189	$ns->ext_reply ($reply, @reply)
3190	if $reply;
3191
3192	} else {	3347	} else {
3193	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";
3194	}	3349	}
3195		3350
3196	cf::override;	3351	cf::override;
…		…
3364	=cut	3519	=cut
3365		3520
3366	#############################################################################	3521	#############################################################################
3367	# the server's init and main functions	3522	# the server's init and main functions
3368		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
3369	sub load_facedata($) {	3548	sub load_facedata($) {
3370	my ($path) = @_;	3549	my ($path) = @_;
3371		3550
3372	# 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
3373	# for this (global event?)	3552	# for this (global event?)
…		…
3375		3554
3376	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3555	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3377		3556
3378	trace "loading facedata from $path\n";	3557	trace "loading facedata from $path\n";
3379		3558
3380	0 < aio_load $path, my $facedata	3559	my $facedata = decode_storable load_file $path;
3381	or die "$path: $!";
3382
3383	$facedata = Coro::Storable::thaw $facedata;
3384		3560
3385	$facedata->{version} == 2	3561	$facedata->{version} == 2
3386	or cf::cleanup "$path: version mismatch, cannot proceed.";	3562	or cf::cleanup "$path: version mismatch, cannot proceed.";
3387		3563
3388	# patch in the exptable
3389	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3390	$facedata->{resource}{"res/exp_table"} = {
3391	type => FT_RSRC,
3392	data => $exp_table,
3393	hash => (Digest::MD5::md5 $exp_table),
3394	};
3395	cf::cede_to_tick;	3564	cf::cede_to_tick;
3396		3565
3397	{	3566	{
3398	my $faces = $facedata->{faceinfo};	3567	my $faces = $facedata->{faceinfo};
3399		3568
3400	while (my ($face, $info) = each %$faces) {	3569	for my $face (sort keys %$faces) {
		3570	my $info = $faces->{$face};
3401	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3571	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3402		3572
3403	cf::face::set_visibility $idx, $info->{visibility};	3573	cf::face::set_visibility $idx, $info->{visibility};
3404	cf::face::set_magicmap $idx, $info->{magicmap};	3574	cf::face::set_magicmap $idx, $info->{magicmap};
3405	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3575	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3406	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3576	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3577	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3578	$FACEHASH{$info->{hash64}} = $idx;#d#
3407		3579
3408	cf::cede_to_tick;	3580	cf::cede_to_tick;
3409	}	3581	}
3410		3582
3411	while (my ($face, $info) = each %$faces) {	3583	while (my ($face, $info) = each %$faces) {
…		…
3438		3610
3439	{	3611	{
3440	my $res = $facedata->{resource};	3612	my $res = $facedata->{resource};
3441		3613
3442	while (my ($name, $info) = each %$res) {	3614	while (my ($name, $info) = each %$res) {
3443	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
3444	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3617	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3445		3618
		3619	cf::face::set_type $idx, $type;
3446	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3620	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3447	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#
3448	} else {	3623	} else {
3449	$RESOURCE{$name} = $info; # unused	3624	# $RESOURCE{$name} = $info; # unused
3450	}	3625	}
3451		3626
3452	cf::cede_to_tick;	3627	cf::cede_to_tick;
3453	}	3628	}
3454	}	3629	}
…		…
3472	my $status = load_resource_file_ $_[0];	3647	my $status = load_resource_file_ $_[0];
3473	get_slot 0.1, 100;	3648	get_slot 0.1, 100;
3474	cf::arch::commit_load;	3649	cf::arch::commit_load;
3475		3650
3476	$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;
3477	}	3665	}
3478		3666
3479	sub reload_regions {	3667	sub reload_regions {
3480	# 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
3481	# for this (global event?)	3669	# for this (global event?)
…		…
3496	}	3684	}
3497		3685
3498	sub reload_archetypes {	3686	sub reload_archetypes {
3499	load_resource_file "$DATADIR/archetypes"	3687	load_resource_file "$DATADIR/archetypes"
3500	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	);
3501	}	3698	}
3502		3699
3503	sub reload_treasures {	3700	sub reload_treasures {
3504	load_resource_file "$DATADIR/treasures"	3701	load_resource_file "$DATADIR/treasures"
3505	or die "unable to load treasurelists\n";	3702	or die "unable to load treasurelists\n";
3506	}	3703	}
3507		3704
3508	sub reload_sound {	3705	sub reload_sound {
3509	trace "loading sound config from $DATADIR/sound\n";	3706	trace "loading sound config from $DATADIR/sound\n";
3510		3707
3511	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3512	or die "$DATADIR/sound $!";
3513
3514	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3708	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3515		3709
3516	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3710	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3517	my $sound = $soundconf->{compat}[$_]	3711	my $sound = $soundconf->{compat}[$_]
3518	or next;	3712	or next;
3519		3713
…		…
3529	}	3723	}
3530		3724
3531	sub reload_resources {	3725	sub reload_resources {
3532	trace "reloading resource files...\n";	3726	trace "reloading resource files...\n";
3533		3727
3534	reload_exp_table;
3535	reload_materials;	3728	reload_materials;
3536	reload_facedata;	3729	reload_facedata;
		3730	reload_exp_table;
3537	reload_sound;	3731	reload_sound;
3538	reload_archetypes;	3732	reload_archetypes;
3539	reload_regions;	3733	reload_regions;
3540	reload_treasures;	3734	reload_treasures;
3541		3735
…		…
3543	}	3737	}
3544		3738
3545	sub reload_config {	3739	sub reload_config {
3546	trace "reloading config file...\n";	3740	trace "reloading config file...\n";
3547		3741
3548	0 < aio_load "$CONFDIR/config", my $config	3742	my $config = load_file "$CONFDIR/config";
3549	or die "$CONFDIR/config: $!";
3550
3551	utf8::decode $config;	3743	utf8::decode $config;
3552		3744	*CFG = decode_yaml $config;
3553	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3554	*CFG = YAML::XS::Load $config;
3555		3745
3556	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3746	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3557		3747
3558	$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};
3559	$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};
…		…
3597		3787
3598	sub main {	3788	sub main {
3599	cf::init_globals; # initialise logging	3789	cf::init_globals; # initialise logging
3600		3790
3601	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3791	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3602	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.";
3603	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3793	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3604	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3794	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3605		3795
3606	$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
3607		3797
3608	# we must not ever block the main coroutine	3798	# we must not ever block the main coroutine
3609	local $Coro::idle = sub {	3799	$Coro::idle = sub {
3610	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#
3611	(async {	3801	(async {
3612	$Coro::current->{desc} = "IDLE BUG HANDLER";	3802	$Coro::current->{desc} = "IDLE BUG HANDLER";
3613	EV::loop EV::LOOP_ONESHOT;	3803	EV::loop EV::LOOP_ONESHOT;
3614	})->prio (Coro::PRIO_MAX);	3804	})->prio (Coro::PRIO_MAX);
…		…
3617	evthread_start IO::AIO::poll_fileno;	3807	evthread_start IO::AIO::poll_fileno;
3618		3808
3619	cf::sync_job {	3809	cf::sync_job {
3620	cf::incloader::init ();	3810	cf::incloader::init ();
3621		3811
		3812	db_init;
		3813
3622	cf::init_anim;	3814	cf::init_anim;
3623	cf::init_attackmess;	3815	cf::init_attackmess;
3624	cf::init_dynamic;	3816	cf::init_dynamic;
3625		3817
3626	cf::load_settings;	3818	cf::load_settings;
3627		3819
3628	reload_resources;	3820	reload_resources;
3629	reload_config;	3821	reload_config;
3630	db_init;
3631		3822
3632	cf::init_uuid;	3823	cf::init_uuid;
3633	cf::init_signals;	3824	cf::init_signals;
3634	cf::init_skills;	3825	cf::init_skills;
3635		3826
…		…
3643		3834
3644	# no (long-running) fork's whatsoever before this point(!)	3835	# no (long-running) fork's whatsoever before this point(!)
3645	use POSIX ();	3836	use POSIX ();
3646	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};
3647		3838
3648	(pop @POST_INIT)->(0) while @POST_INIT;	3839	cf::_post_init 0;
3649	};	3840	};
3650		3841
3651	cf::object::thawer::errors_are_fatal 0;	3842	cf::object::thawer::errors_are_fatal 0;
3652	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";
3653		3844
3654	my $free_main; $free_main = EV::idle sub {	3845	AE::postpone {
3655	undef $free_main;
3656	undef &main; # free gobs of memory :)	3846	undef &main; # free gobs of memory :)
3657	};	3847	};
3658		3848
3659	goto &main_loop;	3849	goto &main_loop;
3660	}	3850	}
…		…
3817		4007
3818	cf::write_runtime_sync; # external watchdog should not bark	4008	cf::write_runtime_sync; # external watchdog should not bark
3819		4009
3820	trace "emergency_perl_save: flushing outstanding aio requests";	4010	trace "emergency_perl_save: flushing outstanding aio requests";
3821	while (IO::AIO::nreqs || BDB::nreqs) {	4011	while (IO::AIO::nreqs || BDB::nreqs) {
3822	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
3823	}	4013	}
3824		4014
3825	cf::write_runtime_sync; # external watchdog should not bark	4015	cf::write_runtime_sync; # external watchdog should not bark
3826	};	4016	};
3827		4017
…		…
3876		4066
3877	my $t1 = AE::time;	4067	my $t1 = AE::time;
3878		4068
3879	while ($RELOAD) {	4069	while ($RELOAD) {
3880	cf::get_slot 0.1, -1, "reload_perl";	4070	cf::get_slot 0.1, -1, "reload_perl";
3881	info "reloading...";	4071	info "perl_reload: reloading...";
3882		4072
3883	trace "entering sync_job";	4073	trace "perl_reload: entering sync_job";
3884		4074
3885	cf::sync_job {	4075	cf::sync_job {
3886	#cf::emergency_save;	4076	#cf::emergency_save;
3887		4077
3888	trace "cancelling all extension coros";	4078	trace "perl_reload: cancelling all extension coros";
3889	$_->cancel for values %EXT_CORO;	4079	$_->cancel for values %EXT_CORO;
3890	%EXT_CORO = ();	4080	%EXT_CORO = ();
3891		4081
3892	trace "removing commands";	4082	trace "perl_reload: removing commands";
3893	%COMMAND = ();	4083	%COMMAND = ();
3894		4084
3895	trace "removing ext/exti commands";	4085	trace "perl_reload: removing ext/exti commands";
3896	%EXTCMD = ();	4086	%EXTCMD = ();
3897	%EXTICMD = ();	4087	%EXTICMD = ();
3898		4088
3899	trace "unloading/nuking all extensions";	4089	trace "perl_reload: unloading/nuking all extensions";
3900	for my $pkg (@EXTS) {	4090	for my $pkg (@EXTS) {
3901	trace "... unloading $pkg";	4091	trace "... unloading $pkg";
3902		4092
3903	if (my $cb = $pkg->can ("unload")) {	4093	if (my $cb = $pkg->can ("unload")) {
3904	eval {	4094	eval {
…		…
3909		4099
3910	trace "... clearing $pkg";	4100	trace "... clearing $pkg";
3911	clear_package $pkg;	4101	clear_package $pkg;
3912	}	4102	}
3913		4103
3914	trace "unloading all perl modules loaded from $LIBDIR";	4104	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3915	while (my ($k, $v) = each %INC) {	4105	while (my ($k, $v) = each %INC) {
3916	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4106	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3917		4107
3918	trace "... unloading $k";	4108	trace "... unloading $k";
3919	delete $INC{$k};	4109	delete $INC{$k};
…		…
3926	}	4116	}
3927		4117
3928	clear_package $k;	4118	clear_package $k;
3929	}	4119	}
3930		4120
3931	trace "getting rid of safe::, as good as possible";	4121	trace "perl_reload: getting rid of safe::, as good as possible";
3932	clear_package "safe::$_"	4122	clear_package "safe::$_"
3933	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);
3934		4124
3935	trace "unloading cf.pm \"a bit\"";	4125	trace "perl_reload: unloading cf.pm \"a bit\"";
3936	delete $INC{"cf.pm"};	4126	delete $INC{"cf.pm"};
3937	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4127	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3938		4128
3939	# don't, removes xs symbols, too,	4129	# don't, removes xs symbols, too,
3940	# and global variables created in xs	4130	# and global variables created in xs
3941	#clear_package __PACKAGE__;	4131	#clear_package __PACKAGE__;
3942		4132
3943	info "unload completed, starting to reload now";	4133	info "perl_reload: unload completed, starting to reload now";
3944		4134
3945	trace "reloading cf.pm";	4135	trace "perl_reload: reloading cf.pm";
3946	require cf;	4136	require cf;
3947	cf::_connect_to_perl_1;	4137	cf::_connect_to_perl_1;
3948		4138
3949	trace "loading config and database again";	4139	trace "perl_reload: loading config and database again";
3950	cf::reload_config;	4140	cf::reload_config;
3951		4141
3952	trace "loading extensions";	4142	trace "perl_reload: loading extensions";
3953	cf::load_extensions;	4143	cf::load_extensions;
3954		4144
3955	if ($REATTACH_ON_RELOAD) {	4145	if ($REATTACH_ON_RELOAD) {
3956	trace "reattaching attachments to objects/players";	4146	trace "perl_reload: reattaching attachments to objects/players";
3957	_global_reattach; # objects, sockets	4147	_global_reattach; # objects, sockets
3958	trace "reattaching attachments to maps";	4148	trace "perl_reload: reattaching attachments to maps";
3959	reattach $_ for values %MAP;	4149	reattach $_ for values %MAP;
3960	trace "reattaching attachments to players";	4150	trace "perl_reload: reattaching attachments to players";
3961	reattach $_ for values %PLAYER;	4151	reattach $_ for values %PLAYER;
3962	}	4152	}
3963		4153
3964	trace "running post_init jobs";	4154	cf::_post_init 1;
3965	(pop @POST_INIT)->(1) while @POST_INIT;
3966		4155
3967	trace "leaving sync_job";	4156	trace "perl_reload: leaving sync_job";
3968		4157
3969	1	4158	1
3970	} or do {	4159	} or do {
3971	error $@;	4160	error $@;
3972	cf::cleanup "error while reloading, exiting.";	4161	cf::cleanup "perl_reload: error, exiting.";
3973	};	4162	};
3974		4163
3975	info "reloaded";
3976	--$RELOAD;	4164	--$RELOAD;
3977	}	4165	}
3978		4166
3979	$t1 = AE::time - $t1;	4167	$t1 = AE::time - $t1;
3980	info "reload completed in ${t1}s\n";	4168	info "perl_reload: completed in ${t1}s\n";
3981	};	4169	};
3982		4170
3983	our $RELOAD_WATCHER; # used only during reload	4171	our $RELOAD_WATCHER; # used only during reload
3984		4172
3985	sub reload_perl() {	4173	sub reload_perl() {
…		…
4010		4198
4011	#############################################################################	4199	#############################################################################
4012		4200
4013	my $bug_warning = 0;	4201	my $bug_warning = 0;
4014		4202
4015	our @WAIT_FOR_TICK;
4016	our @WAIT_FOR_TICK_BEGIN;
4017
4018	sub wait_for_tick() {	4203	sub wait_for_tick() {
4019	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4204	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4020		4205
4021	my $signal = new Coro::Signal;	4206	$WAIT_FOR_TICK->wait;
4022	push @WAIT_FOR_TICK, $signal;
4023	$signal->wait;
4024	}	4207	}
4025		4208
4026	sub wait_for_tick_begin() {	4209	sub wait_for_tick_begin() {
4027	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4210	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4028		4211
4029	my $signal = new Coro::Signal;	4212	my $signal = new Coro::Signal;
4030	push @WAIT_FOR_TICK_BEGIN, $signal;	4213	push @WAIT_FOR_TICK_BEGIN, $signal;
4031	$signal->wait;	4214	$signal->wait;
4032	}	4215	}
…		…
4036	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"
4037	unless ++$bug_warning > 10;	4220	unless ++$bug_warning > 10;
4038	return;	4221	return;
4039	}	4222	}
4040		4223
4041	cf::server_tick; # one server iteration	4224	cf::one_tick; # one server iteration
4042		4225
4043	#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#
4044		4227
4045	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4228	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4046	$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.;
…		…
4052	}	4235	}
4053		4236
4054	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4237	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4055	$sig->send;	4238	$sig->send;
4056	}	4239	}
4057	while (my $sig = shift @WAIT_FOR_TICK) {	4240	$WAIT_FOR_TICK->broadcast;
4058	$sig->send;
4059	}
4060		4241
4061	$LOAD = ($NOW - $TICK_START) / $TICK;	4242	$LOAD = ($NOW - $TICK_START) / $TICK;
4062	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4243	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4063		4244
4064	if (0) {	4245	if (0) {
…		…
4070	}	4251	}
4071	}	4252	}
4072		4253
4073	{	4254	{
4074	# configure BDB	4255	# configure BDB
		4256	info "initialising database";
4075		4257
4076	BDB::min_parallel 16;	4258	BDB::min_parallel 16;
4077	BDB::max_poll_reqs $TICK * 0.1;	4259	BDB::max_poll_reqs $TICK * 0.1;
4078	$AnyEvent::BDB::WATCHER->priority (1);	4260	#$AnyEvent::BDB::WATCHER->priority (1);
4079		4261
4080	unless ($DB_ENV) {	4262	unless ($DB_ENV) {
4081	$DB_ENV = BDB::db_env_create;	4263	$DB_ENV = BDB::db_env_create;
4082	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4264	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4083	$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;
…		…
4108	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4290	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4109	};	4291	};
4110	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4292	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4111	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4293	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4112	};	4294	};
		4295
		4296	info "database initialised";
4113	}	4297	}
4114		4298
4115	{	4299	{
4116	# configure IO::AIO	4300	# configure IO::AIO
4117		4301
		4302	info "initialising aio";
4118	IO::AIO::min_parallel 8;	4303	IO::AIO::min_parallel 8;
4119	IO::AIO::max_poll_time $TICK * 0.1;	4304	IO::AIO::max_poll_time $TICK * 0.1;
4120	undef $AnyEvent::AIO::WATCHER;	4305	undef $AnyEvent::AIO::WATCHER;
		4306	info "aio initialised";
4121	}	4307	}
4122		4308
4123	my $_log_backtrace;	4309	our $_log_backtrace;
		4310	our $_log_backtrace_last;
4124		4311
4125	sub _log_backtrace {	4312	sub _log_backtrace {
4126	my ($msg, @addr) = @_;	4313	my ($msg, @addr) = @_;
4127		4314
4128	$msg =~ s/\n//;	4315	$msg =~ s/\n$//;
4129		4316
		4317	if ($_log_backtrace_last eq $msg) {
		4318	LOG llevInfo, "[ABT] $msg\n";
		4319	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4130	# limit the # of concurrent backtraces	4320	# limit the # of concurrent backtraces
4131	if ($_log_backtrace < 2) {	4321	} elsif ($_log_backtrace < 2) {
		4322	$_log_backtrace_last = $msg;
4132	++$_log_backtrace;	4323	++$_log_backtrace;
4133	my $perl_bt = Carp::longmess $msg;	4324	my $perl_bt = Carp::longmess $msg;
4134	async {	4325	async {
4135	$Coro::current->{desc} = "abt $msg";	4326	$Coro::current->{desc} = "abt $msg";
4136		4327
…		…
4156	LOG llevInfo, "[ABT] $_\n" for @bt;	4347	LOG llevInfo, "[ABT] $_\n" for @bt;
4157	--$_log_backtrace;	4348	--$_log_backtrace;
4158	};	4349	};
4159	} else {	4350	} else {
4160	LOG llevInfo, "[ABT] $msg\n";	4351	LOG llevInfo, "[ABT] $msg\n";
4161	LOG llevInfo, "[ABT] [suppressed]\n";	4352	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4162	}	4353	}
4163	}	4354	}
4164		4355
4165	# load additional modules	4356	# load additional modules
4166	require "cf/$_.pm" for @EXTRA_MODULES;	4357	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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