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.521 by root, Fri Apr 16 23:28:42 2010 UTC vs.
Revision 1.620 by root, Tue Aug 11 02:13:26 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};
1441		1653
1442	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1444	} else {	1656	} else {
1445	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1446	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1447	$progress = 1;	1659	$progress = 1;
1448		1660
1449	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1450	unless $active;	1662	unless $active;
1451	}	1663	}
1452	}	1664	}
1453		1665
1454	unless ($progress) {	1666	unless ($progress) {
…		…
1456		1668
1457	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1458	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1459	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1460	}	1672	}
		1673
		1674	last;
1461	}	1675	}
1462	}	1676	}
1463	};	1677	};
1464	}	1678	}
1465		1679
…		…
1623	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1624		1838
1625	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1626	$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
1627		1841
1628	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1629	$pl->deactivate;	1843	$pl->deactivate;
		1844
1630	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;
1631	$pl->ob->check_score;
1632	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1633	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1634		1850
1635	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1636	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1637	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1691	\@logins	1907	\@logins
1692	}	1908	}
1693		1909
1694	=item $player->maps	1910	=item $player->maps
1695		1911
		1912	=item cf::player::maps $login
		1913
1696	Returns an arrayref of map paths that are private for this	1914	Returns an arrayref of map paths that are private for this
1697	player. May block.	1915	player. May block.
1698		1916
1699	=cut	1917	=cut
1700		1918
…		…
1721		1939
1722	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1723		1941
1724	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1725		1943
1726	=item $player->ext_reply ($msgid, @msg)
1727
1728	Sends an ext reply to the player.
1729
1730	=cut
1731
1732	sub ext_reply($$@) {
1733	my ($self, $id, @msg) = @_;
1734
1735	$self->ns->ext_reply ($id, @msg)
1736	}
1737
1738	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1739		1945
1740	Sends an ext event to the client.	1946	Sends an ext event to the client.
1741		1947
1742	=cut	1948	=cut
…		…
1761		1967
1762	=cut	1968	=cut
1763		1969
1764	sub find_by_path($) {	1970	sub find_by_path($) {
1765	my ($path) = @_;	1971	my ($path) = @_;
		1972
		1973	$path =~ s/^~[^\/]*//; # skip ~login
1766		1974
1767	my ($match, $specificity);	1975	my ($match, $specificity);
1768		1976
1769	for my $region (list) {	1977	for my $region (list) {
1770	if ($region->{match} && $path =~ $region->{match}) {	1978	if ($region->{match} && $path =~ $region->{match}) {
…		…
1799	sub generate_random_map {	2007	sub generate_random_map {
1800	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1801		2009
1802	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
1803		2011
1804	# mit "rum" bekleckern, nicht
1805	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1806	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1807	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1808	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1809	$rmp->{exit_on_final_map},
1810	$rmp->{xsize}, $rmp->{ysize},
1811	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1812	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1813	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1814	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1815	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1816	(cf::region::find $rmp->{region}), $rmp->{custom}
1817	)
1818	}	2013	}
1819		2014
1820	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1821		2016
1822	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
…		…
1827		2022
1828	sub register {	2023	sub register {
1829	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1830	my $pkg = caller;	2025	my $pkg = caller;
1831		2026
1832	no strict;
1833	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1834		2028
1835	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1836	}	2030	}
1837		2031
1838	# also paths starting with '/'	2032	# also paths starting with '/'
1839	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2033	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1840		2034
1841	sub thawer_merge {	2035	sub thawer_merge {
1842	my ($self, $merge) = @_;	2036	my ($self, $merge) = @_;
1843		2037
1844	# we have to keep some variables in memory intact	2038	# we have to keep some variables in memory intact
…		…
1849	}	2043	}
1850		2044
1851	sub normalise {	2045	sub normalise {
1852	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1853		2047
1854	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1855		2049
1856	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1857		2051
1858	# map plan:	2052	# map plan:
1859	#	2053	#
…		…
1874	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1875	$path = "$base/$path";	2069	$path = "$base/$path";
1876	}	2070	}
1877		2071
1878	for ($path) {	2072	for ($path) {
1879	redo if s{//}{/};
1880	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1881	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1882	}	2075	}
1883		2076
1884	$path	2077	$path
…		…
1898	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1899	return $self;	2092	return $self;
1900	}	2093	}
1901	}	2094	}
1902		2095
1903	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1904	()	2097	()
1905	}	2098	}
1906		2099
		2100	# may re-bless or do other evil things
1907	sub init {	2101	sub init {
1908	my ($self) = @_;	2102	my ($self) = @_;
1909		2103
1910	$self	2104	$self
1911	}	2105	}
…		…
1976	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1977		2171
1978	1	2172	1
1979	}	2173	}
1980		2174
		2175	# used to laod the header of an original map
1981	sub load_header_orig {	2176	sub load_header_orig {
1982	my ($self) = @_;	2177	my ($self) = @_;
1983		2178
1984	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1985	}	2180	}
1986		2181
		2182	# used to laod the header of an instantiated map
1987	sub load_header_temp {	2183	sub load_header_temp {
1988	my ($self) = @_;	2184	my ($self) = @_;
1989		2185
1990	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
1991	}	2187	}
1992		2188
		2189	# called after loading the header from an instantiated map
