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.516 by root, Thu Apr 15 06:05:52 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
112		121
113	our $OUTPUT_RATE_MIN = 4000;	122	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	123	our $OUTPUT_RATE_MAX = 1000000;
		124
		125	our $MAX_LINKS = 32; # how many chained exits to follow
		126	our $VERBOSE_IO = 1;
115		127
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	128	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	129	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	130	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	131	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	133	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	134	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	135	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	136	our $DB_ENV;
125		137
126	our @EXTRA_MODULES = qw(pod match mapscript);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		139
128	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		142
130	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
132	our $NOW;	146	our $NOW;
133		147
134	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		159
146	our @POST_INIT;	160	our @POST_INIT;
147		161
148	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)
149	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;
150		167
151	binmode STDOUT;	168	binmode STDOUT;
152	binmode STDERR;	169	binmode STDERR;
153		170
154	# read virtual server time, if available	171	# read virtual server time, if available
…		…
165		182
166	our $EMERGENCY_POSITION;	183	our $EMERGENCY_POSITION;
167		184
168	sub cf::map::normalise;	185	sub cf::map::normalise;
169		186
		187	sub in_main() {
		188	$Coro::current == $Coro::main
		189	}
		190
170	#############################################################################	191	#############################################################################
171		192
172	%REFLECT = ();	193	%REFLECT = ();
173	for (@REFLECT) {	194	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	195	my $reflect = JSON::XS::decode_json $_;
…		…
184		205
185	=over 4	206	=over 4
186		207
187	=item $cf::UPTIME	208	=item $cf::UPTIME
188		209
189	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.
190		226
191	=item $cf::RUNTIME	227	=item $cf::RUNTIME
192		228
193	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
194	every server tick.	230	every server tick.
195		231
196	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199		235
200	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
201	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
203	database environment.	239	database environment.
204		240
205	=item $cf::NOW
206
207	The time of the last (current) server tick.
208
209	=item $cf::TICK
210
211	The interval between server ticks, in seconds.
212
213	=item $cf::LOADAVG	241	=item $cf::LOADAVG
214		242
215	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
216	(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
217	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
225	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
226	from wherever your confdir points to.	254	from wherever your confdir points to.
227		255
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		257
230	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.
231	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
232	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();
233		279
234	=item @cf::INVOKE_RESULTS	280	=item @cf::INVOKE_RESULTS
235		281
236	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
237	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
…		…
245		291
246	=back	292	=back
247		293
248	=cut	294	=cut
249		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
250	$Coro::State::WARNHOOK = sub {	302	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	303	my $msg = join "", @_;
252		304
253	$msg .= "\n"	305	$msg .= "\n"
254	unless $msg =~ /\n$/;	306	unless $msg =~ /\n$/;
255		307
256	$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;
257		309
258	LOG llevError, $msg;	310	LOG llevWarn, $msg;
259	};	311	};
260		312
261	$Coro::State::DIEHOOK = sub {	313	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	314	return unless $^S eq 0; # "eq", not "=="
263		315
264	warn Carp::longmess $_[0];	316	error Carp::longmess $_[0];
265		317
266	if ($Coro::current == $Coro::main) {#d#	318	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	319	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	320	return;#d#
269	}#d#	321	}#d#
270		322
271	# kill coroutine otherwise	323	# kill coroutine otherwise
272	Coro::terminate	324	Coro::terminate
…		…
292	)) {	344	)) {
293	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294	}	346	}
295		347
296	$EV::DIED = sub {	348	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
298	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
299		356
300	#############################################################################	357	#############################################################################
301		358
302	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
303		360
…		…
324	$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;
325	$d	382	$d
326	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
327	}	384	}
328		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
329	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
330		439
331	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
332		441
333	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
339	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
340		449
341	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
343		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
344	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
345		499
346	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,
347	but I<before> the server starts ticking again.	501	but I<before> the server starts ticking again.
348		502
349	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
350	is a reload or not.	504	is a reload or not.
351		505
352	=cut	506	=cut
353		507
354	sub post_init(&) {	508	sub post_init(&) {
355	push @POST_INIT, shift;	509	push @POST_INIT, shift;
356	}	510	}
357		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
358	=item cf::lock_wait $string	529	=item cf::lock_wait $string
359		530
360	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
361		532
362	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
363		534
364	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
365	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,
…		…
413	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
414	}	585	}
415		586
416	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
417		588
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	Allocate $time seconds of blocking CPU time at priority C<$priority>
419	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
420	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.
421		596
422	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
423	used for statistical purposes and should identify the same time-class.	598	used for statistical purposes and should identify the same time-class.
424		599
425	Useful for short background jobs.	600	Useful for short background jobs.
…		…
437	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
438	my $busy;	613	my $busy;
439		614
440	while () {	615	while () {
441	next_job:	616	next_job:
		617
		618	Coro::cede;
442		619
443	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
444		621
445	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
446	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
447	$busy = 0;	624	$busy = 0;
448	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
449	$job->[2]->send;	626	$job->[2]->send;
450	Coro::cede;
451	goto next_job;	627	goto next_job;
452	} else {	628	} else {
453	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
454	}	630	}
455	}	631	}
456		632
457	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
458	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
459	push @cf::WAIT_FOR_TICK, $signal;
460	$signal->wait;
461	} else {	635	} else {
462	$busy = 0;	636	$busy = 0;
463	Coro::schedule;	637	Coro::schedule;
464	}	638	}
465	}	639	}
…		…
491	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
492		666
493	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
494		668
495	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
496	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
497	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
498	acceptable.	672	acceptable.
499		673
500	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
501	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
…		…
505	=cut	679	=cut
506		680
507	sub sync_job(&) {	681	sub sync_job(&) {
508	my ($job) = @_;	682	my ($job) = @_;
509		683
510	if ($Coro::current == $Coro::main) {	684	if (in_main) {
511	my $time = AE::time;	685	my $time = AE::time;
512		686
513	# this is the main coro, too bad, we have to block	687	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	688	# till the operation succeeds, freezing the server :/
515		689
516	LOG llevError, Carp::longmess "sync job";#d#	690	#LOG llevError, Carp::longmess "sync job";#d#
517		691
518	my $freeze_guard = freeze_mainloop;	692	my $freeze_guard = freeze_mainloop;
519		693
520	my $busy = 1;	694	my $busy = 1;
521	my @res;	695	my @res;
522		696
523	(async {	697	(async {
524	$Coro::current->desc ("sync job coro");	698	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	699	@res = eval { $job->() };
526	warn $@ if $@;	700	error $@ if $@;
527	undef $busy;	701	undef $busy;
528	})->prio (Coro::PRIO_MAX);	702	})->prio (Coro::PRIO_MAX);
529		703
530	while ($busy) {	704	while ($busy) {
531	if (Coro::nready) {	705	if (Coro::nready) {
532	Coro::cede_notself;	706	Coro::cede_notself;
533	} else {	707	} else {
534	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
535	}	709	}
536	}	710	}
537		711
538	my $time = AE::time - $time;	712	my $time = AE::time - $time;
539		713
…		…
565	$EXT_CORO{$coro+0} = $coro;	739	$EXT_CORO{$coro+0} = $coro;
566		740
567	$coro	741	$coro
568	}	742	}
569		743
570	=item fork_call { }, $args	744	=item fork_call { }, @args
571		745
572	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
573	process, returning the results. Everything must be serialisable with	747	process, returning the results. Everything must be serialisable with
574	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
575	never block itself or use any form of event handling.	749	never block itself or use any form of event handling.
576		750
577	=cut	751	=cut
578		752
		753	sub post_fork {
		754	reset_signals;
		755	}
		756
579	sub fork_call(&@) {	757	sub fork_call(&@) {
580	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
581		759
582	# we seemingly have to make a local copy of the whole thing,
583	# otherwise perl prematurely frees the stuff :/
584	# TODO: investigate and fix (likely this will be rather laborious)
585
586	my @res = Coro::Util::fork_eval {	760	my @res = Coro::Util::fork_eval {
587	reset_signals;	761	cf::post_fork;
588	&$cb	762	&$cb
589	}, @args;	763	} @args;
590		764
591	wantarray ? @res : $res[-1]	765	wantarray ? @res : $res[-1]
592	}	766	}
593		767
594	sub objinfo {	768	sub objinfo {
…		…
644	within each server.	818	within each server.
645		819
646	=cut	820	=cut
647		821
648	sub db_table($) {	822	sub db_table($) {
		823	cf::error "db_get called from main context"
		824	if $Coro::current == $Coro::main;
		825
649	my ($name) = @_;	826	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	827	my $db = BDB::db_create $DB_ENV;
651		828
652	eval {	829	eval {
653	$db->set_flags (BDB::CHKSUM);	830	$db->set_flags (BDB::CHKSUM);
…		…
663	}	840	}
664		841
665	our $DB;	842	our $DB;
666		843
667	sub db_init {	844	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	845	$DB ||= db_table "db";
670	};
671	}	846	}
672		847
673	sub db_get($$) {	848	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	849	my $key = "$_[0]/$_[1]";
675		850
676	cf::sync_job {	851	cf::error "db_get called from main context"
		852	if $Coro::current == $Coro::main;
		853
677	BDB::db_get $DB, undef, $key, my $data;	854	BDB::db_get $DB, undef, $key, my $data;
678		855
679	$! ? ()	856	$! ? ()
680	: $data	857	: $data
681	}
682	}	858	}
683		859
684	sub db_put($$$) {	860	sub db_put($$$) {
685	BDB::dbreq_pri 4;	861	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	862	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		890
715	my @data;	891	my @data;
716	my $md5;	892	my $md5;
717		893
718	for (0 .. $#$src) {	894	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	896	}
722		897
723	# if processing is expensive, check	898	# if processing is expensive, check
724	# checksum first	899	# checksum first
725	if (1) {	900	if (1) {
…		…
738		913
739	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
740	}	915	}
741	}	916	}
742		917
743	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
744	my $data = $process->(\@data);	919	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
746		921
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		923
749	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	926	db_put cache => "$id/meta", $meta;
752		927
…		…
762		937
763	=cut	938	=cut
764		939
765	sub datalog($@) {	940	sub datalog($@) {
766	my ($type, %kv) = @_;	941	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	942	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	943	}
769		944
770	=back	945	=back
771		946
772	=cut	947	=cut
…		…
967		1142
968	} elsif (exists $cb_id{$type}) {	1143	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1144	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1145
971	} elsif (ref $type) {	1146	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1147	error "attaching objects not supported, ignoring.\n";
973		1148
974	} else {	1149	} else {
975	shift @arg;	1150	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1151	error "attach argument '$type' not supported, ignoring.\n";
977	}	1152	}
978	}	1153	}
979	}	1154	}
980		1155
981	sub _object_attach {	1156	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
992	}	1167	}
993		1168
994	$obj->{$name} = \%arg;	1169	$obj->{$name} = \%arg;
995	} else {	1170	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1171	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1172	}
998		1173
999	$obj->{_attachment}{$name} = undef;	1174	$obj->{_attachment}{$name} = undef;
1000	}	1175	}
1001		1176
…		…
1060		1235
1061	for (@$callbacks) {	1236	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1237	eval { &{$_->[1]} };
1063		1238
1064	if ($@) {	1239	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1240	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1241	override;
1068	}	1242	}
1069		1243
1070	return 1 if $override;	1244	return 1 if $override;
1071	}	1245	}
…		…
1150	for (@$attach) {	1324	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1325	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1326	_attach $registry, $klass, @attach;
1153	}	1327	}
1154	} else {	1328	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1329	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1330	}
1157	}	1331	}
1158	}	1332	}
1159		1333
1160	cf::attachable->attach (	1334	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1361	my ($filename, $rdata, $objs) = @_;
1188		1362
1189	sync_job {	1363	sync_job {
1190	if (length $$rdata) {	1364	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1365	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1366	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1367	$decname, length $$rdata, scalar @$objs
		1368	if $VERBOSE_IO;
1194		1369
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1370	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1371	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1372	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1373	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1395	aio_rename "$filename~", $filename;
1221		1396
1222	$filename =~ s%/[^/]+$%%;	1397	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1398	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1399	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1400	error "unable to save objects: $filename~: $!\n";
1226	}	1401	}
1227	} else {	1402	} else {
1228	aio_unlink $filename;	1403	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1404	aio_unlink "$filename.pst";
1230	}	1405	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1429	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1430	$av = $st->{objs};
1256	}	1431	}
1257		1432
1258	utf8::decode (my $decname = $filename);	1433	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1434	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1435	$decname, length $data, scalar @{$av || []}
		1436	if $VERBOSE_IO;
