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.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.583 by root, Mon Oct 29 23:12:37 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 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;
33	use Opcode;	31	use Opcode;
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
		35	use Carp ();
37		36
38	use Guard ();	37	use Guard ();
39	use Coro ();	38	use Coro ();
40	use Coro::State;	39	use Coro::State;
41	use Coro::Handle;	40	use Coro::Handle;
…		…
52	use Coro::Util ();	51	use Coro::Util ();
53		52
54	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
55	use BDB ();	54	use BDB ();
56	use Data::Dumper;	55	use Data::Dumper;
57	use Digest::MD5;
58	use Fcntl;	56	use Fcntl;
59	use YAML::XS ();	57	use YAML::XS ();
60	use IO::AIO ();	58	use IO::AIO ();
61	use Time::HiRes;	59	use Time::HiRes;
62	use Compress::LZF;	60	use Compress::LZF;
…		…
78	# strictly for debugging	76	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		78
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		80
		81	our @ORIG_INC;
		82
83	our %COMMAND = ();	83	our %COMMAND = ();
84	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
85		85
86	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	87	our %EXTCMD = ();
…		…
93	our @EVENT;	93	our @EVENT;
94	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	95	our %REFLECT; # set by us
96		96
97	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
98	our $DATADIR = datadir;	99	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
102	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		112
111	our %RESOURCE;	113	#our %RESOURCE; # unused
		114
		115	our $OUTPUT_RATE_MIN = 3000;
		116	our $OUTPUT_RATE_MAX = 1000000;
		117
		118	our $MAX_LINKS = 32; # how many chained exits to follow
		119	our $VERBOSE_IO = 1;
112		120
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	123	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	129	our $DB_ENV;
122		130
123	our @EXTRA_MODULES = qw(pod match mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		132
125	our %CFG;	133	our %CFG;
		134	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		135
127	our $UPTIME; $UPTIME ||= time;	136	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	137	our $RUNTIME = 0;
		138	our $SERVER_TICK = 0;
129	our $NOW;	139	our $NOW;
130		140
131	our (%PLAYER, %PLAYER_LOADING); # all users	141	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	142	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	143	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		152
143	our @POST_INIT;	153	our @POST_INIT;
144		154
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	155	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	156	our $REALLY_UNLOOP; # never set to true, please :)
		157
		158	our $WAIT_FOR_TICK = new Coro::Signal;
		159	our @WAIT_FOR_TICK_BEGIN;
147		160
148	binmode STDOUT;	161	binmode STDOUT;
149	binmode STDERR;	162	binmode STDERR;
150		163
151	# read virtual server time, if available	164	# read virtual server time, if available
…		…
162		175
163	our $EMERGENCY_POSITION;	176	our $EMERGENCY_POSITION;
164		177
165	sub cf::map::normalise;	178	sub cf::map::normalise;
166		179
		180	sub in_main() {
		181	$Coro::current == $Coro::main
		182	}
		183
167	#############################################################################	184	#############################################################################
168		185
169	%REFLECT = ();	186	%REFLECT = ();
170	for (@REFLECT) {	187	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	188	my $reflect = JSON::XS::decode_json $_;
…		…
181		198
182	=over 4	199	=over 4
183		200
184	=item $cf::UPTIME	201	=item $cf::UPTIME
185		202
186	The timestamp of the server start (so not actually an uptime).	203	The timestamp of the server start (so not actually an "uptime").
		204
		205	=item $cf::SERVER_TICK
		206
		207	An unsigned integer that starts at zero when the server is started and is
		208	incremented on every tick.
		209
		210	=item $cf::NOW
		211
		212	The (real) time of the last (current) server tick - updated before and
		213	after tick processing, so this is useful only as a rough "what time is it
		214	now" estimate.
		215
		216	=item $cf::TICK
		217
		218	The interval between each server tick, in seconds.
187		219
188	=item $cf::RUNTIME	220	=item $cf::RUNTIME
189		221
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	222	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	223	every server tick.
…		…
197	Various directories - "/etc", read-only install directory, perl-library	229	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	230	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	231	unique-items directory, player file directory, random maps directory and
200	database environment.	232	database environment.
201		233
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	234	=item $cf::LOADAVG
211		235
212	The current CPU load on the server (alpha-smoothed), as a value between 0	236	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	237	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	238	objects per tick. Healthy values are < 0.5.
…		…
223	from wherever your confdir points to.	247	from wherever your confdir points to.
224		248
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	249	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		250
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	251	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228	returns directly I<after> the tick processing (and consequently, can only wake one process	252	returns directly I<after> the tick processing (and consequently, can only wake one thread
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	253	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
230		254
		255	Note that cf::Wait_for_tick will immediately return when the server is not
		256	ticking, making it suitable for small pauses in threads that need to run
		257	when the server is paused. If that is not applicable (i.e. you I<really>
		258	want to wait, use C<$cf::WAIT_FOR_TICK>).
		259
		260	=item $cf::WAIT_FOR_TICK
		261
		262	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		263	variable contains a L<Coro::Signal> that is broadcats after every server
		264	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		265	next server tick.
		266
		267	=cut
		268
		269	sub wait_for_tick();
		270	sub wait_for_tick_begin();
		271
231	=item @cf::INVOKE_RESULTS	272	=item @cf::INVOKE_RESULTS
232		273
233	This array contains the results of the last C<invoke ()> call. When	274	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	275	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235	that call.	276	that call.
236		277
237	=item %cf::REFLECT	278	=item %cf::REFLECT
238		279
…		…
242		283
243	=back	284	=back
244		285
245	=cut	286	=cut
246		287
		288	sub error(@) { LOG llevError, join "", @_ }
		289	sub warn (@) { LOG llevWarn , join "", @_ }
		290	sub info (@) { LOG llevInfo , join "", @_ }
		291	sub debug(@) { LOG llevDebug, join "", @_ }
		292	sub trace(@) { LOG llevTrace, join "", @_ }
		293
247	$Coro::State::WARNHOOK = sub {	294	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	295	my $msg = join "", @_;
249		296
250	$msg .= "\n"	297	$msg .= "\n"
251	unless $msg =~ /\n$/;	298	unless $msg =~ /\n$/;
252		299
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	300	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		301
255	LOG llevError, $msg;	302	LOG llevWarn, $msg;
256	};	303	};
257		304
258	$Coro::State::DIEHOOK = sub {	305	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	306	return unless $^S eq 0; # "eq", not "=="
260		307
261	warn Carp::longmess $_[0];	308	error Carp::longmess $_[0];
262		309
263	if ($Coro::current == $Coro::main) {#d#	310	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	311	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	312	return;#d#
266	}#d#	313	}#d#
267		314
268	# kill coroutine otherwise	315	# kill coroutine otherwise
269	Coro::terminate	316	Coro::terminate
…		…
289	)) {	336	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	337	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	338	}
292		339
293	$EV::DIED = sub {	340	$EV::DIED = sub {
294	warn "error in event callback: @_";	341	Carp::cluck "error in event callback: @_";
295	};	342	};
		343
		344	#############################################################################
		345
		346	sub fork_call(&@);
		347	sub get_slot($;$$);
296		348
297	#############################################################################	349	#############################################################################
298		350
299	=head2 UTILITY FUNCTIONS	351	=head2 UTILITY FUNCTIONS
300		352
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	373	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	374	$d
323	} || "[unable to dump $_[0]: '$@']";	375	} || "[unable to dump $_[0]: '$@']";
324	}	376	}
325		377
		378	=item $scalar = cf::load_file $path
		379
		380	Loads the given file from path and returns its contents. Croaks on error
		381	and can block.
		382
		383	=cut
		384
		385	sub load_file($) {
		386	0 <= aio_load $_[0], my $data
		387	or Carp::croak "$_[0]: $!";
		388
		389	$data
		390	}
		391
		392	=item $success = cf::replace_file $path, $data, $sync
		393
		394	Atomically replaces the file at the given $path with new $data, and
		395	optionally $sync the data to disk before replacing the file.
		396
		397	=cut
		398
		399	sub replace_file($$;$) {
		400	my ($path, $data, $sync) = @_;
		401
		402	my $lock = cf::lock_acquire ("replace_file:$path");
		403
		404	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		405	or return;
		406
		407	$data = $data->() if ref $data;
		408
		409	length $data == aio_write $fh, 0, (length $data), $data, 0
		410	or return;
		411
		412	!$sync
		413	or !aio_fsync $fh
		414	or return;
		415
		416	aio_close $fh
		417	and return;
		418
		419	aio_rename "$path~", $path
		420	and return;
		421
		422	if ($sync) {
		423	$path =~ s%/[^/]*$%%;
		424	aio_pathsync $path;
		425	}
		426
		427	1
		428	}
		429
326	=item $ref = cf::decode_json $json	430	=item $ref = cf::decode_json $json
327		431
328	Converts a JSON string into the corresponding perl data structure.	432	Converts a JSON string into the corresponding perl data structure.
329		433
330	=item $json = cf::encode_json $ref	434	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	440	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		441
338	sub encode_json($) { $json_coder->encode ($_[0]) }	442	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	443	sub decode_json($) { $json_coder->decode ($_[0]) }
340		444
		445	=item $ref = cf::decode_storable $scalar
		446
		447	Same as Coro::Storable::thaw, so blocks.
		448
		449	=cut
		450
		451	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		452
		453	=item $ref = cf::decode_yaml $scalar
		454
		455	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		456
		457	=cut
		458
		459	sub decode_yaml($) {
		460	fork_call { YAML::XS::Load $_[0] } @_
		461	}
		462
		463	=item $scalar = cf::unlzf $scalar
		464
		465	Same as Compress::LZF::compress, but takes server ticks into account, so
		466	blocks.
		467
		468	=cut
		469
		470	sub unlzf($) {
		471	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		472	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		473	Compress::LZF::decompress $_[0]
		474	}
		475
341	=item cf::post_init { BLOCK }	476	=item cf::post_init { BLOCK }
342		477
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	478	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	479	but I<before> the server starts ticking again.
345		480
346	The cdoeblock will have a single boolean argument to indicate whether this	481	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	482	is a reload or not.
348		483
349	=cut	484	=cut
350		485
351	sub post_init(&) {	486	sub post_init(&) {
352	push @POST_INIT, shift;	487	push @POST_INIT, shift;
		488	}
		489
		490	sub _post_init {
		491	trace "running post_init jobs";
		492
		493	# run them in parallel...
		494
		495	my @join;
		496
		497	while () {
		498	push @join, map &Coro::async ($_, 0), @POST_INIT;
		499	@POST_INIT = ();
		500
		501	@join or last;
		502
		503	(pop @join)->join;
		504	}
353	}	505	}
354		506
355	=item cf::lock_wait $string	507	=item cf::lock_wait $string
356		508
357	Wait until the given lock is available. See cf::lock_acquire.	509	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	548	}
397		549
398	=item cf::periodic $interval, $cb	550	=item cf::periodic $interval, $cb
399		551
400	Like EV::periodic, but randomly selects a starting point so that the actions	552	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	553	get spread over time.
402		554
403	=cut	555	=cut
404		556
405	sub periodic($$) {	557	sub periodic($$) {
406	my ($interval, $cb) = @_;	558	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	562	EV::periodic $start, $interval, 0, $cb
411	}	563	}
412		564
413	=item cf::get_slot $time[, $priority[, $name]]	565	=item cf::get_slot $time[, $priority[, $name]]
414		566
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	567	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	This call blocks and returns only when you have at least C<$time> seconds	568	(default: 0): This call blocks and returns only when you have at least
417	of cpu time till the next tick. The slot is only valid till the next cede.	569	C<$time> seconds of cpu time till the next tick. The slot is only valid
		570	till the next cede.
		571
		572	Background jobs should use a priority les than zero, interactive jobs
		573	should use 100 or more.
418		574
419	The optional C<$name> can be used to identify the job to run. It might be	575	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	576	used for statistical purposes and should identify the same time-class.
421		577
422	Useful for short background jobs.	578	Useful for short background jobs.
423		579
424	=cut	580	=cut
425		581
426	our @SLOT_QUEUE;	582	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	583	our $SLOT_QUEUE;
		584	our $SLOT_DECAY = 0.9;
