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.511 by root, Wed Apr 7 18:35:56 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 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 (©) 2018 Marc Alexander Lehmann / the Deliantra team
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	6	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	7	# 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	8	# 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	9	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	10	# option) any later version.
10	#	11	#
11	# This program is distributed in the hope that it will be useful,	12	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	13	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	15	# GNU General Public License for more details.
15	#	16	#
16	# You should have received a copy of the Affero GNU General Public License	17	# 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	18	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	19	# <http://www.gnu.org/licenses/>.
19	#	20	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	21	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	22	#
22		23
23	package cf;	24	package cf;
24		25
25	use 5.10.0;	26	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		27
29	use Symbol;	28	use Symbol;
30	use List::Util;	29	use List::Util;
31	use Socket;	30	use Socket;
32	use EV;	31	use EV;
…		…
34	use Safe;	33	use Safe;
35	use Safe::Hole;	34	use Safe::Hole;
36	use Storable ();	35	use Storable ();
37	use Carp ();	36	use Carp ();
38		37
39	use Guard ();	38	use AnyEvent ();
		39	use AnyEvent::IO ();
		40	use AnyEvent::DNS ();
		41
40	use Coro ();	42	use Coro ();
41	use Coro::State;	43	use Coro::State;
42	use Coro::Handle;	44	use Coro::Handle;
43	use Coro::EV;	45	use Coro::EV;
44	use Coro::AnyEvent;	46	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	52	use Coro::AIO;
51	use Coro::BDB 1.6;	53	use Coro::BDB 1.6;
52	use Coro::Storable;	54	use Coro::Storable;
53	use Coro::Util ();	55	use Coro::Util ();
54		56
		57	use Guard ();
55	use JSON::XS 2.01 ();	58	use JSON::XS 2.01 ();
56	use BDB ();	59	use BDB ();
57	use Data::Dumper;	60	use Data::Dumper;
58	use Fcntl;	61	use Fcntl;
59	use YAML::XS ();	62	use YAML::XS ();
		63	use CBOR::XS ();
60	use IO::AIO ();	64	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	65	use Compress::LZF;
63	use Digest::MD5 ();	66	use Digest::MD5 ();
64		67
65	AnyEvent::detect;	68	AnyEvent::detect;
66		69
…		…
78	# strictly for debugging	81	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	82	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		83
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	84	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		85
		86	our @ORIG_INC;
		87
83	our %COMMAND = ();	88	our %COMMAND = ();
84	our %COMMAND_TIME = ();	89	our %COMMAND_TIME = ();
85		90
86	our @EXTS = (); # list of extension package names	91	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	92	our %EXTCMD = ();
		93	our %EXTACMD = ();
88	our %EXTICMD = ();	94	our %EXTICMD = ();
		95	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	96	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	97	our %EXT_MAP = (); # pluggable maps
91		98
92	our $RELOAD; # number of reloads so far, non-zero while in reload	99	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	100	our @EVENT;
94	our @REFLECT; # set by XS	101	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	102	our %REFLECT; # set by us
96		103
97	our $CONFDIR = confdir;	104	our $CONFDIR = confdir;
		105
98	our $DATADIR = datadir;	106	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	107	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	108	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	109	our $MAPDIR = "$DATADIR/" . mapdir;
		110
102	our $LOCALDIR = localdir;	111	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	112	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	113	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	114	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	115	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	116	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	117	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	118	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		119
111	our %RESOURCE;	120	#our %RESOURCE; # unused
		121
		122	our $OUTPUT_RATE_MIN = 3000;
		123	our $OUTPUT_RATE_MAX = 1000000;
		124
		125	our $MAX_LINKS = 32; # how many chained exits to follow
		126	our $VERBOSE_IO = 1;
112		127
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	128	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	129	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	130	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	131	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	133	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	134	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	135	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	136	our $DB_ENV;
122		137
123	our @EXTRA_MODULES = qw(pod match mapscript);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		139
125	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		142
127	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
129	our $NOW;	146	our $NOW;
130		147
131	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		159
143	our @POST_INIT;	160	our @POST_INIT;
144		161
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	162	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	163	our $REALLY_UNLOOP; # never set to true, please :)
		164
		165	our $WAIT_FOR_TICK = new Coro::Signal;
		166	our @WAIT_FOR_TICK_BEGIN;
147		167
148	binmode STDOUT;	168	binmode STDOUT;
149	binmode STDERR;	169	binmode STDERR;
150		170
151	# read virtual server time, if available	171	# read virtual server time, if available
…		…
162		182
163	our $EMERGENCY_POSITION;	183	our $EMERGENCY_POSITION;
164		184
165	sub cf::map::normalise;	185	sub cf::map::normalise;
166		186
		187	sub in_main() {
		188	$Coro::current == $Coro::main
		189	}
		190
167	#############################################################################	191	#############################################################################
168		192
169	%REFLECT = ();	193	%REFLECT = ();
170	for (@REFLECT) {	194	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	195	my $reflect = JSON::XS::decode_json $_;
…		…
181		205
182	=over 4	206	=over 4
183		207
184	=item $cf::UPTIME	208	=item $cf::UPTIME
185		209
186	The timestamp of the server start (so not actually an uptime).	210	The timestamp of the server start (so not actually an "uptime").
		211
		212	=item $cf::SERVER_TICK
		213
		214	An unsigned integer that starts at zero when the server is started and is
		215	incremented on every tick.
		216
		217	=item $cf::NOW
		218
		219	The (real) time of the last (current) server tick - updated before and
		220	after tick processing, so this is useful only as a rough "what time is it
		221	now" estimate.
		222
		223	=item $cf::TICK
		224
		225	The interval between each server tick, in seconds.
187		226
188	=item $cf::RUNTIME	227	=item $cf::RUNTIME
189		228
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	229	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	230	every server tick.
192		231
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		235
197	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
200	database environment.	239	database environment.
201		240
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	241	=item $cf::LOADAVG
211		242
212	The current CPU load on the server (alpha-smoothed), as a value between 0	243	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	244	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	253	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223	from wherever your confdir points to.	254	from wherever your confdir points to.
224		255
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		257
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	258	These are functions that inhibit the current coroutine one tick.
228	returns directly I<after> the tick processing (and consequently, can only wake one process	259	cf::wait_for_tick_begin only returns directly I<after> the tick
		260	processing (and consequently, can only wake one thread per tick), while
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	261	cf::wait_for_tick wakes up all waiters after tick processing.
		262
		263	Note that cf::wait_for_tick will immediately return when the server is not
		264	ticking, making it suitable for small pauses in threads that need to run
		265	when the server is paused. If that is not applicable (i.e. you I<really>
		266	want to wait, use C<$cf::WAIT_FOR_TICK>).
		267
		268	=item $cf::WAIT_FOR_TICK
		269
		270	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		271	variable contains a L<Coro::Signal> that is broadcats after every server
		272	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		273	next server tick.
		274
		275	=cut
		276
		277	sub wait_for_tick();
		278	sub wait_for_tick_begin();
230		279
231	=item @cf::INVOKE_RESULTS	280	=item @cf::INVOKE_RESULTS
232		281
233	This array contains the results of the last C<invoke ()> call. When	282	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	283	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		291
243	=back	292	=back
244		293
245	=cut	294	=cut
246		295
		296	sub error(@) { LOG llevError, join "", @_ }
		297	sub warn (@) { LOG llevWarn , join "", @_ }
		298	sub info (@) { LOG llevInfo , join "", @_ }
		299	sub debug(@) { LOG llevDebug, join "", @_ }
		300	sub trace(@) { LOG llevTrace, join "", @_ }
		301
247	$Coro::State::WARNHOOK = sub {	302	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	303	my $msg = join "", @_;
249		304
250	$msg .= "\n"	305	$msg .= "\n"
251	unless $msg =~ /\n$/;	306	unless $msg =~ /\n$/;
252		307
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	308	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		309
255	LOG llevError, $msg;	310	LOG llevWarn, $msg;
256	};	311	};
257		312
258	$Coro::State::DIEHOOK = sub {	313	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	314	return unless $^S eq 0; # "eq", not "=="
260		315
261	warn Carp::longmess $_[0];	316	error Carp::longmess $_[0];
262		317
263	if ($Coro::current == $Coro::main) {#d#	318	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	319	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	320	return;#d#
266	}#d#	321	}#d#
267		322
268	# kill coroutine otherwise	323	# kill coroutine otherwise
269	Coro::terminate	324	Coro::terminate
…		…
289	)) {	344	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	346	}
292		347
293	$EV::DIED = sub {	348	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
295	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
296		356
297	#############################################################################	357	#############################################################################
298		358
299	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
300		360
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	381	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	382	$d
323	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
324	}	384	}
325		385
		386	=item $scalar = cf::load_file $path
		387
		388	Loads the given file from path and returns its contents. Croaks on error
		389	and can block.
		390
		391	=cut
		392
		393	sub load_file($) {
		394	0 <= aio_load $_[0], my $data
		395	or Carp::croak "$_[0]: $!";
		396
		397	$data
		398	}
		399
		400	=item $success = cf::replace_file $path, $data, $sync
		401
		402	Atomically replaces the file at the given $path with new $data, and
		403	optionally $sync the data to disk before replacing the file.
		404
		405	=cut
		406
		407	sub replace_file($$;$) {
		408	my ($path, $data, $sync) = @_;
		409
		410	my $lock = cf::lock_acquire ("replace_file:$path");
		411
		412	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		413	or return;
		414
		415	$data = $data->() if ref $data;
		416
		417	length $data == aio_write $fh, 0, (length $data), $data, 0
		418	or return;
		419
		420	!$sync
		421	or !aio_fsync $fh
		422	or return;
		423
		424	aio_close $fh
		425	and return;
		426
		427	aio_rename "$path~", $path
		428	and return;
		429
		430	if ($sync) {
		431	$path =~ s%/[^/]*$%%;
		432	aio_pathsync $path;
		433	}
		434
		435	1
		436	}
		437
326	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
327		439
328	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
329		441
330	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	448	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		449
338	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
340		452
		453	=item $ref = cf::decode_storable $scalar
		454
		455	Same as Coro::Storable::thaw, so blocks.
		456
		457	=cut
		458
		459	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		460
		461	=item $ref = cf::decode_yaml $scalar
		462
		463	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		464
		465	=cut
		466
		467	sub decode_yaml($) {
		468	fork_call { YAML::XS::Load $_[0] } @_
		469	}
		470
		471	=item $scalar = cf::decode_cbor $scalar
		472
		473	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		474	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		475	alternative.
		476
		477	=cut
		478
		479	sub decode_cbor($) {
		480	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		481	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		482	CBOR::XS::decode_cbor $_[0]
		483	}
		484
		485	=item $scalar = cf::unlzf $scalar
		486
		487	Same as Compress::LZF::compress, but takes server ticks into account, so
		488	blocks.
		489
		490	=cut
		491
		492	sub unlzf($) {
		493	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		494	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		495	Compress::LZF::decompress $_[0]
		496	}
		497
341	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
342		499
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	500	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	501	but I<before> the server starts ticking again.
345		502
346	The cdoeblock will have a single boolean argument to indicate whether this	503	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	504	is a reload or not.
348		505
349	=cut	506	=cut
350		507
351	sub post_init(&) {	508	sub post_init(&) {
352	push @POST_INIT, shift;	509	push @POST_INIT, shift;
353	}	510	}
354		511
		512	sub _post_init {
		513	trace "running post_init jobs";
		514
		515	# run them in parallel...
		516
		517	my @join;
		518
		519	while () {
		520	push @join, map &Coro::async ($_, 0), @POST_INIT;
		521	@POST_INIT = ();
		522
		523	@join or last;
		524
		525	(pop @join)->join;
		526	}
		527	}
		528
