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.538 by root, Tue May 4 21:45:43 2010 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
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 less 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,
596	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)
598
599	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
600	reset_signals;	745	cf::post_fork;
601	&$cb	746	&$cb
602	}, @args;	747	} @args;
603		748
604	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
605	}	750	}
606		751
607	sub objinfo {	752	sub objinfo {
…		…
729		874
730	my @data;	875	my @data;
731	my $md5;	876	my $md5;
732		877
733	for (0 .. $#$src) {	878	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	880	}
737		881
738	# if processing is expensive, check	882	# if processing is expensive, check
739	# checksum first	883	# checksum first
740	if (1) {	884	if (1) {
…		…
753		897
754	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
755	}	899	}
756	}	900	}
757		901
758	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
759	my $data = $process->(\@data);	903	my $data = $process->(\@data);
760	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
761		905
762	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
763		907
764	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
765	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
…		…
1285	=cut	1429	=cut
1286		1430
1287	#############################################################################	1431	#############################################################################
1288	# command handling &c	1432	# command handling &c
1289		1433
1290	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1291		1435
1292	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1293	$name.	1437	$name.
1294		1438
1295	=cut	1439	=cut
…		…
1301	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1302		1446
1303	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1304	}	1448	}
1305		1449
1306	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1307		1451
1308	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1309	extcmd packet. Ext commands will be processed in the order they are	1453	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	1454	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	1455	the logged-in player. Ext commands can only be processed after a player
1312	has logged in successfully.	1456	has logged in successfully.
1313		1457
1314	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1315	called.
1316		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1317	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1318		1466
1319	Register a callback for execution when the client sends an (asynchronous)	1467	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	1468	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	1469	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	1470	is a client socket. Exti commands can be received anytime, even before
1323	log-in.	1471	log-in.
1324		1472
1325	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1326	called.
1327		1474
1328	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1329		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1330	sub register_extcmd {	1482	sub register_extcmd($$) {
1331	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1332		1484
1333	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1334	}	1486	}
1335		1487
1336	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1337	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1338		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1339	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1340	}	1504	}
1341		1505
1342	use File::Glob ();	1506	use File::Glob ();
1343		1507
1344	cf::player->attach (	1508	cf::player->attach (
…		…
1358	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1359		1523
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1525
1362	if (ref $msg) {	1526	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1527	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		1528
1368	my @reply;
1369
1370	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1372	}	1547	}
1373
1374	$pl->ext_reply ($reply, @reply)
1375	if $reply;
1376		1548
1377	} else {	1549	} else {
1378	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1379	}	1551	}
1380		1552
…		…
1393	};	1565	};
1394		1566
1395	$grp	1567	$grp
1396	}	1568	}
1397		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1398	sub load_extensions {	1581	sub load_extensions {
1399	info "loading extensions...";	1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
1400		1585
1401	cf::sync_job {	1586	cf::sync_job {
1402	my %todo;	1587	my %todo;
1403		1588
1404	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1632	unless exists $done{$_};
1448	}	1633	}
1449		1634
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1452	my $active = eval $v->{source};	1646	my $active = eval $source;
1453		1647
1454	if (length $@) {	1648	if (length $@) {
1455	error "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1456	undef $@; # work around perl 5.10.0 utf-8 caching bug
1457		1650
1458	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1459	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
1460		1653
1461	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1475		1668
1476	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1477	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1478	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1479	}	1672	}
		1673
		1674	last;
1480	}	1675	}
1481	}	1676	}
1482	};	1677	};
1483	}	1678	}
1484		1679
…		…
1642	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1643		1838
1644	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1645	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1646		1841
1647	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1648	$pl->deactivate;	1843	$pl->deactivate;
		1844
1649	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1650	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1651	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1652		1850
1653	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1654	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1655	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1741		1939
1742	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1743		1941
1744	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1745		1943
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)	1944	=item $player->ext_msg ($type, @msg)
1759		1945
1760	Sends an ext event to the client.	1946	Sends an ext event to the client.
1761		1947
1762	=cut	1948	=cut
…		…
1821	sub generate_random_map {	2007	sub generate_random_map {
1822	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1823		2009
1824	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1825		2011
1826	# mit "rum" bekleckern, nicht
1827	$self->_create_random_map (	2012	$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	}	2013	}
1841		2014
1842	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1843		2016
1844	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1849		2022
1850	sub register {	2023	sub register {
1851	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1852	my $pkg = caller;	2025	my $pkg = caller;
1853		2026
1854	no strict;
1855	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1856		2028
1857	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1858	}	2030	}
1859		2031
…		…
1871	}	2043	}
1872		2044
1873	sub normalise {	2045	sub normalise {
1874	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1875		2047
1876	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1877		2049
1878	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1879		2051
1880	# map plan:	2052	# map plan:
1881	#	2053	#
…		…
1896	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1897	$path = "$base/$path";	2069	$path = "$base/$path";
1898	}	2070	}
1899		2071
1900	for ($path) {	2072	for ($path) {
1901	redo if s{//}{/};
1902	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1903	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1904	}	2075	}
1905		2076
1906	$path	2077	$path
…		…
1920	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1921	return $self;	2092	return $self;
1922	}	2093	}
1923	}	2094	}
1924		2095
1925	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1926	()	2097	()
1927	}	2098	}
1928		2099
		2100	# may re-bless or do other evil things