428		585
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	586	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	587	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	588	$Coro::current->desc ("timeslot manager");
432		589
433	my $signal = new Coro::Signal;	590	my $signal = new Coro::Signal;
		591	my $busy;
434		592
435	while () {	593	while () {
436	next_job:	594	next_job:
		595
437	my $avail = cf::till_tick;	596	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	597
439	for (0 .. $#SLOT_QUEUE) {	598	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	599	if ($SLOT_QUEUE[$_][0] <= $avail) {
		600	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	601	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	602	$job->[2]->send;
443	Coro::cede;	603	Coro::cede;
444	goto next_job;	604	goto next_job;
445	}	605	} else {
		606	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	607	}
447	}	608	}
448		609
449	if (@SLOT_QUEUE) {	610	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	611	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	612	$WAIT_FOR_TICK->wait;
452	$signal->wait;
453	} else {	613	} else {
		614	$busy = 0;
454	Coro::schedule;	615	Coro::schedule;
455	}	616	}
456	}	617	}
457	};	618	};
458		619
459	sub get_slot($;$$) {	620	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	621	return if tick_inhibit || $Coro::current == $Coro::main;
461		622
462	my ($time, $pri, $name) = @_;	623	my ($time, $pri, $name) = @_;
463		624
464	$time = $TICK * .6 if $time > $TICK * .6;	625	$time = clamp $time, 0.01, $TICK * .6;
		626
465	my $sig = new Coro::Signal;	627	my $sig = new Coro::Signal;
466		628
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	629	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	630	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	631	$SLOT_QUEUE->ready;
…		…
495	=cut	657	=cut
496		658
497	sub sync_job(&) {	659	sub sync_job(&) {
498	my ($job) = @_;	660	my ($job) = @_;
499		661
500	if ($Coro::current == $Coro::main) {	662	if (in_main) {
501	my $time = EV::time;	663	my $time = AE::time;
502		664
503	# this is the main coro, too bad, we have to block	665	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	666	# till the operation succeeds, freezing the server :/
505		667
506	LOG llevError, Carp::longmess "sync job";#d#	668	#LOG llevError, Carp::longmess "sync job";#d#
507		669
508	my $freeze_guard = freeze_mainloop;	670	my $freeze_guard = freeze_mainloop;
509		671
510	my $busy = 1;	672	my $busy = 1;
511	my @res;	673	my @res;
512		674
513	(async {	675	(async {
514	$Coro::current->desc ("sync job coro");	676	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	677	@res = eval { $job->() };
516	warn $@ if $@;	678	error $@ if $@;
517	undef $busy;	679	undef $busy;
518	})->prio (Coro::PRIO_MAX);	680	})->prio (Coro::PRIO_MAX);
519		681
520	while ($busy) {	682	while ($busy) {
521	if (Coro::nready) {	683	if (Coro::nready) {
…		…
523	} else {	685	} else {
524	EV::loop EV::LOOP_ONESHOT;	686	EV::loop EV::LOOP_ONESHOT;
525	}	687	}
526	}	688	}
527		689
528	my $time = EV::time - $time;	690	my $time = AE::time - $time;
529		691
530	$TICK_START += $time; # do not account sync jobs to server load	692	$TICK_START += $time; # do not account sync jobs to server load
531		693
532	wantarray ? @res : $res[0]	694	wantarray ? @res : $res[0]
533	} else {	695	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	717	$EXT_CORO{$coro+0} = $coro;
556		718
557	$coro	719	$coro
558	}	720	}
559		721
560	=item fork_call { }, $args	722	=item fork_call { }, @args
561		723
562	Executes the given code block with the given arguments in a seperate	724	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	725	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	726	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	727	never block itself or use any form of event handling.
566		728
567	=cut	729	=cut
568		730
		731	sub post_fork {
		732	reset_signals;
		733	}
		734
569	sub fork_call(&@) {	735	sub fork_call(&@) {
570	my ($cb, @args) = @_;	736	my ($cb, @args) = @_;
571		737
572	# we seemingly have to make a local copy of the whole thing,	738	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/	739	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)	740	# TODO: investigate and fix (likely this will be rather laborious)
575		741
576	my @res = Coro::Util::fork_eval {	742	my @res = Coro::Util::fork_eval {
577	reset_signals;	743	cf::post_fork;
578	&$cb	744	&$cb
579	}, @args;	745	} @args;
580		746
581	wantarray ? @res : $res[-1]	747	wantarray ? @res : $res[-1]
		748	}
		749
		750	sub objinfo {
		751	(
		752	"counter value" => cf::object::object_count,
		753	"objects created" => cf::object::create_count,
		754	"objects destroyed" => cf::object::destroy_count,
		755	"freelist size" => cf::object::free_count,
		756	"allocated objects" => cf::object::objects_size,
		757	"active objects" => cf::object::actives_size,
		758	)
582	}	759	}
583		760
584	=item $coin = coin_from_name $name	761	=item $coin = coin_from_name $name
585		762
586	=cut	763	=cut
…		…
623	within each server.	800	within each server.
624		801
625	=cut	802	=cut
626		803
627	sub db_table($) {	804	sub db_table($) {
		805	cf::error "db_get called from main context"
		806	if $Coro::current == $Coro::main;
		807
628	my ($name) = @_;	808	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	809	my $db = BDB::db_create $DB_ENV;
630		810
631	eval {	811	eval {
632	$db->set_flags (BDB::CHKSUM);	812	$db->set_flags (BDB::CHKSUM);
…		…
642	}	822	}
643		823
644	our $DB;	824	our $DB;
645		825
646	sub db_init {	826	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	827	$DB ||= db_table "db";
649	};
650	}	828	}
651		829
652	sub db_get($$) {	830	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	831	my $key = "$_[0]/$_[1]";
654		832
655	cf::sync_job {	833	cf::error "db_get called from main context"
		834	if $Coro::current == $Coro::main;
		835
656	BDB::db_get $DB, undef, $key, my $data;	836	BDB::db_get $DB, undef, $key, my $data;
657		837
658	$! ? ()	838	$! ? ()
659	: $data	839	: $data
660	}
661	}	840	}
662		841
663	sub db_put($$$) {	842	sub db_put($$$) {
664	BDB::dbreq_pri 4;	843	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	844	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
693		872
694	my @data;	873	my @data;
695	my $md5;	874	my $md5;
696		875
697	for (0 .. $#$src) {	876	for (0 .. $#$src) {
698	0 <= aio_load $src->[$_], $data[$_]	877	$data[$_] = load_file $src->[$_];
699	or Carp::croak "$src->[$_]: $!";
700	}	878	}
701		879
702	# if processing is expensive, check	880	# if processing is expensive, check
703	# checksum first	881	# checksum first
704	if (1) {	882	if (1) {
…		…
721		899
722	my $t1 = Time::HiRes::time;	900	my $t1 = Time::HiRes::time;
723	my $data = $process->(\@data);	901	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	902	my $t2 = Time::HiRes::time;
725		903
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	904	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		905
728	db_put cache => "$id/data", $data;	906	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	907	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	908	db_put cache => "$id/meta", $meta;
731		909
…		…
741		919
742	=cut	920	=cut
743		921
744	sub datalog($@) {	922	sub datalog($@) {
745	my ($type, %kv) = @_;	923	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	924	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	925	}
748		926
749	=back	927	=back
750		928
751	=cut	929	=cut
…		…
946		1124
947	} elsif (exists $cb_id{$type}) {	1125	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1126	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1127
950	} elsif (ref $type) {	1128	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1129	error "attaching objects not supported, ignoring.\n";
952		1130
953	} else {	1131	} else {
954	shift @arg;	1132	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1133	error "attach argument '$type' not supported, ignoring.\n";
956	}	1134	}
957	}	1135	}
958	}	1136	}
959		1137
960	sub _object_attach {	1138	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1148	_attach $registry, $klass, @attach;
971	}	1149	}
972		1150
973	$obj->{$name} = \%arg;	1151	$obj->{$name} = \%arg;
974	} else {	1152	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1153	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1154	}
977		1155
978	$obj->{_attachment}{$name} = undef;	1156	$obj->{_attachment}{$name} = undef;
979	}	1157	}
980		1158
…		…
1039		1217
1040	for (@$callbacks) {	1218	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1219	eval { &{$_->[1]} };
1042		1220
1043	if ($@) {	1221	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1222	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1223	override;
1047	}	1224	}
1048		1225
1049	return 1 if $override;	1226	return 1 if $override;
1050	}	1227	}
…		…
1129	for (@$attach) {	1306	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1307	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1308	_attach $registry, $klass, @attach;
1132	}	1309	}
1133	} else {	1310	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1311	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1312	}
1136	}	1313	}
1137	}	1314	}
1138		1315
1139	cf::attachable->attach (	1316	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1343	my ($filename, $rdata, $objs) = @_;
1167		1344
1168	sync_job {	1345	sync_job {
1169	if (length $$rdata) {	1346	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1347	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1348	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1349	$decname, length $$rdata, scalar @$objs
		1350	if $VERBOSE_IO;
1173		1351
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1352	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1353	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1354	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1355	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1377	aio_rename "$filename~", $filename;
1200		1378
1201	$filename =~ s%/[^/]+$%%;	1379	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1380	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1381	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1382	error "unable to save objects: $filename~: $!\n";
1205	}	1383	}
1206	} else {	1384	} else {
1207	aio_unlink $filename;	1385	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1386	aio_unlink "$filename.pst";
1209	}	1387	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1411	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1412	$av = $st->{objs};
1235	}	1413	}
1236		1414
1237	utf8::decode (my $decname = $filename);	1415	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1416	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1417	$decname, length $data, scalar @{$av || []}
		1418	if $VERBOSE_IO;
1240		1419
1241	($data, $av)	1420	($data, $av)
1242	}	1421	}
1243		1422
1244	=head2 COMMAND CALLBACKS	1423	=head2 COMMAND CALLBACKS
…		…
1303	}	1482	}
1304		1483
1305	use File::Glob ();	1484	use File::Glob ();
1306		1485
1307	cf::player->attach (	1486	cf::player->attach (
1308	on_command => sub {	1487	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1488	my ($pl, $name, $params) = @_;
1310		1489
1311	my $cb = $COMMAND{$name}	1490	my $cb = $COMMAND{$name}
1312	or return;	1491	or return;
1313		1492
…		…
1321	my ($pl, $buf) = @_;	1500	my ($pl, $buf) = @_;
1322		1501
1323	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1502	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324		1503
1325	if (ref $msg) {	1504	if (ref $msg) {
1326	my ($type, $reply, @payload) =	1505	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1327	"ARRAY" eq ref $msg
1328	? @$msg
1329	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1330		1506
1331	my @reply;	1507	my @reply;
1332		1508
1333	if (my $cb = $EXTCMD{$type}) {	1509	if (my $cb = $EXTCMD{$type}) {
1334	@reply = $cb->($pl, @payload);	1510	@reply = $cb->($pl, @payload);
…		…
1336		1512
1337	$pl->ext_reply ($reply, @reply)	1513	$pl->ext_reply ($reply, @reply)
1338	if $reply;	1514	if $reply;
1339		1515
1340	} else {	1516	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1517	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1518	}
1343		1519
1344	cf::override;	1520	cf::override;
1345	},	1521	},
1346	);	1522	);
…		…
1356	};	1532	};
1357		1533
1358	$grp	1534	$grp
1359	}	1535	}
1360		1536
		1537	sub _ext_cfg_reg($$$$) {
		1538	my ($rvar, $varname, $cfgname, $default) = @_;
		1539
		1540	$cfgname = lc $varname
		1541	unless length $cfgname;
		1542
		1543	$EXT_CFG{$cfgname} = [$rvar, $default];
		1544
		1545	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1546	}
		1547