355	=item cf::lock_wait $string	529	=item cf::lock_wait $string
356		530
357	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
358		532
359	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
360		534
361	Wait until the given lock is available and then acquires it and returns	535	Wait until the given lock is available and then acquires it and returns
362	a L<Guard> object. If the guard object gets destroyed (goes out of scope,	536	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
396	}	570	}
397		571
398	=item cf::periodic $interval, $cb	572	=item cf::periodic $interval, $cb
399		573
400	Like EV::periodic, but randomly selects a starting point so that the actions	574	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	575	get spread over time.
402		576
403	=cut	577	=cut
404		578
405	sub periodic($$) {	579	sub periodic($$) {
406	my ($interval, $cb) = @_;	580	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
411	}	585	}
412		586
413	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
414		588
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	This call blocks and returns only when you have at least C<$time> seconds	590	(default: 0): This call blocks and returns only when you have at least
417	of cpu time till the next tick. The slot is only valid till the next cede.	591	C<$time> seconds of cpu time till the next tick. The slot is only valid
		592	till the next cede.
		593
		594	Background jobs should use a priority less than zero, interactive jobs
		595	should use 100 or more.
418		596
419	The optional C<$name> can be used to identify the job to run. It might be	597	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	598	used for statistical purposes and should identify the same time-class.
421		599
422	Useful for short background jobs.	600	Useful for short background jobs.
…		…
434	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
435	my $busy;	613	my $busy;
436		614
437	while () {	615	while () {
438	next_job:	616	next_job:
		617
		618	Coro::cede;
439		619
440	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
441		621
442	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
443	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
444	$busy = 0;	624	$busy = 0;
445	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
446	$job->[2]->send;	626	$job->[2]->send;
447	Coro::cede;
448	goto next_job;	627	goto next_job;
449	} else {	628	} else {
450	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
451	}	630	}
452	}	631	}
453		632
454	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
455	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
456	push @cf::WAIT_FOR_TICK, $signal;
457	$signal->wait;
458	} else {	635	} else {
459	$busy = 0;	636	$busy = 0;
460	Coro::schedule;	637	Coro::schedule;
461	}	638	}
462	}	639	}
…		…
488	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
489		666
490	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
491		668
492	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
493	is always able to handle events or runnable, as Deliantra is only	670	is always able to handle events or is runnable, as Deliantra is only
494	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not	671	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
495	acceptable.	672	acceptable.
496		673
497	If it must be done, put the blocking parts into C<sync_job>. This will run	674	If it must be done, put the blocking parts into C<sync_job>. This will run
498	the given BLOCK in another coroutine while waiting for the result. The	675	the given BLOCK in another coroutine while waiting for the result. The
…		…
502	=cut	679	=cut
503		680
504	sub sync_job(&) {	681	sub sync_job(&) {
505	my ($job) = @_;	682	my ($job) = @_;
506		683
507	if ($Coro::current == $Coro::main) {	684	if (in_main) {
508	my $time = EV::time;	685	my $time = AE::time;
509		686
510	# this is the main coro, too bad, we have to block	687	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	688	# till the operation succeeds, freezing the server :/
512		689
513	LOG llevError, Carp::longmess "sync job";#d#	690	#LOG llevError, Carp::longmess "sync job";#d#
514		691
515	my $freeze_guard = freeze_mainloop;	692	my $freeze_guard = freeze_mainloop;
516		693
517	my $busy = 1;	694	my $busy = 1;
518	my @res;	695	my @res;
519		696
520	(async {	697	(async {
521	$Coro::current->desc ("sync job coro");	698	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	699	@res = eval { $job->() };
523	warn $@ if $@;	700	error $@ if $@;
524	undef $busy;	701	undef $busy;
525	})->prio (Coro::PRIO_MAX);	702	})->prio (Coro::PRIO_MAX);
526		703
527	while ($busy) {	704	while ($busy) {
528	if (Coro::nready) {	705	if (Coro::nready) {
529	Coro::cede_notself;	706	Coro::cede_notself;
530	} else {	707	} else {
531	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
532	}	709	}
533	}	710	}
534		711
535	my $time = EV::time - $time;	712	my $time = AE::time - $time;
536		713
537	$TICK_START += $time; # do not account sync jobs to server load	714	$TICK_START += $time; # do not account sync jobs to server load
538		715
539	wantarray ? @res : $res[0]	716	wantarray ? @res : $res[0]
540	} else {	717	} else {
…		…
562	$EXT_CORO{$coro+0} = $coro;	739	$EXT_CORO{$coro+0} = $coro;
563		740
564	$coro	741	$coro
565	}	742	}
566		743
567	=item fork_call { }, $args	744	=item fork_call { }, @args
568		745
569	Executes the given code block with the given arguments in a seperate	746	Executes the given code block with the given arguments in a seperate
570	process, returning the results. Everything must be serialisable with	747	process, returning the results. Everything must be serialisable with
571	Coro::Storable. May, of course, block. Note that the executed sub may	748	Coro::Storable. May, of course, block. Note that the executed sub may
572	never block itself or use any form of event handling.	749	never block itself or use any form of event handling.
573		750
574	=cut	751	=cut
575		752
		753	sub post_fork {
		754	reset_signals;
		755	}
		756
576	sub fork_call(&@) {	757	sub fork_call(&@) {
577	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
578		759
579	# we seemingly have to make a local copy of the whole thing,
580	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)
582
583	my @res = Coro::Util::fork_eval {	760	my @res = Coro::Util::fork_eval {
584	reset_signals;	761	cf::post_fork;
585	&$cb	762	&$cb
586	}, @args;	763	} @args;
587		764
588	wantarray ? @res : $res[-1]	765	wantarray ? @res : $res[-1]
		766	}
		767
		768	sub objinfo {
		769	(
		770	"counter value" => cf::object::object_count,
		771	"objects created" => cf::object::create_count,
		772	"objects destroyed" => cf::object::destroy_count,
		773	"freelist size" => cf::object::free_count,
		774	"allocated objects" => cf::object::objects_size,
		775	"active objects" => cf::object::actives_size,
		776	)
589	}	777	}
590		778
591	=item $coin = coin_from_name $name	779	=item $coin = coin_from_name $name
592		780
593	=cut	781	=cut
…		…
630	within each server.	818	within each server.
631		819
632	=cut	820	=cut
633		821
634	sub db_table($) {	822	sub db_table($) {
		823	cf::error "db_get called from main context"
		824	if $Coro::current == $Coro::main;
		825
635	my ($name) = @_;	826	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	827	my $db = BDB::db_create $DB_ENV;
637		828
638	eval {	829	eval {
639	$db->set_flags (BDB::CHKSUM);	830	$db->set_flags (BDB::CHKSUM);
…		…
649	}	840	}
650		841
651	our $DB;	842	our $DB;
652		843
653	sub db_init {	844	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	845	$DB ||= db_table "db";
656	};
657	}	846	}
658		847
659	sub db_get($$) {	848	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	849	my $key = "$_[0]/$_[1]";
661		850
662	cf::sync_job {	851	cf::error "db_get called from main context"
		852	if $Coro::current == $Coro::main;
		853
663	BDB::db_get $DB, undef, $key, my $data;	854	BDB::db_get $DB, undef, $key, my $data;
664		855
665	$! ? ()	856	$! ? ()
666	: $data	857	: $data
667	}
668	}	858	}
669		859
670	sub db_put($$$) {	860	sub db_put($$$) {
671	BDB::dbreq_pri 4;	861	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	862	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		890
701	my @data;	891	my @data;
702	my $md5;	892	my $md5;
703		893
704	for (0 .. $#$src) {	894	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	896	}
708		897
709	# if processing is expensive, check	898	# if processing is expensive, check
710	# checksum first	899	# checksum first
711	if (1) {	900	if (1) {
…		…
724		913
725	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
726	}	915	}
727	}	916	}
728		917
729	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
730	my $data = $process->(\@data);	919	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
732		921
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		923
735	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	926	db_put cache => "$id/meta", $meta;
738		927
…		…
748		937
749	=cut	938	=cut
750		939
751	sub datalog($@) {	940	sub datalog($@) {
752	my ($type, %kv) = @_;	941	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	942	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	943	}
755		944
756	=back	945	=back
757		946
758	=cut	947	=cut
…		…
953		1142
954	} elsif (exists $cb_id{$type}) {	1143	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1144	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1145
957	} elsif (ref $type) {	1146	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1147	error "attaching objects not supported, ignoring.\n";
959		1148
960	} else {	1149	} else {
961	shift @arg;	1150	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1151	error "attach argument '$type' not supported, ignoring.\n";
963	}	1152	}
964	}	1153	}
965	}	1154	}
966		1155
967	sub _object_attach {	1156	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
978	}	1167	}
979		1168
980	$obj->{$name} = \%arg;	1169	$obj->{$name} = \%arg;
981	} else {	1170	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1171	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1172	}
984		1173
985	$obj->{_attachment}{$name} = undef;	1174	$obj->{_attachment}{$name} = undef;
986	}	1175	}
987		1176
…		…
1046		1235
1047	for (@$callbacks) {	1236	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1237	eval { &{$_->[1]} };
1049		1238
1050	if ($@) {	1239	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1240	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1241	override;
1054	}	1242	}
1055		1243
1056	return 1 if $override;	1244	return 1 if $override;
1057	}	1245	}
…		…
1136	for (@$attach) {	1324	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1325	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1326	_attach $registry, $klass, @attach;
1139	}	1327	}
1140	} else {	1328	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1329	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1330	}
1143	}	1331	}
1144	}	1332	}
1145		1333
1146	cf::attachable->attach (	1334	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1361	my ($filename, $rdata, $objs) = @_;
1174		1362
1175	sync_job {	1363	sync_job {
1176	if (length $$rdata) {	1364	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1365	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1366	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1367	$decname, length $$rdata, scalar @$objs
		1368	if $VERBOSE_IO;
1180		1369
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1370	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1371	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1372	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1373	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1395	aio_rename "$filename~", $filename;
1207		1396
1208	$filename =~ s%/[^/]+$%%;	1397	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1398	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1399	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1400	error "unable to save objects: $filename~: $!\n";
1212	}	1401	}
1213	} else {	1402	} else {
1214	aio_unlink $filename;	1403	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1404	aio_unlink "$filename.pst";
1216	}	1405	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1429	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1430	$av = $st->{objs};
1242	}	1431	}
1243		1432
1244	utf8::decode (my $decname = $filename);	1433	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1434	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1435	$decname, length $data, scalar @{$av || []}
		1436	if $VERBOSE_IO;
1247		1437
1248	($data, $av)	1438	($data, $av)
1249	}	1439	}
1250		1440
1251	=head2 COMMAND CALLBACKS	1441	=head2 COMMAND CALLBACKS
…		…
1255	=cut	1445	=cut
1256		1446
1257	#############################################################################	1447	#############################################################################
1258	# command handling &c	1448	# command handling &c
1259		1449
1260	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1261		1451
1262	Register a callback for execution when the client sends the user command	1452	Register a callback for execution when the client sends the user command
1263	$name.	1453	$name.
1264		1454
1265	=cut	1455	=cut
…		…
1271	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1272		1462
1273	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1274	}	1464	}
1275		1465
1276	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1277		1467
1278	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1279	extcmd packet. Ext commands will be processed in the order they are	1469	extcmd packet. Ext commands will be processed in the order they are
1280	received by the server, like other user commands. The first argument is	1470	received by the server, like other user commands. The first argument is
1281	the logged-in player. Ext commands can only be processed after a player	1471	the logged-in player. Ext commands can only be processed after a player
1282	has logged in successfully.	1472	has logged in successfully.
1283		1473
1284	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1285	called.
1286		1475
		1476	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1477
		1478	Same as C<cf::register_extcmd>, but instead of returning values, the
		1479	callback needs to clal the C<$reply> function.
		1480
