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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 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
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	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.
…		…
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. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	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.	258	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		259
		260	Note that cf::Wait_for_tick will immediately return when the server is not
		261	ticking, making it suitable for small pauses in threads that need to run
		262	when the server is paused. If that is not applicable (i.e. you I<really>
		263	want to wait, use C<$cf::WAIT_FOR_TICK>).
		264
		265	=item $cf::WAIT_FOR_TICK
		266
		267	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		268	variable contains a L<Coro::Signal> that is broadcats after every server
		269	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		270	next server tick.
		271
		272	=cut
		273
		274	sub wait_for_tick();
		275	sub wait_for_tick_begin();
240		276
241	=item @cf::INVOKE_RESULTS	277	=item @cf::INVOKE_RESULTS
242		278
243	This array contains the results of the last C<invoke ()> call. When	279	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	280	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	341	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	343	}
308		344
309	$EV::DIED = sub {	345	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
311	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
312		353
313	#############################################################################	354	#############################################################################
314		355
315	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
316		357
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	378	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	379	$d
339	} || "[unable to dump $_[0]: '$@']";	380	} || "[unable to dump $_[0]: '$@']";
340	}	381	}
341		382
		383	=item $scalar = cf::load_file $path
		384
		385	Loads the given file from path and returns its contents. Croaks on error
		386	and can block.
		387
		388	=cut
		389
		390	sub load_file($) {
		391	0 <= aio_load $_[0], my $data
		392	or Carp::croak "$_[0]: $!";
		393
		394	$data
		395	}
		396
		397	=item $success = cf::replace_file $path, $data, $sync
		398
		399	Atomically replaces the file at the given $path with new $data, and
		400	optionally $sync the data to disk before replacing the file.
		401
		402	=cut
		403
		404	sub replace_file($$;$) {
		405	my ($path, $data, $sync) = @_;
		406
		407	my $lock = cf::lock_acquire ("replace_file:$path");
		408
		409	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		410	or return;
		411
		412	$data = $data->() if ref $data;
		413
		414	length $data == aio_write $fh, 0, (length $data), $data, 0
		415	or return;
		416
		417	!$sync
		418	or !aio_fsync $fh
		419	or return;
		420
		421	aio_close $fh
		422	and return;
		423
		424	aio_rename "$path~", $path
		425	and return;
		426
		427	if ($sync) {
		428	$path =~ s%/[^/]*$%%;
		429	aio_pathsync $path;
		430	}
		431
		432	1
		433	}
		434
342	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
343		436
344	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
345		438
346	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	445	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		446
354	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
356		449
		450	=item $ref = cf::decode_storable $scalar
		451
		452	Same as Coro::Storable::thaw, so blocks.
		453
		454	=cut
		455
		456	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		457
		458	=item $ref = cf::decode_yaml $scalar
		459
		460	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		461
		462	=cut
		463
		464	sub decode_yaml($) {
		465	fork_call { YAML::XS::Load $_[0] } @_
		466	}
		467
		468	=item $scalar = cf::unlzf $scalar
		469
		470	Same as Compress::LZF::compress, but takes server ticks into account, so
		471	blocks.
		472
		473	=cut
		474
		475	sub unlzf($) {
		476	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		477	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		478	Compress::LZF::decompress $_[0]
		479	}
		480
357	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
358		482
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	483	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	484	but I<before> the server starts ticking again.
361		485
362	The cdoeblock will have a single boolean argument to indicate whether this	486	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	487	is a reload or not.
364		488
365	=cut	489	=cut
366		490
367	sub post_init(&) {	491	sub post_init(&) {
368	push @POST_INIT, shift;	492	push @POST_INIT, shift;
		493	}
		494
		495	sub _post_init {
		496	trace "running post_init jobs";
		497
		498	# run them in parallel...
		499
		500	my @join;
		501
		502	while () {
		503	push @join, map &Coro::async ($_, 0), @POST_INIT;
		504	@POST_INIT = ();
		505
		506	@join or last;
		507
		508	(pop @join)->join;
		509	}
369	}	510	}
370		511
371	=item cf::lock_wait $string	512	=item cf::lock_wait $string
372		513
373	Wait until the given lock is available. See cf::lock_acquire.	514	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
427	}	568	}
428		569
429	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
430		571
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	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	573	(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.	574	C<$time> seconds of cpu time till the next tick. The slot is only valid
		575	till the next cede.
		576
		577	Background jobs should use a priority les than zero, interactive jobs
		578	should use 100 or more.
434		579
435	The optional C<$name> can be used to identify the job to run. It might be	580	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.	581	used for statistical purposes and should identify the same time-class.
437		582
438	Useful for short background jobs.	583	Useful for short background jobs.
…		…
467	}	612	}
468	}	613	}
469		614
470	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	616	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	618	} else {
475	$busy = 0;	619	$busy = 0;
476	Coro::schedule;	620	Coro::schedule;
477	}	621	}
478	}	622	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	722	$EXT_CORO{$coro+0} = $coro;
579		723
580	$coro	724	$coro
581	}	725	}
582		726
583	=item fork_call { }, $args	727	=item fork_call { }, @args
584		728
585	Executes the given code block with the given arguments in a seperate	729	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	730	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	731	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	732	never block itself or use any form of event handling.
589		733
590	=cut	734	=cut
591		735
		736	sub post_fork {
		737	reset_signals;
		738	}
		739