1261		1437
1262	($data, $av)	1438	($data, $av)
1263	}	1439	}
1264		1440
1265	=head2 COMMAND CALLBACKS	1441	=head2 COMMAND CALLBACKS
…		…
1269	=cut	1445	=cut
1270		1446
1271	#############################################################################	1447	#############################################################################
1272	# command handling &c	1448	# command handling &c
1273		1449
1274	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1275		1451
1276	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
1277	$name.	1453	$name.
1278		1454
1279	=cut	1455	=cut
…		…
1285	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1286		1462
1287	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1288	}	1464	}
1289		1465
1290	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1291		1467
1292	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1293	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
1294	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
1295	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
1296	has logged in successfully.	1472	has logged in successfully.
1297		1473
1298	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1299	called.
1300		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
1301	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1302		1482
1303	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1304	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
1305	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
1306	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
1307	log-in.	1487	log-in.
1308		1488
1309	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1310	called.
1311		1490
1312	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1313		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
1314	sub register_extcmd {	1498	sub register_extcmd($$) {
1315	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1316		1500
1317	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1318	}	1502	}
1319		1503
1320	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1321	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1322		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1323	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1324	}	1520	}
1325		1521
1326	use File::Glob ();	1522	use File::Glob ();
1327		1523
1328	cf::player->attach (	1524	cf::player->attach (
…		…
1342	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1343		1539
1344	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345		1541
1346	if (ref $msg) {	1542	if (ref $msg) {
1347	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348	"ARRAY" eq ref $msg
1349	? @$msg
1350	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351		1544
1352	my @reply;
1353
1354	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}) {
1355	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1356	}	1563	}
1357		1564
1358	$pl->ext_reply ($reply, @reply)
1359	if $reply;
1360
1361	} else {	1565	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1567	}
1364		1568
1365	cf::override;	1569	cf::override;
1366	},	1570	},
1367	);	1571	);
…		…
1377	};	1581	};
1378		1582
1379	$grp	1583	$grp
1380	}	1584	}
1381		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
1382	sub load_extensions {	1597	sub load_extensions {
		1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
		1601
1383	cf::sync_job {	1602	cf::sync_job {
1384	my %todo;	1603	my %todo;
1385		1604
1386	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1606	next unless -r $path;
…		…
1405		1624
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1625	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1626	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1627
1409	$ext{source} =	1628	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1629	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1630	. "#line 1 \"$path\"\n{\n"
1412	. $source	1631	. $source
1413	. "\n};\n1";	1632	. "\n};\n1";
1414		1633
1415	$todo{$base} = \%ext;	1634	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1646	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1647	next ext
1429	unless exists $done{$_};	1648	unless exists $done{$_};
1430	}	1649	}
1431		1650
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		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
1434	my $active = eval $v->{source};	1662	my $active = eval $source;
1435		1663
1436	if (length $@) {	1664	if (length $@) {
1437	warn "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1438		1666
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	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};
1441	} else {	1672	} else {
1442	$done{$k} = delete $todo{$k};	1673	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1674	push @EXTS, $v->{pkg};
1444	$progress = 1;	1675	$progress = 1;
1445		1676
1446	warn "$v->{base}: extension inactive.\n"	1677	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1678	unless $active;
1448	}	1679	}
1449	}	1680	}
1450		1681
1451	unless ($progress) {	1682	unless ($progress) {
…		…
1453		1684
1454	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1457	}	1688	}
		1689
		1690	last;