1287	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1288		1482
1289	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1290	exticmd packet. Exti commands are processed by the server as soon as they	1484	exticmd packet. Exti commands are processed by the server as soon as they
1291	are received, i.e. out of order w.r.t. other commands. The first argument	1485	are received, i.e. out of order w.r.t. other commands. The first argument
1292	is a client socket. Exti commands can be received anytime, even before	1486	is a client socket. Exti commands can be received anytime, even before
1293	log-in.	1487	log-in.
1294		1488
1295	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1296	called.
1297		1490
1298	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1299		1492
		1493	Same as C<cf::register_extcmd>, but instead of returning values, the
		1494	callback needs to clal the C<$reply> function.
		1495
		1496	=cut
		1497
1300	sub register_extcmd {	1498	sub register_extcmd($$) {
1301	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1302		1500
1303	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1304	}	1502	}
1305		1503
1306	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1307	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1308		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1309	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1310	}	1520	}
1311		1521
1312	use File::Glob ();	1522	use File::Glob ();
1313		1523
1314	cf::player->attach (	1524	cf::player->attach (
…		…
1328	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1329		1539
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1541
1332	if (ref $msg) {	1542	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1544
1338	my @reply;
1339
1340	if (my $cb = $EXTCMD{$type}) {	1545	if (my $cb = $EXTACMD{$type}) {
		1546	$cb->(
		1547	$pl,
		1548	sub {
		1549	$pl->ext_msg ("reply-$reply", @_)
		1550	if $reply;
		1551	},
		1552	@payload
		1553	);
		1554	} else {
		1555	my @reply;
		1556
		1557	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1342	}	1563	}
1343		1564
1344	$pl->ext_reply ($reply, @reply)
1345	if $reply;
1346
1347	} else {	1565	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1567	}
1350		1568
1351	cf::override;	1569	cf::override;
1352	},	1570	},
1353	);	1571	);
…		…
1363	};	1581	};
1364		1582
1365	$grp	1583	$grp
1366	}	1584	}
1367		1585
		1586	sub _ext_cfg_reg($$$$) {
		1587	my ($rvar, $varname, $cfgname, $default) = @_;
		1588
		1589	$cfgname = lc $varname
		1590	unless length $cfgname;
		1591
		1592	$EXT_CFG{$cfgname} = [$rvar, $default];
		1593
		1594	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1595	}
		1596
1368	sub load_extensions {	1597	sub load_extensions {
		1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
		1601
1369	cf::sync_job {	1602	cf::sync_job {
1370	my %todo;	1603	my %todo;
1371		1604
1372	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1606	next unless -r $path;
…		…
1391		1624
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1625	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1626	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1627
1395	$ext{source} =	1628	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1629	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1630	. "#line 1 \"$path\"\n{\n"
1398	. $source	1631	. $source
1399	. "\n};\n1";	1632	. "\n};\n1";
1400		1633
1401	$todo{$base} = \%ext;	1634	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1646	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1647	next ext
1415	unless exists $done{$_};	1648	unless exists $done{$_};
1416	}	1649	}
1417		1650
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		1652
		1653	my $source = $v->{source};
		1654
		1655	# support "CONF varname :confname = default" pseudo-statements
		1656	$source =~ s{
		1657	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1658	}{
		1659	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1660	}gmxe;
		1661
1420	my $active = eval $v->{source};	1662	my $active = eval $source;
1421		1663
1422	if (length $@) {	1664	if (length $@) {
1423	warn "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1424		1666
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1668	if exists $v->{meta}{mandatory};
		1669
		1670	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1671	delete $todo{$k};
1427	} else {	1672	} else {
1428	$done{$k} = delete $todo{$k};	1673	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1674	push @EXTS, $v->{pkg};
1430	$progress = 1;	1675	$progress = 1;
1431		1676
1432	warn "$v->{base}: extension inactive.\n"	1677	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1678	unless $active;
1434	}	1679	}
1435	}	1680	}
1436		1681
1437	unless ($progress) {	1682	unless ($progress) {
…		…
1439		1684
1440	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1443	}	1688	}
		1689
		1690	last;
1444	}	1691	}
1445	}	1692	}
1446	};	1693	};
1447	}	1694	}
1448		1695
…		…
1606	my $name = $pl->ob->name;	1853	my $name = $pl->ob->name;
1607		1854
1608	$pl->{deny_save} = 1;	1855	$pl->{deny_save} = 1;
1609	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1856	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1610		1857
1611	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1858	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1612	$pl->deactivate;	1859	$pl->deactivate;
		1860
1613	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1861	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1614	$pl->ob->check_score;
1615	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1862	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1863	ext::highscore::check ($pl->ob);
		1864
1616	$pl->ns->destroy if $pl->ns;	1865	$pl->ns->destroy if $pl->ns;
1617		1866
1618	my $path = playerdir $pl;	1867	my $path = playerdir $pl;
1619	my $temp = "$path~$cf::RUNTIME~deleting~";	1868	my $temp = "$path~$cf::RUNTIME~deleting~";
1620	aio_rename $path, $temp;	1869	aio_rename $path, $temp;
…		…
1674	\@logins	1923	\@logins
1675	}	1924	}
1676		1925
1677	=item $player->maps	1926	=item $player->maps
1678		1927
		1928	=item cf::player::maps $login
		1929
1679	Returns an arrayref of map paths that are private for this	1930	Returns an arrayref of map paths that are private for this
1680	player. May block.	1931	player. May block.
1681		1932
1682	=cut	1933	=cut
1683		1934
…		…
1704		1955
1705	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1706		1957
1707	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1708		1959
1709	=item $player->ext_reply ($msgid, @msg)
1710
1711	Sends an ext reply to the player.
1712
1713	=cut
1714
1715	sub ext_reply($$@) {
1716	my ($self, $id, @msg) = @_;
1717
1718	$self->ns->ext_reply ($id, @msg)
1719	}
1720
1721	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1722		1961
1723	Sends an ext event to the client.	1962	Sends an ext event to the client.
1724		1963
1725	=cut	1964	=cut
…		…
1744		1983
1745	=cut	1984	=cut
1746		1985
1747	sub find_by_path($) {	1986	sub find_by_path($) {
1748	my ($path) = @_;	1987	my ($path) = @_;
		1988
		1989	$path =~ s/^~[^\/]*//; # skip ~login
1749		1990
1750	my ($match, $specificity);	1991	my ($match, $specificity);
1751		1992
1752	for my $region (list) {	1993	for my $region (list) {
1753	if ($region->{match} && $path =~ $region->{match}) {	1994	if ($region->{match} && $path =~ $region->{match}) {
…		…
1782	sub generate_random_map {	2023	sub generate_random_map {
1783	my ($self, $rmp) = @_;	2024	my ($self, $rmp) = @_;
1784		2025
1785	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2026	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1786		2027
1787	# mit "rum" bekleckern, nicht
1788	$self->_create_random_map (	2028	$self->_create_random_map ($rmp);
1789	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1790	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1791	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1792	$rmp->{exit_on_final_map},
1793	$rmp->{xsize}, $rmp->{ysize},
1794	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1795	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1796	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1797	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1798	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1799	(cf::region::find $rmp->{region}), $rmp->{custom}
1800	)
1801	}	2029	}
1802		2030
1803	=item cf::map->register ($regex, $prio)	2031	=item cf::map->register ($regex, $prio)
1804		2032
1805	Register a handler for the map path matching the given regex at the	2033	Register a handler for the map path matching the given regex at the
…		…
1810		2038
1811	sub register {	2039	sub register {
1812	my (undef, $regex, $prio) = @_;	2040	my (undef, $regex, $prio) = @_;
1813	my $pkg = caller;	2041	my $pkg = caller;
1814		2042
1815	no strict;
1816	push @{"$pkg\::ISA"}, __PACKAGE__;	2043	push @{"$pkg\::ISA"}, __PACKAGE__;
1817		2044
1818	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2045	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1819	}	2046	}
1820		2047
1821	# also paths starting with '/'	2048	# also paths starting with '/'
1822	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2049	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1823		2050
1824	sub thawer_merge {	2051	sub thawer_merge {
1825	my ($self, $merge) = @_;	2052	my ($self, $merge) = @_;
1826		2053
1827	# we have to keep some variables in memory intact	2054	# we have to keep some variables in memory intact
…		…
1832	}	2059	}
1833		2060
1834	sub normalise {	2061	sub normalise {
1835	my ($path, $base) = @_;	2062	my ($path, $base) = @_;
1836		2063
1837	$path = "$path"; # make sure its a string	2064	$path = "$path"; # make sure it's a string
1838		2065
1839	$path =~ s/\.map$//;	2066	$path =~ s/\.map$//;
1840		2067
1841	# map plan:	2068	# map plan:
1842	#	2069	#
…		…
1857	$base =~ s{[^/]+/?$}{};	2084	$base =~ s{[^/]+/?$}{};
1858	$path = "$base/$path";	2085	$path = "$base/$path";
1859	}	2086	}
1860		2087
1861	for ($path) {	2088	for ($path) {
1862	redo if s{//}{/};
1863	redo if s{/\.?/}{/};	2089	redo if s{/\.?/}{/};
1864	redo if s{/[^/]+/\.\./}{/};	2090	redo if s{/[^/]+/\.\./}{/};
1865	}	2091	}
1866		2092
1867	$path	2093	$path
…		…
1881	$self->init; # pass $1 etc.	2107	$self->init; # pass $1 etc.
1882	return $self;	2108	return $self;
1883	}	2109	}
1884	}	2110	}
1885		2111
1886	Carp::cluck "unable to resolve path '$path' (base '$base').";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1887	()	2113	()
1888	}	2114	}
1889		2115
		2116	# may re-bless or do other evil things
1890	sub init {	2117	sub init {
1891	my ($self) = @_;	2118	my ($self) = @_;
1892		2119
1893	$self	2120	$self
1894	}	2121	}
…		…
1959	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
1960		2187
1961	1	2188	1
1962	}	2189	}
1963		2190
		2191	# used to laod the header of an original map
1964	sub load_header_orig {	2192	sub load_header_orig {
1965	my ($self) = @_;	2193	my ($self) = @_;
1966		2194
1967	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
1968	}	2196	}
1969		2197
		2198	# used to laod the header of an instantiated map
1970	sub load_header_temp {	2199	sub load_header_temp {
1971	my ($self) = @_;	2200	my ($self) = @_;
1972		2201
1973	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
1974	}	2203	}
1975		2204
		2205	# called after loading the header from an instantiated map
1976	sub prepare_temp {	2206	sub prepare_temp {
1977	my ($self) = @_;	2207	my ($self) = @_;
1978		2208
1979	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
1980	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
1981	# safety	2211	# safety
1982	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
1983	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
1984	}	2214	}
1985		2215
		2216	# called after loading the header from an original map
