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.520 by root, Fri Apr 16 02:37:50 2010 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 4000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 100000;	121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
115		125
116	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
117	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
118	our $NEXT_TICK;	128	our $NEXT_TICK;
119	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
121	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
122	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
123	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
124	our $DB_ENV;	134	our $DB_ENV;
125		135
126	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
127		137
128	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
129		140
130	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
131	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
132	our $NOW;	144	our $NOW;
133		145
134	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
135	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
136	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
145		157
146	our @POST_INIT;	158	our @POST_INIT;
147		159
148	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
150		165
151	binmode STDOUT;	166	binmode STDOUT;
152	binmode STDERR;	167	binmode STDERR;
153		168
154	# read virtual server time, if available	169	# read virtual server time, if available
…		…
165		180
166	our $EMERGENCY_POSITION;	181	our $EMERGENCY_POSITION;
167		182
168	sub cf::map::normalise;	183	sub cf::map::normalise;
169		184
		185	sub in_main() {
		186	$Coro::current == $Coro::main
		187	}
		188
170	#############################################################################	189	#############################################################################
171		190
172	%REFLECT = ();	191	%REFLECT = ();
173	for (@REFLECT) {	192	for (@REFLECT) {
174	my $reflect = JSON::XS::decode_json $_;	193	my $reflect = JSON::XS::decode_json $_;
…		…
184		203
185	=over 4	204	=over 4
186		205
187	=item $cf::UPTIME	206	=item $cf::UPTIME
188		207
189	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
190		224
191	=item $cf::RUNTIME	225	=item $cf::RUNTIME
192		226
193	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
194	every server tick.	228	every server tick.
195		229
196	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
197	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
198	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
199		233
200	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
201	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
202	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
203	database environment.	237	database environment.
204		238
205	=item $cf::NOW
206
207	The time of the last (current) server tick.
208
209	=item $cf::TICK
210
211	The interval between server ticks, in seconds.
212
213	=item $cf::LOADAVG	239	=item $cf::LOADAVG
214		240
215	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
216	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
217	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
225	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
226	from wherever your confdir points to.	252	from wherever your confdir points to.
227		253
228	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
229		255
230	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
231	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
232	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
233		277
234	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
235		279
236	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
237	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
245		289
246	=back	290	=back
247		291
248	=cut	292	=cut
249		293
		294	sub error(@) { LOG llevError, join "", @_ }
		295	sub warn (@) { LOG llevWarn , join "", @_ }
		296	sub info (@) { LOG llevInfo , join "", @_ }
		297	sub debug(@) { LOG llevDebug, join "", @_ }
		298	sub trace(@) { LOG llevTrace, join "", @_ }
		299
250	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
251	my $msg = join "", @_;	301	my $msg = join "", @_;
252		302
253	$msg .= "\n"	303	$msg .= "\n"
254	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
255		305
256	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	306	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
257		307
258	LOG llevError, $msg;	308	LOG llevWarn, $msg;
259	};	309	};
260		310
261	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
262	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
263		313
264	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
265		315
266	if ($Coro::current == $Coro::main) {#d#	316	if (in_main) {#d#
267	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
268	return;#d#	318	return;#d#
269	}#d#	319	}#d#
270		320
271	# kill coroutine otherwise	321	# kill coroutine otherwise
272	Coro::terminate	322	Coro::terminate
…		…
292	)) {	342	)) {
293	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
294	}	344	}
295		345
296	$EV::DIED = sub {	346	$EV::DIED = sub {
297	Carp::cluck "error in event callback: @_";	347	warn "error in event callback: $@";
298	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
299		354
300	#############################################################################	355	#############################################################################
301		356
302	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
303		358
…		…
324	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
325	$d	380	$d
326	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
327	}	382	}
328		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
329	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
330		437
331	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
332		439
333	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
339	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
340		447
341	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
342	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
343		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
344	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
345		483
346	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
347	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
348		486
349	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
350	is a reload or not.	488	is a reload or not.
351		489
352	=cut	490	=cut
353		491
354	sub post_init(&) {	492	sub post_init(&) {
355	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
356	}	511	}
357		512
358	=item cf::lock_wait $string	513	=item cf::lock_wait $string
359		514
360	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
413	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
414	}	569	}
415		570
416	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
417		572
418	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	Allocate $time seconds of blocking CPU time at priority C<$priority>
419	This call blocks and returns only when you have at least C<$time> seconds	574	(default: 0): This call blocks and returns only when you have at least
420	of cpu time till the next tick. The slot is only valid till the next cede.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
421		580
422	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
423	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
424		583
425	Useful for short background jobs.	584	Useful for short background jobs.
…		…
437	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
438	my $busy;	597	my $busy;
439		598
440	while () {	599	while () {
441	next_job:	600	next_job:
		601
		602	Coro::cede;
442		603
443	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
444		605
445	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
446	if ($SLOT_QUEUE[$_][0] <= $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
447	$busy = 0;	608	$busy = 0;
448	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
449	$job->[2]->send;	610	$job->[2]->send;
450	Coro::cede;
451	goto next_job;	611	goto next_job;
452	} else {	612	} else {
453	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;	613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
454	}	614	}
455	}	615	}
456		616
457	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
458	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
459	push @cf::WAIT_FOR_TICK, $signal;
460	$signal->wait;
461	} else {	619	} else {
462	$busy = 0;	620	$busy = 0;
463	Coro::schedule;	621	Coro::schedule;
464	}	622	}
465	}	623	}
…		…
505	=cut	663	=cut
506		664
507	sub sync_job(&) {	665	sub sync_job(&) {
508	my ($job) = @_;	666	my ($job) = @_;
509		667
510	if ($Coro::current == $Coro::main) {	668	if (in_main) {
511	my $time = AE::time;	669	my $time = AE::time;
512		670
513	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
514	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
515		673
516	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
517		675
518	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
519		677
520	my $busy = 1;	678	my $busy = 1;
521	my @res;	679	my @res;
522		680
523	(async {	681	(async {
524	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
525	@res = eval { $job->() };	683	@res = eval { $job->() };
526	warn $@ if $@;	684	error $@ if $@;
527	undef $busy;	685	undef $busy;
528	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
529		687
530	while ($busy) {	688	while ($busy) {
531	if (Coro::nready) {	689	if (Coro::nready) {
532	Coro::cede_notself;	690	Coro::cede_notself;
533	} else {	691	} else {
534	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
535	}	693	}
536	}	694	}
537		695
538	my $time = AE::time - $time;	696	my $time = AE::time - $time;
539		697
…		…
565	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
566		724
567	$coro	725	$coro
568	}	726	}
569		727
570	=item fork_call { }, $args	728	=item fork_call { }, @args
571		729
572	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
573	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
574	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
575	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
576		734
577	=cut	735	=cut
578		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
579	sub fork_call(&@) {	741	sub fork_call(&@) {
580	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
581		743
582	# we seemingly have to make a local copy of the whole thing,
583	# otherwise perl prematurely frees the stuff :/
584	# TODO: investigate and fix (likely this will be rather laborious)
585
586	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
587	reset_signals;	745	cf::post_fork;
588	&$cb	746	&$cb
589	}, @args;	747	} @args;
590		748
591	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
592	}	750	}
593		751
594	sub objinfo {	752	sub objinfo {
…		…
644	within each server.	802	within each server.
645		803
646	=cut	804	=cut
647		805
648	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
649	my ($name) = @_;	810	my ($name) = @_;
650	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
651		812
652	eval {	813	eval {
653	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
663	}	824	}
664		825
665	our $DB;	826	our $DB;
666		827
667	sub db_init {	828	sub db_init {
668	cf::sync_job {
669	$DB ||= db_table "db";	829	$DB ||= db_table "db";
670	};
671	}	830	}
672		831
673	sub db_get($$) {	832	sub db_get($$) {
674	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
675		834
676	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
677	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
678		839
679	$! ? ()	840	$! ? ()
680	: $data	841	: $data
681	}
682	}	842	}
683		843
684	sub db_put($$$) {	844	sub db_put($$$) {
685	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
686	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
714		874
715	my @data;	875	my @data;
716	my $md5;	876	my $md5;
717		877
718	for (0 .. $#$src) {	878	for (0 .. $#$src) {
719	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
720	or Carp::croak "$src->[$_]: $!";
721	}	880	}
722		881
723	# if processing is expensive, check	882	# if processing is expensive, check
724	# checksum first	883	# checksum first
725	if (1) {	884	if (1) {
…		…
738		897
739	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
740	}	899	}
741	}	900	}
742		901
743	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
744	my $data = $process->(\@data);	903	my $data = $process->(\@data);
745	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
746		905
747	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
748		907
749	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
750	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
751	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
752		911
…		…
762		921
763	=cut	922	=cut
764		923
765	sub datalog($@) {	924	sub datalog($@) {
766	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
767	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
768	}	927	}
769		928
770	=back	929	=back
771		930
772	=cut	931	=cut
…		…
967		1126
968	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
969	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
970		1129
971	} elsif (ref $type) {	1130	} elsif (ref $type) {
972	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
973		1132
974	} else {	1133	} else {
975	shift @arg;	1134	shift @arg;
976	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
977	}	1136	}
978	}	1137	}
979	}	1138	}
980		1139
981	sub _object_attach {	1140	sub _object_attach {
…		…
991	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
992	}	1151	}
993		1152
994	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
995	} else {	1154	} else {
996	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
997	}	1156	}
998		1157
999	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
1000	}	1159	}
1001		1160
…		…
1060		1219
1061	for (@$callbacks) {	1220	for (@$callbacks) {
1062	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1063		1222
1064	if ($@) {	1223	if ($@) {
1065	warn "$@";
1066	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1067	override;	1225	override;
1068	}	1226	}
1069		1227
1070	return 1 if $override;	1228	return 1 if $override;
1071	}	1229	}
…		…
1150	for (@$attach) {	1308	for (@$attach) {
1151	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1152	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1153	}	1311	}
1154	} else {	1312	} else {
1155	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1156	}	1314	}
1157	}	1315	}
1158	}	1316	}
1159		1317
1160	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1187	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1188		1346
1189	sync_job {	1347	sync_job {
1190	if (length $$rdata) {	1348	if (length $$rdata) {
1191	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1192	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1193	$decname, length $$rdata, scalar @$objs;	1351	$decname, length $$rdata, scalar @$objs
		1352	if $VERBOSE_IO;
1194		1353
1195	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1196	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1197	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1198	if ($cf::USE_FSYNC) {	1357	if ($cf::USE_FSYNC) {
…		…
1220	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1221		1380
1222	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1223	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1224	} else {	1383	} else {
1225	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1226	}	1385	}
1227	} else {	1386	} else {
1228	aio_unlink $filename;	1387	aio_unlink $filename;
1229	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1230	}	1389	}
…		…
1254	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1255	$av = $st->{objs};	1414	$av = $st->{objs};
1256	}	1415	}
1257		1416
1258	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1259	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1260	$decname, length $data, scalar @{$av || []};	1419	$decname, length $data, scalar @{$av || []}
		1420	if $VERBOSE_IO;