1361	sub load_extensions {	1548	sub load_extensions {
		1549	info "loading extensions...";
		1550
		1551	%EXT_CFG = ();
		1552
1362	cf::sync_job {	1553	cf::sync_job {
1363	my %todo;	1554	my %todo;
1364		1555
1365	for my $path (<$LIBDIR/*.ext>) {	1556	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1557	next unless -r $path;
…		…
1384		1575
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1576	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1577	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1578
1388	$ext{source} =	1579	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1580	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1581	. "#line 1 \"$path\"\n{\n"
1391	. $source	1582	. $source
1392	. "\n};\n1";	1583	. "\n};\n1";
1393		1584
1394	$todo{$base} = \%ext;	1585	$todo{$base} = \%ext;
1395	}	1586	}
1396		1587
		1588	my $pass = 0;
1397	my %done;	1589	my %done;
1398	while (%todo) {	1590	while (%todo) {
1399	my $progress;	1591	my $progress;
1400		1592
		1593	++$pass;
		1594
		1595	ext:
1401	while (my ($k, $v) = each %todo) {	1596	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1597	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1598	next ext
1404	unless exists $done{$_};	1599	unless exists $done{$_};
1405	}	1600	}
1406		1601
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1602	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1603
1409	unless (eval $v->{source}) {	1604	my $source = $v->{source};
		1605
		1606	# support "CONF varname :confname = default" pseudo-statements
		1607	$source =~ s{
		1608	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1609	}{
		1610	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1611	}gmxe;
		1612
		1613	my $active = eval $source;
		1614
		1615	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1616	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1617
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1618	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1619	if exists $v->{meta}{mandatory};
1417		1620
1418	warn $msg;	1621	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1622	delete $todo{$k};
		1623	} else {
		1624	$done{$k} = delete $todo{$k};
		1625	push @EXTS, $v->{pkg};
		1626	$progress = 1;
		1627
		1628	info "$v->{base}: extension inactive.\n"
		1629	unless $active;
1419	}	1630	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1631	}
1425		1632
1426	skip:	1633	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1634	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1635
		1636	while (my ($k, $v) = each %todo) {
		1637	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1638	if exists $v->{meta}{mandatory};
		1639	}
		1640
		1641	last;
		1642	}
1429	}	1643	}
1430	};	1644	};
1431	}	1645	}
1432		1646
1433	#############################################################################	1647	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1731	$cf::PLAYER{$login} = $pl
1518	}	1732	}
1519	}	1733	}
1520	}	1734	}
1521		1735
		1736	cf::player->attach (
		1737	on_load => sub {
		1738	my ($pl, $path) = @_;
		1739
		1740	# restore slots saved in save, below
		1741	my $slots = delete $pl->{_slots};
		1742
		1743	$pl->ob->current_weapon ($slots->[0]);
		1744	$pl->combat_ob ($slots->[1]);
		1745	$pl->ranged_ob ($slots->[2]);
		1746	},
		1747	);
		1748
1522	sub save($) {	1749	sub save($) {
1523	my ($pl) = @_;	1750	my ($pl) = @_;
1524		1751
1525	return if $pl->{deny_save};	1752	return if $pl->{deny_save};
1526		1753
…		…
1531		1758
1532	aio_mkdir playerdir $pl, 0770;	1759	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1760	$pl->{last_save} = $cf::RUNTIME;
1534		1761
1535	cf::get_slot 0.01;	1762	cf::get_slot 0.01;
		1763
		1764	# save slots, to be restored later
		1765	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1766
1537	$pl->save_pl ($path);	1767	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1768	cf::cede_to_tick;
1539	}	1769	}
1540		1770
…		…
1574	my $name = $pl->ob->name;	1804	my $name = $pl->ob->name;
1575		1805
1576	$pl->{deny_save} = 1;	1806	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1807	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1808
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1809	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580	$pl->deactivate;	1810	$pl->deactivate;
		1811
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1812	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1813	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1814	ext::highscore::check ($pl->ob);
		1815
1584	$pl->ns->destroy if $pl->ns;	1816	$pl->ns->destroy if $pl->ns;
1585		1817
1586	my $path = playerdir $pl;	1818	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1819	my $temp = "$path~$cf::RUNTIME~deleting~";
1588	aio_rename $path, $temp;	1820	aio_rename $path, $temp;
…		…
1642	\@logins	1874	\@logins
1643	}	1875	}
1644		1876
1645	=item $player->maps	1877	=item $player->maps
1646		1878
		1879	=item cf::player::maps $login
		1880
1647	Returns an arrayref of map paths that are private for this	1881	Returns an arrayref of map paths that are private for this
1648	player. May block.	1882	player. May block.
1649		1883
1650	=cut	1884	=cut
1651		1885
…		…
1713	=cut	1947	=cut
1714		1948
1715	sub find_by_path($) {	1949	sub find_by_path($) {
1716	my ($path) = @_;	1950	my ($path) = @_;
1717		1951
		1952	$path =~ s/^~[^\/]*//; # skip ~login
		1953
1718	my ($match, $specificity);	1954	my ($match, $specificity);
1719		1955
1720	for my $region (list) {	1956	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1957	if ($region->{match} && $path =~ $region->{match}) {
1722	($match, $specificity) = ($region, $region->specificity)	1958	($match, $specificity) = ($region, $region->specificity)
…		…
1750	sub generate_random_map {	1986	sub generate_random_map {
1751	my ($self, $rmp) = @_;	1987	my ($self, $rmp) = @_;
1752		1988
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1989	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		1990
1755	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	1991	$self->_create_random_map ($rmp);
1757	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1758	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1759	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1760	$rmp->{exit_on_final_map},
1761	$rmp->{xsize}, $rmp->{ysize},
1762	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1763	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1764	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1765	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1766	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1767	(cf::region::find $rmp->{region}), $rmp->{custom}
1768	)
1769	}	1992	}
1770		1993
1771	=item cf::map->register ($regex, $prio)	1994	=item cf::map->register ($regex, $prio)
1772		1995
1773	Register a handler for the map path matching the given regex at the	1996	Register a handler for the map path matching the given regex at the
…		…
1778		2001
1779	sub register {	2002	sub register {
1780	my (undef, $regex, $prio) = @_;	2003	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	2004	my $pkg = caller;
1782		2005
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	2006	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		2007
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2008	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	2009	}
1788		2010
1789	# also paths starting with '/'	2011	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2012	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		2013
1792	sub thawer_merge {	2014	sub thawer_merge {
1793	my ($self, $merge) = @_;	2015	my ($self, $merge) = @_;
1794		2016
1795	# we have to keep some variables in memory intact	2017	# we have to keep some variables in memory intact
…		…
1800	}	2022	}
1801		2023
1802	sub normalise {	2024	sub normalise {
1803	my ($path, $base) = @_;	2025	my ($path, $base) = @_;
1804		2026
1805	$path = "$path"; # make sure its a string	2027	$path = "$path"; # make sure it's a string
1806		2028
1807	$path =~ s/\.map$//;	2029	$path =~ s/\.map$//;
1808		2030
1809	# map plan:	2031	# map plan:
1810	#	2032	#
…		…
1825	$base =~ s{[^/]+/?$}{};	2047	$base =~ s{[^/]+/?$}{};
1826	$path = "$base/$path";	2048	$path = "$base/$path";
1827	}	2049	}
1828		2050
1829	for ($path) {	2051	for ($path) {
1830	redo if s{//}{/};
1831	redo if s{/\.?/}{/};	2052	redo if s{/\.?/}{/};
1832	redo if s{/[^/]+/\.\./}{/};	2053	redo if s{/[^/]+/\.\./}{/};
1833	}	2054	}
1834		2055
1835	$path	2056	$path
…		…
1849	$self->init; # pass $1 etc.	2070	$self->init; # pass $1 etc.
1850	return $self;	2071	return $self;
1851	}	2072	}
1852	}	2073	}
1853		2074
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	2075	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	2076	()
1856	}	2077	}
1857		2078
		2079	# may re-bless or do other evil things
1858	sub init {	2080	sub init {
1859	my ($self) = @_;	2081	my ($self) = @_;
1860		2082
1861	$self	2083	$self
1862	}	2084	}
…		…
1927	$self->{load_path} = $path;	2149	$self->{load_path} = $path;
1928		2150
1929	1	2151	1
1930	}	2152	}
1931		2153
		2154	# used to laod the header of an original map
1932	sub load_header_orig {	2155	sub load_header_orig {
1933	my ($self) = @_;	2156	my ($self) = @_;
1934		2157
1935	$self->load_header_from ($self->load_path)	2158	$self->load_header_from ($self->load_path)
1936	}	2159	}
1937		2160
		2161	# used to laod the header of an instantiated map
1938	sub load_header_temp {	2162	sub load_header_temp {
1939	my ($self) = @_;	2163	my ($self) = @_;
1940		2164
1941	$self->load_header_from ($self->save_path)	2165	$self->load_header_from ($self->save_path)
1942	}	2166	}
1943		2167
		2168	# called after loading the header from an instantiated map