592	sub fork_call(&@) {	740	sub fork_call(&@) {
593	my ($cb, @args) = @_;	741	my ($cb, @args) = @_;
594		742
595	# we seemingly have to make a local copy of the whole thing,	743	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	744	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	745	# TODO: investigate and fix (likely this will be rather laborious)
598		746
599	my @res = Coro::Util::fork_eval {	747	my @res = Coro::Util::fork_eval {
600	reset_signals;	748	cf::post_fork;
601	&$cb	749	&$cb
602	}, @args;	750	} @args;
603		751
604	wantarray ? @res : $res[-1]	752	wantarray ? @res : $res[-1]
605	}	753	}
606		754
607	sub objinfo {	755	sub objinfo {
…		…
729		877
730	my @data;	878	my @data;
731	my $md5;	879	my $md5;
732		880
733	for (0 .. $#$src) {	881	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	883	}
737		884
738	# if processing is expensive, check	885	# if processing is expensive, check
739	# checksum first	886	# checksum first
740	if (1) {	887	if (1) {
…		…
753		900
754	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
755	}	902	}
756	}	903	}
757		904
758	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
759	my $data = $process->(\@data);	906	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
761		908
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		910
764	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1432	=cut
1286		1433
1287	#############################################################################	1434	#############################################################################
1288	# command handling &c	1435	# command handling &c
1289		1436
1290	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1291		1438
1292	Register a callback for execution when the client sends the user command	1439	Register a callback for execution when the client sends the user command
1293	$name.	1440	$name.
1294		1441
1295	=cut	1442	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1302		1449
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1451	}
1305		1452
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1454
1308	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1456	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	1457	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	1458	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1459	has logged in successfully.
1313		1460
1314	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1315	called.
1316		1462
		1463	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1464
		1465	Same as C<cf::register_extcmd>, but instead of returning values, the
		1466	callback needs to clal the C<$reply> function.
		1467
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1469
1319	Register a callback for execution when the client sends an (asynchronous)	1470	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	1471	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	1472	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	1473	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1474	log-in.
1324		1475
1325	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1326	called.
1327		1477
1328	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1479
		1480	Same as C<cf::register_extcmd>, but instead of returning values, the
		1481	callback needs to clal the C<$reply> function.
		1482
		1483	=cut
		1484
1330	sub register_extcmd {	1485	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1332		1487
1333	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1334	}	1489	}
1335		1490
1336	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1338		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1339	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1340	}	1507	}
1341		1508
1342	use File::Glob ();	1509	use File::Glob ();
1343		1510
1344	cf::player->attach (	1511	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1359		1526
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1528
1362	if (ref $msg) {	1529	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1530	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		1531
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1532	if (my $cb = $EXTACMD{$type}) {
		1533	$cb->(
		1534	$pl,
		1535	sub {
		1536	$pl->ext_msg ("reply-$reply", @_)
		1537	if $reply;
		1538	},
		1539	@payload
		1540	);
		1541	} else {
		1542	my @reply;
		1543
		1544	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1372	}	1550	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1551
1377	} else {	1552	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1554	}
1380		1555
…		…
1393	};	1568	};
1394		1569
1395	$grp	1570	$grp
1396	}	1571	}
1397		1572
		1573	sub _ext_cfg_reg($$$$) {
		1574	my ($rvar, $varname, $cfgname, $default) = @_;
		1575
		1576	$cfgname = lc $varname
		1577	unless length $cfgname;
		1578
		1579	$EXT_CFG{$cfgname} = [$rvar, $default];
		1580
		1581	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1582	}
		1583
