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.524 by root, Sun Apr 18 07:08:07 2010 UTC vs.
Revision 1.624 by root, Sat Nov 17 23:40:02 2018 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
		4	# Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	6	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	7	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	8	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	9	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	10	# option) any later version.
10	#	11	#
11	# This program is distributed in the hope that it will be useful,	12	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	13	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	15	# GNU General Public License for more details.
15	#	16	#
16	# You should have received a copy of the Affero GNU General Public License	17	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	18	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	19	# <http://www.gnu.org/licenses/>.
19	#	20	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	21	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	22	#
22		23
23	package cf;	24	package cf;
24		25
25	use 5.10.0;	26	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		27
29	use Symbol;	28	use Symbol;
30	use List::Util;	29	use List::Util;
31	use Socket;	30	use Socket;
32	use EV;	31	use EV;
…		…
34	use Safe;	33	use Safe;
35	use Safe::Hole;	34	use Safe::Hole;
36	use Storable ();	35	use Storable ();
37	use Carp ();	36	use Carp ();
38		37
39	use Guard ();	38	use AnyEvent ();
		39	use AnyEvent::IO ();
		40	use AnyEvent::DNS ();
		41
40	use Coro ();	42	use Coro ();
41	use Coro::State;	43	use Coro::State;
42	use Coro::Handle;	44	use Coro::Handle;
43	use Coro::EV;	45	use Coro::EV;
44	use Coro::AnyEvent;	46	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	52	use Coro::AIO;
51	use Coro::BDB 1.6;	53	use Coro::BDB 1.6;
52	use Coro::Storable;	54	use Coro::Storable;
53	use Coro::Util ();	55	use Coro::Util ();
54		56
		57	use Guard ();
55	use JSON::XS 2.01 ();	58	use JSON::XS 2.01 ();
56	use BDB ();	59	use BDB ();
57	use Data::Dumper;	60	use Data::Dumper;
58	use Fcntl;	61	use Fcntl;
59	use YAML::XS ();	62	use YAML::XS ();
		63	use CBOR::XS ();
60	use IO::AIO ();	64	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	65	use Compress::LZF;
63	use Digest::MD5 ();	66	use Digest::MD5 ();
64		67
65	AnyEvent::detect;	68	AnyEvent::detect;
66		69
…		…
78	# strictly for debugging	81	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	82	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		83
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	84	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		85
		86	our @ORIG_INC;
		87
83	our %COMMAND = ();	88	our %COMMAND = ();
84	our %COMMAND_TIME = ();	89	our %COMMAND_TIME = ();
85		90
86	our @EXTS = (); # list of extension package names	91	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	92	our %EXTCMD = ();
		93	our %EXTACMD = ();
88	our %EXTICMD = ();	94	our %EXTICMD = ();
		95	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	96	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	97	our %EXT_MAP = (); # pluggable maps
91		98
92	our $RELOAD; # number of reloads so far, non-zero while in reload	99	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	100	our @EVENT;
94	our @REFLECT; # set by XS	101	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	102	our %REFLECT; # set by us
96		103
97	our $CONFDIR = confdir;	104	our $CONFDIR = confdir;
		105
98	our $DATADIR = datadir;	106	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	107	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	108	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	109	our $MAPDIR = "$DATADIR/" . mapdir;
		110
102	our $LOCALDIR = localdir;	111	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	112	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	113	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	114	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	115	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	116	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	117	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	118	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		119
111	our %RESOURCE;	120	#our %RESOURCE; # unused
112		121
113	our $OUTPUT_RATE_MIN = 4000;	122	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	123	our $OUTPUT_RATE_MAX = 1000000;
		124
		125	our $MAX_LINKS = 32; # how many chained exits to follow
		126	our $VERBOSE_IO = 1;
115		127
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	128	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	129	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	130	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	131	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	133	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	134	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	135	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	136	our $DB_ENV;
125		137
126	our @EXTRA_MODULES = qw(pod match mapscript);	138	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		139
128	our %CFG;	140	our %CFG;
		141	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		142
130	our $UPTIME; $UPTIME ||= time;	143	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	144	our $RUNTIME = 0;
		145	our $SERVER_TICK = 0;
132	our $NOW;	146	our $NOW;
133		147
134	our (%PLAYER, %PLAYER_LOADING); # all users	148	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	149	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	150	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		159
146	our @POST_INIT;	160	our @POST_INIT;
147		161
148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	162	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149	our $REALLY_UNLOOP; # never set to true, please :)	163	our $REALLY_UNLOOP; # never set to true, please :)
		164
		165	our $WAIT_FOR_TICK = new Coro::Signal;
		166	our @WAIT_FOR_TICK_BEGIN;
150		167
151	binmode STDOUT;	168	binmode STDOUT;
152	binmode STDERR;	169	binmode STDERR;
153		170
154	# read virtual server time, if available	171	# read virtual server time, if available
…		…
188		205
189	=over 4	206	=over 4
190		207
191	=item $cf::UPTIME	208	=item $cf::UPTIME
192		209
193	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.
194		226
195	=item $cf::RUNTIME	227	=item $cf::RUNTIME
196		228
197	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
198	every server tick.	230	every server tick.
199		231
200	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	232	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
201	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	233	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
202	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	234	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
203		235
204	Various directories - "/etc", read-only install directory, perl-library	236	Various directories - "/etc", read-only install directory, perl-library
205	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	237	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
206	unique-items directory, player file directory, random maps directory and	238	unique-items directory, player file directory, random maps directory and
207	database environment.	239	database environment.
208		240
209	=item $cf::NOW
210
211	The time of the last (current) server tick.
212
213	=item $cf::TICK
214
215	The interval between server ticks, in seconds.
216
217	=item $cf::LOADAVG	241	=item $cf::LOADAVG
218		242
219	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
220	(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
221	objects per tick. Healthy values are < 0.5.	245	objects per tick. Healthy values are < 0.5.
…		…
229	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
230	from wherever your confdir points to.	254	from wherever your confdir points to.
231		255
232	=item cf::wait_for_tick, cf::wait_for_tick_begin	256	=item cf::wait_for_tick, cf::wait_for_tick_begin
233		257
234	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.
235	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
236	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();
237		279
238	=item @cf::INVOKE_RESULTS	280	=item @cf::INVOKE_RESULTS
239		281
240	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
241	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
…		…
249		291
250	=back	292	=back
251		293
252	=cut	294	=cut
253		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
254	$Coro::State::WARNHOOK = sub {	302	$Coro::State::WARNHOOK = sub {
255	my $msg = join "", @_;	303	my $msg = join "", @_;
256		304
257	$msg .= "\n"	305	$msg .= "\n"
258	unless $msg =~ /\n$/;	306	unless $msg =~ /\n$/;
259		307
260	$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;
261		309
262	LOG llevError, $msg;	310	LOG llevWarn, $msg;
263	};	311	};
264		312
265	$Coro::State::DIEHOOK = sub {	313	$Coro::State::DIEHOOK = sub {
266	return unless $^S eq 0; # "eq", not "=="	314	return unless $^S eq 0; # "eq", not "=="
267		315
268	warn Carp::longmess $_[0];	316	error Carp::longmess $_[0];
269		317
270	if (in_main) {#d#	318	if (in_main) {#d#
271	warn "DIEHOOK called in main context, Coro bug?\n";#d#	319	error "DIEHOOK called in main context, Coro bug?\n";#d#
272	return;#d#	320	return;#d#
273	}#d#	321	}#d#
274		322
275	# kill coroutine otherwise	323	# kill coroutine otherwise
276	Coro::terminate	324	Coro::terminate
…		…
296	)) {	344	)) {
297	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	345	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
298	}	346	}
299		347
300	$EV::DIED = sub {	348	$EV::DIED = sub {
301	Carp::cluck "error in event callback: @_";	349	warn "error in event callback: $@";
302	};	350	};
		351
		352	#############################################################################
		353
		354	sub fork_call(&@);
		355	sub get_slot($;$$);
