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.513 by root, Mon Apr 12 05:22:38 2010 UTC vs.
Revision 1.610 by root, Tue Nov 20 14:40:01 2012 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.
…		…
399	}	554	}
400		555
401	=item cf::periodic $interval, $cb	556	=item cf::periodic $interval, $cb
402		557
403	Like EV::periodic, but randomly selects a starting point so that the actions	558	Like EV::periodic, but randomly selects a starting point so that the actions
404	get spread over timer.	559	get spread over time.
405		560
406	=cut	561	=cut
407		562
408	sub periodic($$) {	563	sub periodic($$) {
409	my ($interval, $cb) = @_;	564	my ($interval, $cb) = @_;
…		…
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.
…		…
454	}	613	}
455	}	614	}
456		615
457	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
458	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
459	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
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) {
…		…
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]
		750	}
		751
		752	sub objinfo {
		753	(
		754	"counter value" => cf::object::object_count,
		755	"objects created" => cf::object::create_count,
		756	"objects destroyed" => cf::object::destroy_count,
		757	"freelist size" => cf::object::free_count,
		758	"allocated objects" => cf::object::objects_size,
		759	"active objects" => cf::object::actives_size,
		760	)
592	}	761	}
593		762
594	=item $coin = coin_from_name $name	763	=item $coin = coin_from_name $name
595		764
596	=cut	765	=cut
…		…
633	within each server.	802	within each server.
634		803
635	=cut	804	=cut
636		805
637	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
638	my ($name) = @_;	810	my ($name) = @_;
639	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
640		812
641	eval {	813	eval {
642	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
652	}	824	}
653		825
654	our $DB;	826	our $DB;
655		827
656	sub db_init {	828	sub db_init {
657	cf::sync_job {
658	$DB ||= db_table "db";	829	$DB ||= db_table "db";
659	};
660	}	830	}
661		831
662	sub db_get($$) {	832	sub db_get($$) {
663	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
664		834
665	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
666	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
667		839
668	$! ? ()	840	$! ? ()
669	: $data	841	: $data
670	}
671	}	842	}
672		843
673	sub db_put($$$) {	844	sub db_put($$$) {
674	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
675	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
703		874
704	my @data;	875	my @data;
705	my $md5;	876	my $md5;
706		877
707	for (0 .. $#$src) {	878	for (0 .. $#$src) {
708	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
709	or Carp::croak "$src->[$_]: $!";
710	}	880	}
711		881
712	# if processing is expensive, check	882	# if processing is expensive, check
713	# checksum first	883	# checksum first
714	if (1) {	884	if (1) {
…		…
727		897
728	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
729	}	899	}
730	}	900	}
731		901
732	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
733	my $data = $process->(\@data);	903	my $data = $process->(\@data);
734	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
735		905
736	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
737		907
738	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
739	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
740	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
741		911
…		…
751		921
752	=cut	922	=cut
753		923
754	sub datalog($@) {	924	sub datalog($@) {
755	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
756	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
757	}	927	}
758		928
759	=back	929	=back
760		930
761	=cut	931	=cut
…		…
956		1126
957	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
958	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
959		1129
960	} elsif (ref $type) {	1130	} elsif (ref $type) {
961	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
962		1132
963	} else {	1133	} else {
964	shift @arg;	1134	shift @arg;
965	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
966	}	1136	}
967	}	1137	}
968	}	1138	}
969		1139
970	sub _object_attach {	1140	sub _object_attach {
…		…
980	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
981	}	1151	}
982		1152
983	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
984	} else {	1154	} else {
985	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
986	}	1156	}
987		1157
988	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
989	}	1159	}
990		1160
…		…
1049		1219
1050	for (@$callbacks) {	1220	for (@$callbacks) {
1051	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1052		1222
1053	if ($@) {	1223	if ($@) {
1054	warn "$@";
1055	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1056	override;	1225	override;
1057	}	1226	}
1058		1227
1059	return 1 if $override;	1228	return 1 if $override;
1060	}	1229	}
…		…
1139	for (@$attach) {	1308	for (@$attach) {
1140	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1141	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1142	}	1311	}
1143	} else {	1312	} else {
1144	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1145	}	1314	}
1146	}	1315	}
1147	}	1316	}
1148		1317
1149	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1176	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1177		1346
1178	sync_job {	1347	sync_job {
1179	if (length $$rdata) {	1348	if (length $$rdata) {
1180	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1181	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1182	$decname, length $$rdata, scalar @$objs;	1351	$decname, length $$rdata, scalar @$objs
		1352	if $VERBOSE_IO;
1183		1353
1184	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1185	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1186	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1187	if ($cf::USE_FSYNC) {	1357	if ($cf::USE_FSYNC) {
…		…
1209	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1210		1380
1211	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1212	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1213	} else {	1383	} else {
1214	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1215	}	1385	}
1216	} else {	1386	} else {
1217	aio_unlink $filename;	1387	aio_unlink $filename;
1218	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1219	}	1389	}
…		…
1243	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1244	$av = $st->{objs};	1414	$av = $st->{objs};
1245	}	1415	}
1246		1416
1247	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1248	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1249	$decname, length $data, scalar @{$av || []};	1419	$decname, length $data, scalar @{$av || []}
		1420	if $VERBOSE_IO;
1250		1421
1251	($data, $av)	1422	($data, $av)
1252	}	1423	}
1253		1424
1254	=head2 COMMAND CALLBACKS	1425	=head2 COMMAND CALLBACKS
…		…
1258	=cut	1429	=cut
1259		1430
1260	#############################################################################	1431	#############################################################################
1261	# command handling &c	1432	# command handling &c
1262		1433
1263	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1264		1435
1265	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
1266	$name.	1437	$name.
1267		1438
1268	=cut	1439	=cut
…		…
1274	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1275		1446
1276	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1277	}	1448	}
1278		1449
1279	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1280		1451
1281	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1282	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
1283	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
1284	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
1285	has logged in successfully.	1456	has logged in successfully.
1286		1457
1287	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1288	called.
1289		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
1290	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1291		1466
1292	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1293	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
1294	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
1295	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
1296	log-in.	1471	log-in.
1297		1472
1298	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1299	called.
1300		1474
1301	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1302		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
1303	sub register_extcmd {	1482	sub register_extcmd($$) {
1304	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1305		1484
1306	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1307	}	1486	}
1308		1487
1309	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1310	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1311		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1312	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
		1498	}
		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
1313	}	1504	}
1314		1505
1315	use File::Glob ();	1506	use File::Glob ();
1316		1507
1317	cf::player->attach (	1508	cf::player->attach (
…		…
1331	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1332		1523
1333	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1334		1525
1335	if (ref $msg) {	1526	if (ref $msg) {
1336	my ($type, $reply, @payload) =	1527	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1337	"ARRAY" eq ref $msg
1338	? @$msg
1339	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1340		1528
1341	my @reply;
1342
1343	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}) {
1344	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1345	}	1547	}
1346		1548
1347	$pl->ext_reply ($reply, @reply)
1348	if $reply;
1349
1350	} else {	1549	} else {
1351	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1352	}	1551	}
1353		1552
1354	cf::override;	1553	cf::override;
1355	},	1554	},
1356	);	1555	);
…		…
1366	};	1565	};
1367		1566
1368	$grp	1567	$grp
1369	}	1568	}
1370		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
1371	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1372	cf::sync_job {	1586	cf::sync_job {
1373	my %todo;	1587	my %todo;
1374		1588
1375	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1376	next unless -r $path;	1590	next unless -r $path;
…		…
1394		1608
1395	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1396	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1397		1611
1398	$ext{source} =	1612	$ext{source} =
1399	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1400	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1401	. $source	1615	. $source
1402	. "\n};\n1";	1616	. "\n};\n1";
1403		1617
1404	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
…		…
1416	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1417	next ext	1631	next ext
1418	unless exists $done{$_};	1632	unless exists $done{$_};
1419	}	1633	}
1420		1634
1421	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1422		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
1423	my $active = eval $v->{source};	1646	my $active = eval $source;
1424		1647
1425	if (length $@) {	1648	if (length $@) {
1426	warn "$v->{path}: $@\n";	1649	error "$v->{path}: $@\n";
1427		1650
1428	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1429	if exists $v->{meta}{mandatory};	1652	if exists $v->{meta}{mandatory};
		1653
		1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1655	delete $todo{$k};
1430	} else {	1656	} else {
1431	$done{$k} = delete $todo{$k};	1657	$done{$k} = delete $todo{$k};
1432	push @EXTS, $v->{pkg};	1658	push @EXTS, $v->{pkg};
1433	$progress = 1;	1659	$progress = 1;
1434		1660
1435	warn "$v->{base}: extension inactive.\n"	1661	info "$v->{base}: extension inactive.\n"
1436	unless $active;	1662	unless $active;
1437	}	1663	}
1438	}	1664	}
1439		1665
1440	unless ($progress) {	1666	unless ($progress) {
…		…
1442		1668
1443	while (my ($k, $v) = each %todo) {	1669	while (my ($k, $v) = each %todo) {
1444	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1445	if exists $v->{meta}{mandatory};	1671	if exists $v->{meta}{mandatory};
1446	}	1672	}
		1673
		1674	last;
1447	}	1675	}
1448	}	1676	}
1449	};	1677	};
1450	}	1678	}
1451		1679
…		…
1609	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1610		1838
1611	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1612	$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
1613		1841
1614	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1615	$pl->deactivate;	1843	$pl->deactivate;
		1844