1458	}	1691	}
1459	}	1692	}
1460	};	1693	};
1461	}	1694	}
1462		1695
…		…
1620	my $name = $pl->ob->name;	1853	my $name = $pl->ob->name;
1621		1854
1622	$pl->{deny_save} = 1;	1855	$pl->{deny_save} = 1;
1623	$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
1624		1857
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1858	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1859	$pl->deactivate;
		1860
1627	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;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1862	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1863	ext::highscore::check ($pl->ob);
		1864
1630	$pl->ns->destroy if $pl->ns;	1865	$pl->ns->destroy if $pl->ns;
1631		1866
1632	my $path = playerdir $pl;	1867	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1868	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1869	aio_rename $path, $temp;
…		…
1688	\@logins	1923	\@logins
1689	}	1924	}
1690		1925
1691	=item $player->maps	1926	=item $player->maps
1692		1927
		1928	=item cf::player::maps $login
		1929
1693	Returns an arrayref of map paths that are private for this	1930	Returns an arrayref of map paths that are private for this
1694	player. May block.	1931	player. May block.
1695		1932
1696	=cut	1933	=cut
1697		1934
…		…
1718		1955
1719	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1720		1957
1721	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1722		1959
1723	=item $player->ext_reply ($msgid, @msg)
1724
1725	Sends an ext reply to the player.
1726
1727	=cut
1728
1729	sub ext_reply($$@) {
1730	my ($self, $id, @msg) = @_;
1731
1732	$self->ns->ext_reply ($id, @msg)
1733	}
1734
1735	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1736		1961
1737	Sends an ext event to the client.	1962	Sends an ext event to the client.
1738		1963
1739	=cut	1964	=cut
…		…
1758		1983
1759	=cut	1984	=cut
1760		1985
1761	sub find_by_path($) {	1986	sub find_by_path($) {
1762	my ($path) = @_;	1987	my ($path) = @_;
		1988
		1989	$path =~ s/^~[^\/]*//; # skip ~login
1763		1990
1764	my ($match, $specificity);	1991	my ($match, $specificity);
1765		1992
1766	for my $region (list) {	1993	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1994	if ($region->{match} && $path =~ $region->{match}) {
…		…
1796	sub generate_random_map {	2023	sub generate_random_map {
1797	my ($self, $rmp) = @_;	2024	my ($self, $rmp) = @_;
1798		2025
1799	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
1800		2027
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	2028	$self->_create_random_map ($rmp);
1803	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806	$rmp->{exit_on_final_map},
1807	$rmp->{xsize}, $rmp->{ysize},
1808	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813	(cf::region::find $rmp->{region}), $rmp->{custom}
1814	)
1815	}	2029	}
1816		2030
1817	=item cf::map->register ($regex, $prio)	2031	=item cf::map->register ($regex, $prio)
1818		2032
1819	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
…		…
1824		2038
1825	sub register {	2039	sub register {
1826	my (undef, $regex, $prio) = @_;	2040	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	2041	my $pkg = caller;
1828		2042
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	2043	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		2044
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2045	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	2046	}
1834		2047
1835	# also paths starting with '/'	2048	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2049	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		2050
1838	sub thawer_merge {	2051	sub thawer_merge {
1839	my ($self, $merge) = @_;	2052	my ($self, $merge) = @_;
1840		2053
1841	# we have to keep some variables in memory intact	2054	# we have to keep some variables in memory intact
…		…
1846	}	2059	}
1847		2060
1848	sub normalise {	2061	sub normalise {
1849	my ($path, $base) = @_;	2062	my ($path, $base) = @_;
1850		2063
1851	$path = "$path"; # make sure its a string	2064	$path = "$path"; # make sure it's a string
1852		2065
1853	$path =~ s/\.map$//;	2066	$path =~ s/\.map$//;
1854		2067
1855	# map plan:	2068	# map plan:
1856	#	2069	#
…		…
1871	$base =~ s{[^/]+/?$}{};	2084	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	2085	$path = "$base/$path";
1873	}	2086	}
1874		2087
1875	for ($path) {	2088	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	2089	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	2090	redo if s{/[^/]+/\.\./}{/};
1879	}	2091	}
1880		2092
1881	$path	2093	$path
…		…
1895	$self->init; # pass $1 etc.	2107	$self->init; # pass $1 etc.
1896	return $self;	2108	return $self;
1897	}	2109	}
1898	}	2110	}
1899		2111
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2113	()
1902	}	2114	}
1903		2115
		2116	# may re-bless or do other evil things
1904	sub init {	2117	sub init {
1905	my ($self) = @_;	2118	my ($self) = @_;
1906		2119
1907	$self	2120	$self
1908	}	2121	}
…		…
1973	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
1974		2187
1975	1	2188	1
1976	}	2189	}
1977		2190
		2191	# used to laod the header of an original map
1978	sub load_header_orig {	2192	sub load_header_orig {
1979	my ($self) = @_;	2193	my ($self) = @_;
1980		2194
1981	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
1982	}	2196	}
1983		2197
		2198	# used to laod the header of an instantiated map
1984	sub load_header_temp {	2199	sub load_header_temp {
1985	my ($self) = @_;	2200	my ($self) = @_;
1986		2201
1987	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
1988	}	2203	}
1989		2204
		2205	# called after loading the header from an instantiated map
1990	sub prepare_temp {	2206	sub prepare_temp {
1991	my ($self) = @_;	2207	my ($self) = @_;
1992		2208
1993	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
1994	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
1995	# safety	2211	# safety
1996	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
1997	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
1998	}	2214	}
1999		2215
		2216	# called after loading the header from an original map
2000	sub prepare_orig {	2217	sub prepare_orig {
2001	my ($self) = @_;	2218	my ($self) = @_;
2002		2219
2003	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
2004	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2028		2245
2029	sub find;	2246	sub find;
2030	sub find {	2247	sub find {
2031	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2032		2249
		2250	cf::cede_to_tick;
		2251
2033	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2034		2253
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2256
2038	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2069		2288
2070	{	2289	{
2071	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2072		2291
2073	return unless $self->valid;	2292	return unless $self->valid;
2074	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2075
2076	$self->in_memory (cf::MAP_LOADING);
2077		2294
2078	$self->alloc;	2295	$self->alloc;
2079		2296
2080	$self->pre_load;	2297	$self->pre_load;
2081	cf::cede_to_tick;	2298	cf::cede_to_tick;
2082		2299
		2300	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2302	$f->skip_block;
2085	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2086	or return;	2304	or return;
2087		2305
2088	$self->post_load_original	2306	$self->post_load_original
2089	if delete $self->{load_original};	2307	if delete $self->{load_original};
2090		2308
2091	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2310	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2313	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2098	}	2317	}
2099	}	2318	}
2100	}
2101		2319
2102	$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);
2103		2327
2104	cf::cede_to_tick;	2328	cf::cede_to_tick;
2105	# now do the right thing for maps	2329	# now do the right thing for maps
2106	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2111	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2336	$self->decay_objects;
2113	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2114	$self->update_buttons;	2338	$self->update_buttons;
2115	cf::cede_to_tick;	2339	cf::cede_to_tick;
2116	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2117	}	2341	}
2118		2342
2119	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2121
2122	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2345	}
2124		2346
2125	$self->post_load;	2347	$self->post_load;
		2348
		2349	1
