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.541 by root, Tue May 4 23:33:16 2010 UTC vs.
Revision 1.593 by root, Fri Nov 9 01:59:33 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE; # unused	117	#our %RESOURCE; # unused
112		118
113	our $OUTPUT_RATE_MIN = 3000;	119	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	120	our $OUTPUT_RATE_MAX = 1000000;
115		121
116	our $MAX_LINKS = 32; # how many chained exits to follow	122	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	130	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	131	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	132	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	133	our $DB_ENV;
128		134
129	our @EXTRA_MODULES = qw(pod match mapscript);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		136
131	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		139
133	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
135	our $NOW;	143	our $NOW;
136		144
137	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		156
149	our @POST_INIT;	157	our @POST_INIT;
150		158
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
153		164
154	binmode STDOUT;	165	binmode STDOUT;
155	binmode STDERR;	166	binmode STDERR;
156		167
157	# read virtual server time, if available	168	# read virtual server time, if available
…		…
191		202
192	=over 4	203	=over 4
193		204
194	=item $cf::UPTIME	205	=item $cf::UPTIME
195		206
196	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
197		223
198	=item $cf::RUNTIME	224	=item $cf::RUNTIME
199		225
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	227	every server tick.
202		228
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	229	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	230	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	231	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		232
207	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
210	database environment.	236	database environment.
211		237
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	238	=item $cf::LOADAVG
221		239
222	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	251	from wherever your confdir points to.
234		252
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		254
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
240		275
241	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
242		277
243	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	340	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	342	}
308		343
309	$EV::DIED = sub {	344	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
311	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
312		352
313	#############################################################################	353	#############################################################################
314		354
315	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
316		356
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	378	$d
339	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
340	}	380	}
341		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
342	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
343		435
344	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
345		437
346	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		445
354	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
356		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
357	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
358		481
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
361		484
362	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	486	is a reload or not.
364		487
365	=cut	488	=cut
366		489
367	sub post_init(&) {	490	sub post_init(&) {
368	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
369	}	509	}
370		510
371	=item cf::lock_wait $string	511	=item cf::lock_wait $string
372		512
373	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
427	}	567	}
428		568
429	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
430		570
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
433	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
434		578
435	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
436	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
437		581
438	Useful for short background jobs.	582	Useful for short background jobs.
…		…
467	}	611	}
468	}	612	}
469		613
470	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	617	} else {
475	$busy = 0;	618	$busy = 0;
476	Coro::schedule;	619	Coro::schedule;
477	}	620	}
478	}	621	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
579		722
580	$coro	723	$coro
581	}	724	}
582		725
583	=item fork_call { }, $args	726	=item fork_call { }, @args
584		727
585	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
589		732
590	=cut	733	=cut
591		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
592	sub fork_call(&@) {	739	sub fork_call(&@) {
593	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
594		741
595	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
598		745
599	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
600	reset_signals;	747	cf::post_fork;
601	&$cb	748	&$cb
602	}, @args;	749	} @args;
603		750
604	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
605	}	752	}
606		753
607	sub objinfo {	754	sub objinfo {
…		…
729		876
730	my @data;	877	my @data;
731	my $md5;	878	my $md5;
732		879
733	for (0 .. $#$src) {	880	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	882	}
737		883
738	# if processing is expensive, check	884	# if processing is expensive, check
739	# checksum first	885	# checksum first
740	if (1) {	886	if (1) {
…		…
1285	=cut	1431	=cut
1286		1432
1287	#############################################################################	1433	#############################################################################
1288	# command handling &c	1434	# command handling &c
1289		1435
1290	=item cf::register_command $name => \&callback($ob,$args);	1436	=item cf::register_command $name => \&callback($ob,$args)
1291		1437
1292	Register a callback for execution when the client sends the user command	1438	Register a callback for execution when the client sends the user command
1293	$name.	1439	$name.
1294		1440
1295	=cut	1441	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1447	#warn "registering command '$name/$time' to '$caller'";
1302		1448
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1449	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1450	}
1305		1451
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1452	=item cf::register_extcmd $name => \&callback($pl,$packet)
1307		1453
1308	Register a callback for execution when the client sends an (synchronous)	1454	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1455	extcmd packet. Ext commands will be processed in the order they are
1310	received by the server, like other user commands. The first argument is	1456	received by the server, like other user commands. The first argument is
1311	the logged-in player. Ext commands can only be processed after a player	1457	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1458	has logged in successfully.
1313		1459
1314	If the callback returns something, it is sent back as if reply was being	1460	If the callback returns something, it is sent back as if reply was being
1315	called.	1461	called.
1316		1462
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1463	=item cf::register_exticmd $name => \&callback($ns,$packet)
1318		1464
1319	Register a callback for execution when the client sends an (asynchronous)	1465	Register a callback for execution when the client sends an (asynchronous)
1320	exticmd packet. Exti commands are processed by the server as soon as they	1466	exticmd packet. Exti commands are processed by the server as soon as they
1321	are received, i.e. out of order w.r.t. other commands. The first argument	1467	are received, i.e. out of order w.r.t. other commands. The first argument
1322	is a client socket. Exti commands can be received anytime, even before	1468	is a client socket. Exti commands can be received anytime, even before
…		…
1358	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1359		1505
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1507
1362	if (ref $msg) {	1508	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1510
1368	my @reply;	1511	my @reply;
1369		1512
1370	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
1372	}	1515	}
1373		1516
1374	$pl->ext_reply ($reply, @reply)	1517	$pl->ext_msg ("reply-$reply", @reply)
1375	if $reply;	1518	if $reply;
1376		1519
1377	} else {	1520	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1522	}
…		…
1393	};	1536	};
1394		1537
1395	$grp	1538	$grp
1396	}	1539	}
1397		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1398	sub load_extensions {	1552	sub load_extensions {
1399	info "loading extensions...";	1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
1400		1556
1401	cf::sync_job {	1557	cf::sync_job {
1402	my %todo;	1558	my %todo;
1403		1559
1404	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1603	unless exists $done{$_};
1448	}	1604	}
1449		1605
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1452	my $active = eval $v->{source};	1617	my $active = eval $source;
1453		1618
1454	if (length $@) {	1619	if (length $@) {
1455	error "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1456	undef $@; # work around perl 5.10.0 utf-8 caching bug
1457		1621
1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459	if exists $v->{meta}{mandatory};	1623	if exists $v->{meta}{mandatory};
1460		1624
1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1625	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1475		1639
1476	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1479	}	1643	}
		1644
		1645	last;
1480	}	1646	}
1481	}	1647	}
1482	};	1648	};
1483	}	1649	}
1484		1650
…		…
1642	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1643		1809
1644	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1645	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1646		1812
1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648	$pl->deactivate;	1814	$pl->deactivate;
		1815