1616	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;
1617	$pl->ob->check_score;
1618	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1619	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1620		1850
1621	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1622	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1623	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1677	\@logins	1907	\@logins
1678	}	1908	}
1679		1909
1680	=item $player->maps	1910	=item $player->maps
1681		1911
		1912	=item cf::player::maps $login
		1913
1682	Returns an arrayref of map paths that are private for this	1914	Returns an arrayref of map paths that are private for this
1683	player. May block.	1915	player. May block.
1684		1916
1685	=cut	1917	=cut
1686		1918
…		…
1707		1939
1708	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1709		1941
1710	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1711		1943
1712	=item $player->ext_reply ($msgid, @msg)
1713
1714	Sends an ext reply to the player.
1715
1716	=cut
1717
1718	sub ext_reply($$@) {
1719	my ($self, $id, @msg) = @_;
1720
1721	$self->ns->ext_reply ($id, @msg)
1722	}
1723
1724	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1725		1945
1726	Sends an ext event to the client.	1946	Sends an ext event to the client.
1727		1947
1728	=cut	1948	=cut
…		…
1747		1967
1748	=cut	1968	=cut
1749		1969
1750	sub find_by_path($) {	1970	sub find_by_path($) {
1751	my ($path) = @_;	1971	my ($path) = @_;
		1972
		1973	$path =~ s/^~[^\/]*//; # skip ~login
1752		1974
1753	my ($match, $specificity);	1975	my ($match, $specificity);
1754		1976
1755	for my $region (list) {	1977	for my $region (list) {
1756	if ($region->{match} && $path =~ $region->{match}) {	1978	if ($region->{match} && $path =~ $region->{match}) {
…		…
1785	sub generate_random_map {	2007	sub generate_random_map {
1786	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1787		2009
1788	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
1789		2011
1790	# mit "rum" bekleckern, nicht
1791	$self->_create_random_map (	2012	$self->_create_random_map ($rmp);
1792	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1793	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1794	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1795	$rmp->{exit_on_final_map},
1796	$rmp->{xsize}, $rmp->{ysize},
1797	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1798	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1799	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1800	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1801	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1802	(cf::region::find $rmp->{region}), $rmp->{custom}
1803	)
1804	}	2013	}
1805		2014
1806	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1807		2016
1808	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
…		…
1813		2022
1814	sub register {	2023	sub register {
1815	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1816	my $pkg = caller;	2025	my $pkg = caller;
1817		2026
1818	no strict;
1819	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1820		2028
1821	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1822	}	2030	}
1823		2031
1824	# also paths starting with '/'	2032	# also paths starting with '/'
1825	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2033	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1826		2034
1827	sub thawer_merge {	2035	sub thawer_merge {
1828	my ($self, $merge) = @_;	2036	my ($self, $merge) = @_;
1829		2037
1830	# we have to keep some variables in memory intact	2038	# we have to keep some variables in memory intact
…		…
1835	}	2043	}
1836		2044
1837	sub normalise {	2045	sub normalise {
1838	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1839		2047
1840	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1841		2049
1842	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1843		2051
1844	# map plan:	2052	# map plan:
1845	#	2053	#
…		…
1860	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1861	$path = "$base/$path";	2069	$path = "$base/$path";
1862	}	2070	}
1863		2071
1864	for ($path) {	2072	for ($path) {
1865	redo if s{//}{/};
1866	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1867	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1868	}	2075	}
1869		2076
1870	$path	2077	$path
…		…
1884	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1885	return $self;	2092	return $self;
1886	}	2093	}
1887	}	2094	}
1888		2095
1889	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1890	()	2097	()
1891	}	2098	}
1892		2099
		2100	# may re-bless or do other evil things
1893	sub init {	2101	sub init {
1894	my ($self) = @_;	2102	my ($self) = @_;
1895		2103
1896	$self	2104	$self
1897	}	2105	}
…		…
1962	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1963		2171
1964	1	2172	1
1965	}	2173	}
1966		2174
		2175	# used to laod the header of an original map
1967	sub load_header_orig {	2176	sub load_header_orig {
1968	my ($self) = @_;	2177	my ($self) = @_;
1969		2178
1970	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1971	}	2180	}
1972		2181
		2182	# used to laod the header of an instantiated map
1973	sub load_header_temp {	2183	sub load_header_temp {
1974	my ($self) = @_;	2184	my ($self) = @_;
1975		2185
1976	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
1977	}	2187	}
1978		2188
		2189	# called after loading the header from an instantiated map
1979	sub prepare_temp {	2190	sub prepare_temp {
1980	my ($self) = @_;	2191	my ($self) = @_;
1981		2192
1982	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
1983	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
1984	# safety	2195	# safety
1985	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
1986	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
1987	}	2198	}
1988		2199
		2200	# called after loading the header from an original map
1989	sub prepare_orig {	2201	sub prepare_orig {
1990	my ($self) = @_;	2202	my ($self) = @_;
1991		2203
1992	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
1993	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2017		2229
2018	sub find;	2230	sub find;
2019	sub find {	2231	sub find {
2020	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
2021		2233
		2234	cf::cede_to_tick;
		2235
2022	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
2023		2237
2024	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2025	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
2026		2240
2027	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2058		2272
2059	{	2273	{
2060	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2061		2275
2062	return unless $self->valid;	2276	return unless $self->valid;
2063	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2064
2065	$self->in_memory (cf::MAP_LOADING);
2066		2278
2067	$self->alloc;	2279	$self->alloc;
2068		2280
2069	$self->pre_load;	2281	$self->pre_load;
2070	cf::cede_to_tick;	2282	cf::cede_to_tick;
2071		2283
		2284	if (exists $self->{load_path}) {
2072	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2073	$f->skip_block;	2286	$f->skip_block;
2074	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2075	or return;	2288	or return;
2076		2289
2077	$self->post_load_original	2290	$self->post_load_original
2078	if delete $self->{load_original};	2291	if delete $self->{load_original};
2079		2292
2080	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2081	utf8::encode $uniq;	2294	utf8::encode $uniq;
2082	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2083	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2084	$self->clear_unique_items;	2297	$self->clear_unique_items;
2085	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2086	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2087	}	2301	}
2088	}	2302	}
2089	}
2090		2303
2091	$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);
2092		2311
2093	cf::cede_to_tick;	2312	cf::cede_to_tick;
2094	# now do the right thing for maps	2313	# now do the right thing for maps
2095	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2096	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2100	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2101	$self->decay_objects;	2320	$self->decay_objects;
2102	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2103	$self->update_buttons;	2322	$self->update_buttons;
2104	cf::cede_to_tick;	2323	cf::cede_to_tick;
2105	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2106	}	2325	}
2107		2326
2108	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2109	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2110
2111	$self->in_memory (cf::MAP_ACTIVE);
2112	}	2329	}
2113		2330
2114	$self->post_load;	2331	$self->post_load;
		2332
		2333	1
2115	}	2334	}
2116		2335
2117	# customize the map for a given player, i.e.	2336	# customize the map for a given player, i.e.
2118	# return the _real_ map. used by e.g. per-player	2337	# return the _real_ map. used by e.g. per-player
2119	# maps to change the path to ~playername/mappath	2338	# maps to change the path to ~playername/mappath
…		…
2127	# if $self->per_party;	2346	# if $self->per_party;
2128		2347
2129	$self	2348	$self
2130	}	2349	}
2131		2350
2132	# find and load all maps in the 3x3 area around a map
2133	sub load_neighbours {
2134	my ($map) = @_;
2135
2136	my @neigh; # diagonal neighbours
2137
2138	for (0 .. 3) {
2139	my $neigh = $map->tile_path ($_)
2140	or next;
2141	$neigh = find $neigh, $map
2142	or next;
2143	$neigh->load;
2144
2145	push @neigh,
2146	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2147	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2148	}
2149
2150	for (grep defined $_->[0], @neigh) {
2151	my ($path, $origin) = @$_;
2152	my $neigh = find $path, $origin
2153	or next;
2154	$neigh->load;
2155	}
2156	}
2157
2158	sub find_sync {	2351	sub find_sync {
2159	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2160		2353
2161	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
2162	}	2359	}
2163		2360
2164	sub do_load_sync {	2361	sub do_load_sync {
2165	my ($map) = @_;	2362	my ($map) = @_;
2166		2363
		2364	# it's a bug to call this from the main context
2167	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2168	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2169		2367
2170	cf::sync_job { $map->load };	2368	$map->load;
2171	}	2369	}
2172		2370
2173	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2174	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2175		2373
2176	sub find_async {	2374	sub find_async {
2177	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2178		2376
2179	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2180		2378
2181	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2182	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2183	}	2381	}
2184		2382
2185	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2186		2384
2187	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2201	$MAP_PREFETCHER->prio (6);	2399	$MAP_PREFETCHER->prio (6);
2202		2400
2203	()	2401	()
2204	}	2402	}
2205		2403
		2404	# common code, used by both ->save and ->swapout