1993	sub prepare_temp {	2190	sub prepare_temp {
1994	my ($self) = @_;	2191	my ($self) = @_;
1995		2192
1996	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
1997	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
1998	# safety	2195	# safety
1999	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
2000	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
2001	}	2198	}
2002		2199
		2200	# called after loading the header from an original map
2003	sub prepare_orig {	2201	sub prepare_orig {
2004	my ($self) = @_;	2202	my ($self) = @_;
2005		2203
2006	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
2007	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2031		2229
2032	sub find;	2230	sub find;
2033	sub find {	2231	sub find {
2034	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2035		2233
		2234	cf::cede_to_tick;
		2235
2036	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2037		2237
2038	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2039	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2040		2240
2041	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2072		2272
2073	{	2273	{
2074	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2075		2275
2076	return unless $self->valid;	2276	return unless $self->valid;
2077	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2078
2079	$self->in_memory (cf::MAP_LOADING);
2080		2278
2081	$self->alloc;	2279	$self->alloc;
2082		2280
2083	$self->pre_load;	2281	$self->pre_load;
2084	cf::cede_to_tick;	2282	cf::cede_to_tick;
2085		2283
		2284	if (exists $self->{load_path}) {
2086	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2087	$f->skip_block;	2286	$f->skip_block;
2088	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2089	or return;	2288	or return;
2090		2289
2091	$self->post_load_original	2290	$self->post_load_original
2092	if delete $self->{load_original};	2291	if delete $self->{load_original};
2093		2292
2094	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2095	utf8::encode $uniq;	2294	utf8::encode $uniq;
2096	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2097	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2098	$self->clear_unique_items;	2297	$self->clear_unique_items;
2099	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2100	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2101	}	2301	}
2102	}	2302	}
2103	}
2104		2303
2105	$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);
2106		2311
2107	cf::cede_to_tick;	2312	cf::cede_to_tick;
2108	# now do the right thing for maps	2313	# now do the right thing for maps
2109	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2110	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2114	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2115	$self->decay_objects;	2320	$self->decay_objects;
2116	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2117	$self->update_buttons;	2322	$self->update_buttons;
2118	cf::cede_to_tick;	2323	cf::cede_to_tick;
2119	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2120	}	2325	}
2121		2326
2122	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2123	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2124
2125	$self->in_memory (cf::MAP_ACTIVE);
2126	}	2329	}
2127		2330
2128	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2129	}	2334	}
2130		2335
2131	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2132	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2133	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2141	# if $self->per_party;	2346	# if $self->per_party;
2142		2347
2143	$self	2348	$self
2144	}	2349	}
2145		2350
2146	# find and load all maps in the 3x3 area around a map
2147	sub load_neighbours {
2148	my ($map) = @_;
2149
2150	my @neigh; # diagonal neighbours
2151
2152	for (0 .. 3) {
2153	my $neigh = $map->tile_path ($_)
2154	or next;
2155	$neigh = find $neigh, $map
2156	or next;
2157	$neigh->load;
2158
2159	push @neigh,
2160	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2161	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2162	}
2163
2164	for (grep defined $_->[0], @neigh) {
2165	my ($path, $origin) = @$_;
2166	my $neigh = find $path, $origin
2167	or next;
2168	$neigh->load;
2169	}
2170	}
2171
2172	sub find_sync {	2351	sub find_sync {
2173	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2174		2353
2175	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
2176	}	2359	}
2177		2360
2178	sub do_load_sync {	2361	sub do_load_sync {
2179	my ($map) = @_;	2362	my ($map) = @_;
2180		2363
		2364	# it's a bug to call this from the main context
2181	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2182	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2183		2367
2184	cf::sync_job { $map->load };	2368	$map->load;
2185	}	2369	}
2186		2370
2187	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2188	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2189		2373
2190	sub find_async {	2374	sub find_async {
2191	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2192		2376
2193	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2194		2378
2195	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2196	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2197	}	2381	}
2198		2382
2199	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2200		2384
2201	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
2202	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2203		2387
2204	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2205	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2206	if (my $map = find $k) {	2390	if (my $map = find $k) {
2207	$map->load if $v;	2391	$map->load if $MAP_PREFETCH{$k};
2208	}	2392	}
2209		2393
2210	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
2211	}	2395	}
2212	}	2396	}
…		…
2260	sub swap_out {	2444	sub swap_out {
2261	my ($self) = @_;	2445	my ($self) = @_;
2262		2446
2263	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2264		2448
2265	return if $self->in_memory != cf::MAP_ACTIVE;	2449	return if !$self->linkable;
2266	return if $self->{deny_save};	2450	return if $self->{deny_save};
2267	return if $self->players;	2451	return if $self->players;
2268		2452
2269	# first deactivate the map and "unlink" it from the core	2453	# first deactivate the map and "unlink" it from the core
2270	$self->deactivate;	2454	$self->deactivate;
2271	$_->clear_links_to ($self) for values %cf::MAP;	2455	$_->clear_links_to ($self) for values %cf::MAP;
2272	$self->in_memory (cf::MAP_SWAPPED);	2456	$self->state (cf::MAP_SWAPPED);
2273		2457
2274	# then atomically save	2458	# then atomically save
2275	$self->_save;	2459	$self->_save;
2276		2460
2277	# then free the map	2461	# then free the map
…		…
2301		2485
2302	my $lock = cf::lock_acquire "map_data:$self->{path}";	2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
2303		2487
2304	return if $self->players;	2488	return if $self->players;
2305		2489
2306	warn "resetting map ", $self->path, "\n";	2490	cf::trace "resetting map ", $self->path, "\n";
2307		2491
2308	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
2309		2493
2310	# need to save uniques path	2494	# need to save uniques path
2311	unless ($self->{deny_save}) {	2495	unless ($self->{deny_save}) {
2312	my $uniq = $self->uniq_path; utf8::encode $uniq;	2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
2313		2497
…		…
2335		2519
2336	delete $cf::MAP{$self->path};	2520	delete $cf::MAP{$self->path};
2337		2521
2338	$self->unlink_save;	2522	$self->unlink_save;
2339		2523
2340	bless $self, "cf::map";	2524	bless $self, "cf::map::wrap";
2341	delete $self->{deny_reset};	2525	delete $self->{deny_reset};
2342	$self->{deny_save} = 1;	2526	$self->{deny_save} = 1;
2343	$self->reset_timeout (1);	2527	$self->reset_timeout (1);
2344	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2528	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2345		2529
…		…
2466		2650
2467	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.
2468		2652
2469	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2470		2654
2471	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,
2472	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2473		2657
2474	=cut	2658	=cut
2475		2659
2476	sub deref {	2660	sub deref {
…		…
2558	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2559		2743
2560	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2561	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2562		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
2563	=cut	2772	=cut
2564		2773
2565	sub cf::object::player::may {	2774	sub cf::object::player::may {
2566	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2567		2776
2568	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2569	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2570	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2571	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2572	}	2781	}
2573		2782
2574	=item $player_object->enter_link	2783	=item $player_object->enter_link
2575		2784
2576	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}>).
2577		2786
2578	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.
2579	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,
2580	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
2581	map.	2790	map.
2582		2791
2583	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.
2584		2799
2585	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2586		2801
2587	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
2588	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
…		…
2606	sub cf::object::player::enter_link {	2821	sub cf::object::player::enter_link {
2607	my ($self) = @_;	2822	my ($self) = @_;
2608		2823
2609	$self->deactivate_recursive;	2824	$self->deactivate_recursive;
2610		2825
		2826	++$self->{_link_recursion};
		2827
2611	return if UNIVERSAL::isa $self->map, "ext::map_link";	2828	return if UNIVERSAL::isa $self->map, "ext::map_link";
2612		2829
2613	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2830	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2614	if $self->map && $self->map->{path} ne "{link}";	2831	if $self->map && $self->map->{path} ne "{link}";
2615		2832
…		…
2641	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2642	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2643	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2644		2861
2645	$map->load;	2862	$map->load;
2646	$map->load_neighbours;
2647		2863
2648	return unless $self->contr->active;	2864	return unless $self->contr->active;
2649		2865
2650	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2651	$self->enter_map ($map, $x, $y);	2867	if ($self->enter_map ($map, $x, $y)) {
2652		2868	# entering was successful
		2869	delete $self->{_link_recursion};
2653	# only activate afterwards, to support waiting in hooks	2870	# only activate afterwards, to support waiting in hooks
2654	$self->activate_recursive;	2871	$self->activate_recursive;
2655	}	2872	}
2656		2873
		2874	}
		2875
2657	=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)]])
2658		2877
2659	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
2660	her, loading and preparing them map, calling the provided $check callback	2879	her, loading and preparing them map, calling the provided $check callback
2661	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
2662	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
…		…
2669		2888
2670	our $GOTOGEN;	2889	our $GOTOGEN;
2671		2890
2672	sub cf::object::player::goto {	2891	sub cf::object::player::goto {
2673	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	}
2674		2899
2675	# 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
2676	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2901	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2677		2902
2678	$self->enter_link;	2903	$self->enter_link;
…		…
2698	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2699	}	2924	}
2700	}	2925	}
2701		2926
2702	my $map = eval {	2927	my $map = eval {
2703	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2704		2929
2705	if ($map) {	2930	if ($map) {
2706	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2707	$map = $check->($map) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2708	} else {	2933	} else {
2709	$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);
2710	}	2935	}
2711		2936
2712	$map	2937	$map
…		…
2720	if ($gen == $self->{_goto_generation}) {	2945	if ($gen == $self->{_goto_generation}) {
2721	delete $self->{_goto_generation};	2946	delete $self->{_goto_generation};
2722	$self->leave_link ($map, $x, $y);	2947	$self->leave_link ($map, $x, $y);
2723	}	2948	}
2724		2949
2725	$done->() if $done;	2950	$done->($self) if $done;
2726	})->prio (1);	2951	})->prio (1);
2727	}	2952	}
2728		2953
2729	=item $player_object->enter_exit ($exit_object)	2954	=item $player_object->enter_exit ($exit_object)
2730		2955
…		…
2798	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2799		3024
2800	unless (eval {	3025	unless (eval {
2801	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2802		3027
2803	# random map handling
2804	{
2805	my $guard = cf::lock_acquire "exit_prepare:$exit";
2806
2807	prepare_random_map $exit
2808	if $exit->slaying eq "/!";
2809	}
2810
2811	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2812	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2813	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	}
2814		3054
2815	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2816		3056
2817	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2818	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2823	$self->message ("Something went wrong deep within the deliantra server. "	3063	$self->message ("Something went wrong deep within the deliantra server. "
2824	. "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. "
2825	. "Please report this to the dungeon master!",	3065	. "Please report this to the dungeon master!",
2826	cf::NDI_UNIQUE | cf::NDI_RED);	3066	cf::NDI_UNIQUE | cf::NDI_RED);
2827		3067
2828	warn "ERROR in enter_exit: $@";	3068	error "ERROR in enter_exit: $@";
2829	$self->leave_link;	3069	$self->leave_link;
2830	}	3070	}
2831	})->prio (1);	3071	})->prio (1);
2832	}	3072	}
2833		3073
2834	=head3 cf::client	3074	=head3 cf::client
2835		3075
2836	=over 4	3076	=over 4
2837
2838	=item $client->send_drawinfo ($text, $flags)
2839
2840	Sends a drawinfo packet to the client. Circumvents output buffering so
2841	should not be used under normal circumstances.
2842
2843	=cut
2844
2845	sub cf::client::send_drawinfo {
2846	my ($self, $text, $flags) = @_;
2847
2848	utf8::encode $text;
2849	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2850	}
2851		3077
2852	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2853		3079
2854	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
2855	them as required.	3081	them as required.
…		…
2874	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2875	}	3101	}
2876		3102
2877	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2878		3104
2879	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
2880	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
2881	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
2882	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2883		3109
2884	=cut	3110	=cut
2885		3111
2886	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
2991	id => "death",	3217	id => "death",
2992	title => "Death",	3218	title => "Death",
2993	reply => undef,	3219	reply => undef,
2994	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
2995	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
2996	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
2997	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
2998	);	3230	);
2999		3231
3000	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
3043	=cut	3275	=cut
3044		3276
3045	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
3046	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
3047		3279
3048	if ($self->extcmd == 2) {
3049	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3050	} elsif ($self->extcmd == 1) { # TODO: remove
3051	push @msg, msgtype => "event_$type";
3052	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3053	}
3054	}
3055
3056	=item $client->ext_reply ($msgid, @msg)
3057
3058	Sends an ext reply to the client.
3059
3060	=cut
3061
3062	sub cf::client::ext_reply($$@) {
3063	my ($self, $id, @msg) = @_;
3064
3065	if ($self->extcmd == 2) {
3066	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3067	} elsif ($self->extcmd == 1) {
3068	#TODO: version 1, remove
3069	unshift @msg, msgtype => "reply", msgid => $id;
3070	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3071	}
3072	}	3281	}
3073		3282
3074	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3075		3284
3076	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3096		3305
3097	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3098	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3099		3308
3100	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;
3101	}	3349	}
3102		3350
3103	cf::client->attach (	3351	cf::client->attach (
3104	on_connect => sub {	3352	on_connect => sub {
3105	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3131	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3132		3380
3133	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3134		3382
3135	if (ref $msg) {	3383	if (ref $msg) {
3136	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3137	"ARRAY" eq ref $msg
3138	? @$msg
3139	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3140		3385
3141	my @reply;
3142
3143	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}) {
3144	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3145	}	3404	}
3146
3147	$ns->ext_reply ($reply, @reply)
3148	if $reply;
3149
3150	} else {	3405	} else {
3151	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";
3152	}	3407	}
3153		3408
3154	cf::override;	3409	cf::override;
3155	},	3410	},
3156	);	3411	);
…		…
3237	decrease split destroy change_exp value msg lore send_msg)],	3492	decrease split destroy change_exp value msg lore send_msg)],
3238	["cf::object::player" => qw(player)],	3493	["cf::object::player" => qw(player)],
3239	["cf::player" => qw(peaceful send_msg)],	3494	["cf::player" => qw(peaceful send_msg)],
3240	["cf::map" => qw(trigger)],	3495	["cf::map" => qw(trigger)],
3241	) {	3496	) {
3242	no strict 'refs';
3243	my ($pkg, @funs) = @$_;	3497	my ($pkg, @funs) = @$_;
3244	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3498	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3245	for @funs;	3499	for @funs;
3246	}	3500	}
3247		3501
…		…
3286	local @cf::_safe_eval_args = values %vars;	3540	local @cf::_safe_eval_args = values %vars;
3287	@res = wantarray ? eval eval : scalar eval $eval;	3541	@res = wantarray ? eval eval : scalar eval $eval;
3288	}	3542	}
3289		3543
3290	if ($@) {	3544	if ($@) {
3291	warn "$@";	3545	warn "$@",
3292	warn "while executing safe code '$code'\n";	3546	"while executing safe code '$code'\n",
3293	warn "with arguments " . (join " ", %vars) . "\n";	3547	"with arguments " . (join " ", %vars) . "\n";
3294	}	3548	}
3295		3549
3296	wantarray ? @res : $res[0]	3550	wantarray ? @res : $res[0]
3297	}	3551	}
3298		3552
…		…
3323	=cut	3577	=cut
3324		3578
3325	#############################################################################	3579	#############################################################################
3326	# the server's init and main functions	3580	# the server's init and main functions
3327		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
3328	sub load_facedata($) {	3659	sub load_facedata($) {
3329	my ($path) = @_;	3660	my ($path) = @_;
3330		3661
3331	# HACK to clear player env face cache, we need some signal framework
3332	# for this (global event?)
3333	%ext::player_env::MUSIC_FACE_CACHE = ();
3334
3335	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3336		3663
3337	warn "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3338		3665
3339	my $facedata;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3340	0 < aio_load $path, $facedata
3341	or die "$path: $!";
3342
3343	$facedata = Coro::Storable::thaw $facedata;
3344		3667
3345	$facedata->{version} == 2	3668	$facedata->{version} == 2
3346	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3347		3670
3348	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3349	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3350	$facedata->{resource}{"res/exp_table"} = {	3673
3351	type => FT_RSRC,	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3352	data => $exp_table,	3675
3353	hash => (Digest::MD5::md5 $exp_table),	3676	# BEGIN ATOMIC
3354	};	3677	# from here on, everything must be atomic - no thread switch allowed
3355	cf::cede_to_tick;	3678	my $t1 = EV::time;
3356		3679
3357	{	3680	{
3358	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3359		3682
3360	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3361	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3362		3686
3363	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3364	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3365	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};
3366	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};
3367		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3368	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3369	}	3694	}
3370		3695
3371	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3372	next unless $info->{smooth};	3697	next unless $info->{smooth};
3373		3698
…		…
3376		3701
3377	if (my $smooth = cf::face::find $info->{smooth}) {	3702	if (my $smooth = cf::face::find $info->{smooth}) {
3378	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3379	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3380	} else {	3705	} else {
3381	warn "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3382	}	3707	}
3383
3384	cf::cede_to_tick;
3385	}	3708	}
3386	}	3709	}
3387		3710
3388	{	3711	{
3389	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3390		3713
3391	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3392	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3393	cf::cede_to_tick;
3394	}	3716	}
3395		3717
3396	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3397	}	3719	}
3398		3720
3399	{	3721	{
3400	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3401		3723
3402	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3403	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
3404	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3405		3728
3406	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3407	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;
3408	} else {	3735	} else {
3409	$RESOURCE{$name} = $info;	3736	# $RESOURCE{$name} = $info; # unused
3410	}	3737	}
3411
3412	cf::cede_to_tick;
3413	}	3738	}
3414	}	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;
3415		3750
3416	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3417		3752
		3753	aio_close $fh if $fh; # close old facedata
		3754