2126	}	2350	}
2127		2351
2128	# customize the map for a given player, i.e.	2352	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2353	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2354	# maps to change the path to ~playername/mappath
…		…
2138	# if $self->per_party;	2362	# if $self->per_party;
2139		2363
2140	$self	2364	$self
2141	}	2365	}
2142		2366
2143	# find and load all maps in the 3x3 area around a map
2144	sub load_neighbours {
2145	my ($map) = @_;
2146
2147	my @neigh; # diagonal neighbours
2148
2149	for (0 .. 3) {
2150	my $neigh = $map->tile_path ($_)
2151	or next;
2152	$neigh = find $neigh, $map
2153	or next;
2154	$neigh->load;
2155
2156	push @neigh,
2157	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2158	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2159	}
2160
2161	for (grep defined $_->[0], @neigh) {
2162	my ($path, $origin) = @$_;
2163	my $neigh = find $path, $origin
2164	or next;
2165	$neigh->load;
2166	}
2167	}
2168
2169	sub find_sync {	2367	sub find_sync {
2170	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2171		2369
2172	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
2173	}	2375	}
2174		2376
2175	sub do_load_sync {	2377	sub do_load_sync {
2176	my ($map) = @_;	2378	my ($map) = @_;
2177		2379
		2380	# it's a bug to call this from the main context
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2180		2383
2181	cf::sync_job { $map->load };	2384	$map->load;
2182	}	2385	}
2183		2386
2184	our %MAP_PREFETCH;	2387	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2186		2389
2187	sub find_async {	2390	sub find_async {
2188	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2189		2392
2190	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2191		2394
2192	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2194	}	2397	}
2195		2398
2196	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2197		2400
2198	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2199	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2200		2403
2201	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2202	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2203	if (my $map = find $k) {	2406	if (my $map = find $k) {
2204	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2205	}	2408	}
2206		2409
2207	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2208	}	2411	}
2209	}	2412	}
…		…
2212	$MAP_PREFETCHER->prio (6);	2415	$MAP_PREFETCHER->prio (6);
2213		2416
2214	()	2417	()
2215	}	2418	}
2216		2419
		2420	# common code, used by both ->save and ->swapout
2217	sub save {	2421	sub _save {
2218	my ($self) = @_;	2422	my ($self) = @_;
2219
2220	my $lock = cf::lock_acquire "map_data:$self->{path}";
2221		2423
2222	$self->{last_save} = $cf::RUNTIME;	2424	$self->{last_save} = $cf::RUNTIME;
2223		2425
2224	return unless $self->dirty;	2426	return unless $self->dirty;
2225		2427
…		…
2245	} else {	2447	} else {
2246	$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);
2247	}	2449	}
2248	}	2450	}
2249		2451
		2452	sub save {
		2453	my ($self) = @_;
		2454
		2455	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2456
		2457	$self->_save;
		2458	}
		2459
2250	sub swap_out {	2460	sub swap_out {
2251	my ($self) = @_;	2461	my ($self) = @_;
2252		2462
2253	# save first because save cedes
2254	$self->save;
2255
2256	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2257		2464
		2465	return if !$self->linkable;
		2466	return if $self->{deny_save};
2258	return if $self->players;	2467	return if $self->players;
2259	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
2260	return if $self->{deny_save};	2485	return 1e99 if $self->{deny_reset};
2261		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
2262	$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};
2263		2519
2264	$self->deactivate;	2520	$self->deactivate;
2265	$_->clear_links_to ($self) for values %cf::MAP;	2521	$_->clear_links_to ($self) for values %cf::MAP;
2266	$self->clear;	2522	$self->clear;
2267	}
2268
2269	sub reset_at {
2270	my ($self) = @_;
2271
2272	# TODO: safety, remove and allow resettable per-player maps
2273	return 1e99 if $self->{deny_reset};
2274
2275	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2276	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2277
2278	$time + $to
2279	}
2280
2281	sub should_reset {
2282	my ($self) = @_;
2283
2284	$self->reset_at <= $cf::RUNTIME
2285	}
2286
2287	sub reset {
2288	my ($self) = @_;
2289
2290	my $lock = cf::lock_acquire "map_data:$self->{path}";
2291
2292	return if $self->players;
2293
2294	warn "resetting map ", $self->path, "\n";
2295
2296	$self->in_memory (cf::MAP_SWAPPED);
2297
2298	# need to save uniques path
2299	unless ($self->{deny_save}) {
2300	my $uniq = $self->uniq_path; utf8::encode $uniq;
2301
2302	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2303	if $uniq;
2304	}
2305
2306	delete $cf::MAP{$self->path};
2307
2308	$self->deactivate;
2309	$_->clear_links_to ($self) for values %cf::MAP;
2310	$self->clear;
2311		2523
2312	$self->unlink_save;	2524	$self->unlink_save;
2313	$self->destroy;	2525	$self->destroy;
2314	}	2526	}
2315		2527
…		…
2323		2535
2324	delete $cf::MAP{$self->path};	2536	delete $cf::MAP{$self->path};
2325		2537
2326	$self->unlink_save;	2538	$self->unlink_save;
2327		2539
2328	bless $self, "cf::map";	2540	bless $self, "cf::map::wrap";
2329	delete $self->{deny_reset};	2541	delete $self->{deny_reset};
2330	$self->{deny_save} = 1;	2542	$self->{deny_save} = 1;
2331	$self->reset_timeout (1);	2543	$self->reset_timeout (1);
2332	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2544	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2333		2545
…		…
2454		2666
2455	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.
2456		2668
2457	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2458		2670
2459	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,
2460	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2461		2673
2462	=cut	2674	=cut
2463		2675
2464	sub deref {	2676	sub deref {
…		…
2546	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2547		2759
2548	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2549	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2550		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
2551	=cut	2788	=cut
2552		2789
2553	sub cf::object::player::may {	2790	sub cf::object::player::may {
2554	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2555		2792
2556	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2557	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2558	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2559	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2560	}	2797	}
2561		2798
2562	=item $player_object->enter_link	2799	=item $player_object->enter_link
2563		2800
2564	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}>).
2565		2802
2566	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.
2567	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,
2568	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
2569	map.	2806	map.
2570		2807
2571	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.
2572		2815
2573	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2574		2817
2575	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
2576	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
…		…
2594	sub cf::object::player::enter_link {	2837	sub cf::object::player::enter_link {
2595	my ($self) = @_;	2838	my ($self) = @_;
2596		2839
2597	$self->deactivate_recursive;	2840	$self->deactivate_recursive;
2598		2841
		2842	++$self->{_link_recursion};
		2843
2599	return if UNIVERSAL::isa $self->map, "ext::map_link";	2844	return if UNIVERSAL::isa $self->map, "ext::map_link";
2600		2845
2601	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2846	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2602	if $self->map && $self->map->{path} ne "{link}";	2847	if $self->map && $self->map->{path} ne "{link}";
2603		2848
2604	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2849	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2605	}	2850	}
2606		2851
2607	sub cf::object::player::leave_link {	2852	sub cf::object::player::leave_link {
2608	my ($self, $map, $x, $y) = @_;	2853	my ($self, $map, $x, $y) = @_;
2609		2854
…		…
2629	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2630	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2631	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2632		2877
2633	$map->load;	2878	$map->load;
2634	$map->load_neighbours;
2635		2879
2636	return unless $self->contr->active;	2880	return unless $self->contr->active;
2637		2881
2638	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2639	$self->enter_map ($map, $x, $y);	2883	if ($self->enter_map ($map, $x, $y)) {
2640		2884	# entering was successful
		2885	delete $self->{_link_recursion};
2641	# only activate afterwards, to support waiting in hooks	2886	# only activate afterwards, to support waiting in hooks
2642	$self->activate_recursive;	2887	$self->activate_recursive;
2643	}	2888	}
2644		2889
		2890	}
		2891