1398	sub load_extensions {	1584	sub load_extensions {
1399	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1400		1588
1401	cf::sync_job {	1589	cf::sync_job {
1402	my %todo;	1590	my %todo;
1403		1591
1404	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1635	unless exists $done{$_};
1448	}	1636	}
1449		1637
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1639
		1640	my $source = $v->{source};
		1641
		1642	# support "CONF varname :confname = default" pseudo-statements
		1643	$source =~ s{
		1644	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1645	}{
		1646	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1647	}gmxe;
		1648
1452	my $active = eval $v->{source};	1649	my $active = eval $source;
1453		1650
1454	if (length $@) {	1651	if (length $@) {
1455	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1456		1653
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1671
1475	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1478	}	1675	}
		1676
		1677	last;
1479	}	1678	}
1480	}	1679	}
1481	};	1680	};
1482	}	1681	}
1483		1682
…		…
1641	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1642		1841
1643	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1644	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1843	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1645		1844
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1846	$pl->deactivate;
		1847
1648	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1848	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1850	ext::highscore::check ($pl->ob);
		1851
1650	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1651		1853
1652	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1740		1942
1741	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1742		1944
1743	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1744		1946
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)	1947	=item $player->ext_msg ($type, @msg)
1758		1948
1759	Sends an ext event to the client.	1949	Sends an ext event to the client.
1760		1950
1761	=cut	1951	=cut
…		…
1820	sub generate_random_map {	2010	sub generate_random_map {
1821	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1822		2012
1823	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2013	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1824		2014
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	2015	$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	}	2016	}
1840		2017
1841	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1842		2019
1843	Register a handler for the map path matching the given regex at the	2020	Register a handler for the map path matching the given regex at the
…		…
1869	}	2046	}
1870		2047
1871	sub normalise {	2048	sub normalise {
1872	my ($path, $base) = @_;	2049	my ($path, $base) = @_;
1873		2050
1874	$path = "$path"; # make sure its a string	2051	$path = "$path"; # make sure it's a string
1875		2052
1876	$path =~ s/\.map$//;	2053	$path =~ s/\.map$//;
1877		2054
1878	# map plan:	2055	# map plan:
1879	#	2056	#
…		…
1894	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2072	$path = "$base/$path";
1896	}	2073	}
1897		2074
1898	for ($path) {	2075	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1902	}	2078	}
1903		2079
1904	$path	2080	$path
…		…
1918	$self->init; # pass $1 etc.	2094	$self->init; # pass $1 etc.
1919	return $self;	2095	return $self;
1920	}	2096	}
1921	}	2097	}
1922		2098
1923	Carp::cluck "unable to resolve path '$path' (base '$base').";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2100	()
1925	}	2101	}
1926		2102
		2103	# may re-bless or do other evil things
1927	sub init {	2104	sub init {
1928	my ($self) = @_;	2105	my ($self) = @_;
1929		2106
1930	$self	2107	$self
1931	}	2108	}
…		…
1996	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
1997		2174
1998	1	2175	1
1999	}	2176	}
2000		2177
		2178	# used to laod the header of an original map
