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

Diff Legend

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