1929	sub init {	2101	sub init {
1930	my ($self) = @_;	2102	my ($self) = @_;
1931		2103
1932	$self	2104	$self
1933	}	2105	}
…		…
1998	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1999		2171
2000	1	2172	1
2001	}	2173	}
2002		2174
		2175	# used to laod the header of an original map
2003	sub load_header_orig {	2176	sub load_header_orig {
2004	my ($self) = @_;	2177	my ($self) = @_;
2005		2178
2006	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
2007	}	2180	}
2008		2181
		2182	# used to laod the header of an instantiated map
2009	sub load_header_temp {	2183	sub load_header_temp {
2010	my ($self) = @_;	2184	my ($self) = @_;
2011		2185
2012	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
2013	}	2187	}
2014		2188
		2189	# called after loading the header from an instantiated map
2015	sub prepare_temp {	2190	sub prepare_temp {
2016	my ($self) = @_;	2191	my ($self) = @_;
2017		2192
2018	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
2019	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
2020	# safety	2195	# safety
2021	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2022	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2023	}	2198	}
2024		2199
		2200	# called after loading the header from an original map
2025	sub prepare_orig {	2201	sub prepare_orig {
2026	my ($self) = @_;	2202	my ($self) = @_;
2027		2203
2028	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2029	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2053		2229
2054	sub find;	2230	sub find;
2055	sub find {	2231	sub find {
2056	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2057		2233
		2234	cf::cede_to_tick;
		2235
2058	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2059		2237
2060	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2061	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2062		2240
2063	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2094		2272
2095	{	2273	{
2096	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2097		2275
2098	return unless $self->valid;	2276	return unless $self->valid;
2099	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2100
2101	$self->in_memory (cf::MAP_LOADING);
2102		2278
2103	$self->alloc;	2279	$self->alloc;
2104		2280
2105	$self->pre_load;	2281	$self->pre_load;
2106	cf::cede_to_tick;	2282	cf::cede_to_tick;
2107		2283
		2284	if (exists $self->{load_path}) {
2108	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2109	$f->skip_block;	2286	$f->skip_block;
2110	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2111	or return;	2288	or return;
2112		2289
2113	$self->post_load_original	2290	$self->post_load_original
2114	if delete $self->{load_original};	2291	if delete $self->{load_original};
2115		2292
2116	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2117	utf8::encode $uniq;	2294	utf8::encode $uniq;
2118	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2119	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2120	$self->clear_unique_items;	2297	$self->clear_unique_items;
2121	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2122	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2123	}	2301	}
2124	}	2302	}
2125	}
2126		2303
2127	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2128		2311
2129	cf::cede_to_tick;	2312	cf::cede_to_tick;
2130	# now do the right thing for maps	2313	# now do the right thing for maps
2131	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2132	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2136	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2137	$self->decay_objects;	2320	$self->decay_objects;
2138	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2139	$self->update_buttons;	2322	$self->update_buttons;
2140	cf::cede_to_tick;	2323	cf::cede_to_tick;
2141	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2142	}	2325	}
2143		2326
2144	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2145	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2146
2147	$self->in_memory (cf::MAP_ACTIVE);
2148	}	2329	}
2149		2330
2150	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2151	}	2334	}
2152		2335
2153	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2154	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2155	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2163	# if $self->per_party;	2346	# if $self->per_party;
2164		2347
2165	$self	2348	$self
2166	}	2349	}
2167		2350
2168	# find and load all maps in the 3x3 area around a map
2169	sub load_neighbours {
2170	my ($map) = @_;
2171
2172	my @neigh; # diagonal neighbours
2173
2174	for (0 .. 3) {
2175	my $neigh = $map->tile_path ($_)
2176	or next;
2177	$neigh = find $neigh, $map
2178	or next;
2179	$neigh->load;
2180
2181	# now find the diagonal neighbours
2182	push @neigh,
2183	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2184	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2185	}
2186
2187	for (grep defined $_->[0], @neigh) {
2188	my ($path, $origin) = @$_;
2189	my $neigh = find $path, $origin
2190	or next;
2191	$neigh->load;
2192	}
2193	}
2194
2195	sub find_sync {	2351	sub find_sync {
2196	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2197		2353
		2354	# it's a bug to call this from the main context
2198	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2199	if $Coro::current == $Coro::main;	2356	if $Coro::current == $Coro::main;
2200		2357
2201	find $path, $origin	2358	find $path, $origin
2202	}	2359	}
2203		2360
2204	sub do_load_sync {	2361	sub do_load_sync {
2205	my ($map) = @_;	2362	my ($map) = @_;
2206		2363
		2364	# it's a bug to call this from the main context
2207	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2208	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2209		2367
2210	$map->load;	2368	$map->load;
2211	}	2369	}
…		…
2214	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2215		2373
2216	sub find_async {	2374	sub find_async {
2217	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2218		2376
2219	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2220		2378
2221	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2222	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2223	}	2381	}
2224		2382
2225	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2226		2384
2227	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2286	sub swap_out {	2444	sub swap_out {
2287	my ($self) = @_;	2445	my ($self) = @_;
2288		2446
2289	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2290		2448
2291	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2292	return if $self->{deny_save};	2450	return if $self->{deny_save};
2293	return if $self->players;	2451	return if $self->players;
2294		2452
2295	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2296	$self->deactivate;	2454	$self->deactivate;
2297	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2298	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2299		2457
2300	# then atomically save	2458	# then atomically save
2301	$self->_save;	2459	$self->_save;
2302		2460
2303	# then free the map	2461	# then free the map
…		…
2329		2487
2330	return if $self->players;	2488	return if $self->players;
2331		2489
2332	cf::trace "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2333		2491
2334	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2335		2493
2336	# need to save uniques path	2494	# need to save uniques path
2337	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2338	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2339		2497
…		…
2492		2650
2493	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2494		2652
2495	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2496		2654
2497	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2498	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2499		2657
2500	=cut	2658	=cut
2501		2659
2502	sub deref {	2660	sub deref {
…		…
2669	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2670	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2671	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2672		2830
2673	$map->load;	2831	$map->load;
2674	$map->load_neighbours;
2675		2832
2676	return unless $self->contr->active;	2833	return unless $self->contr->active;
2677		2834
2678	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2679	if ($self->enter_map ($map, $x, $y)) {	2836	if ($self->enter_map ($map, $x, $y)) {
…		…
2735	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2736	}	2893	}
2737	}	2894	}
2738		2895
2739	my $map = eval {	2896	my $map = eval {
2740	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2741		2898
2742	if ($map) {	2899	if ($map) {
2743	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2744	$map = $check->($map, $x, $y, $self) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2745	} else {	2902	} else {
…		…
2835	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2836		2993
2837	unless (eval {	2994	unless (eval {
2838	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2839		2996
2840	# random map handling
2841	{
2842	my $guard = cf::lock_acquire "exit_prepare:$exit";
2843
2844	prepare_random_map $exit
2845	if $exit->slaying eq "/!";
2846	}
2847
2848	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2849	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2850	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2851		3023
2852	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2853		3025
2854	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2855	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
3080	=cut	3252	=cut
3081		3253
3082	sub cf::client::ext_msg($$@) {	3254	sub cf::client::ext_msg($$@) {
3083	my ($self, $type, @msg) = @_;	3255	my ($self, $type, @msg) = @_;
3084		3256
3085	if ($self->extcmd == 2) {
3086	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3257	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3087	} elsif ($self->extcmd == 1) { # TODO: remove
3088	push @msg, msgtype => "event_$type";
3089	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3090	}
3091	}
3092
3093	=item $client->ext_reply ($msgid, @msg)
3094
3095	Sends an ext reply to the client.
3096
3097	=cut
3098
3099	sub cf::client::ext_reply($$@) {
3100	my ($self, $id, @msg) = @_;
3101
3102	if ($self->extcmd == 2) {
3103	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3104	} elsif ($self->extcmd == 1) {
3105	#TODO: version 1, remove
3106	unshift @msg, msgtype => "reply", msgid => $id;
3107	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3108	}
3109	}	3258	}
3110		3259
3111	=item $success = $client->query ($flags, "text", \&cb)	3260	=item $success = $client->query ($flags, "text", \&cb)
3112		3261
3113	Queues a query to the client, calling the given callback with	3262	Queues a query to the client, calling the given callback with
…		…
3168	my ($ns, $buf) = @_;	3317	my ($ns, $buf) = @_;
3169		3318
3170	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3319	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3171		3320
3172	if (ref $msg) {	3321	if (ref $msg) {
3173	my ($type, $reply, @payload) =	3322	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3174	"ARRAY" eq ref $msg
3175	? @$msg
3176	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3177		3323
3178	my @reply;
3179
3180	if (my $cb = $EXTICMD{$type}) {	3324	if (my $cb = $EXTIACMD{$type}) {
		3325	$cb->(
		3326	$ns,
		3327	sub {
		3328	$ns->ext_msg ("reply-$reply", @_)
		3329	if $reply;
		3330	},
		3331	@payload
		3332	);
		3333	} else {
		3334	my @reply;
		3335
		3336	if (my $cb = $EXTICMD{$type}) {
3181	@reply = $cb->($ns, @payload);	3337	@reply = $cb->($ns, @payload);
		3338	}
		3339
		3340	$ns->ext_msg ("reply-$reply", @reply)
		3341	if $reply;
3182	}	3342	}
3183
3184	$ns->ext_reply ($reply, @reply)
3185	if $reply;
3186
3187	} else {	3343	} else {
3188	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3344	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3189	}	3345	}
3190		3346
3191	cf::override;	3347	cf::override;
…		…
3274	decrease split destroy change_exp value msg lore send_msg)],	3430	decrease split destroy change_exp value msg lore send_msg)],
3275	["cf::object::player" => qw(player)],	3431	["cf::object::player" => qw(player)],
3276	["cf::player" => qw(peaceful send_msg)],	3432	["cf::player" => qw(peaceful send_msg)],
3277	["cf::map" => qw(trigger)],	3433	["cf::map" => qw(trigger)],
3278	) {	3434	) {
3279	no strict 'refs';
3280	my ($pkg, @funs) = @$_;	3435	my ($pkg, @funs) = @$_;
3281	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3436	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3282	for @funs;	3437	for @funs;
3283	}	3438	}
3284		3439
…		…
3360	=cut	3515	=cut
3361		3516
3362	#############################################################################	3517	#############################################################################
3363	# the server's init and main functions	3518	# the server's init and main functions
3364		3519
		3520	{
		3521	package cf::face;
		3522
		3523	our %HASH; # hash => idx
		3524	our @DATA; # dynamically-created facedata, only faceste 0 used
		3525	our @FOFS; # file offset, if > 0
		3526	our @SIZE; # size of face, in octets
		3527	our @META; # meta hash of face, if any
		3528	our $DATAFH; # facedata filehandle
		3529
		3530	# internal api, not finalised
		3531	sub set {
		3532	my ($name, $type, $data) = @_;
		3533
		3534	my $idx = cf::face::find $name;
		3535
		3536	if ($idx) {
		3537	delete $HASH{cf::face::get_chksum $idx};
		3538	} else {
		3539	$idx = cf::face::alloc $name;
		3540	}
		3541
		3542	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3543
		3544	cf::face::set_type $idx, $type;
		3545	cf::face::set_csum $idx, 0, $hash;
		3546
		3547	# we need to destroy the SV itself, not just modify it, as a running ix
		3548	# might hold a reference to it: "delete" achieves that.
		3549	delete $FOFS[0][$idx];
		3550	delete $DATA[0][$idx];
		3551	$DATA[0][$idx] = $data;
		3552	$SIZE[0][$idx] = length $data;
		3553	delete $META[$idx];
		3554	$HASH{$hash} = $idx;#d#
		3555
		3556	$idx
		3557	}
		3558
		3559	sub _get_data($$$) {
		3560	my ($idx, $set, $cb) = @_;
		3561
		3562	if (defined $DATA[$set][$idx]) {
		3563	$cb->($DATA[$set][$idx]);
		3564	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3565	my $size = $SIZE[$set][$idx];
		3566	my $buf;
		3567	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3568	if ($_[0] == $size) {
		3569	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3570	$cb->($buf);
		3571	} else {
		3572	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3573	}
		3574	};
		3575	} else {
		3576	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3577	}
		3578	}
		3579
		3580	# rather ineffient
		3581	sub cf::face::get_data($;$) {
		3582	my ($idx, $set) = @_;
		3583
		3584	_get_data $idx, $set, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $set, $idx, $pri) = @_;
		3590
		3591	_get_data $idx, $set, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595	}
		3596
3365	sub load_facedata($) {	3597	sub load_facedata($) {
3366	my ($path) = @_;	3598	my ($path) = @_;
3367		3599
3368	# HACK to clear player env face cache, we need some signal framework
3369	# for this (global event?)
3370	%ext::player_env::MUSIC_FACE_CACHE = ();
3371
3372	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3600	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3373		3601
3374	trace "loading facedata from $path\n";	3602	trace "loading facedata from $path\n";
3375		3603
3376	my $facedata;	3604	my $facedata = decode_storable load_file "$path/faceinfo";
3377	0 < aio_load $path, $facedata
3378	or die "$path: $!";
3379
3380	$facedata = Coro::Storable::thaw $facedata;
3381		3605
3382	$facedata->{version} == 2	3606	$facedata->{version} == 2
3383	or cf::cleanup "$path: version mismatch, cannot proceed.";	3607	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3384		3608
3385	# patch in the exptable	3609	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3386	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3610	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3387	$facedata->{resource}{"res/exp_table"} = {	3611
3388	type => FT_RSRC,	3612	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3389	data => $exp_table,	3613
3390	hash => (Digest::MD5::md5 $exp_table),	3614	# BEGIN ATOMIC
3391	};	3615	# from here on, everything must be atomic - no thread switch allowed
3392	cf::cede_to_tick;	3616	my $t1 = EV::time;
3393		3617
3394	{	3618	{
3395	my $faces = $facedata->{faceinfo};	3619	my $faces = $facedata->{faceinfo};
3396		3620
3397	while (my ($face, $info) = each %$faces) {	3621	for my $face (sort keys %$faces) {
		3622	my $info = $faces->{$face};
3398	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3623	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3399		3624
3400	cf::face::set_visibility $idx, $info->{visibility};	3625	cf::face::set_visibility $idx, $info->{visibility};
3401	cf::face::set_magicmap $idx, $info->{magicmap};	3626	cf::face::set_magicmap $idx, $info->{magicmap};
3402	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3627	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3403	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3628	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3404		3629	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3405	cf::cede_to_tick;	3630	$cf::face::HASH{$info->{hash64}} = $idx;
		3631	delete $cf::face::META[$idx];
3406	}	3632	}
3407		3633
3408	while (my ($face, $info) = each %$faces) {	3634	while (my ($face, $info) = each %$faces) {
3409	next unless $info->{smooth};	3635	next unless $info->{smooth};
3410		3636
…		…
3415	cf::face::set_smooth $idx, $smooth;	3641	cf::face::set_smooth $idx, $smooth;
3416	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3642	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3417	} else {	3643	} else {
3418	error "smooth face '$info->{smooth}' not found for face '$face'";	3644	error "smooth face '$info->{smooth}' not found for face '$face'";
3419	}	3645	}
3420
3421	cf::cede_to_tick;
3422	}	3646	}
3423	}	3647	}
3424		3648
3425	{	3649	{
3426	my $anims = $facedata->{animinfo};	3650	my $anims = $facedata->{animinfo};
3427		3651
3428	while (my ($anim, $info) = each %$anims) {	3652	while (my ($anim, $info) = each %$anims) {
3429	cf::anim::set $anim, $info->{frames}, $info->{facings};	3653	cf::anim::set $anim, $info->{frames}, $info->{facings};
3430	cf::cede_to_tick;
3431	}	3654	}
3432		3655
3433	cf::anim::invalidate_all; # d'oh	3656	cf::anim::invalidate_all; # d'oh
3434	}	3657	}
3435		3658
3436	{	3659	{
3437	my $res = $facedata->{resource};	3660	my $res = $facedata->{resource};
3438		3661
3439	while (my ($name, $info) = each %$res) {	3662	while (my ($name, $info) = each %$res) {
3440	if (defined $info->{type}) {	3663	if (defined (my $type = $info->{type})) {
		3664	# TODO: different hash - must free and use new index, or cache ixface data queue
3441	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3665	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3442		3666
3443	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3444	cf::face::set_type $idx, $info->{type};	3667	cf::face::set_type $idx, $type;
		3668	cf::face::set_csum $idx, 0, $info->{hash};
		3669	$cf::face::SIZE[0][$idx] = $info->{size};
		3670	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3671	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3672	$cf::face::HASH{$info->{hash}} = $idx;
3445	} else {	3673	} else {
3446	$RESOURCE{$name} = $info; # unused	3674	# $RESOURCE{$name} = $info; # unused
3447	}	3675	}
3448
3449	cf::cede_to_tick;
3450	}	3676	}
3451	}	3677	}
		3678
		3679	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3680
		3681	# HACK to clear player env face cache, we need some signal framework
		3682	# for this (global event?)
		3683	%ext::player_env::MUSIC_FACE_CACHE = ();
		3684
		3685	# END ATOMIC
		3686
		3687	cf::debug "facedata atomic update time ", EV::time - $t1;
3452		3688
3453	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3689	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
		3690
		3691	aio_close $fh if $fh; # close old facedata
3454		3692
3455	1	3693	1
3456	}	3694	}
3457		3695
3458	register_exticmd fx_want => sub {	3696	register_exticmd fx_want => sub {
…		…
3469	my $status = load_resource_file_ $_[0];	3707	my $status = load_resource_file_ $_[0];
3470	get_slot 0.1, 100;	3708	get_slot 0.1, 100;
3471	cf::arch::commit_load;	3709	cf::arch::commit_load;
3472		3710
3473	$status	3711	$status
		3712	}
		3713
		3714	sub reload_exp_table {
		3715	_reload_exp_table;
		3716
		3717	cf::face::set
		3718	"res/exp_table" => FT_RSRC,
		3719	JSON::XS->new->utf8->canonical->encode (
		3720	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3721	);
		3722	}
		3723
		3724	sub reload_materials {
		3725	_reload_materials;
3474	}	3726	}
3475		3727
3476	sub reload_regions {	3728	sub reload_regions {
3477	# HACK to clear player env face cache, we need some signal framework	3729	# HACK to clear player env face cache, we need some signal framework
3478	# for this (global event?)	3730	# for this (global event?)
…		…
3486	if exists $_->{match};	3738	if exists $_->{match};
3487	}	3739	}
3488	}	3740	}
3489		3741
3490	sub reload_facedata {	3742	sub reload_facedata {
3491	load_facedata "$DATADIR/facedata"	3743	load_facedata $DATADIR
3492	or die "unable to load facedata\n";	3744	or die "unable to load facedata\n";
3493	}	3745	}
3494		3746
3495	sub reload_archetypes {	3747	sub reload_archetypes {
3496	load_resource_file "$DATADIR/archetypes"	3748	load_resource_file "$DATADIR/archetypes"
3497	or die "unable to load archetypes\n";	3749	or die "unable to load archetypes\n";
		3750
		3751	cf::face::set
		3752	"res/skill_info" => FT_RSRC,
		3753	JSON::XS->new->utf8->canonical->encode (
		3754	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3755	);
		3756
		3757	cf::face::set
		3758	"res/spell_paths" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3761	);
3498	}	3762	}
3499		3763
3500	sub reload_treasures {	3764	sub reload_treasures {
3501	load_resource_file "$DATADIR/treasures"	3765	load_resource_file "$DATADIR/treasures"
3502	or die "unable to load treasurelists\n";	3766	or die "unable to load treasurelists\n";
3503	}	3767	}
3504		3768
3505	sub reload_sound {	3769	sub reload_sound {
3506	trace "loading sound config from $DATADIR/sound\n";	3770	trace "loading sound config from $DATADIR/sound\n";
3507		3771
3508	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3509	or die "$DATADIR/sound $!";
3510
3511	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3772	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3512		3773
3513	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3774	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3514	my $sound = $soundconf->{compat}[$_]	3775	my $sound = $soundconf->{compat}[$_]
3515	or next;	3776	or next;
3516		3777
…		…
3526	}	3787	}
3527		3788
3528	sub reload_resources {	3789	sub reload_resources {
3529	trace "reloading resource files...\n";	3790	trace "reloading resource files...\n";
3530		3791
		3792	reload_materials;
3531	reload_facedata;	3793	reload_facedata;
		3794	reload_exp_table;
3532	reload_sound;	3795	reload_sound;
3533	reload_archetypes;	3796	reload_archetypes;
3534	reload_regions;	3797	reload_regions;
3535	reload_treasures;	3798	reload_treasures;
3536		3799
…		…
3538	}	3801	}
3539		3802
3540	sub reload_config {	3803	sub reload_config {
3541	trace "reloading config file...\n";	3804	trace "reloading config file...\n";
3542		3805
3543	open my $fh, "<:utf8", "$CONFDIR/config"	3806	my $config = load_file "$CONFDIR/config";
3544	or return;	3807	utf8::decode $config;
3545		3808	*CFG = decode_yaml $config;
3546	local $/;
3547	*CFG = YAML::XS::Load scalar <$fh>;
3548		3809
3549	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3810	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3550		3811
3551	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3812	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3552	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3813	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3556	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3817	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3557	and die "WARNING: m(un)lockall failed: $!\n";	3818	and die "WARNING: m(un)lockall failed: $!\n";
3558	};	3819	};
3559	warn $@ if $@;	3820	warn $@ if $@;
3560	}	3821	}
3561
3562	trace "finished reloading resource files\n";
3563	}	3822	}
3564		3823
3565	sub pidfile() {	3824	sub pidfile() {
3566	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3825	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3567	or die "$PIDFILE: $!";	3826	or die "$PIDFILE: $!";
…		…
3592		3851
3593	sub main {	3852	sub main {
3594	cf::init_globals; # initialise logging	3853	cf::init_globals; # initialise logging
3595		3854
3596	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3855	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3597	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3856	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3598	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3857	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3599	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3858	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3600		3859
3601	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3860	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3602		3861
3603	# we must not ever block the main coroutine	3862	# we must not ever block the main coroutine
3604	local $Coro::idle = sub {	3863	$Coro::idle = sub {
3605	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3864	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3606	(async {	3865	(async {
3607	$Coro::current->{desc} = "IDLE BUG HANDLER";	3866	$Coro::current->{desc} = "IDLE BUG HANDLER";
3608	EV::loop EV::LOOP_ONESHOT;	3867	EV::loop EV::LOOP_ONESHOT;
3609	})->prio (Coro::PRIO_MAX);	3868	})->prio (Coro::PRIO_MAX);
3610	};	3869	};
3611		3870
3612	evthread_start IO::AIO::poll_fileno;	3871	evthread_start IO::AIO::poll_fileno;
3613		3872
3614	cf::sync_job {	3873	cf::sync_job {
3615	cf::init_experience;	3874	cf::incloader::init ();
		3875
		3876	db_init;
		3877
3616	cf::init_anim;	3878	cf::init_anim;
3617	cf::init_attackmess;	3879	cf::init_attackmess;
3618	cf::init_dynamic;	3880	cf::init_dynamic;
3619		3881
3620	cf::load_settings;	3882	cf::load_settings;
3621	cf::load_materials;
3622		3883
3623	reload_resources;	3884	reload_resources;
3624	reload_config;	3885	reload_config;
3625	db_init;
3626		3886
3627	cf::init_uuid;	3887	cf::init_uuid;
3628	cf::init_signals;	3888	cf::init_signals;
3629	cf::init_skills;	3889	cf::init_skills;
3630		3890
…		…
3638		3898
3639	# no (long-running) fork's whatsoever before this point(!)	3899	# no (long-running) fork's whatsoever before this point(!)
3640	use POSIX ();	3900	use POSIX ();
3641	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3901	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3642		3902
3643	(pop @POST_INIT)->(0) while @POST_INIT;	3903	cf::_post_init 0;
3644	};	3904	};
3645		3905
3646	cf::object::thawer::errors_are_fatal 0;	3906	cf::object::thawer::errors_are_fatal 0;
3647	info "parse errors in files are no longer fatal from this point on.\n";	3907	info "parse errors in files are no longer fatal from this point on.\n";
3648		3908
		3909	AE::postpone {
		3910	undef &main; # free gobs of memory :)
		3911	};
		3912
3649	main_loop;	3913	goto &main_loop;
3650	}	3914	}
3651		3915
3652	#############################################################################	3916	#############################################################################
3653	# initialisation and cleanup	3917	# initialisation and cleanup
3654		3918
…		…
3807		4071
3808	cf::write_runtime_sync; # external watchdog should not bark	4072	cf::write_runtime_sync; # external watchdog should not bark
3809		4073
3810	trace "emergency_perl_save: flushing outstanding aio requests";	4074	trace "emergency_perl_save: flushing outstanding aio requests";
3811	while (IO::AIO::nreqs || BDB::nreqs) {	4075	while (IO::AIO::nreqs || BDB::nreqs) {
3812	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4076	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3813	}	4077	}
3814		4078
3815	cf::write_runtime_sync; # external watchdog should not bark	4079	cf::write_runtime_sync; # external watchdog should not bark
3816	};	4080	};
3817		4081
…		…
3855	}	4119	}
3856	}	4120	}
3857		4121
3858	sub do_reload_perl() {	4122	sub do_reload_perl() {
3859	# can/must only be called in main	4123	# can/must only be called in main
3860	if (in_main) {	4124	unless (in_main) {
3861	error "can only reload from main coroutine";	4125	error "can only reload from main coroutine";
3862	return;	4126	return;
3863	}	4127	}
3864		4128
3865	return if $RELOAD++;	4129	return if $RELOAD++;
3866		4130
3867	my $t1 = AE::time;	4131	my $t1 = AE::time;
3868		4132
3869	while ($RELOAD) {	4133	while ($RELOAD) {
		4134	cf::get_slot 0.1, -1, "reload_perl";
3870	info "reloading...";	4135	info "perl_reload: reloading...";
3871		4136
3872	trace "entering sync_job";	4137	trace "perl_reload: entering sync_job";
3873		4138
3874	cf::sync_job {	4139	cf::sync_job {
3875	cf::emergency_save;	4140	#cf::emergency_save;
3876		4141
3877	trace "cancelling all extension coros";	4142	trace "perl_reload: cancelling all extension coros";
3878	$_->cancel for values %EXT_CORO;	4143	$_->cancel for values %EXT_CORO;
3879	%EXT_CORO = ();	4144	%EXT_CORO = ();
3880		4145
3881	trace "removing commands";	4146	trace "perl_reload: removing commands";
3882	%COMMAND = ();	4147	%COMMAND = ();
3883		4148
3884	trace "removing ext/exti commands";	4149	trace "perl_reload: removing ext/exti commands";
3885	%EXTCMD = ();	4150	%EXTCMD = ();
3886	%EXTICMD = ();	4151	%EXTICMD = ();
3887		4152
3888	trace "unloading/nuking all extensions";	4153	trace "perl_reload: unloading/nuking all extensions";
3889	for my $pkg (@EXTS) {	4154	for my $pkg (@EXTS) {
3890	trace "... unloading $pkg";	4155	trace "... unloading $pkg";
3891		4156
3892	if (my $cb = $pkg->can ("unload")) {	4157	if (my $cb = $pkg->can ("unload")) {
3893	eval {	4158	eval {
…		…
3898		4163
3899	trace "... clearing $pkg";	4164	trace "... clearing $pkg";
3900	clear_package $pkg;	4165	clear_package $pkg;
3901	}	4166	}
3902		4167
3903	trace "unloading all perl modules loaded from $LIBDIR";	4168	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3904	while (my ($k, $v) = each %INC) {	4169	while (my ($k, $v) = each %INC) {
3905	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4170	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3906		4171
3907	trace "... unloading $k";	4172	trace "... unloading $k";
3908	delete $INC{$k};	4173	delete $INC{$k};
…		…
3915	}	4180	}
3916		4181
3917	clear_package $k;	4182	clear_package $k;
3918	}	4183	}
3919		4184
3920	trace "getting rid of safe::, as good as possible";	4185	trace "perl_reload: getting rid of safe::, as good as possible";
3921	clear_package "safe::$_"	4186	clear_package "safe::$_"
3922	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4187	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3923		4188
3924	trace "unloading cf.pm \"a bit\"";	4189	trace "perl_reload: unloading cf.pm \"a bit\"";
3925	delete $INC{"cf.pm"};	4190	delete $INC{"cf.pm"};
3926	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4191	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3927		4192
3928	# don't, removes xs symbols, too,	4193	# don't, removes xs symbols, too,
3929	# and global variables created in xs	4194	# and global variables created in xs
3930	#clear_package __PACKAGE__;	4195	#clear_package __PACKAGE__;
3931		4196
3932	info "unload completed, starting to reload now";	4197	info "perl_reload: unload completed, starting to reload now";
3933		4198
3934	trace "reloading cf.pm";	4199	trace "perl_reload: reloading cf.pm";
3935	require cf;	4200	require cf;
3936	cf::_connect_to_perl_1;	4201	cf::_connect_to_perl_1;
3937		4202
3938	trace "loading config and database again";	4203	trace "perl_reload: loading config and database again";
3939	cf::reload_config;	4204	cf::reload_config;
3940		4205
3941	trace "loading extensions";	4206	trace "perl_reload: loading extensions";
3942	cf::load_extensions;	4207	cf::load_extensions;
3943		4208
3944	if ($REATTACH_ON_RELOAD) {	4209	if ($REATTACH_ON_RELOAD) {
3945	trace "reattaching attachments to objects/players";	4210	trace "perl_reload: reattaching attachments to objects/players";
3946	_global_reattach; # objects, sockets	4211	_global_reattach; # objects, sockets
3947	trace "reattaching attachments to maps";	4212	trace "perl_reload: reattaching attachments to maps";
3948	reattach $_ for values %MAP;	4213	reattach $_ for values %MAP;
3949	trace "reattaching attachments to players";	4214	trace "perl_reload: reattaching attachments to players";
3950	reattach $_ for values %PLAYER;	4215	reattach $_ for values %PLAYER;
3951	}	4216	}
3952		4217
3953	trace "running post_init jobs";	4218	cf::_post_init 1;
3954	(pop @POST_INIT)->(1) while @POST_INIT;
3955		4219
3956	trace "leaving sync_job";	4220	trace "perl_reload: leaving sync_job";
3957		4221
3958	1	4222	1
3959	} or do {	4223	} or do {
3960	error $@;	4224	error $@;
3961	cf::cleanup "error while reloading, exiting.";	4225	cf::cleanup "perl_reload: error, exiting.";
3962	};	4226	};
3963		4227
3964	info "reloaded";
3965	--$RELOAD;	4228	--$RELOAD;
3966	}	4229	}
3967		4230
3968	$t1 = AE::time - $t1;	4231	$t1 = AE::time - $t1;
3969	info "reload completed in ${t1}s\n";	4232	info "perl_reload: completed in ${t1}s\n";
3970	};	4233	};
3971		4234
3972	our $RELOAD_WATCHER; # used only during reload	4235	our $RELOAD_WATCHER; # used only during reload
3973		4236
3974	sub reload_perl() {	4237	sub reload_perl() {
…		…
3995	reload_perl;	4258	reload_perl;
3996	};	4259	};
3997	}	4260	}
3998	};	4261	};
3999		4262
4000	unshift @INC, $LIBDIR;	4263	#############################################################################
4001		4264
4002	my $bug_warning = 0;	4265	my $bug_warning = 0;
4003		4266
4004	our @WAIT_FOR_TICK;
4005	our @WAIT_FOR_TICK_BEGIN;
4006
4007	sub wait_for_tick {	4267	sub wait_for_tick() {
4008	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4268	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4009		4269
4010	my $signal = new Coro::Signal;	4270	$WAIT_FOR_TICK->wait;
4011	push @WAIT_FOR_TICK, $signal;
4012	$signal->wait;
4013	}	4271	}
4014		4272
4015	sub wait_for_tick_begin {	4273	sub wait_for_tick_begin() {
4016	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4017		4275
4018	my $signal = new Coro::Signal;	4276	my $signal = new Coro::Signal;
4019	push @WAIT_FOR_TICK_BEGIN, $signal;	4277	push @WAIT_FOR_TICK_BEGIN, $signal;
4020	$signal->wait;	4278	$signal->wait;
4021	}	4279	}
…		…
4025	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4283	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4026	unless ++$bug_warning > 10;	4284	unless ++$bug_warning > 10;
4027	return;	4285	return;
4028	}	4286	}
4029		4287
4030	cf::server_tick; # one server iteration	4288	cf::one_tick; # one server iteration
4031		4289
4032	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4290	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4033		4291
4034	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4292	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4035	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4293	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4041	}	4299	}
4042		4300
4043	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4301	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4044	$sig->send;	4302	$sig->send;
4045	}	4303	}
4046	while (my $sig = shift @WAIT_FOR_TICK) {	4304	$WAIT_FOR_TICK->broadcast;
4047	$sig->send;
4048	}
4049		4305
4050	$LOAD = ($NOW - $TICK_START) / $TICK;	4306	$LOAD = ($NOW - $TICK_START) / $TICK;
4051	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4307	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4052		4308
4053	if (0) {	4309	if (0) {
…		…
4059	}	4315	}
4060	}	4316	}
4061		4317
4062	{	4318	{
4063	# configure BDB	4319	# configure BDB
		4320	info "initialising database";
4064		4321
4065	BDB::min_parallel 16;	4322	BDB::min_parallel 16;
4066	BDB::max_poll_reqs $TICK * 0.1;	4323	BDB::max_poll_reqs $TICK * 0.1;
4067	$AnyEvent::BDB::WATCHER->priority (1);	4324	#$AnyEvent::BDB::WATCHER->priority (1);
4068		4325
4069	unless ($DB_ENV) {	4326	unless ($DB_ENV) {
4070	$DB_ENV = BDB::db_env_create;	4327	$DB_ENV = BDB::db_env_create;
4071	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4328	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4072	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4329	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4097	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4354	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4098	};	4355	};
4099	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4356	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4100	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4357	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4101	};	4358	};
		4359
		4360	info "database initialised";
