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.518 by root, Fri Apr 16 02:21:26 2010 UTC vs.
Revision 1.622 by root, Wed Nov 23 06:05:33 2016 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
		62	use CBOR::XS ();
60	use IO::AIO ();	63	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	64	use Compress::LZF;
63	use Digest::MD5 ();	65	use Digest::MD5 ();
64		66
65	AnyEvent::detect;	67	AnyEvent::detect;
66		68
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
		92	our %EXTACMD = ();
88	our %EXTICMD = ();	93	our %EXTICMD = ();
		94	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	95	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	96	our %EXT_MAP = (); # pluggable maps
91		97
92	our $RELOAD; # number of reloads so far, non-zero while in reload	98	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	99	our @EVENT;
94	our @REFLECT; # set by XS	100	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	101	our %REFLECT; # set by us
96		102
97	our $CONFDIR = confdir;	103	our $CONFDIR = confdir;
		104
98	our $DATADIR = datadir;	105	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	106	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	107	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	108	our $MAPDIR = "$DATADIR/" . mapdir;
		109
102	our $LOCALDIR = localdir;	110	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	111	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	112	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	113	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	114	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	115	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	116	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	117	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		118
111	our %RESOURCE;	119	#our %RESOURCE; # unused
112		120
113	our $OUTPUT_RATE_MIN = 4000;	121	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	122	our $OUTPUT_RATE_MAX = 1000000;
		123
		124	our $MAX_LINKS = 32; # how many chained exits to follow
		125	our $VERBOSE_IO = 1;
115		126
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	127	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	128	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	129	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	130	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	132	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	133	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	134	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	135	our $DB_ENV;
125		136
126	our @EXTRA_MODULES = qw(pod match mapscript);	137	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		138
128	our %CFG;	139	our %CFG;
		140	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		141
130	our $UPTIME; $UPTIME ||= time;	142	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	143	our $RUNTIME = 0;
		144	our $SERVER_TICK = 0;
132	our $NOW;	145	our $NOW;
133		146
134	our (%PLAYER, %PLAYER_LOADING); # all users	147	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	148	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	149	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		158
146	our @POST_INIT;	159	our @POST_INIT;
147		160
148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	161	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149	our $REALLY_UNLOOP; # never set to true, please :)	162	our $REALLY_UNLOOP; # never set to true, please :)
		163
		164	our $WAIT_FOR_TICK = new Coro::Signal;
		165	our @WAIT_FOR_TICK_BEGIN;
150		166
151	binmode STDOUT;	167	binmode STDOUT;
152	binmode STDERR;	168	binmode STDERR;
153		169
154	# read virtual server time, if available	170	# read virtual server time, if available
…		…
165		181
166	our $EMERGENCY_POSITION;	182	our $EMERGENCY_POSITION;
167		183
168	sub cf::map::normalise;	184	sub cf::map::normalise;
169		185
		186	sub in_main() {
		187	$Coro::current == $Coro::main
		188	}
		189
170	#############################################################################	190	#############################################################################
171		191
172	%REFLECT = ();	192	%REFLECT = ();
173	for (@REFLECT) {	193	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	194	my $reflect = JSON::XS::decode_json $_;
…		…
184		204
185	=over 4	205	=over 4
186		206
187	=item $cf::UPTIME	207	=item $cf::UPTIME
188		208
189	The timestamp of the server start (so not actually an uptime).	209	The timestamp of the server start (so not actually an "uptime").
		210
		211	=item $cf::SERVER_TICK
		212
		213	An unsigned integer that starts at zero when the server is started and is
		214	incremented on every tick.
		215
		216	=item $cf::NOW
		217
		218	The (real) time of the last (current) server tick - updated before and
		219	after tick processing, so this is useful only as a rough "what time is it
		220	now" estimate.
		221
		222	=item $cf::TICK
		223
		224	The interval between each server tick, in seconds.
190		225
191	=item $cf::RUNTIME	226	=item $cf::RUNTIME
192		227
193	The time this server has run, starts at 0 and is increased by $cf::TICK on	228	The time this server has run, starts at 0 and is increased by $cf::TICK on
194	every server tick.	229	every server tick.
195		230
196	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	231	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	232	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	233	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199		234
200	Various directories - "/etc", read-only install directory, perl-library	235	Various directories - "/etc", read-only install directory, perl-library
201	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	236	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202	unique-items directory, player file directory, random maps directory and	237	unique-items directory, player file directory, random maps directory and
203	database environment.	238	database environment.
204		239
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	240	=item $cf::LOADAVG
214		241
215	The current CPU load on the server (alpha-smoothed), as a value between 0	242	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	243	(none) and 1 (overloaded), indicating how much time is spent on processing
217	objects per tick. Healthy values are < 0.5.	244	objects per tick. Healthy values are < 0.5.
…		…
225	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	252	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
226	from wherever your confdir points to.	253	from wherever your confdir points to.
227		254
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	255	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		256
230	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	257	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	258	cf::wait_for_tick_begin only returns directly I<after> the tick
		259	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.	260	cf::wait_for_tick wakes up all waiters after tick processing.
		261
		262	Note that cf::wait_for_tick will immediately return when the server is not
		263	ticking, making it suitable for small pauses in threads that need to run
		264	when the server is paused. If that is not applicable (i.e. you I<really>
		265	want to wait, use C<$cf::WAIT_FOR_TICK>).
		266
		267	=item $cf::WAIT_FOR_TICK
		268
		269	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		270	variable contains a L<Coro::Signal> that is broadcats after every server
		271	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		272	next server tick.
		273
		274	=cut
		275
		276	sub wait_for_tick();
		277	sub wait_for_tick_begin();
233		278
234	=item @cf::INVOKE_RESULTS	279	=item @cf::INVOKE_RESULTS
235		280
236	This array contains the results of the last C<invoke ()> call. When	281	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	282	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
245		290
246	=back	291	=back
247		292
248	=cut	293	=cut
249		294
		295	sub error(@) { LOG llevError, join "", @_ }
		296	sub warn (@) { LOG llevWarn , join "", @_ }
		297	sub info (@) { LOG llevInfo , join "", @_ }
		298	sub debug(@) { LOG llevDebug, join "", @_ }
		299	sub trace(@) { LOG llevTrace, join "", @_ }
		300
250	$Coro::State::WARNHOOK = sub {	301	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	302	my $msg = join "", @_;
252		303
253	$msg .= "\n"	304	$msg .= "\n"
254	unless $msg =~ /\n$/;	305	unless $msg =~ /\n$/;
255		306
256	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	307	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257		308
258	LOG llevError, $msg;	309	LOG llevWarn, $msg;
259	};	310	};
260		311
261	$Coro::State::DIEHOOK = sub {	312	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	313	return unless $^S eq 0; # "eq", not "=="
263		314
264	warn Carp::longmess $_[0];	315	error Carp::longmess $_[0];
265		316
266	if ($Coro::current == $Coro::main) {#d#	317	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	318	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	319	return;#d#
269	}#d#	320	}#d#
270		321
271	# kill coroutine otherwise	322	# kill coroutine otherwise
272	Coro::terminate	323	Coro::terminate
…		…
292	)) {	343	)) {
293	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	344	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294	}	345	}
295		346
296	$EV::DIED = sub {	347	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	348	warn "error in event callback: $@";
298	};	349	};
		350
		351	#############################################################################
		352
		353	sub fork_call(&@);
		354	sub get_slot($;$$);
299		355
300	#############################################################################	356	#############################################################################
301		357
302	=head2 UTILITY FUNCTIONS	358	=head2 UTILITY FUNCTIONS
303		359
…		…
324	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	380	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325	$d	381	$d
326	} || "[unable to dump $_[0]: '$@']";	382	} || "[unable to dump $_[0]: '$@']";
327	}	383	}
328		384
		385	=item $scalar = cf::load_file $path
		386
		387	Loads the given file from path and returns its contents. Croaks on error
		388	and can block.
		389
		390	=cut
		391
		392	sub load_file($) {
		393	0 <= aio_load $_[0], my $data
		394	or Carp::croak "$_[0]: $!";
		395
		396	$data
		397	}
		398
		399	=item $success = cf::replace_file $path, $data, $sync
		400
		401	Atomically replaces the file at the given $path with new $data, and
		402	optionally $sync the data to disk before replacing the file.
		403
		404	=cut
		405
		406	sub replace_file($$;$) {
		407	my ($path, $data, $sync) = @_;
		408
		409	my $lock = cf::lock_acquire ("replace_file:$path");
		410
		411	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		412	or return;
		413
		414	$data = $data->() if ref $data;
		415
		416	length $data == aio_write $fh, 0, (length $data), $data, 0
		417	or return;
		418
		419	!$sync
		420	or !aio_fsync $fh
		421	or return;
		422
		423	aio_close $fh
		424	and return;
		425
		426	aio_rename "$path~", $path
		427	and return;
		428
		429	if ($sync) {
		430	$path =~ s%/[^/]*$%%;
		431	aio_pathsync $path;
		432	}
		433
		434	1
		435	}
		436
329	=item $ref = cf::decode_json $json	437	=item $ref = cf::decode_json $json
330		438
331	Converts a JSON string into the corresponding perl data structure.	439	Converts a JSON string into the corresponding perl data structure.
332		440
333	=item $json = cf::encode_json $ref	441	=item $json = cf::encode_json $ref
…		…
339	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	447	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340		448
341	sub encode_json($) { $json_coder->encode ($_[0]) }	449	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	450	sub decode_json($) { $json_coder->decode ($_[0]) }
343		451
		452	=item $ref = cf::decode_storable $scalar
		453
		454	Same as Coro::Storable::thaw, so blocks.
		455
		456	=cut
		457
		458	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		459
		460	=item $ref = cf::decode_yaml $scalar
		461
		462	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		463
		464	=cut
		465
		466	sub decode_yaml($) {
		467	fork_call { YAML::XS::Load $_[0] } @_
		468	}
		469
		470	=item $scalar = cf::decode_cbor $scalar
		471
		472	Same as CBOR::XS::decode_cbor, but takes server ticks into account, so
		473	blocks. For small amounts of data, C<CBOR::XS::decode_cbor> is the better
		474	alternative.
		475
		476	=cut
		477
		478	sub decode_cbor($) {
		479	# we assume 10mb/s minimum decoding speed (on a ~2ghz machine)
		480	cf::get_slot +(length $_[0]) / 10_000_000, 0, "decode_cbor";
		481	CBOR::XS::decode_cbor $_[0]
		482	}
		483
		484	=item $scalar = cf::unlzf $scalar
		485
		486	Same as Compress::LZF::compress, but takes server ticks into account, so
		487	blocks.
		488
		489	=cut
		490
		491	sub unlzf($) {
		492	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		493	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		494	Compress::LZF::decompress $_[0]
		495	}
		496
344	=item cf::post_init { BLOCK }	497	=item cf::post_init { BLOCK }
345		498
346	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	499	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347	but I<before> the server starts ticking again.	500	but I<before> the server starts ticking again.
348		501
349	The cdoeblock will have a single boolean argument to indicate whether this	502	The codeblock will have a single boolean argument to indicate whether this
350	is a reload or not.	503	is a reload or not.
351		504
352	=cut	505	=cut
353		506
354	sub post_init(&) {	507	sub post_init(&) {
355	push @POST_INIT, shift;	508	push @POST_INIT, shift;
356	}	509	}
357		510
		511	sub _post_init {
		512	trace "running post_init jobs";
		513
		514	# run them in parallel...
		515
		516	my @join;
		517
		518	while () {
		519	push @join, map &Coro::async ($_, 0), @POST_INIT;
		520	@POST_INIT = ();
		521
		522	@join or last;
		523
		524	(pop @join)->join;
		525	}
		526	}
		527