303		356
304	#############################################################################	357	#############################################################################
305		358
306	=head2 UTILITY FUNCTIONS	359	=head2 UTILITY FUNCTIONS
307		360
…		…
328	$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;
329	$d	382	$d
330	} || "[unable to dump $_[0]: '$@']";	383	} || "[unable to dump $_[0]: '$@']";
331	}	384	}
332		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
333	=item $ref = cf::decode_json $json	438	=item $ref = cf::decode_json $json
334		439
335	Converts a JSON string into the corresponding perl data structure.	440	Converts a JSON string into the corresponding perl data structure.
336		441
337	=item $json = cf::encode_json $ref	442	=item $json = cf::encode_json $ref
…		…
343	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
344		449
345	sub encode_json($) { $json_coder->encode ($_[0]) }	450	sub encode_json($) { $json_coder->encode ($_[0]) }
346	sub decode_json($) { $json_coder->decode ($_[0]) }	451	sub decode_json($) { $json_coder->decode ($_[0]) }
347		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
348	=item cf::post_init { BLOCK }	498	=item cf::post_init { BLOCK }
349		499
350	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,
351	but I<before> the server starts ticking again.	501	but I<before> the server starts ticking again.
352		502
353	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
354	is a reload or not.	504	is a reload or not.
355		505
356	=cut	506	=cut
357		507
358	sub post_init(&) {	508	sub post_init(&) {
359	push @POST_INIT, shift;	509	push @POST_INIT, shift;
360	}	510	}
361		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
362	=item cf::lock_wait $string	529	=item cf::lock_wait $string
363		530
364	Wait until the given lock is available. See cf::lock_acquire.	531	Wait until the given lock is available. See cf::lock_acquire.
365		532
366	=item my $lock = cf::lock_acquire $string	533	=item my $lock = cf::lock_acquire $string
367		534
368	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
369	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,
…		…
417	EV::periodic $start, $interval, 0, $cb	584	EV::periodic $start, $interval, 0, $cb
418	}	585	}
419		586
420	=item cf::get_slot $time[, $priority[, $name]]	587	=item cf::get_slot $time[, $priority[, $name]]
421		588
422	Allocate $time seconds of blocking CPU time at priority C<$priority>:	589	Allocate $time seconds of blocking CPU time at priority C<$priority>
423	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
424	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.
425		596
426	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
427	used for statistical purposes and should identify the same time-class.	598	used for statistical purposes and should identify the same time-class.
428		599
429	Useful for short background jobs.	600	Useful for short background jobs.
…		…
441	my $signal = new Coro::Signal;	612	my $signal = new Coro::Signal;
442	my $busy;	613	my $busy;
443		614
444	while () {	615	while () {
445	next_job:	616	next_job:
		617
		618	Coro::cede;
446		619
447	my $avail = cf::till_tick;	620	my $avail = cf::till_tick;
448		621
449	for (0 .. $#SLOT_QUEUE) {	622	for (0 .. $#SLOT_QUEUE) {
450	if ($SLOT_QUEUE[$_][0] <= $avail) {	623	if ($SLOT_QUEUE[$_][0] <= $avail) {
451	$busy = 0;	624	$busy = 0;
452	my $job = splice @SLOT_QUEUE, $_, 1, ();	625	my $job = splice @SLOT_QUEUE, $_, 1, ();
453	$job->[2]->send;	626	$job->[2]->send;
454	Coro::cede;
455	goto next_job;	627	goto next_job;
456	} else {	628	} else {
457	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	629	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
458	}	630	}
459	}	631	}
460		632
461	if (@SLOT_QUEUE) {	633	if (@SLOT_QUEUE) {
462	# we do not use wait_for_tick() as it returns immediately when tick is inactive	634	wait_for_tick;
463	push @cf::WAIT_FOR_TICK, $signal;
464	$signal->wait;
465	} else {	635	} else {
466	$busy = 0;	636	$busy = 0;
467	Coro::schedule;	637	Coro::schedule;
468	}	638	}
469	}	639	}
…		…
495	BEGIN { *async = \&Coro::async_pool }	665	BEGIN { *async = \&Coro::async_pool }
496		666
497	=item cf::sync_job { BLOCK }	667	=item cf::sync_job { BLOCK }
498		668
499	The design of Deliantra requires that the main coroutine ($Coro::main)	669	The design of Deliantra requires that the main coroutine ($Coro::main)
500	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
501	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
502	acceptable.	672	acceptable.
503		673
504	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
505	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
…		…
509	=cut	679	=cut
510		680
511	sub sync_job(&) {	681	sub sync_job(&) {
512	my ($job) = @_;	682	my ($job) = @_;
513		683
514	if ($Coro::current == $Coro::main) {	684	if (in_main) {
515	my $time = AE::time;	685	my $time = AE::time;
516		686
517	# this is the main coro, too bad, we have to block	687	# this is the main coro, too bad, we have to block
518	# till the operation succeeds, freezing the server :/	688	# till the operation succeeds, freezing the server :/
519		689
520	LOG llevError, Carp::longmess "sync job";#d#	690	#LOG llevError, Carp::longmess "sync job";#d#
521		691
522	my $freeze_guard = freeze_mainloop;	692	my $freeze_guard = freeze_mainloop;
523		693
524	my $busy = 1;	694	my $busy = 1;
525	my @res;	695	my @res;
526		696
527	(async {	697	(async {
528	$Coro::current->desc ("sync job coro");	698	$Coro::current->desc ("sync job coro");
529	@res = eval { $job->() };	699	@res = eval { $job->() };
530	warn $@ if $@;	700	error $@ if $@;
531	undef $busy;	701	undef $busy;
532	})->prio (Coro::PRIO_MAX);	702	})->prio (Coro::PRIO_MAX);
533		703
534	while ($busy) {	704	while ($busy) {
535	if (Coro::nready) {	705	if (Coro::nready) {
536	Coro::cede_notself;	706	Coro::cede_notself;
537	} else {	707	} else {
538	EV::loop EV::LOOP_ONESHOT;	708	EV::run EV::RUN_ONCE;
539	}	709	}
540	}	710	}
541		711
542	my $time = AE::time - $time;	712	my $time = AE::time - $time;
543		713
…		…
569	$EXT_CORO{$coro+0} = $coro;	739	$EXT_CORO{$coro+0} = $coro;
570		740
571	$coro	741	$coro
572	}	742	}
573		743
574	=item fork_call { }, $args	744	=item fork_call { }, @args
575		745
576	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
577	process, returning the results. Everything must be serialisable with	747	process, returning the results. Everything must be serialisable with
578	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
579	never block itself or use any form of event handling.	749	never block itself or use any form of event handling.
580		750
581	=cut	751	=cut
582		752
		753	sub post_fork {
		754	reset_signals;
		755	}
		756
583	sub fork_call(&@) {	757	sub fork_call(&@) {
584	my ($cb, @args) = @_;	758	my ($cb, @args) = @_;
585		759
586	# we seemingly have to make a local copy of the whole thing,
587	# otherwise perl prematurely frees the stuff :/
588	# TODO: investigate and fix (likely this will be rather laborious)
589
590	my @res = Coro::Util::fork_eval {	760	my @res = Coro::Util::fork_eval {
591	reset_signals;	761	cf::post_fork;
592	&$cb	762	&$cb
593	}, @args;	763	} @args;
594		764
595	wantarray ? @res : $res[-1]	765	wantarray ? @res : $res[-1]
596	}	766	}
597		767
598	sub objinfo {	768	sub objinfo {
…		…
648	within each server.	818	within each server.
649		819
650	=cut	820	=cut
651		821
652	sub db_table($) {	822	sub db_table($) {
		823	cf::error "db_get called from main context"
		824	if $Coro::current == $Coro::main;
		825
653	my ($name) = @_;	826	my ($name) = @_;
654	my $db = BDB::db_create $DB_ENV;	827	my $db = BDB::db_create $DB_ENV;
655		828
656	eval {	829	eval {
657	$db->set_flags (BDB::CHKSUM);	830	$db->set_flags (BDB::CHKSUM);
…		…
667	}	840	}
668		841
669	our $DB;	842	our $DB;
670		843
671	sub db_init {	844	sub db_init {
672	cf::sync_job {
673	$DB ||= db_table "db";	845	$DB ||= db_table "db";
674	};
675	}	846	}
676		847
677	sub db_get($$) {	848	sub db_get($$) {
678	my $key = "$_[0]/$_[1]";	849	my $key = "$_[0]/$_[1]";
679		850
680	cf::sync_job {	851	cf::error "db_get called from main context"
		852	if $Coro::current == $Coro::main;
		853
681	BDB::db_get $DB, undef, $key, my $data;	854	BDB::db_get $DB, undef, $key, my $data;
682		855
683	$! ? ()	856	$! ? ()
684	: $data	857	: $data
685	}
686	}	858	}
687		859
688	sub db_put($$$) {	860	sub db_put($$$) {
689	BDB::dbreq_pri 4;	861	BDB::dbreq_pri 4;
690	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	862	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
718		890
719	my @data;	891	my @data;
720	my $md5;	892	my $md5;
721		893
722	for (0 .. $#$src) {	894	for (0 .. $#$src) {
723	0 <= aio_load $src->[$_], $data[$_]	895	$data[$_] = load_file $src->[$_];
724	or Carp::croak "$src->[$_]: $!";
725	}	896	}
726		897
727	# if processing is expensive, check	898	# if processing is expensive, check
728	# checksum first	899	# checksum first
729	if (1) {	900	if (1) {
…		…
742		913
743	return db_get cache => "$id/data";	914	return db_get cache => "$id/data";
744	}	915	}
745	}	916	}
746		917
747	my $t1 = Time::HiRes::time;	918	my $t1 = EV::time;
748	my $data = $process->(\@data);	919	my $data = $process->(\@data);
749	my $t2 = Time::HiRes::time;	920	my $t2 = EV::time;
750		921
751	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	922	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
752		923
753	db_put cache => "$id/data", $data;	924	db_put cache => "$id/data", $data;
754	db_put cache => "$id/md5" , $md5;	925	db_put cache => "$id/md5" , $md5;
755	db_put cache => "$id/meta", $meta;	926	db_put cache => "$id/meta", $meta;
756		927
…		…
766		937
767	=cut	938	=cut
768		939
769	sub datalog($@) {	940	sub datalog($@) {
770	my ($type, %kv) = @_;	941	my ($type, %kv) = @_;
771	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	942	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
772	}	943	}
773		944
774	=back	945	=back
775		946
776	=cut	947	=cut
…		…
971		1142
972	} elsif (exists $cb_id{$type}) {	1143	} elsif (exists $cb_id{$type}) {
973	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1144	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
974		1145
975	} elsif (ref $type) {	1146	} elsif (ref $type) {
976	warn "attaching objects not supported, ignoring.\n";	1147	error "attaching objects not supported, ignoring.\n";
977		1148
978	} else {	1149	} else {
979	shift @arg;	1150	shift @arg;
980	warn "attach argument '$type' not supported, ignoring.\n";	1151	error "attach argument '$type' not supported, ignoring.\n";
981	}	1152	}
982	}	1153	}
983	}	1154	}
984		1155
985	sub _object_attach {	1156	sub _object_attach {
…		…
995	_attach $registry, $klass, @attach;	1166	_attach $registry, $klass, @attach;
996	}	1167	}
997		1168
998	$obj->{$name} = \%arg;	1169	$obj->{$name} = \%arg;
999	} else {	1170	} else {
1000	warn "object uses attachment '$name' which is not available, postponing.\n";	1171	info "object uses attachment '$name' which is not available, postponing.\n";
1001	}	1172	}
1002		1173
1003	$obj->{_attachment}{$name} = undef;	1174	$obj->{_attachment}{$name} = undef;
1004	}	1175	}
1005		1176
…		…
1064		1235
1065	for (@$callbacks) {	1236	for (@$callbacks) {
1066	eval { &{$_->[1]} };	1237	eval { &{$_->[1]} };
1067		1238
1068	if ($@) {	1239	if ($@) {
1069	warn "$@";
1070	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1240	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1071	override;	1241	override;
1072	}	1242	}
1073		1243
1074	return 1 if $override;	1244	return 1 if $override;
1075	}	1245	}
…		…
1154	for (@$attach) {	1324	for (@$attach) {
1155	my ($klass, @attach) = @$_;	1325	my ($klass, @attach) = @$_;
1156	_attach $registry, $klass, @attach;	1326	_attach $registry, $klass, @attach;
1157	}	1327	}
1158	} else {	1328	} else {
1159	warn "object uses attachment '$name' that is not available, postponing.\n";	1329	info "object uses attachment '$name' that is not available, postponing.\n";
1160	}	1330	}
1161	}	1331	}
1162	}	1332	}
1163		1333
1164	cf::attachable->attach (	1334	cf::attachable->attach (
…		…
1191	my ($filename, $rdata, $objs) = @_;	1361	my ($filename, $rdata, $objs) = @_;
1192		1362
1193	sync_job {	1363	sync_job {
1194	if (length $$rdata) {	1364	if (length $$rdata) {
1195	utf8::decode (my $decname = $filename);	1365	utf8::decode (my $decname = $filename);
1196	warn sprintf "saving %s (%d,%d)\n",	1366	trace sprintf "saving %s (%d,%d)\n",
1197	$decname, length $$rdata, scalar @$objs;	1367	$decname, length $$rdata, scalar @$objs
		1368	if $VERBOSE_IO;
1198		1369
1199	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1370	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1200	aio_chmod $fh, SAVE_MODE;	1371	aio_chmod $fh, SAVE_MODE;
1201	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1372	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1202	if ($cf::USE_FSYNC) {	1373	if ($cf::USE_FSYNC) {
…		…
1224	aio_rename "$filename~", $filename;	1395	aio_rename "$filename~", $filename;
1225		1396
1226	$filename =~ s%/[^/]+$%%;	1397	$filename =~ s%/[^/]+$%%;
1227	aio_pathsync $filename if $cf::USE_FSYNC;	1398	aio_pathsync $filename if $cf::USE_FSYNC;
1228	} else {	1399	} else {
1229	warn "unable to save objects: $filename~: $!\n";	1400	error "unable to save objects: $filename~: $!\n";
1230	}	1401	}
1231	} else {	1402	} else {
1232	aio_unlink $filename;	1403	aio_unlink $filename;
1233	aio_unlink "$filename.pst";	1404	aio_unlink "$filename.pst";
1234	}	1405	}
…		…
1258	my $st = eval { Coro::Storable::thaw $av };	1429	my $st = eval { Coro::Storable::thaw $av };
1259	$av = $st->{objs};	1430	$av = $st->{objs};
1260	}	1431	}
1261		1432
1262	utf8::decode (my $decname = $filename);	1433	utf8::decode (my $decname = $filename);
1263	warn sprintf "loading %s (%d,%d)\n",	1434	trace sprintf "loading %s (%d,%d)\n",
1264	$decname, length $data, scalar @{$av || []};	1435	$decname, length $data, scalar @{$av || []}
		1436	if $VERBOSE_IO;
1265		1437
1266	($data, $av)	1438	($data, $av)
1267	}	1439	}
1268		1440
1269	=head2 COMMAND CALLBACKS	1441	=head2 COMMAND CALLBACKS
…		…
1273	=cut	1445	=cut
1274		1446
1275	#############################################################################	1447	#############################################################################
1276	# command handling &c	1448	# command handling &c
1277		1449
1278	=item cf::register_command $name => \&callback($ob,$args);	1450	=item cf::register_command $name => \&callback($ob,$args)
1279		1451
1280	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
1281	$name.	1453	$name.
1282		1454
1283	=cut	1455	=cut
…		…
1289	#warn "registering command '$name/$time' to '$caller'";	1461	#warn "registering command '$name/$time' to '$caller'";
1290		1462
1291	push @{ $COMMAND{$name} }, [$caller, $cb];	1463	push @{ $COMMAND{$name} }, [$caller, $cb];
1292	}	1464	}
1293		1465
1294	=item cf::register_extcmd $name => \&callback($pl,$packet);	1466	=item cf::register_extcmd $name => \&callback($pl,@args)
1295		1467
1296	Register a callback for execution when the client sends an (synchronous)	1468	Register a callback for execution when the client sends an (synchronous)
1297	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
1298	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
1299	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
1300	has logged in successfully.	1472	has logged in successfully.
1301		1473
1302	If the callback returns something, it is sent back as if reply was being	1474	The values will be sent back to the client.
1303	called.
1304		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
1305	=item cf::register_exticmd $name => \&callback($ns,$packet);	1481	=item cf::register_exticmd $name => \&callback($ns,@args)
1306		1482
1307	Register a callback for execution when the client sends an (asynchronous)	1483	Register a callback for execution when the client sends an (asynchronous)
1308	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
1309	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
1310	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
1311	log-in.	1487	log-in.
1312		1488
1313	If the callback returns something, it is sent back as if reply was being	1489	The values will be sent back to the client.
1314	called.
1315		1490
1316	=cut	1491	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1317		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
1318	sub register_extcmd {	1498	sub register_extcmd($$) {
1319	my ($name, $cb) = @_;	1499	my ($name, $cb) = @_;
1320		1500
1321	$EXTCMD{$name} = $cb;	1501	$EXTCMD{$name} = $cb;
1322	}	1502	}
1323		1503
1324	sub register_exticmd {	1504	sub register_async_extcmd($$) {
1325	my ($name, $cb) = @_;	1505	my ($name, $cb) = @_;
1326		1506
		1507	$EXTACMD{$name} = $cb;
		1508	}
		1509
		1510	sub register_exticmd($$) {
		1511	my ($name, $cb) = @_;
		1512
1327	$EXTICMD{$name} = $cb;	1513	$EXTICMD{$name} = $cb;
		1514	}
		1515
		1516	sub register_async_exticmd($$) {
		1517	my ($name, $cb) = @_;
		1518
		1519	$EXTIACMD{$name} = $cb;
1328	}	1520	}
1329		1521
1330	use File::Glob ();	1522	use File::Glob ();
1331		1523
1332	cf::player->attach (	1524	cf::player->attach (
…		…
1346	my ($pl, $buf) = @_;	1538	my ($pl, $buf) = @_;
1347		1539
1348	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1540	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1349		1541
1350	if (ref $msg) {	1542	if (ref $msg) {
1351	my ($type, $reply, @payload) =	1543	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1352	"ARRAY" eq ref $msg
1353	? @$msg
1354	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355		1544
1356	my @reply;
1357
1358	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}) {
1359	@reply = $cb->($pl, @payload);	1558	@reply = $cb->($pl, @payload);
		1559	}
		1560
		1561	$pl->ext_msg ("reply-$reply", @reply)
		1562	if $reply;
1360	}	1563	}
1361		1564
1362	$pl->ext_reply ($reply, @reply)
1363	if $reply;
1364
1365	} else {	1565	} else {
1366	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1566	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1367	}	1567	}
1368		1568
1369	cf::override;	1569	cf::override;
1370	},	1570	},
1371	);	1571	);
…		…
1381	};	1581	};
1382		1582
1383	$grp	1583	$grp
1384	}	1584	}
1385		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
1386	sub load_extensions {	1597	sub load_extensions {
		1598	info "loading extensions...";
		1599
		1600	%EXT_CFG = ();
		1601
1387	cf::sync_job {	1602	cf::sync_job {
1388	my %todo;	1603	my %todo;
1389		1604
1390	for my $path (<$LIBDIR/*.ext>) {	1605	for my $path (<$LIBDIR/*.ext>) {
1391	next unless -r $path;	1606	next unless -r $path;
…		…
1409		1624
1410	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1625	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1411	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1626	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1412		1627
1413	$ext{source} =	1628	$ext{source} =
1414	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1629	"package $pkg; use common::sense;\n"
1415	. "#line 1 \"$path\"\n{\n"	1630	. "#line 1 \"$path\"\n{\n"
1416	. $source	1631	. $source
1417	. "\n};\n1";	1632	. "\n};\n1";
1418		1633
1419	$todo{$base} = \%ext;	1634	$todo{$base} = \%ext;
…		…
1431	for (split /,\s*/, $v->{meta}{depends}) {	1646	for (split /,\s*/, $v->{meta}{depends}) {
1432	next ext	1647	next ext
1433	unless exists $done{$_};	1648	unless exists $done{$_};
1434	}	1649	}
1435		1650
1436	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1651	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1437		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
1438	my $active = eval $v->{source};	1662	my $active = eval $source;
1439		1663
1440	if (length $@) {	1664	if (length $@) {
1441	warn "$v->{path}: $@\n";	1665	error "$v->{path}: $@\n";
1442		1666
1443	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1667	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1444	if exists $v->{meta}{mandatory};	1668	if exists $v->{meta}{mandatory};
1445		1669
1446	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1670	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1448	} else {	1672	} else {
1449	$done{$k} = delete $todo{$k};	1673	$done{$k} = delete $todo{$k};
1450	push @EXTS, $v->{pkg};	1674	push @EXTS, $v->{pkg};
1451	$progress = 1;	1675	$progress = 1;
1452		1676
1453	warn "$v->{base}: extension inactive.\n"	1677	info "$v->{base}: extension inactive.\n"
1454	unless $active;	1678	unless $active;
1455	}	1679	}
1456	}	1680	}
1457		1681
1458	unless ($progress) {	1682	unless ($progress) {
…		…
1460		1684
1461	while (my ($k, $v) = each %todo) {	1685	while (my ($k, $v) = each %todo) {
1462	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1686	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463	if exists $v->{meta}{mandatory};	1687	if exists $v->{meta}{mandatory};
1464	}	1688	}
		1689
		1690	last;
1465	}	1691	}
1466	}	1692	}
1467	};	1693	};
1468	}	1694	}
1469		1695
…		…
1627	my $name = $pl->ob->name;	1853	my $name = $pl->ob->name;
1628		1854
1629	$pl->{deny_save} = 1;	1855	$pl->{deny_save} = 1;
1630	$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
1631		1857
1632	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1858	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1633	$pl->deactivate;	1859	$pl->deactivate;
		1860
