ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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