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.529 by root, Wed Apr 28 11:28:22 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

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

Diff Legend

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