1261		1421
1262	($data, $av)	1422	($data, $av)
1263	}	1423	}
1264		1424
1265	=head2 COMMAND CALLBACKS	1425	=head2 COMMAND CALLBACKS
…		…
1269	=cut	1429	=cut
1270		1430
1271	#############################################################################	1431	#############################################################################
1272	# command handling &c	1432	# command handling &c
1273		1433
1274	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1275		1435
1276	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1277	$name.	1437	$name.
1278		1438
1279	=cut	1439	=cut
…		…
1285	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1286		1446
1287	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1288	}	1448	}
1289		1449
1290	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1291		1451
1292	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1293	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1294	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1295	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1296	has logged in successfully.	1456	has logged in successfully.
1297		1457
1298	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1299	called.
1300		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1301	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1302		1466
1303	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1304	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1305	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1306	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1307	log-in.	1471	log-in.
1308		1472
1309	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1310	called.
1311		1474
1312	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1313		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1314	sub register_extcmd {	1482	sub register_extcmd($$) {
1315	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1316		1484
1317	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1318	}	1486	}
1319		1487
1320	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1321	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1322		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1323	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1324	}	1504	}
1325		1505
1326	use File::Glob ();	1506	use File::Glob ();
1327		1507
1328	cf::player->attach (	1508	cf::player->attach (
…		…
1342	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1343		1523
1344	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1345		1525
1346	if (ref $msg) {	1526	if (ref $msg) {
1347	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1348	"ARRAY" eq ref $msg
1349	? @$msg
1350	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1351		1528
1352	my @reply;
1353
1354	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1355	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1356	}	1547	}
1357		1548
1358	$pl->ext_reply ($reply, @reply)
1359	if $reply;
1360
1361	} else {	1549	} else {
1362	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1363	}	1551	}
1364		1552
1365	cf::override;	1553	cf::override;
1366	},	1554	},
1367	);	1555	);
…		…
1377	};	1565	};
1378		1566
1379	$grp	1567	$grp
1380	}	1568	}
1381		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1382	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1383	cf::sync_job {	1586	cf::sync_job {
1384	my %todo;	1587	my %todo;
1385		1588
1386	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1387	next unless -r $path;	1590	next unless -r $path;
…		…
1405		1608
1406	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1407	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1408		1611
1409	$ext{source} =	1612	$ext{source} =
1410	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1411	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1412	. $source	1615	. $source
1413	. "\n};\n1";	1616	. "\n};\n1";
1414		1617
1415	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1427	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1428	next ext	1631	next ext
1429	unless exists $done{$_};	1632	unless exists $done{$_};
1430	}	1633	}
1431		1634
1432	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1433		1636
		1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
1434	my $active = eval $v->{source};	1646	my $active = eval $source;
1435		1647
1436	if (length $@) {	1648	if (length $@) {
1437	warn "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1438		1650
1439	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1440	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
		1653
		1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1655	delete $todo{$k};
1441	} else {	1656	} else {
1442	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1443	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1444	$progress = 1;	1659	$progress = 1;
1445		1660
1446	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1447	unless $active;	1662	unless $active;
1448	}	1663	}
1449	}	1664	}
1450		1665
1451	unless ($progress) {	1666	unless ($progress) {
…		…
1453		1668
1454	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1455	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1456	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1457	}	1672	}
		1673
		1674	last;