358	=item cf::lock_wait $string	528	=item cf::lock_wait $string
359		529
360	Wait until the given lock is available. See cf::lock_acquire.	530	Wait until the given lock is available. See cf::lock_acquire.
361		531
362	=item my $lock = cf::lock_acquire $string	532	=item my $lock = cf::lock_acquire $string
363		533
364	Wait until the given lock is available and then acquires it and returns	534	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,	535	a L<Guard> object. If the guard object gets destroyed (goes out of scope,
…		…
413	EV::periodic $start, $interval, 0, $cb	583	EV::periodic $start, $interval, 0, $cb
414	}	584	}
415		585
416	=item cf::get_slot $time[, $priority[, $name]]	586	=item cf::get_slot $time[, $priority[, $name]]
417		587
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	588	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	589	(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.	590	C<$time> seconds of cpu time till the next tick. The slot is only valid
		591	till the next cede.
		592
		593	Background jobs should use a priority less than zero, interactive jobs
		594	should use 100 or more.
421		595
422	The optional C<$name> can be used to identify the job to run. It might be	596	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.	597	used for statistical purposes and should identify the same time-class.
424		598
425	Useful for short background jobs.	599	Useful for short background jobs.
…		…
437	my $signal = new Coro::Signal;	611	my $signal = new Coro::Signal;
438	my $busy;	612	my $busy;
439		613
440	while () {	614	while () {
441	next_job:	615	next_job:
		616
		617	Coro::cede;
442		618
443	my $avail = cf::till_tick;	619	my $avail = cf::till_tick;
444		620
445	for (0 .. $#SLOT_QUEUE) {	621	for (0 .. $#SLOT_QUEUE) {
446	if ($SLOT_QUEUE[$_][0] <= $avail) {	622	if ($SLOT_QUEUE[$_][0] <= $avail) {
447	$busy = 0;	623	$busy = 0;
448	my $job = splice @SLOT_QUEUE, $_, 1, ();	624	my $job = splice @SLOT_QUEUE, $_, 1, ();
449	$job->[2]->send;	625	$job->[2]->send;
450	Coro::cede;
451	goto next_job;	626	goto next_job;
452	} else {	627	} else {
453	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	628	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
454	}	629	}
455	}	630	}
456		631
457	if (@SLOT_QUEUE) {	632	if (@SLOT_QUEUE) {
458	# we do not use wait_for_tick() as it returns immediately when tick is inactive	633	wait_for_tick;
459	push @cf::WAIT_FOR_TICK, $signal;
460	$signal->wait;
461	} else {	634	} else {
462	$busy = 0;	635	$busy = 0;
463	Coro::schedule;	636	Coro::schedule;
464	}	637	}
465	}	638	}
…		…
491	BEGIN { *async = \&Coro::async_pool }	664	BEGIN { *async = \&Coro::async_pool }
492		665
493	=item cf::sync_job { BLOCK }	666	=item cf::sync_job { BLOCK }
494		667
495	The design of Deliantra requires that the main coroutine ($Coro::main)	668	The design of Deliantra requires that the main coroutine ($Coro::main)
496	is always able to handle events or runnable, as Deliantra is only	669	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	670	partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
498	acceptable.	671	acceptable.
499		672
500	If it must be done, put the blocking parts into C<sync_job>. This will run	673	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	674	the given BLOCK in another coroutine while waiting for the result. The
…		…
505	=cut	678	=cut
506		679
507	sub sync_job(&) {	680	sub sync_job(&) {
508	my ($job) = @_;	681	my ($job) = @_;
509		682
510	if ($Coro::current == $Coro::main) {	683	if (in_main) {
511	my $time = AE::time;	684	my $time = AE::time;
512		685
513	# this is the main coro, too bad, we have to block	686	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	687	# till the operation succeeds, freezing the server :/
515		688
516	LOG llevError, Carp::longmess "sync job";#d#	689	#LOG llevError, Carp::longmess "sync job";#d#
517		690
518	my $freeze_guard = freeze_mainloop;	691	my $freeze_guard = freeze_mainloop;
519		692
520	my $busy = 1;	693	my $busy = 1;
521	my @res;	694	my @res;
522		695
523	(async {	696	(async {
524	$Coro::current->desc ("sync job coro");	697	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	698	@res = eval { $job->() };
526	warn $@ if $@;	699	error $@ if $@;
527	undef $busy;	700	undef $busy;
528	})->prio (Coro::PRIO_MAX);	701	})->prio (Coro::PRIO_MAX);
529		702
530	while ($busy) {	703	while ($busy) {
531	if (Coro::nready) {	704	if (Coro::nready) {
532	Coro::cede_notself;	705	Coro::cede_notself;
533	} else {	706	} else {
534	EV::loop EV::LOOP_ONESHOT;	707	EV::run EV::RUN_ONCE;
535	}	708	}
536	}	709	}
537		710
538	my $time = AE::time - $time;	711	my $time = AE::time - $time;
539		712
…		…
565	$EXT_CORO{$coro+0} = $coro;	738	$EXT_CORO{$coro+0} = $coro;
566		739
567	$coro	740	$coro
568	}	741	}
569		742
570	=item fork_call { }, $args	743	=item fork_call { }, @args
571		744
572	Executes the given code block with the given arguments in a seperate	745	Executes the given code block with the given arguments in a seperate
573	process, returning the results. Everything must be serialisable with	746	process, returning the results. Everything must be serialisable with
574	Coro::Storable. May, of course, block. Note that the executed sub may	747	Coro::Storable. May, of course, block. Note that the executed sub may
575	never block itself or use any form of event handling.	748	never block itself or use any form of event handling.
576		749
577	=cut	750	=cut
578		751
		752	sub post_fork {
		753	reset_signals;
		754	}
		755
579	sub fork_call(&@) {	756	sub fork_call(&@) {
580	my ($cb, @args) = @_;	757	my ($cb, @args) = @_;
581		758
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 {	759	my @res = Coro::Util::fork_eval {
587	reset_signals;	760	cf::post_fork;
588	&$cb	761	&$cb
589	}, @args;	762	} @args;
590		763
591	wantarray ? @res : $res[-1]	764	wantarray ? @res : $res[-1]
592	}	765	}
593		766
594	sub objinfo {	767	sub objinfo {
…		…
644	within each server.	817	within each server.
645		818
646	=cut	819	=cut
647		820
648	sub db_table($) {	821	sub db_table($) {
		822	cf::error "db_get called from main context"
		823	if $Coro::current == $Coro::main;
		824
649	my ($name) = @_;	825	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	826	my $db = BDB::db_create $DB_ENV;
651		827
652	eval {	828	eval {
653	$db->set_flags (BDB::CHKSUM);	829	$db->set_flags (BDB::CHKSUM);
…		…
663	}	839	}
664		840
665	our $DB;	841	our $DB;
666		842
667	sub db_init {	843	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	844	$DB ||= db_table "db";
670	};
671	}	845	}
672		846
673	sub db_get($$) {	847	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	848	my $key = "$_[0]/$_[1]";
675		849
676	cf::sync_job {	850	cf::error "db_get called from main context"
		851	if $Coro::current == $Coro::main;
		852
677	BDB::db_get $DB, undef, $key, my $data;	853	BDB::db_get $DB, undef, $key, my $data;
678		854
679	$! ? ()	855	$! ? ()
680	: $data	856	: $data
681	}
682	}	857	}
683		858
684	sub db_put($$$) {	859	sub db_put($$$) {
685	BDB::dbreq_pri 4;	860	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	861	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		889
715	my @data;	890	my @data;
716	my $md5;	891	my $md5;
717		892
718	for (0 .. $#$src) {	893	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	894	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	895	}
722		896
723	# if processing is expensive, check	897	# if processing is expensive, check
724	# checksum first	898	# checksum first
725	if (1) {	899	if (1) {
…		…
738		912
739	return db_get cache => "$id/data";	913	return db_get cache => "$id/data";
740	}	914	}
741	}	915	}
742		916
743	my $t1 = Time::HiRes::time;	917	my $t1 = EV::time;
744	my $data = $process->(\@data);	918	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	919	my $t2 = EV::time;
746		920
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	921	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		922
749	db_put cache => "$id/data", $data;	923	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	924	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	925	db_put cache => "$id/meta", $meta;
752		926
…		…
762		936
763	=cut	937	=cut
764		938
765	sub datalog($@) {	939	sub datalog($@) {
766	my ($type, %kv) = @_;	940	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	941	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	942	}
769		943
770	=back	944	=back
771		945
772	=cut	946	=cut
…		…
967		1141
968	} elsif (exists $cb_id{$type}) {	1142	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1143	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1144
971	} elsif (ref $type) {	1145	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1146	error "attaching objects not supported, ignoring.\n";
973		1147
974	} else {	1148	} else {
975	shift @arg;	1149	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1150	error "attach argument '$type' not supported, ignoring.\n";
977	}	1151	}
978	}	1152	}
979	}	1153	}
980		1154
981	sub _object_attach {	1155	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1165	_attach $registry, $klass, @attach;
992	}	1166	}
993		1167
994	$obj->{$name} = \%arg;	1168	$obj->{$name} = \%arg;
995	} else {	1169	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1170	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1171	}
998		1172
999	$obj->{_attachment}{$name} = undef;	1173	$obj->{_attachment}{$name} = undef;
1000	}	1174	}
1001		1175
…		…
1060		1234
1061	for (@$callbacks) {	1235	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1236	eval { &{$_->[1]} };
1063		1237
1064	if ($@) {	1238	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1239	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1240	override;
1068	}	1241	}
1069		1242
1070	return 1 if $override;	1243	return 1 if $override;
1071	}	1244	}
…		…
1150	for (@$attach) {	1323	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1324	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1325	_attach $registry, $klass, @attach;
1153	}	1326	}
1154	} else {	1327	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1328	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1329	}
1157	}	1330	}
1158	}	1331	}
1159		1332
1160	cf::attachable->attach (	1333	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1360	my ($filename, $rdata, $objs) = @_;
1188		1361
1189	sync_job {	1362	sync_job {
1190	if (length $$rdata) {	1363	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1364	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1365	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1366	$decname, length $$rdata, scalar @$objs
		1367	if $VERBOSE_IO;
1194		1368
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1369	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1370	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1371	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1372	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1394	aio_rename "$filename~", $filename;
1221		1395
1222	$filename =~ s%/[^/]+$%%;	1396	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1397	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1398	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1399	error "unable to save objects: $filename~: $!\n";
1226	}	1400	}
1227	} else {	1401	} else {
1228	aio_unlink $filename;	1402	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1403	aio_unlink "$filename.pst";
1230	}	1404	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1428	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1429	$av = $st->{objs};
1256	}	1430	}
1257		1431
1258	utf8::decode (my $decname = $filename);	1432	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1433	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1434	$decname, length $data, scalar @{$av || []}
		1435	if $VERBOSE_IO;
1261		1436
1262	($data, $av)	1437	($data, $av)
1263	}	1438	}
1264		1439
1265	=head2 COMMAND CALLBACKS	1440	=head2 COMMAND CALLBACKS
…		…
1269	=cut	1444	=cut
1270		1445
1271	#############################################################################	1446	#############################################################################
1272	# command handling &c	1447	# command handling &c
1273		1448
1274	=item cf::register_command $name => \&callback($ob,$args);	1449	=item cf::register_command $name => \&callback($ob,$args)
1275		1450
1276	Register a callback for execution when the client sends the user command	1451	Register a callback for execution when the client sends the user command
1277	$name.	1452	$name.
1278		1453
1279	=cut	1454	=cut
…		…
1285	#warn "registering command '$name/$time' to '$caller'";	1460	#warn "registering command '$name/$time' to '$caller'";
1286		1461
1287	push @{ $COMMAND{$name} }, [$caller, $cb];	1462	push @{ $COMMAND{$name} }, [$caller, $cb];
1288	}	1463	}
1289		1464
1290	=item cf::register_extcmd $name => \&callback($pl,$packet);	1465	=item cf::register_extcmd $name => \&callback($pl,@args)
1291		1466
1292	Register a callback for execution when the client sends an (synchronous)	1467	Register a callback for execution when the client sends an (synchronous)
1293	extcmd packet. Ext commands will be processed in the order they are	1468	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	1469	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	1470	the logged-in player. Ext commands can only be processed after a player
1296	has logged in successfully.	1471	has logged in successfully.
1297		1472
1298	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1299	called.
1300		1474
		1475	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
1301	=item cf::register_exticmd $name => \&callback($ns,$packet);	1480	=item cf::register_exticmd $name => \&callback($ns,@args)
1302		1481
1303	Register a callback for execution when the client sends an (asynchronous)	1482	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	1483	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	1484	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	1485	is a client socket. Exti commands can be received anytime, even before
1307	log-in.	1486	log-in.
1308		1487
1309	If the callback returns something, it is sent back as if reply was being	1488	The values will be sent back to the client.
1310	called.
1311		1489
1312	=cut	1490	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1313		1491
		1492	Same as C<cf::register_extcmd>, but instead of returning values, the
		1493	callback needs to clal the C<$reply> function.
		1494
		1495	=cut
		1496