2206	sub save {	2405	sub _save {
2207	my ($self) = @_;	2406	my ($self) = @_;
2208
2209	my $lock = cf::lock_acquire "map_data:$self->{path}";
2210		2407
2211	$self->{last_save} = $cf::RUNTIME;	2408	$self->{last_save} = $cf::RUNTIME;
2212		2409
2213	return unless $self->dirty;	2410	return unless $self->dirty;
2214		2411
…		…
2234	} else {	2431	} else {
2235	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2432	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2236	}	2433	}
2237	}	2434	}
2238		2435
		2436	sub save {
		2437	my ($self) = @_;
		2438
		2439	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2440
		2441	$self->_save;
		2442	}
		2443
2239	sub swap_out {	2444	sub swap_out {
2240	my ($self) = @_;	2445	my ($self) = @_;
2241		2446
2242	# save first because save cedes
2243	$self->save;
2244
2245	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2246		2448
		2449	return if !$self->linkable;
		2450	return if $self->{deny_save};
2247	return if $self->players;	2451	return if $self->players;
2248	return if $self->in_memory != cf::MAP_ACTIVE;	2452
		2453	# first deactivate the map and "unlink" it from the core
		2454	$self->deactivate;
		2455	$_->clear_links_to ($self) for values %cf::MAP;
		2456	$self->state (cf::MAP_SWAPPED);
		2457
		2458	# then atomically save
		2459	$self->_save;
		2460
		2461	# then free the map
		2462	$self->clear;
		2463	}
		2464
		2465	sub reset_at {
		2466	my ($self) = @_;
		2467
		2468	# TODO: safety, remove and allow resettable per-player maps
2249	return if $self->{deny_save};	2469	return 1e99 if $self->{deny_reset};
2250		2470
		2471	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2472	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2473
		2474	$time + $to
		2475	}
		2476
		2477	sub should_reset {
		2478	my ($self) = @_;
		2479
		2480	$self->reset_at <= $cf::RUNTIME
		2481	}
		2482
		2483	sub reset {
		2484	my ($self) = @_;
		2485
		2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2487
		2488	return if $self->players;
		2489
		2490	cf::trace "resetting map ", $self->path, "\n";
		2491
2251	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
		2493
		2494	# need to save uniques path
		2495	unless ($self->{deny_save}) {
		2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2497
		2498	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2499	if $uniq;
		2500	}
		2501
		2502	delete $cf::MAP{$self->path};
2252		2503
2253	$self->deactivate;	2504	$self->deactivate;
2254	$_->clear_links_to ($self) for values %cf::MAP;	2505	$_->clear_links_to ($self) for values %cf::MAP;
2255	$self->clear;	2506	$self->clear;
2256	}
2257
2258	sub reset_at {
2259	my ($self) = @_;
2260
2261	# TODO: safety, remove and allow resettable per-player maps
2262	return 1e99 if $self->{deny_reset};
2263
2264	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2265	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2266
2267	$time + $to
2268	}
2269
2270	sub should_reset {
2271	my ($self) = @_;
2272
2273	$self->reset_at <= $cf::RUNTIME
2274	}
2275
2276	sub reset {
2277	my ($self) = @_;
2278
2279	my $lock = cf::lock_acquire "map_data:$self->{path}";
2280
2281	return if $self->players;
2282
2283	warn "resetting map ", $self->path, "\n";
2284
2285	$self->in_memory (cf::MAP_SWAPPED);
2286
2287	# need to save uniques path
2288	unless ($self->{deny_save}) {
2289	my $uniq = $self->uniq_path; utf8::encode $uniq;
2290
2291	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2292	if $uniq;
2293	}
2294
2295	delete $cf::MAP{$self->path};
2296
2297	$self->deactivate;
2298	$_->clear_links_to ($self) for values %cf::MAP;
2299	$self->clear;
2300		2507
2301	$self->unlink_save;	2508	$self->unlink_save;
2302	$self->destroy;	2509	$self->destroy;
2303	}	2510	}
2304		2511
…		…
2312		2519
2313	delete $cf::MAP{$self->path};	2520	delete $cf::MAP{$self->path};
2314		2521
2315	$self->unlink_save;	2522	$self->unlink_save;
2316		2523
2317	bless $self, "cf::map";	2524	bless $self, "cf::map::wrap";
2318	delete $self->{deny_reset};	2525	delete $self->{deny_reset};
2319	$self->{deny_save} = 1;	2526	$self->{deny_save} = 1;
2320	$self->reset_timeout (1);	2527	$self->reset_timeout (1);
2321	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2528	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2322		2529
…		…
2443		2650
2444	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.
2445		2652
2446	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2447		2654
2448	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,
2449	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2450		2657
2451	=cut	2658	=cut
2452		2659
2453	sub deref {	2660	sub deref {
…		…
2552		2759
2553	Freezes the player and moves him/her to a special map (C<{link}>).	2760	Freezes the player and moves him/her to a special map (C<{link}>).
2554		2761
2555	The player should be reasonably safe there for short amounts of time (e.g.	2762	The player should be reasonably safe there for short amounts of time (e.g.
2556	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2763	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2557	though, as the palyer cannot control the character while it is on the link	2764	though, as the player cannot control the character while it is on the link
2558	map.	2765	map.
2559		2766
2560	Will never block.	2767	Will never block.
2561		2768
2562	=item $player_object->leave_link ($map, $x, $y)	2769	=item $player_object->leave_link ($map, $x, $y)
…		…
2583	sub cf::object::player::enter_link {	2790	sub cf::object::player::enter_link {
2584	my ($self) = @_;	2791	my ($self) = @_;
2585		2792
2586	$self->deactivate_recursive;	2793	$self->deactivate_recursive;
2587		2794
		2795	++$self->{_link_recursion};
		2796
2588	return if UNIVERSAL::isa $self->map, "ext::map_link";	2797	return if UNIVERSAL::isa $self->map, "ext::map_link";
2589		2798
2590	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2799	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2591	if $self->map && $self->map->{path} ne "{link}";	2800	if $self->map && $self->map->{path} ne "{link}";
2592		2801
2593	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2802	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2594	}	2803	}
2595		2804
2596	sub cf::object::player::leave_link {	2805	sub cf::object::player::leave_link {
2597	my ($self, $map, $x, $y) = @_;	2806	my ($self, $map, $x, $y) = @_;
2598		2807
…		…
2618	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2619	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2620	if $x <= 0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2621		2830
2622	$map->load;	2831	$map->load;
2623	$map->load_neighbours;
2624		2832
2625	return unless $self->contr->active;	2833	return unless $self->contr->active;
2626		2834
2627	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2628	$self->enter_map ($map, $x, $y);	2836	if ($self->enter_map ($map, $x, $y)) {
2629		2837	# entering was successful
		2838	delete $self->{_link_recursion};
2630	# only activate afterwards, to support waiting in hooks	2839	# only activate afterwards, to support waiting in hooks
2631	$self->activate_recursive;	2840	$self->activate_recursive;
2632	}	2841	}
2633		2842
		2843	}
		2844
2634	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2845	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2635		2846
2636	Moves the player to the given map-path and coordinates by first freezing	2847	Moves the player to the given map-path and coordinates by first freezing
2637	her, loading and preparing them map, calling the provided $check callback	2848	her, loading and preparing them map, calling the provided $check callback
2638	that has to return the map if sucecssful, and then unfreezes the player on	2849	that has to return the map if sucecssful, and then unfreezes the player on
2639	the new (success) or old (failed) map position. In either case, $done will	2850	the new (success) or old (failed) map position. In either case, $done will
…		…
2646		2857
2647	our $GOTOGEN;	2858	our $GOTOGEN;
2648		2859
2649	sub cf::object::player::goto {	2860	sub cf::object::player::goto {
2650	my ($self, $path, $x, $y, $check, $done) = @_;	2861	my ($self, $path, $x, $y, $check, $done) = @_;
		2862
		2863	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2864	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2865	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2866	($path, $x, $y) = @$EMERGENCY_POSITION;
		2867	}
2651		2868
2652	# do generation counting so two concurrent goto's will be executed in-order	2869	# do generation counting so two concurrent goto's will be executed in-order
2653	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2870	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2654		2871
2655	$self->enter_link;	2872	$self->enter_link;
…		…
2675	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2676	}	2893	}
2677	}	2894	}
2678		2895
2679	my $map = eval {	2896	my $map = eval {
2680	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2681		2898
2682	if ($map) {	2899	if ($map) {
2683	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2684	$map = $check->($map) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2685	} else {	2902	} else {
2686	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2903	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2687	}	2904	}
2688		2905
2689	$map	2906	$map
…		…
2697	if ($gen == $self->{_goto_generation}) {	2914	if ($gen == $self->{_goto_generation}) {
2698	delete $self->{_goto_generation};	2915	delete $self->{_goto_generation};
2699	$self->leave_link ($map, $x, $y);	2916	$self->leave_link ($map, $x, $y);
2700	}	2917	}
2701		2918
2702	$done->() if $done;	2919	$done->($self) if $done;
2703	})->prio (1);	2920	})->prio (1);
2704	}	2921	}
2705		2922
2706	=item $player_object->enter_exit ($exit_object)	2923	=item $player_object->enter_exit ($exit_object)
2707		2924
…		…
2775	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2776		2993
2777	unless (eval {	2994	unless (eval {
2778	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2779		2996
2780	# random map handling
2781	{
2782	my $guard = cf::lock_acquire "exit_prepare:$exit";
2783
2784	prepare_random_map $exit
2785	if $exit->slaying eq "/!";
2786	}
2787
2788	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2789	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2790	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2791		3023
2792	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2793		3025
2794	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2795	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2800	$self->message ("Something went wrong deep within the deliantra server. "	3032	$self->message ("Something went wrong deep within the deliantra server. "
2801	. "I'll try to bring you back to the map you were before. "	3033	. "I'll try to bring you back to the map you were before. "
2802	. "Please report this to the dungeon master!",	3034	. "Please report this to the dungeon master!",
2803	cf::NDI_UNIQUE | cf::NDI_RED);	3035	cf::NDI_UNIQUE | cf::NDI_RED);
2804		3036
2805	warn "ERROR in enter_exit: $@";	3037	error "ERROR in enter_exit: $@";
2806	$self->leave_link;	3038	$self->leave_link;
2807	}	3039	}
2808	})->prio (1);	3040	})->prio (1);
2809	}	3041	}
2810		3042
2811	=head3 cf::client	3043	=head3 cf::client
2812		3044
2813	=over 4	3045	=over 4
2814
2815	=item $client->send_drawinfo ($text, $flags)
2816
2817	Sends a drawinfo packet to the client. Circumvents output buffering so
2818	should not be used under normal circumstances.
2819
2820	=cut
2821
2822	sub cf::client::send_drawinfo {
2823	my ($self, $text, $flags) = @_;
2824
2825	utf8::encode $text;
2826	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2827	}
2828		3046
2829	=item $client->send_big_packet ($pkt)	3047	=item $client->send_big_packet ($pkt)
2830		3048
2831	Like C<send_packet>, but tries to compress large packets, and fragments	3049	Like C<send_packet>, but tries to compress large packets, and fragments
2832	them as required.	3050	them as required.
…		…
2851	$self->send_packet ($pkt);	3069	$self->send_packet ($pkt);
2852	}	3070	}
2853		3071
2854	=item $client->send_msg ($channel, $msg, $color, [extra...])	3072	=item $client->send_msg ($channel, $msg, $color, [extra...])
2855		3073
2856	Send a drawinfo or msg packet to the client, formatting the msg for the	3074	Send a msg packet to the client, formatting the msg for the client if
2857	client if neccessary. C<$type> should be a string identifying the type of	3075	necessary. C<$type> should be a string identifying the type of the
2858	the message, with C<log> being the default. If C<$color> is negative, suppress	3076	message, with C<log> being the default. If C<$color> is negative, suppress
2859	the message unless the client supports the msg packet.	3077	the message unless the client supports the msg packet.
2860		3078
2861	=cut	3079	=cut
2862		3080
2863	# non-persistent channels (usually the info channel)	3081	# non-persistent channels (usually the info channel)
…		…
2968	id => "death",	3186	id => "death",
2969	title => "Death",	3187	title => "Death",
2970	reply => undef,	3188	reply => undef,
2971	tooltip => "Reason for and more info about your most recent death",	3189	tooltip => "Reason for and more info about your most recent death",
2972	},	3190	},
		3191	"c/fatal" => {
		3192	id => "fatal",
		3193	title => "Fatal Error",
		3194	reply => undef,
		3195	tooltip => "Reason for the server disconnect",
		3196	},