1458	}	1675	}
1459	}	1676	}
1460	};	1677	};
1461	}	1678	}
1462		1679
…		…
1620	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1621		1838
1622	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1623	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1624		1841
1625	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1626	$pl->deactivate;	1843	$pl->deactivate;
		1844
1627	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1628	$pl->ob->check_score;
1629	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1630	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1631		1850
1632	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1633	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1634	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1688	\@logins	1907	\@logins
1689	}	1908	}
1690		1909
1691	=item $player->maps	1910	=item $player->maps
1692		1911
		1912	=item cf::player::maps $login
		1913
1693	Returns an arrayref of map paths that are private for this	1914	Returns an arrayref of map paths that are private for this
1694	player. May block.	1915	player. May block.
1695		1916
1696	=cut	1917	=cut
1697		1918
…		…
1718		1939
1719	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1720		1941
1721	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1722		1943
1723	=item $player->ext_reply ($msgid, @msg)
1724
1725	Sends an ext reply to the player.
1726
1727	=cut
1728
1729	sub ext_reply($$@) {
1730	my ($self, $id, @msg) = @_;
1731
1732	$self->ns->ext_reply ($id, @msg)
1733	}
1734
1735	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1736		1945
1737	Sends an ext event to the client.	1946	Sends an ext event to the client.
1738		1947
1739	=cut	1948	=cut
…		…
1758		1967
1759	=cut	1968	=cut
1760		1969
1761	sub find_by_path($) {	1970	sub find_by_path($) {
1762	my ($path) = @_;	1971	my ($path) = @_;
		1972
		1973	$path =~ s/^~[^\/]*//; # skip ~login
1763		1974
1764	my ($match, $specificity);	1975	my ($match, $specificity);
1765		1976
1766	for my $region (list) {	1977	for my $region (list) {
1767	if ($region->{match} && $path =~ $region->{match}) {	1978	if ($region->{match} && $path =~ $region->{match}) {
…		…
1796	sub generate_random_map {	2007	sub generate_random_map {
1797	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1798		2009
1799	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1800		2011
1801	# mit "rum" bekleckern, nicht
1802	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1803	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1804	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1805	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1806	$rmp->{exit_on_final_map},
1807	$rmp->{xsize}, $rmp->{ysize},
1808	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1809	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1810	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1811	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1812	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1813	(cf::region::find $rmp->{region}), $rmp->{custom}
1814	)
1815	}	2013	}
1816		2014
1817	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1818		2016
1819	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1824		2022
1825	sub register {	2023	sub register {
1826	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1827	my $pkg = caller;	2025	my $pkg = caller;
1828		2026
1829	no strict;
1830	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1831		2028
1832	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1833	}	2030	}
1834		2031
1835	# also paths starting with '/'	2032	# also paths starting with '/'
1836	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2033	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1837		2034
1838	sub thawer_merge {	2035	sub thawer_merge {
1839	my ($self, $merge) = @_;	2036	my ($self, $merge) = @_;
1840		2037
1841	# we have to keep some variables in memory intact	2038	# we have to keep some variables in memory intact
…		…
1846	}	2043	}
1847		2044
1848	sub normalise {	2045	sub normalise {
1849	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1850		2047
1851	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1852		2049
1853	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1854		2051
1855	# map plan:	2052	# map plan:
1856	#	2053	#
…		…
1871	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1872	$path = "$base/$path";	2069	$path = "$base/$path";
1873	}	2070	}
1874		2071
1875	for ($path) {	2072	for ($path) {
1876	redo if s{//}{/};
1877	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1878	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1879	}	2075	}
1880		2076
1881	$path	2077	$path
…		…
1895	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1896	return $self;	2092	return $self;
1897	}	2093	}
1898	}	2094	}
1899		2095
1900	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1901	()	2097	()
1902	}	2098	}
1903		2099
		2100	# may re-bless or do other evil things
1904	sub init {	2101	sub init {
1905	my ($self) = @_;	2102	my ($self) = @_;
1906		2103
1907	$self	2104	$self
1908	}	2105	}
…		…
1973	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1974		2171
1975	1	2172	1
1976	}	2173	}
1977		2174
		2175	# used to laod the header of an original map
1978	sub load_header_orig {	2176	sub load_header_orig {
1979	my ($self) = @_;	2177	my ($self) = @_;
1980		2178
1981	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1982	}	2180	}
1983		2181
		2182	# used to laod the header of an instantiated map
1984	sub load_header_temp {	2183	sub load_header_temp {
1985	my ($self) = @_;	2184	my ($self) = @_;
1986		2185
1987	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
1988	}	2187	}
1989		2188
		2189	# called after loading the header from an instantiated map
1990	sub prepare_temp {	2190	sub prepare_temp {
1991	my ($self) = @_;	2191	my ($self) = @_;
1992		2192
1993	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
1994	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
1995	# safety	2195	# safety
1996	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
1997	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
1998	}	2198	}
1999		2199
		2200	# called after loading the header from an original map