3418	1	3755	1
3419	}	3756	}
3420
3421	cf::global->attach (on_resource_update => sub {
3422	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3423	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3424
3425	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3426	my $sound = $soundconf->{compat}[$_]
3427	or next;
3428
3429	my $face = cf::face::find "sound/$sound->[1]";
3430	cf::sound::set $sound->[0] => $face;
3431	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3432	}
3433
3434	while (my ($k, $v) = each %{$soundconf->{event}}) {
3435	my $face = cf::face::find "sound/$v";
3436	cf::sound::set $k => $face;
3437	}
3438	}
3439	});
3440		3757
3441	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
3442	my ($ns, $want) = @_;	3759	my ($ns, $want) = @_;
3443		3760
3444	while (my ($k, $v) = each %$want) {	3761	while (my ($k, $v) = each %$want) {
…		…
3452	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3453	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3454	cf::arch::commit_load;	3771	cf::arch::commit_load;
3455		3772
3456	$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;
3457	}	3788	}
3458		3789
3459	sub reload_regions {	3790	sub reload_regions {
3460	# 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
3461	# for this (global event?)	3792	# for this (global event?)
…		…
3469	if exists $_->{match};	3800	if exists $_->{match};
3470	}	3801	}
3471	}	3802	}
3472		3803
3473	sub reload_facedata {	3804	sub reload_facedata {
3474	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3475	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3476	}	3807	}
3477		3808
3478	sub reload_archetypes {	3809	sub reload_archetypes {
3479	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3480	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;
3481	}	3838	}
3482		3839
3483	sub reload_treasures {	3840	sub reload_treasures {
3484	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3485	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3486	}	3843	}
3487		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
3488	sub reload_resources {	3865	sub reload_resources {
3489	warn "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3490		3867
		3868	reload_materials;
3491	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
		3871	reload_sound;
3492	reload_archetypes;	3872	reload_archetypes;
3493	reload_regions;	3873	reload_regions;
3494	reload_treasures;	3874	reload_treasures;
3495		3875
3496	warn "finished reloading resource files\n";	3876	trace "finished reloading resource files\n";
3497	}	3877	}
3498		3878
3499	sub reload_config {	3879	sub reload_config {
3500	warn "reloading config file...\n";	3880	trace "reloading config file...\n";
3501		3881
3502	open my $fh, "<:utf8", "$CONFDIR/config"	3882	my $config = load_file "$CONFDIR/config";
3503	or return;	3883	utf8::decode $config;
		3884	*CFG = decode_yaml $config;
3504		3885
3505	local $/;
3506	*CFG = YAML::XS::Load scalar <$fh>;
3507
3508	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3509		3887
3510	$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};
3511	$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};
3512		3890
3513	if (exists $CFG{mlockall}) {	3891	if (exists $CFG{mlockall}) {
…		…
3515	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3893	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3516	and die "WARNING: m(un)lockall failed: $!\n";	3894	and die "WARNING: m(un)lockall failed: $!\n";
3517	};	3895	};
3518	warn $@ if $@;	3896	warn $@ if $@;
3519	}	3897	}
3520
3521	warn "finished reloading resource files\n";
3522	}	3898	}
3523		3899
3524	sub pidfile() {	3900	sub pidfile() {
3525	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3901	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3526	or die "$PIDFILE: $!";	3902	or die "$PIDFILE: $!";
…		…
3539	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3540	print $fh $$;	3916	print $fh $$;
3541	}	3917	}
3542		3918
3543	sub main_loop {	3919	sub main_loop {
3544	warn "EV::loop starting\n";	3920	trace "EV::run starting\n";
3545	if (1) {	3921	if (1) {
3546	EV::loop;	3922	EV::run;
3547	}	3923	}
3548	warn "EV::loop returned\n";	3924	trace "EV::run returned\n";
3549	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3550	}	3926	}
3551		3927
3552	sub main {	3928	sub main {
3553	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3554		3930
3555	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3556	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.";
3557	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3558	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3559		3935
3560	$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
3561		3937
3562	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3563	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3564	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#
3565	(async {	3941	(async {
3566	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3567	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3568	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3569	};	3945	};
3570		3946
3571	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3572		3948
3573	cf::sync_job {	3949	cf::sync_job {
3574	cf::init_experience;	3950	cf::incloader::init ();
		3951
		3952	db_init;
		3953
3575	cf::init_anim;	3954	cf::init_anim;
3576	cf::init_attackmess;	3955	cf::init_attackmess;
3577	cf::init_dynamic;	3956	cf::init_dynamic;
3578		3957
3579	cf::load_settings;	3958	cf::load_settings;
3580	cf::load_materials;
3581		3959
3582	reload_resources;	3960	reload_resources;
3583	reload_config;	3961	reload_config;
3584	db_init;
3585		3962
3586	cf::init_uuid;	3963	cf::init_uuid;
3587	cf::init_signals;	3964	cf::init_signals;
3588	cf::init_skills;	3965	cf::init_skills;
3589		3966
…		…
3597		3974
3598	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3599	use POSIX ();	3976	use POSIX ();
3600	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};
3601		3978
3602	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3603	};	3980	};
3604		3981
3605	cf::object::thawer::errors_are_fatal 0;	3982	cf::object::thawer::errors_are_fatal 0;
3606	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";
3607		3984
		3985	AE::postpone {
		3986	undef &main; # free gobs of memory :)
		3987	};
		3988
3608	main_loop;	3989	goto &main_loop;
3609	}	3990	}
3610		3991
3611	#############################################################################	3992	#############################################################################
3612	# initialisation and cleanup	3993	# initialisation and cleanup
3613		3994
…		…
3652	or return;	4033	or return;
3653		4034
3654	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4035	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3655	and return;	4036	and return;
3656		4037
3657	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	4038	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3658		4039
3659	1	4040	1
3660	}	4041	}
3661		4042
3662	our $uuid_lock;	4043	our $uuid_lock;
…		…
3674	or return;	4055	or return;
3675		4056
3676	my $value = uuid_seq uuid_cur;	4057	my $value = uuid_seq uuid_cur;
3677		4058
3678	unless ($value) {	4059	unless ($value) {
3679	warn "cowardly refusing to write zero uuid value!\n";	4060	info "cowardly refusing to write zero uuid value!\n";
3680	return;	4061	return;
3681	}	4062	}
3682		4063
3683	my $value = uuid_str $value + $uuid_skip;	4064	my $value = uuid_str $value + $uuid_skip;
3684	$uuid_skip = 0;	4065	$uuid_skip = 0;
…		…
3694	or return;	4075	or return;
3695		4076
3696	aio_rename "$uuid~", $uuid	4077	aio_rename "$uuid~", $uuid
3697	and return;	4078	and return;
3698		4079
3699	warn "uuid file written ($value).\n";	4080	trace "uuid file written ($value).\n";
3700		4081
3701	1	4082	1
3702		4083
3703	}	4084	}
3704		4085
…		…
3710	}	4091	}
3711		4092
3712	sub emergency_save() {	4093	sub emergency_save() {
3713	my $freeze_guard = cf::freeze_mainloop;	4094	my $freeze_guard = cf::freeze_mainloop;
3714		4095
3715	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;
3716		4102
3717	cf::sync_job {	4103	cf::sync_job {
3718	# this is a trade-off: we want to be very quick here, so	4104	cf::write_runtime_sync; # external watchdog should not bark
3719	# save all maps without fsync, and later call a global sync
3720	# (which in turn might be very very slow)
3721	local $USE_FSYNC = 0;
3722		4105
3723	# use a peculiar iteration method to avoid tripping on perl	4106	# use a peculiar iteration method to avoid tripping on perl
3724	# refcount bugs in for. also avoids problems with players	4107	# refcount bugs in for. also avoids problems with players
3725	# and maps saved/destroyed asynchronously.	4108	# and maps saved/destroyed asynchronously.
3726	warn "emergency_perl_save: begin player save\n";	4109	info "emergency_perl_save: begin player save\n";
3727	for my $login (keys %cf::PLAYER) {	4110	for my $login (keys %cf::PLAYER) {
3728	my $pl = $cf::PLAYER{$login} or next;	4111	my $pl = $cf::PLAYER{$login} or next;
3729	$pl->valid or next;	4112	$pl->valid or next;
3730	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4113	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3731	$pl->save;	4114	$pl->save;
3732	}	4115	}
3733	warn "emergency_perl_save: end player save\n";	4116	info "emergency_perl_save: end player save\n";
3734		4117
		4118	cf::write_runtime_sync; # external watchdog should not bark
		4119
3735	warn "emergency_perl_save: begin map save\n";	4120	info "emergency_perl_save: begin map save\n";
3736	for my $path (keys %cf::MAP) {	4121	for my $path (keys %cf::MAP) {
3737	my $map = $cf::MAP{$path} or next;	4122	my $map = $cf::MAP{$path} or next;
3738	$map->valid or next;	4123	$map->valid or next;
3739	$map->save;	4124	$map->save;
3740	}	4125	}
3741	warn "emergency_perl_save: end map save\n";	4126	info "emergency_perl_save: end map save\n";
3742		4127
		4128	cf::write_runtime_sync; # external watchdog should not bark
		4129
3743	warn "emergency_perl_save: begin database checkpoint\n";	4130	info "emergency_perl_save: begin database checkpoint\n";
3744	BDB::db_env_txn_checkpoint $DB_ENV;	4131	BDB::db_env_txn_checkpoint $DB_ENV;
3745	warn "emergency_perl_save: end database checkpoint\n";	4132	info "emergency_perl_save: end database checkpoint\n";
3746		4133
3747	warn "emergency_perl_save: begin write uuid\n";	4134	info "emergency_perl_save: begin write uuid\n";
3748	write_uuid_sync 1;	4135	write_uuid_sync 1;
3749	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
3750	};	4156	};
3751		4157
3752	warn "emergency_perl_save: starting sync()\n";
3753	IO::AIO::aio_sync sub {
3754	warn "emergency_perl_save: finished sync()\n";
3755	};
3756
3757	warn "emergency_perl_save: leave\n";	4158	info "emergency_perl_save: leave\n";
3758	}	4159	}
3759		4160
3760	sub post_cleanup {	4161	sub post_cleanup {
3761	my ($make_core) = @_;	4162	my ($make_core) = @_;
3762		4163
		4164	IO::AIO::flush;
		4165
3763	warn Carp::longmess "post_cleanup backtrace"	4166	error Carp::longmess "post_cleanup backtrace"
3764	if $make_core;	4167	if $make_core;
3765		4168
3766	my $fh = pidfile;	4169	my $fh = pidfile;
3767	unlink $PIDFILE if <$fh> == $$;	4170	unlink $PIDFILE if <$fh> == $$;
3768	}	4171	}
…		…
3792	}	4195	}
3793	}	4196	}
3794		4197
3795	sub do_reload_perl() {	4198	sub do_reload_perl() {
3796	# can/must only be called in main	4199	# can/must only be called in main
3797	if ($Coro::current != $Coro::main) {	4200	unless (in_main) {
3798	warn "can only reload from main coroutine";	4201	error "can only reload from main coroutine";
3799	return;	4202	return;
3800	}	4203	}
3801		4204
3802	return if $RELOAD++;	4205	return if $RELOAD++;
3803		4206
3804	my $t1 = AE::time;	4207	my $t1 = AE::time;
3805		4208
3806	while ($RELOAD) {	4209	while ($RELOAD) {
3807	warn "reloading...";	4210	cf::get_slot 0.1, -1, "reload_perl";
		4211	info "perl_reload: reloading...";
3808		4212
3809	warn "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3810		4214
3811	cf::sync_job {	4215	cf::sync_job {
3812	cf::write_runtime_sync; # external watchdog should not bark
3813	cf::emergency_save;	4216	#cf::emergency_save;
3814	cf::write_runtime_sync; # external watchdog should not bark
3815		4217
3816	warn "syncing database to disk";
3817	BDB::db_env_txn_checkpoint $DB_ENV;
3818
3819	# if anything goes wrong in here, we should simply crash as we already saved
3820
3821	warn "flushing outstanding aio requests";
3822	while (IO::AIO::nreqs || BDB::nreqs) {
3823	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3824	}
3825
3826	warn "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3827	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3828	%EXT_CORO = ();	4220	%EXT_CORO = ();
3829		4221
3830	warn "removing commands";	4222	trace "perl_reload: removing commands";
3831	%COMMAND = ();	4223	%COMMAND = ();
3832		4224
3833	warn "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3834	%EXTCMD = ();	4226	%EXTCMD = ();
3835	%EXTICMD = ();	4227	%EXTICMD = ();
3836		4228
3837	warn "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3838	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3839	warn "... unloading $pkg";	4231	trace "... unloading $pkg";
3840		4232
3841	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3842	eval {	4234	eval {
3843	$cb->($pkg);	4235	$cb->($pkg);
3844	1	4236	1
3845	} or warn "$pkg unloaded, but with errors: $@";	4237	} or error "$pkg unloaded, but with errors: $@";
3846	}	4238	}
3847		4239
3848	warn "... clearing $pkg";	4240	trace "... clearing $pkg";
3849	clear_package $pkg;	4241	clear_package $pkg;
3850	}	4242	}
3851		4243
3852	warn "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3853	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3854	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3855		4247
3856	warn "... unloading $k";	4248	trace "... unloading $k";
3857	delete $INC{$k};	4249	delete $INC{$k};
3858		4250
3859	$k =~ s/\.pm$//;	4251	$k =~ s/\.pm$//;
3860	$k =~ s/\//::/g;	4252	$k =~ s/\//::/g;
3861		4253
…		…
3864	}	4256	}
3865		4257
3866	clear_package $k;	4258	clear_package $k;
3867	}	4259	}
3868		4260
3869	warn "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3870	clear_package "safe::$_"	4262	clear_package "safe::$_"
3871	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);
3872		4264
3873	warn "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3874	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3875	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3876		4268
3877	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3878	# and global variables created in xs	4270	# and global variables created in xs
3879	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3880		4272
3881	warn "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3882		4274
3883	warn "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3884	require cf;	4276	require cf;
3885	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3886		4278
3887	warn "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3888	cf::reload_config;	4280	cf::reload_config;
3889		4281
3890	warn "loading extensions";	4282	trace "perl_reload: loading extensions";
3891	cf::load_extensions;	4283	cf::load_extensions;
3892		4284
3893	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3894	warn "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3895	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3896	warn "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3897	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3898	warn "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3899	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3900	}	4292	}
3901		4293
3902	warn "running post_init jobs";	4294	cf::_post_init 1;
3903	(pop @POST_INIT)->(1) while @POST_INIT;
3904		4295
3905	warn "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3906		4297
3907	1	4298	1
3908	} or do {	4299	} or do {
3909	warn $@;	4300	error $@;
3910	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3911	};	4302	};
3912		4303
3913	warn "reloaded";
3914	--$RELOAD;	4304	--$RELOAD;
3915	}	4305	}
3916		4306
3917	$t1 = AE::time - $t1;	4307	$t1 = AE::time - $t1;
3918	warn "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3919	};	4309	};
3920		4310
3921	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3922		4312
3923	sub reload_perl() {	4313	sub reload_perl() {
…		…
3944	reload_perl;	4334	reload_perl;
3945	};	4335	};
3946	}	4336	}
3947	};	4337	};
3948		4338
3949	unshift @INC, $LIBDIR;	4339	#############################################################################
3950		4340
3951	my $bug_warning = 0;	4341	my $bug_warning = 0;
3952		4342
3953	our @WAIT_FOR_TICK;
3954	our @WAIT_FOR_TICK_BEGIN;
3955
3956	sub wait_for_tick {	4343	sub wait_for_tick() {
3957	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3958		4345
3959	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
3960	push @WAIT_FOR_TICK, $signal;
3961	$signal->wait;
3962	}	4347	}
3963		4348
3964	sub wait_for_tick_begin {	4349	sub wait_for_tick_begin() {
3965	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3966		4351
3967	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
3968	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
3969	$signal->wait;	4354	$signal->wait;
3970	}	4355	}
…		…
3974	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"
3975	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
3976	return;	4361	return;
3977	}	4362	}
3978		4363
3979	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
3980		4365
3981	#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#
3982		4367
3983	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3984	$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.;
3985	Coro::async_pool {	4370	Coro::async_pool {
3986	$Coro::current->{desc} = "runtime saver";	4371	$Coro::current->{desc} = "runtime saver";
3987	write_runtime_sync	4372	write_runtime_sync
3988	or warn "ERROR: unable to write runtime file: $!";	4373	or error "ERROR: unable to write runtime file: $!";
3989	};	4374	};
3990	}	4375	}
3991		4376
3992	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3993	$sig->send;	4378	$sig->send;
3994	}	4379	}
3995	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
3996	$sig->send;
3997	}
3998		4381
3999	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
4000	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4001		4384
4002	if (0) {	4385	if (0) {
4003	if ($NEXT_TICK) {	4386	if ($NEXT_TICK) {
4004	my $jitter = $TICK_START - $NEXT_TICK;	4387	my $jitter = $TICK_START - $NEXT_TICK;
4005	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4388	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4006	warn "jitter $JITTER\n";#d#	4389	debug "jitter $JITTER\n";#d#
4007	}	4390	}
4008	}	4391	}
4009	}	4392	}
4010		4393
4011	{	4394	{
4012	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
4013		4397
4014	BDB::min_parallel 16;	4398	BDB::min_parallel 16;
4015	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
4016	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
4017		4401
4018	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
4019	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
4020	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4021	$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;
…		…
4046	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4047	};	4431	};
4048	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4049	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4050	};	4434	};
		4435
		4436	info "database initialised";
4051	}	4437	}
4052		4438
4053	{	4439	{
4054	# configure IO::AIO	4440	# configure IO::AIO
4055		4441
		4442	info "initialising aio";
4056	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
4057	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
4058	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
4059	}	4447	}
4060		4448
4061	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
4062		4451
4063	sub _log_backtrace {	4452	sub _log_backtrace {
4064	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
4065		4454
4066	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
4067		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4068	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4069	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4070	++$_log_backtrace;	4463	++$_log_backtrace;
4071	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4072	async {	4465	async {
4073	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4074		4467
…		…
4094	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4095	--$_log_backtrace;	4488	--$_log_backtrace;
4096	};	4489	};
4097	} else {	4490	} else {
4098	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4099	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4100	}	4493	}
4101	}	4494	}
4102		4495
4103	# load additional modules	4496	# load additional modules
4104	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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