1944	sub prepare_temp {	2169	sub prepare_temp {
1945	my ($self) = @_;	2170	my ($self) = @_;
1946		2171
1947	$self->last_access ((delete $self->{last_access})	2172	$self->last_access ((delete $self->{last_access})
1948	|| $cf::RUNTIME); #d#	2173	|| $cf::RUNTIME); #d#
1949	# safety	2174	# safety
1950	$self->{instantiate_time} = $cf::RUNTIME	2175	$self->{instantiate_time} = $cf::RUNTIME
1951	if $self->{instantiate_time} > $cf::RUNTIME;	2176	if $self->{instantiate_time} > $cf::RUNTIME;
1952	}	2177	}
1953		2178
		2179	# called after loading the header from an original map
1954	sub prepare_orig {	2180	sub prepare_orig {
1955	my ($self) = @_;	2181	my ($self) = @_;
1956		2182
1957	$self->{load_original} = 1;	2183	$self->{load_original} = 1;
1958	$self->{instantiate_time} = $cf::RUNTIME;	2184	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1982		2208
1983	sub find;	2209	sub find;
1984	sub find {	2210	sub find {
1985	my ($path, $origin) = @_;	2211	my ($path, $origin) = @_;
1986		2212
		2213	cf::cede_to_tick;
		2214
1987	$path = normalise $path, $origin && $origin->path;	2215	$path = normalise $path, $origin;
1988		2216
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2217	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2218	my $guard2 = cf::lock_acquire "map_find:$path";
1991		2219
1992	$cf::MAP{$path} || do {	2220	$cf::MAP{$path} || do {
…		…
2009		2237
2010	$cf::MAP{$path} = $map	2238	$cf::MAP{$path} = $map
2011	}	2239	}
2012	}	2240	}
2013		2241
2014	sub pre_load { }	2242	sub pre_load { }
2015	sub post_load { }	2243	#sub post_load { } # XS
2016		2244
2017	sub load {	2245	sub load {
2018	my ($self) = @_;	2246	my ($self) = @_;
2019		2247
2020	local $self->{deny_reset} = 1; # loading can take a long time	2248	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2023		2251
2024	{	2252	{
2025	my $guard = cf::lock_acquire "map_data:$path";	2253	my $guard = cf::lock_acquire "map_data:$path";
2026		2254
2027	return unless $self->valid;	2255	return unless $self->valid;
2028	return unless $self->in_memory == cf::MAP_SWAPPED;	2256	return unless $self->state == cf::MAP_SWAPPED;
2029
2030	$self->in_memory (cf::MAP_LOADING);
2031		2257
2032	$self->alloc;	2258	$self->alloc;
2033		2259
2034	$self->pre_load;	2260	$self->pre_load;
2035	cf::cede_to_tick;	2261	cf::cede_to_tick;
2036		2262
		2263	if (exists $self->{load_path}) {
2037	my $f = new_from_file cf::object::thawer $self->{load_path};	2264	my $f = new_from_file cf::object::thawer $self->{load_path};
2038	$f->skip_block;	2265	$f->skip_block;
2039	$self->_load_objects ($f)	2266	$self->_load_objects ($f)
2040	or return;	2267	or return;
2041		2268
2042	$self->post_load_original	2269	$self->post_load_original
2043	if delete $self->{load_original};	2270	if delete $self->{load_original};
2044		2271
2045	if (my $uniq = $self->uniq_path) {	2272	if (my $uniq = $self->uniq_path) {
2046	utf8::encode $uniq;	2273	utf8::encode $uniq;
2047	unless (aio_stat $uniq) {	2274	unless (aio_stat $uniq) {
2048	if (my $f = new_from_file cf::object::thawer $uniq) {	2275	if (my $f = new_from_file cf::object::thawer $uniq) {
2049	$self->clear_unique_items;	2276	$self->clear_unique_items;
2050	$self->_load_objects ($f);	2277	$self->_load_objects ($f);
2051	$f->resolve_delayed_derefs;	2278	$f->resolve_delayed_derefs;
		2279	}
2052	}	2280	}
2053	}	2281	}
2054	}
2055		2282
2056	$f->resolve_delayed_derefs;	2283	$f->resolve_delayed_derefs;
		2284	} else {
		2285	$self->post_load_original
		2286	if delete $self->{load_original};
		2287	}
		2288
		2289	$self->state (cf::MAP_INACTIVE);
2057		2290
2058	cf::cede_to_tick;	2291	cf::cede_to_tick;
2059	# now do the right thing for maps	2292	# now do the right thing for maps
2060	$self->link_multipart_objects;	2293	$self->link_multipart_objects;
2061	$self->difficulty ($self->estimate_difficulty)	2294	$self->difficulty ($self->estimate_difficulty)
…		…
2065	unless ($self->{deny_activate}) {	2298	unless ($self->{deny_activate}) {
2066	$self->decay_objects;	2299	$self->decay_objects;
2067	$self->fix_auto_apply;	2300	$self->fix_auto_apply;
2068	$self->update_buttons;	2301	$self->update_buttons;
2069	cf::cede_to_tick;	2302	cf::cede_to_tick;
2070	$self->activate;	2303	#$self->activate; # no longer activate maps automatically
2071	}	2304	}
2072		2305
2073	$self->{last_save} = $cf::RUNTIME;	2306	$self->{last_save} = $cf::RUNTIME;
2074	$self->last_access ($cf::RUNTIME);	2307	$self->last_access ($cf::RUNTIME);
2075
2076	$self->in_memory (cf::MAP_ACTIVE);
2077	}	2308	}
2078		2309
2079	$self->post_load;	2310	$self->post_load;
2080	}
2081		2311
		2312	1
		2313	}
		2314
		2315	# customize the map for a given player, i.e.
		2316	# return the _real_ map. used by e.g. per-player
		2317	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2318	sub customise_for {
2083	my ($self, $ob) = @_;	2319	my ($self, $ob) = @_;
2084		2320
2085	return find "~" . $ob->name . "/" . $self->{path}	2321	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2322	if $self->per_player;
…		…
2089	# if $self->per_party;	2325	# if $self->per_party;
2090		2326
2091	$self	2327	$self
2092	}	2328	}
2093		2329
2094	# find and load all maps in the 3x3 area around a map
2095	sub load_neighbours {
2096	my ($map) = @_;
2097
2098	my @neigh; # diagonal neighbours
2099
2100	for (0 .. 3) {
2101	my $neigh = $map->tile_path ($_)
2102	or next;
2103	$neigh = find $neigh, $map
2104	or next;
2105	$neigh->load;
2106
2107	push @neigh,
2108	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2109	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2110	}
2111
2112	for (grep defined $_->[0], @neigh) {
2113	my ($path, $origin) = @$_;
2114	my $neigh = find $path, $origin
2115	or next;
2116	$neigh->load;
2117	}
2118	}
2119
2120	sub find_sync {	2330	sub find_sync {
2121	my ($path, $origin) = @_;	2331	my ($path, $origin) = @_;
2122		2332
2123	cf::sync_job { find $path, $origin }	2333	# it's a bug to call this from the main context
		2334	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2335	if $Coro::current == $Coro::main;
		2336
		2337	find $path, $origin
2124	}	2338	}
2125		2339
2126	sub do_load_sync {	2340	sub do_load_sync {
2127	my ($map) = @_;	2341	my ($map) = @_;
2128		2342
		2343	# it's a bug to call this from the main context
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2344	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2345	if $Coro::current == $Coro::main;
2131		2346
2132	cf::sync_job { $map->load };	2347	$map->load;
2133	}	2348	}
2134		2349
2135	our %MAP_PREFETCH;	2350	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2351	our $MAP_PREFETCHER = undef;
2137		2352
2138	sub find_async {	2353	sub find_async {
2139	my ($path, $origin, $load) = @_;	2354	my ($path, $origin, $load) = @_;
2140		2355
2141	$path = normalise $path, $origin && $origin->{path};	2356	$path = normalise $path, $origin;
2142		2357
2143	if (my $map = $cf::MAP{$path}) {	2358	if (my $map = $cf::MAP{$path}) {
2144	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2359	return $map if !$load || $map->linkable;
2145	}	2360	}
2146		2361
2147	$MAP_PREFETCH{$path} |= $load;	2362	$MAP_PREFETCH{$path} |= $load;
2148		2363
2149	$MAP_PREFETCHER ||= cf::async {	2364	$MAP_PREFETCHER ||= cf::async {
…		…
2163	$MAP_PREFETCHER->prio (6);	2378	$MAP_PREFETCHER->prio (6);
2164		2379
2165	()	2380	()
2166	}	2381	}
2167		2382
		2383	# common code, used by both ->save and ->swapout
2168	sub save {	2384	sub _save {
2169	my ($self) = @_;	2385	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2386
2173	$self->{last_save} = $cf::RUNTIME;	2387	$self->{last_save} = $cf::RUNTIME;
2174		2388
2175	return unless $self->dirty;	2389	return unless $self->dirty;
2176		2390
…		…
2196	} else {	2410	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2411	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2412	}
2199	}	2413	}
2200		2414
		2415	sub save {
		2416	my ($self) = @_;
		2417
		2418	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2419
		2420	$self->_save;
		2421	}
		2422
2201	sub swap_out {	2423	sub swap_out {
2202	my ($self) = @_;	2424	my ($self) = @_;
2203		2425
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2426	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2427
		2428	return if !$self->linkable;
		2429	return if $self->{deny_save};
2209	return if $self->players;	2430	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2431
		2432	# first deactivate the map and "unlink" it from the core
		2433	$self->deactivate;
		2434	$_->clear_links_to ($self) for values %cf::MAP;
		2435	$self->state (cf::MAP_SWAPPED);
		2436
		2437	# then atomically save
		2438	$self->_save;
		2439
		2440	# then free the map
		2441	$self->clear;
		2442	}
		2443
		2444	sub reset_at {
		2445	my ($self) = @_;
		2446
		2447	# TODO: safety, remove and allow resettable per-player maps
2211	return if $self->{deny_save};	2448	return 1e99 if $self->{deny_reset};
2212		2449
		2450	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2451	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2452
		2453	$time + $to
		2454	}
		2455
		2456	sub should_reset {
		2457	my ($self) = @_;
		2458
		2459	$self->reset_at <= $cf::RUNTIME
		2460	}
		2461
		2462	sub reset {
		2463	my ($self) = @_;
		2464
		2465	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2466
		2467	return if $self->players;
		2468
		2469	cf::trace "resetting map ", $self->path, "\n";
		2470
2213	$self->in_memory (cf::MAP_SWAPPED);	2471	$self->state (cf::MAP_SWAPPED);
		2472
		2473	# need to save uniques path
		2474	unless ($self->{deny_save}) {
		2475	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2476
		2477	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2478	if $uniq;
		2479	}
		2480
		2481	delete $cf::MAP{$self->path};
2214		2482
2215	$self->deactivate;	2483	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2484	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2485	$self->clear;
2218	}
2219
2220	sub reset_at {
2221	my ($self) = @_;
2222
2223	# TODO: safety, remove and allow resettable per-player maps
2224	return 1e99 if $self->{deny_reset};
2225
2226	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2227	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2228
2229	$time + $to
2230	}
2231
2232	sub should_reset {
2233	my ($self) = @_;
2234
2235	$self->reset_at <= $cf::RUNTIME
2236	}
2237
2238	sub reset {
2239	my ($self) = @_;
2240
2241	my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2243	return if $self->players;
2244
2245	warn "resetting map ", $self->path, "\n";
2246
2247	$self->in_memory (cf::MAP_SWAPPED);
2248
2249	# need to save uniques path
2250	unless ($self->{deny_save}) {
2251	my $uniq = $self->uniq_path; utf8::encode $uniq;
2252
2253	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2254	if $uniq;
2255	}
2256
2257	delete $cf::MAP{$self->path};
2258
2259	$self->deactivate;
2260	$_->clear_links_to ($self) for values %cf::MAP;
2261	$self->clear;
2262		2486
2263	$self->unlink_save;	2487	$self->unlink_save;
2264	$self->destroy;	2488	$self->destroy;
2265	}	2489	}
2266		2490
…		…
2274		2498
2275	delete $cf::MAP{$self->path};	2499	delete $cf::MAP{$self->path};
2276		2500
2277	$self->unlink_save;	2501	$self->unlink_save;
2278		2502
2279	bless $self, "cf::map";	2503	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2504	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2505	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2506	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2507	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2508
…		…
2341	: normalise $_	2565	: normalise $_
2342	} @{ aio_readdir $UNIQUEDIR or [] }	2566	} @{ aio_readdir $UNIQUEDIR or [] }
2343	]	2567	]
2344	}	2568	}
2345		2569
		2570	=item cf::map::static_maps
		2571
		2572	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2573	file in the shared directory excluding F</styles> and F</editor>). May
		2574	block.
		2575
		2576	=cut
		2577
		2578	sub static_maps() {
		2579	my @dirs = "";
		2580	my @maps;
		2581
		2582	while (@dirs) {
		2583	my $dir = shift @dirs;
		2584
		2585	next if $dir eq "/styles" || $dir eq "/editor";
		2586
		2587	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2588	or return;
		2589
		2590	for (@$files) {
		2591	s/\.map$// or next;
		2592	utf8::decode $_;
		2593	push @maps, "$dir/$_";
		2594	}
		2595
		2596	push @dirs, map "$dir/$_", @$dirs;
		2597	}
		2598
		2599	\@maps
		2600	}
		2601