1314	sub register_extcmd {	1497	sub register_extcmd($$) {
1315	my ($name, $cb) = @_;	1498	my ($name, $cb) = @_;
1316		1499
1317	$EXTCMD{$name} = $cb;	1500	$EXTCMD{$name} = $cb;
1318	}	1501	}
1319		1502
1320	sub register_exticmd {	1503	sub register_async_extcmd($$) {
1321	my ($name, $cb) = @_;	1504	my ($name, $cb) = @_;
1322		1505
		1506	$EXTACMD{$name} = $cb;
		1507	}
		1508
		1509	sub register_exticmd($$) {
		1510	my ($name, $cb) = @_;
		1511
1323	$EXTICMD{$name} = $cb;	1512	$EXTICMD{$name} = $cb;
		1513	}
		1514
		1515	sub register_async_exticmd($$) {
		1516	my ($name, $cb) = @_;
		1517
		1518	$EXTIACMD{$name} = $cb;
1324	}	1519	}
1325		1520
1326	use File::Glob ();	1521	use File::Glob ();
1327		1522
1328	cf::player->attach (	1523	cf::player->attach (
…		…
1342	my ($pl, $buf) = @_;	1537	my ($pl, $buf) = @_;
1343		1538
1344	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1539	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345		1540
1346	if (ref $msg) {	1541	if (ref $msg) {
1347	my ($type, $reply, @payload) =	1542	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		1543
1352	my @reply;
1353
1354	if (my $cb = $EXTCMD{$type}) {	1544	if (my $cb = $EXTACMD{$type}) {
		1545	$cb->(
		1546	$pl,
		1547	sub {
		1548	$pl->ext_msg ("reply-$reply", @_)
		1549	if $reply;
		1550	},
		1551	@payload
		1552	);
		1553	} else {
		1554	my @reply;
		1555
		1556	if (my $cb = $EXTCMD{$type}) {
1355	@reply = $cb->($pl, @payload);	1557	@reply = $cb->($pl, @payload);
		1558	}
		1559
		1560	$pl->ext_msg ("reply-$reply", @reply)
		1561	if $reply;
1356	}	1562	}
1357		1563
1358	$pl->ext_reply ($reply, @reply)
1359	if $reply;
1360
1361	} else {	1564	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1565	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1566	}
1364		1567
1365	cf::override;	1568	cf::override;
1366	},	1569	},
1367	);	1570	);
…		…
1377	};	1580	};
1378		1581
1379	$grp	1582	$grp
1380	}	1583	}
1381		1584
		1585	sub _ext_cfg_reg($$$$) {
		1586	my ($rvar, $varname, $cfgname, $default) = @_;
		1587
		1588	$cfgname = lc $varname
		1589	unless length $cfgname;
		1590
		1591	$EXT_CFG{$cfgname} = [$rvar, $default];
		1592
		1593	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1594	}
		1595
1382	sub load_extensions {	1596	sub load_extensions {
		1597	info "loading extensions...";
		1598
		1599	%EXT_CFG = ();
		1600
1383	cf::sync_job {	1601	cf::sync_job {
1384	my %todo;	1602	my %todo;
1385		1603
1386	for my $path (<$LIBDIR/*.ext>) {	1604	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1605	next unless -r $path;
…		…
1405		1623
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1624	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1625	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1626
1409	$ext{source} =	1627	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1628	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1629	. "#line 1 \"$path\"\n{\n"
1412	. $source	1630	. $source
1413	. "\n};\n1";	1631	. "\n};\n1";
1414		1632
1415	$todo{$base} = \%ext;	1633	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1645	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1646	next ext
1429	unless exists $done{$_};	1647	unless exists $done{$_};
1430	}	1648	}
1431		1649
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1650	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		1651
		1652	my $source = $v->{source};
		1653
		1654	# support "CONF varname :confname = default" pseudo-statements
		1655	$source =~ s{
		1656	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1657	}{
		1658	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1659	}gmxe;
		1660
1434	my $active = eval $v->{source};	1661	my $active = eval $source;
1435		1662
1436	if (length $@) {	1663	if (length $@) {
1437	warn "$v->{path}: $@\n";	1664	error "$v->{path}: $@\n";
1438		1665
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1666	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	if exists $v->{meta}{mandatory};	1667	if exists $v->{meta}{mandatory};
		1668
		1669	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1670	delete $todo{$k};
1441	} else {	1671	} else {
1442	$done{$k} = delete $todo{$k};	1672	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1673	push @EXTS, $v->{pkg};
1444	$progress = 1;	1674	$progress = 1;
1445		1675
1446	warn "$v->{base}: extension inactive.\n"	1676	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1677	unless $active;
1448	}	1678	}
1449	}	1679	}
1450		1680
1451	unless ($progress) {	1681	unless ($progress) {
…		…
1453		1683
1454	while (my ($k, $v) = each %todo) {	1684	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1685	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1686	if exists $v->{meta}{mandatory};
1457	}	1687	}
		1688
		1689	last;
1458	}	1690	}
1459	}	1691	}
1460	};	1692	};
1461	}	1693	}
1462		1694
…		…
1620	my $name = $pl->ob->name;	1852	my $name = $pl->ob->name;
1621		1853
1622	$pl->{deny_save} = 1;	1854	$pl->{deny_save} = 1;
1623	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1855	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1624		1856
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1857	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1858	$pl->deactivate;
		1859
1627	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1860	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1861	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1862	ext::highscore::check ($pl->ob);
		1863
1630	$pl->ns->destroy if $pl->ns;	1864	$pl->ns->destroy if $pl->ns;
1631		1865
1632	my $path = playerdir $pl;	1866	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1867	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1868	aio_rename $path, $temp;
…		…
1688	\@logins	1922	\@logins
1689	}	1923	}
1690		1924
1691	=item $player->maps	1925	=item $player->maps
1692		1926
		1927	=item cf::player::maps $login
		1928
1693	Returns an arrayref of map paths that are private for this	1929	Returns an arrayref of map paths that are private for this
1694	player. May block.	1930	player. May block.
1695		1931
1696	=cut	1932	=cut
1697		1933
…		…
1718		1954
1719	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1955	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1720		1956
1721	Expand deliantra pod fragments into protocol xml.	1957	Expand deliantra pod fragments into protocol xml.
1722		1958
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)	1959	=item $player->ext_msg ($type, @msg)
1736		1960
1737	Sends an ext event to the client.	1961	Sends an ext event to the client.
1738		1962
1739	=cut	1963	=cut
…		…
1758		1982
1759	=cut	1983	=cut
1760		1984
1761	sub find_by_path($) {	1985	sub find_by_path($) {
1762	my ($path) = @_;	1986	my ($path) = @_;
		1987
		1988	$path =~ s/^~[^\/]*//; # skip ~login
1763		1989
1764	my ($match, $specificity);	1990	my ($match, $specificity);
1765		1991
1766	for my $region (list) {	1992	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1993	if ($region->{match} && $path =~ $region->{match}) {
…		…
1796	sub generate_random_map {	2022	sub generate_random_map {
1797	my ($self, $rmp) = @_;	2023	my ($self, $rmp) = @_;
1798		2024
1799	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2025	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800		2026
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	2027	$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	}	2028	}
1816		2029
1817	=item cf::map->register ($regex, $prio)	2030	=item cf::map->register ($regex, $prio)
1818		2031
1819	Register a handler for the map path matching the given regex at the	2032	Register a handler for the map path matching the given regex at the
…		…
1824		2037
1825	sub register {	2038	sub register {
1826	my (undef, $regex, $prio) = @_;	2039	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	2040	my $pkg = caller;
1828		2041
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	2042	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		2043
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2044	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	2045	}
1834		2046
1835	# also paths starting with '/'	2047	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2048	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		2049
1838	sub thawer_merge {	2050	sub thawer_merge {
1839	my ($self, $merge) = @_;	2051	my ($self, $merge) = @_;
1840		2052
1841	# we have to keep some variables in memory intact	2053	# we have to keep some variables in memory intact
…		…
1846	}	2058	}
1847		2059
1848	sub normalise {	2060	sub normalise {
1849	my ($path, $base) = @_;	2061	my ($path, $base) = @_;
1850		2062
1851	$path = "$path"; # make sure its a string	2063	$path = "$path"; # make sure it's a string
1852		2064
1853	$path =~ s/\.map$//;	2065	$path =~ s/\.map$//;
1854		2066
1855	# map plan:	2067	# map plan:
1856	#	2068	#
…		…
1871	$base =~ s{[^/]+/?$}{};	2083	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	2084	$path = "$base/$path";
1873	}	2085	}
1874		2086
1875	for ($path) {	2087	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	2088	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	2089	redo if s{/[^/]+/\.\./}{/};
1879	}	2090	}
1880		2091
1881	$path	2092	$path
…		…
1895	$self->init; # pass $1 etc.	2106	$self->init; # pass $1 etc.
1896	return $self;	2107	return $self;
1897	}	2108	}
1898	}	2109	}
1899		2110
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2111	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2112	()
1902	}	2113	}
1903		2114
		2115	# may re-bless or do other evil things
1904	sub init {	2116	sub init {
1905	my ($self) = @_;	2117	my ($self) = @_;
1906		2118
1907	$self	2119	$self
1908	}	2120	}
…		…
1973	$self->{load_path} = $path;	2185	$self->{load_path} = $path;
1974		2186
1975	1	2187	1
1976	}	2188	}
1977		2189
		2190	# used to laod the header of an original map
1978	sub load_header_orig {	2191	sub load_header_orig {
1979	my ($self) = @_;	2192	my ($self) = @_;
1980		2193
1981	$self->load_header_from ($self->load_path)	2194	$self->load_header_from ($self->load_path)
1982	}	2195	}
1983		2196
		2197	# used to laod the header of an instantiated map
1984	sub load_header_temp {	2198	sub load_header_temp {
1985	my ($self) = @_;	2199	my ($self) = @_;
1986		2200
1987	$self->load_header_from ($self->save_path)	2201	$self->load_header_from ($self->save_path)
1988	}	2202	}
1989		2203
		2204	# called after loading the header from an instantiated map