2973	"c/say" => $SAY_CHANNEL,	3197	"c/say" => $SAY_CHANNEL,
2974	"c/chat" => $CHAT_CHANNEL,	3198	"c/chat" => $CHAT_CHANNEL,
2975	);	3199	);
2976		3200
2977	sub cf::client::send_msg {	3201	sub cf::client::send_msg {
…		…
3020	=cut	3244	=cut
3021		3245
3022	sub cf::client::ext_msg($$@) {	3246	sub cf::client::ext_msg($$@) {
3023	my ($self, $type, @msg) = @_;	3247	my ($self, $type, @msg) = @_;
3024		3248
3025	if ($self->extcmd == 2) {
3026	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3249	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3027	} elsif ($self->extcmd == 1) { # TODO: remove
3028	push @msg, msgtype => "event_$type";
3029	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3030	}
3031	}
3032
3033	=item $client->ext_reply ($msgid, @msg)
3034
3035	Sends an ext reply to the client.
3036
3037	=cut
3038
3039	sub cf::client::ext_reply($$@) {
3040	my ($self, $id, @msg) = @_;
3041
3042	if ($self->extcmd == 2) {
3043	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3044	} elsif ($self->extcmd == 1) {
3045	#TODO: version 1, remove
3046	unshift @msg, msgtype => "reply", msgid => $id;
3047	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3048	}
3049	}	3250	}
3050		3251
3051	=item $success = $client->query ($flags, "text", \&cb)	3252	=item $success = $client->query ($flags, "text", \&cb)
3052		3253
3053	Queues a query to the client, calling the given callback with	3254	Queues a query to the client, calling the given callback with
…		…
3073		3274
3074	$self->send_packet ($self->{query_queue}[0][0])	3275	$self->send_packet ($self->{query_queue}[0][0])
3075	if @{ $self->{query_queue} } == 1;	3276	if @{ $self->{query_queue} } == 1;
3076		3277
3077	1	3278	1
		3279	}
		3280
		3281	=item $client->update_command_faces
		3282
		3283	=cut
		3284
		3285	our %COMMAND_FACE;
		3286
		3287	sub cf::client::update_command_faces {
		3288	my ($self) = @_;
		3289
		3290	my @faces = grep $_,
		3291	$COMMAND_FACE{standard},
		3292	$COMMAND_FACE{emote},
		3293	$COMMAND_FACE{skill},
		3294	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3295	;
		3296
		3297	$self->send_face ($_)
		3298	for @faces;
		3299	$self->flush_fx;
		3300
		3301	$self->ext_msg (command_list => @faces);
		3302	}
		3303
		3304	=item cf::client::set_command_face $type, $commands
		3305
		3306	=cut
		3307
		3308	sub cf::client::set_command_face {
		3309	my ($type, $list) = @_;
		3310
		3311	my $idx = &cf::face::set ( #d# ugly forward reference
		3312	"command_list/$type" => cf::FT_RSRC,
		3313	JSON::XS->new->utf8->encode ([ sort @$list ])
		3314	);
		3315
		3316	$COMMAND_FACE{$type} = $idx;
3078	}	3317	}
3079		3318
3080	cf::client->attach (	3319	cf::client->attach (
3081	on_connect => sub {	3320	on_connect => sub {
3082	my ($ns) = @_;	3321	my ($ns) = @_;
…		…
3108	my ($ns, $buf) = @_;	3347	my ($ns, $buf) = @_;
3109		3348
3110	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3349	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3111		3350
3112	if (ref $msg) {	3351	if (ref $msg) {
3113	my ($type, $reply, @payload) =	3352	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3114	"ARRAY" eq ref $msg
3115	? @$msg
3116	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3117		3353
3118	my @reply;
3119
3120	if (my $cb = $EXTICMD{$type}) {	3354	if (my $cb = $EXTIACMD{$type}) {
		3355	$cb->(
		3356	$ns,
		3357	sub {
		3358	$ns->ext_msg ("reply-$reply", @_)
		3359	if $reply;
		3360	},
		3361	@payload
		3362	);
		3363	} else {
		3364	my @reply;
		3365
		3366	if (my $cb = $EXTICMD{$type}) {
3121	@reply = $cb->($ns, @payload);	3367	@reply = $cb->($ns, @payload);
		3368	}
		3369
		3370	$ns->ext_msg ("reply-$reply", @reply)
		3371	if $reply;
3122	}	3372	}
3123
3124	$ns->ext_reply ($reply, @reply)
3125	if $reply;
3126
3127	} else {	3373	} else {
3128	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3374	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3129	}	3375	}
3130		3376
3131	cf::override;	3377	cf::override;
3132	},	3378	},
3133	);	3379	);
…		…
3214	decrease split destroy change_exp value msg lore send_msg)],	3460	decrease split destroy change_exp value msg lore send_msg)],
3215	["cf::object::player" => qw(player)],	3461	["cf::object::player" => qw(player)],
3216	["cf::player" => qw(peaceful send_msg)],	3462	["cf::player" => qw(peaceful send_msg)],
3217	["cf::map" => qw(trigger)],	3463	["cf::map" => qw(trigger)],
3218	) {	3464	) {
3219	no strict 'refs';
3220	my ($pkg, @funs) = @$_;	3465	my ($pkg, @funs) = @$_;
3221	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3466	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3222	for @funs;	3467	for @funs;
3223	}	3468	}
3224		3469
…		…
3263	local @cf::_safe_eval_args = values %vars;	3508	local @cf::_safe_eval_args = values %vars;
3264	@res = wantarray ? eval eval : scalar eval $eval;	3509	@res = wantarray ? eval eval : scalar eval $eval;
3265	}	3510	}
3266		3511
3267	if ($@) {	3512	if ($@) {
3268	warn "$@";	3513	warn "$@",
3269	warn "while executing safe code '$code'\n";	3514	"while executing safe code '$code'\n",
3270	warn "with arguments " . (join " ", %vars) . "\n";	3515	"with arguments " . (join " ", %vars) . "\n";
3271	}	3516	}
3272		3517
3273	wantarray ? @res : $res[0]	3518	wantarray ? @res : $res[0]
3274	}	3519	}
3275		3520
…		…
3300	=cut	3545	=cut
3301		3546
3302	#############################################################################	3547	#############################################################################
3303	# the server's init and main functions	3548	# the server's init and main functions
3304		3549
		3550	{
		3551	package cf::face;
		3552
		3553	our %HASH; # hash => idx
		3554	our @DATA; # dynamically-created facedata, only faceste 0 used
		3555	our @FOFS; # file offset, if > 0
		3556	our @SIZE; # size of face, in octets
		3557	our @META; # meta hash of face, if any
		3558	our $DATAFH; # facedata filehandle
		3559
		3560	# internal api, not finalised
		3561	sub set {
		3562	my ($name, $type, $data) = @_;
		3563
		3564	my $idx = cf::face::find $name;
		3565
		3566	if ($idx) {
		3567	delete $HASH{cf::face::get_csum $idx};
		3568	} else {
		3569	$idx = cf::face::alloc $name;
		3570	}
		3571
		3572	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3573
		3574	cf::face::set_type $idx, $type;
		3575	cf::face::set_csum $idx, 0, $hash;
		3576
		3577	# we need to destroy the SV itself, not just modify it, as a running ix
		3578	# might hold a reference to it: "delete" achieves that.
		3579	delete $FOFS[0][$idx];
		3580	delete $DATA[0][$idx];
		3581	$DATA[0][$idx] = $data;
		3582	$SIZE[0][$idx] = length $data;
		3583	delete $META[$idx];
		3584	$HASH{$hash} = $idx;#d#
		3585
		3586	$idx
		3587	}
		3588
		3589	sub _get_data($$$) {
		3590	my ($idx, $set, $cb) = @_;
		3591
		3592	if (defined $DATA[$set][$idx]) {
		3593	$cb->($DATA[$set][$idx]);
		3594	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3595	my $size = $SIZE[$set][$idx];
		3596	my $buf;
		3597	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3598	if ($_[0] == $size) {
		3599	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3600	$cb->($buf);
		3601	} else {
		3602	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3603	}
		3604	};
		3605	} else {
		3606	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3607	}
		3608	}
		3609
		3610	# rather ineffient
		3611	sub cf::face::get_data($;$) {
		3612	my ($idx, $set) = @_;
		3613
		3614	_get_data $idx, $set, Coro::rouse_cb;
		3615	Coro::rouse_wait
		3616	}
		3617
		3618	sub cf::face::ix {
		3619	my ($ns, $set, $idx, $pri) = @_;
		3620
		3621	_get_data $idx, $set, sub {
		3622	$ns->ix_send ($idx, $pri, $_[0]);
		3623	};
		3624	}
		3625	}
		3626