2346	=back	2602	=back
2347		2603
2348	=head3 cf::object	2604	=head3 cf::object
2349		2605
2350	=cut	2606	=cut
…		…
2482		2738
2483	Freezes the player and moves him/her to a special map (C<{link}>).	2739	Freezes the player and moves him/her to a special map (C<{link}>).
2484		2740
2485	The player should be reasonably safe there for short amounts of time (e.g.	2741	The player should be reasonably safe there for short amounts of time (e.g.
2486	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2742	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487	though, as the palyer cannot control the character while it is on the link	2743	though, as the player cannot control the character while it is on the link
2488	map.	2744	map.
2489		2745
2490	Will never block.	2746	Will never block.
2491		2747
2492	=item $player_object->leave_link ($map, $x, $y)	2748	=item $player_object->leave_link ($map, $x, $y)
…		…
2513	sub cf::object::player::enter_link {	2769	sub cf::object::player::enter_link {
2514	my ($self) = @_;	2770	my ($self) = @_;
2515		2771
2516	$self->deactivate_recursive;	2772	$self->deactivate_recursive;
2517		2773
		2774	++$self->{_link_recursion};
		2775
2518	return if UNIVERSAL::isa $self->map, "ext::map_link";	2776	return if UNIVERSAL::isa $self->map, "ext::map_link";
2519		2777
2520	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2778	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521	if $self->map && $self->map->{path} ne "{link}";	2779	if $self->map && $self->map->{path} ne "{link}";
2522		2780
2523	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2781	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2524	}	2782	}
2525		2783
2526	sub cf::object::player::leave_link {	2784	sub cf::object::player::leave_link {
2527	my ($self, $map, $x, $y) = @_;	2785	my ($self, $map, $x, $y) = @_;
2528		2786
…		…
2545	($x, $y) = (-1, -1)	2803	($x, $y) = (-1, -1)
2546	unless (defined $x) && (defined $y);	2804	unless (defined $x) && (defined $y);
2547		2805
2548	# use -1 or undef as default coordinates, not 0, 0	2806	# use -1 or undef as default coordinates, not 0, 0
2549	($x, $y) = ($map->enter_x, $map->enter_y)	2807	($x, $y) = ($map->enter_x, $map->enter_y)
2550	if $x <=0 && $y <= 0;	2808	if $x <= 0 && $y <= 0;
2551		2809
2552	$map->load;	2810	$map->load;
2553	$map->load_neighbours;
2554		2811
2555	return unless $self->contr->active;	2812	return unless $self->contr->active;
2556		2813
2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2814	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558	$self->enter_map ($map, $x, $y);	2815	if ($self->enter_map ($map, $x, $y)) {
2559		2816	# entering was successful
		2817	delete $self->{_link_recursion};
2560	# only activate afterwards, to support waiting in hooks	2818	# only activate afterwards, to support waiting in hooks
2561	$self->activate_recursive;	2819	$self->activate_recursive;
2562	}	2820	}
2563		2821
		2822	}
		2823
2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2824	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565		2825
2566	Moves the player to the given map-path and coordinates by first freezing	2826	Moves the player to the given map-path and coordinates by first freezing
2567	her, loading and preparing them map, calling the provided $check callback	2827	her, loading and preparing them map, calling the provided $check callback
2568	that has to return the map if sucecssful, and then unfreezes the player on	2828	that has to return the map if sucecssful, and then unfreezes the player on
2569	the new (success) or old (failed) map position. In either case, $done will	2829	the new (success) or old (failed) map position. In either case, $done will
…		…
2576		2836
2577	our $GOTOGEN;	2837	our $GOTOGEN;
2578		2838
2579	sub cf::object::player::goto {	2839	sub cf::object::player::goto {
2580	my ($self, $path, $x, $y, $check, $done) = @_;	2840	my ($self, $path, $x, $y, $check, $done) = @_;
		2841
		2842	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2843	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2844	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2845	($path, $x, $y) = @$EMERGENCY_POSITION;
		2846	}
2581		2847
2582	# do generation counting so two concurrent goto's will be executed in-order	2848	# do generation counting so two concurrent goto's will be executed in-order
2583	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2849	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584		2850
2585	$self->enter_link;	2851	$self->enter_link;
…		…
2605	($path, $x, $y) = (undef, undef, undef);	2871	($path, $x, $y) = (undef, undef, undef);
2606	}	2872	}
2607	}	2873	}
2608		2874
2609	my $map = eval {	2875	my $map = eval {
2610	my $map = defined $path ? cf::map::find $path : undef;	2876	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2611		2877
2612	if ($map) {	2878	if ($map) {
2613	$map = $map->customise_for ($self);	2879	$map = $map->customise_for ($self);
2614	$map = $check->($map) if $check && $map;	2880	$map = $check->($map, $x, $y, $self) if $check && $map;
2615	} else {	2881	} else {
2616	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2882	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617	}	2883	}
2618		2884
2619	$map	2885	$map
…		…
2627	if ($gen == $self->{_goto_generation}) {	2893	if ($gen == $self->{_goto_generation}) {
2628	delete $self->{_goto_generation};	2894	delete $self->{_goto_generation};
2629	$self->leave_link ($map, $x, $y);	2895	$self->leave_link ($map, $x, $y);
2630	}	2896	}
2631		2897
2632	$done->() if $done;	2898	$done->($self) if $done;
2633	})->prio (1);	2899	})->prio (1);
2634	}	2900	}
2635		2901
2636	=item $player_object->enter_exit ($exit_object)	2902	=item $player_object->enter_exit ($exit_object)
2637		2903
…		…
2705	$Coro::current->{desc} = "enter_exit";	2971	$Coro::current->{desc} = "enter_exit";
2706		2972
2707	unless (eval {	2973	unless (eval {
2708	$self->deactivate_recursive; # just to be sure	2974	$self->deactivate_recursive; # just to be sure
2709		2975
2710	# random map handling
2711	{
2712	my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714	prepare_random_map $exit
2715	if $exit->slaying eq "/!";
2716	}
2717
2718	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2976	my $map = cf::map::normalise $exit->slaying, $exit->map;
2719	my $x = $exit->stats->hp;	2977	my $x = $exit->stats->hp;
2720	my $y = $exit->stats->sp;	2978	my $y = $exit->stats->sp;
		2979
		2980	# special map handling
		2981	my $slaying = $exit->slaying;
		2982
		2983	# special map handling
		2984	if ($slaying eq "/!") {
		2985	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2986
		2987	prepare_random_map $exit
		2988	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2989
		2990	$map = $exit->slaying;
		2991
		2992	} elsif ($slaying eq '!up') {
		2993	$map = $exit->map->tile_path (cf::TILE_UP);
		2994	$x = $exit->x;
		2995	$y = $exit->y;
		2996
		2997	} elsif ($slaying eq '!down') {
		2998	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2999	$x = $exit->x;
		3000	$y = $exit->y;
		3001	}
2721		3002
2722	$self->goto ($map, $x, $y);	3003	$self->goto ($map, $x, $y);
2723		3004
2724	# if exit is damned, update players death & WoR home-position	3005	# if exit is damned, update players death & WoR home-position
2725	$self->contr->savebed ($map, $x, $y)	3006	$self->contr->savebed ($map, $x, $y)
…		…
2730	$self->message ("Something went wrong deep within the deliantra server. "	3011	$self->message ("Something went wrong deep within the deliantra server. "
2731	. "I'll try to bring you back to the map you were before. "	3012	. "I'll try to bring you back to the map you were before. "
2732	. "Please report this to the dungeon master!",	3013	. "Please report this to the dungeon master!",
2733	cf::NDI_UNIQUE | cf::NDI_RED);	3014	cf::NDI_UNIQUE | cf::NDI_RED);
2734		3015
2735	warn "ERROR in enter_exit: $@";	3016	error "ERROR in enter_exit: $@";
2736	$self->leave_link;	3017	$self->leave_link;
2737	}	3018	}
2738	})->prio (1);	3019	})->prio (1);
2739	}	3020	}
2740		3021
…		…
2752	sub cf::client::send_drawinfo {	3033	sub cf::client::send_drawinfo {
2753	my ($self, $text, $flags) = @_;	3034	my ($self, $text, $flags) = @_;
2754		3035
2755	utf8::encode $text;	3036	utf8::encode $text;
2756	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3037	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		3038	}
		3039
		3040	=item $client->send_big_packet ($pkt)
		3041
		3042	Like C<send_packet>, but tries to compress large packets, and fragments
		3043	them as required.
		3044
		3045	=cut
		3046
		3047	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		3048
		3049	sub cf::client::send_big_packet {
		3050	my ($self, $pkt) = @_;
		3051
		3052	# try lzf for large packets
		3053	$pkt = "lzf " . Compress::LZF::compress $pkt
		3054	if 1024 <= length $pkt and $self->{can_lzf};
		3055
		3056	# split very large packets
		3057	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3058	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3059	$pkt = "frag";
		3060	}
		3061
		3062	$self->send_packet ($pkt);
2757	}	3063	}
2758		3064
2759	=item $client->send_msg ($channel, $msg, $color, [extra...])	3065	=item $client->send_msg ($channel, $msg, $color, [extra...])
2760		3066
2761	Send a drawinfo or msg packet to the client, formatting the msg for the	3067	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2782	"c/examine" => {	3088	"c/examine" => {
2783	id => "infobox",	3089	id => "infobox",
2784	title => "Examine",	3090	title => "Examine",
2785	reply => undef,	3091	reply => undef,
2786	tooltip => "Signs and other items you examined",	3092	tooltip => "Signs and other items you examined",
		3093	},
		3094	"c/shopinfo" => {
		3095	id => "infobox",
		3096	title => "Shop Info",
		3097	reply => undef,
		3098	tooltip => "What your bargaining skill tells you about the shop",
2787	},	3099	},
2788	"c/book" => {	3100	"c/book" => {
2789	id => "infobox",	3101	id => "infobox",
2790	title => "Book",	3102	title => "Book",
2791	reply => undef,	3103	reply => undef,
…		…
2907	my $pkt = "msg "	3219	my $pkt = "msg "
2908	. $self->{json_coder}->encode (	3220	. $self->{json_coder}->encode (
2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3221	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910	);	3222	);
2911		3223
2912	# try lzf for large packets
2913	$pkt = "lzf " . Compress::LZF::compress $pkt
2914	if 1024 <= length $pkt and $self->{can_lzf};
2915
2916	# split very large packets
2917	if (8192 < length $pkt and $self->{can_lzf}) {
2918	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2919	$pkt = "frag";
2920	}
2921
2922	$self->send_packet ($pkt);	3224	$self->send_big_packet ($pkt);
2923	}	3225	}
2924		3226
2925	=item $client->ext_msg ($type, @msg)	3227	=item $client->ext_msg ($type, @msg)
2926		3228
2927	Sends an ext event to the client.	3229	Sends an ext event to the client.
…		…
2930		3232
2931	sub cf::client::ext_msg($$@) {	3233	sub cf::client::ext_msg($$@) {
2932	my ($self, $type, @msg) = @_;	3234	my ($self, $type, @msg) = @_;
2933		3235
2934	if ($self->extcmd == 2) {	3236	if ($self->extcmd == 2) {
2935	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3237	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936	} elsif ($self->extcmd == 1) { # TODO: remove	3238	} elsif ($self->extcmd == 1) { # TODO: remove
2937	push @msg, msgtype => "event_$type";	3239	push @msg, msgtype => "event_$type";
2938	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939	}	3241	}
2940	}	3242	}
2941		3243
2942	=item $client->ext_reply ($msgid, @msg)	3244	=item $client->ext_reply ($msgid, @msg)
2943		3245
…		…
2946	=cut	3248	=cut
2947		3249
2948	sub cf::client::ext_reply($$@) {	3250	sub cf::client::ext_reply($$@) {
2949	my ($self, $id, @msg) = @_;	3251	my ($self, $id, @msg) = @_;
2950		3252
2951	if ($self->extcmd == 2) {	3253	return unless $self->extcmd == 2;
		3254
2952	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3255	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953	} elsif ($self->extcmd == 1) {
2954	#TODO: version 1, remove
2955	unshift @msg, msgtype => "reply", msgid => $id;
2956	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957	}
2958	}	3256	}
2959		3257
2960	=item $success = $client->query ($flags, "text", \&cb)	3258	=item $success = $client->query ($flags, "text", \&cb)
2961		3259
2962	Queues a query to the client, calling the given callback with	3260	Queues a query to the client, calling the given callback with
…		…
3017	my ($ns, $buf) = @_;	3315	my ($ns, $buf) = @_;
3018		3316
3019	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3317	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3020		3318
3021	if (ref $msg) {	3319	if (ref $msg) {
3022	my ($type, $reply, @payload) =	3320	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3023	"ARRAY" eq ref $msg
3024	? @$msg
3025	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3026		3321
3027	my @reply;	3322	my @reply;
3028		3323
3029	if (my $cb = $EXTICMD{$type}) {	3324	if (my $cb = $EXTICMD{$type}) {
3030	@reply = $cb->($ns, @payload);	3325	@reply = $cb->($ns, @payload);
…		…
3032		3327
3033	$ns->ext_reply ($reply, @reply)	3328	$ns->ext_reply ($reply, @reply)
3034	if $reply;	3329	if $reply;
3035		3330
3036	} else {	3331	} else {
3037	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3332	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3038	}	3333	}
3039		3334
3040	cf::override;	3335	cf::override;
3041	},	3336	},
3042	);	3337	);
…		…
3062		3357
3063	$coro	3358	$coro
3064	}	3359	}
3065		3360
3066	cf::client->attach (	3361	cf::client->attach (
3067	on_destroy => sub {	3362	on_client_destroy => sub {
3068	my ($ns) = @_;	3363	my ($ns) = @_;
3069		3364
3070	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3365	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071	},	3366	},
3072	);	3367	);
…		…
3088	our $safe_hole = new Safe::Hole;	3383	our $safe_hole = new Safe::Hole;
3089		3384
3090	$SIG{FPE} = 'IGNORE';	3385	$SIG{FPE} = 'IGNORE';
3091		3386
3092	$safe->permit_only (Opcode::opset qw(	3387	$safe->permit_only (Opcode::opset qw(
3093	:base_core :base_mem :base_orig :base_math	3388	:base_core :base_mem :base_orig :base_math :base_loop
3094	grepstart grepwhile mapstart mapwhile	3389	grepstart grepwhile mapstart mapwhile
3095	sort time	3390	sort time
3096	));	3391	));
3097		3392
3098	# here we export the classes and methods available to script code	3393	# here we export the classes and methods available to script code
…		…
3123	decrease split destroy change_exp value msg lore send_msg)],	3418	decrease split destroy change_exp value msg lore send_msg)],
3124	["cf::object::player" => qw(player)],	3419	["cf::object::player" => qw(player)],
3125	["cf::player" => qw(peaceful send_msg)],	3420	["cf::player" => qw(peaceful send_msg)],
3126	["cf::map" => qw(trigger)],	3421	["cf::map" => qw(trigger)],
3127	) {	3422	) {
3128	no strict 'refs';
3129	my ($pkg, @funs) = @$_;	3423	my ($pkg, @funs) = @$_;
3130	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3424	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131	for @funs;	3425	for @funs;
3132	}	3426	}
3133		3427
…		…
3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3444	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3151	$qcode =~ s/\n/\\n/g;	3445	$qcode =~ s/\n/\\n/g;
3152		3446
3153	%vars = (_dummy => 0) unless %vars;	3447	%vars = (_dummy => 0) unless %vars;
3154		3448
		3449	my @res;
