ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.547 by root, Sun May 9 22:51:13 2010 UTC vs.
Revision 1.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.
…		…
606	# TODO: investigate and fix (likely this will be rather laborious)	746	# TODO: investigate and fix (likely this will be rather laborious)
607		747
608	my @res = Coro::Util::fork_eval {	748	my @res = Coro::Util::fork_eval {
609	cf::post_fork;	749	cf::post_fork;
610	&$cb	750	&$cb
611	}, @args;	751	} @args;
612		752
613	wantarray ? @res : $res[-1]	753	wantarray ? @res : $res[-1]
614	}	754	}
615		755
616	sub objinfo {	756	sub objinfo {
…		…
738		878
739	my @data;	879	my @data;
740	my $md5;	880	my $md5;
741		881
742	for (0 .. $#$src) {	882	for (0 .. $#$src) {
743	0 <= aio_load $src->[$_], $data[$_]	883	$data[$_] = load_file $src->[$_];
744	or Carp::croak "$src->[$_]: $!";
745	}	884	}
746		885
747	# if processing is expensive, check	886	# if processing is expensive, check
748	# checksum first	887	# checksum first
749	if (1) {	888	if (1) {
…		…
1294	=cut	1433	=cut
1295		1434
1296	#############################################################################	1435	#############################################################################
1297	# command handling &c	1436	# command handling &c
1298		1437
1299	=item cf::register_command $name => \&callback($ob,$args);	1438	=item cf::register_command $name => \&callback($ob,$args)
1300		1439
1301	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
1302	$name.	1441	$name.
1303		1442
1304	=cut	1443	=cut
…		…
1310	#warn "registering command '$name/$time' to '$caller'";	1449	#warn "registering command '$name/$time' to '$caller'";
1311		1450
1312	push @{ $COMMAND{$name} }, [$caller, $cb];	1451	push @{ $COMMAND{$name} }, [$caller, $cb];
1313	}	1452	}
1314		1453
1315	=item cf::register_extcmd $name => \&callback($pl,$packet);	1454	=item cf::register_extcmd $name => \&callback($pl,@args)
1316		1455
1317	Register a callback for execution when the client sends an (synchronous)	1456	Register a callback for execution when the client sends an (synchronous)
1318	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
1319	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
1320	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
1321	has logged in successfully.	1460	has logged in successfully.
1322		1461
1323	If the callback returns something, it is sent back as if reply was being	1462	The values will be sent back to the client.
1324	called.
1325		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
1326	=item cf::register_exticmd $name => \&callback($ns,$packet);	1469	=item cf::register_exticmd $name => \&callback($ns,@args)
1327		1470
1328	Register a callback for execution when the client sends an (asynchronous)	1471	Register a callback for execution when the client sends an (asynchronous)
1329	exticmd packet. Exti commands are processed by the server as soon as they	1472	exticmd packet. Exti commands are processed by the server as soon as they
1330	are received, i.e. out of order w.r.t. other commands. The first argument	1473	are received, i.e. out of order w.r.t. other commands. The first argument
1331	is a client socket. Exti commands can be received anytime, even before	1474	is a client socket. Exti commands can be received anytime, even before
1332	log-in.	1475	log-in.
1333		1476
1334	If the callback returns something, it is sent back as if reply was being	1477	The values will be sent back to the client.
1335	called.
1336		1478
1337	=cut	1479	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1338		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
1339	sub register_extcmd {	1486	sub register_extcmd($$) {
1340	my ($name, $cb) = @_;	1487	my ($name, $cb) = @_;
1341		1488
1342	$EXTCMD{$name} = $cb;	1489	$EXTCMD{$name} = $cb;
1343	}	1490	}
1344		1491
1345	sub register_exticmd {	1492	sub register_async_extcmd($$) {
1346	my ($name, $cb) = @_;	1493	my ($name, $cb) = @_;
1347		1494
		1495	$EXTACMD{$name} = $cb;
		1496	}
		1497
		1498	sub register_exticmd($$) {
		1499	my ($name, $cb) = @_;
		1500
1348	$EXTICMD{$name} = $cb;	1501	$EXTICMD{$name} = $cb;
		1502	}
		1503
		1504	sub register_async_exticmd($$) {
		1505	my ($name, $cb) = @_;
		1506
		1507	$EXTIACMD{$name} = $cb;
1349	}	1508	}
1350		1509
1351	use File::Glob ();	1510	use File::Glob ();
1352		1511
1353	cf::player->attach (	1512	cf::player->attach (
…		…
1367	my ($pl, $buf) = @_;	1526	my ($pl, $buf) = @_;
1368		1527
1369	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1528	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1370		1529
1371	if (ref $msg) {	1530	if (ref $msg) {
1372	my ($type, $reply, @payload) =	1531	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1373	"ARRAY" eq ref $msg
1374	? @$msg
1375	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1376		1532
1377	my @reply;
1378
1379	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}) {
1380	@reply = $cb->($pl, @payload);	1546	@reply = $cb->($pl, @payload);
		1547	}
		1548
		1549	$pl->ext_msg ("reply-$reply", @reply)
		1550	if $reply;
1381	}	1551	}
1382
1383	$pl->ext_reply ($reply, @reply)
1384	if $reply;
1385		1552
1386	} else {	1553	} else {
1387	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1554	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1388	}	1555	}
1389		1556
…		…
1402	};	1569	};
1403		1570
1404	$grp	1571	$grp
1405	}	1572	}
1406		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
1407	sub load_extensions {	1585	sub load_extensions {
1408	info "loading extensions...";	1586	info "loading extensions...";
		1587
		1588	%EXT_CFG = ();
1409		1589
1410	cf::sync_job {	1590	cf::sync_job {
1411	my %todo;	1591	my %todo;
1412		1592
1413	for my $path (<$LIBDIR/*.ext>) {	1593	for my $path (<$LIBDIR/*.ext>) {
…		…
1456	unless exists $done{$_};	1636	unless exists $done{$_};
1457	}	1637	}
1458		1638
1459	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1639	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1460		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
1461	my $active = eval $v->{source};	1650	my $active = eval $source;
1462		1651
1463	if (length $@) {	1652	if (length $@) {
1464	error "$v->{path}: $@\n";	1653	error "$v->{path}: $@\n";
1465		1654
1466	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1655	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1483		1672
1484	while (my ($k, $v) = each %todo) {	1673	while (my ($k, $v) = each %todo) {
1485	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1674	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1486	if exists $v->{meta}{mandatory};	1675	if exists $v->{meta}{mandatory};
1487	}	1676	}
		1677
		1678	last;
1488	}	1679	}
1489	}	1680	}
1490	};	1681	};
1491	}	1682	}
1492		1683
…		…
1650	my $name = $pl->ob->name;	1841	my $name = $pl->ob->name;
1651		1842
1652	$pl->{deny_save} = 1;	1843	$pl->{deny_save} = 1;
1653	$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
1654		1845
1655	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1846	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1656	$pl->deactivate;	1847	$pl->deactivate;
1657		1848
1658	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;
		1850	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
1659	ext::highscore::check ($pl->ob);	1851	ext::highscore::check ($pl->ob);
1660		1852
1661	$pl->invoke (cf::EVENT_PLAYER_QUIT);
1662	$pl->ns->destroy if $pl->ns;	1853	$pl->ns->destroy if $pl->ns;
1663		1854
1664	my $path = playerdir $pl;	1855	my $path = playerdir $pl;
1665	my $temp = "$path~$cf::RUNTIME~deleting~";	1856	my $temp = "$path~$cf::RUNTIME~deleting~";
1666	aio_rename $path, $temp;	1857	aio_rename $path, $temp;
…		…
1752		1943
1753	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1944	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1754		1945
1755	Expand deliantra pod fragments into protocol xml.	1946	Expand deliantra pod fragments into protocol xml.
1756		1947
1757	=item $player->ext_reply ($msgid, @msg)
1758
1759	Sends an ext reply to the player.
1760
1761	=cut
1762
1763	sub ext_reply($$@) {
1764	my ($self, $id, @msg) = @_;
1765
1766	$self->ns->ext_reply ($id, @msg)
1767	}
1768
1769	=item $player->ext_msg ($type, @msg)	1948	=item $player->ext_msg ($type, @msg)
1770		1949
1771	Sends an ext event to the client.	1950	Sends an ext event to the client.
1772		1951
1773	=cut	1952	=cut
…		…
1832	sub generate_random_map {	2011	sub generate_random_map {
1833	my ($self, $rmp) = @_;	2012	my ($self, $rmp) = @_;
1834		2013
1835	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
1836		2015
1837	# mit "rum" bekleckern, nicht
1838	$self->_create_random_map (	2016	$self->_create_random_map ($rmp);
1839	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1840	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1841	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1842	$rmp->{exit_on_final_map},
1843	$rmp->{xsize}, $rmp->{ysize},
1844	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1845	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1846	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1847	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1848	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1849	(cf::region::find $rmp->{region}), $rmp->{custom}
1850	)
1851	}	2017	}
1852		2018
1853	=item cf::map->register ($regex, $prio)	2019	=item cf::map->register ($regex, $prio)
1854		2020
1855	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
…		…
1906	$base =~ s{[^/]+/?$}{};	2072	$base =~ s{[^/]+/?$}{};
1907	$path = "$base/$path";	2073	$path = "$base/$path";
1908	}	2074	}
1909		2075
1910	for ($path) {	2076	for ($path) {
1911	redo if s{//}{/};
1912	redo if s{/\.?/}{/};	2077	redo if s{/\.?/}{/};
1913	redo if s{/[^/]+/\.\./}{/};	2078	redo if s{/[^/]+/\.\./}{/};
1914	}	2079	}
1915		2080
1916	$path	2081	$path
…		…
1934		2099
1935	Carp::cluck "unable to resolve path '$path' (base '$base')";	2100	Carp::cluck "unable to resolve path '$path' (base '$base')";
1936	()	2101	()
1937	}	2102	}
1938		2103
		2104	# may re-bless or do other evil things
1939	sub init {	2105	sub init {
1940	my ($self) = @_;	2106	my ($self) = @_;
1941		2107
1942	$self	2108	$self
1943	}	2109	}
…		…
2008	$self->{load_path} = $path;	2174	$self->{load_path} = $path;
2009		2175
2010	1	2176	1
2011	}	2177	}
2012		2178
		2179	# used to laod the header of an original map
2013	sub load_header_orig {	2180	sub load_header_orig {
2014	my ($self) = @_;	2181	my ($self) = @_;
2015		2182
2016	$self->load_header_from ($self->load_path)	2183	$self->load_header_from ($self->load_path)
2017	}	2184	}
2018		2185
		2186	# used to laod the header of an instantiated map
2019	sub load_header_temp {	2187	sub load_header_temp {
2020	my ($self) = @_;	2188	my ($self) = @_;
2021		2189
2022	$self->load_header_from ($self->save_path)	2190	$self->load_header_from ($self->save_path)
2023	}	2191	}
2024		2192
		2193	# called after loading the header from an instantiated map
2025	sub prepare_temp {	2194	sub prepare_temp {
2026	my ($self) = @_;	2195	my ($self) = @_;
2027		2196
2028	$self->last_access ((delete $self->{last_access})	2197	$self->last_access ((delete $self->{last_access})
2029	|| $cf::RUNTIME); #d#	2198	|| $cf::RUNTIME); #d#
2030	# safety	2199	# safety
2031	$self->{instantiate_time} = $cf::RUNTIME	2200	$self->{instantiate_time} = $cf::RUNTIME
2032	if $self->{instantiate_time} > $cf::RUNTIME;	2201	if $self->{instantiate_time} > $cf::RUNTIME;
2033	}	2202	}
2034		2203
		2204	# called after loading the header from an original map
2035	sub prepare_orig {	2205	sub prepare_orig {
2036	my ($self) = @_;	2206	my ($self) = @_;
2037		2207
2038	$self->{load_original} = 1;	2208	$self->{load_original} = 1;
2039	$self->{instantiate_time} = $cf::RUNTIME;	2209	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2065	sub find {	2235	sub find {
2066	my ($path, $origin) = @_;	2236	my ($path, $origin) = @_;
2067		2237
2068	cf::cede_to_tick;	2238	cf::cede_to_tick;
2069		2239
2070	$path = normalise $path, $origin && $origin->path;	2240	$path = normalise $path, $origin;
2071		2241
2072	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2242	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2073	my $guard2 = cf::lock_acquire "map_find:$path";	2243	my $guard2 = cf::lock_acquire "map_find:$path";
2074		2244
2075	$cf::MAP{$path} || do {	2245	$cf::MAP{$path} || do {
…		…
2106		2276
2107	{	2277	{
2108	my $guard = cf::lock_acquire "map_data:$path";	2278	my $guard = cf::lock_acquire "map_data:$path";
2109		2279
2110	return unless $self->valid;	2280	return unless $self->valid;
2111	return unless $self->in_memory == cf::MAP_SWAPPED;	2281	return unless $self->state == cf::MAP_SWAPPED;
2112
2113	$self->in_memory (cf::MAP_LOADING);
2114		2282
2115	$self->alloc;	2283	$self->alloc;
2116		2284
2117	$self->pre_load;	2285	$self->pre_load;
2118	cf::cede_to_tick;	2286	cf::cede_to_tick;
2119		2287
		2288	if (exists $self->{load_path}) {
2120	my $f = new_from_file cf::object::thawer $self->{load_path};	2289	my $f = new_from_file cf::object::thawer $self->{load_path};
2121	$f->skip_block;	2290	$f->skip_block;
2122	$self->_load_objects ($f)	2291	$self->_load_objects ($f)
2123	or return;	2292	or return;
2124		2293
2125	$self->post_load_original	2294	$self->post_load_original
2126	if delete $self->{load_original};	2295	if delete $self->{load_original};
2127		2296
2128	if (my $uniq = $self->uniq_path) {	2297	if (my $uniq = $self->uniq_path) {
2129	utf8::encode $uniq;	2298	utf8::encode $uniq;
2130	unless (aio_stat $uniq) {	2299	unless (aio_stat $uniq) {
2131	if (my $f = new_from_file cf::object::thawer $uniq) {	2300	if (my $f = new_from_file cf::object::thawer $uniq) {
2132	$self->clear_unique_items;	2301	$self->clear_unique_items;
2133	$self->_load_objects ($f);	2302	$self->_load_objects ($f);
2134	$f->resolve_delayed_derefs;	2303	$f->resolve_delayed_derefs;
		2304	}
2135	}	2305	}
2136	}	2306	}
2137	}
2138		2307
2139	$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);
2140		2315
2141	cf::cede_to_tick;	2316	cf::cede_to_tick;
2142	# now do the right thing for maps	2317	# now do the right thing for maps
2143	$self->link_multipart_objects;	2318	$self->link_multipart_objects;
2144	$self->difficulty ($self->estimate_difficulty)	2319	$self->difficulty ($self->estimate_difficulty)
…		…
2148	unless ($self->{deny_activate}) {	2323	unless ($self->{deny_activate}) {
2149	$self->decay_objects;	2324	$self->decay_objects;
2150	$self->fix_auto_apply;	2325	$self->fix_auto_apply;
2151	$self->update_buttons;	2326	$self->update_buttons;
2152	cf::cede_to_tick;	2327	cf::cede_to_tick;
2153	$self->activate;	2328	#$self->activate; # no longer activate maps automatically
2154	}	2329	}
2155		2330
2156	$self->{last_save} = $cf::RUNTIME;	2331	$self->{last_save} = $cf::RUNTIME;
2157	$self->last_access ($cf::RUNTIME);	2332	$self->last_access ($cf::RUNTIME);
2158
2159	$self->in_memory (cf::MAP_ACTIVE);
2160	}	2333	}
2161		2334
2162	$self->post_load;	2335	$self->post_load;
		2336
		2337	1
2163	}	2338	}
2164		2339
2165	# customize the map for a given player, i.e.	2340	# customize the map for a given player, i.e.
2166	# return the _real_ map. used by e.g. per-player	2341	# return the _real_ map. used by e.g. per-player
2167	# maps to change the path to ~playername/mappath	2342	# maps to change the path to ~playername/mappath
…		…
2175	# if $self->per_party;	2350	# if $self->per_party;
2176		2351
2177	$self	2352	$self
2178	}	2353	}
2179		2354
2180	# find and load all maps in the 3x3 area around a map
2181	sub load_neighbours {
2182	my ($map) = @_;
2183
2184	my @neigh; # diagonal neighbours
2185
2186	for (0 .. 3) {
2187	my $neigh = $map->tile_path ($_)
2188	or next;
2189	$neigh = find $neigh, $map
2190	or next;
2191	$neigh->load;
2192
2193	# now find the diagonal neighbours
2194	push @neigh,
2195	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2196	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2197	}
2198
2199	for (grep defined $_->[0], @neigh) {
2200	my ($path, $origin) = @$_;
2201	my $neigh = find $path, $origin
2202	or next;
2203	$neigh->load;
2204	}
2205	}
2206
2207	sub find_sync {	2355	sub find_sync {
2208	my ($path, $origin) = @_;	2356	my ($path, $origin) = @_;
2209		2357
		2358	# it's a bug to call this from the main context
2210	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2359	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2211	if $Coro::current == $Coro::main;	2360	if $Coro::current == $Coro::main;
2212		2361
2213	find $path, $origin	2362	find $path, $origin
2214	}	2363	}
2215		2364
2216	sub do_load_sync {	2365	sub do_load_sync {
2217	my ($map) = @_;	2366	my ($map) = @_;
2218		2367
		2368	# it's a bug to call this from the main context
2219	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2369	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2220	if $Coro::current == $Coro::main;	2370	if $Coro::current == $Coro::main;
2221		2371
2222	$map->load;	2372	$map->load;
2223	}	2373	}
…		…
2226	our $MAP_PREFETCHER = undef;	2376	our $MAP_PREFETCHER = undef;
2227		2377
2228	sub find_async {	2378	sub find_async {
2229	my ($path, $origin, $load) = @_;	2379	my ($path, $origin, $load) = @_;
2230		2380
2231	$path = normalise $path, $origin && $origin->{path};	2381	$path = normalise $path, $origin;
2232		2382
2233	if (my $map = $cf::MAP{$path}) {	2383	if (my $map = $cf::MAP{$path}) {
2234	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2384	return $map if !$load || $map->linkable;
2235	}	2385	}
2236		2386
2237	$MAP_PREFETCH{$path} |= $load;	2387	$MAP_PREFETCH{$path} |= $load;
2238		2388
2239	$MAP_PREFETCHER ||= cf::async {	2389	$MAP_PREFETCHER ||= cf::async {
…		…
2298	sub swap_out {	2448	sub swap_out {
2299	my ($self) = @_;	2449	my ($self) = @_;
2300		2450
2301	my $lock = cf::lock_acquire "map_data:$self->{path}";	2451	my $lock = cf::lock_acquire "map_data:$self->{path}";
2302		2452
2303	return if $self->in_memory != cf::MAP_ACTIVE;	2453	return if !$self->linkable;
2304	return if $self->{deny_save};	2454	return if $self->{deny_save};
2305	return if $self->players;	2455	return if $self->players;
2306		2456
2307	# first deactivate the map and "unlink" it from the core	2457	# first deactivate the map and "unlink" it from the core
2308	$self->deactivate;	2458	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;	2459	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->in_memory (cf::MAP_SWAPPED);	2460	$self->state (cf::MAP_SWAPPED);
2311		2461
2312	# then atomically save	2462	# then atomically save
2313	$self->_save;	2463	$self->_save;
2314		2464
2315	# then free the map	2465	# then free the map
…		…
2341		2491
2342	return if $self->players;	2492	return if $self->players;
2343		2493
2344	cf::trace "resetting map ", $self->path, "\n";	2494	cf::trace "resetting map ", $self->path, "\n";
2345		2495
2346	$self->in_memory (cf::MAP_SWAPPED);	2496	$self->state (cf::MAP_SWAPPED);
2347		2497
2348	# need to save uniques path	2498	# need to save uniques path
2349	unless ($self->{deny_save}) {	2499	unless ($self->{deny_save}) {
2350	my $uniq = $self->uniq_path; utf8::encode $uniq;	2500	my $uniq = $self->uniq_path; utf8::encode $uniq;
2351		2501
…		…
2681	# use -1 or undef as default coordinates, not 0, 0	2831	# use -1 or undef as default coordinates, not 0, 0
2682	($x, $y) = ($map->enter_x, $map->enter_y)	2832	($x, $y) = ($map->enter_x, $map->enter_y)
2683	if $x <= 0 && $y <= 0;	2833	if $x <= 0 && $y <= 0;
2684		2834
2685	$map->load;	2835	$map->load;
2686	$map->load_neighbours;
2687		2836
2688	return unless $self->contr->active;	2837	return unless $self->contr->active;
2689		2838
2690	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2839	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2691	if ($self->enter_map ($map, $x, $y)) {	2840	if ($self->enter_map ($map, $x, $y)) {
…		…
2747	($path, $x, $y) = (undef, undef, undef);	2896	($path, $x, $y) = (undef, undef, undef);
2748	}	2897	}
2749	}	2898	}
2750		2899
2751	my $map = eval {	2900	my $map = eval {
2752	my $map = defined $path ? cf::map::find $path : undef;	2901	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2753		2902
2754	if ($map) {	2903	if ($map) {
2755	$map = $map->customise_for ($self);	2904	$map = $map->customise_for ($self);
2756	$map = $check->($map, $x, $y, $self) if $check && $map;	2905	$map = $check->($map, $x, $y, $self) if $check && $map;
2757	} else {	2906	} else {
…		…
2847	$Coro::current->{desc} = "enter_exit";	2996	$Coro::current->{desc} = "enter_exit";
2848		2997
2849	unless (eval {	2998	unless (eval {
2850	$self->deactivate_recursive; # just to be sure	2999	$self->deactivate_recursive; # just to be sure
2851		3000
2852	# random map handling
2853	{
2854	my $guard = cf::lock_acquire "exit_prepare:$exit";
2855
2856	prepare_random_map $exit
2857	if $exit->slaying eq "/!";
2858	}
2859
2860	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3001	my $map = cf::map::normalise $exit->slaying, $exit->map;
2861	my $x = $exit->stats->hp;	3002	my $x = $exit->stats->hp;
2862	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	}
2863		3027
2864	$self->goto ($map, $x, $y);	3028	$self->goto ($map, $x, $y);
2865		3029
2866	# if exit is damned, update players death & WoR home-position	3030	# if exit is damned, update players death & WoR home-position
2867	$self->contr->savebed ($map, $x, $y)	3031	$self->contr->savebed ($map, $x, $y)
…		…
3092	=cut	3256	=cut
3093		3257
3094	sub cf::client::ext_msg($$@) {	3258	sub cf::client::ext_msg($$@) {
3095	my ($self, $type, @msg) = @_;	3259	my ($self, $type, @msg) = @_;
3096		3260
3097	if ($self->extcmd == 2) {
3098	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3261	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3099	} elsif ($self->extcmd == 1) { # TODO: remove
3100	push @msg, msgtype => "event_$type";
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}
3104
3105	=item $client->ext_reply ($msgid, @msg)
3106
3107	Sends an ext reply to the client.
3108
3109	=cut
3110
3111	sub cf::client::ext_reply($$@) {
3112	my ($self, $id, @msg) = @_;
3113
3114	if ($self->extcmd == 2) {
3115	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3116	} elsif ($self->extcmd == 1) {
3117	#TODO: version 1, remove
3118	unshift @msg, msgtype => "reply", msgid => $id;
3119	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3120	}
3121	}	3262	}
3122		3263
3123	=item $success = $client->query ($flags, "text", \&cb)	3264	=item $success = $client->query ($flags, "text", \&cb)
3124		3265
3125	Queues a query to the client, calling the given callback with	3266	Queues a query to the client, calling the given callback with
…		…
3180	my ($ns, $buf) = @_;	3321	my ($ns, $buf) = @_;
3181		3322
3182	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3323	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3183		3324
3184	if (ref $msg) {	3325	if (ref $msg) {
3185	my ($type, $reply, @payload) =	3326	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3186	"ARRAY" eq ref $msg
3187	? @$msg
3188	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3189		3327
3190	my @reply;
3191
3192	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}) {
3193	@reply = $cb->($ns, @payload);	3341	@reply = $cb->($ns, @payload);
		3342	}
		3343
		3344	$ns->ext_msg ("reply-$reply", @reply)
		3345	if $reply;
3194	}	3346	}
3195
3196	$ns->ext_reply ($reply, @reply)
3197	if $reply;
3198
3199	} else {	3347	} else {
3200	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";
3201	}	3349	}
3202		3350
3203	cf::override;	3351	cf::override;
…		…
3371	=cut	3519	=cut
3372		3520
3373	#############################################################################	3521	#############################################################################
3374	# the server's init and main functions	3522	# the server's init and main functions
3375		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
3376	sub load_facedata($) {	3548	sub load_facedata($) {
3377	my ($path) = @_;	3549	my ($path) = @_;
3378		3550
3379	# 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
3380	# for this (global event?)	3552	# for this (global event?)
…		…
3382		3554
3383	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3555	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3384		3556
3385	trace "loading facedata from $path\n";	3557	trace "loading facedata from $path\n";
3386		3558
3387	0 < aio_load $path, my $facedata	3559	my $facedata = decode_storable load_file $path;
3388	or die "$path: $!";
3389
3390	$facedata = Coro::Storable::thaw $facedata;
3391		3560
3392	$facedata->{version} == 2	3561	$facedata->{version} == 2
3393	or cf::cleanup "$path: version mismatch, cannot proceed.";	3562	or cf::cleanup "$path: version mismatch, cannot proceed.";
3394		3563
3395	# patch in the exptable
3396	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3397	$facedata->{resource}{"res/exp_table"} = {
3398	type => FT_RSRC,
3399	data => $exp_table,
3400	hash => (Digest::MD5::md5 $exp_table),
3401	};
3402	cf::cede_to_tick;	3564	cf::cede_to_tick;
3403		3565
3404	{	3566	{
3405	my $faces = $facedata->{faceinfo};	3567	my $faces = $facedata->{faceinfo};
3406		3568
3407	while (my ($face, $info) = each %$faces) {	3569	for my $face (sort keys %$faces) {
		3570	my $info = $faces->{$face};
3408	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3571	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3409		3572
3410	cf::face::set_visibility $idx, $info->{visibility};	3573	cf::face::set_visibility $idx, $info->{visibility};
3411	cf::face::set_magicmap $idx, $info->{magicmap};	3574	cf::face::set_magicmap $idx, $info->{magicmap};
3412	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3575	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3413	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#
3414		3579
3415	cf::cede_to_tick;	3580	cf::cede_to_tick;
3416	}	3581	}
3417		3582
3418	while (my ($face, $info) = each %$faces) {	3583	while (my ($face, $info) = each %$faces) {
…		…
3445		3610
3446	{	3611	{
3447	my $res = $facedata->{resource};	3612	my $res = $facedata->{resource};
3448		3613
3449	while (my ($name, $info) = each %$res) {	3614	while (my ($name, $info) = each %$res) {
3450	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
3451	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3617	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3452		3618
		3619	cf::face::set_type $idx, $type;
3453	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3620	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3454	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#
3455	} else {	3623	} else {
3456	$RESOURCE{$name} = $info; # unused	3624	# $RESOURCE{$name} = $info; # unused
3457	}	3625	}
3458		3626
3459	cf::cede_to_tick;	3627	cf::cede_to_tick;
3460	}	3628	}
3461	}	3629	}
…		…
3479	my $status = load_resource_file_ $_[0];	3647	my $status = load_resource_file_ $_[0];
3480	get_slot 0.1, 100;	3648	get_slot 0.1, 100;
3481	cf::arch::commit_load;	3649	cf::arch::commit_load;
3482		3650
3483	$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;
3484	}	3665	}
3485		3666
3486	sub reload_regions {	3667	sub reload_regions {
3487	# 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
3488	# for this (global event?)	3669	# for this (global event?)
…		…
3503	}	3684	}
3504		3685
3505	sub reload_archetypes {	3686	sub reload_archetypes {
3506	load_resource_file "$DATADIR/archetypes"	3687	load_resource_file "$DATADIR/archetypes"
3507	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	);
3508	}	3698	}
3509		3699
3510	sub reload_treasures {	3700	sub reload_treasures {
3511	load_resource_file "$DATADIR/treasures"	3701	load_resource_file "$DATADIR/treasures"
3512	or die "unable to load treasurelists\n";	3702	or die "unable to load treasurelists\n";
3513	}	3703	}
3514		3704
3515	sub reload_sound {	3705	sub reload_sound {
3516	trace "loading sound config from $DATADIR/sound\n";	3706	trace "loading sound config from $DATADIR/sound\n";
3517		3707
3518	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3519	or die "$DATADIR/sound $!";
3520
3521	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3708	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3522		3709
3523	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3710	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3524	my $sound = $soundconf->{compat}[$_]	3711	my $sound = $soundconf->{compat}[$_]
3525	or next;	3712	or next;
3526		3713
…		…
3536	}	3723	}
3537		3724
3538	sub reload_resources {	3725	sub reload_resources {
3539	trace "reloading resource files...\n";	3726	trace "reloading resource files...\n";
3540		3727
3541	reload_exp_table;
3542	reload_materials;	3728	reload_materials;
3543	reload_facedata;	3729	reload_facedata;
		3730	reload_exp_table;
3544	reload_sound;	3731	reload_sound;
3545	reload_archetypes;	3732	reload_archetypes;
3546	reload_regions;	3733	reload_regions;
3547	reload_treasures;	3734	reload_treasures;
3548		3735
…		…
3550	}	3737	}
3551		3738
3552	sub reload_config {	3739	sub reload_config {
3553	trace "reloading config file...\n";	3740	trace "reloading config file...\n";
3554		3741
3555	0 < aio_load "$CONFDIR/config", my $config	3742	my $config = load_file "$CONFDIR/config";
3556	or die "$CONFDIR/config: $!";
3557
3558	utf8::decode $config;	3743	utf8::decode $config;
3559		3744	*CFG = decode_yaml $config;
3560	cf::get_slot 0.1, 10, "reload_config"; # yaml might be slow...
3561	*CFG = YAML::XS::Load $config;
3562		3745
3563	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3746	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3564		3747
3565	$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};
3566	$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};
…		…
3604		3787
3605	sub main {	3788	sub main {
3606	cf::init_globals; # initialise logging	3789	cf::init_globals; # initialise logging
3607		3790
3608	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3791	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3609	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.";
3610	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3793	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3611	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3794	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3612		3795
3613	$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
3614		3797
3615	# we must not ever block the main coroutine	3798	# we must not ever block the main coroutine
3616	local $Coro::idle = sub {	3799	$Coro::idle = sub {
3617	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#
3618	(async {	3801	(async {
3619	$Coro::current->{desc} = "IDLE BUG HANDLER";	3802	$Coro::current->{desc} = "IDLE BUG HANDLER";
3620	EV::loop EV::LOOP_ONESHOT;	3803	EV::loop EV::LOOP_ONESHOT;
3621	})->prio (Coro::PRIO_MAX);	3804	})->prio (Coro::PRIO_MAX);
…		…
3624	evthread_start IO::AIO::poll_fileno;	3807	evthread_start IO::AIO::poll_fileno;
3625		3808
3626	cf::sync_job {	3809	cf::sync_job {
3627	cf::incloader::init ();	3810	cf::incloader::init ();
3628		3811
		3812	db_init;
		3813
3629	cf::init_anim;	3814	cf::init_anim;
3630	cf::init_attackmess;	3815	cf::init_attackmess;
3631	cf::init_dynamic;	3816	cf::init_dynamic;
3632		3817
3633	cf::load_settings;	3818	cf::load_settings;
3634		3819
3635	reload_resources;	3820	reload_resources;
3636	reload_config;	3821	reload_config;
3637	db_init;
3638		3822
3639	cf::init_uuid;	3823	cf::init_uuid;
3640	cf::init_signals;	3824	cf::init_signals;
3641	cf::init_skills;	3825	cf::init_skills;
3642		3826
…		…
3650		3834
3651	# no (long-running) fork's whatsoever before this point(!)	3835	# no (long-running) fork's whatsoever before this point(!)
3652	use POSIX ();	3836	use POSIX ();
3653	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};
3654		3838
3655	(pop @POST_INIT)->(0) while @POST_INIT;	3839	cf::_post_init 0;
3656	};	3840	};
3657		3841
3658	cf::object::thawer::errors_are_fatal 0;	3842	cf::object::thawer::errors_are_fatal 0;
3659	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";
3660		3844
3661	my $free_main; $free_main = EV::idle sub {	3845	AE::postpone {
3662	undef $free_main;
3663	undef &main; # free gobs of memory :)	3846	undef &main; # free gobs of memory :)
3664	};	3847	};
3665		3848
3666	goto &main_loop;	3849	goto &main_loop;
3667	}	3850	}
…		…
3824		4007
3825	cf::write_runtime_sync; # external watchdog should not bark	4008	cf::write_runtime_sync; # external watchdog should not bark
3826		4009
3827	trace "emergency_perl_save: flushing outstanding aio requests";	4010	trace "emergency_perl_save: flushing outstanding aio requests";
3828	while (IO::AIO::nreqs || BDB::nreqs) {	4011	while (IO::AIO::nreqs || BDB::nreqs) {
3829	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
3830	}	4013	}
3831		4014
3832	cf::write_runtime_sync; # external watchdog should not bark	4015	cf::write_runtime_sync; # external watchdog should not bark
3833	};	4016	};
3834		4017
…		…
3883		4066
3884	my $t1 = AE::time;	4067	my $t1 = AE::time;
3885		4068
3886	while ($RELOAD) {	4069	while ($RELOAD) {
3887	cf::get_slot 0.1, -1, "reload_perl";	4070	cf::get_slot 0.1, -1, "reload_perl";
3888	info "reloading...";	4071	info "perl_reload: reloading...";
3889		4072
3890	trace "entering sync_job";	4073	trace "perl_reload: entering sync_job";
3891		4074
3892	cf::sync_job {	4075	cf::sync_job {
3893	#cf::emergency_save;	4076	#cf::emergency_save;
3894		4077
3895	trace "cancelling all extension coros";	4078	trace "perl_reload: cancelling all extension coros";
3896	$_->cancel for values %EXT_CORO;	4079	$_->cancel for values %EXT_CORO;
3897	%EXT_CORO = ();	4080	%EXT_CORO = ();
3898		4081
3899	trace "removing commands";	4082	trace "perl_reload: removing commands";
3900	%COMMAND = ();	4083	%COMMAND = ();
3901		4084
3902	trace "removing ext/exti commands";	4085	trace "perl_reload: removing ext/exti commands";
3903	%EXTCMD = ();	4086	%EXTCMD = ();
3904	%EXTICMD = ();	4087	%EXTICMD = ();
3905		4088
3906	trace "unloading/nuking all extensions";	4089	trace "perl_reload: unloading/nuking all extensions";
3907	for my $pkg (@EXTS) {	4090	for my $pkg (@EXTS) {
3908	trace "... unloading $pkg";	4091	trace "... unloading $pkg";
3909		4092
3910	if (my $cb = $pkg->can ("unload")) {	4093	if (my $cb = $pkg->can ("unload")) {
3911	eval {	4094	eval {
…		…
3916		4099
3917	trace "... clearing $pkg";	4100	trace "... clearing $pkg";
3918	clear_package $pkg;	4101	clear_package $pkg;
3919	}	4102	}
3920		4103
3921	trace "unloading all perl modules loaded from $LIBDIR";	4104	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3922	while (my ($k, $v) = each %INC) {	4105	while (my ($k, $v) = each %INC) {
3923	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4106	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3924		4107
3925	trace "... unloading $k";	4108	trace "... unloading $k";
3926	delete $INC{$k};	4109	delete $INC{$k};
…		…
3933	}	4116	}
3934		4117
3935	clear_package $k;	4118	clear_package $k;
3936	}	4119	}
3937		4120
3938	trace "getting rid of safe::, as good as possible";	4121	trace "perl_reload: getting rid of safe::, as good as possible";
3939	clear_package "safe::$_"	4122	clear_package "safe::$_"
3940	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);
3941		4124
3942	trace "unloading cf.pm \"a bit\"";	4125	trace "perl_reload: unloading cf.pm \"a bit\"";
3943	delete $INC{"cf.pm"};	4126	delete $INC{"cf.pm"};
3944	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4127	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3945		4128
3946	# don't, removes xs symbols, too,	4129	# don't, removes xs symbols, too,
3947	# and global variables created in xs	4130	# and global variables created in xs
3948	#clear_package __PACKAGE__;	4131	#clear_package __PACKAGE__;
3949		4132
3950	info "unload completed, starting to reload now";	4133	info "perl_reload: unload completed, starting to reload now";
3951		4134
3952	trace "reloading cf.pm";	4135	trace "perl_reload: reloading cf.pm";
3953	require cf;	4136	require cf;
3954	cf::_connect_to_perl_1;	4137	cf::_connect_to_perl_1;
3955		4138
3956	trace "loading config and database again";	4139	trace "perl_reload: loading config and database again";
3957	cf::reload_config;	4140	cf::reload_config;
3958		4141
3959	trace "loading extensions";	4142	trace "perl_reload: loading extensions";
3960	cf::load_extensions;	4143	cf::load_extensions;
3961		4144
3962	if ($REATTACH_ON_RELOAD) {	4145	if ($REATTACH_ON_RELOAD) {
3963	trace "reattaching attachments to objects/players";	4146	trace "perl_reload: reattaching attachments to objects/players";
3964	_global_reattach; # objects, sockets	4147	_global_reattach; # objects, sockets
3965	trace "reattaching attachments to maps";	4148	trace "perl_reload: reattaching attachments to maps";
3966	reattach $_ for values %MAP;	4149	reattach $_ for values %MAP;
3967	trace "reattaching attachments to players";	4150	trace "perl_reload: reattaching attachments to players";
3968	reattach $_ for values %PLAYER;	4151	reattach $_ for values %PLAYER;
3969	}	4152	}
3970		4153
3971	trace "running post_init jobs";	4154	cf::_post_init 1;
3972	(pop @POST_INIT)->(1) while @POST_INIT;
3973		4155
3974	trace "leaving sync_job";	4156	trace "perl_reload: leaving sync_job";
3975		4157
3976	1	4158	1
3977	} or do {	4159	} or do {
3978	error $@;	4160	error $@;
3979	cf::cleanup "error while reloading, exiting.";	4161	cf::cleanup "perl_reload: error, exiting.";
3980	};	4162	};
3981		4163
3982	info "reloaded";
3983	--$RELOAD;	4164	--$RELOAD;
3984	}	4165	}
3985		4166
3986	$t1 = AE::time - $t1;	4167	$t1 = AE::time - $t1;
3987	info "reload completed in ${t1}s\n";	4168	info "perl_reload: completed in ${t1}s\n";
3988	};	4169	};
3989		4170
3990	our $RELOAD_WATCHER; # used only during reload	4171	our $RELOAD_WATCHER; # used only during reload
3991		4172
3992	sub reload_perl() {	4173	sub reload_perl() {
…		…
4017		4198
4018	#############################################################################	4199	#############################################################################
4019		4200
4020	my $bug_warning = 0;	4201	my $bug_warning = 0;
4021		4202
4022	our @WAIT_FOR_TICK;
4023	our @WAIT_FOR_TICK_BEGIN;
4024
4025	sub wait_for_tick() {	4203	sub wait_for_tick() {
4026	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4204	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4027		4205
4028	my $signal = new Coro::Signal;	4206	$WAIT_FOR_TICK->wait;
4029	push @WAIT_FOR_TICK, $signal;
4030	$signal->wait;
4031	}	4207	}
4032		4208
4033	sub wait_for_tick_begin() {	4209	sub wait_for_tick_begin() {
4034	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4210	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4035		4211
4036	my $signal = new Coro::Signal;	4212	my $signal = new Coro::Signal;
4037	push @WAIT_FOR_TICK_BEGIN, $signal;	4213	push @WAIT_FOR_TICK_BEGIN, $signal;
4038	$signal->wait;	4214	$signal->wait;
4039	}	4215	}
…		…
4043	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"
4044	unless ++$bug_warning > 10;	4220	unless ++$bug_warning > 10;
4045	return;	4221	return;
4046	}	4222	}
4047		4223
4048	cf::server_tick; # one server iteration	4224	cf::one_tick; # one server iteration
4049		4225
4050	#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#
4051		4227
4052	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4228	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4053	$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.;
…		…
4059	}	4235	}
4060		4236
4061	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4237	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4062	$sig->send;	4238	$sig->send;
4063	}	4239	}
4064	while (my $sig = shift @WAIT_FOR_TICK) {	4240	$WAIT_FOR_TICK->broadcast;
4065	$sig->send;
4066	}
4067		4241
4068	$LOAD = ($NOW - $TICK_START) / $TICK;	4242	$LOAD = ($NOW - $TICK_START) / $TICK;
4069	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4243	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4070		4244
4071	if (0) {	4245	if (0) {
…		…
4077	}	4251	}
4078	}	4252	}
4079		4253
4080	{	4254	{
4081	# configure BDB	4255	# configure BDB
		4256	info "initialising database";
4082		4257
4083	BDB::min_parallel 16;	4258	BDB::min_parallel 16;
4084	BDB::max_poll_reqs $TICK * 0.1;	4259	BDB::max_poll_reqs $TICK * 0.1;
4085	$AnyEvent::BDB::WATCHER->priority (1);	4260	#$AnyEvent::BDB::WATCHER->priority (1);
4086		4261
4087	unless ($DB_ENV) {	4262	unless ($DB_ENV) {
4088	$DB_ENV = BDB::db_env_create;	4263	$DB_ENV = BDB::db_env_create;
4089	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4264	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4090	$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;
…		…
4115	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4290	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4116	};	4291	};
4117	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4292	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4118	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4293	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4119	};	4294	};
		4295
		4296	info "database initialised";
4120	}	4297	}
4121		4298
4122	{	4299	{
4123	# configure IO::AIO	4300	# configure IO::AIO
4124		4301
		4302	info "initialising aio";
4125	IO::AIO::min_parallel 8;	4303	IO::AIO::min_parallel 8;
4126	IO::AIO::max_poll_time $TICK * 0.1;	4304	IO::AIO::max_poll_time $TICK * 0.1;
4127	undef $AnyEvent::AIO::WATCHER;	4305	undef $AnyEvent::AIO::WATCHER;
		4306	info "aio initialised";
4128	}	4307	}
4129		4308
4130	my $_log_backtrace;	4309	our $_log_backtrace;
		4310	our $_log_backtrace_last;
4131		4311
4132	sub _log_backtrace {	4312	sub _log_backtrace {
4133	my ($msg, @addr) = @_;	4313	my ($msg, @addr) = @_;
4134		4314
4135	$msg =~ s/\n//;	4315	$msg =~ s/\n$//;
4136		4316
		4317	if ($_log_backtrace_last eq $msg) {
		4318	LOG llevInfo, "[ABT] $msg\n";
		4319	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4137	# limit the # of concurrent backtraces	4320	# limit the # of concurrent backtraces
4138	if ($_log_backtrace < 2) {	4321	} elsif ($_log_backtrace < 2) {
		4322	$_log_backtrace_last = $msg;
4139	++$_log_backtrace;	4323	++$_log_backtrace;
4140	my $perl_bt = Carp::longmess $msg;	4324	my $perl_bt = Carp::longmess $msg;
4141	async {	4325	async {
4142	$Coro::current->{desc} = "abt $msg";	4326	$Coro::current->{desc} = "abt $msg";
4143		4327
…		…
4163	LOG llevInfo, "[ABT] $_\n" for @bt;	4347	LOG llevInfo, "[ABT] $_\n" for @bt;
4164	--$_log_backtrace;	4348	--$_log_backtrace;
4165	};	4349	};
4166	} else {	4350	} else {
4167	LOG llevInfo, "[ABT] $msg\n";	4351	LOG llevInfo, "[ABT] $msg\n";
4168	LOG llevInfo, "[ABT] [suppressed]\n";	4352	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4169	}	4353	}
4170	}	4354	}
4171		4355
4172	# load additional modules	4356	# load additional modules
4173	require "cf/$_.pm" for @EXTRA_MODULES;	4357	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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