3305	sub load_facedata($) {	3627	sub load_facedata($) {
3306	my ($path) = @_;	3628	my ($path) = @_;
3307		3629
3308	# HACK to clear player env face cache, we need some signal framework
3309	# for this (global event?)
3310	%ext::player_env::MUSIC_FACE_CACHE = ();
3311
3312	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3630	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3313		3631
3314	warn "loading facedata from $path\n";	3632	trace "loading facedata from $path\n";
3315		3633
3316	my $facedata;	3634	my $facedata = decode_storable load_file "$path/faceinfo";
3317	0 < aio_load $path, $facedata
3318	or die "$path: $!";
3319
3320	$facedata = Coro::Storable::thaw $facedata;
3321		3635
3322	$facedata->{version} == 2	3636	$facedata->{version} == 2
3323	or cf::cleanup "$path: version mismatch, cannot proceed.";	3637	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3324		3638
3325	# patch in the exptable	3639	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3326	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);	3640	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3327	$facedata->{resource}{"res/exp_table"} = {	3641
3328	type => FT_RSRC,	3642	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3329	data => $exp_table,	3643
3330	hash => (Digest::MD5::md5 $exp_table),	3644	# BEGIN ATOMIC
3331	};	3645	# from here on, everything must be atomic - no thread switch allowed
3332	cf::cede_to_tick;	3646	my $t1 = EV::time;
3333		3647
3334	{	3648	{
3335	my $faces = $facedata->{faceinfo};	3649	my $faces = $facedata->{faceinfo};
3336		3650
3337	while (my ($face, $info) = each %$faces) {	3651	for my $face (sort keys %$faces) {
		3652	my $info = $faces->{$face};
3338	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3653	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3339		3654
3340	cf::face::set_visibility $idx, $info->{visibility};	3655	cf::face::set_visibility $idx, $info->{visibility};
3341	cf::face::set_magicmap $idx, $info->{magicmap};	3656	cf::face::set_magicmap $idx, $info->{magicmap};
3342	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3657	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3343	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3658	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3344		3659	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3345	cf::cede_to_tick;	3660	$cf::face::HASH{$info->{hash64}} = $idx;
		3661	delete $cf::face::META[$idx];
3346	}	3662	}
3347		3663
3348	while (my ($face, $info) = each %$faces) {	3664	while (my ($face, $info) = each %$faces) {
3349	next unless $info->{smooth};	3665	next unless $info->{smooth};
3350		3666
…		…
3353		3669
3354	if (my $smooth = cf::face::find $info->{smooth}) {	3670	if (my $smooth = cf::face::find $info->{smooth}) {
3355	cf::face::set_smooth $idx, $smooth;	3671	cf::face::set_smooth $idx, $smooth;
3356	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3672	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3357	} else {	3673	} else {
3358	warn "smooth face '$info->{smooth}' not found for face '$face'";	3674	error "smooth face '$info->{smooth}' not found for face '$face'";
3359	}	3675	}
3360
3361	cf::cede_to_tick;
3362	}	3676	}
3363	}	3677	}
3364		3678
3365	{	3679	{
3366	my $anims = $facedata->{animinfo};	3680	my $anims = $facedata->{animinfo};
3367		3681
3368	while (my ($anim, $info) = each %$anims) {	3682	while (my ($anim, $info) = each %$anims) {
3369	cf::anim::set $anim, $info->{frames}, $info->{facings};	3683	cf::anim::set $anim, $info->{frames}, $info->{facings};
3370	cf::cede_to_tick;
3371	}	3684	}
3372		3685
3373	cf::anim::invalidate_all; # d'oh	3686	cf::anim::invalidate_all; # d'oh
3374	}	3687	}
3375		3688
3376	{	3689	{
3377	my $res = $facedata->{resource};	3690	my $res = $facedata->{resource};
3378		3691
3379	while (my ($name, $info) = each %$res) {	3692	while (my ($name, $info) = each %$res) {
3380	if (defined $info->{type}) {	3693	if (defined (my $type = $info->{type})) {
		3694	# TODO: different hash - must free and use new index, or cache ixface data queue
3381	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3695	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3382		3696
3383	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3384	cf::face::set_type $idx, $info->{type};	3697	cf::face::set_type $idx, $type;
		3698	cf::face::set_csum $idx, 0, $info->{hash};
		3699	$cf::face::SIZE[0][$idx] = $info->{size};
		3700	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3701	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3702	$cf::face::HASH{$info->{hash}} = $idx;
3385	} else {	3703	} else {
3386	$RESOURCE{$name} = $info;	3704	# $RESOURCE{$name} = $info; # unused
3387	}	3705	}
3388
3389	cf::cede_to_tick;
3390	}	3706	}
3391	}	3707	}
		3708
		3709	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3710
		3711	# HACK to clear player env face cache, we need some signal framework
		3712	# for this (global event?)
		3713	%ext::player_env::MUSIC_FACE_CACHE = ();
		3714
		3715	# END ATOMIC
		3716
		3717	cf::debug "facedata atomic update time ", EV::time - $t1;
3392		3718
3393	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3719	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3394		3720
		3721	aio_close $fh if $fh; # close old facedata
		3722
3395	1	3723	1
3396	}	3724	}
3397
3398	cf::global->attach (on_resource_update => sub {
3399	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3400	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3401
3402	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3403	my $sound = $soundconf->{compat}[$_]
3404	or next;
3405
3406	my $face = cf::face::find "sound/$sound->[1]";
3407	cf::sound::set $sound->[0] => $face;
3408	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3409	}
3410
3411	while (my ($k, $v) = each %{$soundconf->{event}}) {
3412	my $face = cf::face::find "sound/$v";
3413	cf::sound::set $k => $face;
3414	}
3415	}
3416	});
3417		3725
3418	register_exticmd fx_want => sub {	3726	register_exticmd fx_want => sub {
3419	my ($ns, $want) = @_;	3727	my ($ns, $want) = @_;
3420		3728
3421	while (my ($k, $v) = each %$want) {	3729	while (my ($k, $v) = each %$want) {
…		…
3429	my $status = load_resource_file_ $_[0];	3737	my $status = load_resource_file_ $_[0];
3430	get_slot 0.1, 100;	3738	get_slot 0.1, 100;
3431	cf::arch::commit_load;	3739	cf::arch::commit_load;
3432		3740
3433	$status	3741	$status
		3742	}
		3743
		3744	sub reload_exp_table {
		3745	_reload_exp_table;
		3746
		3747	cf::face::set
		3748	"res/exp_table" => FT_RSRC,
		3749	JSON::XS->new->utf8->canonical->encode (
		3750	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3751	);
		3752	}
		3753
		3754	sub reload_materials {
		3755	_reload_materials;
3434	}	3756	}
3435		3757
3436	sub reload_regions {	3758	sub reload_regions {
3437	# HACK to clear player env face cache, we need some signal framework	3759	# HACK to clear player env face cache, we need some signal framework
3438	# for this (global event?)	3760	# for this (global event?)
…		…
3446	if exists $_->{match};	3768	if exists $_->{match};
3447	}	3769	}
3448	}	3770	}
3449		3771
3450	sub reload_facedata {	3772	sub reload_facedata {
3451	load_facedata "$DATADIR/facedata"	3773	load_facedata $DATADIR
3452	or die "unable to load facedata\n";	3774	or die "unable to load facedata\n";
3453	}	3775	}
3454		3776
3455	sub reload_archetypes {	3777	sub reload_archetypes {
3456	load_resource_file "$DATADIR/archetypes"	3778	load_resource_file "$DATADIR/archetypes"
3457	or die "unable to load archetypes\n";	3779	or die "unable to load archetypes\n";
		3780
		3781	cf::face::set
		3782	"res/skill_info" => FT_RSRC,
		3783	JSON::XS->new->utf8->canonical->encode (
		3784	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3785	);
		3786
		3787	cf::face::set
		3788	"res/spell_paths" => FT_RSRC,
		3789	JSON::XS->new->utf8->canonical->encode (
		3790	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3791	);
3458	}	3792	}
3459		3793
3460	sub reload_treasures {	3794	sub reload_treasures {
3461	load_resource_file "$DATADIR/treasures"	3795	load_resource_file "$DATADIR/treasures"
3462	or die "unable to load treasurelists\n";	3796	or die "unable to load treasurelists\n";
3463	}	3797	}
3464		3798
		3799	sub reload_sound {
		3800	trace "loading sound config from $DATADIR/sound\n";
		3801
		3802	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3803
		3804	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3805	my $sound = $soundconf->{compat}[$_]
		3806	or next;
		3807
		3808	my $face = cf::face::find "sound/$sound->[1]";
		3809	cf::sound::set $sound->[0] => $face;
		3810	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3811	}
		3812
		3813	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3814	my $face = cf::face::find "sound/$v";
		3815	cf::sound::set $k => $face;
		3816	}
		3817	}
		3818