4102	}	4361	}
4103		4362
4104	{	4363	{
4105	# configure IO::AIO	4364	# configure IO::AIO
4106		4365
		4366	info "initialising aio";
4107	IO::AIO::min_parallel 8;	4367	IO::AIO::min_parallel 8;
4108	IO::AIO::max_poll_time $TICK * 0.1;	4368	IO::AIO::max_poll_time $TICK * 0.1;
4109	undef $AnyEvent::AIO::WATCHER;	4369	undef $AnyEvent::AIO::WATCHER;
		4370	info "aio initialised";
4110	}	4371	}
4111		4372
4112	my $_log_backtrace;	4373	our $_log_backtrace;
		4374	our $_log_backtrace_last;
4113		4375
4114	sub _log_backtrace {	4376	sub _log_backtrace {
4115	my ($msg, @addr) = @_;	4377	my ($msg, @addr) = @_;
4116		4378
4117	$msg =~ s/\n//;	4379	$msg =~ s/\n$//;
4118		4380
		4381	if ($_log_backtrace_last eq $msg) {
		4382	LOG llevInfo, "[ABT] $msg\n";
		4383	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4119	# limit the # of concurrent backtraces	4384	# limit the # of concurrent backtraces
4120	if ($_log_backtrace < 2) {	4385	} elsif ($_log_backtrace < 2) {
		4386	$_log_backtrace_last = $msg;
4121	++$_log_backtrace;	4387	++$_log_backtrace;
4122	my $perl_bt = Carp::longmess $msg;	4388	my $perl_bt = Carp::longmess $msg;
4123	async {	4389	async {
4124	$Coro::current->{desc} = "abt $msg";	4390	$Coro::current->{desc} = "abt $msg";
4125		4391
…		…
4145	LOG llevInfo, "[ABT] $_\n" for @bt;	4411	LOG llevInfo, "[ABT] $_\n" for @bt;
4146	--$_log_backtrace;	4412	--$_log_backtrace;
4147	};	4413	};
4148	} else {	4414	} else {
4149	LOG llevInfo, "[ABT] $msg\n";	4415	LOG llevInfo, "[ABT] $msg\n";
4150	LOG llevInfo, "[ABT] [suppressed]\n";	4416	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4151	}	4417	}
4152	}	4418	}
4153		4419
4154	# load additional modules	4420	# load additional modules
4155	require "cf/$_.pm" for @EXTRA_MODULES;	4421	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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