2645	=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)]])
2646		2893
2647	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
2648	her, loading and preparing them map, calling the provided $check callback	2895	her, loading and preparing them map, calling the provided $check callback
2649	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
2650	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
…		…
2657		2904
2658	our $GOTOGEN;	2905	our $GOTOGEN;
2659		2906
2660	sub cf::object::player::goto {	2907	sub cf::object::player::goto {
2661	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	}
2662		2915
2663	# 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
2664	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2917	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2665		2918
2666	$self->enter_link;	2919	$self->enter_link;
…		…
2686	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2687	}	2940	}
2688	}	2941	}
2689		2942
2690	my $map = eval {	2943	my $map = eval {
2691	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2692		2945
2693	if ($map) {	2946	if ($map) {
2694	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2695	$map = $check->($map) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2696	} else {	2949	} else {
2697	$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);
2698	}	2951	}
2699		2952
2700	$map	2953	$map
…		…
2708	if ($gen == $self->{_goto_generation}) {	2961	if ($gen == $self->{_goto_generation}) {
2709	delete $self->{_goto_generation};	2962	delete $self->{_goto_generation};
2710	$self->leave_link ($map, $x, $y);	2963	$self->leave_link ($map, $x, $y);
2711	}	2964	}
2712		2965
2713	$done->() if $done;	2966	$done->($self) if $done;
2714	})->prio (1);	2967	})->prio (1);
2715	}	2968	}
2716		2969
2717	=item $player_object->enter_exit ($exit_object)	2970	=item $player_object->enter_exit ($exit_object)
2718		2971
…		…
2786	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2787		3040
2788	unless (eval {	3041	unless (eval {
2789	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2790		3043
2791	# random map handling
2792	{
2793	my $guard = cf::lock_acquire "exit_prepare:$exit";
2794
2795	prepare_random_map $exit
2796	if $exit->slaying eq "/!";
2797	}
2798
2799	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2800	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2801	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	}
2802		3070
2803	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2804		3072
2805	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2806	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2811	$self->message ("Something went wrong deep within the deliantra server. "	3079	$self->message ("Something went wrong deep within the deliantra server. "
2812	. "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. "
2813	. "Please report this to the dungeon master!",	3081	. "Please report this to the dungeon master!",
2814	cf::NDI_UNIQUE | cf::NDI_RED);	3082	cf::NDI_UNIQUE | cf::NDI_RED);
2815		3083
2816	warn "ERROR in enter_exit: $@";	3084	error "ERROR in enter_exit: $@";
2817	$self->leave_link;	3085	$self->leave_link;
2818	}	3086	}
2819	})->prio (1);	3087	})->prio (1);
2820	}	3088	}
2821		3089
2822	=head3 cf::client	3090	=head3 cf::client
2823		3091
2824	=over 4	3092	=over 4
2825
2826	=item $client->send_drawinfo ($text, $flags)
2827
2828	Sends a drawinfo packet to the client. Circumvents output buffering so
2829	should not be used under normal circumstances.
2830
2831	=cut
2832
2833	sub cf::client::send_drawinfo {
2834	my ($self, $text, $flags) = @_;
2835
2836	utf8::encode $text;
2837	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2838	}
2839		3093
2840	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2841		3095
2842	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
2843	them as required.	3097	them as required.
…		…
2862	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2863	}	3117	}
2864		3118
2865	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2866		3120
2867	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
2868	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
2869	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
2870	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2871		3125
2872	=cut	3126	=cut
2873		3127
2874	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2917	},	3171	},
2918	"c/body" => {	3172	"c/body" => {
2919	id => "infobox",	3173	id => "infobox",
2920	title => "Body Parts",	3174	title => "Body Parts",
2921	reply => undef,	3175	reply => undef,
2922	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
2923	},	3177	},
2924	"c/statistics" => {	3178	"c/statistics" => {
2925	id => "infobox",	3179	id => "infobox",
2926	title => "Statistics",	3180	title => "Statistics",
2927	reply => undef,	3181	reply => undef,
…		…
2979	id => "death",	3233	id => "death",
2980	title => "Death",	3234	title => "Death",
2981	reply => undef,	3235	reply => undef,
2982	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
2983	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
2984	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
2985	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
2986	);	3246	);
2987		3247
2988	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3031	=cut	3291	=cut
3032		3292
3033	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3034	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3035		3295
3036	if ($self->extcmd == 2) {
3037	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3038	} elsif ($self->extcmd == 1) { # TODO: remove
3039	push @msg, msgtype => "event_$type";
3040	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3041	}
3042	}
3043
3044	=item $client->ext_reply ($msgid, @msg)
3045
3046	Sends an ext reply to the client.
3047
3048	=cut
3049
3050	sub cf::client::ext_reply($$@) {
3051	my ($self, $id, @msg) = @_;
3052
3053	if ($self->extcmd == 2) {
3054	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3055	} elsif ($self->extcmd == 1) {
3056	#TODO: version 1, remove
3057	unshift @msg, msgtype => "reply", msgid => $id;
3058	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3059	}
3060	}	3297	}
3061		3298
3062	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3063		3300
3064	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3084		3321
3085	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3086	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3087		3324
3088	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;
3089	}	3365	}
3090		3366
3091	cf::client->attach (	3367	cf::client->attach (
3092	on_connect => sub {	3368	on_connect => sub {
3093	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3119	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3120		3396
3121	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3122		3398
3123	if (ref $msg) {	3399	if (ref $msg) {
3124	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3125	"ARRAY" eq ref $msg
3126	? @$msg
3127	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3128		3401
3129	my @reply;
3130
3131	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}) {
3132	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3133	}	3420	}
3134
3135	$ns->ext_reply ($reply, @reply)
3136	if $reply;
3137
3138	} else {	3421	} else {
3139	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";
3140	}	3423	}
3141		3424
3142	cf::override;	3425	cf::override;
3143	},	3426	},
3144	);	3427	);
…		…
3225	decrease split destroy change_exp value msg lore send_msg)],	3508	decrease split destroy change_exp value msg lore send_msg)],
3226	["cf::object::player" => qw(player)],	3509	["cf::object::player" => qw(player)],
3227	["cf::player" => qw(peaceful send_msg)],	3510	["cf::player" => qw(peaceful send_msg)],
3228	["cf::map" => qw(trigger)],	3511	["cf::map" => qw(trigger)],
3229	) {	3512	) {
3230	no strict 'refs';
3231	my ($pkg, @funs) = @$_;	3513	my ($pkg, @funs) = @$_;
3232	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3514	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3233	for @funs;	3515	for @funs;
3234	}	3516	}
3235		3517
…		…
3274	local @cf::_safe_eval_args = values %vars;	3556	local @cf::_safe_eval_args = values %vars;
3275	@res = wantarray ? eval eval : scalar eval $eval;	3557	@res = wantarray ? eval eval : scalar eval $eval;
3276	}	3558	}
3277		3559
3278	if ($@) {	3560	if ($@) {
3279	warn "$@";	3561	warn "$@",
3280	warn "while executing safe code '$code'\n";	3562	"while executing safe code '$code'\n",
3281	warn "with arguments " . (join " ", %vars) . "\n";	3563	"with arguments " . (join " ", %vars) . "\n";
3282	}	3564	}
3283		3565
3284	wantarray ? @res : $res[0]	3566	wantarray ? @res : $res[0]
3285	}	3567	}
3286		3568
…		…
3311	=cut	3593	=cut
3312		3594
3313	#############################################################################	3595	#############################################################################
3314	# the server's init and main functions	3596	# the server's init and main functions
3315		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
3316	sub load_facedata($) {	3675	sub load_facedata($) {
3317	my ($path) = @_;	3676	my ($path) = @_;
3318		3677
3319	# HACK to clear player env face cache, we need some signal framework
3320	# for this (global event?)
3321	%ext::player_env::MUSIC_FACE_CACHE = ();
3322
3323	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3324		3679
3325	warn "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3326		3681
3327	my $facedata;	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3328	0 < aio_load $path, $facedata
3329	or die "$path: $!";
3330
3331	$facedata = Coro::Storable::thaw $facedata;
3332		3683
3333	$facedata->{version} == 2	3684	$facedata->{version} == 2
3334	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3335		3686
3336	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3337	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3338	$facedata->{resource}{"res/exp_table"} = {	3689
3339	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3340	data => $exp_table,	3691
3341	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3342	};	3693	# from here on, everything must be atomic - no thread switch allowed
3343	cf::cede_to_tick;	3694	my $t1 = EV::time;
3344		3695
3345	{	3696	{
3346	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3347		3698
3348	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3349	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3350		3702
3351	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3352	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3353	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};
3354	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};
3355		3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3356	cf::cede_to_tick;	3708	$cf::face::HASH{$info->{hash64}} = $idx;
		3709	delete $cf::face::META[$idx];
3357	}	3710	}
3358		3711
3359	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3360	next unless $info->{smooth};	3713	next unless $info->{smooth};
3361		3714
…		…
3364		3717
3365	if (my $smooth = cf::face::find $info->{smooth}) {	3718	if (my $smooth = cf::face::find $info->{smooth}) {
3366	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3367	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3368	} else {	3721	} else {
3369	warn "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3370	}	3723	}
3371
3372	cf::cede_to_tick;
3373	}	3724	}
3374	}	3725	}
3375		3726
3376	{	3727	{
3377	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3378		3729
3379	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3380	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3381	cf::cede_to_tick;
3382	}	3732	}
3383		3733
3384	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3385	}	3735	}
3386		3736
3387	{	3737	{
3388	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3389		3739
3390	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3391	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
3392	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3393		3744
3394	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3395	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;
3396	} else {	3751	} else {
3397	$RESOURCE{$name} = $info;	3752	# $RESOURCE{$name} = $info; # unused
3398	}	3753	}
3399
3400	cf::cede_to_tick;
3401	}	3754	}
3402	}	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;
3403		3766
3404	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3767	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3405		3768
		3769	aio_close $fh if $fh; # close old facedata
		3770