1986	sub prepare_orig {	2217	sub prepare_orig {
1987	my ($self) = @_;	2218	my ($self) = @_;
1988		2219
1989	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
1990	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2014		2245
2015	sub find;	2246	sub find;
2016	sub find {	2247	sub find {
2017	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2018		2249
		2250	cf::cede_to_tick;
		2251
2019	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2020		2253
2021	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2022	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2023		2256
2024	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2055		2288
2056	{	2289	{
2057	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2058		2291
2059	return unless $self->valid;	2292	return unless $self->valid;
2060	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2061
2062	$self->in_memory (cf::MAP_LOADING);
2063		2294
2064	$self->alloc;	2295	$self->alloc;
2065		2296
2066	$self->pre_load;	2297	$self->pre_load;
2067	cf::cede_to_tick;	2298	cf::cede_to_tick;
2068		2299
		2300	if (exists $self->{load_path}) {
2069	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2070	$f->skip_block;	2302	$f->skip_block;
2071	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2072	or return;	2304	or return;
2073		2305
2074	$self->post_load_original	2306	$self->post_load_original
2075	if delete $self->{load_original};	2307	if delete $self->{load_original};
2076		2308
2077	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2078	utf8::encode $uniq;	2310	utf8::encode $uniq;
2079	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2080	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2081	$self->clear_unique_items;	2313	$self->clear_unique_items;
2082	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2083	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2084	}	2317	}
2085	}	2318	}
2086	}
2087		2319
2088	$f->resolve_delayed_derefs;	2320	$f->resolve_delayed_derefs;
		2321	} else {
		2322	$self->post_load_original
		2323	if delete $self->{load_original};
		2324	}
		2325
		2326	$self->state (cf::MAP_INACTIVE);
2089		2327
2090	cf::cede_to_tick;	2328	cf::cede_to_tick;
2091	# now do the right thing for maps	2329	# now do the right thing for maps
2092	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2093	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2097	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2098	$self->decay_objects;	2336	$self->decay_objects;
2099	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2100	$self->update_buttons;	2338	$self->update_buttons;
2101	cf::cede_to_tick;	2339	cf::cede_to_tick;
2102	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2103	}	2341	}
2104		2342
2105	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2106	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2107
2108	$self->in_memory (cf::MAP_ACTIVE);
2109	}	2345	}
2110		2346
2111	$self->post_load;	2347	$self->post_load;
		2348
		2349	1
2112	}	2350	}
2113		2351
2114	# customize the map for a given player, i.e.	2352	# customize the map for a given player, i.e.
2115	# return the _real_ map. used by e.g. per-player	2353	# return the _real_ map. used by e.g. per-player
2116	# maps to change the path to ~playername/mappath	2354	# maps to change the path to ~playername/mappath
…		…
2124	# if $self->per_party;	2362	# if $self->per_party;
2125		2363
2126	$self	2364	$self
2127	}	2365	}
2128		2366
2129	# find and load all maps in the 3x3 area around a map
2130	sub load_neighbours {
2131	my ($map) = @_;
2132
2133	my @neigh; # diagonal neighbours
2134
2135	for (0 .. 3) {
2136	my $neigh = $map->tile_path ($_)
2137	or next;
2138	$neigh = find $neigh, $map
2139	or next;
2140	$neigh->load;
2141
2142	push @neigh,
2143	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2144	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2145	}
2146
2147	for (grep defined $_->[0], @neigh) {
2148	my ($path, $origin) = @$_;
2149	my $neigh = find $path, $origin
2150	or next;
2151	$neigh->load;
2152	}
2153	}
2154
2155	sub find_sync {	2367	sub find_sync {
2156	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2157		2369
2158	cf::sync_job { find $path, $origin }	2370	# it's a bug to call this from the main context
		2371	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2372	if $Coro::current == $Coro::main;
		2373
		2374	find $path, $origin
2159	}	2375	}
2160		2376
2161	sub do_load_sync {	2377	sub do_load_sync {
2162	my ($map) = @_;	2378	my ($map) = @_;
2163		2379
		2380	# it's a bug to call this from the main context
2164	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2165	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2166		2383
2167	cf::sync_job { $map->load };	2384	$map->load;
2168	}	2385	}
2169		2386
2170	our %MAP_PREFETCH;	2387	our %MAP_PREFETCH;
2171	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2172		2389
2173	sub find_async {	2390	sub find_async {
2174	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2175		2392
2176	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2177		2394
2178	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2179	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2180	}	2397	}
2181		2398
2182	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2183		2400
2184	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2185	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2186		2403
2187	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2188	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2189	if (my $map = find $k) {	2406	if (my $map = find $k) {
2190	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2191	}	2408	}
2192		2409
2193	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2194	}	2411	}
2195	}	2412	}
…		…
2198	$MAP_PREFETCHER->prio (6);	2415	$MAP_PREFETCHER->prio (6);
2199		2416
2200	()	2417	()
2201	}	2418	}
2202		2419
		2420	# common code, used by both ->save and ->swapout
2203	sub save {	2421	sub _save {
2204	my ($self) = @_;	2422	my ($self) = @_;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2423
2208	$self->{last_save} = $cf::RUNTIME;	2424	$self->{last_save} = $cf::RUNTIME;
2209		2425
2210	return unless $self->dirty;	2426	return unless $self->dirty;
2211		2427
…		…
2231	} else {	2447	} else {
2232	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2448	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2233	}	2449	}
2234	}	2450	}
2235		2451
		2452	sub save {
		2453	my ($self) = @_;
		2454
		2455	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2456
		2457	$self->_save;
		2458	}
		2459