3465	sub reload_resources {	3819	sub reload_resources {
3466	warn "reloading resource files...\n";	3820	trace "reloading resource files...\n";
3467		3821
		3822	reload_materials;
3468	reload_facedata;	3823	reload_facedata;
		3824	reload_exp_table;
		3825	reload_sound;
3469	reload_archetypes;	3826	reload_archetypes;
3470	reload_regions;	3827	reload_regions;
3471	reload_treasures;	3828	reload_treasures;
3472		3829
3473	warn "finished reloading resource files\n";	3830	trace "finished reloading resource files\n";
3474	}	3831	}
3475		3832
3476	sub reload_config {	3833	sub reload_config {
3477	warn "reloading config file...\n";	3834	trace "reloading config file...\n";
3478		3835
3479	open my $fh, "<:utf8", "$CONFDIR/config"	3836	my $config = load_file "$CONFDIR/config";
3480	or return;	3837	utf8::decode $config;
		3838	*CFG = decode_yaml $config;
3481		3839
3482	local $/;
3483	*CFG = YAML::XS::Load scalar <$fh>;
3484
3485	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3840	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3486		3841
3487	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3842	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3488	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3843	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3489		3844
3490	if (exists $CFG{mlockall}) {	3845	if (exists $CFG{mlockall}) {
…		…
3492	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3847	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3493	and die "WARNING: m(un)lockall failed: $!\n";	3848	and die "WARNING: m(un)lockall failed: $!\n";
3494	};	3849	};
3495	warn $@ if $@;	3850	warn $@ if $@;
3496	}	3851	}
3497
3498	warn "finished reloading resource files\n";
3499	}	3852	}
3500		3853
3501	sub pidfile() {	3854	sub pidfile() {
3502	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3855	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3503	or die "$PIDFILE: $!";	3856	or die "$PIDFILE: $!";
…		…
3516	seek $fh, 0, 0;	3869	seek $fh, 0, 0;
3517	print $fh $$;	3870	print $fh $$;
3518	}	3871	}
3519		3872
3520	sub main_loop {	3873	sub main_loop {
3521	warn "EV::loop starting\n";	3874	trace "EV::loop starting\n";
3522	if (1) {	3875	if (1) {
3523	EV::loop;	3876	EV::loop;
3524	}	3877	}
3525	warn "EV::loop returned\n";	3878	trace "EV::loop returned\n";
3526	goto &main_loop unless $REALLY_UNLOOP;	3879	goto &main_loop unless $REALLY_UNLOOP;
3527	}	3880	}
3528		3881
3529	sub main {	3882	sub main {
3530	cf::init_globals; # initialise logging	3883	cf::init_globals; # initialise logging
3531		3884
3532	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3885	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3533	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3886	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3534	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3887	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3535	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3888	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3536		3889
3537	cf::init_experience;
3538	cf::init_anim;
3539	cf::init_attackmess;
3540	cf::init_dynamic;
3541
3542	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3890	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3543		3891
3544	# we must not ever block the main coroutine	3892	# we must not ever block the main coroutine
3545	local $Coro::idle = sub {	3893	$Coro::idle = sub {
3546	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3894	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3547	(async {	3895	(async {
3548	$Coro::current->{desc} = "IDLE BUG HANDLER";	3896	$Coro::current->{desc} = "IDLE BUG HANDLER";
3549	EV::loop EV::LOOP_ONESHOT;	3897	EV::loop EV::LOOP_ONESHOT;
3550	})->prio (Coro::PRIO_MAX);	3898	})->prio (Coro::PRIO_MAX);
3551	};	3899	};
3552		3900
3553	evthread_start IO::AIO::poll_fileno;	3901	evthread_start IO::AIO::poll_fileno;
3554		3902
3555	cf::sync_job {	3903	cf::sync_job {
		3904	cf::incloader::init ();
		3905
		3906	db_init;
		3907
		3908	cf::init_anim;
		3909	cf::init_attackmess;
		3910	cf::init_dynamic;
		3911
3556	cf::load_settings;	3912	cf::load_settings;
3557	cf::load_materials;
3558		3913
3559	reload_resources;	3914	reload_resources;
3560	reload_config;	3915	reload_config;
3561	db_init;
3562		3916
3563	cf::init_uuid;	3917	cf::init_uuid;
3564	cf::init_signals;	3918	cf::init_signals;
3565	cf::init_skills;	3919	cf::init_skills;
3566		3920
…		…
3574		3928
3575	# no (long-running) fork's whatsoever before this point(!)	3929	# no (long-running) fork's whatsoever before this point(!)
3576	use POSIX ();	3930	use POSIX ();
3577	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3931	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3578		3932
3579	(pop @POST_INIT)->(0) while @POST_INIT;	3933	cf::_post_init 0;
3580	};	3934	};
3581		3935
		3936	cf::object::thawer::errors_are_fatal 0;
		3937	info "parse errors in files are no longer fatal from this point on.\n";
		3938
		3939	AE::postpone {
		3940	undef &main; # free gobs of memory :)
		3941	};
		3942
3582	main_loop;	3943	goto &main_loop;
3583	}	3944	}
3584		3945
3585	#############################################################################	3946	#############################################################################
3586	# initialisation and cleanup	3947	# initialisation and cleanup
3587		3948
…		…
3626	or return;	3987	or return;
3627		3988
3628	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3989	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3629	and return;	3990	and return;
3630		3991
3631	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3992	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3632		3993
3633	1	3994	1
3634	}	3995	}
3635		3996
3636	our $uuid_lock;	3997	our $uuid_lock;
…		…
3648	or return;	4009	or return;
3649		4010
3650	my $value = uuid_seq uuid_cur;	4011	my $value = uuid_seq uuid_cur;
3651		4012
3652	unless ($value) {	4013	unless ($value) {
3653	warn "cowardly refusing to write zero uuid value!\n";	4014	info "cowardly refusing to write zero uuid value!\n";
3654	return;	4015	return;
3655	}	4016	}
3656		4017
3657	my $value = uuid_str $value + $uuid_skip;	4018	my $value = uuid_str $value + $uuid_skip;
3658	$uuid_skip = 0;	4019	$uuid_skip = 0;
…		…
3668	or return;	4029	or return;
3669		4030
3670	aio_rename "$uuid~", $uuid	4031	aio_rename "$uuid~", $uuid
3671	and return;	4032	and return;
3672		4033
3673	warn "uuid file written ($value).\n";	4034	trace "uuid file written ($value).\n";
3674		4035
3675	1	4036	1
3676		4037
3677	}	4038	}
3678		4039
…		…
3684	}	4045	}
3685		4046
3686	sub emergency_save() {	4047	sub emergency_save() {
3687	my $freeze_guard = cf::freeze_mainloop;	4048	my $freeze_guard = cf::freeze_mainloop;
3688		4049
3689	warn "emergency_perl_save: enter\n";	4050	info "emergency_perl_save: enter\n";
		4051
		4052	# this is a trade-off: we want to be very quick here, so
		4053	# save all maps without fsync, and later call a global sync
		4054	# (which in turn might be very very slow)
		4055	local $USE_FSYNC = 0;
3690		4056
3691	cf::sync_job {	4057	cf::sync_job {
3692	# this is a trade-off: we want to be very quick here, so	4058	cf::write_runtime_sync; # external watchdog should not bark
3693	# save all maps without fsync, and later call a global sync
3694	# (which in turn might be very very slow)
3695	local $USE_FSYNC = 0;
3696		4059
3697	# use a peculiar iteration method to avoid tripping on perl	4060	# use a peculiar iteration method to avoid tripping on perl
3698	# refcount bugs in for. also avoids problems with players	4061	# refcount bugs in for. also avoids problems with players
3699	# and maps saved/destroyed asynchronously.	4062	# and maps saved/destroyed asynchronously.
3700	warn "emergency_perl_save: begin player save\n";	4063	info "emergency_perl_save: begin player save\n";
3701	for my $login (keys %cf::PLAYER) {	4064	for my $login (keys %cf::PLAYER) {
3702	my $pl = $cf::PLAYER{$login} or next;	4065	my $pl = $cf::PLAYER{$login} or next;
3703	$pl->valid or next;	4066	$pl->valid or next;
3704	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4067	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3705	$pl->save;	4068	$pl->save;
3706	}	4069	}
3707	warn "emergency_perl_save: end player save\n";	4070	info "emergency_perl_save: end player save\n";
3708		4071
		4072	cf::write_runtime_sync; # external watchdog should not bark
		4073
3709	warn "emergency_perl_save: begin map save\n";	4074	info "emergency_perl_save: begin map save\n";
3710	for my $path (keys %cf::MAP) {	4075	for my $path (keys %cf::MAP) {
3711	my $map = $cf::MAP{$path} or next;	4076	my $map = $cf::MAP{$path} or next;
3712	$map->valid or next;	4077	$map->valid or next;
3713	$map->save;	4078	$map->save;
3714	}	4079	}
3715	warn "emergency_perl_save: end map save\n";	4080	info "emergency_perl_save: end map save\n";
3716		4081
		4082	cf::write_runtime_sync; # external watchdog should not bark
		4083
3717	warn "emergency_perl_save: begin database checkpoint\n";	4084	info "emergency_perl_save: begin database checkpoint\n";
3718	BDB::db_env_txn_checkpoint $DB_ENV;	4085	BDB::db_env_txn_checkpoint $DB_ENV;
3719	warn "emergency_perl_save: end database checkpoint\n";	4086	info "emergency_perl_save: end database checkpoint\n";
3720		4087
3721	warn "emergency_perl_save: begin write uuid\n";	4088	info "emergency_perl_save: begin write uuid\n";
3722	write_uuid_sync 1;	4089	write_uuid_sync 1;
3723	warn "emergency_perl_save: end write uuid\n";	4090	info "emergency_perl_save: end write uuid\n";
		4091
		4092	cf::write_runtime_sync; # external watchdog should not bark
		4093
		4094	trace "emergency_perl_save: syncing database to disk";
		4095	BDB::db_env_txn_checkpoint $DB_ENV;
		4096
		4097	info "emergency_perl_save: starting sync\n";
		4098	IO::AIO::aio_sync sub {
		4099	info "emergency_perl_save: finished sync\n";
		4100	};
		4101
		4102	cf::write_runtime_sync; # external watchdog should not bark
		4103
		4104	trace "emergency_perl_save: flushing outstanding aio requests";
		4105	while (IO::AIO::nreqs || BDB::nreqs) {
		4106	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4107	}
		4108
		4109	cf::write_runtime_sync; # external watchdog should not bark
3724	};	4110	};
3725		4111
3726	warn "emergency_perl_save: starting sync()\n";
3727	IO::AIO::aio_sync sub {
3728	warn "emergency_perl_save: finished sync()\n";
3729	};
3730
3731	warn "emergency_perl_save: leave\n";	4112	info "emergency_perl_save: leave\n";
3732	}	4113	}
3733		4114
3734	sub post_cleanup {	4115	sub post_cleanup {
3735	my ($make_core) = @_;	4116	my ($make_core) = @_;
3736		4117
		4118	IO::AIO::flush;
		4119
3737	warn Carp::longmess "post_cleanup backtrace"	4120	error Carp::longmess "post_cleanup backtrace"
3738	if $make_core;	4121	if $make_core;
3739		4122
3740	my $fh = pidfile;	4123	my $fh = pidfile;
3741	unlink $PIDFILE if <$fh> == $$;	4124	unlink $PIDFILE if <$fh> == $$;
3742	}	4125	}
…		…
3762	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4145	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3763	for my $name (keys %$leaf_symtab) {	4146	for my $name (keys %$leaf_symtab) {
3764	_gv_clear *{"$pkg$name"};	4147	_gv_clear *{"$pkg$name"};
3765	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4148	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3766	}	4149	}
3767	warn "cleared package $pkg\n";#d#
3768	}	4150	}
3769		4151
3770	sub do_reload_perl() {	4152	sub do_reload_perl() {
3771	# can/must only be called in main	4153	# can/must only be called in main
3772	if ($Coro::current != $Coro::main) {	4154	unless (in_main) {
3773	warn "can only reload from main coroutine";	4155	error "can only reload from main coroutine";
3774	return;	4156	return;
3775	}	4157	}
3776		4158
3777	return if $RELOAD++;	4159	return if $RELOAD++;
3778		4160
3779	my $t1 = AE::time;	4161	my $t1 = AE::time;
3780		4162
3781	while ($RELOAD) {	4163	while ($RELOAD) {
3782	warn "reloading...";	4164	cf::get_slot 0.1, -1, "reload_perl";
		4165	info "perl_reload: reloading...";
3783		4166
3784	warn "entering sync_job";	4167	trace "perl_reload: entering sync_job";
3785		4168
3786	cf::sync_job {	4169	cf::sync_job {
3787	cf::write_runtime_sync; # external watchdog should not bark
3788	cf::emergency_save;	4170	#cf::emergency_save;
3789	cf::write_runtime_sync; # external watchdog should not bark
3790		4171
3791	warn "syncing database to disk";
3792	BDB::db_env_txn_checkpoint $DB_ENV;
3793
3794	# if anything goes wrong in here, we should simply crash as we already saved
3795
3796	warn "flushing outstanding aio requests";
3797	while (IO::AIO::nreqs || BDB::nreqs) {
3798	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3799	}
3800
3801	warn "cancelling all extension coros";	4172	trace "perl_reload: cancelling all extension coros";
3802	$_->cancel for values %EXT_CORO;	4173	$_->cancel for values %EXT_CORO;
3803	%EXT_CORO = ();	4174	%EXT_CORO = ();
3804		4175
3805	warn "removing commands";	4176	trace "perl_reload: removing commands";
3806	%COMMAND = ();	4177	%COMMAND = ();
3807		4178
3808	warn "removing ext/exti commands";	4179	trace "perl_reload: removing ext/exti commands";
3809	%EXTCMD = ();	4180	%EXTCMD = ();
3810	%EXTICMD = ();	4181	%EXTICMD = ();
3811		4182
3812	warn "unloading/nuking all extensions";	4183	trace "perl_reload: unloading/nuking all extensions";
3813	for my $pkg (@EXTS) {	4184	for my $pkg (@EXTS) {
3814	warn "... unloading $pkg";	4185	trace "... unloading $pkg";
3815		4186
3816	if (my $cb = $pkg->can ("unload")) {	4187	if (my $cb = $pkg->can ("unload")) {
3817	eval {	4188	eval {
3818	$cb->($pkg);	4189	$cb->($pkg);
3819	1	4190	1
3820	} or warn "$pkg unloaded, but with errors: $@";	4191	} or error "$pkg unloaded, but with errors: $@";
3821	}	4192	}
3822		4193
3823	warn "... clearing $pkg";	4194	trace "... clearing $pkg";
3824	clear_package $pkg;	4195	clear_package $pkg;
3825	}	4196	}
3826		4197
3827	warn "unloading all perl modules loaded from $LIBDIR";	4198	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3828	while (my ($k, $v) = each %INC) {	4199	while (my ($k, $v) = each %INC) {
3829	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4200	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3830		4201
3831	warn "... unloading $k";	4202	trace "... unloading $k";
3832	delete $INC{$k};	4203	delete $INC{$k};
3833		4204
3834	$k =~ s/\.pm$//;	4205	$k =~ s/\.pm$//;
3835	$k =~ s/\//::/g;	4206	$k =~ s/\//::/g;
3836		4207
…		…
3839	}	4210	}
3840		4211
3841	clear_package $k;	4212	clear_package $k;
3842	}	4213	}
3843		4214
3844	warn "getting rid of safe::, as good as possible";	4215	trace "perl_reload: getting rid of safe::, as good as possible";
3845	clear_package "safe::$_"	4216	clear_package "safe::$_"
3846	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4217	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3847		4218
3848	warn "unloading cf.pm \"a bit\"";	4219	trace "perl_reload: unloading cf.pm \"a bit\"";
3849	delete $INC{"cf.pm"};	4220	delete $INC{"cf.pm"};
3850	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4221	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3851		4222
3852	# don't, removes xs symbols, too,	4223	# don't, removes xs symbols, too,
3853	# and global variables created in xs	4224	# and global variables created in xs
3854	#clear_package __PACKAGE__;	4225	#clear_package __PACKAGE__;
3855		4226
3856	warn "unload completed, starting to reload now";	4227	info "perl_reload: unload completed, starting to reload now";
3857		4228
3858	warn "reloading cf.pm";	4229	trace "perl_reload: reloading cf.pm";
3859	require cf;	4230	require cf;
3860	cf::_connect_to_perl_1;	4231	cf::_connect_to_perl_1;
3861		4232
3862	warn "loading config and database again";	4233	trace "perl_reload: loading config and database again";
3863	cf::reload_config;	4234	cf::reload_config;
3864		4235
3865	warn "loading extensions";	4236	trace "perl_reload: loading extensions";
3866	cf::load_extensions;	4237	cf::load_extensions;
3867		4238
3868	if ($REATTACH_ON_RELOAD) {	4239	if ($REATTACH_ON_RELOAD) {
3869	warn "reattaching attachments to objects/players";	4240	trace "perl_reload: reattaching attachments to objects/players";
3870	_global_reattach; # objects, sockets	4241	_global_reattach; # objects, sockets
3871	warn "reattaching attachments to maps";	4242	trace "perl_reload: reattaching attachments to maps";
3872	reattach $_ for values %MAP;	4243	reattach $_ for values %MAP;
3873	warn "reattaching attachments to players";	4244	trace "perl_reload: reattaching attachments to players";
3874	reattach $_ for values %PLAYER;	4245	reattach $_ for values %PLAYER;
3875	}	4246	}
3876		4247
3877	warn "running post_init jobs";	4248	cf::_post_init 1;
3878	(pop @POST_INIT)->(1) while @POST_INIT;
3879		4249
3880	warn "leaving sync_job";	4250	trace "perl_reload: leaving sync_job";
3881		4251
3882	1	4252	1
3883	} or do {	4253	} or do {
3884	warn $@;	4254	error $@;
3885	cf::cleanup "error while reloading, exiting.";	4255	cf::cleanup "perl_reload: error, exiting.";
3886	};	4256	};
3887		4257
3888	warn "reloaded";
3889	--$RELOAD;	4258	--$RELOAD;
3890	}	4259	}
3891		4260
3892	$t1 = AE::time - $t1;	4261	$t1 = AE::time - $t1;
3893	warn "reload completed in ${t1}s\n";	4262	info "perl_reload: completed in ${t1}s\n";
3894	};	4263	};
3895		4264
3896	our $RELOAD_WATCHER; # used only during reload	4265	our $RELOAD_WATCHER; # used only during reload
3897		4266
3898	sub reload_perl() {	4267	sub reload_perl() {
…		…
3919	reload_perl;	4288	reload_perl;
3920	};	4289	};
3921	}	4290	}
3922	};	4291	};
3923		4292
3924	unshift @INC, $LIBDIR;	4293	#############################################################################
3925		4294
3926	my $bug_warning = 0;	4295	my $bug_warning = 0;
3927		4296
3928	our @WAIT_FOR_TICK;
3929	our @WAIT_FOR_TICK_BEGIN;
3930
3931	sub wait_for_tick {	4297	sub wait_for_tick() {
3932	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4298	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3933		4299
3934	my $signal = new Coro::Signal;	4300	$WAIT_FOR_TICK->wait;
3935	push @WAIT_FOR_TICK, $signal;
3936	$signal->wait;
3937	}	4301	}
3938		4302
3939	sub wait_for_tick_begin {	4303	sub wait_for_tick_begin() {
3940	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4304	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3941		4305
3942	my $signal = new Coro::Signal;	4306	my $signal = new Coro::Signal;
3943	push @WAIT_FOR_TICK_BEGIN, $signal;	4307	push @WAIT_FOR_TICK_BEGIN, $signal;
3944	$signal->wait;	4308	$signal->wait;
3945	}	4309	}
…		…
3949	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4313	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3950	unless ++$bug_warning > 10;	4314	unless ++$bug_warning > 10;
3951	return;	4315	return;
3952	}	4316	}
3953		4317
3954	cf::server_tick; # one server iteration	4318	cf::one_tick; # one server iteration
3955		4319
3956	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4320	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3957		4321
3958	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4322	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3959	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4323	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3960	Coro::async_pool {	4324	Coro::async_pool {
3961	$Coro::current->{desc} = "runtime saver";	4325	$Coro::current->{desc} = "runtime saver";
3962	write_runtime_sync	4326	write_runtime_sync
3963	or warn "ERROR: unable to write runtime file: $!";	4327	or error "ERROR: unable to write runtime file: $!";
3964	};	4328	};
3965	}	4329	}
3966		4330
3967	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4331	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3968	$sig->send;	4332	$sig->send;
3969	}	4333	}
3970	while (my $sig = shift @WAIT_FOR_TICK) {	4334	$WAIT_FOR_TICK->broadcast;
3971	$sig->send;
3972	}
3973		4335
3974	$LOAD = ($NOW - $TICK_START) / $TICK;	4336	$LOAD = ($NOW - $TICK_START) / $TICK;
3975	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4337	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3976		4338
3977	if (0) {	4339	if (0) {
3978	if ($NEXT_TICK) {	4340	if ($NEXT_TICK) {
3979	my $jitter = $TICK_START - $NEXT_TICK;	4341	my $jitter = $TICK_START - $NEXT_TICK;
3980	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4342	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3981	warn "jitter $JITTER\n";#d#	4343	debug "jitter $JITTER\n";#d#
3982	}	4344	}
3983	}	4345	}
3984	}	4346	}
3985		4347
3986	{	4348	{
3987	# configure BDB	4349	# configure BDB
		4350	info "initialising database";
3988		4351
3989	BDB::min_parallel 16;	4352	BDB::min_parallel 16;
3990	BDB::max_poll_reqs $TICK * 0.1;	4353	BDB::max_poll_reqs $TICK * 0.1;
3991	$AnyEvent::BDB::WATCHER->priority (1);	4354	#$AnyEvent::BDB::WATCHER->priority (1);
3992		4355
3993	unless ($DB_ENV) {	4356	unless ($DB_ENV) {
3994	$DB_ENV = BDB::db_env_create;	4357	$DB_ENV = BDB::db_env_create;
3995	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4358	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3996	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4359	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4021	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4384	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4022	};	4385	};
4023	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4386	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4024	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4387	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4025	};	4388	};
		4389
		4390	info "database initialised";