2000	sub prepare_orig {	2201	sub prepare_orig {
2001	my ($self) = @_;	2202	my ($self) = @_;
2002		2203
2003	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2004	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2028		2229
2029	sub find;	2230	sub find;
2030	sub find {	2231	sub find {
2031	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2032		2233
		2234	cf::cede_to_tick;
		2235
2033	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2034		2237
2035	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2036	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2037		2240
2038	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2069		2272
2070	{	2273	{
2071	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2072		2275
2073	return unless $self->valid;	2276	return unless $self->valid;
2074	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2075
2076	$self->in_memory (cf::MAP_LOADING);
2077		2278
2078	$self->alloc;	2279	$self->alloc;
2079		2280
2080	$self->pre_load;	2281	$self->pre_load;
2081	cf::cede_to_tick;	2282	cf::cede_to_tick;
2082		2283
		2284	if (exists $self->{load_path}) {
2083	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2084	$f->skip_block;	2286	$f->skip_block;
2085	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2086	or return;	2288	or return;
2087		2289
2088	$self->post_load_original	2290	$self->post_load_original
2089	if delete $self->{load_original};	2291	if delete $self->{load_original};
2090		2292
2091	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2092	utf8::encode $uniq;	2294	utf8::encode $uniq;
2093	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2094	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2095	$self->clear_unique_items;	2297	$self->clear_unique_items;
2096	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2097	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2098	}	2301	}
2099	}	2302	}
2100	}
2101		2303
2102	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2103		2311
2104	cf::cede_to_tick;	2312	cf::cede_to_tick;
2105	# now do the right thing for maps	2313	# now do the right thing for maps
2106	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2107	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2111	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2112	$self->decay_objects;	2320	$self->decay_objects;
2113	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2114	$self->update_buttons;	2322	$self->update_buttons;
2115	cf::cede_to_tick;	2323	cf::cede_to_tick;
2116	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2117	}	2325	}
2118		2326
2119	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2120	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2121
2122	$self->in_memory (cf::MAP_ACTIVE);
2123	}	2329	}
2124		2330
2125	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2126	}	2334	}
2127		2335
2128	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2129	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2130	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2138	# if $self->per_party;	2346	# if $self->per_party;
2139		2347
2140	$self	2348	$self
2141	}	2349	}
2142		2350
2143	# find and load all maps in the 3x3 area around a map
2144	sub load_neighbours {
2145	my ($map) = @_;
2146
2147	my @neigh; # diagonal neighbours
2148
2149	for (0 .. 3) {
2150	my $neigh = $map->tile_path ($_)
2151	or next;
2152	$neigh = find $neigh, $map
2153	or next;
2154	$neigh->load;
2155
2156	push @neigh,
2157	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2158	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2159	}
2160
2161	for (grep defined $_->[0], @neigh) {
2162	my ($path, $origin) = @$_;
2163	my $neigh = find $path, $origin
2164	or next;
2165	$neigh->load;
2166	}
2167	}
2168
2169	sub find_sync {	2351	sub find_sync {
2170	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2171		2353
2172	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2173	}	2359	}
2174		2360
2175	sub do_load_sync {	2361	sub do_load_sync {
2176	my ($map) = @_;	2362	my ($map) = @_;
2177		2363
		2364	# it's a bug to call this from the main context
2178	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2179	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2180		2367
2181	cf::sync_job { $map->load };	2368	$map->load;
2182	}	2369	}
2183		2370
2184	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2185	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2186		2373
2187	sub find_async {	2374	sub find_async {
2188	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2189		2376
2190	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2191		2378
2192	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2193	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2194	}	2381	}
2195		2382
2196	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2197		2384
2198	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2199	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2200		2387
2201	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2202	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2203	if (my $map = find $k) {	2390	if (my $map = find $k) {
2204	$map->load if $v;	2391	$map->load if $v;
2205	}	2392	}
2206		2393
2207	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
…		…
2257	sub swap_out {	2444	sub swap_out {
2258	my ($self) = @_;	2445	my ($self) = @_;
2259		2446
2260	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2261		2448
2262	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2263	return if $self->{deny_save};	2450	return if $self->{deny_save};
2264	return if $self->players;	2451	return if $self->players;
2265		2452
2266	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2267	$self->deactivate;	2454	$self->deactivate;
2268	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2269	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2270		2457
2271	# then atomically save	2458	# then atomically save
2272	$self->_save;	2459	$self->_save;
2273		2460
2274	# then free the map	2461	# then free the map
…		…
2298		2485
2299	my $lock = cf::lock_acquire "map_data:$self->{path}";	2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
2300		2487
2301	return if $self->players;	2488	return if $self->players;
2302		2489
2303	warn "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2304		2491
2305	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2306		2493
2307	# need to save uniques path	2494	# need to save uniques path
2308	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2309	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2310		2497
…		…
2332		2519
2333	delete $cf::MAP{$self->path};	2520	delete $cf::MAP{$self->path};
2334		2521
2335	$self->unlink_save;	2522	$self->unlink_save;
2336		2523
2337	bless $self, "cf::map";	2524	bless $self, "cf::map::wrap";
2338	delete $self->{deny_reset};	2525	delete $self->{deny_reset};
2339	$self->{deny_save} = 1;	2526	$self->{deny_save} = 1;
2340	$self->reset_timeout (1);	2527	$self->reset_timeout (1);
2341	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2528	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2342		2529
…		…
2463		2650
2464	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2465		2652
2466	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2467		2654
2468	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2469	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2470		2657
2471	=cut	2658	=cut
2472		2659
2473	sub deref {	2660	sub deref {
…		…
2555	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2556		2743
2557	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2558	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2559		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2560	=cut	2772	=cut
2561		2773
2562	sub cf::object::player::may {	2774	sub cf::object::player::may {
2563	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2564		2776
2565	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2566	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2567	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2568	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2569	}	2781	}
2570		2782
2571	=item $player_object->enter_link	2783	=item $player_object->enter_link
2572		2784
2573	Freezes the player and moves him/her to a special map (C<{link}>).	2785	Freezes the player and moves him/her to a special map (C<{link}>).
2574		2786
2575	The player should be reasonably safe there for short amounts of time (e.g.	2787	The player should be reasonably safe there for short amounts of time (e.g.
2576	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2788	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2577	though, as the palyer cannot control the character while it is on the link	2789	though, as the player cannot control the character while it is on the link
2578	map.	2790	map.
2579		2791
2580	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2581		2799
2582	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2583		2801
2584	Moves the player out of the special C<{link}> map onto the specified	2802	Moves the player out of the special C<{link}> map onto the specified
2585	map. If the map is not valid (or omitted), the player will be moved back	2803	map. If the map is not valid (or omitted), the player will be moved back
…		…
2603	sub cf::object::player::enter_link {	2821	sub cf::object::player::enter_link {
2604	my ($self) = @_;	2822	my ($self) = @_;
2605		2823
2606	$self->deactivate_recursive;	2824	$self->deactivate_recursive;
2607		2825
		2826	++$self->{_link_recursion};
		2827
2608	return if UNIVERSAL::isa $self->map, "ext::map_link";	2828	return if UNIVERSAL::isa $self->map, "ext::map_link";
2609		2829
2610	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2830	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2611	if $self->map && $self->map->{path} ne "{link}";	2831	if $self->map && $self->map->{path} ne "{link}";
2612		2832
…		…
2638	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2639	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2640	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2641		2861
2642	$map->load;	2862	$map->load;
2643	$map->load_neighbours;
2644		2863
2645	return unless $self->contr->active;	2864	return unless $self->contr->active;
2646		2865
2647	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2648	$self->enter_map ($map, $x, $y);	2867	if ($self->enter_map ($map, $x, $y)) {
2649		2868	# entering was successful
		2869	delete $self->{_link_recursion};
2650	# only activate afterwards, to support waiting in hooks	2870	# only activate afterwards, to support waiting in hooks
2651	$self->activate_recursive;	2871	$self->activate_recursive;
2652	}	2872	}
2653		2873
		2874	}
		2875
2654	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2876	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2655		2877
2656	Moves the player to the given map-path and coordinates by first freezing	2878	Moves the player to the given map-path and coordinates by first freezing
2657	her, loading and preparing them map, calling the provided $check callback	2879	her, loading and preparing them map, calling the provided $check callback
2658	that has to return the map if sucecssful, and then unfreezes the player on	2880	that has to return the map if sucecssful, and then unfreezes the player on
2659	the new (success) or old (failed) map position. In either case, $done will	2881	the new (success) or old (failed) map position. In either case, $done will
…		…
2666		2888
2667	our $GOTOGEN;	2889	our $GOTOGEN;
2668		2890
2669	sub cf::object::player::goto {	2891	sub cf::object::player::goto {
2670	my ($self, $path, $x, $y, $check, $done) = @_;	2892	my ($self, $path, $x, $y, $check, $done) = @_;
		2893
		2894	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2895	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2896	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2897	($path, $x, $y) = @$EMERGENCY_POSITION;
		2898	}
2671		2899
2672	# do generation counting so two concurrent goto's will be executed in-order	2900	# do generation counting so two concurrent goto's will be executed in-order
2673	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2901	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2674		2902
2675	$self->enter_link;	2903	$self->enter_link;
…		…
2695	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2696	}	2924	}
2697	}	2925	}
2698		2926
2699	my $map = eval {	2927	my $map = eval {
2700	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2701		2929
2702	if ($map) {	2930	if ($map) {
2703	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2704	$map = $check->($map) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2705	} else {	2933	} else {
2706	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2934	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2707	}	2935	}
2708		2936
2709	$map	2937	$map
…		…
2717	if ($gen == $self->{_goto_generation}) {	2945	if ($gen == $self->{_goto_generation}) {
2718	delete $self->{_goto_generation};	2946	delete $self->{_goto_generation};
2719	$self->leave_link ($map, $x, $y);	2947	$self->leave_link ($map, $x, $y);
2720	}	2948	}
2721		2949
2722	$done->() if $done;	2950	$done->($self) if $done;
2723	})->prio (1);	2951	})->prio (1);
2724	}	2952	}
2725		2953
2726	=item $player_object->enter_exit ($exit_object)	2954	=item $player_object->enter_exit ($exit_object)
2727		2955
…		…
2795	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2796		3024
2797	unless (eval {	3025	unless (eval {
2798	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2799		3027
2800	# random map handling
2801	{
2802	my $guard = cf::lock_acquire "exit_prepare:$exit";
2803
2804	prepare_random_map $exit
2805	if $exit->slaying eq "/!";
2806	}
2807
2808	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2809	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2810	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2811		3054
2812	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2813		3056
2814	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2815	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2820	$self->message ("Something went wrong deep within the deliantra server. "	3063	$self->message ("Something went wrong deep within the deliantra server. "
2821	. "I'll try to bring you back to the map you were before. "	3064	. "I'll try to bring you back to the map you were before. "
2822	. "Please report this to the dungeon master!",	3065	. "Please report this to the dungeon master!",
2823	cf::NDI_UNIQUE | cf::NDI_RED);	3066	cf::NDI_UNIQUE | cf::NDI_RED);
2824		3067
2825	warn "ERROR in enter_exit: $@";	3068	error "ERROR in enter_exit: $@";
2826	$self->leave_link;	3069	$self->leave_link;
2827	}	3070	}
2828	})->prio (1);	3071	})->prio (1);
2829	}	3072	}
2830		3073
2831	=head3 cf::client	3074	=head3 cf::client
2832		3075
2833	=over 4	3076	=over 4
2834
2835	=item $client->send_drawinfo ($text, $flags)
2836
2837	Sends a drawinfo packet to the client. Circumvents output buffering so
2838	should not be used under normal circumstances.
2839
2840	=cut
2841
2842	sub cf::client::send_drawinfo {
2843	my ($self, $text, $flags) = @_;
2844
2845	utf8::encode $text;
2846	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2847	}
2848		3077
2849	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2850		3079
2851	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2852	them as required.	3081	them as required.
…		…
2871	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2872	}	3101	}
2873		3102
2874	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2875		3104
2876	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	Send a msg packet to the client, formatting the msg for the client if
2877	client if neccessary. C<$type> should be a string identifying the type of	3106	necessary. C<$type> should be a string identifying the type of the
2878	the message, with C<log> being the default. If C<$color> is negative, suppress	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2879	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2880		3109
2881	=cut	3110	=cut
2882		3111
2883	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
2988	id => "death",	3217	id => "death",
2989	title => "Death",	3218	title => "Death",
2990	reply => undef,	3219	reply => undef,
2991	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
2992	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
2993	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
2994	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
2995	);	3230	);
2996		3231
2997	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3040	=cut	3275	=cut
3041		3276
3042	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3043	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3044		3279
3045	if ($self->extcmd == 2) {
3046	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3047	} elsif ($self->extcmd == 1) { # TODO: remove
3048	push @msg, msgtype => "event_$type";
3049	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3050	}
3051	}
3052
3053	=item $client->ext_reply ($msgid, @msg)
3054
3055	Sends an ext reply to the client.
3056
3057	=cut
3058
3059	sub cf::client::ext_reply($$@) {
3060	my ($self, $id, @msg) = @_;
3061
3062	if ($self->extcmd == 2) {
3063	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3064	} elsif ($self->extcmd == 1) {
3065	#TODO: version 1, remove
3066	unshift @msg, msgtype => "reply", msgid => $id;
3067	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3068	}
3069	}	3281	}
3070		3282
3071	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3072		3284
3073	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3093		3305
3094	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3095	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3096		3308
3097	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3098	}	3349	}
3099		3350
3100	cf::client->attach (	3351	cf::client->attach (
3101	on_connect => sub {	3352	on_connect => sub {
3102	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3128	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3129		3380
3130	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3131		3382
3132	if (ref $msg) {	3383	if (ref $msg) {
3133	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3134	"ARRAY" eq ref $msg
3135	? @$msg
3136	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3137		3385
3138	my @reply;
3139
3140	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3141	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3142	}	3404	}
3143
3144	$ns->ext_reply ($reply, @reply)
3145	if $reply;
3146
3147	} else {	3405	} else {
3148	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3149	}	3407	}
3150		3408
3151	cf::override;	3409	cf::override;
3152	},	3410	},
3153	);	3411	);
…		…
3234	decrease split destroy change_exp value msg lore send_msg)],	3492	decrease split destroy change_exp value msg lore send_msg)],
3235	["cf::object::player" => qw(player)],	3493	["cf::object::player" => qw(player)],
3236	["cf::player" => qw(peaceful send_msg)],	3494	["cf::player" => qw(peaceful send_msg)],
3237	["cf::map" => qw(trigger)],	3495	["cf::map" => qw(trigger)],
3238	) {	3496	) {
3239	no strict 'refs';
3240	my ($pkg, @funs) = @$_;	3497	my ($pkg, @funs) = @$_;
3241	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3498	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3242	for @funs;	3499	for @funs;
3243	}	3500	}
3244		3501
…		…
3283	local @cf::_safe_eval_args = values %vars;	3540	local @cf::_safe_eval_args = values %vars;
3284	@res = wantarray ? eval eval : scalar eval $eval;	3541	@res = wantarray ? eval eval : scalar eval $eval;
3285	}	3542	}
3286		3543
3287	if ($@) {	3544	if ($@) {
3288	warn "$@";	3545	warn "$@",
3289	warn "while executing safe code '$code'\n";	3546	"while executing safe code '$code'\n",
3290	warn "with arguments " . (join " ", %vars) . "\n";	3547	"with arguments " . (join " ", %vars) . "\n";
3291	}	3548	}
3292		3549
3293	wantarray ? @res : $res[0]	3550	wantarray ? @res : $res[0]
3294	}	3551	}
3295		3552
…		…
3320	=cut	3577	=cut
3321		3578
3322	#############################################################################	3579	#############################################################################
3323	# the server's init and main functions	3580	# the server's init and main functions
3324		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3325	sub load_facedata($) {	3659	sub load_facedata($) {
3326	my ($path) = @_;	3660	my ($path) = @_;
3327		3661
3328	# HACK to clear player env face cache, we need some signal framework
3329	# for this (global event?)
3330	%ext::player_env::MUSIC_FACE_CACHE = ();
3331
3332	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3333		3663
3334	warn "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3335		3665
3336	my $facedata;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3337	0 < aio_load $path, $facedata
3338	or die "$path: $!";
3339
3340	$facedata = Coro::Storable::thaw $facedata;
3341		3667
3342	$facedata->{version} == 2	3668	$facedata->{version} == 2
3343	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3344		3670
3345	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3346	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3347	$facedata->{resource}{"res/exp_table"} = {	3673
3348	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3349	data => $exp_table,	3675
3350	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3351	};	3677	# from here on, everything must be atomic - no thread switch allowed
3352	cf::cede_to_tick;	3678	my $t1 = EV::time;
3353		3679
3354	{	3680	{
3355	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3356		3682
3357	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3358	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3359		3686
3360	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3361	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3362	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3363	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3364		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3365	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3366	}	3694	}
3367		3695
3368	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3369	next unless $info->{smooth};	3697	next unless $info->{smooth};
3370		3698
…		…
3373		3701
3374	if (my $smooth = cf::face::find $info->{smooth}) {	3702	if (my $smooth = cf::face::find $info->{smooth}) {
3375	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3376	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3377	} else {	3705	} else {
3378	warn "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3379	}	3707	}
3380
3381	cf::cede_to_tick;
3382	}	3708	}
3383	}	3709	}
3384		3710
3385	{	3711	{
3386	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3387		3713
3388	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3389	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3390	cf::cede_to_tick;
3391	}	3716	}
3392		3717
3393	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3394	}	3719	}
3395		3720
3396	{	3721	{
3397	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3398		3723
3399	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3400	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# TODO: different hash - must free and use new index, or cache ixface data queue
3401	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3402		3728
3403	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3404	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3405	} else {	3735	} else {
3406	$RESOURCE{$name} = $info;	3736	# $RESOURCE{$name} = $info; # unused
3407	}	3737	}
3408
3409	cf::cede_to_tick;
3410	}	3738	}
3411	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3412		3750
3413	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3414		3752
		3753	aio_close $fh if $fh; # close old facedata
		3754