2236	sub swap_out {	2460	sub swap_out {
2237	my ($self) = @_;	2461	my ($self) = @_;
2238		2462
2239	# save first because save cedes
2240	$self->save;
2241
2242	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2243		2464
		2465	return if !$self->linkable;
		2466	return if $self->{deny_save};
2244	return if $self->players;	2467	return if $self->players;
2245	return if $self->in_memory != cf::MAP_ACTIVE;	2468
		2469	# first deactivate the map and "unlink" it from the core
		2470	$self->deactivate;
		2471	$_->clear_links_to ($self) for values %cf::MAP;
		2472	$self->state (cf::MAP_SWAPPED);
		2473
		2474	# then atomically save
		2475	$self->_save;
		2476
		2477	# then free the map
		2478	$self->clear;
		2479	}
		2480
		2481	sub reset_at {
		2482	my ($self) = @_;
		2483
		2484	# TODO: safety, remove and allow resettable per-player maps
2246	return if $self->{deny_save};	2485	return 1e99 if $self->{deny_reset};
2247		2486
		2487	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2488	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2489
		2490	$time + $to
		2491	}
		2492
		2493	sub should_reset {
		2494	my ($self) = @_;
		2495
		2496	$self->reset_at <= $cf::RUNTIME
		2497	}
		2498
		2499	sub reset {
		2500	my ($self) = @_;
		2501
		2502	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2503
		2504	return if $self->players;
		2505
		2506	cf::trace "resetting map ", $self->path, "\n";
		2507
2248	$self->in_memory (cf::MAP_SWAPPED);	2508	$self->state (cf::MAP_SWAPPED);
		2509
		2510	# need to save uniques path
		2511	unless ($self->{deny_save}) {
		2512	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2513
		2514	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2515	if $uniq;
		2516	}
		2517
		2518	delete $cf::MAP{$self->path};
2249		2519
2250	$self->deactivate;	2520	$self->deactivate;
2251	$_->clear_links_to ($self) for values %cf::MAP;	2521	$_->clear_links_to ($self) for values %cf::MAP;
2252	$self->clear;	2522	$self->clear;
2253	}
2254
2255	sub reset_at {
2256	my ($self) = @_;
2257
2258	# TODO: safety, remove and allow resettable per-player maps
2259	return 1e99 if $self->{deny_reset};
2260
2261	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2262	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2263
2264	$time + $to
2265	}
2266
2267	sub should_reset {
2268	my ($self) = @_;
2269
2270	$self->reset_at <= $cf::RUNTIME
2271	}
2272
2273	sub reset {
2274	my ($self) = @_;
2275
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277
2278	return if $self->players;
2279
2280	warn "resetting map ", $self->path, "\n";
2281
2282	$self->in_memory (cf::MAP_SWAPPED);
2283
2284	# need to save uniques path
2285	unless ($self->{deny_save}) {
2286	my $uniq = $self->uniq_path; utf8::encode $uniq;
2287
2288	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2289	if $uniq;
2290	}
2291
2292	delete $cf::MAP{$self->path};
2293
2294	$self->deactivate;
2295	$_->clear_links_to ($self) for values %cf::MAP;
2296	$self->clear;
2297		2523
2298	$self->unlink_save;	2524	$self->unlink_save;
2299	$self->destroy;	2525	$self->destroy;
2300	}	2526	}
2301		2527
…		…
2309		2535
2310	delete $cf::MAP{$self->path};	2536	delete $cf::MAP{$self->path};
2311		2537
2312	$self->unlink_save;	2538	$self->unlink_save;
2313		2539
2314	bless $self, "cf::map";	2540	bless $self, "cf::map::wrap";
2315	delete $self->{deny_reset};	2541	delete $self->{deny_reset};
2316	$self->{deny_save} = 1;	2542	$self->{deny_save} = 1;
2317	$self->reset_timeout (1);	2543	$self->reset_timeout (1);
2318	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2544	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2319		2545
…		…
2440		2666
2441	Creates and returns a persistent reference to an object that can be stored as a string.	2667	Creates and returns a persistent reference to an object that can be stored as a string.
2442		2668
2443	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2444		2670
2445	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2671	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2446	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2447		2673
2448	=cut	2674	=cut
2449		2675
2450	sub deref {	2676	sub deref {
…		…
2532	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2533		2759
2534	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2535	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2536		2762
		2763	This is implemented by checking a config setting of C<may_access> where
		2764	C<access> is replaced by the access string. The following alternatives are
		2765	possible (and are tested in order):
		2766
		2767	=over 4
		2768
		2769	=item * Player is DM
		2770
		2771	The request will succeed.
		2772
		2773	=item * may_access is an array reference
		2774
		2775	If either the player nickname or UUID is in the array, the request will
		2776	succeed, otherwise it will fail.
		2777
		2778	=item * may_access is a true value
		2779
		2780	The request will succeed.
		2781
		2782	=item * may_access is missing or false
		2783
		2784	The request will fail.
		2785
		2786	=back
		2787
2537	=cut	2788	=cut
2538		2789
2539	sub cf::object::player::may {	2790	sub cf::object::player::may {
2540	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2541		2792
2542	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2543	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2544	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2545	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2546	}	2797	}
2547		2798
2548	=item $player_object->enter_link	2799	=item $player_object->enter_link
2549		2800
2550	Freezes the player and moves him/her to a special map (C<{link}>).	2801	Freezes the player and moves him/her to a special map (C<{link}>).
2551		2802
2552	The player should be reasonably safe there for short amounts of time (e.g.	2803	The player should be reasonably safe there for short amounts of time (e.g.
2553	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2804	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2554	though, as the palyer cannot control the character while it is on the link	2805	though, as the player cannot control the character while it is on the link
2555	map.	2806	map.
2556		2807
2557	Will never block.	2808	This method will never block, which is the whole reaosn for it's
		2809	existance: you can I<always> put a player onto the link map, which is the
		2810	only place to put objects that is guaranteed to exist.
		2811
		2812	A typical usage pattern is to call C<enter_link> synchronously from the
		2813	server, then start a new thread, do your blocking stuff there and then
		2814	call C<leave_link> from that thread.
2558		2815
2559	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2560		2817
2561	Moves the player out of the special C<{link}> map onto the specified	2818	Moves the player out of the special C<{link}> map onto the specified
2562	map. If the map is not valid (or omitted), the player will be moved back	2819	map. If the map is not valid (or omitted), the player will be moved back
…		…
2580	sub cf::object::player::enter_link {	2837	sub cf::object::player::enter_link {
2581	my ($self) = @_;	2838	my ($self) = @_;
2582		2839
2583	$self->deactivate_recursive;	2840	$self->deactivate_recursive;
2584		2841
		2842	++$self->{_link_recursion};
		2843
2585	return if UNIVERSAL::isa $self->map, "ext::map_link";	2844	return if UNIVERSAL::isa $self->map, "ext::map_link";
2586		2845
2587	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2846	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2588	if $self->map && $self->map->{path} ne "{link}";	2847	if $self->map && $self->map->{path} ne "{link}";
2589		2848
2590	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2849	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2591	}	2850	}
2592		2851
2593	sub cf::object::player::leave_link {	2852	sub cf::object::player::leave_link {
2594	my ($self, $map, $x, $y) = @_;	2853	my ($self, $map, $x, $y) = @_;
2595		2854
…		…
2615	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2616	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2617	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2618		2877
2619	$map->load;	2878	$map->load;
2620	$map->load_neighbours;
2621		2879
2622	return unless $self->contr->active;	2880	return unless $self->contr->active;
2623		2881
2624	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2625	$self->enter_map ($map, $x, $y);	2883	if ($self->enter_map ($map, $x, $y)) {
2626		2884	# entering was successful
		2885	delete $self->{_link_recursion};
2627	# only activate afterwards, to support waiting in hooks	2886	# only activate afterwards, to support waiting in hooks
2628	$self->activate_recursive;	2887	$self->activate_recursive;
2629	}	2888	}
2630		2889
		2890	}
		2891
2631	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2892	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2632		2893
2633	Moves the player to the given map-path and coordinates by first freezing	2894	Moves the player to the given map-path and coordinates by first freezing
2634	her, loading and preparing them map, calling the provided $check callback	2895	her, loading and preparing them map, calling the provided $check callback
2635	that has to return the map if sucecssful, and then unfreezes the player on	2896	that has to return the map if sucecssful, and then unfreezes the player on
2636	the new (success) or old (failed) map position. In either case, $done will	2897	the new (success) or old (failed) map position. In either case, $done will
…		…
2643		2904
2644	our $GOTOGEN;	2905	our $GOTOGEN;
2645		2906
2646	sub cf::object::player::goto {	2907	sub cf::object::player::goto {
2647	my ($self, $path, $x, $y, $check, $done) = @_;	2908	my ($self, $path, $x, $y, $check, $done) = @_;
		2909
		2910	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2911	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2912	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2913	($path, $x, $y) = @$EMERGENCY_POSITION;
		2914	}
2648		2915
2649	# do generation counting so two concurrent goto's will be executed in-order	2916	# do generation counting so two concurrent goto's will be executed in-order
2650	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2917	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2651		2918
2652	$self->enter_link;	2919	$self->enter_link;
…		…
2672	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2673	}	2940	}
2674	}	2941	}
2675		2942
2676	my $map = eval {	2943	my $map = eval {
2677	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2678		2945
2679	if ($map) {	2946	if ($map) {
2680	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2681	$map = $check->($map) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2682	} else {	2949	} else {
2683	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2950	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2684	}	2951	}
2685		2952
2686	$map	2953	$map
…		…
2694	if ($gen == $self->{_goto_generation}) {	2961	if ($gen == $self->{_goto_generation}) {
2695	delete $self->{_goto_generation};	2962	delete $self->{_goto_generation};
2696	$self->leave_link ($map, $x, $y);	2963	$self->leave_link ($map, $x, $y);
2697	}	2964	}
2698		2965
2699	$done->() if $done;	2966	$done->($self) if $done;
2700	})->prio (1);	2967	})->prio (1);
2701	}	2968	}
2702		2969
2703	=item $player_object->enter_exit ($exit_object)	2970	=item $player_object->enter_exit ($exit_object)
2704		2971
…		…
2772	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2773		3040
2774	unless (eval {	3041	unless (eval {
2775	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2776		3043
2777	# random map handling
2778	{
2779	my $guard = cf::lock_acquire "exit_prepare:$exit";
2780
2781	prepare_random_map $exit
2782	if $exit->slaying eq "/!";
2783	}
2784
2785	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2786	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2787	my $y = $exit->stats->sp;	3046	my $y = $exit->stats->sp;
		3047
		3048	# special map handling
		3049	my $slaying = $exit->slaying;
		3050
		3051	# special map handling
		3052	if ($slaying eq "/!") {
		3053	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3054
		3055	prepare_random_map $exit
		3056	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3057
		3058	$map = $exit->slaying;
		3059
		3060	} elsif ($slaying eq '!up') {
		3061	$map = $exit->map->tile_path (cf::TILE_UP);
		3062	$x = $exit->x;
		3063	$y = $exit->y;
		3064
		3065	} elsif ($slaying eq '!down') {
		3066	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3067	$x = $exit->x;
		3068	$y = $exit->y;
		3069	}
2788		3070
2789	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2790		3072
2791	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2792	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2797	$self->message ("Something went wrong deep within the deliantra server. "	3079	$self->message ("Something went wrong deep within the deliantra server. "
2798	. "I'll try to bring you back to the map you were before. "	3080	. "I'll try to bring you back to the map you were before. "
2799	. "Please report this to the dungeon master!",	3081	. "Please report this to the dungeon master!",
2800	cf::NDI_UNIQUE | cf::NDI_RED);	3082	cf::NDI_UNIQUE | cf::NDI_RED);
2801		3083
2802	warn "ERROR in enter_exit: $@";	3084	error "ERROR in enter_exit: $@";
2803	$self->leave_link;	3085	$self->leave_link;
2804	}	3086	}
2805	})->prio (1);	3087	})->prio (1);
2806	}	3088	}
2807		3089
2808	=head3 cf::client	3090	=head3 cf::client
2809		3091
2810	=over 4	3092	=over 4
2811
2812	=item $client->send_drawinfo ($text, $flags)
2813
2814	Sends a drawinfo packet to the client. Circumvents output buffering so
2815	should not be used under normal circumstances.
2816
2817	=cut
2818
2819	sub cf::client::send_drawinfo {
2820	my ($self, $text, $flags) = @_;
2821
2822	utf8::encode $text;
2823	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2824	}
2825		3093
2826	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2827		3095
2828	Like C<send_packet>, but tries to compress large packets, and fragments	3096	Like C<send_packet>, but tries to compress large packets, and fragments
2829	them as required.	3097	them as required.
…		…
2848	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2849	}	3117	}
2850		3118
2851	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2852		3120
2853	Send a drawinfo or msg packet to the client, formatting the msg for the	3121	Send a msg packet to the client, formatting the msg for the client if
2854	client if neccessary. C<$type> should be a string identifying the type of	3122	necessary. C<$type> should be a string identifying the type of the
2855	the message, with C<log> being the default. If C<$color> is negative, suppress	3123	message, with C<log> being the default. If C<$color> is negative, suppress
2856	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2857		3125
2858	=cut	3126	=cut
2859		3127
2860	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2903	},	3171	},
2904	"c/body" => {	3172	"c/body" => {
2905	id => "infobox",	3173	id => "infobox",
2906	title => "Body Parts",	3174	title => "Body Parts",
2907	reply => undef,	3175	reply => undef,
2908	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
2909	},	3177	},
2910	"c/statistics" => {	3178	"c/statistics" => {
2911	id => "infobox",	3179	id => "infobox",
2912	title => "Statistics",	3180	title => "Statistics",
2913	reply => undef,	3181	reply => undef,
…		…
2965	id => "death",	3233	id => "death",
2966	title => "Death",	3234	title => "Death",
2967	reply => undef,	3235	reply => undef,
2968	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
2969	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
2970	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
2971	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
2972	);	3246	);
2973		3247
2974	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3017	=cut	3291	=cut
3018		3292
3019	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3020	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3021		3295
3022	if ($self->extcmd == 2) {
3023	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3024	} elsif ($self->extcmd == 1) { # TODO: remove
3025	push @msg, msgtype => "event_$type";
3026	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3027	}
3028	}
3029
3030	=item $client->ext_reply ($msgid, @msg)
3031
3032	Sends an ext reply to the client.
3033
3034	=cut
3035
3036	sub cf::client::ext_reply($$@) {
3037	my ($self, $id, @msg) = @_;
3038
3039	if ($self->extcmd == 2) {
3040	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3041	} elsif ($self->extcmd == 1) {
3042	#TODO: version 1, remove
3043	unshift @msg, msgtype => "reply", msgid => $id;
3044	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3045	}
3046	}	3297	}
3047		3298
3048	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3049		3300
3050	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3070		3321
3071	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3072	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3073		3324
3074	1	3325	1
		3326	}
		3327
		3328	=item $client->update_command_faces
		3329
		3330	=cut
		3331
		3332	our %COMMAND_FACE;
		3333
		3334	sub cf::client::update_command_faces {
		3335	my ($self) = @_;
		3336
		3337	my @faces = grep $_,
		3338	$COMMAND_FACE{preferred},
		3339	$COMMAND_FACE{standard},
		3340	$COMMAND_FACE{skill},
		3341	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3342	$COMMAND_FACE{emote},
		3343	;
		3344
		3345	$self->send_face ($_)
		3346	for @faces;
		3347	$self->flush_fx;
		3348
		3349	$self->ext_msg (command_list => @faces);
		3350	}
		3351
		3352	=item cf::client::set_command_face $type, $commands
		3353
		3354	=cut
		3355
		3356	sub cf::client::set_command_face {
		3357	my ($type, $list) = @_;
		3358
		3359	my $idx = &cf::face::set ( #d# ugly forward reference
		3360	"command_list/$type" => cf::FT_RSRC,
		3361	JSON::XS->new->utf8->encode ([ sort @$list ])
		3362	);
		3363
		3364	$COMMAND_FACE{$type} = $idx;
3075	}	3365	}
3076		3366
3077	cf::client->attach (	3367	cf::client->attach (
3078	on_connect => sub {	3368	on_connect => sub {
3079	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3105	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3106		3396
3107	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3108		3398
3109	if (ref $msg) {	3399	if (ref $msg) {
3110	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3111	"ARRAY" eq ref $msg
3112	? @$msg
3113	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3114		3401
3115	my @reply;
3116
3117	if (my $cb = $EXTICMD{$type}) {	3402	if (my $cb = $EXTIACMD{$type}) {
		3403	$cb->(
		3404	$ns,
		3405	sub {
		3406	$ns->ext_msg ("reply-$reply", @_)
		3407	if $reply;
		3408	},
		3409	@payload
		3410	);
		3411	} else {
		3412	my @reply;
		3413
		3414	if (my $cb = $EXTICMD{$type}) {
3118	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3119	}	3420	}
3120
3121	$ns->ext_reply ($reply, @reply)
3122	if $reply;
3123
3124	} else {	3421	} else {
3125	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3422	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3126	}	3423	}
3127		3424
3128	cf::override;	3425	cf::override;
3129	},	3426	},
3130	);	3427	);
…		…
3211	decrease split destroy change_exp value msg lore send_msg)],	3508	decrease split destroy change_exp value msg lore send_msg)],
3212	["cf::object::player" => qw(player)],	3509	["cf::object::player" => qw(player)],
3213	["cf::player" => qw(peaceful send_msg)],	3510	["cf::player" => qw(peaceful send_msg)],
3214	["cf::map" => qw(trigger)],	3511	["cf::map" => qw(trigger)],
3215	) {	3512	) {
3216	no strict 'refs';
3217	my ($pkg, @funs) = @$_;	3513	my ($pkg, @funs) = @$_;
3218	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3514	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3219	for @funs;	3515	for @funs;
3220	}	3516	}
3221		3517
…		…
3260	local @cf::_safe_eval_args = values %vars;	3556	local @cf::_safe_eval_args = values %vars;
3261	@res = wantarray ? eval eval : scalar eval $eval;	3557	@res = wantarray ? eval eval : scalar eval $eval;
3262	}	3558	}
3263		3559
3264	if ($@) {	3560	if ($@) {
3265	warn "$@";	3561	warn "$@",
3266	warn "while executing safe code '$code'\n";	3562	"while executing safe code '$code'\n",
3267	warn "with arguments " . (join " ", %vars) . "\n";	3563	"with arguments " . (join " ", %vars) . "\n";
3268	}	3564	}
3269		3565
3270	wantarray ? @res : $res[0]	3566	wantarray ? @res : $res[0]
3271	}	3567	}
3272		3568
…		…
3297	=cut	3593	=cut
3298		3594
3299	#############################################################################	3595	#############################################################################
3300	# the server's init and main functions	3596	# the server's init and main functions
3301		3597
		3598	{
		3599	package cf::face;
		3600
		3601	our %HASH; # hash => idx
		3602	our @DATA; # dynamically-created facedata, only faceste 0 used
		3603	our @FOFS; # file offset, if > 0
		3604	our @SIZE; # size of face, in octets
		3605	our @META; # meta hash of face, if any
		3606	our $DATAFH; # facedata filehandle
		3607
		3608	# internal api, not finalised
		3609	sub set {
		3610	my ($name, $type, $data) = @_;
		3611
		3612	my $idx = cf::face::find $name;
		3613
		3614	if ($idx) {
		3615	delete $HASH{cf::face::get_csum $idx};
		3616	} else {
		3617	$idx = cf::face::alloc $name;
		3618	}
		3619
		3620	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3621
		3622	cf::face::set_type $idx, $type;
		3623	cf::face::set_csum $idx, 0, $hash;
		3624
		3625	# we need to destroy the SV itself, not just modify it, as a running ix
		3626	# might hold a reference to it: "delete" achieves that.
		3627	delete $FOFS[0][$idx];
		3628	delete $DATA[0][$idx];
		3629	$DATA[0][$idx] = $data;
		3630	$SIZE[0][$idx] = length $data;
		3631	delete $META[$idx];
		3632	$HASH{$hash} = $idx;#d#
		3633
		3634	$idx
		3635	}
		3636
		3637	sub _get_data($$$) {
		3638	my ($idx, $set, $cb) = @_;
		3639
		3640	if (defined $DATA[$set][$idx]) {
		3641	$cb->($DATA[$set][$idx]);
		3642	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3643	my $size = $SIZE[$set][$idx];
		3644	my $buf;
		3645	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3646	if ($_[0] == $size) {
		3647	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3648	$cb->($buf);
		3649	} else {
		3650	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3651	}
		3652	};
		3653	} else {
		3654	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3655	}
		3656	}
		3657
		3658	# rather ineffient
		3659	sub cf::face::get_data($;$) {
		3660	my ($idx, $set) = @_;
		3661
		3662	_get_data $idx, $set, Coro::rouse_cb;
		3663	Coro::rouse_wait
		3664	}
		3665
		3666	sub cf::face::ix {
		3667	my ($ns, $set, $idx, $pri) = @_;
		3668
		3669	_get_data $idx, $set, sub {
		3670	$ns->ix_send ($idx, $pri, $_[0]);
		3671	};
		3672	}
		3673	}
		3674