3406	1	3771	1
3407	}	3772	}
3408
3409	cf::global->attach (on_resource_update => sub {
3410	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3411	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3412
3413	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3414	my $sound = $soundconf->{compat}[$_]
3415	or next;
3416
3417	my $face = cf::face::find "sound/$sound->[1]";
3418	cf::sound::set $sound->[0] => $face;
3419	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3420	}
3421
3422	while (my ($k, $v) = each %{$soundconf->{event}}) {
3423	my $face = cf::face::find "sound/$v";
3424	cf::sound::set $k => $face;
3425	}
3426	}
3427	});
3428		3773
3429	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
3430	my ($ns, $want) = @_;	3775	my ($ns, $want) = @_;
3431		3776
3432	while (my ($k, $v) = each %$want) {	3777	while (my ($k, $v) = each %$want) {
…		…
3440	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3441	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3442	cf::arch::commit_load;	3787	cf::arch::commit_load;
3443		3788
3444	$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;
3445	}	3804	}
3446		3805
3447	sub reload_regions {	3806	sub reload_regions {
3448	# 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
3449	# for this (global event?)	3808	# for this (global event?)
…		…
3457	if exists $_->{match};	3816	if exists $_->{match};
3458	}	3817	}
3459	}	3818	}
3460		3819
3461	sub reload_facedata {	3820	sub reload_facedata {
3462	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3463	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3464	}	3823	}
3465		3824
3466	sub reload_archetypes {	3825	sub reload_archetypes {
3467	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3468	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;
3469	}	3854	}
3470		3855
3471	sub reload_treasures {	3856	sub reload_treasures {
3472	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3473	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3474	}	3859	}
3475		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
3476	sub reload_resources {	3881	sub reload_resources {
3477	warn "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3478		3883
		3884	reload_materials;
3479	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
		3887	reload_sound;
3480	reload_archetypes;	3888	reload_archetypes;
3481	reload_regions;	3889	reload_regions;
3482	reload_treasures;	3890	reload_treasures;
3483		3891
3484	warn "finished reloading resource files\n";	3892	trace "finished reloading resource files\n";
3485	}	3893	}
3486		3894
3487	sub reload_config {	3895	sub reload_config {
3488	warn "reloading config file...\n";	3896	trace "reloading config file...\n";
3489		3897
3490	open my $fh, "<:utf8", "$CONFDIR/config"	3898	my $config = load_file "$CONFDIR/config";
3491	or return;	3899	utf8::decode $config;
		3900	*CFG = decode_yaml $config;
3492		3901
3493	local $/;
3494	*CFG = YAML::XS::Load scalar <$fh>;
3495
3496	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3497		3903
3498	$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};
3499	$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};
3500		3906
3501	if (exists $CFG{mlockall}) {	3907	if (exists $CFG{mlockall}) {
…		…
3503	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3909	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3504	and die "WARNING: m(un)lockall failed: $!\n";	3910	and die "WARNING: m(un)lockall failed: $!\n";
3505	};	3911	};
3506	warn $@ if $@;	3912	warn $@ if $@;
3507	}	3913	}
3508
3509	warn "finished reloading resource files\n";
3510	}	3914	}
3511		3915
3512	sub pidfile() {	3916	sub pidfile() {
3513	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3917	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3514	or die "$PIDFILE: $!";	3918	or die "$PIDFILE: $!";
…		…
3527	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3528	print $fh $$;	3932	print $fh $$;
3529	}	3933	}
3530		3934
3531	sub main_loop {	3935	sub main_loop {
3532	warn "EV::loop starting\n";	3936	trace "EV::run starting\n";
3533	if (1) {	3937	if (1) {
3534	EV::loop;	3938	EV::run;
3535	}	3939	}
3536	warn "EV::loop returned\n";	3940	trace "EV::run returned\n";
3537	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3538	}	3942	}
3539		3943
3540	sub main {	3944	sub main {
3541	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3542		3946
3543	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.";
3544	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.";
3545	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3546	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3547		3952
3548	$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
3549		3954
3550	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3551	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3552	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#
3553	(async {	3958	(async {
3554	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3555	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3556	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3557	};	3962	};
3558		3963
3559	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3560		3965
3561	cf::sync_job {	3966	cf::sync_job {
3562	cf::init_experience;	3967	cf::incloader::init ();
		3968
		3969	db_init;
		3970
3563	cf::init_anim;	3971	cf::init_anim;
3564	cf::init_attackmess;	3972	cf::init_attackmess;
3565	cf::init_dynamic;	3973	cf::init_dynamic;
3566		3974
3567	cf::load_settings;	3975	cf::load_settings;
3568	cf::load_materials;
3569		3976
3570	reload_resources;	3977	reload_resources;
3571	reload_config;	3978	reload_config;
3572	db_init;
3573		3979
3574	cf::init_uuid;	3980	cf::init_uuid;
3575	cf::init_signals;	3981	cf::init_signals;
3576	cf::init_skills;	3982	cf::init_skills;
3577		3983
…		…
3585		3991
3586	# no (long-running) fork's whatsoever before this point(!)	3992	# no (long-running) fork's whatsoever before this point(!)
3587	use POSIX ();	3993	use POSIX ();
3588	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};
3589		3995
3590	(pop @POST_INIT)->(0) while @POST_INIT;	3996	cf::_post_init 0;
3591	};	3997	};
3592		3998
3593	cf::object::thawer::errors_are_fatal 0;	3999	cf::object::thawer::errors_are_fatal 0;
		4000	info "parse errors in files are no longer fatal from this point on.\n";
3594		4001
		4002	AE::postpone {
		4003	undef &main; # free gobs of memory :)
		4004	};
		4005
3595	main_loop;	4006	goto &main_loop;
3596	}	4007	}
3597		4008
3598	#############################################################################	4009	#############################################################################
3599	# initialisation and cleanup	4010	# initialisation and cleanup
3600		4011
…		…
3639	or return;	4050	or return;
3640		4051
3641	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4052	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3642	and return;	4053	and return;
3643		4054
3644	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4055	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3645		4056
3646	1	4057	1
3647	}	4058	}
3648		4059
3649	our $uuid_lock;	4060	our $uuid_lock;
…		…
3661	or return;	4072	or return;
3662		4073
3663	my $value = uuid_seq uuid_cur;	4074	my $value = uuid_seq uuid_cur;
3664		4075
3665	unless ($value) {	4076	unless ($value) {
3666	warn "cowardly refusing to write zero uuid value!\n";	4077	info "cowardly refusing to write zero uuid value!\n";
3667	return;	4078	return;
3668	}	4079	}
3669		4080
3670	my $value = uuid_str $value + $uuid_skip;	4081	my $value = uuid_str $value + $uuid_skip;
3671	$uuid_skip = 0;	4082	$uuid_skip = 0;
…		…
3681	or return;	4092	or return;
3682		4093
3683	aio_rename "$uuid~", $uuid	4094	aio_rename "$uuid~", $uuid
3684	and return;	4095	and return;
3685		4096
3686	warn "uuid file written ($value).\n";	4097	trace "uuid file written ($value).\n";
3687		4098
3688	1	4099	1
3689		4100
3690	}	4101	}
3691		4102
…		…
3697	}	4108	}
3698		4109
3699	sub emergency_save() {	4110	sub emergency_save() {
3700	my $freeze_guard = cf::freeze_mainloop;	4111	my $freeze_guard = cf::freeze_mainloop;
3701		4112
3702	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;
3703		4119
3704	cf::sync_job {	4120	cf::sync_job {
3705	# this is a trade-off: we want to be very quick here, so	4121	cf::write_runtime_sync; # external watchdog should not bark
3706	# save all maps without fsync, and later call a global sync
3707	# (which in turn might be very very slow)
3708	local $USE_FSYNC = 0;
3709		4122
3710	# use a peculiar iteration method to avoid tripping on perl	4123	# use a peculiar iteration method to avoid tripping on perl
3711	# refcount bugs in for. also avoids problems with players	4124	# refcount bugs in for. also avoids problems with players
3712	# and maps saved/destroyed asynchronously.	4125	# and maps saved/destroyed asynchronously.
3713	warn "emergency_perl_save: begin player save\n";	4126	info "emergency_perl_save: begin player save\n";
3714	for my $login (keys %cf::PLAYER) {	4127	for my $login (keys %cf::PLAYER) {
3715	my $pl = $cf::PLAYER{$login} or next;	4128	my $pl = $cf::PLAYER{$login} or next;
3716	$pl->valid or next;	4129	$pl->valid or next;
3717	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4130	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3718	$pl->save;	4131	$pl->save;
3719	}	4132	}
3720	warn "emergency_perl_save: end player save\n";	4133	info "emergency_perl_save: end player save\n";
3721		4134
		4135	cf::write_runtime_sync; # external watchdog should not bark
		4136
3722	warn "emergency_perl_save: begin map save\n";	4137	info "emergency_perl_save: begin map save\n";
3723	for my $path (keys %cf::MAP) {	4138	for my $path (keys %cf::MAP) {
3724	my $map = $cf::MAP{$path} or next;	4139	my $map = $cf::MAP{$path} or next;
3725	$map->valid or next;	4140	$map->valid or next;
3726	$map->save;	4141	$map->save;
3727	}	4142	}
3728	warn "emergency_perl_save: end map save\n";	4143	info "emergency_perl_save: end map save\n";
3729		4144
		4145	cf::write_runtime_sync; # external watchdog should not bark
		4146
3730	warn "emergency_perl_save: begin database checkpoint\n";	4147	info "emergency_perl_save: begin database checkpoint\n";
3731	BDB::db_env_txn_checkpoint $DB_ENV;	4148	BDB::db_env_txn_checkpoint $DB_ENV;
3732	warn "emergency_perl_save: end database checkpoint\n";	4149	info "emergency_perl_save: end database checkpoint\n";
3733		4150
3734	warn "emergency_perl_save: begin write uuid\n";	4151	info "emergency_perl_save: begin write uuid\n";
3735	write_uuid_sync 1;	4152	write_uuid_sync 1;
3736	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
3737	};	4173	};
3738		4174
3739	warn "emergency_perl_save: starting sync()\n";
3740	IO::AIO::aio_sync sub {
3741	warn "emergency_perl_save: finished sync()\n";
3742	};
3743
3744	warn "emergency_perl_save: leave\n";	4175	info "emergency_perl_save: leave\n";
3745	}	4176	}
3746		4177
3747	sub post_cleanup {	4178	sub post_cleanup {
3748	my ($make_core) = @_;	4179	my ($make_core) = @_;
3749		4180
		4181	IO::AIO::flush;
		4182
3750	warn Carp::longmess "post_cleanup backtrace"	4183	error Carp::longmess "post_cleanup backtrace"
3751	if $make_core;	4184	if $make_core;
3752		4185
3753	my $fh = pidfile;	4186	my $fh = pidfile;
3754	unlink $PIDFILE if <$fh> == $$;	4187	unlink $PIDFILE if <$fh> == $$;
3755	}	4188	}
…		…
3775	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4208	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3776	for my $name (keys %$leaf_symtab) {	4209	for my $name (keys %$leaf_symtab) {
3777	_gv_clear *{"$pkg$name"};	4210	_gv_clear *{"$pkg$name"};
3778	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4211	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3779	}	4212	}
3780	warn "cleared package $pkg\n";#d#
3781	}	4213	}
3782		4214
3783	sub do_reload_perl() {	4215	sub do_reload_perl() {
3784	# can/must only be called in main	4216	# can/must only be called in main
3785	if ($Coro::current != $Coro::main) {	4217	unless (in_main) {
3786	warn "can only reload from main coroutine";	4218	error "can only reload from main coroutine";
3787	return;	4219	return;
3788	}	4220	}
3789		4221
3790	return if $RELOAD++;	4222	return if $RELOAD++;
3791		4223
3792	my $t1 = AE::time;	4224	my $t1 = AE::time;
3793		4225
3794	while ($RELOAD) {	4226	while ($RELOAD) {
3795	warn "reloading...";	4227	cf::get_slot 0.1, -1, "reload_perl";
		4228	info "perl_reload: reloading...";
3796		4229
3797	warn "entering sync_job";	4230	trace "perl_reload: entering sync_job";
3798		4231
3799	cf::sync_job {	4232	cf::sync_job {
3800	cf::write_runtime_sync; # external watchdog should not bark
3801	cf::emergency_save;	4233	#cf::emergency_save;
3802	cf::write_runtime_sync; # external watchdog should not bark
3803		4234
3804	warn "syncing database to disk";
3805	BDB::db_env_txn_checkpoint $DB_ENV;
3806
3807	# if anything goes wrong in here, we should simply crash as we already saved
3808
3809	warn "flushing outstanding aio requests";
3810	while (IO::AIO::nreqs || BDB::nreqs) {
3811	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3812	}
3813
3814	warn "cancelling all extension coros";	4235	trace "perl_reload: cancelling all extension coros";
3815	$_->cancel for values %EXT_CORO;	4236	$_->cancel for values %EXT_CORO;
3816	%EXT_CORO = ();	4237	%EXT_CORO = ();
3817		4238
3818	warn "removing commands";	4239	trace "perl_reload: removing commands";
3819	%COMMAND = ();	4240	%COMMAND = ();
3820		4241
3821	warn "removing ext/exti commands";	4242	trace "perl_reload: removing ext/exti commands";
3822	%EXTCMD = ();	4243	%EXTCMD = ();
3823	%EXTICMD = ();	4244	%EXTICMD = ();
3824		4245
3825	warn "unloading/nuking all extensions";	4246	trace "perl_reload: unloading/nuking all extensions";
3826	for my $pkg (@EXTS) {	4247	for my $pkg (@EXTS) {
3827	warn "... unloading $pkg";	4248	trace "... unloading $pkg";
3828		4249
3829	if (my $cb = $pkg->can ("unload")) {	4250	if (my $cb = $pkg->can ("unload")) {
3830	eval {	4251	eval {
3831	$cb->($pkg);	4252	$cb->($pkg);
3832	1	4253	1
3833	} or warn "$pkg unloaded, but with errors: $@";	4254	} or error "$pkg unloaded, but with errors: $@";
3834	}	4255	}
3835		4256
3836	warn "... clearing $pkg";	4257	trace "... clearing $pkg";
3837	clear_package $pkg;	4258	clear_package $pkg;
3838	}	4259	}
3839		4260
3840	warn "unloading all perl modules loaded from $LIBDIR";	4261	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3841	while (my ($k, $v) = each %INC) {	4262	while (my ($k, $v) = each %INC) {
3842	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4263	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3843		4264
3844	warn "... unloading $k";	4265	trace "... unloading $k";
3845	delete $INC{$k};	4266	delete $INC{$k};
3846		4267
3847	$k =~ s/\.pm$//;	4268	$k =~ s/\.pm$//;
3848	$k =~ s/\//::/g;	4269	$k =~ s/\//::/g;
3849		4270
…		…
3852	}	4273	}
3853		4274
3854	clear_package $k;	4275	clear_package $k;
3855	}	4276	}
3856		4277
3857	warn "getting rid of safe::, as good as possible";	4278	trace "perl_reload: getting rid of safe::, as good as possible";
3858	clear_package "safe::$_"	4279	clear_package "safe::$_"
3859	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);
3860		4281
3861	warn "unloading cf.pm \"a bit\"";	4282	trace "perl_reload: unloading cf.pm \"a bit\"";
3862	delete $INC{"cf.pm"};	4283	delete $INC{"cf.pm"};
3863	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4284	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3864		4285
3865	# don't, removes xs symbols, too,	4286	# don't, removes xs symbols, too,
3866	# and global variables created in xs	4287	# and global variables created in xs
3867	#clear_package __PACKAGE__;	4288	#clear_package __PACKAGE__;
3868		4289
3869	warn "unload completed, starting to reload now";	4290	info "perl_reload: unload completed, starting to reload now";
3870		4291
3871	warn "reloading cf.pm";	4292	trace "perl_reload: reloading cf.pm";
3872	require cf;	4293	require cf;
3873	cf::_connect_to_perl_1;	4294	cf::_connect_to_perl_1;
3874		4295
3875	warn "loading config and database again";	4296	trace "perl_reload: loading config and database again";
3876	cf::reload_config;	4297	cf::reload_config;
3877		4298
3878	warn "loading extensions";	4299	trace "perl_reload: loading extensions";
3879	cf::load_extensions;	4300	cf::load_extensions;
3880		4301
3881	if ($REATTACH_ON_RELOAD) {	4302	if ($REATTACH_ON_RELOAD) {
3882	warn "reattaching attachments to objects/players";	4303	trace "perl_reload: reattaching attachments to objects/players";
3883	_global_reattach; # objects, sockets	4304	_global_reattach; # objects, sockets
3884	warn "reattaching attachments to maps";	4305	trace "perl_reload: reattaching attachments to maps";
3885	reattach $_ for values %MAP;	4306	reattach $_ for values %MAP;
3886	warn "reattaching attachments to players";	4307	trace "perl_reload: reattaching attachments to players";
3887	reattach $_ for values %PLAYER;	4308	reattach $_ for values %PLAYER;
3888	}	4309	}
3889		4310
3890	warn "running post_init jobs";	4311	cf::_post_init 1;
3891	(pop @POST_INIT)->(1) while @POST_INIT;
3892		4312
3893	warn "leaving sync_job";	4313	trace "perl_reload: leaving sync_job";
3894		4314
3895	1	4315	1
3896	} or do {	4316	} or do {
3897	warn $@;	4317	error $@;
3898	cf::cleanup "error while reloading, exiting.";	4318	cf::cleanup "perl_reload: error, exiting.";
3899	};	4319	};
3900		4320
3901	warn "reloaded";
3902	--$RELOAD;	4321	--$RELOAD;
3903	}	4322	}
3904		4323
3905	$t1 = AE::time - $t1;	4324	$t1 = AE::time - $t1;
3906	warn "reload completed in ${t1}s\n";	4325	info "perl_reload: completed in ${t1}s\n";
3907	};	4326	};
3908		4327
3909	our $RELOAD_WATCHER; # used only during reload	4328	our $RELOAD_WATCHER; # used only during reload
3910		4329
3911	sub reload_perl() {	4330	sub reload_perl() {
…		…
3932	reload_perl;	4351	reload_perl;
3933	};	4352	};
3934	}	4353	}
3935	};	4354	};
3936		4355
3937	unshift @INC, $LIBDIR;	4356	#############################################################################
3938		4357
3939	my $bug_warning = 0;	4358	my $bug_warning = 0;
3940		4359
3941	our @WAIT_FOR_TICK;
3942	our @WAIT_FOR_TICK_BEGIN;
3943
3944	sub wait_for_tick {	4360	sub wait_for_tick() {
3945	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3946		4362
3947	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
3948	push @WAIT_FOR_TICK, $signal;
3949	$signal->wait;
3950	}	4364	}
3951		4365
3952	sub wait_for_tick_begin {	4366	sub wait_for_tick_begin() {
3953	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3954		4368
3955	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
3956	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
3957	$signal->wait;	4371	$signal->wait;
3958	}	4372	}
…		…
3962	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"
3963	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
3964	return;	4378	return;
3965	}	4379	}
3966		4380
3967	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
3968		4382
3969	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4383	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3970		4384
3971	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3972	$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.;
3973	Coro::async_pool {	4387	Coro::async_pool {
3974	$Coro::current->{desc} = "runtime saver";	4388	$Coro::current->{desc} = "runtime saver";
3975	write_runtime_sync	4389	write_runtime_sync
3976	or warn "ERROR: unable to write runtime file: $!";	4390	or error "ERROR: unable to write runtime file: $!";
3977	};	4391	};
3978	}	4392	}
3979		4393
3980	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3981	$sig->send;	4395	$sig->send;
3982	}	4396	}
3983	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
3984	$sig->send;
3985	}
3986		4398
3987	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
3988	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3989		4401
3990	if (0) {	4402	if (0) {
3991	if ($NEXT_TICK) {	4403	if ($NEXT_TICK) {
3992	my $jitter = $TICK_START - $NEXT_TICK;	4404	my $jitter = $TICK_START - $NEXT_TICK;
3993	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4405	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3994	warn "jitter $JITTER\n";#d#	4406	debug "jitter $JITTER\n";#d#
3995	}	4407	}
3996	}	4408	}
3997	}	4409	}
3998		4410
3999	{	4411	{
4000	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
4001		4414
4002	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
4003	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
4004	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
4005		4418
4006	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
4007	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
4008	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4009	$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;
…		…
4034	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4035	};	4448	};
4036	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4037	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4038	};	4451	};
		4452
		4453	info "database initialised";