1990	sub prepare_temp {	2205	sub prepare_temp {
1991	my ($self) = @_;	2206	my ($self) = @_;
1992		2207
1993	$self->last_access ((delete $self->{last_access})	2208	$self->last_access ((delete $self->{last_access})
1994	|| $cf::RUNTIME); #d#	2209	|| $cf::RUNTIME); #d#
1995	# safety	2210	# safety
1996	$self->{instantiate_time} = $cf::RUNTIME	2211	$self->{instantiate_time} = $cf::RUNTIME
1997	if $self->{instantiate_time} > $cf::RUNTIME;	2212	if $self->{instantiate_time} > $cf::RUNTIME;
1998	}	2213	}
1999		2214
		2215	# called after loading the header from an original map
2000	sub prepare_orig {	2216	sub prepare_orig {
2001	my ($self) = @_;	2217	my ($self) = @_;
2002		2218
2003	$self->{load_original} = 1;	2219	$self->{load_original} = 1;
2004	$self->{instantiate_time} = $cf::RUNTIME;	2220	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2028		2244
2029	sub find;	2245	sub find;
2030	sub find {	2246	sub find {
2031	my ($path, $origin) = @_;	2247	my ($path, $origin) = @_;
2032		2248
		2249	cf::cede_to_tick;
		2250
2033	$path = normalise $path, $origin && $origin->path;	2251	$path = normalise $path, $origin;
2034		2252
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2253	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2254	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2255
2038	$cf::MAP{$path} || do {	2256	$cf::MAP{$path} || do {
…		…
2069		2287
2070	{	2288	{
2071	my $guard = cf::lock_acquire "map_data:$path";	2289	my $guard = cf::lock_acquire "map_data:$path";
2072		2290
2073	return unless $self->valid;	2291	return unless $self->valid;
2074	return unless $self->in_memory == cf::MAP_SWAPPED;	2292	return unless $self->state == cf::MAP_SWAPPED;
2075
2076	$self->in_memory (cf::MAP_LOADING);
2077		2293
2078	$self->alloc;	2294	$self->alloc;
2079		2295
2080	$self->pre_load;	2296	$self->pre_load;
2081	cf::cede_to_tick;	2297	cf::cede_to_tick;
2082		2298
		2299	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2300	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2301	$f->skip_block;
2085	$self->_load_objects ($f)	2302	$self->_load_objects ($f)
2086	or return;	2303	or return;
2087		2304
2088	$self->post_load_original	2305	$self->post_load_original
2089	if delete $self->{load_original};	2306	if delete $self->{load_original};
2090		2307
2091	if (my $uniq = $self->uniq_path) {	2308	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2309	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2310	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2311	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2312	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2313	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2314	$f->resolve_delayed_derefs;
		2315	}
2098	}	2316	}
2099	}	2317	}
2100	}
2101		2318
2102	$f->resolve_delayed_derefs;	2319	$f->resolve_delayed_derefs;
		2320	} else {
		2321	$self->post_load_original
		2322	if delete $self->{load_original};
		2323	}
		2324
		2325	$self->state (cf::MAP_INACTIVE);
2103		2326
2104	cf::cede_to_tick;	2327	cf::cede_to_tick;
2105	# now do the right thing for maps	2328	# now do the right thing for maps
2106	$self->link_multipart_objects;	2329	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2330	$self->difficulty ($self->estimate_difficulty)
…		…
2111	unless ($self->{deny_activate}) {	2334	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2335	$self->decay_objects;
2113	$self->fix_auto_apply;	2336	$self->fix_auto_apply;
2114	$self->update_buttons;	2337	$self->update_buttons;
2115	cf::cede_to_tick;	2338	cf::cede_to_tick;
2116	$self->activate;	2339	#$self->activate; # no longer activate maps automatically
2117	}	2340	}
2118		2341
2119	$self->{last_save} = $cf::RUNTIME;	2342	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2343	$self->last_access ($cf::RUNTIME);
2121
2122	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2344	}
2124		2345
2125	$self->post_load;	2346	$self->post_load;
		2347
		2348	1
2126	}	2349	}
2127		2350
2128	# customize the map for a given player, i.e.	2351	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2352	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2353	# maps to change the path to ~playername/mappath
…		…
2138	# if $self->per_party;	2361	# if $self->per_party;
2139		2362
2140	$self	2363	$self
2141	}	2364	}
2142		2365
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 {	2366	sub find_sync {
2170	my ($path, $origin) = @_;	2367	my ($path, $origin) = @_;
2171		2368
2172	cf::sync_job { find $path, $origin }	2369	# it's a bug to call this from the main context
		2370	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2371	if $Coro::current == $Coro::main;
		2372
		2373	find $path, $origin
2173	}	2374	}
2174		2375
2175	sub do_load_sync {	2376	sub do_load_sync {
2176	my ($map) = @_;	2377	my ($map) = @_;
2177		2378
		2379	# it's a bug to call this from the main context
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2380	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2381	if $Coro::current == $Coro::main;
2180		2382
2181	cf::sync_job { $map->load };	2383	$map->load;
2182	}	2384	}
2183		2385
2184	our %MAP_PREFETCH;	2386	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2387	our $MAP_PREFETCHER = undef;
2186		2388
2187	sub find_async {	2389	sub find_async {
2188	my ($path, $origin, $load) = @_;	2390	my ($path, $origin, $load) = @_;
2189		2391
2190	$path = normalise $path, $origin && $origin->{path};	2392	$path = normalise $path, $origin;
2191		2393
2192	if (my $map = $cf::MAP{$path}) {	2394	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2395	return $map if !$load || $map->linkable;
2194	}	2396	}
2195		2397
2196	$MAP_PREFETCH{$path} |= $load;	2398	$MAP_PREFETCH{$path} |= $load;
2197		2399
2198	$MAP_PREFETCHER ||= cf::async {	2400	$MAP_PREFETCHER ||= cf::async {
2199	$Coro::current->{desc} = "map prefetcher";	2401	$Coro::current->{desc} = "map prefetcher";
2200		2402
2201	while (%MAP_PREFETCH) {	2403	while (%MAP_PREFETCH) {
2202	while (my ($k, $v) = each %MAP_PREFETCH) {	2404	for my $k (keys %MAP_PREFETCH) {
2203	if (my $map = find $k) {	2405	if (my $map = find $k) {
2204	$map->load if $v;	2406	$map->load if $MAP_PREFETCH{$k};
2205	}	2407	}
2206		2408
2207	delete $MAP_PREFETCH{$k};	2409	delete $MAP_PREFETCH{$k};
2208	}	2410	}
2209	}	2411	}
…		…
2257	sub swap_out {	2459	sub swap_out {
2258	my ($self) = @_;	2460	my ($self) = @_;
2259		2461
2260	my $lock = cf::lock_acquire "map_data:$self->{path}";	2462	my $lock = cf::lock_acquire "map_data:$self->{path}";
2261		2463
2262	return if $self->in_memory != cf::MAP_ACTIVE;	2464	return if !$self->linkable;
2263	return if $self->{deny_save};	2465	return if $self->{deny_save};
2264	return if $self->players;	2466	return if $self->players;
2265		2467
2266	# first deactivate the map and "unlink" it from the core	2468	# first deactivate the map and "unlink" it from the core
2267	$self->deactivate;	2469	$self->deactivate;
2268	$_->clear_links_to ($self) for values %cf::MAP;	2470	$_->clear_links_to ($self) for values %cf::MAP;
2269	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
2270		2472
2271	# then atomically save	2473	# then atomically save
2272	$self->_save;	2474	$self->_save;
2273		2475
2274	# then free the map	2476	# then free the map
…		…
2298		2500
2299	my $lock = cf::lock_acquire "map_data:$self->{path}";	2501	my $lock = cf::lock_acquire "map_data:$self->{path}";
2300		2502
2301	return if $self->players;	2503	return if $self->players;
2302		2504
2303	warn "resetting map ", $self->path, "\n";	2505	cf::trace "resetting map ", $self->path, "\n";
2304		2506
2305	$self->in_memory (cf::MAP_SWAPPED);	2507	$self->state (cf::MAP_SWAPPED);
2306		2508
2307	# need to save uniques path	2509	# need to save uniques path
2308	unless ($self->{deny_save}) {	2510	unless ($self->{deny_save}) {
2309	my $uniq = $self->uniq_path; utf8::encode $uniq;	2511	my $uniq = $self->uniq_path; utf8::encode $uniq;
2310		2512
…		…
2332		2534
2333	delete $cf::MAP{$self->path};	2535	delete $cf::MAP{$self->path};
2334		2536
2335	$self->unlink_save;	2537	$self->unlink_save;
2336		2538
2337	bless $self, "cf::map";	2539	bless $self, "cf::map::wrap";
2338	delete $self->{deny_reset};	2540	delete $self->{deny_reset};
2339	$self->{deny_save} = 1;	2541	$self->{deny_save} = 1;
2340	$self->reset_timeout (1);	2542	$self->reset_timeout (1);
2341	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2543	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342		2544
…		…
2463		2665
2464	Creates and returns a persistent reference to an object that can be stored as a string.	2666	Creates and returns a persistent reference to an object that can be stored as a string.
2465		2667
2466	=item $ob = cf::object::deref ($refstring)	2668	=item $ob = cf::object::deref ($refstring)
2467		2669
2468	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2670	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2469	even if the object actually exists. May block.	2671	even if the object actually exists. May block.
2470		2672
2471	=cut	2673	=cut
2472		2674
2473	sub deref {	2675	sub deref {
…		…
2555	=item $player_object->may ("access")	2757	=item $player_object->may ("access")
2556		2758
2557	Returns wether the given player is authorized to access resource "access"	2759	Returns wether the given player is authorized to access resource "access"
2558	(e.g. "command_wizcast").	2760	(e.g. "command_wizcast").
2559		2761
		2762	This is implemented by checking a config setting of C<may_access> where
		2763	C<access> is replaced by the access string. The following alternatives are
		2764	possible (and are tested in order):
		2765
		2766	=over 4
		2767
		2768	=item * Player is DM
		2769
		2770	The request will succeed.
		2771
		2772	=item * may_access is an array reference
		2773
		2774	If either the player nickname or UUID is in the array, the request will
		2775	succeed, otherwise it will fail.
		2776
		2777	=item * may_access is a true value
		2778
		2779	The request will succeed.
		2780
		2781	=item * may_access is missing or false
		2782
		2783	The request will fail.
		2784
		2785	=back
		2786
2560	=cut	2787	=cut
2561		2788
2562	sub cf::object::player::may {	2789	sub cf::object::player::may {
2563	my ($self, $access) = @_;	2790	my ($self, $access) = @_;
2564		2791
2565	$self->flag (cf::FLAG_WIZ) ||	2792	$self->flag (cf::FLAG_WIZ) ||
2566	(ref $cf::CFG{"may_$access"}	2793	(ref $cf::CFG{"may_$access"}
2567	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2794	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2568	: $cf::CFG{"may_$access"})	2795	: $cf::CFG{"may_$access"})
2569	}	2796	}
2570		2797
2571	=item $player_object->enter_link	2798	=item $player_object->enter_link
2572		2799
2573	Freezes the player and moves him/her to a special map (C<{link}>).	2800	Freezes the player and moves him/her to a special map (C<{link}>).
2574		2801
2575	The player should be reasonably safe there for short amounts of time (e.g.	2802	The player should be reasonably safe there for short amounts of time (e.g.
2576	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2803	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577	though, as the palyer cannot control the character while it is on the link	2804	though, as the player cannot control the character while it is on the link
2578	map.	2805	map.
2579		2806
2580	Will never block.	2807	This method will never block, which is the whole reaosn for it's
		2808	existance: you can I<always> put a player onto the link map, which is the
		2809	only place to put objects that is guaranteed to exist.
		2810
		2811	A typical usage pattern is to call C<enter_link> synchronously from the
		2812	server, then start a new thread, do your blocking stuff there and then
		2813	call C<leave_link> from that thread.
2581		2814
2582	=item $player_object->leave_link ($map, $x, $y)	2815	=item $player_object->leave_link ($map, $x, $y)
2583		2816
2584	Moves the player out of the special C<{link}> map onto the specified	2817	Moves the player out of the special C<{link}> map onto the specified
2585	map. If the map is not valid (or omitted), the player will be moved back	2818	map. If the map is not valid (or omitted), the player will be moved back
…		…
2603	sub cf::object::player::enter_link {	2836	sub cf::object::player::enter_link {
2604	my ($self) = @_;	2837	my ($self) = @_;
2605		2838
2606	$self->deactivate_recursive;	2839	$self->deactivate_recursive;
2607		2840
		2841	++$self->{_link_recursion};
		2842
2608	return if UNIVERSAL::isa $self->map, "ext::map_link";	2843	return if UNIVERSAL::isa $self->map, "ext::map_link";
2609		2844
2610	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2845	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611	if $self->map && $self->map->{path} ne "{link}";	2846	if $self->map && $self->map->{path} ne "{link}";
2612		2847
2613	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2848	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2614	}	2849	}
2615		2850
2616	sub cf::object::player::leave_link {	2851	sub cf::object::player::leave_link {
2617	my ($self, $map, $x, $y) = @_;	2852	my ($self, $map, $x, $y) = @_;
2618		2853
…		…
2638	# use -1 or undef as default coordinates, not 0, 0	2873	# use -1 or undef as default coordinates, not 0, 0
2639	($x, $y) = ($map->enter_x, $map->enter_y)	2874	($x, $y) = ($map->enter_x, $map->enter_y)
2640	if $x <= 0 && $y <= 0;	2875	if $x <= 0 && $y <= 0;
2641		2876
2642	$map->load;	2877	$map->load;
2643	$map->load_neighbours;
2644		2878
2645	return unless $self->contr->active;	2879	return unless $self->contr->active;
2646		2880
2647	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2881	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648	$self->enter_map ($map, $x, $y);	2882	if ($self->enter_map ($map, $x, $y)) {
2649		2883	# entering was successful
		2884	delete $self->{_link_recursion};
2650	# only activate afterwards, to support waiting in hooks	2885	# only activate afterwards, to support waiting in hooks
2651	$self->activate_recursive;	2886	$self->activate_recursive;
2652	}	2887	}
2653		2888
		2889	}
		2890
2654	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2891	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655		2892
2656	Moves the player to the given map-path and coordinates by first freezing	2893	Moves the player to the given map-path and coordinates by first freezing
2657	her, loading and preparing them map, calling the provided $check callback	2894	her, loading and preparing them map, calling the provided $check callback
2658	that has to return the map if sucecssful, and then unfreezes the player on	2895	that has to return the map if sucecssful, and then unfreezes the player on
2659	the new (success) or old (failed) map position. In either case, $done will	2896	the new (success) or old (failed) map position. In either case, $done will
…		…
2666		2903
2667	our $GOTOGEN;	2904	our $GOTOGEN;
2668		2905
2669	sub cf::object::player::goto {	2906	sub cf::object::player::goto {
2670	my ($self, $path, $x, $y, $check, $done) = @_;	2907	my ($self, $path, $x, $y, $check, $done) = @_;
		2908
		2909	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2910	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2911	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2912	($path, $x, $y) = @$EMERGENCY_POSITION;
		2913	}
2671		2914
2672	# do generation counting so two concurrent goto's will be executed in-order	2915	# do generation counting so two concurrent goto's will be executed in-order
2673	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2916	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674		2917
2675	$self->enter_link;	2918	$self->enter_link;
…		…
2695	($path, $x, $y) = (undef, undef, undef);	2938	($path, $x, $y) = (undef, undef, undef);
2696	}	2939	}
2697	}	2940	}
2698		2941
2699	my $map = eval {	2942	my $map = eval {
2700	my $map = defined $path ? cf::map::find $path : undef;	2943	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2701		2944
2702	if ($map) {	2945	if ($map) {
2703	$map = $map->customise_for ($self);	2946	$map = $map->customise_for ($self);
2704	$map = $check->($map) if $check && $map;	2947	$map = $check->($map, $x, $y, $self) if $check && $map;
2705	} else {	2948	} else {
2706	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2949	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707	}	2950	}
2708		2951
2709	$map	2952	$map
…		…
2717	if ($gen == $self->{_goto_generation}) {	2960	if ($gen == $self->{_goto_generation}) {
2718	delete $self->{_goto_generation};	2961	delete $self->{_goto_generation};
2719	$self->leave_link ($map, $x, $y);	2962	$self->leave_link ($map, $x, $y);
2720	}	2963	}
2721		2964
2722	$done->() if $done;	2965	$done->($self) if $done;
2723	})->prio (1);	2966	})->prio (1);
2724	}	2967	}
2725		2968
2726	=item $player_object->enter_exit ($exit_object)	2969	=item $player_object->enter_exit ($exit_object)
2727		2970
…		…
2795	$Coro::current->{desc} = "enter_exit";	3038	$Coro::current->{desc} = "enter_exit";
2796		3039
2797	unless (eval {	3040	unless (eval {
2798	$self->deactivate_recursive; # just to be sure	3041	$self->deactivate_recursive; # just to be sure
2799		3042
2800	# random map handling
2801	{
2802	my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804	prepare_random_map $exit
2805	if $exit->slaying eq "/!";
2806	}
2807
2808	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3043	my $map = cf::map::normalise $exit->slaying, $exit->map;
2809	my $x = $exit->stats->hp;	3044	my $x = $exit->stats->hp;
2810	my $y = $exit->stats->sp;	3045	my $y = $exit->stats->sp;
		3046
		3047	# special map handling
		3048	my $slaying = $exit->slaying;
		3049
		3050	# special map handling
		3051	if ($slaying eq "/!") {
		3052	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3053
		3054	prepare_random_map $exit
		3055	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3056
		3057	$map = $exit->slaying;
		3058
		3059	} elsif ($slaying eq '!up') {
		3060	$map = $exit->map->tile_path (cf::TILE_UP);
		3061	$x = $exit->x;
		3062	$y = $exit->y;
		3063
		3064	} elsif ($slaying eq '!down') {
		3065	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3066	$x = $exit->x;
		3067	$y = $exit->y;
		3068	}
2811		3069
2812	$self->goto ($map, $x, $y);	3070	$self->goto ($map, $x, $y);
2813		3071
2814	# if exit is damned, update players death & WoR home-position	3072	# if exit is damned, update players death & WoR home-position
2815	$self->contr->savebed ($map, $x, $y)	3073	$self->contr->savebed ($map, $x, $y)
…		…
2820	$self->message ("Something went wrong deep within the deliantra server. "	3078	$self->message ("Something went wrong deep within the deliantra server. "
2821	. "I'll try to bring you back to the map you were before. "	3079	. "I'll try to bring you back to the map you were before. "
2822	. "Please report this to the dungeon master!",	3080	. "Please report this to the dungeon master!",
2823	cf::NDI_UNIQUE | cf::NDI_RED);	3081	cf::NDI_UNIQUE | cf::NDI_RED);
2824		3082
2825	warn "ERROR in enter_exit: $@";	3083	error "ERROR in enter_exit: $@";
2826	$self->leave_link;	3084	$self->leave_link;
2827	}	3085	}
2828	})->prio (1);	3086	})->prio (1);
2829	}	3087	}
2830		3088
2831	=head3 cf::client	3089	=head3 cf::client
2832		3090
2833	=over 4	3091	=over 4
2834
2835	=item $client->send_drawinfo ($text, $flags)
2836
2837	Sends a drawinfo packet to the client. Circumvents output buffering so
2838	should not be used under normal circumstances.
2839
2840	=cut
2841
2842	sub cf::client::send_drawinfo {
2843	my ($self, $text, $flags) = @_;
2844
2845	utf8::encode $text;
2846	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847	}
2848		3092
2849	=item $client->send_big_packet ($pkt)	3093	=item $client->send_big_packet ($pkt)
2850		3094
2851	Like C<send_packet>, but tries to compress large packets, and fragments	3095	Like C<send_packet>, but tries to compress large packets, and fragments
2852	them as required.	3096	them as required.
…		…
2871	$self->send_packet ($pkt);	3115	$self->send_packet ($pkt);
2872	}	3116	}
2873		3117
2874	=item $client->send_msg ($channel, $msg, $color, [extra...])	3118	=item $client->send_msg ($channel, $msg, $color, [extra...])
2875		3119
2876	Send a drawinfo or msg packet to the client, formatting the msg for the	3120	Send a msg packet to the client, formatting the msg for the client if
2877	client if neccessary. C<$type> should be a string identifying the type of	3121	necessary. C<$type> should be a string identifying the type of the
2878	the message, with C<log> being the default. If C<$color> is negative, suppress	3122	message, with C<log> being the default. If C<$color> is negative, suppress
2879	the message unless the client supports the msg packet.	3123	the message unless the client supports the msg packet.
2880		3124
2881	=cut	3125	=cut
2882		3126
2883	# non-persistent channels (usually the info channel)	3127	# non-persistent channels (usually the info channel)
…		…
2988	id => "death",	3232	id => "death",
2989	title => "Death",	3233	title => "Death",
2990	reply => undef,	3234	reply => undef,
2991	tooltip => "Reason for and more info about your most recent death",	3235	tooltip => "Reason for and more info about your most recent death",
2992	},	3236	},
		3237	"c/fatal" => {
		3238	id => "fatal",
		3239	title => "Fatal Error",
		3240	reply => undef,
		3241	tooltip => "Reason for the server disconnect",
		3242	},
