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.540 by root, Tue May 4 23:32:29 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	undef $@; # work around perl 5.10.0 utf-8 caching bug
1457		1653
1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459	if exists $v->{meta}{mandatory};	1655	if exists $v->{meta}{mandatory};
1460		1656
1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1657	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1475		1671
1476	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1479	}	1675	}
		1676
		1677	last;
1480	}	1678	}
1481	}	1679	}
1482	};	1680	};
1483	}	1681	}
1484		1682
…		…
1642	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1643		1841
1644	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1645	$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
1646		1844
1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648	$pl->deactivate;	1846	$pl->deactivate;
		1847
1649	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;
1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1850	ext::highscore::check ($pl->ob);
		1851
1651	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1652		1853
1653	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1654	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1655	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1741		1942
1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1743		1944
1744	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1745		1946
1746	=item $player->ext_reply ($msgid, @msg)
1747
1748	Sends an ext reply to the player.
1749
1750	=cut
1751
1752	sub ext_reply($$@) {
1753	my ($self, $id, @msg) = @_;
1754
1755	$self->ns->ext_reply ($id, @msg)
1756	}
1757
1758	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1759		1948
1760	Sends an ext event to the client.	1949	Sends an ext event to the client.
1761		1950
1762	=cut	1951	=cut
…		…
1821	sub generate_random_map {	2010	sub generate_random_map {
1822	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1823		2012
1824	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
1825		2014
1826	# mit "rum" bekleckern, nicht
1827	$self->_create_random_map (	2015	$self->_create_random_map ($rmp);
1828	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1829	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1830	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1831	$rmp->{exit_on_final_map},
1832	$rmp->{xsize}, $rmp->{ysize},
1833	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1834	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1835	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1836	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1837	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1838	(cf::region::find $rmp->{region}), $rmp->{custom}
1839	)
1840	}	2016	}
1841		2017
1842	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1843		2019
1844	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
…		…
1870	}	2046	}
1871		2047
1872	sub normalise {	2048	sub normalise {
1873	my ($path, $base) = @_;	2049	my ($path, $base) = @_;
1874		2050
1875	$path = "$path"; # make sure its a string	2051	$path = "$path"; # make sure it's a string
1876		2052
1877	$path =~ s/\.map$//;	2053	$path =~ s/\.map$//;
1878		2054
1879	# map plan:	2055	# map plan:
1880	#	2056	#
…		…
1895	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1896	$path = "$base/$path";	2072	$path = "$base/$path";
1897	}	2073	}
1898		2074
1899	for ($path) {	2075	for ($path) {
1900	redo if s{//}{/};
1901	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1902	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1903	}	2078	}
1904		2079
1905	$path	2080	$path
…		…
1919	$self->init; # pass $1 etc.	2094	$self->init; # pass $1 etc.
1920	return $self;	2095	return $self;
1921	}	2096	}
1922	}	2097	}
1923		2098
1924	Carp::cluck "unable to resolve path '$path' (base '$base').";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1925	()	2100	()
1926	}	2101	}
1927		2102
		2103	# may re-bless or do other evil things
1928	sub init {	2104	sub init {
1929	my ($self) = @_;	2105	my ($self) = @_;
1930		2106
1931	$self	2107	$self
1932	}	2108	}
…		…
1997	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
1998		2174
1999	1	2175	1
2000	}	2176	}
2001		2177
		2178	# used to laod the header of an original map
2002	sub load_header_orig {	2179	sub load_header_orig {
2003	my ($self) = @_;	2180	my ($self) = @_;
2004		2181
2005	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2006	}	2183	}
2007		2184
		2185	# used to laod the header of an instantiated map
2008	sub load_header_temp {	2186	sub load_header_temp {
2009	my ($self) = @_;	2187	my ($self) = @_;
2010		2188
2011	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2012	}	2190	}
2013		2191
		2192	# called after loading the header from an instantiated map
2014	sub prepare_temp {	2193	sub prepare_temp {
2015	my ($self) = @_;	2194	my ($self) = @_;
2016		2195
2017	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2018	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2019	# safety	2198	# safety
2020	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2021	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2022	}	2201	}
2023		2202
		2203	# called after loading the header from an original map