1649	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1651	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1652		1821
1653	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1654	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1655	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1741		1910
1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1911	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1743		1912
1744	Expand deliantra pod fragments into protocol xml.	1913	Expand deliantra pod fragments into protocol xml.
1745		1914
1746	=item $player->ext_reply ($msgid, @msg)
1747
1748	Sends an ext reply to the player.
1749
1750	=cut
1751
1752	sub ext_reply($$@) {
1753	my ($self, $id, @msg) = @_;
1754
1755	$self->ns->ext_reply ($id, @msg)
1756	}
1757
1758	=item $player->ext_msg ($type, @msg)	1915	=item $player->ext_msg ($type, @msg)
1759		1916
1760	Sends an ext event to the client.	1917	Sends an ext event to the client.
1761		1918
1762	=cut	1919	=cut
…		…
1821	sub generate_random_map {	1978	sub generate_random_map {
1822	my ($self, $rmp) = @_;	1979	my ($self, $rmp) = @_;
1823		1980
1824	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1981	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825		1982
1826	# mit "rum" bekleckern, nicht
1827	$self->_create_random_map (	1983	$self->_create_random_map ($rmp);
1828	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831	$rmp->{exit_on_final_map},
1832	$rmp->{xsize}, $rmp->{ysize},
1833	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838	(cf::region::find $rmp->{region}), $rmp->{custom}
1839	)
1840	}	1984	}
1841		1985
1842	=item cf::map->register ($regex, $prio)	1986	=item cf::map->register ($regex, $prio)
1843		1987
1844	Register a handler for the map path matching the given regex at the	1988	Register a handler for the map path matching the given regex at the
…		…
1870	}	2014	}
1871		2015
1872	sub normalise {	2016	sub normalise {
1873	my ($path, $base) = @_;	2017	my ($path, $base) = @_;
1874		2018
1875	$path = "$path"; # make sure its a string	2019	$path = "$path"; # make sure it's a string
1876		2020
1877	$path =~ s/\.map$//;	2021	$path =~ s/\.map$//;
1878		2022
1879	# map plan:	2023	# map plan:
1880	#	2024	#
…		…
1895	$base =~ s{[^/]+/?$}{};	2039	$base =~ s{[^/]+/?$}{};
1896	$path = "$base/$path";	2040	$path = "$base/$path";
1897	}	2041	}
1898		2042
1899	for ($path) {	2043	for ($path) {
1900	redo if s{//}{/};
1901	redo if s{/\.?/}{/};	2044	redo if s{/\.?/}{/};
1902	redo if s{/[^/]+/\.\./}{/};	2045	redo if s{/[^/]+/\.\./}{/};
1903	}	2046	}
1904		2047
1905	$path	2048	$path
…		…
1919	$self->init; # pass $1 etc.	2062	$self->init; # pass $1 etc.
1920	return $self;	2063	return $self;
1921	}	2064	}
1922	}	2065	}
1923		2066
1924	Carp::cluck "unable to resolve path '$path' (base '$base').";	2067	Carp::cluck "unable to resolve path '$path' (base '$base')";
1925	()	2068	()
1926	}	2069	}
1927		2070
		2071	# may re-bless or do other evil things
1928	sub init {	2072	sub init {
1929	my ($self) = @_;	2073	my ($self) = @_;
1930		2074
1931	$self	2075	$self
1932	}	2076	}
…		…
1997	$self->{load_path} = $path;	2141	$self->{load_path} = $path;
1998		2142
1999	1	2143	1
2000	}	2144	}
2001		2145
		2146	# used to laod the header of an original map
2002	sub load_header_orig {	2147	sub load_header_orig {
2003	my ($self) = @_;	2148	my ($self) = @_;
2004		2149
2005	$self->load_header_from ($self->load_path)	2150	$self->load_header_from ($self->load_path)
2006	}	2151	}
2007		2152
		2153	# used to laod the header of an instantiated map
2008	sub load_header_temp {	2154	sub load_header_temp {
2009	my ($self) = @_;	2155	my ($self) = @_;
2010		2156
2011	$self->load_header_from ($self->save_path)	2157	$self->load_header_from ($self->save_path)
2012	}	2158	}
2013		2159
		2160	# called after loading the header from an instantiated map