1634	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;
1635	$pl->ob->check_score;
1636	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1862	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1863	ext::highscore::check ($pl->ob);
		1864
1637	$pl->ns->destroy if $pl->ns;	1865	$pl->ns->destroy if $pl->ns;
1638		1866
1639	my $path = playerdir $pl;	1867	my $path = playerdir $pl;
1640	my $temp = "$path~$cf::RUNTIME~deleting~";	1868	my $temp = "$path~$cf::RUNTIME~deleting~";
1641	aio_rename $path, $temp;	1869	aio_rename $path, $temp;
…		…
1727		1955
1728	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1956	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1729		1957
1730	Expand deliantra pod fragments into protocol xml.	1958	Expand deliantra pod fragments into protocol xml.
1731		1959
1732	=item $player->ext_reply ($msgid, @msg)
1733
1734	Sends an ext reply to the player.
1735
1736	=cut
1737
1738	sub ext_reply($$@) {
1739	my ($self, $id, @msg) = @_;
1740
1741	$self->ns->ext_reply ($id, @msg)
1742	}
1743
1744	=item $player->ext_msg ($type, @msg)	1960	=item $player->ext_msg ($type, @msg)
1745		1961
1746	Sends an ext event to the client.	1962	Sends an ext event to the client.
1747		1963
1748	=cut	1964	=cut
…		…
1807	sub generate_random_map {	2023	sub generate_random_map {
1808	my ($self, $rmp) = @_;	2024	my ($self, $rmp) = @_;
1809		2025
1810	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
1811		2027
1812	# mit "rum" bekleckern, nicht
1813	$self->_create_random_map (	2028	$self->_create_random_map ($rmp);
1814	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1815	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1816	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1817	$rmp->{exit_on_final_map},
1818	$rmp->{xsize}, $rmp->{ysize},
1819	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1820	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1821	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1822	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1823	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1824	(cf::region::find $rmp->{region}), $rmp->{custom}
1825	)
1826	}	2029	}
1827		2030
1828	=item cf::map->register ($regex, $prio)	2031	=item cf::map->register ($regex, $prio)
1829		2032
1830	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
…		…
1835		2038
1836	sub register {	2039	sub register {
1837	my (undef, $regex, $prio) = @_;	2040	my (undef, $regex, $prio) = @_;
1838	my $pkg = caller;	2041	my $pkg = caller;
1839		2042
1840	no strict;
1841	push @{"$pkg\::ISA"}, __PACKAGE__;	2043	push @{"$pkg\::ISA"}, __PACKAGE__;
1842		2044
1843	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2045	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1844	}	2046	}
1845		2047
…		…
1857	}	2059	}
1858		2060
1859	sub normalise {	2061	sub normalise {
1860	my ($path, $base) = @_;	2062	my ($path, $base) = @_;
1861		2063
1862	$path = "$path"; # make sure its a string	2064	$path = "$path"; # make sure it's a string
1863		2065
1864	$path =~ s/\.map$//;	2066	$path =~ s/\.map$//;
1865		2067
1866	# map plan:	2068	# map plan:
1867	#	2069	#
…		…
1882	$base =~ s{[^/]+/?$}{};	2084	$base =~ s{[^/]+/?$}{};
1883	$path = "$base/$path";	2085	$path = "$base/$path";
1884	}	2086	}
1885		2087
1886	for ($path) {	2088	for ($path) {
1887	redo if s{//}{/};
1888	redo if s{/\.?/}{/};	2089	redo if s{/\.?/}{/};
1889	redo if s{/[^/]+/\.\./}{/};	2090	redo if s{/[^/]+/\.\./}{/};
1890	}	2091	}
1891		2092
1892	$path	2093	$path
…		…
1906	$self->init; # pass $1 etc.	2107	$self->init; # pass $1 etc.
1907	return $self;	2108	return $self;
1908	}	2109	}
1909	}	2110	}
1910		2111
1911	Carp::cluck "unable to resolve path '$path' (base '$base').";	2112	Carp::cluck "unable to resolve path '$path' (base '$base')";
1912	()	2113	()
1913	}	2114	}
1914		2115
		2116	# may re-bless or do other evil things