2001	sub load_header_orig {	2179	sub load_header_orig {
2002	my ($self) = @_;	2180	my ($self) = @_;
2003		2181
2004	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2005	}	2183	}
2006		2184
		2185	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2186	sub load_header_temp {
2008	my ($self) = @_;	2187	my ($self) = @_;
2009		2188
2010	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2011	}	2190	}
2012		2191
		2192	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2193	sub prepare_temp {
2014	my ($self) = @_;	2194	my ($self) = @_;
2015		2195
2016	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2017	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2018	# safety	2198	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2201	}
2022		2202
		2203	# called after loading the header from an original map
2023	sub prepare_orig {	2204	sub prepare_orig {
2024	my ($self) = @_;	2205	my ($self) = @_;
2025		2206
2026	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2051		2232
2052	sub find;	2233	sub find;
2053	sub find {	2234	sub find {
2054	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2055		2236
		2237	cf::cede_to_tick;
		2238
2056	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2057		2240
2058	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2060		2243
2061	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2092		2275
2093	{	2276	{
2094	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2095		2278
2096	return unless $self->valid;	2279	return unless $self->valid;
2097	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2098
2099	$self->in_memory (cf::MAP_LOADING);
2100		2281
2101	$self->alloc;	2282	$self->alloc;
2102		2283
2103	$self->pre_load;	2284	$self->pre_load;
2104	cf::cede_to_tick;	2285	cf::cede_to_tick;
2105		2286
		2287	if (exists $self->{load_path}) {
2106	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2107	$f->skip_block;	2289	$f->skip_block;
2108	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2109	or return;	2291	or return;
2110		2292
2111	$self->post_load_original	2293	$self->post_load_original
2112	if delete $self->{load_original};	2294	if delete $self->{load_original};
2113		2295
2114	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2115	utf8::encode $uniq;	2297	utf8::encode $uniq;
2116	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2117	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2118	$self->clear_unique_items;	2300	$self->clear_unique_items;
2119	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2120	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2121	}	2304	}
2122	}	2305	}
2123	}
2124		2306
2125	$f->resolve_delayed_derefs;	2307	$f->resolve_delayed_derefs;
		2308	} else {
		2309	$self->post_load_original
		2310	if delete $self->{load_original};
		2311	}
		2312
		2313	$self->state (cf::MAP_INACTIVE);
2126		2314
2127	cf::cede_to_tick;	2315	cf::cede_to_tick;
2128	# now do the right thing for maps	2316	# now do the right thing for maps
2129	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2130	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2134	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2135	$self->decay_objects;	2323	$self->decay_objects;
2136	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2137	$self->update_buttons;	2325	$self->update_buttons;
2138	cf::cede_to_tick;	2326	cf::cede_to_tick;
2139	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2140	}	2328	}
2141		2329
2142	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2143	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2144
2145	$self->in_memory (cf::MAP_ACTIVE);
2146	}	2332	}
2147		2333
2148	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2149	}	2337	}
2150		2338
2151	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2152	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2153	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2161	# if $self->per_party;	2349	# if $self->per_party;
2162		2350
2163	$self	2351	$self
2164	}	2352	}
2165		2353
2166	# find and load all maps in the 3x3 area around a map
2167	sub load_neighbours {
2168	my ($map) = @_;
2169
2170	my @neigh; # diagonal neighbours
2171
2172	for (0 .. 3) {
2173	my $neigh = $map->tile_path ($_)
2174	or next;
2175	$neigh = find $neigh, $map
2176	or next;
2177	$neigh->load;
2178
2179	# now find the diagonal neighbours
2180	push @neigh,
2181	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2182	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2183	}
2184
2185	for (grep defined $_->[0], @neigh) {
2186	my ($path, $origin) = @$_;
2187	my $neigh = find $path, $origin
2188	or next;
2189	$neigh->load;
2190	}
2191	}
2192
2193	sub find_sync {	2354	sub find_sync {
2194	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2195		2356
		2357	# it's a bug to call this from the main context
2196	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197	if $Coro::current == $Coro::main;	2359	if $Coro::current == $Coro::main;
2198		2360
2199	find $path, $origin	2361	find $path, $origin
2200	}	2362	}
2201		2363
2202	sub do_load_sync {	2364	sub do_load_sync {
2203	my ($map) = @_;	2365	my ($map) = @_;
2204		2366
		2367	# it's a bug to call this from the main context
2205	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2207		2370
2208	$map->load;	2371	$map->load;
2209	}	2372	}
…		…
2212	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2213		2376
2214	sub find_async {	2377	sub find_async {
2215	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2216		2379
2217	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2218		2381
2219	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2220	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2221	}	2384	}
2222		2385
2223	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2224		2387
2225	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2284	sub swap_out {	2447	sub swap_out {
2285	my ($self) = @_;	2448	my ($self) = @_;
2286		2449
2287	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2288		2451
2289	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2290	return if $self->{deny_save};	2453	return if $self->{deny_save};
2291	return if $self->players;	2454	return if $self->players;
2292		2455
2293	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2294	$self->deactivate;	2457	$self->deactivate;
2295	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2296	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2297		2460
2298	# then atomically save	2461	# then atomically save
2299	$self->_save;	2462	$self->_save;
2300		2463
2301	# then free the map	2464	# then free the map
…		…
2327		2490
2328	return if $self->players;	2491	return if $self->players;
2329		2492
2330	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2331		2494
2332	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2333		2496
2334	# need to save uniques path	2497	# need to save uniques path
2335	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2336	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2337		2500
…		…
2667	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2668	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2669	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2670		2833
2671	$map->load;	2834	$map->load;
2672	$map->load_neighbours;
2673		2835
2674	return unless $self->contr->active;	2836	return unless $self->contr->active;
2675		2837
2676	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2733	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2734	}	2896	}
2735	}	2897	}
2736		2898
2737	my $map = eval {	2899	my $map = eval {
2738	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739		2901
2740	if ($map) {	2902	if ($map) {
2741	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2742	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2743	} else {	2905	} else {
…		…
2833	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2834		2996
2835	unless (eval {	2997	unless (eval {
2836	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2837		2999
2838	# random map handling
2839	{
2840	my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842	prepare_random_map $exit
2843	if $exit->slaying eq "/!";
2844	}
2845
2846	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2847	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2848	my $y = $exit->stats->sp;	3002	my $y = $exit->stats->sp;
		3003
		3004	# special map handling
		3005	my $slaying = $exit->slaying;
		3006
		3007	# special map handling
		3008	if ($slaying eq "/!") {
		3009	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3010
		3011	prepare_random_map $exit
		3012	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3013
		3014	$map = $exit->slaying;
		3015
		3016	} elsif ($slaying eq '!up') {
		3017	$map = $exit->map->tile_path (cf::TILE_UP);
		3018	$x = $exit->x;
		3019	$y = $exit->y;
		3020
		3021	} elsif ($slaying eq '!down') {
		3022	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3023	$x = $exit->x;
		3024	$y = $exit->y;
		3025	}
2849		3026
2850	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2851		3028
2852	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2853	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3078	=cut	3255	=cut
3079		3256
3080	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3081	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3082		3259
3083	if ($self->extcmd == 2) {
3084	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3085	} elsif ($self->extcmd == 1) { # TODO: remove
3086	push @msg, msgtype => "event_$type";
3087	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3088	}
3089	}
3090
3091	=item $client->ext_reply ($msgid, @msg)
3092
3093	Sends an ext reply to the client.
3094
3095	=cut
3096
3097	sub cf::client::ext_reply($$@) {
3098	my ($self, $id, @msg) = @_;
3099
3100	if ($self->extcmd == 2) {
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102	} elsif ($self->extcmd == 1) {
3103	#TODO: version 1, remove
3104	unshift @msg, msgtype => "reply", msgid => $id;
3105	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106	}
3107	}	3261	}
3108		3262
3109	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3110		3264
3111	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3166	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3167		3321
3168	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169		3323
3170	if (ref $msg) {	3324	if (ref $msg) {
3171	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172	"ARRAY" eq ref $msg
3173	? @$msg
3174	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175		3326
3176	my @reply;
3177
3178	if (my $cb = $EXTICMD{$type}) {	3327	if (my $cb = $EXTIACMD{$type}) {
		3328	$cb->(
		3329	$ns,
		3330	sub {
		3331	$ns->ext_msg ("reply-$reply", @_)
		3332	if $reply;
		3333	},
		3334	@payload
		3335	);
		3336	} else {
		3337	my @reply;
		3338
		3339	if (my $cb = $EXTICMD{$type}) {
3179	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3180	}	3345	}
3181
3182	$ns->ext_reply ($reply, @reply)
3183	if $reply;
3184
3185	} else {	3346	} else {
3186	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3347	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3187	}	3348	}
3188		3349
3189	cf::override;	3350	cf::override;
…		…
3357	=cut	3518	=cut
3358		3519
3359	#############################################################################	3520	#############################################################################
3360	# the server's init and main functions	3521	# the server's init and main functions
3361		3522
3362	# async inc loader. yay.	3523	our %FACEHASH; # hash => idx, #d# HACK for http server
3363	sub inc_loader {
3364	my $mod = $_[1];
3365		3524
3366	if (in_main && !tick_inhibit) {	3525	# internal api, not fianlised
3367	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3526	sub set_face {
		3527	my ($name, $type, $data) = @_;
		3528
		3529	my $idx = cf::face::find $name;
		3530
		3531	if ($idx) {
		3532	delete $FACEHASH{cf::face::get_chksum $idx};
3368	} else {	3533	} else {
3369	debug "loading perl module $mod\n";	3534	$idx = cf::face::alloc $name;
3370	}	3535	}
3371		3536
3372	# 1. find real file	3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3373	for my $dir (@ORIG_INC) {
3374	ref $dir and next;
3375	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376	or next;
3377		3538
3378	$data = "#line 1 $dir/$mod\n$data";	3539	cf::face::set_type $idx, $type;
		3540	cf::face::set_data $idx, 0, $data, $hash;
		3541	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3542	$FACEHASH{$hash} = $idx;#d#
3379		3543
3380	open my $fh, "<", \$data or die;	3544	$idx
3381
3382	return $fh;
3383	}
3384
3385	()
3386	}
3387
3388	sub init_inc {
3389	# save original @INC
3390	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392	# make sure we can do scalar-opens
3393	open my $dummy, "<", \my $dummy2;
3394
3395	# execute some stuff so perl load's some of the core modules
3396	/Ü/ =~ /ü/i;
3397	eval { &Storable::nstore_fd };
3398
3399	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401	debug "module loading will be asynchronous from this point on.";
3402	}	3545	}
3403		3546
3404	sub load_facedata($) {	3547	sub load_facedata($) {
3405	my ($path) = @_;	3548	my ($path) = @_;
3406		3549
…		…
3410		3553
3411	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412		3555
3413	trace "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3414		3557
3415	my $facedata;	3558	my $facedata = decode_storable load_file $path;
3416	0 < aio_load $path, $facedata
3417	or die "$path: $!";
3418
3419	$facedata = Coro::Storable::thaw $facedata;
3420		3559
3421	$facedata->{version} == 2	3560	$facedata->{version} == 2
3422	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3423		3562
3424	# patch in the exptable
3425	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3426	$facedata->{resource}{"res/exp_table"} = {
3427	type => FT_RSRC,
3428	data => $exp_table,
3429	hash => (Digest::MD5::md5 $exp_table),
3430	};
3431	cf::cede_to_tick;	3563	cf::cede_to_tick;
3432		3564
3433	{	3565	{
3434	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3435		3567
3436	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3437	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438		3571
3439	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3440	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3441	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3443		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3444	cf::cede_to_tick;	3579	cf::cede_to_tick;
3445	}	3580	}
3446		3581
3447	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3448	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3460	cf::cede_to_tick;	3595	cf::cede_to_tick;
3461	}	3596	}
3462	}	3597	}
3463		3598
3464	{	3599	{
3465	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3466		3601
3467	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3468	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3469	cf::cede_to_tick;	3604	cf::cede_to_tick;
3470	}	3605	}
3471		3606
3472	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3473	}	3608	}
3474		3609
3475	{	3610	{
3476	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3477		3612
3478	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3479	if (defined $info->{type}) {	3614	if (defined (my $type = $info->{type})) {
		3615	# TODO: different hash - must free and use new index, or cache ixface data queue
3480	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481		3617
		3618	cf::face::set_type $idx, $type;
3482	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483	cf::face::set_type $idx, $info->{type};	3620	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3621	$FACEHASH{$info->{hash}} = $idx;#d#
3484	} else {	3622	} else {
3485	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3486	}	3624	}
3487		3625
3488	cf::cede_to_tick;	3626	cf::cede_to_tick;
3489	}	3627	}
3490	}	3628	}
…		…
3508	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3509	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3510	cf::arch::commit_load;	3648	cf::arch::commit_load;
3511		3649
3512	$status	3650	$status
		3651	}
		3652
		3653	sub reload_exp_table {
		3654	_reload_exp_table;
		3655
		3656	set_face "res/exp_table" => FT_RSRC,
		3657	JSON::XS->new->utf8->canonical->encode (
		3658	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3659	);
		3660	}
		3661
		3662	sub reload_materials {
		3663	_reload_materials;
3513	}	3664	}
3514		3665
3515	sub reload_regions {	3666	sub reload_regions {
3516	# HACK to clear player env face cache, we need some signal framework	3667	# HACK to clear player env face cache, we need some signal framework
3517	# for this (global event?)	3668	# for this (global event?)
…		…
3532	}	3683	}
3533		3684
3534	sub reload_archetypes {	3685	sub reload_archetypes {
3535	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3536	or die "unable to load archetypes\n";	3687	or die "unable to load archetypes\n";
		3688
		3689	set_face "res/skill_info" => FT_RSRC,
		3690	JSON::XS->new->utf8->canonical->encode (
		3691	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3692	);
		3693	set_face "res/spell_paths" => FT_RSRC,
		3694	JSON::XS->new->utf8->canonical->encode (
		3695	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3696	);
3537	}	3697	}
3538		3698
3539	sub reload_treasures {	3699	sub reload_treasures {
3540	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3541	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3542	}	3702	}
3543		3703
3544	sub reload_sound {	3704	sub reload_sound {
3545	trace "loading sound config from $DATADIR/sound\n";	3705	trace "loading sound config from $DATADIR/sound\n";
3546		3706
3547	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548	or die "$DATADIR/sound $!";
3549
3550	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551		3708
3552	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553	my $sound = $soundconf->{compat}[$_]	3710	my $sound = $soundconf->{compat}[$_]
3554	or next;	3711	or next;
3555		3712
…		…
3565	}	3722	}
3566		3723
3567	sub reload_resources {	3724	sub reload_resources {
3568	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3569		3726
		3727	reload_materials;
3570	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3571	reload_sound;	3730	reload_sound;
3572	reload_archetypes;	3731	reload_archetypes;
3573	reload_regions;	3732	reload_regions;
3574	reload_treasures;	3733	reload_treasures;
3575		3734
…		…
3577	}	3736	}
3578		3737
3579	sub reload_config {	3738	sub reload_config {
3580	trace "reloading config file...\n";	3739	trace "reloading config file...\n";
3581		3740
3582	open my $fh, "<:utf8", "$CONFDIR/config"	3741	my $config = load_file "$CONFDIR/config";
3583	or return;	3742	utf8::decode $config;
3584		3743	*CFG = decode_yaml $config;
3585	local $/;
3586	*CFG = YAML::XS::Load scalar <$fh>;
3587		3744
3588	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589		3746
3590	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3747	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3748	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3595	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3752	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596	and die "WARNING: m(un)lockall failed: $!\n";	3753	and die "WARNING: m(un)lockall failed: $!\n";
3597	};	3754	};
3598	warn $@ if $@;	3755	warn $@ if $@;
3599	}	3756	}
3600
3601	trace "finished reloading resource files\n";
3602	}	3757	}
3603		3758
3604	sub pidfile() {	3759	sub pidfile() {
3605	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3760	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606	or die "$PIDFILE: $!";	3761	or die "$PIDFILE: $!";
…		…
3631		3786
3632	sub main {	3787	sub main {
3633	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3634		3789
3635	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639		3794
3640	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3795	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641		3796
3642	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3643	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3644	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3799	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3645	(async {	3800	(async {
3646	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3647	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3648	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
3649	};	3804	};
3650		3805
3651	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3652		3807
3653	cf::sync_job {	3808	cf::sync_job {
		3809	cf::incloader::init ();
		3810
3654	init_inc;	3811	db_init;
3655		3812
3656	cf::init_experience;
3657	cf::init_anim;	3813	cf::init_anim;
3658	cf::init_attackmess;	3814	cf::init_attackmess;
3659	cf::init_dynamic;	3815	cf::init_dynamic;
3660		3816
3661	cf::load_settings;	3817	cf::load_settings;
3662	cf::load_materials;
3663		3818
3664	reload_resources;	3819	reload_resources;
3665	reload_config;	3820	reload_config;
3666	db_init;
3667		3821
3668	cf::init_uuid;	3822	cf::init_uuid;
3669	cf::init_signals;	3823	cf::init_signals;
3670	cf::init_skills;	3824	cf::init_skills;
3671		3825
…		…
3679		3833
3680	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3681	use POSIX ();	3835	use POSIX ();
3682	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3836	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683		3837
3684	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3685	};	3839	};
3686		3840
3687	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3688	info "parse errors in files are no longer fatal from this point on.\n";	3842	info "parse errors in files are no longer fatal from this point on.\n";
3689		3843
3690	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3691	undef $free_main;
3692	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3693	};	3846	};
3694		3847
3695	goto &main_loop;	3848	goto &main_loop;
3696	}	3849	}
…		…
3853		4006
3854	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3855		4008
3856	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {	4010	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859	}	4012	}
3860		4013
3861	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3862	};	4015	};
3863		4016
…		…
3901	}	4054	}
3902	}	4055	}
3903		4056
3904	sub do_reload_perl() {	4057	sub do_reload_perl() {
3905	# can/must only be called in main	4058	# can/must only be called in main
3906	if (in_main) {	4059	unless (in_main) {
3907	error "can only reload from main coroutine";	4060	error "can only reload from main coroutine";
3908	return;	4061	return;
3909	}	4062	}
3910		4063
3911	return if $RELOAD++;	4064	return if $RELOAD++;
3912		4065
3913	my $t1 = AE::time;	4066	my $t1 = AE::time;
3914		4067
3915	while ($RELOAD) {	4068	while ($RELOAD) {
		4069	cf::get_slot 0.1, -1, "reload_perl";
3916	info "reloading...";	4070	info "perl_reload: reloading...";
3917		4071
3918	trace "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3919		4073
3920	cf::sync_job {	4074	cf::sync_job {
3921	cf::emergency_save;	4075	#cf::emergency_save;
3922		4076
3923	trace "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3924	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3925	%EXT_CORO = ();	4079	%EXT_CORO = ();
3926		4080
3927	trace "removing commands";	4081	trace "perl_reload: removing commands";
3928	%COMMAND = ();	4082	%COMMAND = ();
3929		4083
3930	trace "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3931	%EXTCMD = ();	4085	%EXTCMD = ();
3932	%EXTICMD = ();	4086	%EXTICMD = ();
3933		4087
3934	trace "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3935	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3936	trace "... unloading $pkg";	4090	trace "... unloading $pkg";
3937		4091
3938	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3939	eval {	4093	eval {
…		…
3944		4098
3945	trace "... clearing $pkg";	4099	trace "... clearing $pkg";
3946	clear_package $pkg;	4100	clear_package $pkg;
3947	}	4101	}
3948		4102
3949	trace "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3951	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952		4106
3953	trace "... unloading $k";	4107	trace "... unloading $k";
3954	delete $INC{$k};	4108	delete $INC{$k};
…		…
3961	}	4115	}
3962		4116
3963	clear_package $k;	4117	clear_package $k;
3964	}	4118	}
3965		4119
3966	trace "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3967	clear_package "safe::$_"	4121	clear_package "safe::$_"
3968	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4122	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969		4123
3970	trace "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3971	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3972	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973		4127
3974	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3975	# and global variables created in xs	4129	# and global variables created in xs
3976	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3977		4131
3978	info "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3979		4133
3980	trace "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3981	require cf;	4135	require cf;
3982	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3983		4137
3984	trace "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3985	cf::reload_config;	4139	cf::reload_config;
3986		4140
3987	trace "loading extensions";	4141	trace "perl_reload: loading extensions";
3988	cf::load_extensions;	4142	cf::load_extensions;
3989		4143
3990	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3991	trace "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3992	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3993	trace "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3994	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3995	trace "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3996	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3997	}	4151	}
3998		4152
3999	trace "running post_init jobs";	4153	cf::_post_init 1;
4000	(pop @POST_INIT)->(1) while @POST_INIT;
4001		4154
4002	trace "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
4003		4156
4004	1	4157	1
4005	} or do {	4158	} or do {
4006	error $@;	4159	error $@;
4007	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
4008	};	4161	};
4009		4162
4010	info "reloaded";
4011	--$RELOAD;	4163	--$RELOAD;
4012	}	4164	}
4013		4165
4014	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
4015	info "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
4016	};	4168	};
4017		4169
4018	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
4019		4171
4020	sub reload_perl() {	4172	sub reload_perl() {
…		…
4045		4197
4046	#############################################################################	4198	#############################################################################
4047		4199
4048	my $bug_warning = 0;	4200	my $bug_warning = 0;
4049		4201
4050	our @WAIT_FOR_TICK;
4051	our @WAIT_FOR_TICK_BEGIN;
4052
4053	sub wait_for_tick {	4202	sub wait_for_tick() {
4054	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055		4204
4056	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4057	push @WAIT_FOR_TICK, $signal;
4058	$signal->wait;
4059	}	4206	}
4060		4207
4061	sub wait_for_tick_begin {	4208	sub wait_for_tick_begin() {
4062	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063		4210
4064	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4065	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4066	$signal->wait;	4213	$signal->wait;
4067	}	4214	}
…		…
4071	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4218	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4072	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4073	return;	4220	return;
4074	}	4221	}
4075		4222
4076	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4077		4224
4078	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4225	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079		4226
4080	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4228	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4087	}	4234	}
4088		4235
4089	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090	$sig->send;	4237	$sig->send;
4091	}	4238	}
4092	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4093	$sig->send;
4094	}
4095		4240
4096	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4097	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098		4243
4099	if (0) {	4244	if (0) {
…		…
4105	}	4250	}
4106	}	4251	}
4107		4252
4108	{	4253	{
4109	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4110		4256
4111	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4112	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4113	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4114		4260
4115	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4116	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4117	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4264	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4143	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4144	};	4290	};
4145	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4146	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4147	};	4293	};
		4294
		4295	info "database initialised";
4148	}	4296	}
4149		4297
4150	{	4298	{
4151	# configure IO::AIO	4299	# configure IO::AIO
4152		4300
		4301	info "initialising aio";
4153	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4154	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4155	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4156	}	4306	}
4157		4307
4158	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4159		4310
4160	sub _log_backtrace {	4311	sub _log_backtrace {
4161	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4162		4313
4163	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4164		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4166	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4167	++$_log_backtrace;	4322	++$_log_backtrace;
4168	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4169	async {	4324	async {
4170	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4171		4326
…		…
4191	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4192	--$_log_backtrace;	4347	--$_log_backtrace;
4193	};	4348	};
4194	} else {	4349	} else {
4195	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4196	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197	}	4352	}
4198	}	4353	}
4199		4354
4200	# load additional modules	4355	# load additional modules
4201	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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