3415	1	3755	1
3416	}	3756	}
3417
3418	cf::global->attach (on_resource_update => sub {
3419	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3420	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3421
3422	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3423	my $sound = $soundconf->{compat}[$_]
3424	or next;
3425
3426	my $face = cf::face::find "sound/$sound->[1]";
3427	cf::sound::set $sound->[0] => $face;
3428	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3429	}
3430
3431	while (my ($k, $v) = each %{$soundconf->{event}}) {
3432	my $face = cf::face::find "sound/$v";
3433	cf::sound::set $k => $face;
3434	}
3435	}
3436	});
3437		3757
3438	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
3439	my ($ns, $want) = @_;	3759	my ($ns, $want) = @_;
3440		3760
3441	while (my ($k, $v) = each %$want) {	3761	while (my ($k, $v) = each %$want) {
…		…
3449	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3450	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3451	cf::arch::commit_load;	3771	cf::arch::commit_load;
3452		3772
3453	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3454	}	3788	}
3455		3789
3456	sub reload_regions {	3790	sub reload_regions {
3457	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3458	# for this (global event?)	3792	# for this (global event?)
…		…
3466	if exists $_->{match};	3800	if exists $_->{match};
3467	}	3801	}
3468	}	3802	}
3469		3803
3470	sub reload_facedata {	3804	sub reload_facedata {
3471	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3472	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3473	}	3807	}
3474		3808
3475	sub reload_archetypes {	3809	sub reload_archetypes {
3476	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3477	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3478	}	3838	}
3479		3839
3480	sub reload_treasures {	3840	sub reload_treasures {
3481	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3482	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3483	}	3843	}
3484		3844
		3845	sub reload_sound {
		3846	trace "loading sound config from $DATADIR/sound\n";
		3847
		3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3849
		3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3851	my $sound = $soundconf->{compat}[$_]
		3852	or next;
		3853
		3854	my $face = cf::face::find "sound/$sound->[1]";
		3855	cf::sound::set $sound->[0] => $face;
		3856	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3857	}
		3858
		3859	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3860	my $face = cf::face::find "sound/$v";
		3861	cf::sound::set $k => $face;
		3862	}
		3863	}
		3864