1915	sub init {	2117	sub init {
1916	my ($self) = @_;	2118	my ($self) = @_;
1917		2119
1918	$self	2120	$self
1919	}	2121	}
…		…
1984	$self->{load_path} = $path;	2186	$self->{load_path} = $path;
1985		2187
1986	1	2188	1
1987	}	2189	}
1988		2190
		2191	# used to laod the header of an original map
1989	sub load_header_orig {	2192	sub load_header_orig {
1990	my ($self) = @_;	2193	my ($self) = @_;
1991		2194
1992	$self->load_header_from ($self->load_path)	2195	$self->load_header_from ($self->load_path)
1993	}	2196	}
1994		2197
		2198	# used to laod the header of an instantiated map
1995	sub load_header_temp {	2199	sub load_header_temp {
1996	my ($self) = @_;	2200	my ($self) = @_;
1997		2201
1998	$self->load_header_from ($self->save_path)	2202	$self->load_header_from ($self->save_path)
1999	}	2203	}
2000		2204
		2205	# called after loading the header from an instantiated map
2001	sub prepare_temp {	2206	sub prepare_temp {
2002	my ($self) = @_;	2207	my ($self) = @_;
2003		2208
2004	$self->last_access ((delete $self->{last_access})	2209	$self->last_access ((delete $self->{last_access})
2005	|| $cf::RUNTIME); #d#	2210	|| $cf::RUNTIME); #d#
2006	# safety	2211	# safety
2007	$self->{instantiate_time} = $cf::RUNTIME	2212	$self->{instantiate_time} = $cf::RUNTIME
2008	if $self->{instantiate_time} > $cf::RUNTIME;	2213	if $self->{instantiate_time} > $cf::RUNTIME;
2009	}	2214	}
2010		2215
		2216	# called after loading the header from an original map
2011	sub prepare_orig {	2217	sub prepare_orig {
2012	my ($self) = @_;	2218	my ($self) = @_;
2013		2219
2014	$self->{load_original} = 1;	2220	$self->{load_original} = 1;
2015	$self->{instantiate_time} = $cf::RUNTIME;	2221	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2039		2245
2040	sub find;	2246	sub find;
2041	sub find {	2247	sub find {
2042	my ($path, $origin) = @_;	2248	my ($path, $origin) = @_;
2043		2249
		2250	cf::cede_to_tick;
		2251
2044	$path = normalise $path, $origin && $origin->path;	2252	$path = normalise $path, $origin;
2045		2253
2046	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2254	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2047	my $guard2 = cf::lock_acquire "map_find:$path";	2255	my $guard2 = cf::lock_acquire "map_find:$path";
2048		2256
2049	$cf::MAP{$path} || do {	2257	$cf::MAP{$path} || do {
…		…
2080		2288
2081	{	2289	{
2082	my $guard = cf::lock_acquire "map_data:$path";	2290	my $guard = cf::lock_acquire "map_data:$path";
2083		2291
2084	return unless $self->valid;	2292	return unless $self->valid;
2085	return unless $self->in_memory == cf::MAP_SWAPPED;	2293	return unless $self->state == cf::MAP_SWAPPED;
2086
2087	$self->in_memory (cf::MAP_LOADING);
2088		2294
2089	$self->alloc;	2295	$self->alloc;
2090		2296
2091	$self->pre_load;	2297	$self->pre_load;
2092	cf::cede_to_tick;	2298	cf::cede_to_tick;
2093		2299
		2300	if (exists $self->{load_path}) {
2094	my $f = new_from_file cf::object::thawer $self->{load_path};	2301	my $f = new_from_file cf::object::thawer $self->{load_path};
2095	$f->skip_block;	2302	$f->skip_block;
2096	$self->_load_objects ($f)	2303	$self->_load_objects ($f)
2097	or return;	2304	or return;
2098		2305
2099	$self->post_load_original	2306	$self->post_load_original
2100	if delete $self->{load_original};	2307	if delete $self->{load_original};
2101		2308
2102	if (my $uniq = $self->uniq_path) {	2309	if (my $uniq = $self->uniq_path) {
2103	utf8::encode $uniq;	2310	utf8::encode $uniq;
2104	unless (aio_stat $uniq) {	2311	unless (aio_stat $uniq) {
2105	if (my $f = new_from_file cf::object::thawer $uniq) {	2312	if (my $f = new_from_file cf::object::thawer $uniq) {
2106	$self->clear_unique_items;	2313	$self->clear_unique_items;
2107	$self->_load_objects ($f);	2314	$self->_load_objects ($f);
2108	$f->resolve_delayed_derefs;	2315	$f->resolve_delayed_derefs;
		2316	}
2109	}	2317	}
2110	}	2318	}
2111	}
2112		2319
2113	$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);
2114		2327
2115	cf::cede_to_tick;	2328	cf::cede_to_tick;
2116	# now do the right thing for maps	2329	# now do the right thing for maps
2117	$self->link_multipart_objects;	2330	$self->link_multipart_objects;
2118	$self->difficulty ($self->estimate_difficulty)	2331	$self->difficulty ($self->estimate_difficulty)
…		…
2122	unless ($self->{deny_activate}) {	2335	unless ($self->{deny_activate}) {
2123	$self->decay_objects;	2336	$self->decay_objects;
2124	$self->fix_auto_apply;	2337	$self->fix_auto_apply;
2125	$self->update_buttons;	2338	$self->update_buttons;
2126	cf::cede_to_tick;	2339	cf::cede_to_tick;
2127	$self->activate;	2340	#$self->activate; # no longer activate maps automatically
2128	}	2341	}
2129		2342
2130	$self->{last_save} = $cf::RUNTIME;	2343	$self->{last_save} = $cf::RUNTIME;
2131	$self->last_access ($cf::RUNTIME);	2344	$self->last_access ($cf::RUNTIME);
2132
2133	$self->in_memory (cf::MAP_ACTIVE);
2134	}	2345	}
2135		2346
2136	$self->post_load;	2347	$self->post_load;
		2348
		2349	1
2137	}	2350	}
2138		2351
2139	# customize the map for a given player, i.e.	2352	# customize the map for a given player, i.e.
2140	# return the _real_ map. used by e.g. per-player	2353	# return the _real_ map. used by e.g. per-player
2141	# maps to change the path to ~playername/mappath	2354	# maps to change the path to ~playername/mappath
…		…
2149	# if $self->per_party;	2362	# if $self->per_party;
2150		2363
2151	$self	2364	$self
2152	}	2365	}
2153		2366
2154	# find and load all maps in the 3x3 area around a map
2155	sub load_neighbours {
2156	my ($map) = @_;
2157
2158	my @neigh; # diagonal neighbours
2159
2160	for (0 .. 3) {
2161	my $neigh = $map->tile_path ($_)
2162	or next;
2163	$neigh = find $neigh, $map
2164	or next;
2165	$neigh->load;
2166
2167	push @neigh,
2168	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2169	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2170	}
2171
2172	for (grep defined $_->[0], @neigh) {
2173	my ($path, $origin) = @$_;
2174	my $neigh = find $path, $origin
2175	or next;
2176	$neigh->load;
2177	}
2178	}
2179
2180	sub find_sync {	2367	sub find_sync {
2181	my ($path, $origin) = @_;	2368	my ($path, $origin) = @_;
2182		2369
2183	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
2184	}	2375	}
2185		2376
2186	sub do_load_sync {	2377	sub do_load_sync {
2187	my ($map) = @_;	2378	my ($map) = @_;
2188		2379
		2380	# it's a bug to call this from the main context
2189	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2381	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2190	if $Coro::current == $Coro::main;	2382	if $Coro::current == $Coro::main;
2191		2383
2192	cf::sync_job { $map->load };	2384	$map->load;
2193	}	2385	}
2194		2386
2195	our %MAP_PREFETCH;	2387	our %MAP_PREFETCH;
2196	our $MAP_PREFETCHER = undef;	2388	our $MAP_PREFETCHER = undef;
2197		2389
2198	sub find_async {	2390	sub find_async {
2199	my ($path, $origin, $load) = @_;	2391	my ($path, $origin, $load) = @_;
2200		2392
2201	$path = normalise $path, $origin && $origin->{path};	2393	$path = normalise $path, $origin;
2202		2394
2203	if (my $map = $cf::MAP{$path}) {	2395	if (my $map = $cf::MAP{$path}) {
2204	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2396	return $map if !$load || $map->linkable;
2205	}	2397	}
2206		2398
2207	$MAP_PREFETCH{$path} |= $load;	2399	$MAP_PREFETCH{$path} |= $load;
2208		2400
2209	$MAP_PREFETCHER ||= cf::async {	2401	$MAP_PREFETCHER ||= cf::async {
2210	$Coro::current->{desc} = "map prefetcher";	2402	$Coro::current->{desc} = "map prefetcher";
2211		2403
2212	while (%MAP_PREFETCH) {	2404	while (%MAP_PREFETCH) {
2213	while (my ($k, $v) = each %MAP_PREFETCH) {	2405	for my $k (keys %MAP_PREFETCH) {
2214	if (my $map = find $k) {	2406	if (my $map = find $k) {
2215	$map->load if $v;	2407	$map->load if $MAP_PREFETCH{$k};
2216	}	2408	}
2217		2409
2218	delete $MAP_PREFETCH{$k};	2410	delete $MAP_PREFETCH{$k};
2219	}	2411	}
2220	}	2412	}
…		…
2268	sub swap_out {	2460	sub swap_out {
2269	my ($self) = @_;	2461	my ($self) = @_;
2270		2462
2271	my $lock = cf::lock_acquire "map_data:$self->{path}";	2463	my $lock = cf::lock_acquire "map_data:$self->{path}";
2272		2464
2273	return if $self->in_memory != cf::MAP_ACTIVE;	2465	return if !$self->linkable;
2274	return if $self->{deny_save};	2466	return if $self->{deny_save};
2275	return if $self->players;	2467	return if $self->players;
2276		2468
2277	# first deactivate the map and "unlink" it from the core	2469	# first deactivate the map and "unlink" it from the core
2278	$self->deactivate;	2470	$self->deactivate;
2279	$_->clear_links_to ($self) for values %cf::MAP;	2471	$_->clear_links_to ($self) for values %cf::MAP;
2280	$self->in_memory (cf::MAP_SWAPPED);	2472	$self->state (cf::MAP_SWAPPED);
2281		2473
2282	# then atomically save	2474	# then atomically save
2283	$self->_save;	2475	$self->_save;
2284		2476
2285	# then free the map	2477	# then free the map
…		…
2309		2501
2310	my $lock = cf::lock_acquire "map_data:$self->{path}";	2502	my $lock = cf::lock_acquire "map_data:$self->{path}";
2311		2503
2312	return if $self->players;	2504	return if $self->players;
2313		2505
2314	warn "resetting map ", $self->path, "\n";	2506	cf::trace "resetting map ", $self->path, "\n";
2315		2507
2316	$self->in_memory (cf::MAP_SWAPPED);	2508	$self->state (cf::MAP_SWAPPED);
2317		2509
2318	# need to save uniques path	2510	# need to save uniques path
2319	unless ($self->{deny_save}) {	2511	unless ($self->{deny_save}) {
2320	my $uniq = $self->uniq_path; utf8::encode $uniq;	2512	my $uniq = $self->uniq_path; utf8::encode $uniq;
2321		2513
…		…
2474		2666
2475	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.
2476		2668
2477	=item $ob = cf::object::deref ($refstring)	2669	=item $ob = cf::object::deref ($refstring)
2478		2670
2479	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,
2480	even if the object actually exists. May block.	2672	even if the object actually exists. May block.
2481		2673
2482	=cut	2674	=cut
2483		2675
2484	sub deref {	2676	sub deref {
…		…
2566	=item $player_object->may ("access")	2758	=item $player_object->may ("access")
2567		2759
2568	Returns wether the given player is authorized to access resource "access"	2760	Returns wether the given player is authorized to access resource "access"
2569	(e.g. "command_wizcast").	2761	(e.g. "command_wizcast").
2570		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
2571	=cut	2788	=cut
2572		2789
2573	sub cf::object::player::may {	2790	sub cf::object::player::may {
2574	my ($self, $access) = @_;	2791	my ($self, $access) = @_;
2575		2792
2576	$self->flag (cf::FLAG_WIZ) ||	2793	$self->flag (cf::FLAG_WIZ) ||
2577	(ref $cf::CFG{"may_$access"}	2794	(ref $cf::CFG{"may_$access"}
2578	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2795	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2579	: $cf::CFG{"may_$access"})	2796	: $cf::CFG{"may_$access"})
2580	}	2797	}
2581		2798
2582	=item $player_object->enter_link	2799	=item $player_object->enter_link
2583		2800
2584	Freezes the player and moves him/her to a special map (C<{link}>).	2801	Freezes the player and moves him/her to a special map (C<{link}>).
2585		2802
2586	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.
2587	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,
2588	though, as the palyer cannot control the character while it is on the link	2805	though, as the player cannot control the character while it is on the link
2589	map.	2806	map.
2590		2807
2591	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.
2592		2815
2593	=item $player_object->leave_link ($map, $x, $y)	2816	=item $player_object->leave_link ($map, $x, $y)
2594		2817
2595	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
2596	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
…		…
2614	sub cf::object::player::enter_link {	2837	sub cf::object::player::enter_link {
2615	my ($self) = @_;	2838	my ($self) = @_;
2616		2839
2617	$self->deactivate_recursive;	2840	$self->deactivate_recursive;
2618		2841
		2842	++$self->{_link_recursion};
		2843
2619	return if UNIVERSAL::isa $self->map, "ext::map_link";	2844	return if UNIVERSAL::isa $self->map, "ext::map_link";
2620		2845
2621	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2846	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2622	if $self->map && $self->map->{path} ne "{link}";	2847	if $self->map && $self->map->{path} ne "{link}";
2623		2848
…		…
2649	# use -1 or undef as default coordinates, not 0, 0	2874	# use -1 or undef as default coordinates, not 0, 0
2650	($x, $y) = ($map->enter_x, $map->enter_y)	2875	($x, $y) = ($map->enter_x, $map->enter_y)
2651	if $x <= 0 && $y <= 0;	2876	if $x <= 0 && $y <= 0;
2652		2877
2653	$map->load;	2878	$map->load;
2654	$map->load_neighbours;
2655		2879
2656	return unless $self->contr->active;	2880	return unless $self->contr->active;
2657		2881
2658	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2882	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2659	$self->enter_map ($map, $x, $y);	2883	if ($self->enter_map ($map, $x, $y)) {
2660		2884	# entering was successful
		2885	delete $self->{_link_recursion};
2661	# only activate afterwards, to support waiting in hooks	2886	# only activate afterwards, to support waiting in hooks
2662	$self->activate_recursive;	2887	$self->activate_recursive;
2663	}	2888	}
2664		2889
		2890	}
		2891
2665	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2892	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2666		2893
2667	Moves the player to the given map-path and coordinates by first freezing	2894	Moves the player to the given map-path and coordinates by first freezing
2668	her, loading and preparing them map, calling the provided $check callback	2895	her, loading and preparing them map, calling the provided $check callback
2669	that has to return the map if sucecssful, and then unfreezes the player on	2896	that has to return the map if sucecssful, and then unfreezes the player on
2670	the new (success) or old (failed) map position. In either case, $done will	2897	the new (success) or old (failed) map position. In either case, $done will
…		…
2677		2904
2678	our $GOTOGEN;	2905	our $GOTOGEN;
2679		2906
2680	sub cf::object::player::goto {	2907	sub cf::object::player::goto {
2681	my ($self, $path, $x, $y, $check, $done) = @_;	2908	my ($self, $path, $x, $y, $check, $done) = @_;
		2909
		2910	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2911	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2912	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2913	($path, $x, $y) = @$EMERGENCY_POSITION;
		2914	}
2682		2915
2683	# 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
2684	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2917	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2685		2918
2686	$self->enter_link;	2919	$self->enter_link;
…		…
2706	($path, $x, $y) = (undef, undef, undef);	2939	($path, $x, $y) = (undef, undef, undef);
2707	}	2940	}
2708	}	2941	}
2709		2942
2710	my $map = eval {	2943	my $map = eval {
2711	my $map = defined $path ? cf::map::find $path : undef;	2944	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2712		2945
2713	if ($map) {	2946	if ($map) {
2714	$map = $map->customise_for ($self);	2947	$map = $map->customise_for ($self);
2715	$map = $check->($map) if $check && $map;	2948	$map = $check->($map, $x, $y, $self) if $check && $map;
2716	} else {	2949	} else {
2717	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2950	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2718	}	2951	}
2719		2952
2720	$map	2953	$map
…		…
2728	if ($gen == $self->{_goto_generation}) {	2961	if ($gen == $self->{_goto_generation}) {
2729	delete $self->{_goto_generation};	2962	delete $self->{_goto_generation};
2730	$self->leave_link ($map, $x, $y);	2963	$self->leave_link ($map, $x, $y);
2731	}	2964	}
2732		2965
2733	$done->() if $done;	2966	$done->($self) if $done;
2734	})->prio (1);	2967	})->prio (1);
2735	}	2968	}
2736		2969
2737	=item $player_object->enter_exit ($exit_object)	2970	=item $player_object->enter_exit ($exit_object)
2738		2971
…		…
2806	$Coro::current->{desc} = "enter_exit";	3039	$Coro::current->{desc} = "enter_exit";
2807		3040
2808	unless (eval {	3041	unless (eval {
2809	$self->deactivate_recursive; # just to be sure	3042	$self->deactivate_recursive; # just to be sure
2810		3043
2811	# random map handling
2812	{
2813	my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815	prepare_random_map $exit
2816	if $exit->slaying eq "/!";
2817	}
2818
2819	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3044	my $map = cf::map::normalise $exit->slaying, $exit->map;
2820	my $x = $exit->stats->hp;	3045	my $x = $exit->stats->hp;
2821	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	}
2822		3070
2823	$self->goto ($map, $x, $y);	3071	$self->goto ($map, $x, $y);
2824		3072
2825	# if exit is damned, update players death & WoR home-position	3073	# if exit is damned, update players death & WoR home-position
2826	$self->contr->savebed ($map, $x, $y)	3074	$self->contr->savebed ($map, $x, $y)
…		…
2831	$self->message ("Something went wrong deep within the deliantra server. "	3079	$self->message ("Something went wrong deep within the deliantra server. "
2832	. "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. "
2833	. "Please report this to the dungeon master!",	3081	. "Please report this to the dungeon master!",
2834	cf::NDI_UNIQUE | cf::NDI_RED);	3082	cf::NDI_UNIQUE | cf::NDI_RED);
2835		3083
2836	warn "ERROR in enter_exit: $@";	3084	error "ERROR in enter_exit: $@";
2837	$self->leave_link;	3085	$self->leave_link;
2838	}	3086	}
2839	})->prio (1);	3087	})->prio (1);
2840	}	3088	}
2841		3089
2842	=head3 cf::client	3090	=head3 cf::client
2843		3091
2844	=over 4	3092	=over 4
2845
2846	=item $client->send_drawinfo ($text, $flags)
2847
2848	Sends a drawinfo packet to the client. Circumvents output buffering so
2849	should not be used under normal circumstances.
2850
2851	=cut
2852
2853	sub cf::client::send_drawinfo {
2854	my ($self, $text, $flags) = @_;
2855
2856	utf8::encode $text;
2857	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858	}
2859		3093
2860	=item $client->send_big_packet ($pkt)	3094	=item $client->send_big_packet ($pkt)
2861		3095
2862	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
2863	them as required.	3097	them as required.
…		…
2882	$self->send_packet ($pkt);	3116	$self->send_packet ($pkt);
2883	}	3117	}
2884		3118
2885	=item $client->send_msg ($channel, $msg, $color, [extra...])	3119	=item $client->send_msg ($channel, $msg, $color, [extra...])
2886		3120
2887	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
2888	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
2889	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
2890	the message unless the client supports the msg packet.	3124	the message unless the client supports the msg packet.
2891		3125
2892	=cut	3126	=cut
2893		3127
2894	# non-persistent channels (usually the info channel)	3128	# non-persistent channels (usually the info channel)
…		…
2937	},	3171	},
2938	"c/body" => {	3172	"c/body" => {
2939	id => "infobox",	3173	id => "infobox",
2940	title => "Body Parts",	3174	title => "Body Parts",
2941	reply => undef,	3175	reply => undef,
2942	tooltip => "Shows which body parts you posess and are available",	3176	tooltip => "Shows which body parts you possess and are available",
2943	},	3177	},
2944	"c/statistics" => {	3178	"c/statistics" => {
2945	id => "infobox",	3179	id => "infobox",
2946	title => "Statistics",	3180	title => "Statistics",
2947	reply => undef,	3181	reply => undef,
…		…
2999	id => "death",	3233	id => "death",
3000	title => "Death",	3234	title => "Death",
3001	reply => undef,	3235	reply => undef,
3002	tooltip => "Reason for and more info about your most recent death",	3236	tooltip => "Reason for and more info about your most recent death",
3003	},	3237	},
		3238	"c/fatal" => {
		3239	id => "fatal",
		3240	title => "Fatal Error",
		3241	reply => undef,
		3242	tooltip => "Reason for the server disconnect",
		3243	},