3302	sub load_facedata($) {	3675	sub load_facedata($) {
3303	my ($path) = @_;	3676	my ($path) = @_;
3304		3677
3305	# HACK to clear player env face cache, we need some signal framework
3306	# for this (global event?)
3307	%ext::player_env::MUSIC_FACE_CACHE = ();
3308
3309	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3310		3679
3311	warn "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3312		3681
3313	my $facedata;	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3314	0 < aio_load $path, $facedata
3315	or die "$path: $!";
3316
3317	$facedata = Coro::Storable::thaw $facedata;
3318		3683
3319	$facedata->{version} == 2	3684	$facedata->{version} == 2
3320	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3321		3686
3322	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3323	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3324	$facedata->{resource}{"res/exp_table"} = {	3689
3325	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3326	data => $exp_table,	3691
3327	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3328	};	3693	# from here on, everything must be atomic - no thread switch allowed
3329	cf::cede_to_tick;	3694	my $t1 = EV::time;
3330		3695
3331	{	3696	{
3332	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3333		3698
3334	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3335	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3336		3702
3337	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3338	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3339	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3705	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3340	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3706	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3341		3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3342	cf::cede_to_tick;	3708	$cf::face::HASH{$info->{hash64}} = $idx;
		3709	delete $cf::face::META[$idx];
3343	}	3710	}
3344		3711
3345	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3346	next unless $info->{smooth};	3713	next unless $info->{smooth};
3347		3714
…		…
3350		3717
3351	if (my $smooth = cf::face::find $info->{smooth}) {	3718	if (my $smooth = cf::face::find $info->{smooth}) {
3352	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3353	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3354	} else {	3721	} else {
3355	warn "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3356	}	3723	}
3357
3358	cf::cede_to_tick;
3359	}	3724	}
3360	}	3725	}
3361		3726
3362	{	3727	{
3363	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3364		3729
3365	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3366	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3367	cf::cede_to_tick;
3368	}	3732	}
3369		3733
3370	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3371	}	3735	}
3372		3736
3373	{	3737	{
3374	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3375		3739
3376	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3377	if (defined $info->{type}) {	3741	if (defined (my $type = $info->{type})) {
		3742	# TODO: different hash - must free and use new index, or cache ixface data queue
3378	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3379		3744
3380	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3381	cf::face::set_type $idx, $info->{type};	3745	cf::face::set_type $idx, $type;
		3746	cf::face::set_csum $idx, 0, $info->{hash};
		3747	$cf::face::SIZE[0][$idx] = $info->{size};
		3748	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3749	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3750	$cf::face::HASH{$info->{hash}} = $idx;
3382	} else {	3751	} else {
3383	$RESOURCE{$name} = $info;	3752	# $RESOURCE{$name} = $info; # unused
3384	}	3753	}
3385
3386	cf::cede_to_tick;
3387	}	3754	}
3388	}	3755	}
		3756
		3757	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3758
		3759	# HACK to clear player env face cache, we need some signal framework
		3760	# for this (global event?)
		3761	%ext::player_env::MUSIC_FACE_CACHE = ();
		3762
		3763	# END ATOMIC
		3764
		3765	cf::debug "facedata atomic update time ", EV::time - $t1;
3389		3766
3390	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3767	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3391		3768
		3769	aio_close $fh if $fh; # close old facedata
		3770
3392	1	3771	1
3393	}	3772	}
3394
3395	cf::global->attach (on_resource_update => sub {
3396	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3397	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3398
3399	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3400	my $sound = $soundconf->{compat}[$_]
3401	or next;
3402
3403	my $face = cf::face::find "sound/$sound->[1]";
3404	cf::sound::set $sound->[0] => $face;
3405	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3406	}
3407
3408	while (my ($k, $v) = each %{$soundconf->{event}}) {
3409	my $face = cf::face::find "sound/$v";
3410	cf::sound::set $k => $face;
3411	}
3412	}
3413	});
3414		3773
3415	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
3416	my ($ns, $want) = @_;	3775	my ($ns, $want) = @_;
3417		3776
3418	while (my ($k, $v) = each %$want) {	3777	while (my ($k, $v) = each %$want) {
…		…
3426	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3427	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3428	cf::arch::commit_load;	3787	cf::arch::commit_load;
3429		3788
3430	$status	3789	$status
		3790	}
		3791
		3792	sub reload_exp_table {
		3793	_reload_exp_table;
		3794
		3795	cf::face::set
		3796	"res/exp_table" => FT_RSRC,
		3797	JSON::XS->new->utf8->canonical->encode (
		3798	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3799	);
		3800	}
		3801
		3802	sub reload_materials {
		3803	_reload_materials;
3431	}	3804	}
3432		3805
3433	sub reload_regions {	3806	sub reload_regions {
3434	# HACK to clear player env face cache, we need some signal framework	3807	# HACK to clear player env face cache, we need some signal framework
3435	# for this (global event?)	3808	# for this (global event?)
…		…
3443	if exists $_->{match};	3816	if exists $_->{match};
3444	}	3817	}
3445	}	3818	}
3446		3819
3447	sub reload_facedata {	3820	sub reload_facedata {
3448	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3449	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3450	}	3823	}
3451		3824
3452	sub reload_archetypes {	3825	sub reload_archetypes {
3453	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3454	or die "unable to load archetypes\n";	3827	or die "unable to load archetypes\n";
		3828
		3829	cf::face::set
		3830	"res/skill_info" => FT_RSRC,
		3831	JSON::XS->new->utf8->canonical->encode (
		3832	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3833	);
		3834
		3835	cf::face::set
		3836	"res/spell_paths" => FT_RSRC,
		3837	JSON::XS->new->utf8->canonical->encode (
		3838	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3839	);
		3840
		3841	# command completion
		3842	my @commands;
		3843
		3844	for (0..cf::arch::skillvec_size - 1) {
		3845	my $skill = cf::arch::skillvec $_;
		3846	my $name = $skill->name;
		3847	my $flags = cf::skill_flags $skill->subtype;
		3848
		3849	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3850	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3851	}
		3852
		3853	cf::client::set_command_face skill => \@commands;
3455	}	3854	}
3456		3855
3457	sub reload_treasures {	3856	sub reload_treasures {
3458	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3459	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3460	}	3859	}
3461		3860
		3861	sub reload_sound {
		3862	trace "loading sound config from $DATADIR/sound\n";
		3863
		3864	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3865
		3866	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3867	my $sound = $soundconf->{compat}[$_]
		3868	or next;
		3869
		3870	my $face = cf::face::find "sound/$sound->[1]";
		3871	cf::sound::set $sound->[0] => $face;
		3872	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3873	}
		3874
		3875	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3876	my $face = cf::face::find "sound/$v";
		3877	cf::sound::set $k => $face;
		3878	}
		3879	}
		3880