4026	}	4391	}
4027		4392
4028	{	4393	{
4029	# configure IO::AIO	4394	# configure IO::AIO
4030		4395
		4396	info "initialising aio";
4031	IO::AIO::min_parallel 8;	4397	IO::AIO::min_parallel 8;
4032	IO::AIO::max_poll_time $TICK * 0.1;	4398	IO::AIO::max_poll_time $TICK * 0.1;
4033	undef $AnyEvent::AIO::WATCHER;	4399	undef $AnyEvent::AIO::WATCHER;
		4400	info "aio initialised";
4034	}	4401	}
4035		4402
4036	my $_log_backtrace;	4403	our $_log_backtrace;
		4404	our $_log_backtrace_last;
4037		4405
4038	sub _log_backtrace {	4406	sub _log_backtrace {
4039	my ($msg, @addr) = @_;	4407	my ($msg, @addr) = @_;
4040		4408
4041	$msg =~ s/\n//;	4409	$msg =~ s/\n$//;
4042		4410
		4411	if ($_log_backtrace_last eq $msg) {
		4412	LOG llevInfo, "[ABT] $msg\n";
		4413	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4043	# limit the # of concurrent backtraces	4414	# limit the # of concurrent backtraces
4044	if ($_log_backtrace < 2) {	4415	} elsif ($_log_backtrace < 2) {
		4416	$_log_backtrace_last = $msg;
4045	++$_log_backtrace;	4417	++$_log_backtrace;
4046	my $perl_bt = Carp::longmess $msg;	4418	my $perl_bt = Carp::longmess $msg;
4047	async {	4419	async {
4048	$Coro::current->{desc} = "abt $msg";	4420	$Coro::current->{desc} = "abt $msg";
4049		4421
…		…
4069	LOG llevInfo, "[ABT] $_\n" for @bt;	4441	LOG llevInfo, "[ABT] $_\n" for @bt;
4070	--$_log_backtrace;	4442	--$_log_backtrace;
4071	};	4443	};
4072	} else {	4444	} else {
4073	LOG llevInfo, "[ABT] $msg\n";	4445	LOG llevInfo, "[ABT] $msg\n";
4074	LOG llevInfo, "[ABT] [suppressed]\n";	4446	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4075	}	4447	}
4076	}	4448	}
4077		4449
4078	# load additional modules	4450	# load additional modules
4079	require "cf/$_.pm" for @EXTRA_MODULES;	4451	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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