3004	"c/say" => $SAY_CHANNEL,	3244	"c/say" => $SAY_CHANNEL,
3005	"c/chat" => $CHAT_CHANNEL,	3245	"c/chat" => $CHAT_CHANNEL,
3006	);	3246	);
3007		3247
3008	sub cf::client::send_msg {	3248	sub cf::client::send_msg {
…		…
3051	=cut	3291	=cut
3052		3292
3053	sub cf::client::ext_msg($$@) {	3293	sub cf::client::ext_msg($$@) {
3054	my ($self, $type, @msg) = @_;	3294	my ($self, $type, @msg) = @_;
3055		3295
3056	if ($self->extcmd == 2) {
3057	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3296	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3058	} elsif ($self->extcmd == 1) { # TODO: remove
3059	push @msg, msgtype => "event_$type";
3060	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3061	}
3062	}
3063
3064	=item $client->ext_reply ($msgid, @msg)
3065
3066	Sends an ext reply to the client.
3067
3068	=cut
3069
3070	sub cf::client::ext_reply($$@) {
3071	my ($self, $id, @msg) = @_;
3072
3073	if ($self->extcmd == 2) {
3074	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075	} elsif ($self->extcmd == 1) {
3076	#TODO: version 1, remove
3077	unshift @msg, msgtype => "reply", msgid => $id;
3078	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079	}
3080	}	3297	}
3081		3298
3082	=item $success = $client->query ($flags, "text", \&cb)	3299	=item $success = $client->query ($flags, "text", \&cb)
3083		3300
3084	Queues a query to the client, calling the given callback with	3301	Queues a query to the client, calling the given callback with
…		…
3104		3321
3105	$self->send_packet ($self->{query_queue}[0][0])	3322	$self->send_packet ($self->{query_queue}[0][0])
3106	if @{ $self->{query_queue} } == 1;	3323	if @{ $self->{query_queue} } == 1;
3107		3324
3108	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;
3109	}	3365	}
3110		3366
3111	cf::client->attach (	3367	cf::client->attach (
3112	on_connect => sub {	3368	on_connect => sub {
3113	my ($ns) = @_;	3369	my ($ns) = @_;
…		…
3139	my ($ns, $buf) = @_;	3395	my ($ns, $buf) = @_;
3140		3396
3141	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3397	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3142		3398
3143	if (ref $msg) {	3399	if (ref $msg) {
3144	my ($type, $reply, @payload) =	3400	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3145	"ARRAY" eq ref $msg
3146	? @$msg
3147	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148		3401
3149	my @reply;
3150
3151	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}) {
3152	@reply = $cb->($ns, @payload);	3415	@reply = $cb->($ns, @payload);
		3416	}
		3417
		3418	$ns->ext_msg ("reply-$reply", @reply)
		3419	if $reply;
3153	}	3420	}
3154
3155	$ns->ext_reply ($reply, @reply)
3156	if $reply;
3157
3158	} else {	3421	} else {
3159	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";
3160	}	3423	}
3161		3424
3162	cf::override;	3425	cf::override;
3163	},	3426	},
3164	);	3427	);
…		…
3245	decrease split destroy change_exp value msg lore send_msg)],	3508	decrease split destroy change_exp value msg lore send_msg)],
3246	["cf::object::player" => qw(player)],	3509	["cf::object::player" => qw(player)],
3247	["cf::player" => qw(peaceful send_msg)],	3510	["cf::player" => qw(peaceful send_msg)],
3248	["cf::map" => qw(trigger)],	3511	["cf::map" => qw(trigger)],
3249	) {	3512	) {
3250	no strict 'refs';
3251	my ($pkg, @funs) = @$_;	3513	my ($pkg, @funs) = @$_;
3252	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3514	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3253	for @funs;	3515	for @funs;
3254	}	3516	}
3255		3517
…		…
3294	local @cf::_safe_eval_args = values %vars;	3556	local @cf::_safe_eval_args = values %vars;
3295	@res = wantarray ? eval eval : scalar eval $eval;	3557	@res = wantarray ? eval eval : scalar eval $eval;
3296	}	3558	}
3297		3559
3298	if ($@) {	3560	if ($@) {
3299	warn "$@";	3561	warn "$@",
3300	warn "while executing safe code '$code'\n";	3562	"while executing safe code '$code'\n",
3301	warn "with arguments " . (join " ", %vars) . "\n";	3563	"with arguments " . (join " ", %vars) . "\n";
3302	}	3564	}
3303		3565
3304	wantarray ? @res : $res[0]	3566	wantarray ? @res : $res[0]
3305	}	3567	}
3306		3568
…		…
3331	=cut	3593	=cut
3332		3594
3333	#############################################################################	3595	#############################################################################
3334	# the server's init and main functions	3596	# the server's init and main functions
3335		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
3336	sub load_facedata($) {	3675	sub load_facedata($) {
3337	my ($path) = @_;	3676	my ($path) = @_;
3338		3677
3339	# HACK to clear player env face cache, we need some signal framework
3340	# for this (global event?)
3341	%ext::player_env::MUSIC_FACE_CACHE = ();
3342
3343	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3678	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3344		3679
3345	warn "loading facedata from $path\n";	3680	trace "loading facedata from $path\n";
3346		3681
3347	my $facedata;	3682	my $facedata = decode_storable load_file "$path/faceinfo";
3348	0 < aio_load $path, $facedata
3349	or die "$path: $!";
3350
3351	$facedata = Coro::Storable::thaw $facedata;
3352		3683
3353	$facedata->{version} == 2	3684	$facedata->{version} == 2
3354	or cf::cleanup "$path: version mismatch, cannot proceed.";	3685	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3355		3686
3356	# patch in the exptable	3687	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3357	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3688	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3358	$facedata->{resource}{"res/exp_table"} = {	3689
3359	type => FT_RSRC,	3690	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3360	data => $exp_table,	3691
3361	hash => (Digest::MD5::md5 $exp_table),	3692	# BEGIN ATOMIC
3362	};	3693	# from here on, everything must be atomic - no thread switch allowed
3363	cf::cede_to_tick;	3694	my $t1 = EV::time;
3364		3695
3365	{	3696	{
3366	my $faces = $facedata->{faceinfo};	3697	my $faces = $facedata->{faceinfo};
3367		3698
3368	while (my ($face, $info) = each %$faces) {	3699	for my $face (sort keys %$faces) {
		3700	my $info = $faces->{$face};
3369	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3701	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370		3702
3371	cf::face::set_visibility $idx, $info->{visibility};	3703	cf::face::set_visibility $idx, $info->{visibility};
3372	cf::face::set_magicmap $idx, $info->{magicmap};	3704	cf::face::set_magicmap $idx, $info->{magicmap};
3373	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};
3374	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};
3375		3707	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3376	cf::cede_to_tick;	3708	$cf::face::HASH{$info->{hash64}} = $idx;
		3709	delete $cf::face::META[$idx];
3377	}	3710	}
3378		3711
3379	while (my ($face, $info) = each %$faces) {	3712	while (my ($face, $info) = each %$faces) {
3380	next unless $info->{smooth};	3713	next unless $info->{smooth};
3381		3714
…		…
3384		3717
3385	if (my $smooth = cf::face::find $info->{smooth}) {	3718	if (my $smooth = cf::face::find $info->{smooth}) {
3386	cf::face::set_smooth $idx, $smooth;	3719	cf::face::set_smooth $idx, $smooth;
3387	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3720	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3388	} else {	3721	} else {
3389	warn "smooth face '$info->{smooth}' not found for face '$face'";	3722	error "smooth face '$info->{smooth}' not found for face '$face'";
3390	}	3723	}
3391
3392	cf::cede_to_tick;
3393	}	3724	}
3394	}	3725	}
3395		3726
3396	{	3727	{
3397	my $anims = $facedata->{animinfo};	3728	my $anims = $facedata->{animinfo};
3398		3729
3399	while (my ($anim, $info) = each %$anims) {	3730	while (my ($anim, $info) = each %$anims) {
3400	cf::anim::set $anim, $info->{frames}, $info->{facings};	3731	cf::anim::set $anim, $info->{frames}, $info->{facings};
3401	cf::cede_to_tick;
3402	}	3732	}
3403		3733
3404	cf::anim::invalidate_all; # d'oh	3734	cf::anim::invalidate_all; # d'oh
3405	}	3735	}
3406		3736
3407	{	3737	{
3408	my $res = $facedata->{resource};	3738	my $res = $facedata->{resource};
3409		3739
3410	while (my ($name, $info) = each %$res) {	3740	while (my ($name, $info) = each %$res) {
3411	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
3412	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3743	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3413		3744
3414	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3415	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;
3416	} else {	3751	} else {
3417	$RESOURCE{$name} = $info;	3752	# $RESOURCE{$name} = $info; # unused
3418	}	3753	}
3419
3420	cf::cede_to_tick;
3421	}	3754	}
3422	}	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;
3423		3766
3424	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3767	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425		3768
		3769	aio_close $fh if $fh; # close old facedata
		3770