3462	sub reload_resources {	3881	sub reload_resources {
3463	warn "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3464		3883
		3884	reload_materials;
3465	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
		3887	reload_sound;
3466	reload_archetypes;	3888	reload_archetypes;
3467	reload_regions;	3889	reload_regions;
3468	reload_treasures;	3890	reload_treasures;
3469		3891
3470	warn "finished reloading resource files\n";	3892	trace "finished reloading resource files\n";
3471	}	3893	}
3472		3894
3473	sub reload_config {	3895	sub reload_config {
3474	warn "reloading config file...\n";	3896	trace "reloading config file...\n";
3475		3897
3476	open my $fh, "<:utf8", "$CONFDIR/config"	3898	my $config = load_file "$CONFDIR/config";
3477	or return;	3899	utf8::decode $config;
		3900	*CFG = decode_yaml $config;
3478		3901
3479	local $/;
3480	*CFG = YAML::XS::Load scalar <$fh>;
3481
3482	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3483		3903
3484	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3904	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3485	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3905	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3486		3906
3487	if (exists $CFG{mlockall}) {	3907	if (exists $CFG{mlockall}) {
…		…
3489	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3909	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3490	and die "WARNING: m(un)lockall failed: $!\n";	3910	and die "WARNING: m(un)lockall failed: $!\n";
3491	};	3911	};
3492	warn $@ if $@;	3912	warn $@ if $@;
3493	}	3913	}
3494
3495	warn "finished reloading resource files\n";
3496	}	3914	}
3497		3915
3498	sub pidfile() {	3916	sub pidfile() {
3499	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3917	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3500	or die "$PIDFILE: $!";	3918	or die "$PIDFILE: $!";
…		…
3513	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3514	print $fh $$;	3932	print $fh $$;
3515	}	3933	}
3516		3934
3517	sub main_loop {	3935	sub main_loop {
3518	warn "EV::loop starting\n";	3936	trace "EV::run starting\n";
3519	if (1) {	3937	if (1) {
3520	EV::loop;	3938	EV::run;
3521	}	3939	}
3522	warn "EV::loop returned\n";	3940	trace "EV::run returned\n";
3523	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3524	}	3942	}
3525		3943
3526	sub main {	3944	sub main {
3527	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3528		3946
3529	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3947	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
		3948	LOG llevInfo, "Copyright (C) 2017-2018 Marc Alexander Lehmann / the Deliantra team.";
3530	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3949	LOG llevInfo, "Copyright (C) 2005-2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3531	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3532	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3533		3952
3534	cf::init_experience;
3535	cf::init_anim;
3536	cf::init_attackmess;
3537	cf::init_dynamic;
3538
3539	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3953	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3540		3954
3541	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3542	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3543	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3957	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3544	(async {	3958	(async {
3545	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3546	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3547	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3548	};	3962	};
3549		3963
3550	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3551		3965
3552	cf::sync_job {	3966	cf::sync_job {
		3967	cf::incloader::init ();
		3968
		3969	db_init;
		3970
		3971	cf::init_anim;
		3972	cf::init_attackmess;
		3973	cf::init_dynamic;
		3974
3553	cf::load_settings;	3975	cf::load_settings;
3554	cf::load_materials;
3555		3976
3556	reload_resources;	3977	reload_resources;
3557	reload_config;	3978	reload_config;
3558	db_init;
3559		3979
3560	cf::init_uuid;	3980	cf::init_uuid;
3561	cf::init_signals;	3981	cf::init_signals;
3562	cf::init_skills;	3982	cf::init_skills;
3563		3983
…		…
3571		3991
3572	# no (long-running) fork's whatsoever before this point(!)	3992	# no (long-running) fork's whatsoever before this point(!)
3573	use POSIX ();	3993	use POSIX ();
3574	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3994	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3575		3995
3576	(pop @POST_INIT)->(0) while @POST_INIT;	3996	cf::_post_init 0;
3577	};	3997	};
3578		3998
		3999	cf::object::thawer::errors_are_fatal 0;
		4000	info "parse errors in files are no longer fatal from this point on.\n";
		4001
		4002	AE::postpone {
		4003	undef &main; # free gobs of memory :)
		4004	};
		4005
3579	main_loop;	4006	goto &main_loop;
3580	}	4007	}
3581		4008
3582	#############################################################################	4009	#############################################################################
3583	# initialisation and cleanup	4010	# initialisation and cleanup
3584		4011
3585	# install some emergency cleanup handlers	4012	# install some emergency cleanup handlers
3586	BEGIN {	4013	BEGIN {
3587	our %SIGWATCHER = ();	4014	our %SIGWATCHER = ();
3588	for my $signal (qw(INT HUP TERM)) {	4015	for my $signal (qw(INT HUP TERM)) {
3589	$SIGWATCHER{$signal} = EV::signal $signal, sub {	4016	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3590	cf::cleanup "SIG$signal";	4017	cf::cleanup "SIG$signal";
3591	};	4018	};
3592	}	4019	}
3593	}	4020	}
3594		4021
3595	sub write_runtime_sync {	4022	sub write_runtime_sync {
3596	my $t0 = EV::time;	4023	my $t0 = AE::time;
3597		4024
3598	# first touch the runtime file to show we are still running:	4025	# first touch the runtime file to show we are still running:
3599	# the fsync below can take a very very long time.	4026	# the fsync below can take a very very long time.
3600		4027
3601	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	4028	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
…		…
3623	or return;	4050	or return;
3624		4051
3625	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4052	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3626	and return;	4053	and return;
3627		4054
3628	warn sprintf "runtime file written (%gs).\n", EV::time - $t0;	4055	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3629		4056
3630	1	4057	1
3631	}	4058	}
3632		4059
3633	our $uuid_lock;	4060	our $uuid_lock;
…		…
3645	or return;	4072	or return;
3646		4073
3647	my $value = uuid_seq uuid_cur;	4074	my $value = uuid_seq uuid_cur;
3648		4075
3649	unless ($value) {	4076	unless ($value) {
3650	warn "cowardly refusing to write zero uuid value!\n";	4077	info "cowardly refusing to write zero uuid value!\n";
3651	return;	4078	return;
3652	}	4079	}
3653		4080
3654	my $value = uuid_str $value + $uuid_skip;	4081	my $value = uuid_str $value + $uuid_skip;
3655	$uuid_skip = 0;	4082	$uuid_skip = 0;
…		…
3665	or return;	4092	or return;
3666		4093
3667	aio_rename "$uuid~", $uuid	4094	aio_rename "$uuid~", $uuid
3668	and return;	4095	and return;
3669		4096
3670	warn "uuid file written ($value).\n";	4097	trace "uuid file written ($value).\n";
3671		4098
3672	1	4099	1
3673		4100
3674	}	4101	}
3675		4102
…		…
3681	}	4108	}
3682		4109
3683	sub emergency_save() {	4110	sub emergency_save() {
3684	my $freeze_guard = cf::freeze_mainloop;	4111	my $freeze_guard = cf::freeze_mainloop;
3685		4112
3686	warn "emergency_perl_save: enter\n";	4113	info "emergency_perl_save: enter\n";
		4114
		4115	# this is a trade-off: we want to be very quick here, so
		4116	# save all maps without fsync, and later call a global sync
		4117	# (which in turn might be very very slow)
		4118	local $USE_FSYNC = 0;
3687		4119
3688	cf::sync_job {	4120	cf::sync_job {
3689	# this is a trade-off: we want to be very quick here, so	4121	cf::write_runtime_sync; # external watchdog should not bark
3690	# save all maps without fsync, and later call a global sync
3691	# (which in turn might be very very slow)
3692	local $USE_FSYNC = 0;
3693		4122
3694	# use a peculiar iteration method to avoid tripping on perl	4123	# use a peculiar iteration method to avoid tripping on perl
3695	# refcount bugs in for. also avoids problems with players	4124	# refcount bugs in for. also avoids problems with players
3696	# and maps saved/destroyed asynchronously.	4125	# and maps saved/destroyed asynchronously.
3697	warn "emergency_perl_save: begin player save\n";	4126	info "emergency_perl_save: begin player save\n";
3698	for my $login (keys %cf::PLAYER) {	4127	for my $login (keys %cf::PLAYER) {
3699	my $pl = $cf::PLAYER{$login} or next;	4128	my $pl = $cf::PLAYER{$login} or next;
3700	$pl->valid or next;	4129	$pl->valid or next;
3701	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4130	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3702	$pl->save;	4131	$pl->save;
3703	}	4132	}
3704	warn "emergency_perl_save: end player save\n";	4133	info "emergency_perl_save: end player save\n";
3705		4134
		4135	cf::write_runtime_sync; # external watchdog should not bark
		4136
3706	warn "emergency_perl_save: begin map save\n";	4137	info "emergency_perl_save: begin map save\n";
3707	for my $path (keys %cf::MAP) {	4138	for my $path (keys %cf::MAP) {
3708	my $map = $cf::MAP{$path} or next;	4139	my $map = $cf::MAP{$path} or next;
3709	$map->valid or next;	4140	$map->valid or next;
3710	$map->save;	4141	$map->save;
3711	}	4142	}
3712	warn "emergency_perl_save: end map save\n";	4143	info "emergency_perl_save: end map save\n";
3713		4144
		4145	cf::write_runtime_sync; # external watchdog should not bark
		4146
3714	warn "emergency_perl_save: begin database checkpoint\n";	4147	info "emergency_perl_save: begin database checkpoint\n";
3715	BDB::db_env_txn_checkpoint $DB_ENV;	4148	BDB::db_env_txn_checkpoint $DB_ENV;
3716	warn "emergency_perl_save: end database checkpoint\n";	4149	info "emergency_perl_save: end database checkpoint\n";
3717		4150
3718	warn "emergency_perl_save: begin write uuid\n";	4151	info "emergency_perl_save: begin write uuid\n";
3719	write_uuid_sync 1;	4152	write_uuid_sync 1;
3720	warn "emergency_perl_save: end write uuid\n";	4153	info "emergency_perl_save: end write uuid\n";
		4154
		4155	cf::write_runtime_sync; # external watchdog should not bark
		4156
		4157	trace "emergency_perl_save: syncing database to disk";
		4158	BDB::db_env_txn_checkpoint $DB_ENV;
		4159
		4160	info "emergency_perl_save: starting sync\n";
		4161	IO::AIO::aio_sync sub {
		4162	info "emergency_perl_save: finished sync\n";
		4163	};
		4164
		4165	cf::write_runtime_sync; # external watchdog should not bark
		4166
		4167	trace "emergency_perl_save: flushing outstanding aio requests";
		4168	while (IO::AIO::nreqs || BDB::nreqs) {
		4169	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4170	}
		4171
		4172	cf::write_runtime_sync; # external watchdog should not bark
3721	};	4173	};
3722		4174
3723	warn "emergency_perl_save: starting sync()\n";
3724	IO::AIO::aio_sync sub {
3725	warn "emergency_perl_save: finished sync()\n";
3726	};
3727
3728	warn "emergency_perl_save: leave\n";	4175	info "emergency_perl_save: leave\n";
3729	}	4176	}
3730		4177
3731	sub post_cleanup {	4178	sub post_cleanup {
3732	my ($make_core) = @_;	4179	my ($make_core) = @_;
3733		4180
		4181	IO::AIO::flush;
		4182
3734	warn Carp::longmess "post_cleanup backtrace"	4183	error Carp::longmess "post_cleanup backtrace"
3735	if $make_core;	4184	if $make_core;
3736		4185
3737	my $fh = pidfile;	4186	my $fh = pidfile;
3738	unlink $PIDFILE if <$fh> == $$;	4187	unlink $PIDFILE if <$fh> == $$;
3739	}	4188	}
…		…
3759	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4208	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3760	for my $name (keys %$leaf_symtab) {	4209	for my $name (keys %$leaf_symtab) {
3761	_gv_clear *{"$pkg$name"};	4210	_gv_clear *{"$pkg$name"};
3762	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4211	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3763	}	4212	}
3764	warn "cleared package $pkg\n";#d#
3765	}	4213	}
3766		4214
3767	sub do_reload_perl() {	4215	sub do_reload_perl() {
3768	# can/must only be called in main	4216	# can/must only be called in main
3769	if ($Coro::current != $Coro::main) {	4217	unless (in_main) {
3770	warn "can only reload from main coroutine";	4218	error "can only reload from main coroutine";
3771	return;	4219	return;
3772	}	4220	}
3773		4221
3774	return if $RELOAD++;	4222	return if $RELOAD++;
3775		4223
3776	my $t1 = EV::time;	4224	my $t1 = AE::time;
3777		4225
3778	while ($RELOAD) {	4226	while ($RELOAD) {
3779	warn "reloading...";	4227	cf::get_slot 0.1, -1, "reload_perl";
		4228	info "perl_reload: reloading...";
3780		4229
3781	warn "entering sync_job";	4230	trace "perl_reload: entering sync_job";
3782		4231
3783	cf::sync_job {	4232	cf::sync_job {
3784	cf::write_runtime_sync; # external watchdog should not bark
3785	cf::emergency_save;	4233	#cf::emergency_save;
3786	cf::write_runtime_sync; # external watchdog should not bark
3787		4234
3788	warn "syncing database to disk";
3789	BDB::db_env_txn_checkpoint $DB_ENV;
3790
3791	# if anything goes wrong in here, we should simply crash as we already saved
3792
3793	warn "flushing outstanding aio requests";
3794	while (IO::AIO::nreqs || BDB::nreqs) {
3795	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3796	}
3797
3798	warn "cancelling all extension coros";	4235	trace "perl_reload: cancelling all extension coros";
3799	$_->cancel for values %EXT_CORO;	4236	$_->cancel for values %EXT_CORO;
3800	%EXT_CORO = ();	4237	%EXT_CORO = ();
3801		4238
3802	warn "removing commands";	4239	trace "perl_reload: removing commands";
3803	%COMMAND = ();	4240	%COMMAND = ();
3804		4241
3805	warn "removing ext/exti commands";	4242	trace "perl_reload: removing ext/exti commands";
3806	%EXTCMD = ();	4243	%EXTCMD = ();
3807	%EXTICMD = ();	4244	%EXTICMD = ();
3808		4245
3809	warn "unloading/nuking all extensions";	4246	trace "perl_reload: unloading/nuking all extensions";
3810	for my $pkg (@EXTS) {	4247	for my $pkg (@EXTS) {
3811	warn "... unloading $pkg";	4248	trace "... unloading $pkg";
3812		4249
3813	if (my $cb = $pkg->can ("unload")) {	4250	if (my $cb = $pkg->can ("unload")) {
3814	eval {	4251	eval {
3815	$cb->($pkg);	4252	$cb->($pkg);
3816	1	4253	1
3817	} or warn "$pkg unloaded, but with errors: $@";	4254	} or error "$pkg unloaded, but with errors: $@";
3818	}	4255	}
3819		4256
3820	warn "... clearing $pkg";	4257	trace "... clearing $pkg";
3821	clear_package $pkg;	4258	clear_package $pkg;
3822	}	4259	}
3823		4260
3824	warn "unloading all perl modules loaded from $LIBDIR";	4261	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3825	while (my ($k, $v) = each %INC) {	4262	while (my ($k, $v) = each %INC) {
3826	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4263	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3827		4264
3828	warn "... unloading $k";	4265	trace "... unloading $k";
3829	delete $INC{$k};	4266	delete $INC{$k};
3830		4267
3831	$k =~ s/\.pm$//;	4268	$k =~ s/\.pm$//;
3832	$k =~ s/\//::/g;	4269	$k =~ s/\//::/g;
3833		4270
…		…
3836	}	4273	}
3837		4274
3838	clear_package $k;	4275	clear_package $k;
3839	}	4276	}
3840		4277
3841	warn "getting rid of safe::, as good as possible";	4278	trace "perl_reload: getting rid of safe::, as good as possible";
3842	clear_package "safe::$_"	4279	clear_package "safe::$_"
3843	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4280	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3844		4281
3845	warn "unloading cf.pm \"a bit\"";	4282	trace "perl_reload: unloading cf.pm \"a bit\"";
3846	delete $INC{"cf.pm"};	4283	delete $INC{"cf.pm"};
3847	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4284	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3848		4285
3849	# don't, removes xs symbols, too,	4286	# don't, removes xs symbols, too,
3850	# and global variables created in xs	4287	# and global variables created in xs
3851	#clear_package __PACKAGE__;	4288	#clear_package __PACKAGE__;
3852		4289
3853	warn "unload completed, starting to reload now";	4290	info "perl_reload: unload completed, starting to reload now";
3854		4291
3855	warn "reloading cf.pm";	4292	trace "perl_reload: reloading cf.pm";
3856	require cf;	4293	require cf;
3857	cf::_connect_to_perl_1;	4294	cf::_connect_to_perl_1;
3858		4295
3859	warn "loading config and database again";	4296	trace "perl_reload: loading config and database again";
3860	cf::reload_config;	4297	cf::reload_config;
3861		4298
3862	warn "loading extensions";	4299	trace "perl_reload: loading extensions";
3863	cf::load_extensions;	4300	cf::load_extensions;
3864		4301
3865	if ($REATTACH_ON_RELOAD) {	4302	if ($REATTACH_ON_RELOAD) {
3866	warn "reattaching attachments to objects/players";	4303	trace "perl_reload: reattaching attachments to objects/players";
3867	_global_reattach; # objects, sockets	4304	_global_reattach; # objects, sockets
3868	warn "reattaching attachments to maps";	4305	trace "perl_reload: reattaching attachments to maps";
3869	reattach $_ for values %MAP;	4306	reattach $_ for values %MAP;
3870	warn "reattaching attachments to players";	4307	trace "perl_reload: reattaching attachments to players";
3871	reattach $_ for values %PLAYER;	4308	reattach $_ for values %PLAYER;
3872	}	4309	}
3873		4310
3874	warn "running post_init jobs";	4311	cf::_post_init 1;
3875	(pop @POST_INIT)->(1) while @POST_INIT;
3876		4312
3877	warn "leaving sync_job";	4313	trace "perl_reload: leaving sync_job";
3878		4314
3879	1	4315	1
3880	} or do {	4316	} or do {
3881	warn $@;	4317	error $@;
3882	cf::cleanup "error while reloading, exiting.";	4318	cf::cleanup "perl_reload: error, exiting.";
3883	};	4319	};
3884		4320
3885	warn "reloaded";
3886	--$RELOAD;	4321	--$RELOAD;
3887	}	4322	}
3888		4323
3889	$t1 = EV::time - $t1;	4324	$t1 = AE::time - $t1;
3890	warn "reload completed in ${t1}s\n";	4325	info "perl_reload: completed in ${t1}s\n";
3891	};	4326	};
3892		4327
3893	our $RELOAD_WATCHER; # used only during reload	4328	our $RELOAD_WATCHER; # used only during reload
3894		4329
3895	sub reload_perl() {	4330	sub reload_perl() {
…		…
3897	# coro crashes during coro_state_free->destroy here.	4332	# coro crashes during coro_state_free->destroy here.
3898		4333
3899	$RELOAD_WATCHER ||= cf::async {	4334	$RELOAD_WATCHER ||= cf::async {
3900	Coro::AIO::aio_wait cache_extensions;	4335	Coro::AIO::aio_wait cache_extensions;
3901		4336
3902	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4337	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3903	do_reload_perl;	4338	do_reload_perl;
3904	undef $RELOAD_WATCHER;	4339	undef $RELOAD_WATCHER;
3905	};	4340	};
3906	};	4341	};
3907	}	4342	}
…		…
3916	reload_perl;	4351	reload_perl;
3917	};	4352	};
3918	}	4353	}
3919	};	4354	};
3920		4355
3921	unshift @INC, $LIBDIR;	4356	#############################################################################
3922		4357
3923	my $bug_warning = 0;	4358	my $bug_warning = 0;
3924		4359
3925	our @WAIT_FOR_TICK;
3926	our @WAIT_FOR_TICK_BEGIN;
3927
3928	sub wait_for_tick {	4360	sub wait_for_tick() {
3929	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3930		4362
3931	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
3932	push @WAIT_FOR_TICK, $signal;
3933	$signal->wait;
3934	}	4364	}
3935		4365
3936	sub wait_for_tick_begin {	4366	sub wait_for_tick_begin() {
3937	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3938		4368
3939	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
3940	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
3941	$signal->wait;	4371	$signal->wait;
3942	}	4372	}
…		…
3946	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4376	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3947	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
3948	return;	4378	return;
3949	}	4379	}
3950		4380
3951	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
3952		4382
3953	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4383	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3954		4384
3955	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3956	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4386	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3957	Coro::async_pool {	4387	Coro::async_pool {
3958	$Coro::current->{desc} = "runtime saver";	4388	$Coro::current->{desc} = "runtime saver";
3959	write_runtime_sync	4389	write_runtime_sync
3960	or warn "ERROR: unable to write runtime file: $!";	4390	or error "ERROR: unable to write runtime file: $!";
3961	};	4391	};
3962	}	4392	}
3963		4393
3964	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3965	$sig->send;	4395	$sig->send;
3966	}	4396	}
3967	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
3968	$sig->send;
3969	}
3970		4398
3971	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
3972	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3973		4401
3974	if (0) {	4402	if (0) {
3975	if ($NEXT_TICK) {	4403	if ($NEXT_TICK) {
3976	my $jitter = $TICK_START - $NEXT_TICK;	4404	my $jitter = $TICK_START - $NEXT_TICK;
3977	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4405	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3978	warn "jitter $JITTER\n";#d#	4406	debug "jitter $JITTER\n";#d#
3979	}	4407	}
3980	}	4408	}
3981	}	4409	}
3982		4410
3983	{	4411	{
3984	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
3985		4414
3986	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
3987	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
3988	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
3989		4418
3990	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
3991	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
3992	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3993	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4422	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4018	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4019	};	4448	};
4020	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4021	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4022	};	4451	};
		4452
		4453	info "database initialised";