2993	"c/say" => $SAY_CHANNEL,	3243	"c/say" => $SAY_CHANNEL,
2994	"c/chat" => $CHAT_CHANNEL,	3244	"c/chat" => $CHAT_CHANNEL,
2995	);	3245	);
2996		3246
2997	sub cf::client::send_msg {	3247	sub cf::client::send_msg {
…		…
3040	=cut	3290	=cut
3041		3291
3042	sub cf::client::ext_msg($$@) {	3292	sub cf::client::ext_msg($$@) {
3043	my ($self, $type, @msg) = @_;	3293	my ($self, $type, @msg) = @_;
3044		3294
3045	if ($self->extcmd == 2) {
3046	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3295	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3047	} elsif ($self->extcmd == 1) { # TODO: remove
3048	push @msg, msgtype => "event_$type";
3049	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3050	}
3051	}
3052
3053	=item $client->ext_reply ($msgid, @msg)
3054
3055	Sends an ext reply to the client.
3056
3057	=cut
3058
3059	sub cf::client::ext_reply($$@) {
3060	my ($self, $id, @msg) = @_;
3061
3062	if ($self->extcmd == 2) {
3063	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3064	} elsif ($self->extcmd == 1) {
3065	#TODO: version 1, remove
3066	unshift @msg, msgtype => "reply", msgid => $id;
3067	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3068	}
3069	}	3296	}
3070		3297
3071	=item $success = $client->query ($flags, "text", \&cb)	3298	=item $success = $client->query ($flags, "text", \&cb)
3072		3299
3073	Queues a query to the client, calling the given callback with	3300	Queues a query to the client, calling the given callback with
…		…
3093		3320
3094	$self->send_packet ($self->{query_queue}[0][0])	3321	$self->send_packet ($self->{query_queue}[0][0])
3095	if @{ $self->{query_queue} } == 1;	3322	if @{ $self->{query_queue} } == 1;
3096		3323
3097	1	3324	1
		3325	}
		3326
		3327	=item $client->update_command_faces
		3328
		3329	=cut
		3330
		3331	our %COMMAND_FACE;
		3332
		3333	sub cf::client::update_command_faces {
		3334	my ($self) = @_;
		3335
		3336	my @faces = grep $_,
		3337	$COMMAND_FACE{preferred},
		3338	$COMMAND_FACE{standard},
		3339	$COMMAND_FACE{skill},
		3340	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3341	$COMMAND_FACE{emote},
		3342	;
		3343
		3344	$self->send_face ($_)
		3345	for @faces;
		3346	$self->flush_fx;
		3347
		3348	$self->ext_msg (command_list => @faces);
		3349	}
		3350
		3351	=item cf::client::set_command_face $type, $commands
		3352
		3353	=cut
		3354
		3355	sub cf::client::set_command_face {
		3356	my ($type, $list) = @_;
		3357
		3358	my $idx = &cf::face::set ( #d# ugly forward reference
		3359	"command_list/$type" => cf::FT_RSRC,
		3360	JSON::XS->new->utf8->encode ([ sort @$list ])
		3361	);
		3362
		3363	$COMMAND_FACE{$type} = $idx;
3098	}	3364	}
3099		3365
3100	cf::client->attach (	3366	cf::client->attach (
3101	on_connect => sub {	3367	on_connect => sub {
3102	my ($ns) = @_;	3368	my ($ns) = @_;
…		…
3128	my ($ns, $buf) = @_;	3394	my ($ns, $buf) = @_;
3129		3395
3130	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3396	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3131		3397
3132	if (ref $msg) {	3398	if (ref $msg) {
3133	my ($type, $reply, @payload) =	3399	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3134	"ARRAY" eq ref $msg
3135	? @$msg
3136	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3137		3400
3138	my @reply;
3139
3140	if (my $cb = $EXTICMD{$type}) {	3401	if (my $cb = $EXTIACMD{$type}) {
		3402	$cb->(
		3403	$ns,
		3404	sub {
		3405	$ns->ext_msg ("reply-$reply", @_)
		3406	if $reply;
		3407	},
		3408	@payload
		3409	);
		3410	} else {
		3411	my @reply;
		3412
		3413	if (my $cb = $EXTICMD{$type}) {
3141	@reply = $cb->($ns, @payload);	3414	@reply = $cb->($ns, @payload);
		3415	}
		3416
		3417	$ns->ext_msg ("reply-$reply", @reply)
		3418	if $reply;
3142	}	3419	}
3143
3144	$ns->ext_reply ($reply, @reply)
3145	if $reply;
3146
3147	} else {	3420	} else {
3148	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3421	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149	}	3422	}
3150		3423
3151	cf::override;	3424	cf::override;
3152	},	3425	},
3153	);	3426	);
…		…
3234	decrease split destroy change_exp value msg lore send_msg)],	3507	decrease split destroy change_exp value msg lore send_msg)],
3235	["cf::object::player" => qw(player)],	3508	["cf::object::player" => qw(player)],
3236	["cf::player" => qw(peaceful send_msg)],	3509	["cf::player" => qw(peaceful send_msg)],
3237	["cf::map" => qw(trigger)],	3510	["cf::map" => qw(trigger)],
3238	) {	3511	) {
3239	no strict 'refs';
3240	my ($pkg, @funs) = @$_;	3512	my ($pkg, @funs) = @$_;
3241	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3513	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242	for @funs;	3514	for @funs;
3243	}	3515	}
3244		3516
…		…
3283	local @cf::_safe_eval_args = values %vars;	3555	local @cf::_safe_eval_args = values %vars;
3284	@res = wantarray ? eval eval : scalar eval $eval;	3556	@res = wantarray ? eval eval : scalar eval $eval;
3285	}	3557	}
3286		3558
3287	if ($@) {	3559	if ($@) {
3288	warn "$@";	3560	warn "$@",
3289	warn "while executing safe code '$code'\n";	3561	"while executing safe code '$code'\n",
3290	warn "with arguments " . (join " ", %vars) . "\n";	3562	"with arguments " . (join " ", %vars) . "\n";
3291	}	3563	}
3292		3564
3293	wantarray ? @res : $res[0]	3565	wantarray ? @res : $res[0]
3294	}	3566	}
3295		3567
…		…
3320	=cut	3592	=cut
3321		3593
3322	#############################################################################	3594	#############################################################################
3323	# the server's init and main functions	3595	# the server's init and main functions
3324		3596
		3597	{
		3598	package cf::face;
		3599
		3600	our %HASH; # hash => idx
		3601	our @DATA; # dynamically-created facedata, only faceste 0 used
		3602	our @FOFS; # file offset, if > 0
		3603	our @SIZE; # size of face, in octets
		3604	our @META; # meta hash of face, if any
		3605	our $DATAFH; # facedata filehandle
		3606
		3607	# internal api, not finalised
		3608	sub set {
		3609	my ($name, $type, $data) = @_;
		3610
		3611	my $idx = cf::face::find $name;
		3612
		3613	if ($idx) {
		3614	delete $HASH{cf::face::get_csum $idx};
		3615	} else {
		3616	$idx = cf::face::alloc $name;
		3617	}
		3618
		3619	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3620
		3621	cf::face::set_type $idx, $type;
		3622	cf::face::set_csum $idx, 0, $hash;
		3623
		3624	# we need to destroy the SV itself, not just modify it, as a running ix
		3625	# might hold a reference to it: "delete" achieves that.
		3626	delete $FOFS[0][$idx];
		3627	delete $DATA[0][$idx];
		3628	$DATA[0][$idx] = $data;
		3629	$SIZE[0][$idx] = length $data;
		3630	delete $META[$idx];
		3631	$HASH{$hash} = $idx;#d#
		3632
		3633	$idx
		3634	}
		3635
		3636	sub _get_data($$$) {
		3637	my ($idx, $set, $cb) = @_;
		3638
		3639	if (defined $DATA[$set][$idx]) {
		3640	$cb->($DATA[$set][$idx]);
		3641	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3642	my $size = $SIZE[$set][$idx];
		3643	my $buf;
		3644	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3645	if ($_[0] == $size) {
		3646	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3647	$cb->($buf);
		3648	} else {
		3649	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3650	}
		3651	};
		3652	} else {
		3653	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3654	}
		3655	}
		3656
		3657	# rather ineffient
		3658	sub cf::face::get_data($;$) {
		3659	my ($idx, $set) = @_;
		3660
		3661	_get_data $idx, $set, Coro::rouse_cb;
		3662	Coro::rouse_wait
		3663	}
		3664
		3665	sub cf::face::ix {
		3666	my ($ns, $set, $idx, $pri) = @_;
		3667
		3668	_get_data $idx, $set, sub {
		3669	$ns->ix_send ($idx, $pri, $_[0]);
		3670	};
		3671	}
		3672	}
		3673