2014	sub prepare_temp {	2161	sub prepare_temp {
2015	my ($self) = @_;	2162	my ($self) = @_;
2016		2163
2017	$self->last_access ((delete $self->{last_access})	2164	$self->last_access ((delete $self->{last_access})
2018	|| $cf::RUNTIME); #d#	2165	|| $cf::RUNTIME); #d#
2019	# safety	2166	# safety
2020	$self->{instantiate_time} = $cf::RUNTIME	2167	$self->{instantiate_time} = $cf::RUNTIME
2021	if $self->{instantiate_time} > $cf::RUNTIME;	2168	if $self->{instantiate_time} > $cf::RUNTIME;
2022	}	2169	}
2023		2170
		2171	# called after loading the header from an original map
2024	sub prepare_orig {	2172	sub prepare_orig {
2025	my ($self) = @_;	2173	my ($self) = @_;
2026		2174
2027	$self->{load_original} = 1;	2175	$self->{load_original} = 1;
2028	$self->{instantiate_time} = $cf::RUNTIME;	2176	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2052		2200
2053	sub find;	2201	sub find;
2054	sub find {	2202	sub find {
2055	my ($path, $origin) = @_;	2203	my ($path, $origin) = @_;
2056		2204
		2205	cf::cede_to_tick;
		2206
2057	$path = normalise $path, $origin && $origin->path;	2207	$path = normalise $path, $origin;
2058		2208
2059	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2209	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060	my $guard2 = cf::lock_acquire "map_find:$path";	2210	my $guard2 = cf::lock_acquire "map_find:$path";
2061		2211
2062	$cf::MAP{$path} || do {	2212	$cf::MAP{$path} || do {
…		…
2093		2243
2094	{	2244	{
2095	my $guard = cf::lock_acquire "map_data:$path";	2245	my $guard = cf::lock_acquire "map_data:$path";
2096		2246
2097	return unless $self->valid;	2247	return unless $self->valid;
2098	return unless $self->in_memory == cf::MAP_SWAPPED;	2248	return unless $self->state == cf::MAP_SWAPPED;
2099
2100	$self->in_memory (cf::MAP_LOADING);
2101		2249
2102	$self->alloc;	2250	$self->alloc;
2103		2251
2104	$self->pre_load;	2252	$self->pre_load;
2105	cf::cede_to_tick;	2253	cf::cede_to_tick;
2106		2254
		2255	if (exists $self->{load_path}) {
2107	my $f = new_from_file cf::object::thawer $self->{load_path};	2256	my $f = new_from_file cf::object::thawer $self->{load_path};
2108	$f->skip_block;	2257	$f->skip_block;
2109	$self->_load_objects ($f)	2258	$self->_load_objects ($f)
2110	or return;	2259	or return;
2111		2260
2112	$self->post_load_original	2261	$self->post_load_original
2113	if delete $self->{load_original};	2262	if delete $self->{load_original};
2114		2263
2115	if (my $uniq = $self->uniq_path) {	2264	if (my $uniq = $self->uniq_path) {
2116	utf8::encode $uniq;	2265	utf8::encode $uniq;
2117	unless (aio_stat $uniq) {	2266	unless (aio_stat $uniq) {
2118	if (my $f = new_from_file cf::object::thawer $uniq) {	2267	if (my $f = new_from_file cf::object::thawer $uniq) {
2119	$self->clear_unique_items;	2268	$self->clear_unique_items;
2120	$self->_load_objects ($f);	2269	$self->_load_objects ($f);
2121	$f->resolve_delayed_derefs;	2270	$f->resolve_delayed_derefs;
		2271	}
2122	}	2272	}
2123	}	2273	}
2124	}
2125		2274
2126	$f->resolve_delayed_derefs;	2275	$f->resolve_delayed_derefs;
		2276	} else {
		2277	$self->post_load_original
		2278	if delete $self->{load_original};
		2279	}
		2280
		2281	$self->state (cf::MAP_INACTIVE);
2127		2282
2128	cf::cede_to_tick;	2283	cf::cede_to_tick;
2129	# now do the right thing for maps	2284	# now do the right thing for maps
2130	$self->link_multipart_objects;	2285	$self->link_multipart_objects;
2131	$self->difficulty ($self->estimate_difficulty)	2286	$self->difficulty ($self->estimate_difficulty)
…		…
2135	unless ($self->{deny_activate}) {	2290	unless ($self->{deny_activate}) {
2136	$self->decay_objects;	2291	$self->decay_objects;
2137	$self->fix_auto_apply;	2292	$self->fix_auto_apply;
2138	$self->update_buttons;	2293	$self->update_buttons;
2139	cf::cede_to_tick;	2294	cf::cede_to_tick;
2140	$self->activate;	2295	#$self->activate; # no longer activate maps automatically
2141	}	2296	}
2142		2297
2143	$self->{last_save} = $cf::RUNTIME;	2298	$self->{last_save} = $cf::RUNTIME;
2144	$self->last_access ($cf::RUNTIME);	2299	$self->last_access ($cf::RUNTIME);
2145
2146	$self->in_memory (cf::MAP_ACTIVE);
2147	}	2300	}
2148		2301
2149	$self->post_load;	2302	$self->post_load;
		2303
		2304	1
2150	}	2305	}
2151		2306
2152	# customize the map for a given player, i.e.	2307	# customize the map for a given player, i.e.
2153	# return the _real_ map. used by e.g. per-player	2308	# return the _real_ map. used by e.g. per-player
2154	# maps to change the path to ~playername/mappath	2309	# maps to change the path to ~playername/mappath
…		…
2162	# if $self->per_party;	2317	# if $self->per_party;
2163		2318
2164	$self	2319	$self
2165	}	2320	}
2166		2321
2167	# find and load all maps in the 3x3 area around a map
2168	sub load_neighbours {
2169	my ($map) = @_;
2170
2171	my @neigh; # diagonal neighbours
2172
2173	for (0 .. 3) {
2174	my $neigh = $map->tile_path ($_)
2175	or next;
2176	$neigh = find $neigh, $map
2177	or next;
2178	$neigh->load;
2179
2180	# now find the diagonal neighbours
2181	push @neigh,
2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2184	}
2185
2186	for (grep defined $_->[0], @neigh) {
2187	my ($path, $origin) = @$_;
2188	my $neigh = find $path, $origin
2189	or next;
2190	$neigh->load;
2191	}
2192	}
2193
2194	sub find_sync {	2322	sub find_sync {
2195	my ($path, $origin) = @_;	2323	my ($path, $origin) = @_;
2196		2324
		2325	# it's a bug to call this from the main context
2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2326	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198	if $Coro::current == $Coro::main;	2327	if $Coro::current == $Coro::main;
2199		2328
2200	find $path, $origin	2329	find $path, $origin
2201	}	2330	}
2202		2331
2203	sub do_load_sync {	2332	sub do_load_sync {
2204	my ($map) = @_;	2333	my ($map) = @_;
2205		2334
		2335	# it's a bug to call this from the main context
2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2336	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207	if $Coro::current == $Coro::main;	2337	if $Coro::current == $Coro::main;
2208		2338
2209	$map->load;	2339	$map->load;
2210	}	2340	}
…		…
2213	our $MAP_PREFETCHER = undef;	2343	our $MAP_PREFETCHER = undef;
2214		2344
2215	sub find_async {	2345	sub find_async {
2216	my ($path, $origin, $load) = @_;	2346	my ($path, $origin, $load) = @_;
2217		2347
2218	$path = normalise $path, $origin && $origin->{path};	2348	$path = normalise $path, $origin;
2219		2349
2220	if (my $map = $cf::MAP{$path}) {	2350	if (my $map = $cf::MAP{$path}) {
2221	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2351	return $map if !$load || $map->linkable;
2222	}	2352	}
2223		2353
2224	$MAP_PREFETCH{$path} |= $load;	2354	$MAP_PREFETCH{$path} |= $load;
2225		2355
2226	$MAP_PREFETCHER ||= cf::async {	2356	$MAP_PREFETCHER ||= cf::async {
…		…
2285	sub swap_out {	2415	sub swap_out {
2286	my ($self) = @_;	2416	my ($self) = @_;
2287		2417
2288	my $lock = cf::lock_acquire "map_data:$self->{path}";	2418	my $lock = cf::lock_acquire "map_data:$self->{path}";
2289		2419
2290	return if $self->in_memory != cf::MAP_ACTIVE;	2420	return if !$self->linkable;
2291	return if $self->{deny_save};	2421	return if $self->{deny_save};
2292	return if $self->players;	2422	return if $self->players;
2293		2423
2294	# first deactivate the map and "unlink" it from the core	2424	# first deactivate the map and "unlink" it from the core
2295	$self->deactivate;	2425	$self->deactivate;
2296	$_->clear_links_to ($self) for values %cf::MAP;	2426	$_->clear_links_to ($self) for values %cf::MAP;
2297	$self->in_memory (cf::MAP_SWAPPED);	2427	$self->state (cf::MAP_SWAPPED);
2298		2428
2299	# then atomically save	2429	# then atomically save
2300	$self->_save;	2430	$self->_save;
2301		2431
2302	# then free the map	2432	# then free the map
…		…
2328		2458
2329	return if $self->players;	2459	return if $self->players;
2330		2460
2331	cf::trace "resetting map ", $self->path, "\n";	2461	cf::trace "resetting map ", $self->path, "\n";
2332		2462
2333	$self->in_memory (cf::MAP_SWAPPED);	2463	$self->state (cf::MAP_SWAPPED);
2334		2464
2335	# need to save uniques path	2465	# need to save uniques path
2336	unless ($self->{deny_save}) {	2466	unless ($self->{deny_save}) {
2337	my $uniq = $self->uniq_path; utf8::encode $uniq;	2467	my $uniq = $self->uniq_path; utf8::encode $uniq;
2338		2468
…		…
2668	# use -1 or undef as default coordinates, not 0, 0	2798	# use -1 or undef as default coordinates, not 0, 0
2669	($x, $y) = ($map->enter_x, $map->enter_y)	2799	($x, $y) = ($map->enter_x, $map->enter_y)
2670	if $x <= 0 && $y <= 0;	2800	if $x <= 0 && $y <= 0;
2671		2801
2672	$map->load;	2802	$map->load;
2673	$map->load_neighbours;
2674		2803
2675	return unless $self->contr->active;	2804	return unless $self->contr->active;
2676		2805
2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2806	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678	if ($self->enter_map ($map, $x, $y)) {	2807	if ($self->enter_map ($map, $x, $y)) {
…		…
2734	($path, $x, $y) = (undef, undef, undef);	2863	($path, $x, $y) = (undef, undef, undef);
2735	}	2864	}
2736	}	2865	}
2737		2866
2738	my $map = eval {	2867	my $map = eval {
2739	my $map = defined $path ? cf::map::find $path : undef;	2868	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740		2869
2741	if ($map) {	2870	if ($map) {
2742	$map = $map->customise_for ($self);	2871	$map = $map->customise_for ($self);
2743	$map = $check->($map, $x, $y, $self) if $check && $map;	2872	$map = $check->($map, $x, $y, $self) if $check && $map;
2744	} else {	2873	} else {
…		…
2834	$Coro::current->{desc} = "enter_exit";	2963	$Coro::current->{desc} = "enter_exit";
2835		2964
2836	unless (eval {	2965	unless (eval {
2837	$self->deactivate_recursive; # just to be sure	2966	$self->deactivate_recursive; # just to be sure
2838		2967
2839	# random map handling
2840	{
2841	my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843	prepare_random_map $exit
2844	if $exit->slaying eq "/!";
2845	}
2846
2847	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2968	my $map = cf::map::normalise $exit->slaying, $exit->map;
2848	my $x = $exit->stats->hp;	2969	my $x = $exit->stats->hp;
2849	my $y = $exit->stats->sp;	2970	my $y = $exit->stats->sp;
		2971
		2972	# special map handling
		2973	my $slaying = $exit->slaying;
		2974
		2975	# special map handling
		2976	if ($slaying eq "/!") {
		2977	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2978
		2979	prepare_random_map $exit
		2980	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2981
		2982	$map = $exit->slaying;
		2983
		2984	} elsif ($slaying eq '!up') {
		2985	$map = $exit->map->tile_path (cf::TILE_UP);
		2986	$x = $exit->x;
		2987	$y = $exit->y;
		2988
		2989	} elsif ($slaying eq '!down') {
		2990	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2991	$x = $exit->x;
		2992	$y = $exit->y;
		2993	}
2850		2994
2851	$self->goto ($map, $x, $y);	2995	$self->goto ($map, $x, $y);
2852		2996
2853	# if exit is damned, update players death & WoR home-position	2997	# if exit is damned, update players death & WoR home-position
2854	$self->contr->savebed ($map, $x, $y)	2998	$self->contr->savebed ($map, $x, $y)
…		…
3079	=cut	3223	=cut
3080		3224
3081	sub cf::client::ext_msg($$@) {	3225	sub cf::client::ext_msg($$@) {
3082	my ($self, $type, @msg) = @_;	3226	my ($self, $type, @msg) = @_;
3083		3227
3084	if ($self->extcmd == 2) {
3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3228	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086	} elsif ($self->extcmd == 1) { # TODO: remove
3087	push @msg, msgtype => "event_$type";
3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089	}
3090	}
3091
3092	=item $client->ext_reply ($msgid, @msg)
3093
3094	Sends an ext reply to the client.
3095
3096	=cut
3097
3098	sub cf::client::ext_reply($$@) {
3099	my ($self, $id, @msg) = @_;
3100
3101	if ($self->extcmd == 2) {
3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103	} elsif ($self->extcmd == 1) {
3104	#TODO: version 1, remove
3105	unshift @msg, msgtype => "reply", msgid => $id;
3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107	}
3108	}	3229	}
3109		3230
3110	=item $success = $client->query ($flags, "text", \&cb)	3231	=item $success = $client->query ($flags, "text", \&cb)
3111		3232
3112	Queues a query to the client, calling the given callback with	3233	Queues a query to the client, calling the given callback with
…		…
3167	my ($ns, $buf) = @_;	3288	my ($ns, $buf) = @_;
3168		3289
3169	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3290	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170		3291
3171	if (ref $msg) {	3292	if (ref $msg) {
3172	my ($type, $reply, @payload) =	3293	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173	"ARRAY" eq ref $msg
3174	? @$msg
3175	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176		3294
3177	my @reply;	3295	my @reply;
3178		3296
3179	if (my $cb = $EXTICMD{$type}) {	3297	if (my $cb = $EXTICMD{$type}) {
3180	@reply = $cb->($ns, @payload);	3298	@reply = $cb->($ns, @payload);
3181	}	3299	}
3182		3300
3183	$ns->ext_reply ($reply, @reply)	3301	$ns->ext_msg ("reply-$reply", @reply)
3184	if $reply;	3302	if $reply;
3185		3303
3186	} else {	3304	} else {
3187	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3305	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3188	}	3306	}
…		…
3358	=cut	3476	=cut
3359		3477
3360	#############################################################################	3478	#############################################################################
3361	# the server's init and main functions	3479	# the server's init and main functions
3362		3480
3363	# async inc loader. yay.	3481	our %FACEHASH; # hash => idx, #d# HACK for http server
3364	sub inc_loader {
3365	my $mod = $_[1];
3366		3482
3367	if (in_main && !tick_inhibit) {	3483	# internal api, not fianlised
3368	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3484	sub add_face {
		3485	my ($name, $type, $data) = @_;
		3486
		3487	my $idx = cf::face::find $name;
		3488
		3489	if ($idx) {
		3490	delete $FACEHASH{cf::face::get_chksum $idx};
3369	} else {	3491	} else {
3370	debug "loading perl module $mod\n";	3492	$idx = cf::face::alloc $name;
3371	}	3493	}
3372		3494
3373	# 1. find real file	3495	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3374	for my $dir (@ORIG_INC) {
3375	ref $dir and next;
3376	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3377	or next;
3378		3496
3379	$data = "#line 1 $dir/$mod\n$data";	3497	cf::face::set_type $idx, $type;
		3498	cf::face::set_data $idx, 0, $data, $hash;
		3499	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3500	$FACEHASH{$hash} = $idx;#d#
3380		3501
3381	open my $fh, "<", \$data or die;	3502	$idx
3382
3383	return $fh;
3384	}
3385
3386	()
3387	}
3388
3389	sub init_inc {
3390	# save original @INC
3391	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3392
3393	# make sure we can do scalar-opens
3394	open my $dummy, "<", \my $dummy2;
3395
3396	# execute some stuff so perl load's some of the core modules
3397	/Ü/ =~ /ü/i;
3398	eval { &Storable::nstore_fd };
3399
3400	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3401
3402	debug "module loading will be asynchronous from this point on.";
3403	}	3503	}
3404		3504
3405	sub load_facedata($) {	3505	sub load_facedata($) {
3406	my ($path) = @_;	3506	my ($path) = @_;
3407		3507
…		…
3411		3511
3412	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3512	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3413		3513
3414	trace "loading facedata from $path\n";	3514	trace "loading facedata from $path\n";
3415		3515
3416	my $facedata;	3516	my $facedata = decode_storable load_file $path;
3417	0 < aio_load $path, $facedata
3418	or die "$path: $!";
3419
3420	$facedata = Coro::Storable::thaw $facedata;
3421		3517
3422	$facedata->{version} == 2	3518	$facedata->{version} == 2
3423	or cf::cleanup "$path: version mismatch, cannot proceed.";	3519	or cf::cleanup "$path: version mismatch, cannot proceed.";
3424		3520
3425	# patch in the exptable
3426	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3427	$facedata->{resource}{"res/exp_table"} = {
3428	type => FT_RSRC,
3429	data => $exp_table,
3430	hash => (Digest::MD5::md5 $exp_table),
3431	};
3432	cf::cede_to_tick;	3521	cf::cede_to_tick;
3433		3522
3434	{	3523	{
3435	my $faces = $facedata->{faceinfo};	3524	my $faces = $facedata->{faceinfo};
3436		3525
3437	while (my ($face, $info) = each %$faces) {	3526	for my $face (sort keys %$faces) {
		3527	my $info = $faces->{$face};
3438	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3528	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3439		3529
3440	cf::face::set_visibility $idx, $info->{visibility};	3530	cf::face::set_visibility $idx, $info->{visibility};
3441	cf::face::set_magicmap $idx, $info->{magicmap};	3531	cf::face::set_magicmap $idx, $info->{magicmap};
3442	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3532	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3443	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3533	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3534	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3535	$FACEHASH{$info->{hash64}} = $idx;#d#
3444		3536
3445	cf::cede_to_tick;	3537	cf::cede_to_tick;
3446	}	3538	}
3447		3539
3448	while (my ($face, $info) = each %$faces) {	3540	while (my ($face, $info) = each %$faces) {
…		…
3475		3567
3476	{	3568	{
3477	my $res = $facedata->{resource};	3569	my $res = $facedata->{resource};
3478		3570
3479	while (my ($name, $info) = each %$res) {	3571	while (my ($name, $info) = each %$res) {
3480	if (defined $info->{type}) {	3572	if (defined (my $type = $info->{type})) {
		3573	# TODO: different hash - must free and use new index, or cache ixface data queue
3481	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3574	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3482		3575
		3576	cf::face::set_type $idx, $type;
3483	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3577	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3484	cf::face::set_type $idx, $info->{type};	3578	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3579	$FACEHASH{$info->{hash}} = $idx;#d#
3485	} else {	3580	} else {
3486	$RESOURCE{$name} = $info; # unused	3581	# $RESOURCE{$name} = $info; # unused
3487	}	3582	}
3488		3583
3489	cf::cede_to_tick;	3584	cf::cede_to_tick;
3490	}	3585	}
3491	}	3586	}
…		…
3509	my $status = load_resource_file_ $_[0];	3604	my $status = load_resource_file_ $_[0];
3510	get_slot 0.1, 100;	3605	get_slot 0.1, 100;
3511	cf::arch::commit_load;	3606	cf::arch::commit_load;
3512		3607
3513	$status	3608	$status
		3609	}
		3610
		3611	sub reload_exp_table {
		3612	_reload_exp_table;
		3613
		3614	add_face "res/exp_table" => FT_RSRC,
		3615	JSON::XS->new->utf8->canonical->encode (
		3616	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3617	);
		3618	}
		3619
		3620	sub reload_materials {
		3621	_reload_materials;
3514	}	3622	}
3515		3623
3516	sub reload_regions {	3624	sub reload_regions {
3517	# HACK to clear player env face cache, we need some signal framework	3625	# HACK to clear player env face cache, we need some signal framework
3518	# for this (global event?)	3626	# for this (global event?)
…		…
3533	}	3641	}
3534		3642
3535	sub reload_archetypes {	3643	sub reload_archetypes {
3536	load_resource_file "$DATADIR/archetypes"	3644	load_resource_file "$DATADIR/archetypes"
3537	or die "unable to load archetypes\n";	3645	or die "unable to load archetypes\n";
		3646
		3647	add_face "res/skill_info" => FT_RSRC,
		3648	JSON::XS->new->utf8->canonical->encode (
		3649	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3650	);
		3651	add_face "res/spell_paths" => FT_RSRC,
		3652	JSON::XS->new->utf8->canonical->encode (
		3653	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3654	);
3538	}	3655	}
3539		3656
3540	sub reload_treasures {	3657	sub reload_treasures {
3541	load_resource_file "$DATADIR/treasures"	3658	load_resource_file "$DATADIR/treasures"
3542	or die "unable to load treasurelists\n";	3659	or die "unable to load treasurelists\n";
3543	}	3660	}
3544		3661
3545	sub reload_sound {	3662	sub reload_sound {
3546	trace "loading sound config from $DATADIR/sound\n";	3663	trace "loading sound config from $DATADIR/sound\n";
3547		3664
3548	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3549	or die "$DATADIR/sound $!";
3550
3551	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3665	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3552		3666
3553	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3667	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3554	my $sound = $soundconf->{compat}[$_]	3668	my $sound = $soundconf->{compat}[$_]
3555	or next;	3669	or next;
3556		3670
…		…
3563	my $face = cf::face::find "sound/$v";	3677	my $face = cf::face::find "sound/$v";
3564	cf::sound::set $k => $face;	3678	cf::sound::set $k => $face;
3565	}	3679	}
3566	}	3680	}
3567		3681
		3682	#d# move docstuff to help or so
		3683	our %DOCSTRING;
		3684
		3685	sub reload_pod {
		3686	trace "loading pods $PODDIR\n";
		3687
		3688	%DOCSTRING = ();
		3689	my @command_list;
		3690
		3691	for (
		3692	[0, "command_help"],
		3693	[1, "emote_help"],
		3694	[2, "dmcommand_help"],
		3695	) {
		3696	my ($type, $path) = @$_;
		3697
		3698	my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
		3699	or die "unable to load $path";
		3700
		3701	my $level = 1e9;
		3702	my $rpar;
		3703
		3704	for my $par (@$paragraphs) {
		3705	if ($par->{type} eq "head2") {
		3706	# this code taken almost verbatim from DC/Protocol.pm
		3707
		3708	if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
		3709	my $cmd = $1;
		3710	my @args = split /\|/, $2;
		3711	@args = (".*") unless @args;
		3712
		3713	$_ = $_ eq ".*" ? "" : " $_"
		3714	for @args;
		3715
		3716	my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
		3717
		3718	$rpar = \($DOCSTRING{"command/$cmd"} = &cf::pod::as_cfpod ([$par]));
		3719
		3720	push @command_list, [$type, \@variants];
		3721	$level = $par->{level};
		3722	} else {
		3723	error "$par->{markup}: unparsable command heading";
		3724	}
		3725	} elsif ($par->{level} > $level) {
		3726	$$rpar .= &cf::pod::as_cfpod ([$par]);
		3727	}
		3728
		3729	cf::cede_to_tick;
		3730	}
		3731	}
		3732
		3733	@command_list = sort {
		3734	$a->[0] <=> $b->[0]
		3735	or $a->[1] cmp $b->[1]
		3736	} @command_list;
		3737
		3738	cf::cede_to_tick;
		3739
		3740	add_face "res/command_list" => FT_RSRC,
		3741	JSON::XS->new->utf8->encode (\@command_list);
		3742	}
		3743
3568	sub reload_resources {	3744	sub reload_resources {
3569	trace "reloading resource files...\n";	3745	trace "reloading resource files...\n";
3570		3746
		3747	reload_materials;
3571	reload_facedata;	3748	reload_facedata;
		3749	reload_exp_table;
3572	reload_sound;	3750	reload_sound;
3573	reload_archetypes;	3751	reload_archetypes;
3574	reload_regions;	3752	reload_regions;
3575	reload_treasures;	3753	reload_treasures;
		3754	reload_pod;
3576		3755
3577	trace "finished reloading resource files\n";	3756	trace "finished reloading resource files\n";
3578	}	3757	}
3579		3758
3580	sub reload_config {	3759	sub reload_config {
3581	trace "reloading config file...\n";	3760	trace "reloading config file...\n";
3582		3761
3583	open my $fh, "<:utf8", "$CONFDIR/config"	3762	my $config = load_file "$CONFDIR/config";
3584	or return;	3763	utf8::decode $config;
3585		3764	*CFG = decode_yaml $config;
3586	local $/;
3587	*CFG = YAML::XS::Load scalar <$fh>;
3588		3765
3589	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3766	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3590		3767
3591	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3768	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3592	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3769	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3596	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3773	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3597	and die "WARNING: m(un)lockall failed: $!\n";	3774	and die "WARNING: m(un)lockall failed: $!\n";
3598	};	3775	};
3599	warn $@ if $@;	3776	warn $@ if $@;
3600	}	3777	}
3601
3602	trace "finished reloading resource files\n";
3603	}	3778	}
3604		3779
3605	sub pidfile() {	3780	sub pidfile() {
3606	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3781	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3607	or die "$PIDFILE: $!";	3782	or die "$PIDFILE: $!";
…		…
3632		3807
3633	sub main {	3808	sub main {
3634	cf::init_globals; # initialise logging	3809	cf::init_globals; # initialise logging
3635		3810
3636	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3811	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3637	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3812	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3638	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3813	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3639	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3814	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3640		3815
3641	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3816	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3642		3817
3643	# we must not ever block the main coroutine	3818	# we must not ever block the main coroutine
3644	local $Coro::idle = sub {	3819	$Coro::idle = sub {
3645	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3820	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3646	(async {	3821	(async {
3647	$Coro::current->{desc} = "IDLE BUG HANDLER";	3822	$Coro::current->{desc} = "IDLE BUG HANDLER";
3648	EV::loop EV::LOOP_ONESHOT;	3823	EV::loop EV::LOOP_ONESHOT;
3649	})->prio (Coro::PRIO_MAX);	3824	})->prio (Coro::PRIO_MAX);
3650	};	3825	};
3651		3826
3652	evthread_start IO::AIO::poll_fileno;	3827	evthread_start IO::AIO::poll_fileno;
3653		3828
3654	cf::sync_job {	3829	cf::sync_job {
		3830	cf::incloader::init ();
		3831
3655	init_inc;	3832	db_init;
3656		3833
3657	cf::init_experience;
3658	cf::init_anim;	3834	cf::init_anim;
3659	cf::init_attackmess;	3835	cf::init_attackmess;
3660	cf::init_dynamic;	3836	cf::init_dynamic;
3661		3837
3662	cf::load_settings;	3838	cf::load_settings;
3663	cf::load_materials;
3664		3839
3665	reload_resources;	3840	reload_resources;
3666	reload_config;	3841	reload_config;
3667	db_init;
3668		3842
3669	cf::init_uuid;	3843	cf::init_uuid;
3670	cf::init_signals;	3844	cf::init_signals;
3671	cf::init_skills;	3845	cf::init_skills;
3672		3846
…		…
3680		3854
3681	# no (long-running) fork's whatsoever before this point(!)	3855	# no (long-running) fork's whatsoever before this point(!)
3682	use POSIX ();	3856	use POSIX ();
3683	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3857	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3684		3858
3685	(pop @POST_INIT)->(0) while @POST_INIT;	3859	cf::_post_init 0;
3686	};	3860	};
3687		3861
3688	cf::object::thawer::errors_are_fatal 0;	3862	cf::object::thawer::errors_are_fatal 0;
3689	info "parse errors in files are no longer fatal from this point on.\n";	3863	info "parse errors in files are no longer fatal from this point on.\n";
3690		3864
3691	my $free_main; $free_main = EV::idle sub {	3865	AE::postpone {
3692	undef $free_main;
3693	undef &main; # free gobs of memory :)	3866	undef &main; # free gobs of memory :)
3694	};	3867	};
3695		3868
3696	goto &main_loop;	3869	goto &main_loop;
3697	}	3870	}
…		…
3854		4027
3855	cf::write_runtime_sync; # external watchdog should not bark	4028	cf::write_runtime_sync; # external watchdog should not bark
3856		4029
3857	trace "emergency_perl_save: flushing outstanding aio requests";	4030	trace "emergency_perl_save: flushing outstanding aio requests";
3858	while (IO::AIO::nreqs || BDB::nreqs) {	4031	while (IO::AIO::nreqs || BDB::nreqs) {
3859	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4032	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3860	}	4033	}
3861		4034
3862	cf::write_runtime_sync; # external watchdog should not bark	4035	cf::write_runtime_sync; # external watchdog should not bark
3863	};	4036	};
3864		4037
…		…
3902	}	4075	}
3903	}	4076	}
3904		4077
3905	sub do_reload_perl() {	4078	sub do_reload_perl() {
3906	# can/must only be called in main	4079	# can/must only be called in main
3907	if (in_main) {	4080	unless (in_main) {
3908	error "can only reload from main coroutine";	4081	error "can only reload from main coroutine";
3909	return;	4082	return;
3910	}	4083	}
3911		4084
3912	return if $RELOAD++;	4085	return if $RELOAD++;
3913		4086
3914	my $t1 = AE::time;	4087	my $t1 = AE::time;
3915		4088
3916	while ($RELOAD) {	4089	while ($RELOAD) {
		4090	cf::get_slot 0.1, -1, "reload_perl";
3917	info "reloading...";	4091	info "perl_reload: reloading...";
3918		4092
3919	trace "entering sync_job";	4093	trace "perl_reload: entering sync_job";
3920		4094
3921	cf::sync_job {	4095	cf::sync_job {
3922	cf::emergency_save;	4096	#cf::emergency_save;
3923		4097
3924	trace "cancelling all extension coros";	4098	trace "perl_reload: cancelling all extension coros";
3925	$_->cancel for values %EXT_CORO;	4099	$_->cancel for values %EXT_CORO;
3926	%EXT_CORO = ();	4100	%EXT_CORO = ();
3927		4101
3928	trace "removing commands";	4102	trace "perl_reload: removing commands";
3929	%COMMAND = ();	4103	%COMMAND = ();
3930		4104
3931	trace "removing ext/exti commands";	4105	trace "perl_reload: removing ext/exti commands";
3932	%EXTCMD = ();	4106	%EXTCMD = ();
3933	%EXTICMD = ();	4107	%EXTICMD = ();
3934		4108
3935	trace "unloading/nuking all extensions";	4109	trace "perl_reload: unloading/nuking all extensions";
3936	for my $pkg (@EXTS) {	4110	for my $pkg (@EXTS) {
3937	trace "... unloading $pkg";	4111	trace "... unloading $pkg";
3938		4112
3939	if (my $cb = $pkg->can ("unload")) {	4113	if (my $cb = $pkg->can ("unload")) {
3940	eval {	4114	eval {
…		…
3945		4119
3946	trace "... clearing $pkg";	4120	trace "... clearing $pkg";
3947	clear_package $pkg;	4121	clear_package $pkg;
3948	}	4122	}
3949		4123
3950	trace "unloading all perl modules loaded from $LIBDIR";	4124	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3951	while (my ($k, $v) = each %INC) {	4125	while (my ($k, $v) = each %INC) {
3952	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4126	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3953		4127
3954	trace "... unloading $k";	4128	trace "... unloading $k";
3955	delete $INC{$k};	4129	delete $INC{$k};
…		…
3962	}	4136	}
3963		4137
3964	clear_package $k;	4138	clear_package $k;
3965	}	4139	}
3966		4140
3967	trace "getting rid of safe::, as good as possible";	4141	trace "perl_reload: getting rid of safe::, as good as possible";
3968	clear_package "safe::$_"	4142	clear_package "safe::$_"
3969	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4143	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3970		4144
3971	trace "unloading cf.pm \"a bit\"";	4145	trace "perl_reload: unloading cf.pm \"a bit\"";
3972	delete $INC{"cf.pm"};	4146	delete $INC{"cf.pm"};
3973	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4147	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3974		4148
3975	# don't, removes xs symbols, too,	4149	# don't, removes xs symbols, too,
3976	# and global variables created in xs	4150	# and global variables created in xs
3977	#clear_package __PACKAGE__;	4151	#clear_package __PACKAGE__;
3978		4152
3979	info "unload completed, starting to reload now";	4153	info "perl_reload: unload completed, starting to reload now";
3980		4154
3981	trace "reloading cf.pm";	4155	trace "perl_reload: reloading cf.pm";
3982	require cf;	4156	require cf;
3983	cf::_connect_to_perl_1;	4157	cf::_connect_to_perl_1;
3984		4158
3985	trace "loading config and database again";	4159	trace "perl_reload: loading config and database again";
3986	cf::reload_config;	4160	cf::reload_config;
3987		4161
3988	trace "loading extensions";	4162	trace "perl_reload: loading extensions";
3989	cf::load_extensions;	4163	cf::load_extensions;
3990		4164
3991	if ($REATTACH_ON_RELOAD) {	4165	if ($REATTACH_ON_RELOAD) {
3992	trace "reattaching attachments to objects/players";	4166	trace "perl_reload: reattaching attachments to objects/players";
3993	_global_reattach; # objects, sockets	4167	_global_reattach; # objects, sockets
3994	trace "reattaching attachments to maps";	4168	trace "perl_reload: reattaching attachments to maps";
3995	reattach $_ for values %MAP;	4169	reattach $_ for values %MAP;
3996	trace "reattaching attachments to players";	4170	trace "perl_reload: reattaching attachments to players";
3997	reattach $_ for values %PLAYER;	4171	reattach $_ for values %PLAYER;
3998	}	4172	}
3999		4173
4000	trace "running post_init jobs";	4174	cf::_post_init 1;
4001	(pop @POST_INIT)->(1) while @POST_INIT;
4002		4175
4003	trace "leaving sync_job";	4176	trace "perl_reload: leaving sync_job";
4004		4177
4005	1	4178	1
4006	} or do {	4179	} or do {
4007	error $@;	4180	error $@;
4008	cf::cleanup "error while reloading, exiting.";	4181	cf::cleanup "perl_reload: error, exiting.";
4009	};	4182	};
4010		4183
4011	info "reloaded";
4012	--$RELOAD;	4184	--$RELOAD;
4013	}	4185	}
4014		4186
4015	$t1 = AE::time - $t1;	4187	$t1 = AE::time - $t1;
4016	info "reload completed in ${t1}s\n";	4188	info "perl_reload: completed in ${t1}s\n";
4017	};	4189	};
4018		4190
4019	our $RELOAD_WATCHER; # used only during reload	4191	our $RELOAD_WATCHER; # used only during reload
4020		4192
4021	sub reload_perl() {	4193	sub reload_perl() {
…		…
4046		4218
4047	#############################################################################	4219	#############################################################################
4048		4220
4049	my $bug_warning = 0;	4221	my $bug_warning = 0;
4050		4222
4051	our @WAIT_FOR_TICK;
4052	our @WAIT_FOR_TICK_BEGIN;
4053
4054	sub wait_for_tick {	4223	sub wait_for_tick() {
4055	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4224	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4056		4225
4057	my $signal = new Coro::Signal;	4226	$WAIT_FOR_TICK->wait;
4058	push @WAIT_FOR_TICK, $signal;
4059	$signal->wait;
4060	}	4227	}
4061		4228
4062	sub wait_for_tick_begin {	4229	sub wait_for_tick_begin() {
4063	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4230	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4064		4231
4065	my $signal = new Coro::Signal;	4232	my $signal = new Coro::Signal;
4066	push @WAIT_FOR_TICK_BEGIN, $signal;	4233	push @WAIT_FOR_TICK_BEGIN, $signal;
4067	$signal->wait;	4234	$signal->wait;
4068	}	4235	}
…		…
4072	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4239	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4073	unless ++$bug_warning > 10;	4240	unless ++$bug_warning > 10;
4074	return;	4241	return;
4075	}	4242	}
4076		4243
4077	cf::server_tick; # one server iteration	4244	cf::one_tick; # one server iteration
4078		4245
4079	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4246	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4080		4247
4081	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4248	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4082	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4249	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4088	}	4255	}
4089		4256
4090	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4257	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4091	$sig->send;	4258	$sig->send;
4092	}	4259	}
4093	while (my $sig = shift @WAIT_FOR_TICK) {	4260	$WAIT_FOR_TICK->broadcast;
4094	$sig->send;
4095	}
4096		4261
4097	$LOAD = ($NOW - $TICK_START) / $TICK;	4262	$LOAD = ($NOW - $TICK_START) / $TICK;
4098	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4263	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4099		4264
4100	if (0) {	4265	if (0) {
…		…
4106	}	4271	}
4107	}	4272	}
4108		4273
4109	{	4274	{
4110	# configure BDB	4275	# configure BDB
		4276	info "initialising database";
4111		4277
4112	BDB::min_parallel 16;	4278	BDB::min_parallel 16;
4113	BDB::max_poll_reqs $TICK * 0.1;	4279	BDB::max_poll_reqs $TICK * 0.1;
4114	$AnyEvent::BDB::WATCHER->priority (1);	4280	#$AnyEvent::BDB::WATCHER->priority (1);
4115		4281
4116	unless ($DB_ENV) {	4282	unless ($DB_ENV) {
4117	$DB_ENV = BDB::db_env_create;	4283	$DB_ENV = BDB::db_env_create;
4118	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4284	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4119	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4285	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4144	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4310	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4145	};	4311	};
4146	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4312	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4147	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4313	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4148	};	4314	};
		4315
		4316	info "database initialised";
4149	}	4317	}
4150		4318
4151	{	4319	{
4152	# configure IO::AIO	4320	# configure IO::AIO
4153		4321
		4322	info "initialising aio";
4154	IO::AIO::min_parallel 8;	4323	IO::AIO::min_parallel 8;
4155	IO::AIO::max_poll_time $TICK * 0.1;	4324	IO::AIO::max_poll_time $TICK * 0.1;
4156	undef $AnyEvent::AIO::WATCHER;	4325	undef $AnyEvent::AIO::WATCHER;
		4326	info "aio initialised";
4157	}	4327	}
4158		4328
4159	my $_log_backtrace;	4329	our $_log_backtrace;
		4330	our $_log_backtrace_last;
4160		4331
4161	sub _log_backtrace {	4332	sub _log_backtrace {
4162	my ($msg, @addr) = @_;	4333	my ($msg, @addr) = @_;
4163		4334
4164	$msg =~ s/\n//;	4335	$msg =~ s/\n$//;
4165		4336
		4337	if ($_log_backtrace_last eq $msg) {
		4338	LOG llevInfo, "[ABT] $msg\n";
		4339	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4166	# limit the # of concurrent backtraces	4340	# limit the # of concurrent backtraces
4167	if ($_log_backtrace < 2) {	4341	} elsif ($_log_backtrace < 2) {
		4342	$_log_backtrace_last = $msg;
4168	++$_log_backtrace;	4343	++$_log_backtrace;
4169	my $perl_bt = Carp::longmess $msg;	4344	my $perl_bt = Carp::longmess $msg;
4170	async {	4345	async {
4171	$Coro::current->{desc} = "abt $msg";	4346	$Coro::current->{desc} = "abt $msg";
4172		4347
…		…
4192	LOG llevInfo, "[ABT] $_\n" for @bt;	4367	LOG llevInfo, "[ABT] $_\n" for @bt;
4193	--$_log_backtrace;	4368	--$_log_backtrace;
4194	};	4369	};
4195	} else {	4370	} else {
4196	LOG llevInfo, "[ABT] $msg\n";	4371	LOG llevInfo, "[ABT] $msg\n";
4197	LOG llevInfo, "[ABT] [suppressed]\n";	4372	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4198	}	4373	}
4199	}	4374	}
4200		4375
4201	# load additional modules	4376	# load additional modules
4202	require "cf/$_.pm" for @EXTRA_MODULES;	4377	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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