2024	sub prepare_orig {	2204	sub prepare_orig {
2025	my ($self) = @_;	2205	my ($self) = @_;
2026		2206
2027	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2028	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2052		2232
2053	sub find;	2233	sub find;
2054	sub find {	2234	sub find {
2055	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2056		2236
		2237	cf::cede_to_tick;
		2238
2057	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2058		2240
2059	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2060	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2061		2243
2062	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2093		2275
2094	{	2276	{
2095	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2096		2278
2097	return unless $self->valid;	2279	return unless $self->valid;
2098	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2099
2100	$self->in_memory (cf::MAP_LOADING);
2101		2281
2102	$self->alloc;	2282	$self->alloc;
2103		2283
2104	$self->pre_load;	2284	$self->pre_load;
2105	cf::cede_to_tick;	2285	cf::cede_to_tick;
2106		2286
		2287	if (exists $self->{load_path}) {
2107	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2108	$f->skip_block;	2289	$f->skip_block;
2109	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2110	or return;	2291	or return;
2111		2292
2112	$self->post_load_original	2293	$self->post_load_original
2113	if delete $self->{load_original};	2294	if delete $self->{load_original};
2114		2295
2115	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2116	utf8::encode $uniq;	2297	utf8::encode $uniq;
2117	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2118	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2119	$self->clear_unique_items;	2300	$self->clear_unique_items;
2120	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2121	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2122	}	2304	}
2123	}	2305	}
2124	}
2125		2306
2126	$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);
2127		2314
2128	cf::cede_to_tick;	2315	cf::cede_to_tick;
2129	# now do the right thing for maps	2316	# now do the right thing for maps
2130	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2131	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2135	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2136	$self->decay_objects;	2323	$self->decay_objects;
2137	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2138	$self->update_buttons;	2325	$self->update_buttons;
2139	cf::cede_to_tick;	2326	cf::cede_to_tick;
2140	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2141	}	2328	}
2142		2329
2143	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2144	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2145
2146	$self->in_memory (cf::MAP_ACTIVE);
2147	}	2332	}
2148		2333
2149	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2150	}	2337	}
2151		2338
2152	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2153	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2154	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2162	# if $self->per_party;	2349	# if $self->per_party;
2163		2350
2164	$self	2351	$self
2165	}	2352	}
2166		2353
2167	# find and load all maps in the 3x3 area around a map
2168	sub load_neighbours {
2169	my ($map) = @_;
2170
2171	my @neigh; # diagonal neighbours
2172
2173	for (0 .. 3) {
2174	my $neigh = $map->tile_path ($_)
2175	or next;
2176	$neigh = find $neigh, $map
2177	or next;
2178	$neigh->load;
2179
2180	# now find the diagonal neighbours
2181	push @neigh,
2182	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2183	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2184	}
2185
2186	for (grep defined $_->[0], @neigh) {
2187	my ($path, $origin) = @$_;
2188	my $neigh = find $path, $origin
2189	or next;
2190	$neigh->load;
2191	}
2192	}
2193
2194	sub find_sync {	2354	sub find_sync {
2195	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2196		2356
		2357	# it's a bug to call this from the main context
2197	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2358	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2198	if $Coro::current == $Coro::main;	2359	if $Coro::current == $Coro::main;
2199		2360
2200	find $path, $origin	2361	find $path, $origin
2201	}	2362	}
2202		2363
2203	sub do_load_sync {	2364	sub do_load_sync {
2204	my ($map) = @_;	2365	my ($map) = @_;
2205		2366
		2367	# it's a bug to call this from the main context
2206	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2207	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2208		2370
2209	$map->load;	2371	$map->load;
2210	}	2372	}
…		…
2213	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2214		2376
2215	sub find_async {	2377	sub find_async {
2216	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2217		2379
2218	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2219		2381
2220	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2221	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2222	}	2384	}
2223		2385
2224	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2225		2387
2226	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2285	sub swap_out {	2447	sub swap_out {
2286	my ($self) = @_;	2448	my ($self) = @_;
2287		2449
2288	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2289		2451
2290	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2291	return if $self->{deny_save};	2453	return if $self->{deny_save};
2292	return if $self->players;	2454	return if $self->players;
2293		2455
2294	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2295	$self->deactivate;	2457	$self->deactivate;
2296	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2297	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2298		2460
2299	# then atomically save	2461	# then atomically save
2300	$self->_save;	2462	$self->_save;
2301		2463
2302	# then free the map	2464	# then free the map
…		…
2328		2490
2329	return if $self->players;	2491	return if $self->players;
2330		2492
2331	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2332		2494
2333	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2334		2496
2335	# need to save uniques path	2497	# need to save uniques path
2336	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2337	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2338		2500
…		…
2668	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2669	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2670	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2671		2833
2672	$map->load;	2834	$map->load;
2673	$map->load_neighbours;
2674		2835
2675	return unless $self->contr->active;	2836	return unless $self->contr->active;
2676		2837
2677	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2678	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2734	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2735	}	2896	}
2736	}	2897	}
2737		2898
2738	my $map = eval {	2899	my $map = eval {
2739	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2740		2901
2741	if ($map) {	2902	if ($map) {
2742	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2743	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2744	} else {	2905	} else {
…		…
2834	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2835		2996
2836	unless (eval {	2997	unless (eval {
2837	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2838		2999
2839	# random map handling
2840	{
2841	my $guard = cf::lock_acquire "exit_prepare:$exit";
2842
2843	prepare_random_map $exit
2844	if $exit->slaying eq "/!";
2845	}
2846
2847	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2848	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2849	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	}
2850		3026
2851	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2852		3028
2853	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2854	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3079	=cut	3255	=cut
3080		3256
3081	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3082	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3083		3259
3084	if ($self->extcmd == 2) {
3085	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3086	} elsif ($self->extcmd == 1) { # TODO: remove
3087	push @msg, msgtype => "event_$type";
3088	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3089	}
3090	}
3091
3092	=item $client->ext_reply ($msgid, @msg)
3093
3094	Sends an ext reply to the client.
3095
3096	=cut
3097
3098	sub cf::client::ext_reply($$@) {
3099	my ($self, $id, @msg) = @_;
3100
3101	if ($self->extcmd == 2) {
3102	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3103	} elsif ($self->extcmd == 1) {
3104	#TODO: version 1, remove
3105	unshift @msg, msgtype => "reply", msgid => $id;
3106	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3107	}
3108	}	3261	}
3109		3262
3110	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3111		3264
3112	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3167	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3168		3321
3169	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3170		3323
3171	if (ref $msg) {	3324	if (ref $msg) {
3172	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3173	"ARRAY" eq ref $msg
3174	? @$msg
3175	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3176		3326
3177	my @reply;
3178
3179	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}) {
3180	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3181	}	3345	}
3182
3183	$ns->ext_reply ($reply, @reply)
3184	if $reply;
3185
3186	} else {	3346	} else {
3187	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";
3188	}	3348	}
3189		3349
3190	cf::override;	3350	cf::override;
…		…
3358	=cut	3518	=cut
3359		3519
3360	#############################################################################	3520	#############################################################################
3361	# the server's init and main functions	3521	# the server's init and main functions
3362		3522
3363	# async inc loader. yay.	3523	our %FACEHASH; # hash => idx, #d# HACK for http server
3364	sub inc_loader {
3365	my $mod = $_[1];
3366		3524
3367	if (in_main && !tick_inhibit) {	3525	# internal api, not fianlised
3368	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};
3369	} else {	3533	} else {
3370	debug "loading perl module $mod\n";	3534	$idx = cf::face::alloc $name;
3371	}	3535	}
3372		3536
3373	# 1. find real file	3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3374	for my $dir (@ORIG_INC) {
3375	warn "$dir/$mod\n";#d#
3376	ref $dir and next;
3377	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3378	or next;
3379		3538
3380	$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#
3381		3543
3382	open my $fh, "<", \$data or die;	3544	$idx
3383
3384	return $fh;
3385	}
3386
3387	()
3388	}
3389
3390	sub init_inc {
3391	# save original @INC
3392	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3393
3394	# make sure we can do scalar-opens
3395	open my $dummy, "<", \my $dummy2;
3396
3397	# execute some stuff so perl load's some of the core modules
3398	/Ü/ =~ /ü/i;
3399	eval { &Storable::nstore_fd };
3400
3401	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3402
3403	debug "module loading will be asynchronous from this point on.";
3404	}	3545	}
3405		3546
3406	sub load_facedata($) {	3547	sub load_facedata($) {
3407	my ($path) = @_;	3548	my ($path) = @_;
3408		3549
…		…
3412		3553
3413	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3414		3555
3415	trace "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3416		3557
3417	my $facedata;	3558	my $facedata = decode_storable load_file $path;
3418	0 < aio_load $path, $facedata
3419	or die "$path: $!";
3420
3421	$facedata = Coro::Storable::thaw $facedata;
3422		3559
3423	$facedata->{version} == 2	3560	$facedata->{version} == 2
3424	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3425		3562
3426	# patch in the exptable
3427	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3428	$facedata->{resource}{"res/exp_table"} = {
3429	type => FT_RSRC,
3430	data => $exp_table,
3431	hash => (Digest::MD5::md5 $exp_table),
3432	};
3433	cf::cede_to_tick;	3563	cf::cede_to_tick;
3434		3564
3435	{	3565	{
3436	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3437		3567
3438	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3439	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3440		3571
3441	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3442	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3443	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3444	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3445		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3446	cf::cede_to_tick;	3579	cf::cede_to_tick;
3447	}	3580	}
3448		3581
3449	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3450	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3462	cf::cede_to_tick;	3595	cf::cede_to_tick;
3463	}	3596	}
3464	}	3597	}
3465		3598
3466	{	3599	{
3467	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3468		3601
3469	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3470	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3471	cf::cede_to_tick;	3604	cf::cede_to_tick;
3472	}	3605	}
3473		3606
3474	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3475	}	3608	}
3476		3609
3477	{	3610	{
3478	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3479		3612
3480	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3481	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
3482	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3483		3617
		3618	cf::face::set_type $idx, $type;
3484	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3485	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#
3486	} else {	3622	} else {
3487	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3488	}	3624	}
3489		3625
3490	cf::cede_to_tick;	3626	cf::cede_to_tick;
3491	}	3627	}
3492	}	3628	}
…		…
3510	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3511	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3512	cf::arch::commit_load;	3648	cf::arch::commit_load;
3513		3649
3514	$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;
3515	}	3664	}
3516		3665
3517	sub reload_regions {	3666	sub reload_regions {
3518	# 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
3519	# for this (global event?)	3668	# for this (global event?)
…		…
3534	}	3683	}
3535		3684
3536	sub reload_archetypes {	3685	sub reload_archetypes {
3537	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3538	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	);
3539	}	3697	}
3540		3698
3541	sub reload_treasures {	3699	sub reload_treasures {
3542	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3543	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3544	}	3702	}
3545		3703
3546	sub reload_sound {	3704	sub reload_sound {
3547	trace "loading sound config from $DATADIR/sound\n";	3705	trace "loading sound config from $DATADIR/sound\n";
3548		3706
3549	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3550	or die "$DATADIR/sound $!";
3551
3552	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3553		3708
3554	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3555	my $sound = $soundconf->{compat}[$_]	3710	my $sound = $soundconf->{compat}[$_]
3556	or next;	3711	or next;
3557		3712
…		…
3567	}	3722	}
3568		3723
3569	sub reload_resources {	3724	sub reload_resources {
3570	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3571		3726
		3727	reload_materials;
3572	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3573	reload_sound;	3730	reload_sound;
3574	reload_archetypes;	3731	reload_archetypes;
3575	reload_regions;	3732	reload_regions;
3576	reload_treasures;	3733	reload_treasures;
3577		3734
…		…
3579	}	3736	}
3580		3737
3581	sub reload_config {	3738	sub reload_config {
3582	trace "reloading config file...\n";	3739	trace "reloading config file...\n";
3583		3740
3584	open my $fh, "<:utf8", "$CONFDIR/config"	3741	my $config = load_file "$CONFDIR/config";
3585	or return;	3742	utf8::decode $config;
3586		3743	*CFG = decode_yaml $config;
3587	local $/;
3588	*CFG = YAML::XS::Load scalar <$fh>;
3589		3744
3590	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3591		3746
3592	$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};
3593	$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};
…		…
3597	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3752	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3598	and die "WARNING: m(un)lockall failed: $!\n";	3753	and die "WARNING: m(un)lockall failed: $!\n";
3599	};	3754	};
3600	warn $@ if $@;	3755	warn $@ if $@;
3601	}	3756	}
3602
3603	trace "finished reloading resource files\n";
3604	}	3757	}
3605		3758
3606	sub pidfile() {	3759	sub pidfile() {
3607	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3760	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3608	or die "$PIDFILE: $!";	3761	or die "$PIDFILE: $!";
…		…
3633		3786
3634	sub main {	3787	sub main {
3635	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3636		3789
3637	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3638	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.";
3639	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3640	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3641		3794
3642	$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
3643		3796
3644	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3645	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3646	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#
3647	(async {	3800	(async {
3648	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3649	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3650	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
3651	};	3804	};
3652		3805
3653	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3654		3807
3655	cf::sync_job {	3808	cf::sync_job {
		3809	cf::incloader::init ();
		3810
3656	init_inc;	3811	db_init;
3657		3812
3658	cf::init_experience;
3659	cf::init_anim;	3813	cf::init_anim;
3660	cf::init_attackmess;	3814	cf::init_attackmess;
3661	cf::init_dynamic;	3815	cf::init_dynamic;
3662		3816
3663	cf::load_settings;	3817	cf::load_settings;
3664	cf::load_materials;
3665		3818
3666	reload_resources;	3819	reload_resources;
3667	reload_config;	3820	reload_config;
3668	db_init;
3669		3821
3670	cf::init_uuid;	3822	cf::init_uuid;
3671	cf::init_signals;	3823	cf::init_signals;
3672	cf::init_skills;	3824	cf::init_skills;
3673		3825
…		…
3681		3833
3682	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3683	use POSIX ();	3835	use POSIX ();
3684	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};
3685		3837
3686	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3687	};	3839	};
3688		3840
3689	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3690	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";
3691		3843
3692	my $free_main; $free_main = EV::idle sub {	3844	AE::postpone {
3693	undef $free_main;
3694	undef &main; # free gobs of memory :)	3845	undef &main; # free gobs of memory :)
3695	};	3846	};
3696		3847
3697	goto &main_loop;	3848	goto &main_loop;
3698	}	3849	}
…		…
3855		4006
3856	cf::write_runtime_sync; # external watchdog should not bark	4007	cf::write_runtime_sync; # external watchdog should not bark
3857		4008
3858	trace "emergency_perl_save: flushing outstanding aio requests";	4009	trace "emergency_perl_save: flushing outstanding aio requests";
3859	while (IO::AIO::nreqs || BDB::nreqs) {	4010	while (IO::AIO::nreqs || BDB::nreqs) {
3860	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
3861	}	4012	}
3862		4013
3863	cf::write_runtime_sync; # external watchdog should not bark	4014	cf::write_runtime_sync; # external watchdog should not bark
3864	};	4015	};
3865		4016
…		…
3903	}	4054	}
3904	}	4055	}
3905		4056
3906	sub do_reload_perl() {	4057	sub do_reload_perl() {
3907	# can/must only be called in main	4058	# can/must only be called in main
3908	if (in_main) {	4059	unless (in_main) {
3909	error "can only reload from main coroutine";	4060	error "can only reload from main coroutine";
3910	return;	4061	return;
3911	}	4062	}
3912		4063
3913	return if $RELOAD++;	4064	return if $RELOAD++;
3914		4065
3915	my $t1 = AE::time;	4066	my $t1 = AE::time;
3916		4067
3917	while ($RELOAD) {	4068	while ($RELOAD) {
		4069	cf::get_slot 0.1, -1, "reload_perl";
3918	info "reloading...";	4070	info "perl_reload: reloading...";
3919		4071
3920	trace "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3921		4073
3922	cf::sync_job {	4074	cf::sync_job {
3923	cf::emergency_save;	4075	#cf::emergency_save;
3924		4076
3925	trace "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3926	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3927	%EXT_CORO = ();	4079	%EXT_CORO = ();
3928		4080
3929	trace "removing commands";	4081	trace "perl_reload: removing commands";
3930	%COMMAND = ();	4082	%COMMAND = ();
3931		4083
3932	trace "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3933	%EXTCMD = ();	4085	%EXTCMD = ();
3934	%EXTICMD = ();	4086	%EXTICMD = ();
3935		4087
3936	trace "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3937	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3938	trace "... unloading $pkg";	4090	trace "... unloading $pkg";
3939		4091
3940	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3941	eval {	4093	eval {
…		…
3946		4098
3947	trace "... clearing $pkg";	4099	trace "... clearing $pkg";
3948	clear_package $pkg;	4100	clear_package $pkg;
3949	}	4101	}
3950		4102
3951	trace "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3952	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3953	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3954		4106
3955	trace "... unloading $k";	4107	trace "... unloading $k";
3956	delete $INC{$k};	4108	delete $INC{$k};
…		…
3963	}	4115	}
3964		4116
3965	clear_package $k;	4117	clear_package $k;
3966	}	4118	}
3967		4119
3968	trace "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3969	clear_package "safe::$_"	4121	clear_package "safe::$_"
3970	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);
3971		4123
3972	trace "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3973	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3974	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3975		4127
3976	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3977	# and global variables created in xs	4129	# and global variables created in xs
3978	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3979		4131
3980	info "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3981		4133
3982	trace "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3983	require cf;	4135	require cf;
3984	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3985		4137
3986	trace "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3987	cf::reload_config;	4139	cf::reload_config;
3988		4140
3989	trace "loading extensions";	4141	trace "perl_reload: loading extensions";
3990	cf::load_extensions;	4142	cf::load_extensions;
3991		4143
3992	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3993	trace "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3994	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3995	trace "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3996	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3997	trace "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3998	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3999	}	4151	}
4000		4152
4001	trace "running post_init jobs";	4153	cf::_post_init 1;
4002	(pop @POST_INIT)->(1) while @POST_INIT;
4003		4154
4004	trace "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
4005		4156
4006	1	4157	1
4007	} or do {	4158	} or do {
4008	error $@;	4159	error $@;
4009	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
4010	};	4161	};
4011		4162
4012	info "reloaded";
4013	--$RELOAD;	4163	--$RELOAD;
4014	}	4164	}
4015		4165
4016	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
4017	info "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
4018	};	4168	};
4019		4169
4020	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
4021		4171
4022	sub reload_perl() {	4172	sub reload_perl() {
…		…
4047		4197
4048	#############################################################################	4198	#############################################################################
4049		4199
4050	my $bug_warning = 0;	4200	my $bug_warning = 0;
4051		4201
4052	our @WAIT_FOR_TICK;
4053	our @WAIT_FOR_TICK_BEGIN;
4054
4055	sub wait_for_tick {	4202	sub wait_for_tick() {
4056	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4057		4204
4058	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
4059	push @WAIT_FOR_TICK, $signal;
4060	$signal->wait;
4061	}	4206	}
4062		4207
4063	sub wait_for_tick_begin {	4208	sub wait_for_tick_begin() {
4064	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4065		4210
4066	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4067	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4068	$signal->wait;	4213	$signal->wait;
4069	}	4214	}
…		…
4073	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"
4074	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4075	return;	4220	return;
4076	}	4221	}
4077		4222
4078	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4079		4224
4080	#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#
4081		4226
4082	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4083	$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.;
…		…
4089	}	4234	}
4090		4235
4091	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4092	$sig->send;	4237	$sig->send;
4093	}	4238	}
4094	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4095	$sig->send;
4096	}
4097		4240
4098	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4099	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4100		4243
4101	if (0) {	4244	if (0) {
…		…
4107	}	4250	}
4108	}	4251	}
4109		4252
4110	{	4253	{
4111	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4112		4256
4113	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4114	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4115	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4116		4260
4117	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4118	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4119	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4120	$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;
…		…
4145	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4146	};	4290	};
4147	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4148	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4149	};	4293	};
		4294
		4295	info "database initialised";
4150	}	4296	}
4151		4297
4152	{	4298	{
4153	# configure IO::AIO	4299	# configure IO::AIO
4154		4300
		4301	info "initialising aio";
4155	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4156	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4157	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4158	}	4306	}
4159		4307
4160	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4161		4310
4162	sub _log_backtrace {	4311	sub _log_backtrace {
4163	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4164		4313
4165	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4166		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4167	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4168	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4169	++$_log_backtrace;	4322	++$_log_backtrace;
4170	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4171	async {	4324	async {
4172	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4173		4326
…		…
4193	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4194	--$_log_backtrace;	4347	--$_log_backtrace;
4195	};	4348	};
4196	} else {	4349	} else {
4197	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4198	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4199	}	4352	}
4200	}	4353	}
4201		4354
4202	# load additional modules	4355	# load additional modules
4203	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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