4023	}	4454	}
4024		4455
4025	{	4456	{
4026	# configure IO::AIO	4457	# configure IO::AIO
4027		4458
		4459	info "initialising aio";
4028	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4029	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4030	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4031	}	4464	}
4032		4465
4033	my $_log_backtrace;	4466	our $_log_backtrace;
		4467	our $_log_backtrace_last;
4034		4468
4035	sub _log_backtrace {	4469	sub _log_backtrace {
4036	my ($msg, @addr) = @_;	4470	my ($msg, @addr) = @_;
4037		4471
4038	$msg =~ s/\n//;	4472	$msg =~ s/\n$//;
4039		4473
		4474	if ($_log_backtrace_last eq $msg) {
		4475	LOG llevInfo, "[ABT] $msg\n";
		4476	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4040	# limit the # of concurrent backtraces	4477	# limit the # of concurrent backtraces
4041	if ($_log_backtrace < 2) {	4478	} elsif ($_log_backtrace < 2) {
		4479	$_log_backtrace_last = $msg;
4042	++$_log_backtrace;	4480	++$_log_backtrace;
4043	my $perl_bt = Carp::longmess $msg;	4481	my $perl_bt = Carp::longmess $msg;
4044	async {	4482	async {
4045	$Coro::current->{desc} = "abt $msg";	4483	$Coro::current->{desc} = "abt $msg";
4046		4484
…		…
4066	LOG llevInfo, "[ABT] $_\n" for @bt;	4504	LOG llevInfo, "[ABT] $_\n" for @bt;
4067	--$_log_backtrace;	4505	--$_log_backtrace;
4068	};	4506	};
4069	} else {	4507	} else {
4070	LOG llevInfo, "[ABT] $msg\n";	4508	LOG llevInfo, "[ABT] $msg\n";
4071	LOG llevInfo, "[ABT] [suppressed]\n";	4509	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4072	}	4510	}
4073	}	4511	}
4074		4512
4075	# load additional modules	4513	# load additional modules
4076	require "cf/$_.pm" for @EXTRA_MODULES;	4514	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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