3426	1	3771	1
3427	}	3772	}
3428
3429	cf::global->attach (on_resource_update => sub {
3430	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434	my $sound = $soundconf->{compat}[$_]
3435	or next;
3436
3437	my $face = cf::face::find "sound/$sound->[1]";
3438	cf::sound::set $sound->[0] => $face;
3439	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440	}
3441
3442	while (my ($k, $v) = each %{$soundconf->{event}}) {
3443	my $face = cf::face::find "sound/$v";
3444	cf::sound::set $k => $face;
3445	}
3446	}
3447	});
3448		3773
3449	register_exticmd fx_want => sub {	3774	register_exticmd fx_want => sub {
3450	my ($ns, $want) = @_;	3775	my ($ns, $want) = @_;
3451		3776
3452	while (my ($k, $v) = each %$want) {	3777	while (my ($k, $v) = each %$want) {
…		…
3460	my $status = load_resource_file_ $_[0];	3785	my $status = load_resource_file_ $_[0];
3461	get_slot 0.1, 100;	3786	get_slot 0.1, 100;
3462	cf::arch::commit_load;	3787	cf::arch::commit_load;
3463		3788
3464	$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;
3465	}	3804	}
3466		3805
3467	sub reload_regions {	3806	sub reload_regions {
3468	# 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
3469	# for this (global event?)	3808	# for this (global event?)
…		…
3477	if exists $_->{match};	3816	if exists $_->{match};
3478	}	3817	}
3479	}	3818	}
3480		3819
3481	sub reload_facedata {	3820	sub reload_facedata {
3482	load_facedata "$DATADIR/facedata"	3821	load_facedata $DATADIR
3483	or die "unable to load facedata\n";	3822	or die "unable to load facedata\n";
3484	}	3823	}
3485		3824
3486	sub reload_archetypes {	3825	sub reload_archetypes {
3487	load_resource_file "$DATADIR/archetypes"	3826	load_resource_file "$DATADIR/archetypes"
3488	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;
3489	}	3854	}
3490		3855
3491	sub reload_treasures {	3856	sub reload_treasures {
3492	load_resource_file "$DATADIR/treasures"	3857	load_resource_file "$DATADIR/treasures"
3493	or die "unable to load treasurelists\n";	3858	or die "unable to load treasurelists\n";
3494	}	3859	}
3495		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
3496	sub reload_resources {	3881	sub reload_resources {
3497	warn "reloading resource files...\n";	3882	trace "reloading resource files...\n";
3498		3883
		3884	reload_materials;
3499	reload_facedata;	3885	reload_facedata;
		3886	reload_exp_table;
		3887	reload_sound;
3500	reload_archetypes;	3888	reload_archetypes;
3501	reload_regions;	3889	reload_regions;
3502	reload_treasures;	3890	reload_treasures;
3503		3891
3504	warn "finished reloading resource files\n";	3892	trace "finished reloading resource files\n";
3505	}	3893	}
3506		3894
3507	sub reload_config {	3895	sub reload_config {
3508	warn "reloading config file...\n";	3896	trace "reloading config file...\n";
3509		3897
3510	open my $fh, "<:utf8", "$CONFDIR/config"	3898	my $config = load_file "$CONFDIR/config";
3511	or return;	3899	utf8::decode $config;
		3900	*CFG = decode_yaml $config;
3512		3901
3513	local $/;
3514	*CFG = YAML::XS::Load scalar <$fh>;
3515
3516	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3902	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3517		3903
3518	$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};
3519	$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};
3520		3906
3521	if (exists $CFG{mlockall}) {	3907	if (exists $CFG{mlockall}) {
…		…
3523	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3909	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3524	and die "WARNING: m(un)lockall failed: $!\n";	3910	and die "WARNING: m(un)lockall failed: $!\n";
3525	};	3911	};
3526	warn $@ if $@;	3912	warn $@ if $@;
3527	}	3913	}
3528
3529	warn "finished reloading resource files\n";
3530	}	3914	}
3531		3915
3532	sub pidfile() {	3916	sub pidfile() {
3533	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3917	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534	or die "$PIDFILE: $!";	3918	or die "$PIDFILE: $!";
…		…
3547	seek $fh, 0, 0;	3931	seek $fh, 0, 0;
3548	print $fh $$;	3932	print $fh $$;
3549	}	3933	}
3550		3934
3551	sub main_loop {	3935	sub main_loop {
3552	warn "EV::loop starting\n";	3936	trace "EV::run starting\n";
3553	if (1) {	3937	if (1) {
3554	EV::loop;	3938	EV::run;
3555	}	3939	}
3556	warn "EV::loop returned\n";	3940	trace "EV::run returned\n";
3557	goto &main_loop unless $REALLY_UNLOOP;	3941	goto &main_loop unless $REALLY_UNLOOP;
3558	}	3942	}
3559		3943
3560	sub main {	3944	sub main {
3561	cf::init_globals; # initialise logging	3945	cf::init_globals; # initialise logging
3562		3946
3563	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.";
3564	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.";
3565	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3950	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3951	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567		3952
3568	$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
3569		3954
3570	# we must not ever block the main coroutine	3955	# we must not ever block the main coroutine
3571	local $Coro::idle = sub {	3956	$Coro::idle = sub {
3572	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#
3573	(async {	3958	(async {
3574	$Coro::current->{desc} = "IDLE BUG HANDLER";	3959	$Coro::current->{desc} = "IDLE BUG HANDLER";
3575	EV::loop EV::LOOP_ONESHOT;	3960	EV::run EV::RUN_ONCE;
3576	})->prio (Coro::PRIO_MAX);	3961	})->prio (Coro::PRIO_MAX);
3577	};	3962	};
3578		3963
3579	evthread_start IO::AIO::poll_fileno;	3964	evthread_start IO::AIO::poll_fileno;
3580		3965
3581	cf::sync_job {	3966	cf::sync_job {
3582	cf::init_experience;	3967	cf::incloader::init ();
		3968
		3969	db_init;
		3970
3583	cf::init_anim;	3971	cf::init_anim;
3584	cf::init_attackmess;	3972	cf::init_attackmess;
3585	cf::init_dynamic;	3973	cf::init_dynamic;
3586		3974
3587	cf::load_settings;	3975	cf::load_settings;
3588	cf::load_materials;
3589		3976
3590	reload_resources;	3977	reload_resources;
3591	reload_config;	3978	reload_config;
3592	db_init;
3593		3979
3594	cf::init_uuid;	3980	cf::init_uuid;
3595	cf::init_signals;	3981	cf::init_signals;
3596	cf::init_skills;	3982	cf::init_skills;
3597		3983
…		…
3605		3991
3606	# no (long-running) fork's whatsoever before this point(!)	3992	# no (long-running) fork's whatsoever before this point(!)
3607	use POSIX ();	3993	use POSIX ();
3608	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};
3609		3995
3610	(pop @POST_INIT)->(0) while @POST_INIT;	3996	cf::_post_init 0;
3611	};	3997	};
3612		3998
3613	cf::object::thawer::errors_are_fatal 0;	3999	cf::object::thawer::errors_are_fatal 0;
3614	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";
3615		4001
		4002	AE::postpone {
		4003	undef &main; # free gobs of memory :)
		4004	};
		4005
3616	main_loop;	4006	goto &main_loop;
3617	}	4007	}
3618		4008
3619	#############################################################################	4009	#############################################################################
3620	# initialisation and cleanup	4010	# initialisation and cleanup
3621		4011
…		…
3660	or return;	4050	or return;
3661		4051
3662	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4052	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3663	and return;	4053	and return;
3664		4054
3665	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4055	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3666		4056
3667	1	4057	1
3668	}	4058	}
3669		4059
3670	our $uuid_lock;	4060	our $uuid_lock;
…		…
3682	or return;	4072	or return;
3683		4073
3684	my $value = uuid_seq uuid_cur;	4074	my $value = uuid_seq uuid_cur;
3685		4075
3686	unless ($value) {	4076	unless ($value) {
3687	warn "cowardly refusing to write zero uuid value!\n";	4077	info "cowardly refusing to write zero uuid value!\n";
3688	return;	4078	return;
3689	}	4079	}
3690		4080
3691	my $value = uuid_str $value + $uuid_skip;	4081	my $value = uuid_str $value + $uuid_skip;
3692	$uuid_skip = 0;	4082	$uuid_skip = 0;
…		…
3702	or return;	4092	or return;
3703		4093
3704	aio_rename "$uuid~", $uuid	4094	aio_rename "$uuid~", $uuid
3705	and return;	4095	and return;
3706		4096
3707	warn "uuid file written ($value).\n";	4097	trace "uuid file written ($value).\n";
3708		4098
3709	1	4099	1
3710		4100
3711	}	4101	}
3712		4102
…		…
3718	}	4108	}
3719		4109
3720	sub emergency_save() {	4110	sub emergency_save() {
3721	my $freeze_guard = cf::freeze_mainloop;	4111	my $freeze_guard = cf::freeze_mainloop;
3722		4112
3723	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;
3724		4119
3725	cf::sync_job {	4120	cf::sync_job {
3726	# this is a trade-off: we want to be very quick here, so	4121	cf::write_runtime_sync; # external watchdog should not bark
3727	# save all maps without fsync, and later call a global sync
3728	# (which in turn might be very very slow)
3729	local $USE_FSYNC = 0;
3730		4122
3731	# use a peculiar iteration method to avoid tripping on perl	4123	# use a peculiar iteration method to avoid tripping on perl
3732	# refcount bugs in for. also avoids problems with players	4124	# refcount bugs in for. also avoids problems with players
3733	# and maps saved/destroyed asynchronously.	4125	# and maps saved/destroyed asynchronously.
3734	warn "emergency_perl_save: begin player save\n";	4126	info "emergency_perl_save: begin player save\n";
3735	for my $login (keys %cf::PLAYER) {	4127	for my $login (keys %cf::PLAYER) {
3736	my $pl = $cf::PLAYER{$login} or next;	4128	my $pl = $cf::PLAYER{$login} or next;
3737	$pl->valid or next;	4129	$pl->valid or next;
3738	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4130	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3739	$pl->save;	4131	$pl->save;
3740	}	4132	}
3741	warn "emergency_perl_save: end player save\n";	4133	info "emergency_perl_save: end player save\n";
3742		4134
		4135	cf::write_runtime_sync; # external watchdog should not bark
		4136
3743	warn "emergency_perl_save: begin map save\n";	4137	info "emergency_perl_save: begin map save\n";
3744	for my $path (keys %cf::MAP) {	4138	for my $path (keys %cf::MAP) {
3745	my $map = $cf::MAP{$path} or next;	4139	my $map = $cf::MAP{$path} or next;
3746	$map->valid or next;	4140	$map->valid or next;
3747	$map->save;	4141	$map->save;
3748	}	4142	}
3749	warn "emergency_perl_save: end map save\n";	4143	info "emergency_perl_save: end map save\n";
3750		4144
		4145	cf::write_runtime_sync; # external watchdog should not bark
		4146
3751	warn "emergency_perl_save: begin database checkpoint\n";	4147	info "emergency_perl_save: begin database checkpoint\n";
3752	BDB::db_env_txn_checkpoint $DB_ENV;	4148	BDB::db_env_txn_checkpoint $DB_ENV;
3753	warn "emergency_perl_save: end database checkpoint\n";	4149	info "emergency_perl_save: end database checkpoint\n";
3754		4150
3755	warn "emergency_perl_save: begin write uuid\n";	4151	info "emergency_perl_save: begin write uuid\n";
3756	write_uuid_sync 1;	4152	write_uuid_sync 1;
3757	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
3758	};	4173	};
3759		4174
3760	warn "emergency_perl_save: starting sync()\n";
3761	IO::AIO::aio_sync sub {
3762	warn "emergency_perl_save: finished sync()\n";
3763	};
3764
3765	warn "emergency_perl_save: leave\n";	4175	info "emergency_perl_save: leave\n";
3766	}	4176	}
3767		4177
3768	sub post_cleanup {	4178	sub post_cleanup {
3769	my ($make_core) = @_;	4179	my ($make_core) = @_;
3770		4180
		4181	IO::AIO::flush;
		4182
3771	warn Carp::longmess "post_cleanup backtrace"	4183	error Carp::longmess "post_cleanup backtrace"
3772	if $make_core;	4184	if $make_core;
3773		4185
3774	my $fh = pidfile;	4186	my $fh = pidfile;
3775	unlink $PIDFILE if <$fh> == $$;	4187	unlink $PIDFILE if <$fh> == $$;
3776	}	4188	}
…		…
3800	}	4212	}
3801	}	4213	}
3802		4214
3803	sub do_reload_perl() {	4215	sub do_reload_perl() {
3804	# can/must only be called in main	4216	# can/must only be called in main
3805	if (in_main) {	4217	unless (in_main) {
3806	warn "can only reload from main coroutine";	4218	error "can only reload from main coroutine";
3807	return;	4219	return;
3808	}	4220	}
3809		4221
3810	return if $RELOAD++;	4222	return if $RELOAD++;
3811		4223
3812	my $t1 = AE::time;	4224	my $t1 = AE::time;
3813		4225
3814	while ($RELOAD) {	4226	while ($RELOAD) {
3815	warn "reloading...";	4227	cf::get_slot 0.1, -1, "reload_perl";
		4228	info "perl_reload: reloading...";
3816		4229
3817	warn "entering sync_job";	4230	trace "perl_reload: entering sync_job";
3818		4231
3819	cf::sync_job {	4232	cf::sync_job {
3820	cf::write_runtime_sync; # external watchdog should not bark
3821	cf::emergency_save;	4233	#cf::emergency_save;
3822	cf::write_runtime_sync; # external watchdog should not bark
3823		4234
3824	warn "syncing database to disk";
3825	BDB::db_env_txn_checkpoint $DB_ENV;
3826
3827	# if anything goes wrong in here, we should simply crash as we already saved
3828
3829	warn "flushing outstanding aio requests";
3830	while (IO::AIO::nreqs || BDB::nreqs) {
3831	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3832	}
3833
3834	warn "cancelling all extension coros";	4235	trace "perl_reload: cancelling all extension coros";
3835	$_->cancel for values %EXT_CORO;	4236	$_->cancel for values %EXT_CORO;
3836	%EXT_CORO = ();	4237	%EXT_CORO = ();
3837		4238
3838	warn "removing commands";	4239	trace "perl_reload: removing commands";
3839	%COMMAND = ();	4240	%COMMAND = ();
3840		4241
3841	warn "removing ext/exti commands";	4242	trace "perl_reload: removing ext/exti commands";
3842	%EXTCMD = ();	4243	%EXTCMD = ();
3843	%EXTICMD = ();	4244	%EXTICMD = ();
3844		4245
3845	warn "unloading/nuking all extensions";	4246	trace "perl_reload: unloading/nuking all extensions";
3846	for my $pkg (@EXTS) {	4247	for my $pkg (@EXTS) {
3847	warn "... unloading $pkg";	4248	trace "... unloading $pkg";
3848		4249
3849	if (my $cb = $pkg->can ("unload")) {	4250	if (my $cb = $pkg->can ("unload")) {
3850	eval {	4251	eval {
3851	$cb->($pkg);	4252	$cb->($pkg);
3852	1	4253	1
3853	} or warn "$pkg unloaded, but with errors: $@";	4254	} or error "$pkg unloaded, but with errors: $@";
3854	}	4255	}
3855		4256
3856	warn "... clearing $pkg";	4257	trace "... clearing $pkg";
3857	clear_package $pkg;	4258	clear_package $pkg;
3858	}	4259	}
3859		4260
3860	warn "unloading all perl modules loaded from $LIBDIR";	4261	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3861	while (my ($k, $v) = each %INC) {	4262	while (my ($k, $v) = each %INC) {
3862	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4263	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863		4264
3864	warn "... unloading $k";	4265	trace "... unloading $k";
3865	delete $INC{$k};	4266	delete $INC{$k};
3866		4267
3867	$k =~ s/\.pm$//;	4268	$k =~ s/\.pm$//;
3868	$k =~ s/\//::/g;	4269	$k =~ s/\//::/g;
3869		4270
…		…
3872	}	4273	}
3873		4274
3874	clear_package $k;	4275	clear_package $k;
3875	}	4276	}
3876		4277
3877	warn "getting rid of safe::, as good as possible";	4278	trace "perl_reload: getting rid of safe::, as good as possible";
3878	clear_package "safe::$_"	4279	clear_package "safe::$_"
3879	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);
3880		4281
3881	warn "unloading cf.pm \"a bit\"";	4282	trace "perl_reload: unloading cf.pm \"a bit\"";
3882	delete $INC{"cf.pm"};	4283	delete $INC{"cf.pm"};
3883	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4284	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3884		4285
3885	# don't, removes xs symbols, too,	4286	# don't, removes xs symbols, too,
3886	# and global variables created in xs	4287	# and global variables created in xs
3887	#clear_package __PACKAGE__;	4288	#clear_package __PACKAGE__;
3888		4289
3889	warn "unload completed, starting to reload now";	4290	info "perl_reload: unload completed, starting to reload now";
3890		4291
3891	warn "reloading cf.pm";	4292	trace "perl_reload: reloading cf.pm";
3892	require cf;	4293	require cf;
3893	cf::_connect_to_perl_1;	4294	cf::_connect_to_perl_1;
3894		4295
3895	warn "loading config and database again";	4296	trace "perl_reload: loading config and database again";
3896	cf::reload_config;	4297	cf::reload_config;
3897		4298
3898	warn "loading extensions";	4299	trace "perl_reload: loading extensions";
3899	cf::load_extensions;	4300	cf::load_extensions;
3900		4301
3901	if ($REATTACH_ON_RELOAD) {	4302	if ($REATTACH_ON_RELOAD) {
3902	warn "reattaching attachments to objects/players";	4303	trace "perl_reload: reattaching attachments to objects/players";
3903	_global_reattach; # objects, sockets	4304	_global_reattach; # objects, sockets
3904	warn "reattaching attachments to maps";	4305	trace "perl_reload: reattaching attachments to maps";
3905	reattach $_ for values %MAP;	4306	reattach $_ for values %MAP;
3906	warn "reattaching attachments to players";	4307	trace "perl_reload: reattaching attachments to players";
3907	reattach $_ for values %PLAYER;	4308	reattach $_ for values %PLAYER;
3908	}	4309	}
3909		4310
3910	warn "running post_init jobs";	4311	cf::_post_init 1;
3911	(pop @POST_INIT)->(1) while @POST_INIT;
3912		4312
3913	warn "leaving sync_job";	4313	trace "perl_reload: leaving sync_job";
3914		4314
3915	1	4315	1
3916	} or do {	4316	} or do {
3917	warn $@;	4317	error $@;
3918	cf::cleanup "error while reloading, exiting.";	4318	cf::cleanup "perl_reload: error, exiting.";
3919	};	4319	};
3920		4320
3921	warn "reloaded";
3922	--$RELOAD;	4321	--$RELOAD;
3923	}	4322	}
3924		4323
3925	$t1 = AE::time - $t1;	4324	$t1 = AE::time - $t1;
3926	warn "reload completed in ${t1}s\n";	4325	info "perl_reload: completed in ${t1}s\n";
3927	};	4326	};
3928		4327
3929	our $RELOAD_WATCHER; # used only during reload	4328	our $RELOAD_WATCHER; # used only during reload
3930		4329
3931	sub reload_perl() {	4330	sub reload_perl() {
…		…
3952	reload_perl;	4351	reload_perl;
3953	};	4352	};
3954	}	4353	}
3955	};	4354	};
3956		4355
3957	unshift @INC, $LIBDIR;	4356	#############################################################################
3958		4357
3959	my $bug_warning = 0;	4358	my $bug_warning = 0;
3960		4359
3961	our @WAIT_FOR_TICK;
3962	our @WAIT_FOR_TICK_BEGIN;
3963
3964	sub wait_for_tick {	4360	sub wait_for_tick() {
3965	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4361	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966		4362
3967	my $signal = new Coro::Signal;	4363	$WAIT_FOR_TICK->wait;
3968	push @WAIT_FOR_TICK, $signal;
3969	$signal->wait;
3970	}	4364	}
3971		4365
3972	sub wait_for_tick_begin {	4366	sub wait_for_tick_begin() {
3973	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4367	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3974		4368
3975	my $signal = new Coro::Signal;	4369	my $signal = new Coro::Signal;
3976	push @WAIT_FOR_TICK_BEGIN, $signal;	4370	push @WAIT_FOR_TICK_BEGIN, $signal;
3977	$signal->wait;	4371	$signal->wait;
3978	}	4372	}
…		…
3982	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"
3983	unless ++$bug_warning > 10;	4377	unless ++$bug_warning > 10;
3984	return;	4378	return;
3985	}	4379	}
3986		4380
3987	cf::server_tick; # one server iteration	4381	cf::one_tick; # one server iteration
3988		4382
3989	#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#
3990		4384
3991	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4385	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3992	$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.;
3993	Coro::async_pool {	4387	Coro::async_pool {
3994	$Coro::current->{desc} = "runtime saver";	4388	$Coro::current->{desc} = "runtime saver";
3995	write_runtime_sync	4389	write_runtime_sync
3996	or warn "ERROR: unable to write runtime file: $!";	4390	or error "ERROR: unable to write runtime file: $!";
3997	};	4391	};
3998	}	4392	}
3999		4393
4000	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4394	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4001	$sig->send;	4395	$sig->send;
4002	}	4396	}
4003	while (my $sig = shift @WAIT_FOR_TICK) {	4397	$WAIT_FOR_TICK->broadcast;
4004	$sig->send;
4005	}
4006		4398
4007	$LOAD = ($NOW - $TICK_START) / $TICK;	4399	$LOAD = ($NOW - $TICK_START) / $TICK;
4008	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4400	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4009		4401
4010	if (0) {	4402	if (0) {
4011	if ($NEXT_TICK) {	4403	if ($NEXT_TICK) {
4012	my $jitter = $TICK_START - $NEXT_TICK;	4404	my $jitter = $TICK_START - $NEXT_TICK;
4013	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4405	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014	warn "jitter $JITTER\n";#d#	4406	debug "jitter $JITTER\n";#d#
4015	}	4407	}
4016	}	4408	}
4017	}	4409	}
4018		4410
4019	{	4411	{
4020	# configure BDB	4412	# configure BDB
		4413	info "initialising database";
4021		4414
4022	BDB::min_parallel 16;	4415	BDB::min_parallel 16;
4023	BDB::max_poll_reqs $TICK * 0.1;	4416	BDB::max_poll_reqs $TICK * 0.1;
4024	$AnyEvent::BDB::WATCHER->priority (1);	4417	#$AnyEvent::BDB::WATCHER->priority (1);
4025		4418
4026	unless ($DB_ENV) {	4419	unless ($DB_ENV) {
4027	$DB_ENV = BDB::db_env_create;	4420	$DB_ENV = BDB::db_env_create;
4028	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4421	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029	$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;
…		…
4054	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4447	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4055	};	4448	};
4056	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4449	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4057	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4450	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4058	};	4451	};
		4452
		4453	info "database initialised";