3485	sub reload_resources {	3865	sub reload_resources {
3486	warn "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3487		3867
		3868	reload_materials;
3488	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
		3871	reload_sound;
3489	reload_archetypes;	3872	reload_archetypes;
3490	reload_regions;	3873	reload_regions;
3491	reload_treasures;	3874	reload_treasures;
3492		3875
3493	warn "finished reloading resource files\n";	3876	trace "finished reloading resource files\n";
3494	}	3877	}
3495		3878
3496	sub reload_config {	3879	sub reload_config {
3497	warn "reloading config file...\n";	3880	trace "reloading config file...\n";
3498		3881
3499	open my $fh, "<:utf8", "$CONFDIR/config"	3882	my $config = load_file "$CONFDIR/config";
3500	or return;	3883	utf8::decode $config;
		3884	*CFG = decode_yaml $config;
3501		3885
3502	local $/;
3503	*CFG = YAML::XS::Load scalar <$fh>;
3504
3505	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3506		3887
3507	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3888	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3508	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3889	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3509		3890
3510	if (exists $CFG{mlockall}) {	3891	if (exists $CFG{mlockall}) {
…		…
3512	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3893	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3513	and die "WARNING: m(un)lockall failed: $!\n";	3894	and die "WARNING: m(un)lockall failed: $!\n";
3514	};	3895	};
3515	warn $@ if $@;	3896	warn $@ if $@;
3516	}	3897	}
3517
3518	warn "finished reloading resource files\n";
3519	}	3898	}
3520		3899
3521	sub pidfile() {	3900	sub pidfile() {
3522	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3901	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3523	or die "$PIDFILE: $!";	3902	or die "$PIDFILE: $!";
…		…
3536	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3537	print $fh $$;	3916	print $fh $$;
3538	}	3917	}
3539		3918
3540	sub main_loop {	3919	sub main_loop {
3541	warn "EV::loop starting\n";	3920	trace "EV::run starting\n";
3542	if (1) {	3921	if (1) {
3543	EV::loop;	3922	EV::run;
3544	}	3923	}
3545	warn "EV::loop returned\n";	3924	trace "EV::run returned\n";
3546	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3547	}	3926	}
3548		3927
3549	sub main {	3928	sub main {
3550	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3551		3930
3552	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3553	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3554	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3555	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3556		3935
3557	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3558		3937
3559	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3560	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3561	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3562	(async {	3941	(async {
3563	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3564	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3565	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3566	};	3945	};
3567		3946
3568	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3569		3948
3570	cf::sync_job {	3949	cf::sync_job {
3571	cf::init_experience;	3950	cf::incloader::init ();
		3951
		3952	db_init;
		3953
3572	cf::init_anim;	3954	cf::init_anim;
3573	cf::init_attackmess;	3955	cf::init_attackmess;
3574	cf::init_dynamic;	3956	cf::init_dynamic;
3575		3957
3576	cf::load_settings;	3958	cf::load_settings;
3577	cf::load_materials;
3578		3959
3579	reload_resources;	3960	reload_resources;
3580	reload_config;	3961	reload_config;
3581	db_init;
3582		3962
3583	cf::init_uuid;	3963	cf::init_uuid;
3584	cf::init_signals;	3964	cf::init_signals;
3585	cf::init_skills;	3965	cf::init_skills;
3586		3966
…		…
3594		3974
3595	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3596	use POSIX ();	3976	use POSIX ();
3597	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3977	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3598		3978
3599	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3600	};	3980	};
3601		3981
3602	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3603	warn "parse errors in files are no longer fatal from this point on.\n";	3983	info "parse errors in files are no longer fatal from this point on.\n";
3604		3984
		3985	AE::postpone {
		3986	undef &main; # free gobs of memory :)
		3987	};
		3988
3605	main_loop;	3989	goto &main_loop;
3606	}	3990	}
3607		3991
3608	#############################################################################	3992	#############################################################################
3609	# initialisation and cleanup	3993	# initialisation and cleanup
3610		3994
…		…
3649	or return;	4033	or return;
3650		4034
3651	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4035	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3652	and return;	4036	and return;
3653		4037
3654	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4038	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3655		4039
3656	1	4040	1
3657	}	4041	}
3658		4042
3659	our $uuid_lock;	4043	our $uuid_lock;
…		…
3671	or return;	4055	or return;
3672		4056
3673	my $value = uuid_seq uuid_cur;	4057	my $value = uuid_seq uuid_cur;
3674		4058
3675	unless ($value) {	4059	unless ($value) {
3676	warn "cowardly refusing to write zero uuid value!\n";	4060	info "cowardly refusing to write zero uuid value!\n";
3677	return;	4061	return;
3678	}	4062	}
3679		4063
3680	my $value = uuid_str $value + $uuid_skip;	4064	my $value = uuid_str $value + $uuid_skip;
3681	$uuid_skip = 0;	4065	$uuid_skip = 0;
…		…
3691	or return;	4075	or return;
3692		4076
3693	aio_rename "$uuid~", $uuid	4077	aio_rename "$uuid~", $uuid
3694	and return;	4078	and return;
3695		4079
3696	warn "uuid file written ($value).\n";	4080	trace "uuid file written ($value).\n";
3697		4081
3698	1	4082	1
3699		4083
3700	}	4084	}
3701		4085
…		…
3707	}	4091	}
3708		4092
3709	sub emergency_save() {	4093	sub emergency_save() {
3710	my $freeze_guard = cf::freeze_mainloop;	4094	my $freeze_guard = cf::freeze_mainloop;
3711		4095
3712	warn "emergency_perl_save: enter\n";	4096	info "emergency_perl_save: enter\n";
		4097
		4098	# this is a trade-off: we want to be very quick here, so
		4099	# save all maps without fsync, and later call a global sync
		4100	# (which in turn might be very very slow)
		4101	local $USE_FSYNC = 0;
3713		4102
3714	cf::sync_job {	4103	cf::sync_job {
3715	# this is a trade-off: we want to be very quick here, so	4104	cf::write_runtime_sync; # external watchdog should not bark
3716	# save all maps without fsync, and later call a global sync
3717	# (which in turn might be very very slow)
3718	local $USE_FSYNC = 0;
3719		4105
3720	# use a peculiar iteration method to avoid tripping on perl	4106	# use a peculiar iteration method to avoid tripping on perl
3721	# refcount bugs in for. also avoids problems with players	4107	# refcount bugs in for. also avoids problems with players
3722	# and maps saved/destroyed asynchronously.	4108	# and maps saved/destroyed asynchronously.
3723	warn "emergency_perl_save: begin player save\n";	4109	info "emergency_perl_save: begin player save\n";
3724	for my $login (keys %cf::PLAYER) {	4110	for my $login (keys %cf::PLAYER) {
3725	my $pl = $cf::PLAYER{$login} or next;	4111	my $pl = $cf::PLAYER{$login} or next;
3726	$pl->valid or next;	4112	$pl->valid or next;
3727	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4113	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3728	$pl->save;	4114	$pl->save;
3729	}	4115	}
3730	warn "emergency_perl_save: end player save\n";	4116	info "emergency_perl_save: end player save\n";
3731		4117
		4118	cf::write_runtime_sync; # external watchdog should not bark
		4119
3732	warn "emergency_perl_save: begin map save\n";	4120	info "emergency_perl_save: begin map save\n";
3733	for my $path (keys %cf::MAP) {	4121	for my $path (keys %cf::MAP) {
3734	my $map = $cf::MAP{$path} or next;	4122	my $map = $cf::MAP{$path} or next;
3735	$map->valid or next;	4123	$map->valid or next;
3736	$map->save;	4124	$map->save;
3737	}	4125	}
3738	warn "emergency_perl_save: end map save\n";	4126	info "emergency_perl_save: end map save\n";
3739		4127
		4128	cf::write_runtime_sync; # external watchdog should not bark
		4129
3740	warn "emergency_perl_save: begin database checkpoint\n";	4130	info "emergency_perl_save: begin database checkpoint\n";
3741	BDB::db_env_txn_checkpoint $DB_ENV;	4131	BDB::db_env_txn_checkpoint $DB_ENV;
3742	warn "emergency_perl_save: end database checkpoint\n";	4132	info "emergency_perl_save: end database checkpoint\n";
3743		4133
3744	warn "emergency_perl_save: begin write uuid\n";	4134	info "emergency_perl_save: begin write uuid\n";
3745	write_uuid_sync 1;	4135	write_uuid_sync 1;
3746	warn "emergency_perl_save: end write uuid\n";	4136	info "emergency_perl_save: end write uuid\n";
		4137
		4138	cf::write_runtime_sync; # external watchdog should not bark
		4139
		4140	trace "emergency_perl_save: syncing database to disk";
		4141	BDB::db_env_txn_checkpoint $DB_ENV;
		4142
		4143	info "emergency_perl_save: starting sync\n";
		4144	IO::AIO::aio_sync sub {
		4145	info "emergency_perl_save: finished sync\n";
		4146	};
		4147
		4148	cf::write_runtime_sync; # external watchdog should not bark
		4149
		4150	trace "emergency_perl_save: flushing outstanding aio requests";
		4151	while (IO::AIO::nreqs || BDB::nreqs) {
		4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4153	}
		4154
		4155	cf::write_runtime_sync; # external watchdog should not bark
3747	};	4156	};
3748		4157
3749	warn "emergency_perl_save: starting sync()\n";
3750	IO::AIO::aio_sync sub {
3751	warn "emergency_perl_save: finished sync()\n";
3752	};
3753
3754	warn "emergency_perl_save: leave\n";	4158	info "emergency_perl_save: leave\n";
3755	}	4159	}
3756		4160
3757	sub post_cleanup {	4161	sub post_cleanup {
3758	my ($make_core) = @_;	4162	my ($make_core) = @_;
3759		4163
		4164	IO::AIO::flush;
		4165
3760	warn Carp::longmess "post_cleanup backtrace"	4166	error Carp::longmess "post_cleanup backtrace"
3761	if $make_core;	4167	if $make_core;
3762		4168
3763	my $fh = pidfile;	4169	my $fh = pidfile;
3764	unlink $PIDFILE if <$fh> == $$;	4170	unlink $PIDFILE if <$fh> == $$;
3765	}	4171	}
…		…
3789	}	4195	}
3790	}	4196	}
3791		4197
3792	sub do_reload_perl() {	4198	sub do_reload_perl() {
3793	# can/must only be called in main	4199	# can/must only be called in main
3794	if ($Coro::current != $Coro::main) {	4200	unless (in_main) {
3795	warn "can only reload from main coroutine";	4201	error "can only reload from main coroutine";
3796	return;	4202	return;
3797	}	4203	}
3798		4204
3799	return if $RELOAD++;	4205	return if $RELOAD++;
3800		4206
3801	my $t1 = AE::time;	4207	my $t1 = AE::time;
3802		4208
3803	while ($RELOAD) {	4209	while ($RELOAD) {
3804	warn "reloading...";	4210	cf::get_slot 0.1, -1, "reload_perl";
		4211	info "perl_reload: reloading...";
3805		4212
3806	warn "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3807		4214
3808	cf::sync_job {	4215	cf::sync_job {
3809	cf::write_runtime_sync; # external watchdog should not bark
3810	cf::emergency_save;	4216	#cf::emergency_save;
3811	cf::write_runtime_sync; # external watchdog should not bark
3812		4217
3813	warn "syncing database to disk";
3814	BDB::db_env_txn_checkpoint $DB_ENV;
3815
3816	# if anything goes wrong in here, we should simply crash as we already saved
3817
3818	warn "flushing outstanding aio requests";
3819	while (IO::AIO::nreqs || BDB::nreqs) {
3820	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3821	}
3822
3823	warn "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3824	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3825	%EXT_CORO = ();	4220	%EXT_CORO = ();
3826		4221
3827	warn "removing commands";	4222	trace "perl_reload: removing commands";
3828	%COMMAND = ();	4223	%COMMAND = ();
3829		4224
3830	warn "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3831	%EXTCMD = ();	4226	%EXTCMD = ();
3832	%EXTICMD = ();	4227	%EXTICMD = ();
3833		4228
3834	warn "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3835	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3836	warn "... unloading $pkg";	4231	trace "... unloading $pkg";
3837		4232
3838	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3839	eval {	4234	eval {
3840	$cb->($pkg);	4235	$cb->($pkg);
3841	1	4236	1
3842	} or warn "$pkg unloaded, but with errors: $@";	4237	} or error "$pkg unloaded, but with errors: $@";
3843	}	4238	}
3844		4239
3845	warn "... clearing $pkg";	4240	trace "... clearing $pkg";
3846	clear_package $pkg;	4241	clear_package $pkg;
3847	}	4242	}
3848		4243
3849	warn "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3850	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3851	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3852		4247
3853	warn "... unloading $k";	4248	trace "... unloading $k";
3854	delete $INC{$k};	4249	delete $INC{$k};
3855		4250
3856	$k =~ s/\.pm$//;	4251	$k =~ s/\.pm$//;
3857	$k =~ s/\//::/g;	4252	$k =~ s/\//::/g;
3858		4253
…		…
3861	}	4256	}
3862		4257
3863	clear_package $k;	4258	clear_package $k;
3864	}	4259	}
3865		4260
3866	warn "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3867	clear_package "safe::$_"	4262	clear_package "safe::$_"
3868	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4263	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3869		4264
3870	warn "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3871	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3872	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3873		4268
3874	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3875	# and global variables created in xs	4270	# and global variables created in xs
3876	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3877		4272
3878	warn "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3879		4274
3880	warn "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3881	require cf;	4276	require cf;
3882	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3883		4278
3884	warn "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3885	cf::reload_config;	4280	cf::reload_config;
3886		4281
3887	warn "loading extensions";	4282	trace "perl_reload: loading extensions";
3888	cf::load_extensions;	4283	cf::load_extensions;
3889		4284
3890	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3891	warn "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3892	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3893	warn "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3894	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3895	warn "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3896	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3897	}	4292	}
3898		4293
3899	warn "running post_init jobs";	4294	cf::_post_init 1;
3900	(pop @POST_INIT)->(1) while @POST_INIT;
3901		4295
3902	warn "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3903		4297
3904	1	4298	1
3905	} or do {	4299	} or do {
3906	warn $@;	4300	error $@;
3907	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3908	};	4302	};
3909		4303
3910	warn "reloaded";
3911	--$RELOAD;	4304	--$RELOAD;
3912	}	4305	}
3913		4306
3914	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3915	warn "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3916	};	4309	};
3917		4310
3918	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3919		4312
3920	sub reload_perl() {	4313	sub reload_perl() {
…		…
3941	reload_perl;	4334	reload_perl;
3942	};	4335	};
3943	}	4336	}
3944	};	4337	};
3945		4338
3946	unshift @INC, $LIBDIR;	4339	#############################################################################
3947		4340
3948	my $bug_warning = 0;	4341	my $bug_warning = 0;
3949		4342
3950	our @WAIT_FOR_TICK;
3951	our @WAIT_FOR_TICK_BEGIN;
3952
3953	sub wait_for_tick {	4343	sub wait_for_tick() {
3954	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3955		4345
3956	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
3957	push @WAIT_FOR_TICK, $signal;
3958	$signal->wait;
3959	}	4347	}
3960		4348
3961	sub wait_for_tick_begin {	4349	sub wait_for_tick_begin() {
3962	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3963		4351
3964	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
3965	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
3966	$signal->wait;	4354	$signal->wait;
3967	}	4355	}
…		…
3971	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3972	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
3973	return;	4361	return;
3974	}	4362	}
3975		4363
3976	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
3977		4365
3978	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3979		4367
3980	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3981	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3982	Coro::async_pool {	4370	Coro::async_pool {
3983	$Coro::current->{desc} = "runtime saver";	4371	$Coro::current->{desc} = "runtime saver";
3984	write_runtime_sync	4372	write_runtime_sync
3985	or warn "ERROR: unable to write runtime file: $!";	4373	or error "ERROR: unable to write runtime file: $!";
3986	};	4374	};
3987	}	4375	}
3988		4376
3989	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3990	$sig->send;	4378	$sig->send;
3991	}	4379	}
3992	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
3993	$sig->send;
3994	}
3995		4381
3996	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
3997	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3998		4384
3999	if (0) {	4385	if (0) {
4000	if ($NEXT_TICK) {	4386	if ($NEXT_TICK) {
4001	my $jitter = $TICK_START - $NEXT_TICK;	4387	my $jitter = $TICK_START - $NEXT_TICK;
4002	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4388	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4003	warn "jitter $JITTER\n";#d#	4389	debug "jitter $JITTER\n";#d#
4004	}	4390	}
4005	}	4391	}
4006	}	4392	}
4007		4393
4008	{	4394	{
4009	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4010		4397
4011	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4012	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4013	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4014		4401
4015	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4016	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4017	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4018	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4043	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4044	};	4431	};
4045	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4046	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4047	};	4434	};
		4435
		4436	info "database initialised";
4048	}	4437	}
4049		4438
4050	{	4439	{
4051	# configure IO::AIO	4440	# configure IO::AIO
4052		4441
		4442	info "initialising aio";
4053	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4054	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4055	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4056	}	4447	}
4057		4448
4058	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4059		4451
4060	sub _log_backtrace {	4452	sub _log_backtrace {
4061	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4062		4454
4063	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4064		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4065	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4066	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4067	++$_log_backtrace;	4463	++$_log_backtrace;
4068	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4069	async {	4465	async {
4070	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4071		4467
…		…
4091	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4092	--$_log_backtrace;	4488	--$_log_backtrace;
4093	};	4489	};
4094	} else {	4490	} else {
4095	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4096	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4097	}	4493	}
4098	}	4494	}
4099		4495
4100	# load additional modules	4496	# load additional modules
4101	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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