3155	local $_;	3450	local $_;
3156	local @safe::cf::_safe_eval_args = values %vars;
3157		3451
3158	my $eval =	3452	my $eval =
3159	"do {\n"	3453	"do {\n"
3160	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3454	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161	. "#line 0 \"{$qcode}\"\n"	3455	. "#line 0 \"{$qcode}\"\n"
3162	. $code	3456	. $code
3163	. "\n}"	3457	. "\n}"
3164	;	3458	;
3165		3459
		3460	if ($CFG{safe_eval}) {
3166	sub_generation_inc;	3461	sub_generation_inc;
		3462	local @safe::cf::_safe_eval_args = values %vars;
3167	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3463	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168	sub_generation_inc;	3464	sub_generation_inc;
		3465	} else {
		3466	local @cf::_safe_eval_args = values %vars;
		3467	@res = wantarray ? eval eval : scalar eval $eval;
		3468	}
3169		3469
3170	if ($@) {	3470	if ($@) {
3171	warn "$@";	3471	warn "$@",
3172	warn "while executing safe code '$code'\n";	3472	"while executing safe code '$code'\n",
3173	warn "with arguments " . (join " ", %vars) . "\n";	3473	"with arguments " . (join " ", %vars) . "\n";
3174	}	3474	}
3175		3475
3176	wantarray ? @res : $res[0]	3476	wantarray ? @res : $res[0]
3177	}	3477	}
3178		3478
…		…
3192	=cut	3492	=cut
3193		3493
3194	sub register_script_function {	3494	sub register_script_function {
3195	my ($fun, $cb) = @_;	3495	my ($fun, $cb) = @_;
3196		3496
3197	no strict 'refs';	3497	$fun = "safe::$fun" if $CFG{safe_eval};
3198	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3498	*$fun = $safe_hole->wrap ($cb);
3199	}	3499	}
3200		3500
3201	=back	3501	=back
3202		3502
3203	=cut	3503	=cut
…		…
3212	# for this (global event?)	3512	# for this (global event?)
3213	%ext::player_env::MUSIC_FACE_CACHE = ();	3513	%ext::player_env::MUSIC_FACE_CACHE = ();
3214		3514
3215	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3515	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3216		3516
3217	warn "loading facedata from $path\n";	3517	trace "loading facedata from $path\n";
3218		3518
3219	my $facedata;	3519	my $facedata = decode_storable load_file $path;
3220	0 < aio_load $path, $facedata
3221	or die "$path: $!";
3222
3223	$facedata = Coro::Storable::thaw $facedata;
3224		3520
3225	$facedata->{version} == 2	3521	$facedata->{version} == 2
3226	or cf::cleanup "$path: version mismatch, cannot proceed.";	3522	or cf::cleanup "$path: version mismatch, cannot proceed.";
3227		3523
3228	# patch in the exptable	3524	# patch in the exptable
		3525	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3229	$facedata->{resource}{"res/exp_table"} = {	3526	$facedata->{resource}{"res/exp_table"} = {
3230	type => FT_RSRC,	3527	type => FT_RSRC,
3231	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3528	data => $exp_table,
		3529	hash => (Digest::MD5::md5 $exp_table),
3232	};	3530	};
3233	cf::cede_to_tick;	3531	cf::cede_to_tick;
3234		3532
3235	{	3533	{
3236	my $faces = $facedata->{faceinfo};	3534	my $faces = $facedata->{faceinfo};
…		…
3238	while (my ($face, $info) = each %$faces) {	3536	while (my ($face, $info) = each %$faces) {
3239	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3537	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240		3538
3241	cf::face::set_visibility $idx, $info->{visibility};	3539	cf::face::set_visibility $idx, $info->{visibility};
3242	cf::face::set_magicmap $idx, $info->{magicmap};	3540	cf::face::set_magicmap $idx, $info->{magicmap};
3243	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3541	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3244	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3542	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3543	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3245		3544
3246	cf::cede_to_tick;	3545	cf::cede_to_tick;
3247	}	3546	}
3248		3547
3249	while (my ($face, $info) = each %$faces) {	3548	while (my ($face, $info) = each %$faces) {
…		…
3254		3553
3255	if (my $smooth = cf::face::find $info->{smooth}) {	3554	if (my $smooth = cf::face::find $info->{smooth}) {
3256	cf::face::set_smooth $idx, $smooth;	3555	cf::face::set_smooth $idx, $smooth;
3257	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3556	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3258	} else {	3557	} else {
3259	warn "smooth face '$info->{smooth}' not found for face '$face'";	3558	error "smooth face '$info->{smooth}' not found for face '$face'";
3260	}	3559	}
3261		3560
3262	cf::cede_to_tick;	3561	cf::cede_to_tick;
3263	}	3562	}
3264	}	3563	}
…		…
3273		3572
3274	cf::anim::invalidate_all; # d'oh	3573	cf::anim::invalidate_all; # d'oh
3275	}	3574	}
3276		3575
3277	{	3576	{
3278	# TODO: for gcfclient pleasure, we should give resources
3279	# that gcfclient doesn't grok a >10000 face index.
3280	my $res = $facedata->{resource};	3577	my $res = $facedata->{resource};
3281		3578
3282	while (my ($name, $info) = each %$res) {	3579	while (my ($name, $info) = each %$res) {
3283	if (defined $info->{type}) {	3580	if (defined (my $type = $info->{type})) {
		3581	# TODO: different hash - must free and use new index, or cache ixface data queue
3284	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3582	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285	my $data;
3286		3583
3287	if ($info->{type} & 1) {	3584	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3288	# prepend meta info
3289
3290	my $meta = $enc->encode ({
3291	name => $name,
3292	%{ $info->{meta} || {} },
3293	});
3294
3295	$data = pack "(w/a*)*", $meta, $info->{data};
3296	} else {
3297	$data = $info->{data};
3298	}
3299
3300	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3301	cf::face::set_type $idx, $info->{type};	3585	cf::face::set_type $idx, $type;
		3586	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
3302	} else {	3587	} else {
3303	$RESOURCE{$name} = $info;	3588	# $RESOURCE{$name} = $info; # unused
3304	}	3589	}
3305		3590
3306	cf::cede_to_tick;	3591	cf::cede_to_tick;
3307	}	3592	}
3308	}	3593	}
3309		3594
3310	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3595	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3311		3596
3312	1	3597	1
3313	}	3598	}
3314
3315	cf::global->attach (on_resource_update => sub {
3316	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3317	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3318
3319	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3320	my $sound = $soundconf->{compat}[$_]
3321	or next;
3322
3323	my $face = cf::face::find "sound/$sound->[1]";
3324	cf::sound::set $sound->[0] => $face;
3325	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3326	}
3327
3328	while (my ($k, $v) = each %{$soundconf->{event}}) {
3329	my $face = cf::face::find "sound/$v";
3330	cf::sound::set $k => $face;
3331	}
3332	}
3333	});
3334		3599
3335	register_exticmd fx_want => sub {	3600	register_exticmd fx_want => sub {
3336	my ($ns, $want) = @_;	3601	my ($ns, $want) = @_;
3337		3602
3338	while (my ($k, $v) = each %$want) {	3603	while (my ($k, $v) = each %$want) {
…		…
3377	sub reload_treasures {	3642	sub reload_treasures {
3378	load_resource_file "$DATADIR/treasures"	3643	load_resource_file "$DATADIR/treasures"
3379	or die "unable to load treasurelists\n";	3644	or die "unable to load treasurelists\n";
3380	}	3645	}
3381		3646
		3647	sub reload_sound {
		3648	trace "loading sound config from $DATADIR/sound\n";
		3649
		3650	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3651
		3652	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3653	my $sound = $soundconf->{compat}[$_]
		3654	or next;
		3655
		3656	my $face = cf::face::find "sound/$sound->[1]";
		3657	cf::sound::set $sound->[0] => $face;
		3658	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3659	}
		3660
		3661	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3662	my $face = cf::face::find "sound/$v";
		3663	cf::sound::set $k => $face;
		3664	}
		3665	}
		3666
3382	sub reload_resources {	3667	sub reload_resources {
3383	warn "reloading resource files...\n";	3668	trace "reloading resource files...\n";
3384		3669
		3670	reload_exp_table;
		3671	reload_materials;
3385	reload_facedata;	3672	reload_facedata;
		3673	reload_sound;
3386	reload_archetypes;	3674	reload_archetypes;
3387	reload_regions;	3675	reload_regions;
3388	reload_treasures;	3676	reload_treasures;
3389		3677
3390	warn "finished reloading resource files\n";	3678	trace "finished reloading resource files\n";
3391	}	3679	}
3392		3680
3393	sub reload_config {	3681	sub reload_config {
3394	warn "reloading config file...\n";	3682	trace "reloading config file...\n";
3395		3683
3396	open my $fh, "<:utf8", "$CONFDIR/config"	3684	my $config = load_file "$CONFDIR/config";
3397	or return;	3685	utf8::decode $config;
		3686	*CFG = decode_yaml $config;
3398		3687
3399	local $/;
3400	*CFG = YAML::XS::Load scalar <$fh>;
3401
3402	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3688	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403		3689
3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3690	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3691	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406		3692
3407	if (exists $CFG{mlockall}) {	3693	if (exists $CFG{mlockall}) {
…		…
3409	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3695	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410	and die "WARNING: m(un)lockall failed: $!\n";	3696	and die "WARNING: m(un)lockall failed: $!\n";
3411	};	3697	};
3412	warn $@ if $@;	3698	warn $@ if $@;
3413	}	3699	}
3414
3415	warn "finished reloading resource files\n";
3416	}	3700	}
3417		3701
3418	sub pidfile() {	3702	sub pidfile() {
3419	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3703	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3420	or die "$PIDFILE: $!";	3704	or die "$PIDFILE: $!";
…		…
3433	seek $fh, 0, 0;	3717	seek $fh, 0, 0;
3434	print $fh $$;	3718	print $fh $$;
3435	}	3719	}
3436		3720
3437	sub main_loop {	3721	sub main_loop {
3438	warn "EV::loop starting\n";	3722	trace "EV::loop starting\n";
3439	if (1) {	3723	if (1) {
3440	EV::loop;	3724	EV::loop;
3441	}	3725	}
3442	warn "EV::loop returned\n";	3726	trace "EV::loop returned\n";
3443	goto &main_loop unless $REALLY_UNLOOP;	3727	goto &main_loop unless $REALLY_UNLOOP;
3444	}	3728	}
3445		3729
3446	sub main {	3730	sub main {
3447	cf::init_globals; # initialise logging	3731	cf::init_globals; # initialise logging
3448		3732
3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3733	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3734	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3735	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3736	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3453
3454	cf::init_experience;
3455	cf::init_anim;
3456	cf::init_attackmess;
3457	cf::init_dynamic;
3458		3737
3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3738	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460		3739
3461	# we must not ever block the main coroutine	3740	# we must not ever block the main coroutine
3462	local $Coro::idle = sub {	3741	local $Coro::idle = sub {
…		…
3468	};	3747	};
3469		3748
3470	evthread_start IO::AIO::poll_fileno;	3749	evthread_start IO::AIO::poll_fileno;
3471		3750
3472	cf::sync_job {	3751	cf::sync_job {
		3752	cf::incloader::init ();
		3753
		3754	cf::init_anim;
		3755	cf::init_attackmess;
		3756	cf::init_dynamic;
		3757
		3758	cf::load_settings;
		3759
3473	reload_resources;	3760	reload_resources;
3474	reload_config;	3761	reload_config;
3475	db_init;	3762	db_init;
3476		3763
3477	cf::load_settings;
3478	cf::load_materials;
3479	cf::init_uuid;	3764	cf::init_uuid;
3480	cf::init_signals;	3765	cf::init_signals;
3481	cf::init_commands;
3482	cf::init_skills;	3766	cf::init_skills;
3483		3767
3484	cf::init_beforeplay;	3768	cf::init_beforeplay;
3485		3769
3486	atomic;	3770	atomic;
…		…
3491		3775
3492	# no (long-running) fork's whatsoever before this point(!)	3776	# no (long-running) fork's whatsoever before this point(!)
3493	use POSIX ();	3777	use POSIX ();
3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3778	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495		3779
3496	(pop @POST_INIT)->(0) while @POST_INIT;	3780	cf::_post_init 0;
3497	};	3781	};
3498		3782
		3783	cf::object::thawer::errors_are_fatal 0;
		3784	info "parse errors in files are no longer fatal from this point on.\n";
		3785
		3786	AE::postpone {
		3787	undef &main; # free gobs of memory :)
		3788	};
		3789
3499	main_loop;	3790	goto &main_loop;
3500	}	3791	}
3501		3792
3502	#############################################################################	3793	#############################################################################
3503	# initialisation and cleanup	3794	# initialisation and cleanup
3504		3795
3505	# install some emergency cleanup handlers	3796	# install some emergency cleanup handlers
3506	BEGIN {	3797	BEGIN {
3507	our %SIGWATCHER = ();	3798	our %SIGWATCHER = ();
3508	for my $signal (qw(INT HUP TERM)) {	3799	for my $signal (qw(INT HUP TERM)) {
3509	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3800	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3510	cf::cleanup "SIG$signal";	3801	cf::cleanup "SIG$signal";
3511	};	3802	};
3512	}	3803	}
3513	}	3804	}
3514		3805
3515	sub write_runtime_sync {	3806	sub write_runtime_sync {
		3807	my $t0 = AE::time;
		3808
3516	# first touch the runtime file to show we are still running:	3809	# first touch the runtime file to show we are still running:
3517	# the fsync below can take a very very long time.	3810	# the fsync below can take a very very long time.
3518		3811
3519	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3812	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520		3813
3521	my $guard = cf::lock_acquire "write_runtime";	3814	my $guard = cf::lock_acquire "write_runtime";
3522		3815
3523	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3816	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524	or return;	3817	or return;
3525		3818
3526	my $value = $cf::RUNTIME + 90 + 10;	3819	my $value = $cf::RUNTIME + 90 + 10;
3527	# 10 is the runtime save interval, for a monotonic clock	3820	# 10 is the runtime save interval, for a monotonic clock
3528	# 60 allows for the watchdog to kill the server.	3821	# 60 allows for the watchdog to kill the server.
…		…
3541	or return;	3834	or return;
3542		3835
3543	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3836	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544	and return;	3837	and return;
3545		3838
3546	warn "runtime file written.\n";	3839	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547		3840
3548	1	3841	1
3549	}	3842	}
3550		3843
3551	our $uuid_lock;	3844	our $uuid_lock;
…		…
3563	or return;	3856	or return;
3564		3857
3565	my $value = uuid_seq uuid_cur;	3858	my $value = uuid_seq uuid_cur;
3566		3859
3567	unless ($value) {	3860	unless ($value) {
3568	warn "cowardly refusing to write zero uuid value!\n";	3861	info "cowardly refusing to write zero uuid value!\n";
3569	return;	3862	return;
3570	}	3863	}
3571		3864
3572	my $value = uuid_str $value + $uuid_skip;	3865	my $value = uuid_str $value + $uuid_skip;
3573	$uuid_skip = 0;	3866	$uuid_skip = 0;
…		…
3583	or return;	3876	or return;
3584		3877
3585	aio_rename "$uuid~", $uuid	3878	aio_rename "$uuid~", $uuid
3586	and return;	3879	and return;
3587		3880
3588	warn "uuid file written ($value).\n";	3881	trace "uuid file written ($value).\n";
3589		3882
3590	1	3883	1
3591		3884
3592	}	3885	}
3593		3886
…		…
3599	}	3892	}
3600		3893
3601	sub emergency_save() {	3894	sub emergency_save() {
3602	my $freeze_guard = cf::freeze_mainloop;	3895	my $freeze_guard = cf::freeze_mainloop;
3603		3896
3604	warn "emergency_perl_save: enter\n";	3897	info "emergency_perl_save: enter\n";
		3898
		3899	# this is a trade-off: we want to be very quick here, so
		3900	# save all maps without fsync, and later call a global sync
		3901	# (which in turn might be very very slow)
		3902	local $USE_FSYNC = 0;
3605		3903
3606	cf::sync_job {	3904	cf::sync_job {
3607	# this is a trade-off: we want to be very quick here, so	3905	cf::write_runtime_sync; # external watchdog should not bark
3608	# save all maps without fsync, and later call a global sync
3609	# (which in turn might be very very slow)
3610	local $USE_FSYNC = 0;
3611		3906
3612	# use a peculiar iteration method to avoid tripping on perl	3907	# use a peculiar iteration method to avoid tripping on perl
3613	# refcount bugs in for. also avoids problems with players	3908	# refcount bugs in for. also avoids problems with players
3614	# and maps saved/destroyed asynchronously.	3909	# and maps saved/destroyed asynchronously.
3615	warn "emergency_perl_save: begin player save\n";	3910	info "emergency_perl_save: begin player save\n";
3616	for my $login (keys %cf::PLAYER) {	3911	for my $login (keys %cf::PLAYER) {
3617	my $pl = $cf::PLAYER{$login} or next;	3912	my $pl = $cf::PLAYER{$login} or next;
3618	$pl->valid or next;	3913	$pl->valid or next;
3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3914	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3620	$pl->save;	3915	$pl->save;
3621	}	3916	}
3622	warn "emergency_perl_save: end player save\n";	3917	info "emergency_perl_save: end player save\n";
3623		3918
		3919	cf::write_runtime_sync; # external watchdog should not bark
		3920
3624	warn "emergency_perl_save: begin map save\n";	3921	info "emergency_perl_save: begin map save\n";
3625	for my $path (keys %cf::MAP) {	3922	for my $path (keys %cf::MAP) {
3626	my $map = $cf::MAP{$path} or next;	3923	my $map = $cf::MAP{$path} or next;
3627	$map->valid or next;	3924	$map->valid or next;
3628	$map->save;	3925	$map->save;
3629	}	3926	}
3630	warn "emergency_perl_save: end map save\n";	3927	info "emergency_perl_save: end map save\n";
3631		3928
		3929	cf::write_runtime_sync; # external watchdog should not bark
		3930
3632	warn "emergency_perl_save: begin database checkpoint\n";	3931	info "emergency_perl_save: begin database checkpoint\n";
3633	BDB::db_env_txn_checkpoint $DB_ENV;	3932	BDB::db_env_txn_checkpoint $DB_ENV;
3634	warn "emergency_perl_save: end database checkpoint\n";	3933	info "emergency_perl_save: end database checkpoint\n";
3635		3934
3636	warn "emergency_perl_save: begin write uuid\n";	3935	info "emergency_perl_save: begin write uuid\n";
3637	write_uuid_sync 1;	3936	write_uuid_sync 1;
3638	warn "emergency_perl_save: end write uuid\n";	3937	info "emergency_perl_save: end write uuid\n";
		3938
		3939	cf::write_runtime_sync; # external watchdog should not bark
		3940
		3941	trace "emergency_perl_save: syncing database to disk";
		3942	BDB::db_env_txn_checkpoint $DB_ENV;
		3943
		3944	info "emergency_perl_save: starting sync\n";
		3945	IO::AIO::aio_sync sub {
		3946	info "emergency_perl_save: finished sync\n";
		3947	};
		3948
		3949	cf::write_runtime_sync; # external watchdog should not bark
		3950
		3951	trace "emergency_perl_save: flushing outstanding aio requests";
		3952	while (IO::AIO::nreqs || BDB::nreqs) {
		3953	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3954	}
		3955
		3956	cf::write_runtime_sync; # external watchdog should not bark
3639	};	3957	};
3640		3958
3641	warn "emergency_perl_save: starting sync()\n";
3642	IO::AIO::aio_sync sub {
3643	warn "emergency_perl_save: finished sync()\n";
3644	};
3645
3646	warn "emergency_perl_save: leave\n";	3959	info "emergency_perl_save: leave\n";
3647	}	3960	}
3648		3961
3649	sub post_cleanup {	3962	sub post_cleanup {
3650	my ($make_core) = @_;	3963	my ($make_core) = @_;
3651		3964
		3965	IO::AIO::flush;
		3966
3652	warn Carp::longmess "post_cleanup backtrace"	3967	error Carp::longmess "post_cleanup backtrace"
3653	if $make_core;	3968	if $make_core;
3654		3969
3655	my $fh = pidfile;	3970	my $fh = pidfile;
3656	unlink $PIDFILE if <$fh> == $$;	3971	unlink $PIDFILE if <$fh> == $$;
3657	}	3972	}
…		…
3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3992	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3678	for my $name (keys %$leaf_symtab) {	3993	for my $name (keys %$leaf_symtab) {
3679	_gv_clear *{"$pkg$name"};	3994	_gv_clear *{"$pkg$name"};
3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3995	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3681	}	3996	}
3682	warn "cleared package $pkg\n";#d#
3683	}	3997	}
3684		3998
3685	sub do_reload_perl() {	3999	sub do_reload_perl() {
3686	# can/must only be called in main	4000	# can/must only be called in main
3687	if ($Coro::current != $Coro::main) {	4001	unless (in_main) {
3688	warn "can only reload from main coroutine";	4002	error "can only reload from main coroutine";
3689	return;	4003	return;
3690	}	4004	}
3691		4005
3692	return if $RELOAD++;	4006	return if $RELOAD++;
3693		4007
3694	my $t1 = EV::time;	4008	my $t1 = AE::time;
3695		4009
3696	while ($RELOAD) {	4010	while ($RELOAD) {
3697	warn "reloading...";	4011	cf::get_slot 0.1, -1, "reload_perl";
		4012	info "perl_reload: reloading...";
3698		4013
3699	warn "entering sync_job";	4014	trace "perl_reload: entering sync_job";
3700		4015
3701	cf::sync_job {	4016	cf::sync_job {
3702	cf::write_runtime_sync; # external watchdog should not bark
3703	cf::emergency_save;	4017	#cf::emergency_save;
3704	cf::write_runtime_sync; # external watchdog should not bark
3705		4018
3706	warn "syncing database to disk";
3707	BDB::db_env_txn_checkpoint $DB_ENV;
3708
3709	# if anything goes wrong in here, we should simply crash as we already saved
3710
3711	warn "flushing outstanding aio requests";
3712	while (IO::AIO::nreqs || BDB::nreqs) {
3713	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3714	}
3715
3716	warn "cancelling all extension coros";	4019	trace "perl_reload: cancelling all extension coros";
3717	$_->cancel for values %EXT_CORO;	4020	$_->cancel for values %EXT_CORO;
3718	%EXT_CORO = ();	4021	%EXT_CORO = ();
3719		4022
3720	warn "removing commands";	4023	trace "perl_reload: removing commands";
3721	%COMMAND = ();	4024	%COMMAND = ();
3722		4025
3723	warn "removing ext/exti commands";	4026	trace "perl_reload: removing ext/exti commands";
3724	%EXTCMD = ();	4027	%EXTCMD = ();
3725	%EXTICMD = ();	4028	%EXTICMD = ();
3726		4029
3727	warn "unloading/nuking all extensions";	4030	trace "perl_reload: unloading/nuking all extensions";
3728	for my $pkg (@EXTS) {	4031	for my $pkg (@EXTS) {
3729	warn "... unloading $pkg";	4032	trace "... unloading $pkg";
3730		4033
3731	if (my $cb = $pkg->can ("unload")) {	4034	if (my $cb = $pkg->can ("unload")) {
3732	eval {	4035	eval {
3733	$cb->($pkg);	4036	$cb->($pkg);
3734	1	4037	1
3735	} or warn "$pkg unloaded, but with errors: $@";	4038	} or error "$pkg unloaded, but with errors: $@";
3736	}	4039	}
3737		4040
3738	warn "... clearing $pkg";	4041	trace "... clearing $pkg";
3739	clear_package $pkg;	4042	clear_package $pkg;
3740	}	4043	}
3741		4044
3742	warn "unloading all perl modules loaded from $LIBDIR";	4045	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3743	while (my ($k, $v) = each %INC) {	4046	while (my ($k, $v) = each %INC) {
3744	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4047	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3745		4048
3746	warn "... unloading $k";	4049	trace "... unloading $k";
3747	delete $INC{$k};	4050	delete $INC{$k};
3748		4051
3749	$k =~ s/\.pm$//;	4052	$k =~ s/\.pm$//;
3750	$k =~ s/\//::/g;	4053	$k =~ s/\//::/g;
3751		4054
…		…
3754	}	4057	}
3755		4058
3756	clear_package $k;	4059	clear_package $k;
3757	}	4060	}
3758		4061
3759	warn "getting rid of safe::, as good as possible";	4062	trace "perl_reload: getting rid of safe::, as good as possible";
3760	clear_package "safe::$_"	4063	clear_package "safe::$_"
3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4064	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3762		4065
3763	warn "unloading cf.pm \"a bit\"";	4066	trace "perl_reload: unloading cf.pm \"a bit\"";
3764	delete $INC{"cf.pm"};	4067	delete $INC{"cf.pm"};
3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4068	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3766		4069
3767	# don't, removes xs symbols, too,	4070	# don't, removes xs symbols, too,
3768	# and global variables created in xs	4071	# and global variables created in xs
3769	#clear_package __PACKAGE__;	4072	#clear_package __PACKAGE__;
3770		4073
3771	warn "unload completed, starting to reload now";	4074	info "perl_reload: unload completed, starting to reload now";
3772		4075
3773	warn "reloading cf.pm";	4076	trace "perl_reload: reloading cf.pm";
3774	require cf;	4077	require cf;
3775	cf::_connect_to_perl_1;	4078	cf::_connect_to_perl_1;
3776		4079
3777	warn "loading config and database again";	4080	trace "perl_reload: loading config and database again";
3778	cf::reload_config;	4081	cf::reload_config;
3779		4082
3780	warn "loading extensions";	4083	trace "perl_reload: loading extensions";
3781	cf::load_extensions;	4084	cf::load_extensions;
3782		4085
3783	if ($REATTACH_ON_RELOAD) {	4086	if ($REATTACH_ON_RELOAD) {
3784	warn "reattaching attachments to objects/players";	4087	trace "perl_reload: reattaching attachments to objects/players";
3785	_global_reattach; # objects, sockets	4088	_global_reattach; # objects, sockets
3786	warn "reattaching attachments to maps";	4089	trace "perl_reload: reattaching attachments to maps";
3787	reattach $_ for values %MAP;	4090	reattach $_ for values %MAP;
3788	warn "reattaching attachments to players";	4091	trace "perl_reload: reattaching attachments to players";
3789	reattach $_ for values %PLAYER;	4092	reattach $_ for values %PLAYER;
3790	}	4093	}
3791		4094
3792	warn "running post_init jobs";	4095	cf::_post_init 1;
3793	(pop @POST_INIT)->(1) while @POST_INIT;
3794		4096
3795	warn "leaving sync_job";	4097	trace "perl_reload: leaving sync_job";
3796		4098
3797	1	4099	1
3798	} or do {	4100	} or do {
3799	warn $@;	4101	error $@;
3800	cf::cleanup "error while reloading, exiting.";	4102	cf::cleanup "perl_reload: error, exiting.";
3801	};	4103	};
3802		4104
3803	warn "reloaded";
3804	--$RELOAD;	4105	--$RELOAD;
3805	}	4106	}
3806		4107
3807	$t1 = EV::time - $t1;	4108	$t1 = AE::time - $t1;
3808	warn "reload completed in ${t1}s\n";	4109	info "perl_reload: completed in ${t1}s\n";
3809	};	4110	};
3810		4111
3811	our $RELOAD_WATCHER; # used only during reload	4112	our $RELOAD_WATCHER; # used only during reload
3812		4113
3813	sub reload_perl() {	4114	sub reload_perl() {
…		…
3815	# coro crashes during coro_state_free->destroy here.	4116	# coro crashes during coro_state_free->destroy here.
3816		4117
3817	$RELOAD_WATCHER ||= cf::async {	4118	$RELOAD_WATCHER ||= cf::async {
3818	Coro::AIO::aio_wait cache_extensions;	4119	Coro::AIO::aio_wait cache_extensions;
3819		4120
3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4121	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821	do_reload_perl;	4122	do_reload_perl;
3822	undef $RELOAD_WATCHER;	4123	undef $RELOAD_WATCHER;
3823	};	4124	};
3824	};	4125	};
3825	}	4126	}
…		…
3834	reload_perl;	4135	reload_perl;
3835	};	4136	};
3836	}	4137	}
3837	};	4138	};
3838		4139
3839	unshift @INC, $LIBDIR;	4140	#############################################################################
3840		4141
3841	my $bug_warning = 0;	4142	my $bug_warning = 0;
3842		4143
3843	our @WAIT_FOR_TICK;
3844	our @WAIT_FOR_TICK_BEGIN;
3845
3846	sub wait_for_tick {	4144	sub wait_for_tick() {
3847	return if tick_inhibit || $Coro::current == $Coro::main;	4145	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3848		4146
3849	my $signal = new Coro::Signal;	4147	$WAIT_FOR_TICK->wait;
3850	push @WAIT_FOR_TICK, $signal;
3851	$signal->wait;
3852	}	4148	}
3853		4149
3854	sub wait_for_tick_begin {	4150	sub wait_for_tick_begin() {
3855	return if tick_inhibit || $Coro::current == $Coro::main;	4151	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3856		4152
3857	my $signal = new Coro::Signal;	4153	my $signal = new Coro::Signal;
3858	push @WAIT_FOR_TICK_BEGIN, $signal;	4154	push @WAIT_FOR_TICK_BEGIN, $signal;
3859	$signal->wait;	4155	$signal->wait;
3860	}	4156	}
…		…
3864	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4160	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3865	unless ++$bug_warning > 10;	4161	unless ++$bug_warning > 10;
3866	return;	4162	return;
3867	}	4163	}
3868		4164
3869	cf::server_tick; # one server iteration	4165	cf::one_tick; # one server iteration
		4166
		4167	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3870		4168