3325	sub load_facedata($) {	3674	sub load_facedata($) {
3326	my ($path) = @_;	3675	my ($path) = @_;
3327		3676
3328	# HACK to clear player env face cache, we need some signal framework
3329	# for this (global event?)
3330	%ext::player_env::MUSIC_FACE_CACHE = ();
3331
3332	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3677	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333		3678
3334	warn "loading facedata from $path\n";	3679	trace "loading facedata from $path\n";
3335		3680
3336	my $facedata;	3681	my $facedata = decode_storable load_file "$path/faceinfo";
3337	0 < aio_load $path, $facedata
3338	or die "$path: $!";
3339
3340	$facedata = Coro::Storable::thaw $facedata;
3341		3682
3342	$facedata->{version} == 2	3683	$facedata->{version} == 2
3343	or cf::cleanup "$path: version mismatch, cannot proceed.";	3684	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3344		3685
3345	# patch in the exptable	3686	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3346	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3687	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3347	$facedata->{resource}{"res/exp_table"} = {	3688
3348	type => FT_RSRC,	3689	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3349	data => $exp_table,	3690
3350	hash => (Digest::MD5::md5 $exp_table),	3691	# BEGIN ATOMIC
3351	};	3692	# from here on, everything must be atomic - no thread switch allowed
3352	cf::cede_to_tick;	3693	my $t1 = EV::time;
3353		3694
3354	{	3695	{
3355	my $faces = $facedata->{faceinfo};	3696	my $faces = $facedata->{faceinfo};
3356		3697
3357	while (my ($face, $info) = each %$faces) {	3698	for my $face (sort keys %$faces) {
		3699	my $info = $faces->{$face};
3358	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3700	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359		3701
3360	cf::face::set_visibility $idx, $info->{visibility};	3702	cf::face::set_visibility $idx, $info->{visibility};
3361	cf::face::set_magicmap $idx, $info->{magicmap};	3703	cf::face::set_magicmap $idx, $info->{magicmap};
3362	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3704	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3363	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3705	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3364		3706	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3365	cf::cede_to_tick;	3707	$cf::face::HASH{$info->{hash64}} = $idx;
		3708	delete $cf::face::META[$idx];
3366	}	3709	}
3367		3710
3368	while (my ($face, $info) = each %$faces) {	3711	while (my ($face, $info) = each %$faces) {
3369	next unless $info->{smooth};	3712	next unless $info->{smooth};
3370		3713
…		…
3373		3716
3374	if (my $smooth = cf::face::find $info->{smooth}) {	3717	if (my $smooth = cf::face::find $info->{smooth}) {
3375	cf::face::set_smooth $idx, $smooth;	3718	cf::face::set_smooth $idx, $smooth;
3376	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3719	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377	} else {	3720	} else {
3378	warn "smooth face '$info->{smooth}' not found for face '$face'";	3721	error "smooth face '$info->{smooth}' not found for face '$face'";
3379	}	3722	}
3380
3381	cf::cede_to_tick;
3382	}	3723	}
3383	}	3724	}
3384		3725
3385	{	3726	{
3386	my $anims = $facedata->{animinfo};	3727	my $anims = $facedata->{animinfo};
3387		3728
3388	while (my ($anim, $info) = each %$anims) {	3729	while (my ($anim, $info) = each %$anims) {
3389	cf::anim::set $anim, $info->{frames}, $info->{facings};	3730	cf::anim::set $anim, $info->{frames}, $info->{facings};
3390	cf::cede_to_tick;
3391	}	3731	}
3392		3732
3393	cf::anim::invalidate_all; # d'oh	3733	cf::anim::invalidate_all; # d'oh
3394	}	3734	}
3395		3735
3396	{	3736	{
3397	my $res = $facedata->{resource};	3737	my $res = $facedata->{resource};
3398		3738
3399	while (my ($name, $info) = each %$res) {	3739	while (my ($name, $info) = each %$res) {
3400	if (defined $info->{type}) {	3740	if (defined (my $type = $info->{type})) {
		3741	# TODO: different hash - must free and use new index, or cache ixface data queue
3401	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3742	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402		3743
3403	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404	cf::face::set_type $idx, $info->{type};	3744	cf::face::set_type $idx, $type;
		3745	cf::face::set_csum $idx, 0, $info->{hash};
		3746	$cf::face::SIZE[0][$idx] = $info->{size};
		3747	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3748	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3749	$cf::face::HASH{$info->{hash}} = $idx;
3405	} else {	3750	} else {
3406	$RESOURCE{$name} = $info;	3751	# $RESOURCE{$name} = $info; # unused
3407	}	3752	}
3408
3409	cf::cede_to_tick;
3410	}	3753	}
3411	}	3754	}
		3755
		3756	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3757
		3758	# HACK to clear player env face cache, we need some signal framework
		3759	# for this (global event?)
		3760	%ext::player_env::MUSIC_FACE_CACHE = ();
		3761
		3762	# END ATOMIC
		3763
		3764	cf::debug "facedata atomic update time ", EV::time - $t1;
3412		3765
3413	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3766	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414		3767
		3768	aio_close $fh if $fh; # close old facedata
		3769
3415	1	3770	1
3416	}	3771	}
3417
3418	cf::global->attach (on_resource_update => sub {
3419	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423	my $sound = $soundconf->{compat}[$_]
3424	or next;
3425
3426	my $face = cf::face::find "sound/$sound->[1]";
3427	cf::sound::set $sound->[0] => $face;
3428	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429	}
3430
3431	while (my ($k, $v) = each %{$soundconf->{event}}) {
3432	my $face = cf::face::find "sound/$v";
3433	cf::sound::set $k => $face;
3434	}
3435	}
3436	});
3437		3772
3438	register_exticmd fx_want => sub {	3773	register_exticmd fx_want => sub {
3439	my ($ns, $want) = @_;	3774	my ($ns, $want) = @_;
3440		3775
3441	while (my ($k, $v) = each %$want) {	3776	while (my ($k, $v) = each %$want) {
…		…
3449	my $status = load_resource_file_ $_[0];	3784	my $status = load_resource_file_ $_[0];
3450	get_slot 0.1, 100;	3785	get_slot 0.1, 100;
3451	cf::arch::commit_load;	3786	cf::arch::commit_load;
3452		3787
3453	$status	3788	$status
		3789	}
		3790
		3791	sub reload_exp_table {
		3792	_reload_exp_table;
		3793
		3794	cf::face::set
		3795	"res/exp_table" => FT_RSRC,
		3796	JSON::XS->new->utf8->canonical->encode (
		3797	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3798	);
		3799	}
		3800
		3801	sub reload_materials {
		3802	_reload_materials;
3454	}	3803	}
3455		3804
3456	sub reload_regions {	3805	sub reload_regions {
3457	# HACK to clear player env face cache, we need some signal framework	3806	# HACK to clear player env face cache, we need some signal framework
3458	# for this (global event?)	3807	# for this (global event?)
…		…
3466	if exists $_->{match};	3815	if exists $_->{match};
3467	}	3816	}
3468	}	3817	}
3469		3818
3470	sub reload_facedata {	3819	sub reload_facedata {
3471	load_facedata "$DATADIR/facedata"	3820	load_facedata $DATADIR
3472	or die "unable to load facedata\n";	3821	or die "unable to load facedata\n";
3473	}	3822	}
3474		3823
3475	sub reload_archetypes {	3824	sub reload_archetypes {
3476	load_resource_file "$DATADIR/archetypes"	3825	load_resource_file "$DATADIR/archetypes"
3477	or die "unable to load archetypes\n";	3826	or die "unable to load archetypes\n";
		3827
		3828	cf::face::set
		3829	"res/skill_info" => FT_RSRC,
		3830	JSON::XS->new->utf8->canonical->encode (
		3831	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3832	);
		3833
		3834	cf::face::set
		3835	"res/spell_paths" => FT_RSRC,
		3836	JSON::XS->new->utf8->canonical->encode (
		3837	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3838	);
		3839
		3840	# command completion
		3841	my @commands;
		3842
		3843	for (0..cf::arch::skillvec_size - 1) {
		3844	my $skill = cf::arch::skillvec $_;
		3845	my $name = $skill->name;
		3846	my $flags = cf::skill_flags $skill->subtype;
		3847
		3848	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3849	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3850	}
		3851
		3852	cf::client::set_command_face skill => \@commands;
3478	}	3853	}
3479		3854
3480	sub reload_treasures {	3855	sub reload_treasures {
3481	load_resource_file "$DATADIR/treasures"	3856	load_resource_file "$DATADIR/treasures"
3482	or die "unable to load treasurelists\n";	3857	or die "unable to load treasurelists\n";
3483	}	3858	}
3484		3859
		3860	sub reload_sound {
		3861	trace "loading sound config from $DATADIR/sound\n";
		3862
		3863	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3864
		3865	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3866	my $sound = $soundconf->{compat}[$_]
		3867	or next;
		3868
		3869	my $face = cf::face::find "sound/$sound->[1]";
		3870	cf::sound::set $sound->[0] => $face;
		3871	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3872	}
		3873
		3874	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3875	my $face = cf::face::find "sound/$v";
		3876	cf::sound::set $k => $face;
		3877	}
		3878	}
		3879