4059	}	4454	}
4060		4455
4061	{	4456	{
4062	# configure IO::AIO	4457	# configure IO::AIO
4063		4458
		4459	info "initialising aio";
4064	IO::AIO::min_parallel 8;	4460	IO::AIO::min_parallel 8;
4065	IO::AIO::max_poll_time $TICK * 0.1;	4461	IO::AIO::max_poll_time $TICK * 0.1;
4066	undef $AnyEvent::AIO::WATCHER;	4462	undef $AnyEvent::AIO::WATCHER;
		4463	info "aio initialised";
4067	}	4464	}
4068		4465
4069	my $_log_backtrace;	4466	our $_log_backtrace;
		4467	our $_log_backtrace_last;
4070		4468
4071	sub _log_backtrace {	4469	sub _log_backtrace {
4072	my ($msg, @addr) = @_;	4470	my ($msg, @addr) = @_;
4073		4471
4074	$msg =~ s/\n//;	4472	$msg =~ s/\n$//;
4075		4473
		4474	if ($_log_backtrace_last eq $msg) {
		4475	LOG llevInfo, "[ABT] $msg\n";
		4476	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4076	# limit the # of concurrent backtraces	4477	# limit the # of concurrent backtraces
4077	if ($_log_backtrace < 2) {	4478	} elsif ($_log_backtrace < 2) {
		4479	$_log_backtrace_last = $msg;
4078	++$_log_backtrace;	4480	++$_log_backtrace;
4079	my $perl_bt = Carp::longmess $msg;	4481	my $perl_bt = Carp::longmess $msg;
4080	async {	4482	async {
4081	$Coro::current->{desc} = "abt $msg";	4483	$Coro::current->{desc} = "abt $msg";
4082		4484
…		…
4102	LOG llevInfo, "[ABT] $_\n" for @bt;	4504	LOG llevInfo, "[ABT] $_\n" for @bt;
4103	--$_log_backtrace;	4505	--$_log_backtrace;
4104	};	4506	};
4105	} else {	4507	} else {
4106	LOG llevInfo, "[ABT] $msg\n";	4508	LOG llevInfo, "[ABT] $msg\n";
4107	LOG llevInfo, "[ABT] [suppressed]\n";	4509	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4108	}	4510	}
4109	}	4511	}
4110		4512
4111	# load additional modules	4513	# load additional modules
4112	require "cf/$_.pm" for @EXTRA_MODULES;	4514	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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