4039	}	4454	}
4040		4455
4041	{	4456	{
4042	# configure IO::AIO	4457	# configure IO::AIO
4043		4458
		4459	info "initialising aio";
4044	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4045	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4046	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4047	}	4464	}
4048		4465
4049	my $_log_backtrace;	4466	our $_log_backtrace;
		4467	our $_log_backtrace_last;
4050		4468
4051	sub _log_backtrace {	4469	sub _log_backtrace {
4052	my ($msg, @addr) = @_;	4470	my ($msg, @addr) = @_;
4053		4471
4054	$msg =~ s/\n//;	4472	$msg =~ s/\n$//;
4055		4473
		4474	if ($_log_backtrace_last eq $msg) {
		4475	LOG llevInfo, "[ABT] $msg\n";
		4476	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4056	# limit the # of concurrent backtraces	4477	# limit the # of concurrent backtraces
4057	if ($_log_backtrace < 2) {	4478	} elsif ($_log_backtrace < 2) {
		4479	$_log_backtrace_last = $msg;
4058	++$_log_backtrace;	4480	++$_log_backtrace;
4059	my $perl_bt = Carp::longmess $msg;	4481	my $perl_bt = Carp::longmess $msg;
4060	async {	4482	async {
4061	$Coro::current->{desc} = "abt $msg";	4483	$Coro::current->{desc} = "abt $msg";
4062		4484
…		…
4082	LOG llevInfo, "[ABT] $_\n" for @bt;	4504	LOG llevInfo, "[ABT] $_\n" for @bt;
4083	--$_log_backtrace;	4505	--$_log_backtrace;
4084	};	4506	};
4085	} else {	4507	} else {
4086	LOG llevInfo, "[ABT] $msg\n";	4508	LOG llevInfo, "[ABT] $msg\n";
4087	LOG llevInfo, "[ABT] [suppressed]\n";	4509	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4088	}	4510	}
4089	}	4511	}
4090		4512
4091	# load additional modules	4513	# load additional modules
4092	require "cf/$_.pm" for @EXTRA_MODULES;	4514	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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