3485	sub reload_resources {	3880	sub reload_resources {
3486	warn "reloading resource files...\n";	3881	trace "reloading resource files...\n";
3487		3882
		3883	reload_materials;
3488	reload_facedata;	3884	reload_facedata;
		3885	reload_exp_table;
		3886	reload_sound;
3489	reload_archetypes;	3887	reload_archetypes;
3490	reload_regions;	3888	reload_regions;
3491	reload_treasures;	3889	reload_treasures;
3492		3890
3493	warn "finished reloading resource files\n";	3891	trace "finished reloading resource files\n";
3494	}	3892	}
3495		3893
3496	sub reload_config {	3894	sub reload_config {
3497	warn "reloading config file...\n";	3895	trace "reloading config file...\n";
3498		3896
3499	open my $fh, "<:utf8", "$CONFDIR/config"	3897	my $config = load_file "$CONFDIR/config";
3500	or return;	3898	utf8::decode $config;
		3899	*CFG = decode_yaml $config;
3501		3900
3502	local $/;
3503	*CFG = YAML::XS::Load scalar <$fh>;
3504
3505	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3901	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506		3902
3507	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3903	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3904	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509		3905
3510	if (exists $CFG{mlockall}) {	3906	if (exists $CFG{mlockall}) {
…		…
3512	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3908	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513	and die "WARNING: m(un)lockall failed: $!\n";	3909	and die "WARNING: m(un)lockall failed: $!\n";
3514	};	3910	};
3515	warn $@ if $@;	3911	warn $@ if $@;
3516	}	3912	}
3517
3518	warn "finished reloading resource files\n";
3519	}	3913	}
3520		3914
3521	sub pidfile() {	3915	sub pidfile() {
3522	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3916	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523	or die "$PIDFILE: $!";	3917	or die "$PIDFILE: $!";
…		…
3536	seek $fh, 0, 0;	3930	seek $fh, 0, 0;
3537	print $fh $$;	3931	print $fh $$;
3538	}	3932	}
3539		3933
3540	sub main_loop {	3934	sub main_loop {
3541	warn "EV::loop starting\n";	3935	trace "EV::run starting\n";
3542	if (1) {	3936	if (1) {
3543	EV::loop;	3937	EV::run;
3544	}	3938	}
3545	warn "EV::loop returned\n";	3939	trace "EV::run returned\n";
3546	goto &main_loop unless $REALLY_UNLOOP;	3940	goto &main_loop unless $REALLY_UNLOOP;
3547	}	3941	}
3548		3942
3549	sub main {	3943	sub main {
3550	cf::init_globals; # initialise logging	3944	cf::init_globals; # initialise logging
3551		3945
3552	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3946	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3947	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3948	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3949	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556		3950
3557	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3951	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558		3952
3559	# we must not ever block the main coroutine	3953	# we must not ever block the main coroutine
3560	local $Coro::idle = sub {	3954	$Coro::idle = sub {
3561	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3955	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3562	(async {	3956	(async {
3563	$Coro::current->{desc} = "IDLE BUG HANDLER";	3957	$Coro::current->{desc} = "IDLE BUG HANDLER";
3564	EV::loop EV::LOOP_ONESHOT;	3958	EV::run EV::RUN_ONCE;
3565	})->prio (Coro::PRIO_MAX);	3959	})->prio (Coro::PRIO_MAX);
3566	};	3960	};
3567		3961
3568	evthread_start IO::AIO::poll_fileno;	3962	evthread_start IO::AIO::poll_fileno;
3569		3963
3570	cf::sync_job {	3964	cf::sync_job {
3571	cf::init_experience;	3965	cf::incloader::init ();
		3966
		3967	db_init;
		3968
3572	cf::init_anim;	3969	cf::init_anim;
3573	cf::init_attackmess;	3970	cf::init_attackmess;
3574	cf::init_dynamic;	3971	cf::init_dynamic;
3575		3972
3576	cf::load_settings;	3973	cf::load_settings;
3577	cf::load_materials;
3578		3974
3579	reload_resources;	3975	reload_resources;
3580	reload_config;	3976	reload_config;
3581	db_init;
3582		3977
3583	cf::init_uuid;	3978	cf::init_uuid;
3584	cf::init_signals;	3979	cf::init_signals;
3585	cf::init_skills;	3980	cf::init_skills;
3586		3981
…		…
3594		3989
3595	# no (long-running) fork's whatsoever before this point(!)	3990	# no (long-running) fork's whatsoever before this point(!)
3596	use POSIX ();	3991	use POSIX ();
3597	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3992	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598		3993
3599	(pop @POST_INIT)->(0) while @POST_INIT;	3994	cf::_post_init 0;
3600	};	3995	};
3601		3996
3602	cf::object::thawer::errors_are_fatal 0;	3997	cf::object::thawer::errors_are_fatal 0;
3603	warn "parse errors in files are no longer fatal from this point on.\n";	3998	info "parse errors in files are no longer fatal from this point on.\n";
3604		3999
		4000	AE::postpone {
		4001	undef &main; # free gobs of memory :)
		4002	};
		4003
3605	main_loop;	4004	goto &main_loop;
3606	}	4005	}
3607		4006
3608	#############################################################################	4007	#############################################################################
3609	# initialisation and cleanup	4008	# initialisation and cleanup
3610		4009
…		…
3649	or return;	4048	or return;
3650		4049
3651	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4050	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652	and return;	4051	and return;
3653		4052
3654	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4053	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655		4054
3656	1	4055	1
3657	}	4056	}
3658		4057
3659	our $uuid_lock;	4058	our $uuid_lock;
…		…
3671	or return;	4070	or return;
3672		4071
3673	my $value = uuid_seq uuid_cur;	4072	my $value = uuid_seq uuid_cur;
3674		4073
3675	unless ($value) {	4074	unless ($value) {
3676	warn "cowardly refusing to write zero uuid value!\n";	4075	info "cowardly refusing to write zero uuid value!\n";
3677	return;	4076	return;
3678	}	4077	}
3679		4078
3680	my $value = uuid_str $value + $uuid_skip;	4079	my $value = uuid_str $value + $uuid_skip;
3681	$uuid_skip = 0;	4080	$uuid_skip = 0;
…		…
3691	or return;	4090	or return;
3692		4091
3693	aio_rename "$uuid~", $uuid	4092	aio_rename "$uuid~", $uuid
3694	and return;	4093	and return;
3695		4094
3696	warn "uuid file written ($value).\n";	4095	trace "uuid file written ($value).\n";
3697		4096
3698	1	4097	1
3699		4098
3700	}	4099	}
3701		4100
…		…
3707	}	4106	}
3708		4107
3709	sub emergency_save() {	4108	sub emergency_save() {
3710	my $freeze_guard = cf::freeze_mainloop;	4109	my $freeze_guard = cf::freeze_mainloop;
3711		4110
3712	warn "emergency_perl_save: enter\n";	4111	info "emergency_perl_save: enter\n";
		4112
		4113	# this is a trade-off: we want to be very quick here, so
		4114	# save all maps without fsync, and later call a global sync
		4115	# (which in turn might be very very slow)
		4116	local $USE_FSYNC = 0;
3713		4117
3714	cf::sync_job {	4118	cf::sync_job {
3715	# this is a trade-off: we want to be very quick here, so	4119	cf::write_runtime_sync; # external watchdog should not bark
3716	# save all maps without fsync, and later call a global sync
3717	# (which in turn might be very very slow)
3718	local $USE_FSYNC = 0;
3719		4120
3720	# use a peculiar iteration method to avoid tripping on perl	4121	# use a peculiar iteration method to avoid tripping on perl
3721	# refcount bugs in for. also avoids problems with players	4122	# refcount bugs in for. also avoids problems with players
3722	# and maps saved/destroyed asynchronously.	4123	# and maps saved/destroyed asynchronously.
3723	warn "emergency_perl_save: begin player save\n";	4124	info "emergency_perl_save: begin player save\n";
3724	for my $login (keys %cf::PLAYER) {	4125	for my $login (keys %cf::PLAYER) {
3725	my $pl = $cf::PLAYER{$login} or next;	4126	my $pl = $cf::PLAYER{$login} or next;
3726	$pl->valid or next;	4127	$pl->valid or next;
3727	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4128	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728	$pl->save;	4129	$pl->save;
3729	}	4130	}
3730	warn "emergency_perl_save: end player save\n";	4131	info "emergency_perl_save: end player save\n";
3731		4132
		4133	cf::write_runtime_sync; # external watchdog should not bark
		4134
3732	warn "emergency_perl_save: begin map save\n";	4135	info "emergency_perl_save: begin map save\n";
3733	for my $path (keys %cf::MAP) {	4136	for my $path (keys %cf::MAP) {
3734	my $map = $cf::MAP{$path} or next;	4137	my $map = $cf::MAP{$path} or next;
3735	$map->valid or next;	4138	$map->valid or next;
3736	$map->save;	4139	$map->save;
3737	}	4140	}
3738	warn "emergency_perl_save: end map save\n";	4141	info "emergency_perl_save: end map save\n";
3739		4142
		4143	cf::write_runtime_sync; # external watchdog should not bark
		4144
3740	warn "emergency_perl_save: begin database checkpoint\n";	4145	info "emergency_perl_save: begin database checkpoint\n";
3741	BDB::db_env_txn_checkpoint $DB_ENV;	4146	BDB::db_env_txn_checkpoint $DB_ENV;
3742	warn "emergency_perl_save: end database checkpoint\n";	4147	info "emergency_perl_save: end database checkpoint\n";
3743		4148
3744	warn "emergency_perl_save: begin write uuid\n";	4149	info "emergency_perl_save: begin write uuid\n";
3745	write_uuid_sync 1;	4150	write_uuid_sync 1;
3746	warn "emergency_perl_save: end write uuid\n";	4151	info "emergency_perl_save: end write uuid\n";
		4152
		4153	cf::write_runtime_sync; # external watchdog should not bark
		4154
		4155	trace "emergency_perl_save: syncing database to disk";
		4156	BDB::db_env_txn_checkpoint $DB_ENV;
		4157
		4158	info "emergency_perl_save: starting sync\n";
		4159	IO::AIO::aio_sync sub {
		4160	info "emergency_perl_save: finished sync\n";
		4161	};
		4162
		4163	cf::write_runtime_sync; # external watchdog should not bark
		4164
		4165	trace "emergency_perl_save: flushing outstanding aio requests";
		4166	while (IO::AIO::nreqs || BDB::nreqs) {
		4167	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4168	}
		4169
		4170	cf::write_runtime_sync; # external watchdog should not bark
3747	};	4171	};
3748		4172
3749	warn "emergency_perl_save: starting sync()\n";
3750	IO::AIO::aio_sync sub {
3751	warn "emergency_perl_save: finished sync()\n";
3752	};
3753
3754	warn "emergency_perl_save: leave\n";	4173	info "emergency_perl_save: leave\n";
3755	}	4174	}
3756		4175
3757	sub post_cleanup {	4176	sub post_cleanup {
3758	my ($make_core) = @_;	4177	my ($make_core) = @_;
3759		4178
		4179	IO::AIO::flush;
		4180
3760	warn Carp::longmess "post_cleanup backtrace"	4181	error Carp::longmess "post_cleanup backtrace"
3761	if $make_core;	4182	if $make_core;
3762		4183
3763	my $fh = pidfile;	4184	my $fh = pidfile;
3764	unlink $PIDFILE if <$fh> == $$;	4185	unlink $PIDFILE if <$fh> == $$;
3765	}	4186	}
…		…
3785	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4206	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3786	for my $name (keys %$leaf_symtab) {	4207	for my $name (keys %$leaf_symtab) {
3787	_gv_clear *{"$pkg$name"};	4208	_gv_clear *{"$pkg$name"};
3788	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4209	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3789	}	4210	}
3790	warn "cleared package $pkg\n";#d#
3791	}	4211	}
3792		4212
3793	sub do_reload_perl() {	4213	sub do_reload_perl() {
3794	# can/must only be called in main	4214	# can/must only be called in main
3795	if ($Coro::current != $Coro::main) {	4215	unless (in_main) {
3796	warn "can only reload from main coroutine";	4216	error "can only reload from main coroutine";
3797	return;	4217	return;
3798	}	4218	}
3799		4219
3800	return if $RELOAD++;	4220	return if $RELOAD++;
3801		4221
3802	my $t1 = AE::time;	4222	my $t1 = AE::time;
3803		4223
3804	while ($RELOAD) {	4224	while ($RELOAD) {
3805	warn "reloading...";	4225	cf::get_slot 0.1, -1, "reload_perl";
		4226	info "perl_reload: reloading...";
3806		4227
3807	warn "entering sync_job";	4228	trace "perl_reload: entering sync_job";
3808		4229
3809	cf::sync_job {	4230	cf::sync_job {
3810	cf::write_runtime_sync; # external watchdog should not bark
3811	cf::emergency_save;	4231	#cf::emergency_save;
3812	cf::write_runtime_sync; # external watchdog should not bark
3813		4232
3814	warn "syncing database to disk";
3815	BDB::db_env_txn_checkpoint $DB_ENV;
3816
3817	# if anything goes wrong in here, we should simply crash as we already saved
3818
3819	warn "flushing outstanding aio requests";
3820	while (IO::AIO::nreqs || BDB::nreqs) {
3821	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3822	}
3823
3824	warn "cancelling all extension coros";	4233	trace "perl_reload: cancelling all extension coros";
3825	$_->cancel for values %EXT_CORO;	4234	$_->cancel for values %EXT_CORO;
3826	%EXT_CORO = ();	4235	%EXT_CORO = ();
3827		4236
3828	warn "removing commands";	4237	trace "perl_reload: removing commands";
3829	%COMMAND = ();	4238	%COMMAND = ();
3830		4239
3831	warn "removing ext/exti commands";	4240	trace "perl_reload: removing ext/exti commands";
3832	%EXTCMD = ();	4241	%EXTCMD = ();
3833	%EXTICMD = ();	4242	%EXTICMD = ();
3834		4243
3835	warn "unloading/nuking all extensions";	4244	trace "perl_reload: unloading/nuking all extensions";
3836	for my $pkg (@EXTS) {	4245	for my $pkg (@EXTS) {
3837	warn "... unloading $pkg";	4246	trace "... unloading $pkg";
3838		4247
3839	if (my $cb = $pkg->can ("unload")) {	4248	if (my $cb = $pkg->can ("unload")) {
3840	eval {	4249	eval {
3841	$cb->($pkg);	4250	$cb->($pkg);
3842	1	4251	1
3843	} or warn "$pkg unloaded, but with errors: $@";	4252	} or error "$pkg unloaded, but with errors: $@";
3844	}	4253	}
3845		4254
3846	warn "... clearing $pkg";	4255	trace "... clearing $pkg";
3847	clear_package $pkg;	4256	clear_package $pkg;
3848	}	4257	}
3849		4258
3850	warn "unloading all perl modules loaded from $LIBDIR";	4259	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3851	while (my ($k, $v) = each %INC) {	4260	while (my ($k, $v) = each %INC) {
3852	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4261	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3853		4262
3854	warn "... unloading $k";	4263	trace "... unloading $k";
3855	delete $INC{$k};	4264	delete $INC{$k};
3856		4265
3857	$k =~ s/\.pm$//;	4266	$k =~ s/\.pm$//;
3858	$k =~ s/\//::/g;	4267	$k =~ s/\//::/g;
3859		4268
…		…
3862	}	4271	}
3863		4272
3864	clear_package $k;	4273	clear_package $k;
3865	}	4274	}
3866		4275
3867	warn "getting rid of safe::, as good as possible";	4276	trace "perl_reload: getting rid of safe::, as good as possible";
3868	clear_package "safe::$_"	4277	clear_package "safe::$_"
3869	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4278	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3870		4279
3871	warn "unloading cf.pm \"a bit\"";	4280	trace "perl_reload: unloading cf.pm \"a bit\"";
3872	delete $INC{"cf.pm"};	4281	delete $INC{"cf.pm"};
3873	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4282	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3874		4283
3875	# don't, removes xs symbols, too,	4284	# don't, removes xs symbols, too,
3876	# and global variables created in xs	4285	# and global variables created in xs
3877	#clear_package __PACKAGE__;	4286	#clear_package __PACKAGE__;
3878		4287
3879	warn "unload completed, starting to reload now";	4288	info "perl_reload: unload completed, starting to reload now";
3880		4289
3881	warn "reloading cf.pm";	4290	trace "perl_reload: reloading cf.pm";
3882	require cf;	4291	require cf;
3883	cf::_connect_to_perl_1;	4292	cf::_connect_to_perl_1;
3884		4293
3885	warn "loading config and database again";	4294	trace "perl_reload: loading config and database again";
3886	cf::reload_config;	4295	cf::reload_config;
3887		4296
3888	warn "loading extensions";	4297	trace "perl_reload: loading extensions";
3889	cf::load_extensions;	4298	cf::load_extensions;
3890		4299
3891	if ($REATTACH_ON_RELOAD) {	4300	if ($REATTACH_ON_RELOAD) {
3892	warn "reattaching attachments to objects/players";	4301	trace "perl_reload: reattaching attachments to objects/players";
3893	_global_reattach; # objects, sockets	4302	_global_reattach; # objects, sockets
3894	warn "reattaching attachments to maps";	4303	trace "perl_reload: reattaching attachments to maps";
3895	reattach $_ for values %MAP;	4304	reattach $_ for values %MAP;
3896	warn "reattaching attachments to players";	4305	trace "perl_reload: reattaching attachments to players";
3897	reattach $_ for values %PLAYER;	4306	reattach $_ for values %PLAYER;
3898	}	4307	}
3899		4308
3900	warn "running post_init jobs";	4309	cf::_post_init 1;
3901	(pop @POST_INIT)->(1) while @POST_INIT;
3902		4310
3903	warn "leaving sync_job";	4311	trace "perl_reload: leaving sync_job";
3904		4312
3905	1	4313	1
3906	} or do {	4314	} or do {
3907	warn $@;	4315	error $@;
3908	cf::cleanup "error while reloading, exiting.";	4316	cf::cleanup "perl_reload: error, exiting.";
3909	};	4317	};
3910		4318
3911	warn "reloaded";
3912	--$RELOAD;	4319	--$RELOAD;
3913	}	4320	}
3914		4321
3915	$t1 = AE::time - $t1;	4322	$t1 = AE::time - $t1;
3916	warn "reload completed in ${t1}s\n";	4323	info "perl_reload: completed in ${t1}s\n";
3917	};	4324	};
3918		4325
3919	our $RELOAD_WATCHER; # used only during reload	4326	our $RELOAD_WATCHER; # used only during reload
3920		4327
3921	sub reload_perl() {	4328	sub reload_perl() {
…		…
3942	reload_perl;	4349	reload_perl;
3943	};	4350	};
3944	}	4351	}
3945	};	4352	};
3946		4353
3947	unshift @INC, $LIBDIR;	4354	#############################################################################
3948		4355
3949	my $bug_warning = 0;	4356	my $bug_warning = 0;
3950		4357
3951	our @WAIT_FOR_TICK;
3952	our @WAIT_FOR_TICK_BEGIN;
3953
3954	sub wait_for_tick {	4358	sub wait_for_tick() {
3955	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4359	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3956		4360
3957	my $signal = new Coro::Signal;	4361	$WAIT_FOR_TICK->wait;
3958	push @WAIT_FOR_TICK, $signal;
3959	$signal->wait;
3960	}	4362	}
3961		4363
3962	sub wait_for_tick_begin {	4364	sub wait_for_tick_begin() {
3963	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4365	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3964		4366
3965	my $signal = new Coro::Signal;	4367	my $signal = new Coro::Signal;
3966	push @WAIT_FOR_TICK_BEGIN, $signal;	4368	push @WAIT_FOR_TICK_BEGIN, $signal;
3967	$signal->wait;	4369	$signal->wait;
3968	}	4370	}
…		…
3972	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4374	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3973	unless ++$bug_warning > 10;	4375	unless ++$bug_warning > 10;
3974	return;	4376	return;
3975	}	4377	}
3976		4378
3977	cf::server_tick; # one server iteration	4379	cf::one_tick; # one server iteration
3978		4380
3979	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4381	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3980		4382
3981	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4383	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3982	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4384	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3983	Coro::async_pool {	4385	Coro::async_pool {
3984	$Coro::current->{desc} = "runtime saver";	4386	$Coro::current->{desc} = "runtime saver";
3985	write_runtime_sync	4387	write_runtime_sync
3986	or warn "ERROR: unable to write runtime file: $!";	4388	or error "ERROR: unable to write runtime file: $!";
3987	};	4389	};
3988	}	4390	}
3989		4391
3990	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4392	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3991	$sig->send;	4393	$sig->send;
3992	}	4394	}
3993	while (my $sig = shift @WAIT_FOR_TICK) {	4395	$WAIT_FOR_TICK->broadcast;
3994	$sig->send;
3995	}
3996		4396
3997	$LOAD = ($NOW - $TICK_START) / $TICK;	4397	$LOAD = ($NOW - $TICK_START) / $TICK;
3998	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4398	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3999		4399
4000	if (0) {	4400	if (0) {
4001	if ($NEXT_TICK) {	4401	if ($NEXT_TICK) {
4002	my $jitter = $TICK_START - $NEXT_TICK;	4402	my $jitter = $TICK_START - $NEXT_TICK;
4003	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4403	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4004	warn "jitter $JITTER\n";#d#	4404	debug "jitter $JITTER\n";#d#
4005	}	4405	}
4006	}	4406	}
4007	}	4407	}
4008		4408
4009	{	4409	{
4010	# configure BDB	4410	# configure BDB
		4411	info "initialising database";
4011		4412
4012	BDB::min_parallel 16;	4413	BDB::min_parallel 16;
4013	BDB::max_poll_reqs $TICK * 0.1;	4414	BDB::max_poll_reqs $TICK * 0.1;
4014	$AnyEvent::BDB::WATCHER->priority (1);	4415	#$AnyEvent::BDB::WATCHER->priority (1);
4015		4416
4016	unless ($DB_ENV) {	4417	unless ($DB_ENV) {
4017	$DB_ENV = BDB::db_env_create;	4418	$DB_ENV = BDB::db_env_create;
4018	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4419	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4019	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4420	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4044	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4445	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4045	};	4446	};
4046	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4447	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4047	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4448	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4048	};	4449	};
		4450
		4451	info "database initialised";