3871	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4169	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4170	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873	Coro::async_pool {	4171	Coro::async_pool {
3874	$Coro::current->{desc} = "runtime saver";	4172	$Coro::current->{desc} = "runtime saver";
3875	write_runtime_sync	4173	write_runtime_sync
3876	or warn "ERROR: unable to write runtime file: $!";	4174	or error "ERROR: unable to write runtime file: $!";
3877	};	4175	};
3878	}	4176	}
3879		4177
3880	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4178	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3881	$sig->send;	4179	$sig->send;
3882	}	4180	}
3883	while (my $sig = shift @WAIT_FOR_TICK) {	4181	$WAIT_FOR_TICK->broadcast;
3884	$sig->send;
3885	}
3886		4182
3887	$LOAD = ($NOW - $TICK_START) / $TICK;	4183	$LOAD = ($NOW - $TICK_START) / $TICK;
3888	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4184	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3889		4185
3890	if (0) {	4186	if (0) {
3891	if ($NEXT_TICK) {	4187	if ($NEXT_TICK) {
3892	my $jitter = $TICK_START - $NEXT_TICK;	4188	my $jitter = $TICK_START - $NEXT_TICK;
3893	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4189	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3894	warn "jitter $JITTER\n";#d#	4190	debug "jitter $JITTER\n";#d#
3895	}	4191	}
3896	}	4192	}
3897	}	4193	}
3898		4194
3899	{	4195	{
3900	# configure BDB	4196	# configure BDB
3901		4197
3902	BDB::min_parallel 8;	4198	BDB::min_parallel 16;
3903	BDB::max_poll_reqs $TICK * 0.1;	4199	BDB::max_poll_reqs $TICK * 0.1;
3904	$AnyEvent::BDB::WATCHER->priority (1);	4200	#$AnyEvent::BDB::WATCHER->priority (1);
3905		4201
3906	unless ($DB_ENV) {	4202	unless ($DB_ENV) {
3907	$DB_ENV = BDB::db_env_create;	4203	$DB_ENV = BDB::db_env_create;
3908	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4204	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3909	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4205	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3944	IO::AIO::min_parallel 8;	4240	IO::AIO::min_parallel 8;
3945	IO::AIO::max_poll_time $TICK * 0.1;	4241	IO::AIO::max_poll_time $TICK * 0.1;
3946	undef $AnyEvent::AIO::WATCHER;	4242	undef $AnyEvent::AIO::WATCHER;
3947	}	4243	}
3948		4244
3949	my $_log_backtrace;	4245	our $_log_backtrace;
		4246	our $_log_backtrace_last;
3950		4247
3951	sub _log_backtrace {	4248	sub _log_backtrace {
3952	my ($msg, @addr) = @_;	4249	my ($msg, @addr) = @_;
3953		4250
3954	$msg =~ s/\n//;	4251	$msg =~ s/\n$//;
3955		4252
		4253	if ($_log_backtrace_last eq $msg) {
		4254	LOG llevInfo, "[ABT] $msg\n";
		4255	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3956	# limit the # of concurrent backtraces	4256	# limit the # of concurrent backtraces
3957	if ($_log_backtrace < 2) {	4257	} elsif ($_log_backtrace < 2) {
		4258	$_log_backtrace_last = $msg;
3958	++$_log_backtrace;	4259	++$_log_backtrace;
3959	my $perl_bt = Carp::longmess $msg;	4260	my $perl_bt = Carp::longmess $msg;
3960	async {	4261	async {
3961	$Coro::current->{desc} = "abt $msg";	4262	$Coro::current->{desc} = "abt $msg";
3962		4263
…		…
3982	LOG llevInfo, "[ABT] $_\n" for @bt;	4283	LOG llevInfo, "[ABT] $_\n" for @bt;
3983	--$_log_backtrace;	4284	--$_log_backtrace;
3984	};	4285	};
3985	} else {	4286	} else {
3986	LOG llevInfo, "[ABT] $msg\n";	4287	LOG llevInfo, "[ABT] $msg\n";
3987	LOG llevInfo, "[ABT] [suppressed]\n";	4288	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3988	}	4289	}
3989	}	4290	}
3990		4291
3991	# load additional modules	4292	# load additional modules
3992	require "cf/$_.pm" for @EXTRA_MODULES;	4293	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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