4049	}	4452	}
4050		4453
4051	{	4454	{
4052	# configure IO::AIO	4455	# configure IO::AIO
4053		4456
		4457	info "initialising aio";
4054	IO::AIO::min_parallel 8;	4458	IO::AIO::min_parallel 8;
4055	IO::AIO::max_poll_time $TICK * 0.1;	4459	IO::AIO::max_poll_time $TICK * 0.1;
4056	undef $AnyEvent::AIO::WATCHER;	4460	undef $AnyEvent::AIO::WATCHER;
		4461	info "aio initialised";
4057	}	4462	}
4058		4463
4059	my $_log_backtrace;	4464	our $_log_backtrace;
		4465	our $_log_backtrace_last;
4060		4466
4061	sub _log_backtrace {	4467	sub _log_backtrace {
4062	my ($msg, @addr) = @_;	4468	my ($msg, @addr) = @_;
4063		4469
4064	$msg =~ s/\n//;	4470	$msg =~ s/\n$//;
4065		4471
		4472	if ($_log_backtrace_last eq $msg) {
		4473	LOG llevInfo, "[ABT] $msg\n";
		4474	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4066	# limit the # of concurrent backtraces	4475	# limit the # of concurrent backtraces
4067	if ($_log_backtrace < 2) {	4476	} elsif ($_log_backtrace < 2) {
		4477	$_log_backtrace_last = $msg;
4068	++$_log_backtrace;	4478	++$_log_backtrace;
4069	my $perl_bt = Carp::longmess $msg;	4479	my $perl_bt = Carp::longmess $msg;
4070	async {	4480	async {
4071	$Coro::current->{desc} = "abt $msg";	4481	$Coro::current->{desc} = "abt $msg";
4072		4482
…		…
4092	LOG llevInfo, "[ABT] $_\n" for @bt;	4502	LOG llevInfo, "[ABT] $_\n" for @bt;
4093	--$_log_backtrace;	4503	--$_log_backtrace;
4094	};	4504	};
4095	} else {	4505	} else {
4096	LOG llevInfo, "[ABT] $msg\n";	4506	LOG llevInfo, "[ABT] $msg\n";
4097	LOG llevInfo, "[ABT] [suppressed]\n";	4507	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4098	}	4508	}
4099	}	4509	}
4100		4510
4101	# load additional modules	4511	# load additional modules
4102	require "cf/$_.pm" for @EXTRA_MODULES;	4512	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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