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.480 by root, Thu Oct 8 05:09:43 2009 UTC vs.
Revision 1.577 by root, Tue Jan 3 11:25:33 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	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# it under the terms of the GNU General Public License as published by	7	# the terms of the Affero GNU General Public License as published by the
8	# the Free Software Foundation, either version 3 of the License, or	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# (at your 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 GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# along with this program. If not, see <http://www.gnu.org/licenses/>.	17	# and the GNU General Public License along with this program. If not, see
		18	# <http://www.gnu.org/licenses/>.
18	#	19	#
19	# 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>
20	#	21	#
21		22
22	package cf;	23	package cf;
23		24
24	use 5.10.0;	25	use common::sense;
25	use utf8;
26	use strict qw(vars subs);
27		26
28	use Symbol;	27	use Symbol;
29	use List::Util;	28	use List::Util;
30	use Socket;	29	use Socket;
31	use EV;	30	use EV;
32	use Opcode;	31	use Opcode;
33	use Safe;	32	use Safe;
34	use Safe::Hole;	33	use Safe::Hole;
35	use Storable ();	34	use Storable ();
		35	use Carp ();
36		36
37	use Guard ();	37	use Guard ();
38	use Coro ();	38	use Coro ();
39	use Coro::State;	39	use Coro::State;
40	use Coro::Handle;	40	use Coro::Handle;
…		…
51	use Coro::Util ();	51	use Coro::Util ();
52		52
53	use JSON::XS 2.01 ();	53	use JSON::XS 2.01 ();
54	use BDB ();	54	use BDB ();
55	use Data::Dumper;	55	use Data::Dumper;
56	use Digest::MD5;
57	use Fcntl;	56	use Fcntl;
58	use YAML ();	57	use YAML::XS ();
59	use IO::AIO ();	58	use IO::AIO ();
60	use Time::HiRes;	59	use Time::HiRes;
61	use Compress::LZF;	60	use Compress::LZF;
62	use Digest::MD5 ();	61	use Digest::MD5 ();
63		62
…		…
76		75
77	# strictly for debugging	76	# strictly for debugging
78	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	77	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
79		78
80	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	79	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
		80
		81	our @ORIG_INC;
81		82
82	our %COMMAND = ();	83	our %COMMAND = ();
83	our %COMMAND_TIME = ();	84	our %COMMAND_TIME = ();
84		85
85	our @EXTS = (); # list of extension package names	86	our @EXTS = (); # list of extension package names
…		…
92	our @EVENT;	93	our @EVENT;
93	our @REFLECT; # set by XS	94	our @REFLECT; # set by XS
94	our %REFLECT; # set by us	95	our %REFLECT; # set by us
95		96
96	our $CONFDIR = confdir;	97	our $CONFDIR = confdir;
		98
97	our $DATADIR = datadir;	99	our $DATADIR = datadir;
98	our $LIBDIR = "$DATADIR/ext";	100	our $LIBDIR = "$DATADIR/ext";
99	our $PODDIR = "$DATADIR/pod";	101	our $PODDIR = "$DATADIR/pod";
100	our $MAPDIR = "$DATADIR/" . mapdir;	102	our $MAPDIR = "$DATADIR/" . mapdir;
		103
101	our $LOCALDIR = localdir;	104	our $LOCALDIR = localdir;
102	our $TMPDIR = "$LOCALDIR/" . tmpdir;	105	our $TMPDIR = "$LOCALDIR/" . tmpdir;
103	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	106	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
104	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	107	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
105	our $RANDOMDIR = "$LOCALDIR/random";	108	our $RANDOMDIR = "$LOCALDIR/random";
106	our $BDBDIR = "$LOCALDIR/db";	109	our $BDBDIR = "$LOCALDIR/db";
107	our $PIDFILE = "$LOCALDIR/pid";	110	our $PIDFILE = "$LOCALDIR/pid";
108	our $RUNTIMEFILE = "$LOCALDIR/runtime";	111	our $RUNTIMEFILE = "$LOCALDIR/runtime";
109		112
110	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;
111		120
112	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	121	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
113	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	122	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
114	our $NEXT_TICK;	123	our $NEXT_TICK;
115	our $USE_FSYNC = 1; # use fsync to write maps - default on	124	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
117	our $BDB_DEADLOCK_WATCHER;	126	our $BDB_DEADLOCK_WATCHER;
118	our $BDB_CHECKPOINT_WATCHER;	127	our $BDB_CHECKPOINT_WATCHER;
119	our $BDB_TRICKLE_WATCHER;	128	our $BDB_TRICKLE_WATCHER;
120	our $DB_ENV;	129	our $DB_ENV;
121		130
122	our @EXTRA_MODULES = qw(pod mapscript);	131	our @EXTRA_MODULES = qw(pod match mapscript incloader);
123		132
124	our %CFG;	133	our %CFG;
125		134
126	our $UPTIME; $UPTIME ||= time;	135	our $UPTIME; $UPTIME ||= time;
127	our $RUNTIME;	136	our $RUNTIME = 0;
		137	our $SERVER_TICK = 0;
128	our $NOW;	138	our $NOW;
129		139
130	our (%PLAYER, %PLAYER_LOADING); # all users	140	our (%PLAYER, %PLAYER_LOADING); # all users
131	our (%MAP, %MAP_LOADING ); # all maps	141	our (%MAP, %MAP_LOADING ); # all maps
132	our $LINK_MAP; # the special {link} map, which is always available	142	our $LINK_MAP; # the special {link} map, which is always available
…		…
141		151
142	our @POST_INIT;	152	our @POST_INIT;
143		153
144	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	154	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145	our $REALLY_UNLOOP; # never set to true, please :)	155	our $REALLY_UNLOOP; # never set to true, please :)
		156
		157	our $WAIT_FOR_TICK = new Coro::Signal;
		158	our @WAIT_FOR_TICK_BEGIN;
146		159
147	binmode STDOUT;	160	binmode STDOUT;
148	binmode STDERR;	161	binmode STDERR;
149		162
150	# read virtual server time, if available	163	# read virtual server time, if available
…		…
161		174
162	our $EMERGENCY_POSITION;	175	our $EMERGENCY_POSITION;
163		176
164	sub cf::map::normalise;	177	sub cf::map::normalise;
165		178
		179	sub in_main() {
		180	$Coro::current == $Coro::main
		181	}
		182
166	#############################################################################	183	#############################################################################
167		184
168	%REFLECT = ();	185	%REFLECT = ();
169	for (@REFLECT) {	186	for (@REFLECT) {
170	my $reflect = JSON::XS::decode_json $_;	187	my $reflect = JSON::XS::decode_json $_;
171	$REFLECT{$reflect->{class}} = $reflect;	188	$REFLECT{$reflect->{class}} = $reflect;
172	}	189	}
173		190
174	# this is decidedly evil	191	# this is decidedly evil
175	$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];	192	$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
176		193
177	#############################################################################	194	#############################################################################
178		195
179	=head2 GLOBAL VARIABLES	196	=head2 GLOBAL VARIABLES
180		197
181	=over 4	198	=over 4
182		199
183	=item $cf::UPTIME	200	=item $cf::UPTIME
184		201
185	The timestamp of the server start (so not actually an uptime).	202	The timestamp of the server start (so not actually an "uptime").
		203
		204	=item $cf::SERVER_TICK
		205
		206	An unsigned integer that starts at zero when the server is started and is
		207	incremented on every tick.
		208
		209	=item $cf::NOW
		210
		211	The (real) time of the last (current) server tick - updated before and
		212	after tick processing, so this is useful only as a rough "what time is it
		213	now" estimate.
		214
		215	=item $cf::TICK
		216
		217	The interval between each server tick, in seconds.
186		218
187	=item $cf::RUNTIME	219	=item $cf::RUNTIME
188		220
189	The time this server has run, starts at 0 and is increased by $cf::TICK on	221	The time this server has run, starts at 0 and is increased by $cf::TICK on
190	every server tick.	222	every server tick.
…		…
196	Various directories - "/etc", read-only install directory, perl-library	228	Various directories - "/etc", read-only install directory, perl-library
197	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	229	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
198	unique-items directory, player file directory, random maps directory and	230	unique-items directory, player file directory, random maps directory and
199	database environment.	231	database environment.
200		232
201	=item $cf::NOW
202
203	The time of the last (current) server tick.
204
205	=item $cf::TICK
206
207	The interval between server ticks, in seconds.
208
209	=item $cf::LOADAVG	233	=item $cf::LOADAVG
210		234
211	The current CPU load on the server (alpha-smoothed), as a value between 0	235	The current CPU load on the server (alpha-smoothed), as a value between 0
212	(none) and 1 (overloaded), indicating how much time is spent on processing	236	(none) and 1 (overloaded), indicating how much time is spent on processing
213	objects per tick. Healthy values are < 0.5.	237	objects per tick. Healthy values are < 0.5.
…		…
222	from wherever your confdir points to.	246	from wherever your confdir points to.
223		247
224	=item cf::wait_for_tick, cf::wait_for_tick_begin	248	=item cf::wait_for_tick, cf::wait_for_tick_begin
225		249
226	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	250	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
227	returns directly I<after> the tick processing (and consequently, can only wake one process	251	returns directly I<after> the tick processing (and consequently, can only wake one thread
228	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	252	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
229		253
		254	Note that cf::Wait_for_tick will immediately return when the server is not
		255	ticking, making it suitable for small pauses in threads that need to run
		256	when the server is paused. If that is not applicable (i.e. you I<really>
		257	want to wait, use C<$cf::WAIT_FOR_TICK>).
		258
		259	=item $cf::WAIT_FOR_TICK
		260
		261	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		262	variable contains a L<Coro::Signal> that is broadcats after every server
		263	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		264	next server tick.
		265
		266	=cut
		267
		268	sub wait_for_tick();
		269	sub wait_for_tick_begin();
		270
230	=item @cf::INVOKE_RESULTS	271	=item @cf::INVOKE_RESULTS
231		272
232	This array contains the results of the last C<invoke ()> call. When	273	This array contains the results of the last C<invoke ()> call. When
233	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	274	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
234	that call.	275	that call.
235		276
236	=item %cf::REFLECT	277	=item %cf::REFLECT
237		278
…		…
241		282
242	=back	283	=back
243		284
244	=cut	285	=cut
245		286
		287	sub error(@) { LOG llevError, join "", @_ }
		288	sub warn (@) { LOG llevWarn , join "", @_ }
		289	sub info (@) { LOG llevInfo , join "", @_ }
		290	sub debug(@) { LOG llevDebug, join "", @_ }
		291	sub trace(@) { LOG llevTrace, join "", @_ }
		292
246	$Coro::State::WARNHOOK = sub {	293	$Coro::State::WARNHOOK = sub {
247	my $msg = join "", @_;	294	my $msg = join "", @_;
248		295
249	$msg .= "\n"	296	$msg .= "\n"
250	unless $msg =~ /\n$/;	297	unless $msg =~ /\n$/;
251		298
252	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	299	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
253		300
254	LOG llevError, $msg;	301	LOG llevWarn, $msg;
255	};	302	};
256		303
257	$Coro::State::DIEHOOK = sub {	304	$Coro::State::DIEHOOK = sub {
258	return unless $^S eq 0; # "eq", not "=="	305	return unless $^S eq 0; # "eq", not "=="
259		306
260	warn Carp::longmess $_[0];	307	error Carp::longmess $_[0];
261		308
262	if ($Coro::current == $Coro::main) {#d#	309	if (in_main) {#d#
263	warn "DIEHOOK called in main context, Coro bug?\n";#d#	310	error "DIEHOOK called in main context, Coro bug?\n";#d#
264	return;#d#	311	return;#d#
265	}#d#	312	}#d#
266		313
267	# kill coroutine otherwise	314	# kill coroutine otherwise
268	Coro::terminate	315	Coro::terminate
…		…
288	)) {	335	)) {
289	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	336	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
290	}	337	}
291		338
292	$EV::DIED = sub {	339	$EV::DIED = sub {
293	warn "error in event callback: @_";	340	Carp::cluck "error in event callback: @_";
294	};	341	};
		342
		343	#############################################################################
		344
		345	sub fork_call(&@);
		346	sub get_slot($;$$);
295		347
296	#############################################################################	348	#############################################################################
297		349
298	=head2 UTILITY FUNCTIONS	350	=head2 UTILITY FUNCTIONS
299		351
…		…
320	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	372	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
321	$d	373	$d
322	} || "[unable to dump $_[0]: '$@']";	374	} || "[unable to dump $_[0]: '$@']";
323	}	375	}
324		376
		377	=item $scalar = load_file $path
		378
		379	Loads the given file from path and returns its contents. Croaks on error
		380	and can block.
		381
		382	=cut
		383
		384	sub load_file($) {
		385	0 <= aio_load $_[0], my $data
		386	or Carp::croak "$_[0]: $!";
		387
		388	$data
		389	}
		390
325	=item $ref = cf::decode_json $json	391	=item $ref = cf::decode_json $json
326		392
327	Converts a JSON string into the corresponding perl data structure.	393	Converts a JSON string into the corresponding perl data structure.
328		394
329	=item $json = cf::encode_json $ref	395	=item $json = cf::encode_json $ref
…		…
335	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	401	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
336		402
337	sub encode_json($) { $json_coder->encode ($_[0]) }	403	sub encode_json($) { $json_coder->encode ($_[0]) }
338	sub decode_json($) { $json_coder->decode ($_[0]) }	404	sub decode_json($) { $json_coder->decode ($_[0]) }
339		405
		406	=item $ref = cf::decode_storable $scalar
		407
		408	Same as Coro::Storable::thaw, so blocks.
		409
		410	=cut
		411
		412	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		413
		414	=item $ref = cf::decode_yaml $scalar
		415
		416	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		417
		418	=cut
		419
		420	sub decode_yaml($) {
		421	fork_call { YAML::XS::Load $_[0] } @_
		422	}
		423
		424	=item $scalar = cf::unlzf $scalar
		425
		426	Same as Compress::LZF::compress, but takes server ticks into account, so
		427	blocks.
		428
		429	=cut
		430
		431	sub unlzf($) {
		432	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		433	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		434	Compress::LZF::decompress $_[0]
		435	}
		436
340	=item cf::post_init { BLOCK }	437	=item cf::post_init { BLOCK }
341		438
342	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	439	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343	but I<before> the server starts ticking again.	440	but I<before> the server starts ticking again.
344		441
345	The cdoeblock will have a single boolean argument to indicate whether this	442	The codeblock will have a single boolean argument to indicate whether this
346	is a reload or not.	443	is a reload or not.
347		444
348	=cut	445	=cut
349		446
350	sub post_init(&) {	447	sub post_init(&) {
351	push @POST_INIT, shift;	448	push @POST_INIT, shift;
		449	}
		450
		451	sub _post_init {
		452	trace "running post_init jobs";
		453
		454	# run them in parallel...
		455
		456	my @join;
		457
		458	while () {
		459	push @join, map &Coro::async ($_, 0), @POST_INIT;
		460	@POST_INIT = ();
		461
		462	@join or last;
		463
		464	(pop @join)->join;
		465	}
352	}	466	}
353		467
354	=item cf::lock_wait $string	468	=item cf::lock_wait $string
355		469
356	Wait until the given lock is available. See cf::lock_acquire.	470	Wait until the given lock is available. See cf::lock_acquire.
…		…
395	}	509	}
396		510
397	=item cf::periodic $interval, $cb	511	=item cf::periodic $interval, $cb
398		512
399	Like EV::periodic, but randomly selects a starting point so that the actions	513	Like EV::periodic, but randomly selects a starting point so that the actions
400	get spread over timer.	514	get spread over time.
401		515
402	=cut	516	=cut
403		517
404	sub periodic($$) {	518	sub periodic($$) {
405	my ($interval, $cb) = @_;	519	my ($interval, $cb) = @_;
…		…
409	EV::periodic $start, $interval, 0, $cb	523	EV::periodic $start, $interval, 0, $cb
410	}	524	}
411		525
412	=item cf::get_slot $time[, $priority[, $name]]	526	=item cf::get_slot $time[, $priority[, $name]]
413		527
414	Allocate $time seconds of blocking CPU time at priority C<$priority>:	528	Allocate $time seconds of blocking CPU time at priority C<$priority>
415	This call blocks and returns only when you have at least C<$time> seconds	529	(default: 0): This call blocks and returns only when you have at least
416	of cpu time till the next tick. The slot is only valid till the next cede.	530	C<$time> seconds of cpu time till the next tick. The slot is only valid
		531	till the next cede.
		532
		533	Background jobs should use a priority les than zero, interactive jobs
		534	should use 100 or more.
417		535
418	The optional C<$name> can be used to identify the job to run. It might be	536	The optional C<$name> can be used to identify the job to run. It might be
419	used for statistical purposes and should identify the same time-class.	537	used for statistical purposes and should identify the same time-class.
420		538
421	Useful for short background jobs.	539	Useful for short background jobs.
422		540
423	=cut	541	=cut
424		542
425	our @SLOT_QUEUE;	543	our @SLOT_QUEUE;
426	our $SLOT_QUEUE;	544	our $SLOT_QUEUE;
		545	our $SLOT_DECAY = 0.9;
427		546
428	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	547	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
429	$SLOT_QUEUE = Coro::async {	548	$SLOT_QUEUE = Coro::async {
430	$Coro::current->desc ("timeslot manager");	549	$Coro::current->desc ("timeslot manager");
431		550
432	my $signal = new Coro::Signal;	551	my $signal = new Coro::Signal;
		552	my $busy;
433		553
434	while () {	554	while () {
435	next_job:	555	next_job:
		556
436	my $avail = cf::till_tick;	557	my $avail = cf::till_tick;
437	if ($avail > 0.01) {	558
438	for (0 .. $#SLOT_QUEUE) {	559	for (0 .. $#SLOT_QUEUE) {
439	if ($SLOT_QUEUE[$_][0] < $avail) {	560	if ($SLOT_QUEUE[$_][0] <= $avail) {
		561	$busy = 0;
440	my $job = splice @SLOT_QUEUE, $_, 1, ();	562	my $job = splice @SLOT_QUEUE, $_, 1, ();
441	$job->[2]->send;	563	$job->[2]->send;
442	Coro::cede;	564	Coro::cede;
443	goto next_job;	565	goto next_job;
444	}	566	} else {
		567	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
445	}	568	}
446	}	569	}
447		570
448	if (@SLOT_QUEUE) {	571	if (@SLOT_QUEUE) {
449	# we do not use wait_for_tick() as it returns immediately when tick is inactive	572	# we do not use wait_for_tick() as it returns immediately when tick is inactive
450	push @cf::WAIT_FOR_TICK, $signal;	573	$WAIT_FOR_TICK->wait;
451	$signal->wait;
452	} else {	574	} else {
		575	$busy = 0;
453	Coro::schedule;	576	Coro::schedule;
454	}	577	}
455	}	578	}
456	};	579	};
457		580
458	sub get_slot($;$$) {	581	sub get_slot($;$$) {
459	return if tick_inhibit || $Coro::current == $Coro::main;	582	return if tick_inhibit || $Coro::current == $Coro::main;
460		583
461	my ($time, $pri, $name) = @_;	584	my ($time, $pri, $name) = @_;
462		585
463	$time = $TICK * .6 if $time > $TICK * .6;	586	$time = clamp $time, 0.01, $TICK * .6;
		587
464	my $sig = new Coro::Signal;	588	my $sig = new Coro::Signal;
465		589
466	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	590	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
467	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	591	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
468	$SLOT_QUEUE->ready;	592	$SLOT_QUEUE->ready;
…		…
494	=cut	618	=cut
495		619
496	sub sync_job(&) {	620	sub sync_job(&) {
497	my ($job) = @_;	621	my ($job) = @_;
498		622
499	if ($Coro::current == $Coro::main) {	623	if (in_main) {
500	my $time = EV::time;	624	my $time = AE::time;
501		625
502	# this is the main coro, too bad, we have to block	626	# this is the main coro, too bad, we have to block
503	# till the operation succeeds, freezing the server :/	627	# till the operation succeeds, freezing the server :/
504		628
505	LOG llevError, Carp::longmess "sync job";#d#	629	#LOG llevError, Carp::longmess "sync job";#d#
506		630
507	my $freeze_guard = freeze_mainloop;	631	my $freeze_guard = freeze_mainloop;
508		632
509	my $busy = 1;	633	my $busy = 1;
510	my @res;	634	my @res;
511		635
512	(async {	636	(async {
513	$Coro::current->desc ("sync job coro");	637	$Coro::current->desc ("sync job coro");
514	@res = eval { $job->() };	638	@res = eval { $job->() };
515	warn $@ if $@;	639	error $@ if $@;
516	undef $busy;	640	undef $busy;
517	})->prio (Coro::PRIO_MAX);	641	})->prio (Coro::PRIO_MAX);
518		642
519	while ($busy) {	643	while ($busy) {
520	if (Coro::nready) {	644	if (Coro::nready) {
…		…
522	} else {	646	} else {
523	EV::loop EV::LOOP_ONESHOT;	647	EV::loop EV::LOOP_ONESHOT;
524	}	648	}
525	}	649	}
526		650
527	my $time = EV::time - $time;	651	my $time = AE::time - $time;
528		652
529	$TICK_START += $time; # do not account sync jobs to server load	653	$TICK_START += $time; # do not account sync jobs to server load
530		654
531	wantarray ? @res : $res[0]	655	wantarray ? @res : $res[0]
532	} else {	656	} else {
…		…
554	$EXT_CORO{$coro+0} = $coro;	678	$EXT_CORO{$coro+0} = $coro;
555		679
556	$coro	680	$coro
557	}	681	}
558		682
559	=item fork_call { }, $args	683	=item fork_call { }, @args
560		684
561	Executes the given code block with the given arguments in a seperate	685	Executes the given code block with the given arguments in a seperate
562	process, returning the results. Everything must be serialisable with	686	process, returning the results. Everything must be serialisable with
563	Coro::Storable. May, of course, block. Note that the executed sub may	687	Coro::Storable. May, of course, block. Note that the executed sub may
564	never block itself or use any form of event handling.	688	never block itself or use any form of event handling.
565		689
566	=cut	690	=cut
567		691
		692	sub post_fork {
		693	reset_signals;
		694	}
		695
568	sub fork_call(&@) {	696	sub fork_call(&@) {
569	my ($cb, @args) = @_;	697	my ($cb, @args) = @_;
570		698
571	# we seemingly have to make a local copy of the whole thing,	699	# we seemingly have to make a local copy of the whole thing,
572	# otherwise perl prematurely frees the stuff :/	700	# otherwise perl prematurely frees the stuff :/
573	# TODO: investigate and fix (likely this will be rather laborious)	701	# TODO: investigate and fix (likely this will be rather laborious)
574		702
575	my @res = Coro::Util::fork_eval {	703	my @res = Coro::Util::fork_eval {
576	reset_signals;	704	cf::post_fork;
577	&$cb	705	&$cb
578	}, @args;	706	} @args;
579		707
580	wantarray ? @res : $res[-1]	708	wantarray ? @res : $res[-1]
		709	}
		710
		711	sub objinfo {
		712	(
		713	"counter value" => cf::object::object_count,
		714	"objects created" => cf::object::create_count,
		715	"objects destroyed" => cf::object::destroy_count,
		716	"freelist size" => cf::object::free_count,
		717	"allocated objects" => cf::object::objects_size,
		718	"active objects" => cf::object::actives_size,
		719	)
581	}	720	}
582		721
583	=item $coin = coin_from_name $name	722	=item $coin = coin_from_name $name
584		723
585	=cut	724	=cut
…		…
622	within each server.	761	within each server.
623		762
624	=cut	763	=cut
625		764
626	sub db_table($) {	765	sub db_table($) {
		766	cf::error "db_get called from main context"
		767	if $Coro::current == $Coro::main;
		768
627	my ($name) = @_;	769	my ($name) = @_;
628	my $db = BDB::db_create $DB_ENV;	770	my $db = BDB::db_create $DB_ENV;
629		771
630	eval {	772	eval {
631	$db->set_flags (BDB::CHKSUM);	773	$db->set_flags (BDB::CHKSUM);
…		…
641	}	783	}
642		784
643	our $DB;	785	our $DB;
644		786
645	sub db_init {	787	sub db_init {
646	cf::sync_job {
647	$DB ||= db_table "db";	788	$DB ||= db_table "db";
648	};
649	}	789	}
650		790
651	sub db_get($$) {	791	sub db_get($$) {
652	my $key = "$_[0]/$_[1]";	792	my $key = "$_[0]/$_[1]";
653		793
654	cf::sync_job {	794	cf::error "db_get called from main context"
		795	if $Coro::current == $Coro::main;
		796
655	BDB::db_get $DB, undef, $key, my $data;	797	BDB::db_get $DB, undef, $key, my $data;
656		798
657	$! ? ()	799	$! ? ()
658	: $data	800	: $data
659	}
660	}	801	}
661		802
662	sub db_put($$$) {	803	sub db_put($$$) {
663	BDB::dbreq_pri 4;	804	BDB::dbreq_pri 4;
664	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	805	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
692		833
693	my @data;	834	my @data;
694	my $md5;	835	my $md5;
695		836
696	for (0 .. $#$src) {	837	for (0 .. $#$src) {
697	0 <= aio_load $src->[$_], $data[$_]	838	$data[$_] = load_file $src->[$_];
698	or Carp::croak "$src->[$_]: $!";
699	}	839	}
700		840
701	# if processing is expensive, check	841	# if processing is expensive, check
702	# checksum first	842	# checksum first
703	if (1) {	843	if (1) {
…		…
720		860
721	my $t1 = Time::HiRes::time;	861	my $t1 = Time::HiRes::time;
722	my $data = $process->(\@data);	862	my $data = $process->(\@data);
723	my $t2 = Time::HiRes::time;	863	my $t2 = Time::HiRes::time;
724		864
725	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	865	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
726		866
727	db_put cache => "$id/data", $data;	867	db_put cache => "$id/data", $data;
728	db_put cache => "$id/md5" , $md5;	868	db_put cache => "$id/md5" , $md5;
729	db_put cache => "$id/meta", $meta;	869	db_put cache => "$id/meta", $meta;
730		870
…		…
740		880
741	=cut	881	=cut
742		882
743	sub datalog($@) {	883	sub datalog($@) {
744	my ($type, %kv) = @_;	884	my ($type, %kv) = @_;
745	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	885	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
746	}	886	}
747		887
748	=back	888	=back
749		889
750	=cut	890	=cut
…		…
945		1085
946	} elsif (exists $cb_id{$type}) {	1086	} elsif (exists $cb_id{$type}) {
947	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1087	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
948		1088
949	} elsif (ref $type) {	1089	} elsif (ref $type) {
950	warn "attaching objects not supported, ignoring.\n";	1090	error "attaching objects not supported, ignoring.\n";
951		1091
952	} else {	1092	} else {
953	shift @arg;	1093	shift @arg;
954	warn "attach argument '$type' not supported, ignoring.\n";	1094	error "attach argument '$type' not supported, ignoring.\n";
955	}	1095	}
956	}	1096	}
957	}	1097	}
958		1098
959	sub _object_attach {	1099	sub _object_attach {
…		…
969	_attach $registry, $klass, @attach;	1109	_attach $registry, $klass, @attach;
970	}	1110	}
971		1111
972	$obj->{$name} = \%arg;	1112	$obj->{$name} = \%arg;
973	} else {	1113	} else {
974	warn "object uses attachment '$name' which is not available, postponing.\n";	1114	info "object uses attachment '$name' which is not available, postponing.\n";
975	}	1115	}
976		1116
977	$obj->{_attachment}{$name} = undef;	1117	$obj->{_attachment}{$name} = undef;
978	}	1118	}
979		1119
…		…
1038		1178
1039	for (@$callbacks) {	1179	for (@$callbacks) {
1040	eval { &{$_->[1]} };	1180	eval { &{$_->[1]} };
1041		1181
1042	if ($@) {	1182	if ($@) {
1043	warn "$@";
1044	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1183	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1045	override;	1184	override;
1046	}	1185	}
1047		1186
1048	return 1 if $override;	1187	return 1 if $override;
1049	}	1188	}
…		…
1128	for (@$attach) {	1267	for (@$attach) {
1129	my ($klass, @attach) = @$_;	1268	my ($klass, @attach) = @$_;
1130	_attach $registry, $klass, @attach;	1269	_attach $registry, $klass, @attach;
1131	}	1270	}
1132	} else {	1271	} else {
1133	warn "object uses attachment '$name' that is not available, postponing.\n";	1272	info "object uses attachment '$name' that is not available, postponing.\n";
1134	}	1273	}
1135	}	1274	}
1136	}	1275	}
1137		1276
1138	cf::attachable->attach (	1277	cf::attachable->attach (
…		…
1165	my ($filename, $rdata, $objs) = @_;	1304	my ($filename, $rdata, $objs) = @_;
1166		1305
1167	sync_job {	1306	sync_job {
1168	if (length $$rdata) {	1307	if (length $$rdata) {
1169	utf8::decode (my $decname = $filename);	1308	utf8::decode (my $decname = $filename);
1170	warn sprintf "saving %s (%d,%d)\n",	1309	trace sprintf "saving %s (%d,%d)\n",
1171	$decname, length $$rdata, scalar @$objs;	1310	$decname, length $$rdata, scalar @$objs
		1311	if $VERBOSE_IO;
1172		1312
1173	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1313	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1174	aio_chmod $fh, SAVE_MODE;	1314	aio_chmod $fh, SAVE_MODE;
1175	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1315	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1176	if ($cf::USE_FSYNC) {	1316	if ($cf::USE_FSYNC) {
…		…
1198	aio_rename "$filename~", $filename;	1338	aio_rename "$filename~", $filename;
1199		1339
1200	$filename =~ s%/[^/]+$%%;	1340	$filename =~ s%/[^/]+$%%;
1201	aio_pathsync $filename if $cf::USE_FSYNC;	1341	aio_pathsync $filename if $cf::USE_FSYNC;
1202	} else {	1342	} else {
1203	warn "unable to save objects: $filename~: $!\n";	1343	error "unable to save objects: $filename~: $!\n";
1204	}	1344	}
1205	} else {	1345	} else {
1206	aio_unlink $filename;	1346	aio_unlink $filename;
1207	aio_unlink "$filename.pst";	1347	aio_unlink "$filename.pst";
1208	}	1348	}
…		…
1232	my $st = eval { Coro::Storable::thaw $av };	1372	my $st = eval { Coro::Storable::thaw $av };
1233	$av = $st->{objs};	1373	$av = $st->{objs};
1234	}	1374	}
1235		1375
1236	utf8::decode (my $decname = $filename);	1376	utf8::decode (my $decname = $filename);
1237	warn sprintf "loading %s (%d,%d)\n",	1377	trace sprintf "loading %s (%d,%d)\n",
1238	$decname, length $data, scalar @{$av || []};	1378	$decname, length $data, scalar @{$av || []}
		1379	if $VERBOSE_IO;
1239		1380
1240	($data, $av)	1381	($data, $av)
1241	}	1382	}
1242		1383
1243	=head2 COMMAND CALLBACKS	1384	=head2 COMMAND CALLBACKS
…		…
1302	}	1443	}
1303		1444
1304	use File::Glob ();	1445	use File::Glob ();
1305		1446
1306	cf::player->attach (	1447	cf::player->attach (
1307	on_command => sub {	1448	on_unknown_command => sub {
1308	my ($pl, $name, $params) = @_;	1449	my ($pl, $name, $params) = @_;
1309		1450
1310	my $cb = $COMMAND{$name}	1451	my $cb = $COMMAND{$name}
1311	or return;	1452	or return;
1312		1453
…		…
1320	my ($pl, $buf) = @_;	1461	my ($pl, $buf) = @_;
1321		1462
1322	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1463	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1323		1464
1324	if (ref $msg) {	1465	if (ref $msg) {
1325	my ($type, $reply, @payload) =	1466	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1326	"ARRAY" eq ref $msg
1327	? @$msg
1328	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1329		1467
1330	my @reply;	1468	my @reply;
1331		1469
1332	if (my $cb = $EXTCMD{$type}) {	1470	if (my $cb = $EXTCMD{$type}) {
1333	@reply = $cb->($pl, @payload);	1471	@reply = $cb->($pl, @payload);
…		…
1335		1473
1336	$pl->ext_reply ($reply, @reply)	1474	$pl->ext_reply ($reply, @reply)
1337	if $reply;	1475	if $reply;
1338		1476
1339	} else {	1477	} else {
1340	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1478	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1341	}	1479	}
1342		1480
1343	cf::override;	1481	cf::override;
1344	},	1482	},
1345	);	1483	);
…		…
1356		1494
1357	$grp	1495	$grp
1358	}	1496	}
1359		1497
1360	sub load_extensions {	1498	sub load_extensions {
		1499	info "loading extensions...";
		1500
1361	cf::sync_job {	1501	cf::sync_job {
1362	my %todo;	1502	my %todo;
1363		1503
1364	for my $path (<$LIBDIR/*.ext>) {	1504	for my $path (<$LIBDIR/*.ext>) {
1365	next unless -r $path;	1505	next unless -r $path;
…		…
1383		1523
1384	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1524	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1385	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1525	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1386		1526
1387	$ext{source} =	1527	$ext{source} =
1388	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1528	"package $pkg; use common::sense;\n"
1389	. "#line 1 \"$path\"\n{\n"	1529	. "#line 1 \"$path\"\n{\n"
1390	. $source	1530	. $source
1391	. "\n};\n1";	1531	. "\n};\n1";
1392		1532
1393	$todo{$base} = \%ext;	1533	$todo{$base} = \%ext;
1394	}	1534	}
1395		1535
		1536	my $pass = 0;
1396	my %done;	1537	my %done;
1397	while (%todo) {	1538	while (%todo) {
1398	my $progress;	1539	my $progress;
1399		1540
		1541	++$pass;
		1542
		1543	ext:
1400	while (my ($k, $v) = each %todo) {	1544	while (my ($k, $v) = each %todo) {
1401	for (split /,\s*/, $v->{meta}{depends}) {	1545	for (split /,\s*/, $v->{meta}{depends}) {
1402	goto skip	1546	next ext
1403	unless exists $done{$_};	1547	unless exists $done{$_};
1404	}	1548	}
1405		1549
1406	warn "... loading '$k' into '$v->{pkg}'\n";	1550	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1407		1551
1408	unless (eval $v->{source}) {	1552	my $active = eval $v->{source};
		1553
		1554	if (length $@) {
1409	my $msg = $@ ? "$v->{path}: $@\n"	1555	error "$v->{path}: $@\n";
1410	: "$v->{base}: extension inactive.\n";
1411		1556
1412	if (exists $v->{meta}{mandatory}) {
1413	warn $msg;
1414	cf::cleanup "mandatory extension failed to load, exiting.";	1557	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1415	}	1558	if exists $v->{meta}{mandatory};
1416		1559
1417	warn $msg;	1560	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1561	delete $todo{$k};
		1562	} else {
		1563	$done{$k} = delete $todo{$k};
		1564	push @EXTS, $v->{pkg};
		1565	$progress = 1;
		1566
		1567	info "$v->{base}: extension inactive.\n"
		1568	unless $active;
1418	}	1569	}
1419
1420	$done{$k} = delete $todo{$k};
1421	push @EXTS, $v->{pkg};
1422	$progress = 1;
1423	}	1570	}
1424		1571
1425	skip:	1572	unless ($progress) {
1426	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1573	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1427	unless $progress;	1574
		1575	while (my ($k, $v) = each %todo) {
		1576	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1577	if exists $v->{meta}{mandatory};
		1578	}
		1579
		1580	last;
		1581	}
1428	}	1582	}
1429	};	1583	};
1430	}	1584	}
1431		1585
1432	#############################################################################	1586	#############################################################################
…		…
1516	$cf::PLAYER{$login} = $pl	1670	$cf::PLAYER{$login} = $pl
1517	}	1671	}
1518	}	1672	}
1519	}	1673	}
1520		1674
		1675	cf::player->attach (
		1676	on_load => sub {
		1677	my ($pl, $path) = @_;
		1678
		1679	# restore slots saved in save, below
		1680	my $slots = delete $pl->{_slots};
		1681
		1682	$pl->ob->current_weapon ($slots->[0]);
		1683	$pl->combat_ob ($slots->[1]);
		1684	$pl->ranged_ob ($slots->[2]);
		1685	},
		1686	);
		1687
1521	sub save($) {	1688	sub save($) {
1522	my ($pl) = @_;	1689	my ($pl) = @_;
1523		1690
1524	return if $pl->{deny_save};	1691	return if $pl->{deny_save};
1525		1692
…		…
1530		1697
1531	aio_mkdir playerdir $pl, 0770;	1698	aio_mkdir playerdir $pl, 0770;
1532	$pl->{last_save} = $cf::RUNTIME;	1699	$pl->{last_save} = $cf::RUNTIME;
1533		1700
1534	cf::get_slot 0.01;	1701	cf::get_slot 0.01;
		1702
		1703	# save slots, to be restored later
		1704	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1535		1705
1536	$pl->save_pl ($path);	1706	$pl->save_pl ($path);
1537	cf::cede_to_tick;	1707	cf::cede_to_tick;
1538	}	1708	}
1539		1709
…		…
1573	my $name = $pl->ob->name;	1743	my $name = $pl->ob->name;
1574		1744
1575	$pl->{deny_save} = 1;	1745	$pl->{deny_save} = 1;
1576	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1746	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1577		1747
1578	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1748	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1579	$pl->deactivate;	1749	$pl->deactivate;
		1750
1580	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1751	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581	$pl->ob->check_score;
1582	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1752	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1753	ext::highscore::check ($pl->ob);
		1754
1583	$pl->ns->destroy if $pl->ns;	1755	$pl->ns->destroy if $pl->ns;
1584		1756
1585	my $path = playerdir $pl;	1757	my $path = playerdir $pl;
1586	my $temp = "$path~$cf::RUNTIME~deleting~";	1758	my $temp = "$path~$cf::RUNTIME~deleting~";
1587	aio_rename $path, $temp;	1759	aio_rename $path, $temp;
…		…
1641	\@logins	1813	\@logins
1642	}	1814	}
1643		1815
1644	=item $player->maps	1816	=item $player->maps
1645		1817
		1818	=item cf::player::maps $login
		1819
1646	Returns an arrayref of map paths that are private for this	1820	Returns an arrayref of map paths that are private for this
1647	player. May block.	1821	player. May block.
1648		1822
1649	=cut	1823	=cut
1650		1824
…		…
1712	=cut	1886	=cut
1713		1887
1714	sub find_by_path($) {	1888	sub find_by_path($) {
1715	my ($path) = @_;	1889	my ($path) = @_;
1716		1890
		1891	$path =~ s/^~[^\/]*//; # skip ~login
		1892
1717	my ($match, $specificity);	1893	my ($match, $specificity);
1718		1894
1719	for my $region (list) {	1895	for my $region (list) {
1720	if ($region->{match} && $path =~ $region->{match}) {	1896	if ($region->{match} && $path =~ $region->{match}) {
1721	($match, $specificity) = ($region, $region->specificity)	1897	($match, $specificity) = ($region, $region->specificity)
…		…
1749	sub generate_random_map {	1925	sub generate_random_map {
1750	my ($self, $rmp) = @_;	1926	my ($self, $rmp) = @_;
1751		1927
1752	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1928	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753		1929
1754	# mit "rum" bekleckern, nicht
1755	$self->_create_random_map (	1930	$self->_create_random_map ($rmp);
1756	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1757	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1758	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1759	$rmp->{exit_on_final_map},
1760	$rmp->{xsize}, $rmp->{ysize},
1761	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1762	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1763	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1764	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1765	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1766	(cf::region::find $rmp->{region}), $rmp->{custom}
1767	)
1768	}	1931	}
1769		1932
1770	=item cf::map->register ($regex, $prio)	1933	=item cf::map->register ($regex, $prio)
1771		1934
1772	Register a handler for the map path matching the given regex at the	1935	Register a handler for the map path matching the given regex at the
…		…
1777		1940
1778	sub register {	1941	sub register {
1779	my (undef, $regex, $prio) = @_;	1942	my (undef, $regex, $prio) = @_;
1780	my $pkg = caller;	1943	my $pkg = caller;
1781		1944
1782	no strict;
1783	push @{"$pkg\::ISA"}, __PACKAGE__;	1945	push @{"$pkg\::ISA"}, __PACKAGE__;
1784		1946
1785	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	1947	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1786	}	1948	}
1787		1949
1788	# also paths starting with '/'	1950	# also paths starting with '/'
1789	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	1951	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1790		1952
1791	sub thawer_merge {	1953	sub thawer_merge {
1792	my ($self, $merge) = @_;	1954	my ($self, $merge) = @_;
1793		1955
1794	# we have to keep some variables in memory intact	1956	# we have to keep some variables in memory intact
…		…
1799	}	1961	}
1800		1962
1801	sub normalise {	1963	sub normalise {
1802	my ($path, $base) = @_;	1964	my ($path, $base) = @_;
1803		1965
1804	$path = "$path"; # make sure its a string	1966	$path = "$path"; # make sure it's a string
1805		1967
1806	$path =~ s/\.map$//;	1968	$path =~ s/\.map$//;
1807		1969
1808	# map plan:	1970	# map plan:
1809	#	1971	#
…		…
1824	$base =~ s{[^/]+/?$}{};	1986	$base =~ s{[^/]+/?$}{};
1825	$path = "$base/$path";	1987	$path = "$base/$path";
1826	}	1988	}
1827		1989
1828	for ($path) {	1990	for ($path) {
1829	redo if s{//}{/};
1830	redo if s{/\.?/}{/};	1991	redo if s{/\.?/}{/};
1831	redo if s{/[^/]+/\.\./}{/};	1992	redo if s{/[^/]+/\.\./}{/};
1832	}	1993	}
1833		1994
1834	$path	1995	$path
…		…
1848	$self->init; # pass $1 etc.	2009	$self->init; # pass $1 etc.
1849	return $self;	2010	return $self;
1850	}	2011	}
1851	}	2012	}
1852		2013
1853	Carp::cluck "unable to resolve path '$path' (base '$base').";	2014	Carp::cluck "unable to resolve path '$path' (base '$base')";
1854	()	2015	()
1855	}	2016	}
1856		2017
		2018	# may re-bless or do other evil things
1857	sub init {	2019	sub init {
1858	my ($self) = @_;	2020	my ($self) = @_;
1859		2021
1860	$self	2022	$self
1861	}	2023	}
…		…
1926	$self->{load_path} = $path;	2088	$self->{load_path} = $path;
1927		2089
1928	1	2090	1
1929	}	2091	}
1930		2092
		2093	# used to laod the header of an original map
1931	sub load_header_orig {	2094	sub load_header_orig {
1932	my ($self) = @_;	2095	my ($self) = @_;
1933		2096
1934	$self->load_header_from ($self->load_path)	2097	$self->load_header_from ($self->load_path)
1935	}	2098	}
1936		2099
		2100	# used to laod the header of an instantiated map
1937	sub load_header_temp {	2101	sub load_header_temp {
1938	my ($self) = @_;	2102	my ($self) = @_;
1939		2103
1940	$self->load_header_from ($self->save_path)	2104	$self->load_header_from ($self->save_path)
1941	}	2105	}
1942		2106
		2107	# called after loading the header from an instantiated map
1943	sub prepare_temp {	2108	sub prepare_temp {
1944	my ($self) = @_;	2109	my ($self) = @_;
1945		2110
1946	$self->last_access ((delete $self->{last_access})	2111	$self->last_access ((delete $self->{last_access})
1947	|| $cf::RUNTIME); #d#	2112	|| $cf::RUNTIME); #d#
1948	# safety	2113	# safety
1949	$self->{instantiate_time} = $cf::RUNTIME	2114	$self->{instantiate_time} = $cf::RUNTIME
1950	if $self->{instantiate_time} > $cf::RUNTIME;	2115	if $self->{instantiate_time} > $cf::RUNTIME;
1951	}	2116	}
1952		2117
		2118	# called after loading the header from an original map
1953	sub prepare_orig {	2119	sub prepare_orig {
1954	my ($self) = @_;	2120	my ($self) = @_;
1955		2121
1956	$self->{load_original} = 1;	2122	$self->{load_original} = 1;
1957	$self->{instantiate_time} = $cf::RUNTIME;	2123	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1981		2147
1982	sub find;	2148	sub find;
1983	sub find {	2149	sub find {
1984	my ($path, $origin) = @_;	2150	my ($path, $origin) = @_;
1985		2151
		2152	cf::cede_to_tick;
		2153
1986	$path = normalise $path, $origin && $origin->path;	2154	$path = normalise $path, $origin;
1987		2155
1988	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2156	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1989	my $guard2 = cf::lock_acquire "map_find:$path";	2157	my $guard2 = cf::lock_acquire "map_find:$path";
1990		2158
1991	$cf::MAP{$path} || do {	2159	$cf::MAP{$path} || do {
…		…
2008		2176
2009	$cf::MAP{$path} = $map	2177	$cf::MAP{$path} = $map
2010	}	2178	}
2011	}	2179	}
2012		2180
2013	sub pre_load { }	2181	sub pre_load { }
2014	sub post_load { }	2182	#sub post_load { } # XS
2015		2183
2016	sub load {	2184	sub load {
2017	my ($self) = @_;	2185	my ($self) = @_;
2018		2186
2019	local $self->{deny_reset} = 1; # loading can take a long time	2187	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2022		2190
2023	{	2191	{
2024	my $guard = cf::lock_acquire "map_data:$path";	2192	my $guard = cf::lock_acquire "map_data:$path";
2025		2193
2026	return unless $self->valid;	2194	return unless $self->valid;
2027	return unless $self->in_memory == cf::MAP_SWAPPED;	2195	return unless $self->state == cf::MAP_SWAPPED;
2028
2029	$self->in_memory (cf::MAP_LOADING);
2030		2196
2031	$self->alloc;	2197	$self->alloc;
2032		2198
2033	$self->pre_load;	2199	$self->pre_load;
2034	cf::cede_to_tick;	2200	cf::cede_to_tick;
2035		2201
		2202	if (exists $self->{load_path}) {
2036	my $f = new_from_file cf::object::thawer $self->{load_path};	2203	my $f = new_from_file cf::object::thawer $self->{load_path};
2037	$f->skip_block;	2204	$f->skip_block;
2038	$self->_load_objects ($f)	2205	$self->_load_objects ($f)
2039	or return;	2206	or return;
2040		2207
2041	$self->post_load_original	2208	$self->post_load_original
2042	if delete $self->{load_original};	2209	if delete $self->{load_original};
2043		2210
2044	if (my $uniq = $self->uniq_path) {	2211	if (my $uniq = $self->uniq_path) {
2045	utf8::encode $uniq;	2212	utf8::encode $uniq;
2046	unless (aio_stat $uniq) {	2213	unless (aio_stat $uniq) {
2047	if (my $f = new_from_file cf::object::thawer $uniq) {	2214	if (my $f = new_from_file cf::object::thawer $uniq) {
2048	$self->clear_unique_items;	2215	$self->clear_unique_items;
2049	$self->_load_objects ($f);	2216	$self->_load_objects ($f);
2050	$f->resolve_delayed_derefs;	2217	$f->resolve_delayed_derefs;
		2218	}
2051	}	2219	}
2052	}	2220	}
2053	}
2054		2221
2055	$f->resolve_delayed_derefs;	2222	$f->resolve_delayed_derefs;
		2223	} else {
		2224	$self->post_load_original
		2225	if delete $self->{load_original};
		2226	}
		2227
		2228	$self->state (cf::MAP_INACTIVE);
2056		2229
2057	cf::cede_to_tick;	2230	cf::cede_to_tick;
2058	# now do the right thing for maps	2231	# now do the right thing for maps
2059	$self->link_multipart_objects;	2232	$self->link_multipart_objects;
2060	$self->difficulty ($self->estimate_difficulty)	2233	$self->difficulty ($self->estimate_difficulty)
…		…
2064	unless ($self->{deny_activate}) {	2237	unless ($self->{deny_activate}) {
2065	$self->decay_objects;	2238	$self->decay_objects;
2066	$self->fix_auto_apply;	2239	$self->fix_auto_apply;
2067	$self->update_buttons;	2240	$self->update_buttons;
2068	cf::cede_to_tick;	2241	cf::cede_to_tick;
2069	$self->activate;	2242	#$self->activate; # no longer activate maps automatically
2070	}	2243	}
2071		2244
2072	$self->{last_save} = $cf::RUNTIME;	2245	$self->{last_save} = $cf::RUNTIME;
2073	$self->last_access ($cf::RUNTIME);	2246	$self->last_access ($cf::RUNTIME);
2074
2075	$self->in_memory (cf::MAP_ACTIVE);
2076	}	2247	}
2077		2248
2078	$self->post_load;	2249	$self->post_load;
2079	}
2080		2250
		2251	1
		2252	}
		2253
		2254	# customize the map for a given player, i.e.
		2255	# return the _real_ map. used by e.g. per-player
		2256	# maps to change the path to ~playername/mappath
2081	sub customise_for {	2257	sub customise_for {
2082	my ($self, $ob) = @_;	2258	my ($self, $ob) = @_;
2083		2259
2084	return find "~" . $ob->name . "/" . $self->{path}	2260	return find "~" . $ob->name . "/" . $self->{path}
2085	if $self->per_player;	2261	if $self->per_player;
…		…
2088	# if $self->per_party;	2264	# if $self->per_party;
2089		2265
2090	$self	2266	$self
2091	}	2267	}
2092		2268
2093	# find and load all maps in the 3x3 area around a map
2094	sub load_neighbours {
2095	my ($map) = @_;
2096
2097	my @neigh; # diagonal neighbours
2098
2099	for (0 .. 3) {
2100	my $neigh = $map->tile_path ($_)
2101	or next;
2102	$neigh = find $neigh, $map
2103	or next;
2104	$neigh->load;
2105
2106	push @neigh,
2107	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2108	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2109	}
2110
2111	for (grep defined $_->[0], @neigh) {
2112	my ($path, $origin) = @$_;
2113	my $neigh = find $path, $origin
2114	or next;
2115	$neigh->load;
2116	}
2117	}
2118
2119	sub find_sync {	2269	sub find_sync {
2120	my ($path, $origin) = @_;	2270	my ($path, $origin) = @_;
2121		2271
2122	cf::sync_job { find $path, $origin }	2272	# it's a bug to call this from the main context
		2273	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2274	if $Coro::current == $Coro::main;
		2275
		2276	find $path, $origin
2123	}	2277	}
2124		2278
2125	sub do_load_sync {	2279	sub do_load_sync {
2126	my ($map) = @_;	2280	my ($map) = @_;
2127		2281
		2282	# it's a bug to call this from the main context
2128	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2283	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2129	if $Coro::current == $Coro::main;	2284	if $Coro::current == $Coro::main;
2130		2285
2131	cf::sync_job { $map->load };	2286	$map->load;
2132	}	2287	}
2133		2288
2134	our %MAP_PREFETCH;	2289	our %MAP_PREFETCH;
2135	our $MAP_PREFETCHER = undef;	2290	our $MAP_PREFETCHER = undef;
2136		2291
2137	sub find_async {	2292	sub find_async {
2138	my ($path, $origin, $load) = @_;	2293	my ($path, $origin, $load) = @_;
2139		2294
2140	$path = normalise $path, $origin && $origin->{path};	2295	$path = normalise $path, $origin;
2141		2296
2142	if (my $map = $cf::MAP{$path}) {	2297	if (my $map = $cf::MAP{$path}) {
2143	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2298	return $map if !$load || $map->linkable;
2144	}	2299	}
2145		2300
2146	$MAP_PREFETCH{$path} |= $load;	2301	$MAP_PREFETCH{$path} |= $load;
2147		2302
2148	$MAP_PREFETCHER ||= cf::async {	2303	$MAP_PREFETCHER ||= cf::async {
…		…
2162	$MAP_PREFETCHER->prio (6);	2317	$MAP_PREFETCHER->prio (6);
2163		2318
2164	()	2319	()
2165	}	2320	}
2166		2321
		2322	# common code, used by both ->save and ->swapout
2167	sub save {	2323	sub _save {
2168	my ($self) = @_;	2324	my ($self) = @_;
2169
2170	my $lock = cf::lock_acquire "map_data:$self->{path}";
2171		2325
2172	$self->{last_save} = $cf::RUNTIME;	2326	$self->{last_save} = $cf::RUNTIME;
2173		2327
2174	return unless $self->dirty;	2328	return unless $self->dirty;
2175		2329
…		…
2195	} else {	2349	} else {
2196	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2350	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2197	}	2351	}
2198	}	2352	}
2199		2353
		2354	sub save {
		2355	my ($self) = @_;
		2356
		2357	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2358
		2359	$self->_save;
		2360	}
		2361
2200	sub swap_out {	2362	sub swap_out {
2201	my ($self) = @_;	2363	my ($self) = @_;
2202		2364
2203	# save first because save cedes
2204	$self->save;
2205
2206	my $lock = cf::lock_acquire "map_data:$self->{path}";	2365	my $lock = cf::lock_acquire "map_data:$self->{path}";
2207		2366
		2367	return if !$self->linkable;
		2368	return if $self->{deny_save};
2208	return if $self->players;	2369	return if $self->players;
2209	return if $self->in_memory != cf::MAP_ACTIVE;	2370
		2371	# first deactivate the map and "unlink" it from the core
		2372	$self->deactivate;
		2373	$_->clear_links_to ($self) for values %cf::MAP;
		2374	$self->state (cf::MAP_SWAPPED);
		2375
		2376	# then atomically save
		2377	$self->_save;
		2378
		2379	# then free the map
		2380	$self->clear;
		2381	}
		2382
		2383	sub reset_at {
		2384	my ($self) = @_;
		2385
		2386	# TODO: safety, remove and allow resettable per-player maps
2210	return if $self->{deny_save};	2387	return 1e99 if $self->{deny_reset};
2211		2388
		2389	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2390	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2391
		2392	$time + $to
		2393	}
		2394
		2395	sub should_reset {
		2396	my ($self) = @_;
		2397
		2398	$self->reset_at <= $cf::RUNTIME
		2399	}
		2400
		2401	sub reset {
		2402	my ($self) = @_;
		2403
		2404	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2405
		2406	return if $self->players;
		2407
		2408	cf::trace "resetting map ", $self->path, "\n";
		2409
2212	$self->in_memory (cf::MAP_SWAPPED);	2410	$self->state (cf::MAP_SWAPPED);
		2411
		2412	# need to save uniques path
		2413	unless ($self->{deny_save}) {
		2414	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2415
		2416	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2417	if $uniq;
		2418	}
		2419
		2420	delete $cf::MAP{$self->path};
2213		2421
2214	$self->deactivate;	2422	$self->deactivate;
2215	$_->clear_links_to ($self) for values %cf::MAP;	2423	$_->clear_links_to ($self) for values %cf::MAP;
2216	$self->clear;	2424	$self->clear;
2217	}
2218
2219	sub reset_at {
2220	my ($self) = @_;
2221
2222	# TODO: safety, remove and allow resettable per-player maps
2223	return 1e99 if $self->{deny_reset};
2224
2225	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2226	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2227
2228	$time + $to
2229	}
2230
2231	sub should_reset {
2232	my ($self) = @_;
2233
2234	$self->reset_at <= $cf::RUNTIME
2235	}
2236
2237	sub reset {
2238	my ($self) = @_;
2239
2240	my $lock = cf::lock_acquire "map_data:$self->{path}";
2241
2242	return if $self->players;
2243
2244	warn "resetting map ", $self->path, "\n";
2245
2246	$self->in_memory (cf::MAP_SWAPPED);
2247
2248	# need to save uniques path
2249	unless ($self->{deny_save}) {
2250	my $uniq = $self->uniq_path; utf8::encode $uniq;
2251
2252	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2253	if $uniq;
2254	}
2255
2256	delete $cf::MAP{$self->path};
2257
2258	$self->deactivate;
2259	$_->clear_links_to ($self) for values %cf::MAP;
2260	$self->clear;
2261		2425
2262	$self->unlink_save;	2426	$self->unlink_save;
2263	$self->destroy;	2427	$self->destroy;
2264	}	2428	}
2265		2429
…		…
2273		2437
2274	delete $cf::MAP{$self->path};	2438	delete $cf::MAP{$self->path};
2275		2439
2276	$self->unlink_save;	2440	$self->unlink_save;
2277		2441
2278	bless $self, "cf::map";	2442	bless $self, "cf::map::wrap";
2279	delete $self->{deny_reset};	2443	delete $self->{deny_reset};
2280	$self->{deny_save} = 1;	2444	$self->{deny_save} = 1;
2281	$self->reset_timeout (1);	2445	$self->reset_timeout (1);
2282	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2446	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2283		2447
…		…
2340	: normalise $_	2504	: normalise $_
2341	} @{ aio_readdir $UNIQUEDIR or [] }	2505	} @{ aio_readdir $UNIQUEDIR or [] }
2342	]	2506	]
2343	}	2507	}
2344		2508
		2509	=item cf::map::static_maps
		2510
		2511	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2512	file in the shared directory excluding F</styles> and F</editor>). May
		2513	block.
		2514
		2515	=cut
		2516
		2517	sub static_maps() {
		2518	my @dirs = "";
		2519	my @maps;
		2520
		2521	while (@dirs) {
		2522	my $dir = shift @dirs;
		2523
		2524	next if $dir eq "/styles" || $dir eq "/editor";
		2525
		2526	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2527	or return;
		2528
		2529	for (@$files) {
		2530	s/\.map$// or next;
		2531	utf8::decode $_;
		2532	push @maps, "$dir/$_";
		2533	}
		2534
		2535	push @dirs, map "$dir/$_", @$dirs;
		2536	}
		2537
		2538	\@maps
		2539	}
		2540
2345	=back	2541	=back
2346		2542
2347	=head3 cf::object	2543	=head3 cf::object
2348		2544
2349	=cut	2545	=cut
…		…
2481		2677
2482	Freezes the player and moves him/her to a special map (C<{link}>).	2678	Freezes the player and moves him/her to a special map (C<{link}>).
2483		2679
2484	The player should be reasonably safe there for short amounts of time (e.g.	2680	The player should be reasonably safe there for short amounts of time (e.g.
2485	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2681	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486	though, as the palyer cannot control the character while it is on the link	2682	though, as the player cannot control the character while it is on the link
2487	map.	2683	map.
2488		2684
2489	Will never block.	2685	Will never block.
2490		2686
2491	=item $player_object->leave_link ($map, $x, $y)	2687	=item $player_object->leave_link ($map, $x, $y)
…		…
2512	sub cf::object::player::enter_link {	2708	sub cf::object::player::enter_link {
2513	my ($self) = @_;	2709	my ($self) = @_;
2514		2710
2515	$self->deactivate_recursive;	2711	$self->deactivate_recursive;
2516		2712
		2713	++$self->{_link_recursion};
		2714
2517	return if UNIVERSAL::isa $self->map, "ext::map_link";	2715	return if UNIVERSAL::isa $self->map, "ext::map_link";
2518		2716
2519	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2717	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2520	if $self->map && $self->map->{path} ne "{link}";	2718	if $self->map && $self->map->{path} ne "{link}";
2521		2719
2522	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2720	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2523	}	2721	}
2524		2722
2525	sub cf::object::player::leave_link {	2723	sub cf::object::player::leave_link {
2526	my ($self, $map, $x, $y) = @_;	2724	my ($self, $map, $x, $y) = @_;
2527		2725
…		…
2544	($x, $y) = (-1, -1)	2742	($x, $y) = (-1, -1)
2545	unless (defined $x) && (defined $y);	2743	unless (defined $x) && (defined $y);
2546		2744
2547	# use -1 or undef as default coordinates, not 0, 0	2745	# use -1 or undef as default coordinates, not 0, 0
2548	($x, $y) = ($map->enter_x, $map->enter_y)	2746	($x, $y) = ($map->enter_x, $map->enter_y)
2549	if $x <=0 && $y <= 0;	2747	if $x <= 0 && $y <= 0;
2550		2748
2551	$map->load;	2749	$map->load;
2552	$map->load_neighbours;
2553		2750
2554	return unless $self->contr->active;	2751	return unless $self->contr->active;
2555		2752
2556	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2753	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2557	$self->enter_map ($map, $x, $y);	2754	if ($self->enter_map ($map, $x, $y)) {
2558		2755	# entering was successful
		2756	delete $self->{_link_recursion};
2559	# only activate afterwards, to support waiting in hooks	2757	# only activate afterwards, to support waiting in hooks
2560	$self->activate_recursive;	2758	$self->activate_recursive;
2561	}	2759	}
2562		2760
		2761	}
		2762
2563	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2763	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2564		2764
2565	Moves the player to the given map-path and coordinates by first freezing	2765	Moves the player to the given map-path and coordinates by first freezing
2566	her, loading and preparing them map, calling the provided $check callback	2766	her, loading and preparing them map, calling the provided $check callback
2567	that has to return the map if sucecssful, and then unfreezes the player on	2767	that has to return the map if sucecssful, and then unfreezes the player on
2568	the new (success) or old (failed) map position. In either case, $done will	2768	the new (success) or old (failed) map position. In either case, $done will
…		…
2575		2775
2576	our $GOTOGEN;	2776	our $GOTOGEN;
2577		2777
2578	sub cf::object::player::goto {	2778	sub cf::object::player::goto {
2579	my ($self, $path, $x, $y, $check, $done) = @_;	2779	my ($self, $path, $x, $y, $check, $done) = @_;
		2780
		2781	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2782	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2783	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2784	($path, $x, $y) = @$EMERGENCY_POSITION;
		2785	}
2580		2786
2581	# do generation counting so two concurrent goto's will be executed in-order	2787	# do generation counting so two concurrent goto's will be executed in-order
2582	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2788	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2583		2789
2584	$self->enter_link;	2790	$self->enter_link;
…		…
2604	($path, $x, $y) = (undef, undef, undef);	2810	($path, $x, $y) = (undef, undef, undef);
2605	}	2811	}
2606	}	2812	}
2607		2813
2608	my $map = eval {	2814	my $map = eval {
2609	my $map = defined $path ? cf::map::find $path : undef;	2815	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2610		2816
2611	if ($map) {	2817	if ($map) {
2612	$map = $map->customise_for ($self);	2818	$map = $map->customise_for ($self);
2613	$map = $check->($map) if $check && $map;	2819	$map = $check->($map, $x, $y, $self) if $check && $map;
2614	} else {	2820	} else {
2615	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2821	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2616	}	2822	}
2617		2823
2618	$map	2824	$map
…		…
2626	if ($gen == $self->{_goto_generation}) {	2832	if ($gen == $self->{_goto_generation}) {
2627	delete $self->{_goto_generation};	2833	delete $self->{_goto_generation};
2628	$self->leave_link ($map, $x, $y);	2834	$self->leave_link ($map, $x, $y);
2629	}	2835	}
2630		2836
2631	$done->() if $done;	2837	$done->($self) if $done;
2632	})->prio (1);	2838	})->prio (1);
2633	}	2839	}
2634		2840
2635	=item $player_object->enter_exit ($exit_object)	2841	=item $player_object->enter_exit ($exit_object)
2636		2842
…		…
2704	$Coro::current->{desc} = "enter_exit";	2910	$Coro::current->{desc} = "enter_exit";
2705		2911
2706	unless (eval {	2912	unless (eval {
2707	$self->deactivate_recursive; # just to be sure	2913	$self->deactivate_recursive; # just to be sure
2708		2914
2709	# random map handling
2710	{
2711	my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713	prepare_random_map $exit
2714	if $exit->slaying eq "/!";
2715	}
2716
2717	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2915	my $map = cf::map::normalise $exit->slaying, $exit->map;
2718	my $x = $exit->stats->hp;	2916	my $x = $exit->stats->hp;
2719	my $y = $exit->stats->sp;	2917	my $y = $exit->stats->sp;
		2918
		2919	# special map handling
		2920	my $slaying = $exit->slaying;
		2921
		2922	# special map handling
		2923	if ($slaying eq "/!") {
		2924	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2925
		2926	prepare_random_map $exit
		2927	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2928
		2929	$map = $exit->slaying;
		2930
		2931	} elsif ($slaying eq '!up') {
		2932	$map = $exit->map->tile_path (cf::TILE_UP);
		2933	$x = $exit->x;
		2934	$y = $exit->y;
		2935
		2936	} elsif ($slaying eq '!down') {
		2937	$map = $exit->map->tile_path (cf::TILE_DOWN);
		2938	$x = $exit->x;
		2939	$y = $exit->y;
		2940	}
2720		2941
2721	$self->goto ($map, $x, $y);	2942	$self->goto ($map, $x, $y);
2722		2943
2723	# if exit is damned, update players death & WoR home-position	2944	# if exit is damned, update players death & WoR home-position
2724	$self->contr->savebed ($map, $x, $y)	2945	$self->contr->savebed ($map, $x, $y)
…		…
2729	$self->message ("Something went wrong deep within the deliantra server. "	2950	$self->message ("Something went wrong deep within the deliantra server. "
2730	. "I'll try to bring you back to the map you were before. "	2951	. "I'll try to bring you back to the map you were before. "
2731	. "Please report this to the dungeon master!",	2952	. "Please report this to the dungeon master!",
2732	cf::NDI_UNIQUE | cf::NDI_RED);	2953	cf::NDI_UNIQUE | cf::NDI_RED);
2733		2954
2734	warn "ERROR in enter_exit: $@";	2955	error "ERROR in enter_exit: $@";
2735	$self->leave_link;	2956	$self->leave_link;
2736	}	2957	}
2737	})->prio (1);	2958	})->prio (1);
2738	}	2959	}
2739		2960
…		…
2751	sub cf::client::send_drawinfo {	2972	sub cf::client::send_drawinfo {
2752	my ($self, $text, $flags) = @_;	2973	my ($self, $text, $flags) = @_;
2753		2974
2754	utf8::encode $text;	2975	utf8::encode $text;
2755	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	2976	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		2977	}
		2978
		2979	=item $client->send_big_packet ($pkt)
		2980
		2981	Like C<send_packet>, but tries to compress large packets, and fragments
		2982	them as required.
		2983
		2984	=cut
		2985
		2986	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		2987
		2988	sub cf::client::send_big_packet {
		2989	my ($self, $pkt) = @_;
		2990
		2991	# try lzf for large packets
		2992	$pkt = "lzf " . Compress::LZF::compress $pkt
		2993	if 1024 <= length $pkt and $self->{can_lzf};
		2994
		2995	# split very large packets
		2996	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		2997	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		2998	$pkt = "frag";
		2999	}
		3000
		3001	$self->send_packet ($pkt);
2756	}	3002	}
2757		3003
2758	=item $client->send_msg ($channel, $msg, $color, [extra...])	3004	=item $client->send_msg ($channel, $msg, $color, [extra...])
2759		3005
2760	Send a drawinfo or msg packet to the client, formatting the msg for the	3006	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2764		3010
2765	=cut	3011	=cut
2766		3012
2767	# non-persistent channels (usually the info channel)	3013	# non-persistent channels (usually the info channel)
2768	our %CHANNEL = (	3014	our %CHANNEL = (
		3015	"c/motd" => {
		3016	id => "infobox",
		3017	title => "MOTD",
		3018	reply => undef,
		3019	tooltip => "The message of the day",
		3020	},
2769	"c/identify" => {	3021	"c/identify" => {
2770	id => "infobox",	3022	id => "infobox",
2771	title => "Identify",	3023	title => "Identify",
2772	reply => undef,	3024	reply => undef,
2773	tooltip => "Items recently identified",	3025	tooltip => "Items recently identified",
…		…
2775	"c/examine" => {	3027	"c/examine" => {
2776	id => "infobox",	3028	id => "infobox",
2777	title => "Examine",	3029	title => "Examine",
2778	reply => undef,	3030	reply => undef,
2779	tooltip => "Signs and other items you examined",	3031	tooltip => "Signs and other items you examined",
		3032	},
		3033	"c/shopinfo" => {
		3034	id => "infobox",
		3035	title => "Shop Info",
		3036	reply => undef,
		3037	tooltip => "What your bargaining skill tells you about the shop",
2780	},	3038	},
2781	"c/book" => {	3039	"c/book" => {
2782	id => "infobox",	3040	id => "infobox",
2783	title => "Book",	3041	title => "Book",
2784	reply => undef,	3042	reply => undef,
…		…
2900	my $pkt = "msg "	3158	my $pkt = "msg "
2901	. $self->{json_coder}->encode (	3159	. $self->{json_coder}->encode (
2902	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3160	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2903	);	3161	);
2904		3162
2905	# try lzf for large packets
2906	$pkt = "lzf " . Compress::LZF::compress $pkt
2907	if 1024 <= length $pkt and $self->{can_lzf};
2908
2909	# split very large packets
2910	if (8192 < length $pkt and $self->{can_lzf}) {
2911	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2912	$pkt = "frag";
2913	}
2914
2915	$self->send_packet ($pkt);	3163	$self->send_big_packet ($pkt);
2916	}	3164	}
2917		3165
2918	=item $client->ext_msg ($type, @msg)	3166	=item $client->ext_msg ($type, @msg)
2919		3167
2920	Sends an ext event to the client.	3168	Sends an ext event to the client.
…		…
2923		3171
2924	sub cf::client::ext_msg($$@) {	3172	sub cf::client::ext_msg($$@) {
2925	my ($self, $type, @msg) = @_;	3173	my ($self, $type, @msg) = @_;
2926		3174
2927	if ($self->extcmd == 2) {	3175	if ($self->extcmd == 2) {
2928	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3176	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2929	} elsif ($self->extcmd == 1) { # TODO: remove	3177	} elsif ($self->extcmd == 1) { # TODO: remove
2930	push @msg, msgtype => "event_$type";	3178	push @msg, msgtype => "event_$type";
2931	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));	3179	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2932	}	3180	}
2933	}	3181	}
2934		3182
2935	=item $client->ext_reply ($msgid, @msg)	3183	=item $client->ext_reply ($msgid, @msg)
2936		3184
…		…
2939	=cut	3187	=cut
2940		3188
2941	sub cf::client::ext_reply($$@) {	3189	sub cf::client::ext_reply($$@) {
2942	my ($self, $id, @msg) = @_;	3190	my ($self, $id, @msg) = @_;
2943		3191
2944	if ($self->extcmd == 2) {	3192	return unless $self->extcmd == 2;
		3193
2945	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3194	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2946	} elsif ($self->extcmd == 1) {
2947	#TODO: version 1, remove
2948	unshift @msg, msgtype => "reply", msgid => $id;
2949	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2950	}
2951	}	3195	}
2952		3196
2953	=item $success = $client->query ($flags, "text", \&cb)	3197	=item $success = $client->query ($flags, "text", \&cb)
2954		3198
2955	Queues a query to the client, calling the given callback with	3199	Queues a query to the client, calling the given callback with
…		…
3010	my ($ns, $buf) = @_;	3254	my ($ns, $buf) = @_;
3011		3255
3012	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3256	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3013		3257
3014	if (ref $msg) {	3258	if (ref $msg) {
3015	my ($type, $reply, @payload) =	3259	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3016	"ARRAY" eq ref $msg
3017	? @$msg
3018	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3019		3260
3020	my @reply;	3261	my @reply;
3021		3262
3022	if (my $cb = $EXTICMD{$type}) {	3263	if (my $cb = $EXTICMD{$type}) {
3023	@reply = $cb->($ns, @payload);	3264	@reply = $cb->($ns, @payload);
…		…
3025		3266
3026	$ns->ext_reply ($reply, @reply)	3267	$ns->ext_reply ($reply, @reply)
3027	if $reply;	3268	if $reply;
3028		3269
3029	} else {	3270	} else {
3030	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3271	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3031	}	3272	}
3032		3273
3033	cf::override;	3274	cf::override;
3034	},	3275	},
3035	);	3276	);
…		…
3055		3296
3056	$coro	3297	$coro
3057	}	3298	}
3058		3299
3059	cf::client->attach (	3300	cf::client->attach (
3060	on_destroy => sub {	3301	on_client_destroy => sub {
3061	my ($ns) = @_;	3302	my ($ns) = @_;
3062		3303
3063	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3304	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3064	},	3305	},
3065	);	3306	);
…		…
3081	our $safe_hole = new Safe::Hole;	3322	our $safe_hole = new Safe::Hole;
3082		3323
3083	$SIG{FPE} = 'IGNORE';	3324	$SIG{FPE} = 'IGNORE';
3084		3325
3085	$safe->permit_only (Opcode::opset qw(	3326	$safe->permit_only (Opcode::opset qw(
3086	:base_core :base_mem :base_orig :base_math	3327	:base_core :base_mem :base_orig :base_math :base_loop
3087	grepstart grepwhile mapstart mapwhile	3328	grepstart grepwhile mapstart mapwhile
3088	sort time	3329	sort time
3089	));	3330	));
3090		3331
3091	# here we export the classes and methods available to script code	3332	# here we export the classes and methods available to script code
…		…
3116	decrease split destroy change_exp value msg lore send_msg)],	3357	decrease split destroy change_exp value msg lore send_msg)],
3117	["cf::object::player" => qw(player)],	3358	["cf::object::player" => qw(player)],
3118	["cf::player" => qw(peaceful send_msg)],	3359	["cf::player" => qw(peaceful send_msg)],
3119	["cf::map" => qw(trigger)],	3360	["cf::map" => qw(trigger)],
3120	) {	3361	) {
3121	no strict 'refs';
3122	my ($pkg, @funs) = @$_;	3362	my ($pkg, @funs) = @$_;
3123	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3363	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3124	for @funs;	3364	for @funs;
3125	}	3365	}
3126		3366
…		…
3143	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3383	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3144	$qcode =~ s/\n/\\n/g;	3384	$qcode =~ s/\n/\\n/g;
3145		3385
3146	%vars = (_dummy => 0) unless %vars;	3386	%vars = (_dummy => 0) unless %vars;
3147		3387
		3388	my @res;
3148	local $_;	3389	local $_;
3149	local @safe::cf::_safe_eval_args = values %vars;
3150		3390
3151	my $eval =	3391	my $eval =
3152	"do {\n"	3392	"do {\n"
3153	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3393	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3154	. "#line 0 \"{$qcode}\"\n"	3394	. "#line 0 \"{$qcode}\"\n"
3155	. $code	3395	. $code
3156	. "\n}"	3396	. "\n}"
3157	;	3397	;
3158		3398
		3399	if ($CFG{safe_eval}) {
3159	sub_generation_inc;	3400	sub_generation_inc;
		3401	local @safe::cf::_safe_eval_args = values %vars;
3160	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3402	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3161	sub_generation_inc;	3403	sub_generation_inc;
		3404	} else {
		3405	local @cf::_safe_eval_args = values %vars;
		3406	@res = wantarray ? eval eval : scalar eval $eval;
		3407	}
3162		3408
3163	if ($@) {	3409	if ($@) {
3164	warn "$@";	3410	warn "$@",
3165	warn "while executing safe code '$code'\n";	3411	"while executing safe code '$code'\n",
3166	warn "with arguments " . (join " ", %vars) . "\n";	3412	"with arguments " . (join " ", %vars) . "\n";
3167	}	3413	}
3168		3414
3169	wantarray ? @res : $res[0]	3415	wantarray ? @res : $res[0]
3170	}	3416	}
3171		3417
…		…
3185	=cut	3431	=cut
3186		3432
3187	sub register_script_function {	3433	sub register_script_function {
3188	my ($fun, $cb) = @_;	3434	my ($fun, $cb) = @_;
3189		3435
3190	no strict 'refs';	3436	$fun = "safe::$fun" if $CFG{safe_eval};
3191	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3437	*$fun = $safe_hole->wrap ($cb);
3192	}	3438	}
3193		3439
3194	=back	3440	=back
3195		3441
3196	=cut	3442	=cut
…		…
3205	# for this (global event?)	3451	# for this (global event?)
3206	%ext::player_env::MUSIC_FACE_CACHE = ();	3452	%ext::player_env::MUSIC_FACE_CACHE = ();
3207		3453
3208	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3454	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3209		3455
3210	warn "loading facedata from $path\n";	3456	trace "loading facedata from $path\n";
3211		3457
3212	my $facedata;	3458	my $facedata = decode_storable load_file $path;
3213	0 < aio_load $path, $facedata
3214	or die "$path: $!";
3215
3216	$facedata = Coro::Storable::thaw $facedata;
3217		3459
3218	$facedata->{version} == 2	3460	$facedata->{version} == 2
3219	or cf::cleanup "$path: version mismatch, cannot proceed.";	3461	or cf::cleanup "$path: version mismatch, cannot proceed.";
3220		3462
3221	# patch in the exptable	3463	# patch in the exptable
		3464	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3222	$facedata->{resource}{"res/exp_table"} = {	3465	$facedata->{resource}{"res/exp_table"} = {
3223	type => FT_RSRC,	3466	type => FT_RSRC,
3224	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3467	data => $exp_table,
		3468	hash => (Digest::MD5::md5 $exp_table),
3225	};	3469	};
3226	cf::cede_to_tick;	3470	cf::cede_to_tick;
3227		3471
3228	{	3472	{
3229	my $faces = $facedata->{faceinfo};	3473	my $faces = $facedata->{faceinfo};
…		…
3231	while (my ($face, $info) = each %$faces) {	3475	while (my ($face, $info) = each %$faces) {
3232	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3476	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3233		3477
3234	cf::face::set_visibility $idx, $info->{visibility};	3478	cf::face::set_visibility $idx, $info->{visibility};
3235	cf::face::set_magicmap $idx, $info->{magicmap};	3479	cf::face::set_magicmap $idx, $info->{magicmap};
3236	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3480	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3237	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3481	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3482	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
3238		3483
3239	cf::cede_to_tick;	3484	cf::cede_to_tick;
3240	}	3485	}
3241		3486
3242	while (my ($face, $info) = each %$faces) {	3487	while (my ($face, $info) = each %$faces) {
…		…
3247		3492
3248	if (my $smooth = cf::face::find $info->{smooth}) {	3493	if (my $smooth = cf::face::find $info->{smooth}) {
3249	cf::face::set_smooth $idx, $smooth;	3494	cf::face::set_smooth $idx, $smooth;
3250	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3495	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3251	} else {	3496	} else {
3252	warn "smooth face '$info->{smooth}' not found for face '$face'";	3497	error "smooth face '$info->{smooth}' not found for face '$face'";
3253	}	3498	}
3254		3499
3255	cf::cede_to_tick;	3500	cf::cede_to_tick;
3256	}	3501	}
3257	}	3502	}
…		…
3266		3511
3267	cf::anim::invalidate_all; # d'oh	3512	cf::anim::invalidate_all; # d'oh
3268	}	3513	}
3269		3514
3270	{	3515	{
3271	# TODO: for gcfclient pleasure, we should give resources
3272	# that gcfclient doesn't grok a >10000 face index.
3273	my $res = $facedata->{resource};	3516	my $res = $facedata->{resource};
3274		3517
3275	while (my ($name, $info) = each %$res) {	3518	while (my ($name, $info) = each %$res) {
3276	if (defined $info->{type}) {	3519	if (defined $info->{type}) {
3277	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3520	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3278	my $data;
3279		3521
3280	if ($info->{type} & 1) {	3522	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3281	# prepend meta info
3282
3283	my $meta = $enc->encode ({
3284	name => $name,
3285	%{ $info->{meta} || {} },
3286	});
3287
3288	$data = pack "(w/a*)*", $meta, $info->{data};
3289	} else {
3290	$data = $info->{data};
3291	}
3292
3293	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3294	cf::face::set_type $idx, $info->{type};	3523	cf::face::set_type $idx, $info->{type};
3295	} else {	3524	} else {
3296	$RESOURCE{$name} = $info;	3525	$RESOURCE{$name} = $info; # unused
3297	}	3526	}
3298		3527
3299	cf::cede_to_tick;	3528	cf::cede_to_tick;
3300	}	3529	}
3301	}	3530	}
3302		3531
3303	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3532	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3304		3533
3305	1	3534	1
3306	}	3535	}
3307
3308	cf::global->attach (on_resource_update => sub {
3309	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3310	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3311
3312	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3313	my $sound = $soundconf->{compat}[$_]
3314	or next;
3315
3316	my $face = cf::face::find "sound/$sound->[1]";
3317	cf::sound::set $sound->[0] => $face;
3318	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3319	}
3320
3321	while (my ($k, $v) = each %{$soundconf->{event}}) {
3322	my $face = cf::face::find "sound/$v";
3323	cf::sound::set $k => $face;
3324	}
3325	}
3326	});
3327		3536
3328	register_exticmd fx_want => sub {	3537	register_exticmd fx_want => sub {
3329	my ($ns, $want) = @_;	3538	my ($ns, $want) = @_;
3330		3539
3331	while (my ($k, $v) = each %$want) {	3540	while (my ($k, $v) = each %$want) {
…		…
3370	sub reload_treasures {	3579	sub reload_treasures {
3371	load_resource_file "$DATADIR/treasures"	3580	load_resource_file "$DATADIR/treasures"
3372	or die "unable to load treasurelists\n";	3581	or die "unable to load treasurelists\n";
3373	}	3582	}
3374		3583
		3584	sub reload_sound {
		3585	trace "loading sound config from $DATADIR/sound\n";
		3586
		3587	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3588
		3589	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3590	my $sound = $soundconf->{compat}[$_]
		3591	or next;
		3592
		3593	my $face = cf::face::find "sound/$sound->[1]";
		3594	cf::sound::set $sound->[0] => $face;
		3595	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3596	}
		3597
		3598	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3599	my $face = cf::face::find "sound/$v";
		3600	cf::sound::set $k => $face;
		3601	}
		3602	}
		3603
3375	sub reload_resources {	3604	sub reload_resources {
3376	warn "reloading resource files...\n";	3605	trace "reloading resource files...\n";
3377		3606
		3607	reload_exp_table;
		3608	reload_materials;
3378	reload_facedata;	3609	reload_facedata;
		3610	reload_sound;
3379	reload_archetypes;	3611	reload_archetypes;
3380	reload_regions;	3612	reload_regions;
3381	reload_treasures;	3613	reload_treasures;
3382		3614
3383	warn "finished reloading resource files\n";	3615	trace "finished reloading resource files\n";
3384	}	3616	}
3385		3617
3386	sub reload_config {	3618	sub reload_config {
3387	open my $fh, "<:utf8", "$CONFDIR/config"	3619	trace "reloading config file...\n";
3388	or return;
3389		3620
3390	local $/;	3621	my $config = load_file "$CONFDIR/config";
3391	*CFG = YAML::Load <$fh>;	3622	utf8::decode $config;
		3623	*CFG = decode_yaml $config;
3392		3624
3393	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3625	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3394		3626
3395	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3627	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3396	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3628	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3397		3629
3398	if (exists $CFG{mlockall}) {	3630	if (exists $CFG{mlockall}) {
…		…
3422	seek $fh, 0, 0;	3654	seek $fh, 0, 0;
3423	print $fh $$;	3655	print $fh $$;
3424	}	3656	}
3425		3657
3426	sub main_loop {	3658	sub main_loop {
3427	warn "EV::loop starting\n";	3659	trace "EV::loop starting\n";
3428	if (1) {	3660	if (1) {
3429	EV::loop;	3661	EV::loop;
3430	}	3662	}
3431	warn "EV::loop returned\n";	3663	trace "EV::loop returned\n";
3432	goto &main_loop unless $REALLY_UNLOOP;	3664	goto &main_loop unless $REALLY_UNLOOP;
3433	}	3665	}
3434		3666
3435	sub main {	3667	sub main {
3436	cf::init_globals; # initialise logging	3668	cf::init_globals; # initialise logging
3437		3669
3438	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3670	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3671	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3672	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3673	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443	cf::init_experience;
3444	cf::init_anim;
3445	cf::init_attackmess;
3446	cf::init_dynamic;
3447		3674
3448	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3675	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449		3676
3450	# we must not ever block the main coroutine	3677	# we must not ever block the main coroutine
3451	local $Coro::idle = sub {	3678	local $Coro::idle = sub {
…		…
3457	};	3684	};
3458		3685
3459	evthread_start IO::AIO::poll_fileno;	3686	evthread_start IO::AIO::poll_fileno;
3460		3687
3461	cf::sync_job {	3688	cf::sync_job {
		3689	cf::incloader::init ();
		3690
		3691	cf::init_anim;
		3692	cf::init_attackmess;
		3693	cf::init_dynamic;
		3694
		3695	cf::load_settings;
		3696
3462	reload_resources;	3697	reload_resources;
3463	reload_config;	3698	reload_config;
3464	db_init;	3699	db_init;
3465		3700
3466	cf::load_settings;
3467	cf::load_materials;
3468	cf::init_uuid;	3701	cf::init_uuid;
3469	cf::init_signals;	3702	cf::init_signals;
3470	cf::init_commands;
3471	cf::init_skills;	3703	cf::init_skills;
3472		3704
3473	cf::init_beforeplay;	3705	cf::init_beforeplay;
3474		3706
3475	atomic;	3707	atomic;
…		…
3480		3712
3481	# no (long-running) fork's whatsoever before this point(!)	3713	# no (long-running) fork's whatsoever before this point(!)
3482	use POSIX ();	3714	use POSIX ();
3483	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3715	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484		3716
3485	(pop @POST_INIT)->(0) while @POST_INIT;	3717	cf::_post_init 0;
3486	};	3718	};
3487		3719
		3720	cf::object::thawer::errors_are_fatal 0;
		3721	info "parse errors in files are no longer fatal from this point on.\n";
		3722
		3723	AE::postpone {
		3724	undef &main; # free gobs of memory :)
		3725	};
		3726
3488	main_loop;	3727	goto &main_loop;
3489	}	3728	}
3490		3729
3491	#############################################################################	3730	#############################################################################
3492	# initialisation and cleanup	3731	# initialisation and cleanup
3493		3732
3494	# install some emergency cleanup handlers	3733	# install some emergency cleanup handlers
3495	BEGIN {	3734	BEGIN {
3496	our %SIGWATCHER = ();	3735	our %SIGWATCHER = ();
3497	for my $signal (qw(INT HUP TERM)) {	3736	for my $signal (qw(INT HUP TERM)) {
3498	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3737	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3499	cf::cleanup "SIG$signal";	3738	cf::cleanup "SIG$signal";
3500	};	3739	};
3501	}	3740	}
3502	}	3741	}
3503		3742
3504	sub write_runtime_sync {	3743	sub write_runtime_sync {
		3744	my $t0 = AE::time;
		3745
3505	# first touch the runtime file to show we are still running:	3746	# first touch the runtime file to show we are still running:
3506	# the fsync below can take a very very long time.	3747	# the fsync below can take a very very long time.
3507		3748
3508	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3749	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3509		3750
3510	my $guard = cf::lock_acquire "write_runtime";	3751	my $guard = cf::lock_acquire "write_runtime";
3511		3752
3512	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3753	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3513	or return;	3754	or return;
3514		3755
3515	my $value = $cf::RUNTIME + 90 + 10;	3756	my $value = $cf::RUNTIME + 90 + 10;
3516	# 10 is the runtime save interval, for a monotonic clock	3757	# 10 is the runtime save interval, for a monotonic clock
3517	# 60 allows for the watchdog to kill the server.	3758	# 60 allows for the watchdog to kill the server.
…		…
3530	or return;	3771	or return;
3531		3772
3532	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3773	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3533	and return;	3774	and return;
3534		3775
3535	warn "runtime file written.\n";	3776	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3536		3777
3537	1	3778	1
3538	}	3779	}
3539		3780
3540	our $uuid_lock;	3781	our $uuid_lock;
…		…
3552	or return;	3793	or return;
3553		3794
3554	my $value = uuid_seq uuid_cur;	3795	my $value = uuid_seq uuid_cur;
3555		3796
3556	unless ($value) {	3797	unless ($value) {
3557	warn "cowardly refusing to write zero uuid value!\n";	3798	info "cowardly refusing to write zero uuid value!\n";
3558	return;	3799	return;
3559	}	3800	}
3560		3801
3561	my $value = uuid_str $value + $uuid_skip;	3802	my $value = uuid_str $value + $uuid_skip;
3562	$uuid_skip = 0;	3803	$uuid_skip = 0;
…		…
3572	or return;	3813	or return;
3573		3814
3574	aio_rename "$uuid~", $uuid	3815	aio_rename "$uuid~", $uuid
3575	and return;	3816	and return;
3576		3817
3577	warn "uuid file written ($value).\n";	3818	trace "uuid file written ($value).\n";
3578		3819
3579	1	3820	1
3580		3821
3581	}	3822	}
3582		3823
…		…
3588	}	3829	}
3589		3830
3590	sub emergency_save() {	3831	sub emergency_save() {
3591	my $freeze_guard = cf::freeze_mainloop;	3832	my $freeze_guard = cf::freeze_mainloop;
3592		3833
3593	warn "emergency_perl_save: enter\n";	3834	info "emergency_perl_save: enter\n";
		3835
		3836	# this is a trade-off: we want to be very quick here, so
		3837	# save all maps without fsync, and later call a global sync
		3838	# (which in turn might be very very slow)
		3839	local $USE_FSYNC = 0;
3594		3840
3595	cf::sync_job {	3841	cf::sync_job {
3596	# this is a trade-off: we want to be very quick here, so	3842	cf::write_runtime_sync; # external watchdog should not bark
3597	# save all maps without fsync, and later call a global sync
3598	# (which in turn might be very very slow)
3599	local $USE_FSYNC = 0;
3600		3843
3601	# use a peculiar iteration method to avoid tripping on perl	3844	# use a peculiar iteration method to avoid tripping on perl
3602	# refcount bugs in for. also avoids problems with players	3845	# refcount bugs in for. also avoids problems with players
3603	# and maps saved/destroyed asynchronously.	3846	# and maps saved/destroyed asynchronously.
3604	warn "emergency_perl_save: begin player save\n";	3847	info "emergency_perl_save: begin player save\n";
3605	for my $login (keys %cf::PLAYER) {	3848	for my $login (keys %cf::PLAYER) {
3606	my $pl = $cf::PLAYER{$login} or next;	3849	my $pl = $cf::PLAYER{$login} or next;
3607	$pl->valid or next;	3850	$pl->valid or next;
3608	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3851	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3609	$pl->save;	3852	$pl->save;
3610	}	3853	}
3611	warn "emergency_perl_save: end player save\n";	3854	info "emergency_perl_save: end player save\n";
3612		3855
		3856	cf::write_runtime_sync; # external watchdog should not bark
		3857
3613	warn "emergency_perl_save: begin map save\n";	3858	info "emergency_perl_save: begin map save\n";
3614	for my $path (keys %cf::MAP) {	3859	for my $path (keys %cf::MAP) {
3615	my $map = $cf::MAP{$path} or next;	3860	my $map = $cf::MAP{$path} or next;
3616	$map->valid or next;	3861	$map->valid or next;
3617	$map->save;	3862	$map->save;
3618	}	3863	}
3619	warn "emergency_perl_save: end map save\n";	3864	info "emergency_perl_save: end map save\n";
3620		3865
		3866	cf::write_runtime_sync; # external watchdog should not bark
		3867
3621	warn "emergency_perl_save: begin database checkpoint\n";	3868	info "emergency_perl_save: begin database checkpoint\n";
3622	BDB::db_env_txn_checkpoint $DB_ENV;	3869	BDB::db_env_txn_checkpoint $DB_ENV;
3623	warn "emergency_perl_save: end database checkpoint\n";	3870	info "emergency_perl_save: end database checkpoint\n";
3624		3871
3625	warn "emergency_perl_save: begin write uuid\n";	3872	info "emergency_perl_save: begin write uuid\n";
3626	write_uuid_sync 1;	3873	write_uuid_sync 1;
3627	warn "emergency_perl_save: end write uuid\n";	3874	info "emergency_perl_save: end write uuid\n";
		3875
		3876	cf::write_runtime_sync; # external watchdog should not bark
		3877
		3878	trace "emergency_perl_save: syncing database to disk";
		3879	BDB::db_env_txn_checkpoint $DB_ENV;
		3880
		3881	info "emergency_perl_save: starting sync\n";
		3882	IO::AIO::aio_sync sub {
		3883	info "emergency_perl_save: finished sync\n";
		3884	};
		3885
		3886	cf::write_runtime_sync; # external watchdog should not bark
		3887
		3888	trace "emergency_perl_save: flushing outstanding aio requests";
		3889	while (IO::AIO::nreqs || BDB::nreqs) {
		3890	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3891	}
		3892
		3893	cf::write_runtime_sync; # external watchdog should not bark
3628	};	3894	};
3629		3895
3630	warn "emergency_perl_save: starting sync()\n";
3631	IO::AIO::aio_sync sub {
3632	warn "emergency_perl_save: finished sync()\n";
3633	};
3634
3635	warn "emergency_perl_save: leave\n";	3896	info "emergency_perl_save: leave\n";
3636	}	3897	}
3637		3898
3638	sub post_cleanup {	3899	sub post_cleanup {
3639	my ($make_core) = @_;	3900	my ($make_core) = @_;
3640		3901
		3902	IO::AIO::flush;
		3903
3641	warn Carp::longmess "post_cleanup backtrace"	3904	error Carp::longmess "post_cleanup backtrace"
3642	if $make_core;	3905	if $make_core;
3643		3906
3644	my $fh = pidfile;	3907	my $fh = pidfile;
3645	unlink $PIDFILE if <$fh> == $$;	3908	unlink $PIDFILE if <$fh> == $$;
3646	}	3909	}
…		…
3666	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	3929	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667	for my $name (keys %$leaf_symtab) {	3930	for my $name (keys %$leaf_symtab) {
3668	_gv_clear *{"$pkg$name"};	3931	_gv_clear *{"$pkg$name"};
3669	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	3932	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670	}	3933	}
3671	warn "cleared package $pkg\n";#d#
3672	}	3934	}
3673		3935
3674	sub do_reload_perl() {	3936	sub do_reload_perl() {
3675	# can/must only be called in main	3937	# can/must only be called in main
3676	if ($Coro::current != $Coro::main) {	3938	unless (in_main) {
3677	warn "can only reload from main coroutine";	3939	error "can only reload from main coroutine";
3678	return;	3940	return;
3679	}	3941	}
3680		3942
3681	return if $RELOAD++;	3943	return if $RELOAD++;
3682		3944
3683	my $t1 = EV::time;	3945	my $t1 = AE::time;
3684		3946
3685	while ($RELOAD) {	3947	while ($RELOAD) {
3686	warn "reloading...";	3948	cf::get_slot 0.1, -1, "reload_perl";
		3949	info "perl_reload: reloading...";
3687		3950
3688	warn "entering sync_job";	3951	trace "perl_reload: entering sync_job";
3689		3952
3690	cf::sync_job {	3953	cf::sync_job {
3691	cf::write_runtime_sync; # external watchdog should not bark
3692	cf::emergency_save;	3954	#cf::emergency_save;
3693	cf::write_runtime_sync; # external watchdog should not bark
3694		3955
3695	warn "syncing database to disk";
3696	BDB::db_env_txn_checkpoint $DB_ENV;
3697
3698	# if anything goes wrong in here, we should simply crash as we already saved
3699
3700	warn "flushing outstanding aio requests";
3701	while (IO::AIO::nreqs || BDB::nreqs) {
3702	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3703	}
3704
3705	warn "cancelling all extension coros";	3956	trace "perl_reload: cancelling all extension coros";
3706	$_->cancel for values %EXT_CORO;	3957	$_->cancel for values %EXT_CORO;
3707	%EXT_CORO = ();	3958	%EXT_CORO = ();
3708		3959
3709	warn "removing commands";	3960	trace "perl_reload: removing commands";
3710	%COMMAND = ();	3961	%COMMAND = ();
3711		3962
3712	warn "removing ext/exti commands";	3963	trace "perl_reload: removing ext/exti commands";
3713	%EXTCMD = ();	3964	%EXTCMD = ();
3714	%EXTICMD = ();	3965	%EXTICMD = ();
3715		3966
3716	warn "unloading/nuking all extensions";	3967	trace "perl_reload: unloading/nuking all extensions";
3717	for my $pkg (@EXTS) {	3968	for my $pkg (@EXTS) {
3718	warn "... unloading $pkg";	3969	trace "... unloading $pkg";
3719		3970
3720	if (my $cb = $pkg->can ("unload")) {	3971	if (my $cb = $pkg->can ("unload")) {
3721	eval {	3972	eval {
3722	$cb->($pkg);	3973	$cb->($pkg);
3723	1	3974	1
3724	} or warn "$pkg unloaded, but with errors: $@";	3975	} or error "$pkg unloaded, but with errors: $@";
3725	}	3976	}
3726		3977
3727	warn "... clearing $pkg";	3978	trace "... clearing $pkg";
3728	clear_package $pkg;	3979	clear_package $pkg;
3729	}	3980	}
3730		3981
3731	warn "unloading all perl modules loaded from $LIBDIR";	3982	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3732	while (my ($k, $v) = each %INC) {	3983	while (my ($k, $v) = each %INC) {
3733	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	3984	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734		3985
3735	warn "... unloading $k";	3986	trace "... unloading $k";
3736	delete $INC{$k};	3987	delete $INC{$k};
3737		3988
3738	$k =~ s/\.pm$//;	3989	$k =~ s/\.pm$//;
3739	$k =~ s/\//::/g;	3990	$k =~ s/\//::/g;
3740		3991
…		…
3743	}	3994	}
3744		3995
3745	clear_package $k;	3996	clear_package $k;
3746	}	3997	}
3747		3998
3748	warn "getting rid of safe::, as good as possible";	3999	trace "perl_reload: getting rid of safe::, as good as possible";
3749	clear_package "safe::$_"	4000	clear_package "safe::$_"
3750	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4001	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3751		4002
3752	warn "unloading cf.pm \"a bit\"";	4003	trace "perl_reload: unloading cf.pm \"a bit\"";
3753	delete $INC{"cf.pm"};	4004	delete $INC{"cf.pm"};
3754	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4005	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3755		4006
3756	# don't, removes xs symbols, too,	4007	# don't, removes xs symbols, too,
3757	# and global variables created in xs	4008	# and global variables created in xs
3758	#clear_package __PACKAGE__;	4009	#clear_package __PACKAGE__;
3759		4010
3760	warn "unload completed, starting to reload now";	4011	info "perl_reload: unload completed, starting to reload now";
3761		4012
3762	warn "reloading cf.pm";	4013	trace "perl_reload: reloading cf.pm";
3763	require cf;	4014	require cf;
3764	cf::_connect_to_perl; # nominally unnecessary, but cannot hurt	4015	cf::_connect_to_perl_1;
3765		4016
3766	warn "loading config and database again";	4017	trace "perl_reload: loading config and database again";
3767	cf::reload_config;	4018	cf::reload_config;
3768		4019
3769	warn "loading extensions";	4020	trace "perl_reload: loading extensions";
3770	cf::load_extensions;	4021	cf::load_extensions;
3771		4022
3772	if ($REATTACH_ON_RELOAD) {	4023	if ($REATTACH_ON_RELOAD) {
3773	warn "reattaching attachments to objects/players";	4024	trace "perl_reload: reattaching attachments to objects/players";
3774	_global_reattach; # objects, sockets	4025	_global_reattach; # objects, sockets
3775	warn "reattaching attachments to maps";	4026	trace "perl_reload: reattaching attachments to maps";
3776	reattach $_ for values %MAP;	4027	reattach $_ for values %MAP;
3777	warn "reattaching attachments to players";	4028	trace "perl_reload: reattaching attachments to players";
3778	reattach $_ for values %PLAYER;	4029	reattach $_ for values %PLAYER;
3779	}	4030	}
3780		4031
3781	warn "running post_init jobs";	4032	cf::_post_init 1;
3782	(pop @POST_INIT)->(1) while @POST_INIT;
3783		4033
3784	warn "leaving sync_job";	4034	trace "perl_reload: leaving sync_job";
3785		4035
3786	1	4036	1
3787	} or do {	4037	} or do {
3788	warn $@;	4038	error $@;
3789	cf::cleanup "error while reloading, exiting.";	4039	cf::cleanup "perl_reload: error, exiting.";
3790	};	4040	};
3791		4041
3792	warn "reloaded";
3793	--$RELOAD;	4042	--$RELOAD;
3794	}	4043	}
3795		4044
3796	$t1 = EV::time - $t1;	4045	$t1 = AE::time - $t1;
3797	warn "reload completed in ${t1}s\n";	4046	info "perl_reload: completed in ${t1}s\n";
3798	};	4047	};
3799		4048
3800	our $RELOAD_WATCHER; # used only during reload	4049	our $RELOAD_WATCHER; # used only during reload
3801		4050
3802	sub reload_perl() {	4051	sub reload_perl() {
…		…
3804	# coro crashes during coro_state_free->destroy here.	4053	# coro crashes during coro_state_free->destroy here.
3805		4054
3806	$RELOAD_WATCHER ||= cf::async {	4055	$RELOAD_WATCHER ||= cf::async {
3807	Coro::AIO::aio_wait cache_extensions;	4056	Coro::AIO::aio_wait cache_extensions;
3808		4057
3809	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4058	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3810	do_reload_perl;	4059	do_reload_perl;
3811	undef $RELOAD_WATCHER;	4060	undef $RELOAD_WATCHER;
3812	};	4061	};
3813	};	4062	};
3814	}	4063	}
…		…
3823	reload_perl;	4072	reload_perl;
3824	};	4073	};
3825	}	4074	}
3826	};	4075	};
3827		4076
3828	unshift @INC, $LIBDIR;	4077	#############################################################################
3829		4078
3830	my $bug_warning = 0;	4079	my $bug_warning = 0;
3831		4080
3832	our @WAIT_FOR_TICK;
3833	our @WAIT_FOR_TICK_BEGIN;
3834
3835	sub wait_for_tick {	4081	sub wait_for_tick() {
3836	return if tick_inhibit || $Coro::current == $Coro::main;	4082	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3837		4083
3838	my $signal = new Coro::Signal;	4084	$WAIT_FOR_TICK->wait;
3839	push @WAIT_FOR_TICK, $signal;
3840	$signal->wait;
3841	}	4085	}
3842		4086
3843	sub wait_for_tick_begin {	4087	sub wait_for_tick_begin() {
3844	return if tick_inhibit || $Coro::current == $Coro::main;	4088	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3845		4089
3846	my $signal = new Coro::Signal;	4090	my $signal = new Coro::Signal;
3847	push @WAIT_FOR_TICK_BEGIN, $signal;	4091	push @WAIT_FOR_TICK_BEGIN, $signal;
3848	$signal->wait;	4092	$signal->wait;
3849	}	4093	}
…		…
3853	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4097	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3854	unless ++$bug_warning > 10;	4098	unless ++$bug_warning > 10;
3855	return;	4099	return;
3856	}	4100	}
3857		4101
3858	cf::server_tick; # one server iteration	4102	cf::one_tick; # one server iteration
		4103
		4104	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3859		4105
3860	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4106	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3861	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4107	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3862	Coro::async_pool {	4108	Coro::async_pool {
3863	$Coro::current->{desc} = "runtime saver";	4109	$Coro::current->{desc} = "runtime saver";
3864	write_runtime_sync	4110	write_runtime_sync
3865	or warn "ERROR: unable to write runtime file: $!";	4111	or error "ERROR: unable to write runtime file: $!";
3866	};	4112	};
3867	}	4113	}
3868		4114
3869	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4115	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3870	$sig->send;	4116	$sig->send;
3871	}	4117	}
3872	while (my $sig = shift @WAIT_FOR_TICK) {	4118	$WAIT_FOR_TICK->broadcast;
3873	$sig->send;
3874	}
3875		4119
3876	$LOAD = ($NOW - $TICK_START) / $TICK;	4120	$LOAD = ($NOW - $TICK_START) / $TICK;
3877	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4121	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3878		4122
3879	if (0) {	4123	if (0) {
3880	if ($NEXT_TICK) {	4124	if ($NEXT_TICK) {
3881	my $jitter = $TICK_START - $NEXT_TICK;	4125	my $jitter = $TICK_START - $NEXT_TICK;
3882	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4126	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3883	warn "jitter $JITTER\n";#d#	4127	debug "jitter $JITTER\n";#d#
3884	}	4128	}
3885	}	4129	}
3886	}	4130	}
3887		4131
3888	{	4132	{
3889	# configure BDB	4133	# configure BDB
3890		4134
3891	BDB::min_parallel 8;	4135	BDB::min_parallel 16;
3892	BDB::max_poll_reqs $TICK * 0.1;	4136	BDB::max_poll_reqs $TICK * 0.1;
3893	$AnyEvent::BDB::WATCHER->priority (1);	4137	#$AnyEvent::BDB::WATCHER->priority (1);
3894		4138
3895	unless ($DB_ENV) {	4139	unless ($DB_ENV) {
3896	$DB_ENV = BDB::db_env_create;	4140	$DB_ENV = BDB::db_env_create;
3897	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4141	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3898	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4142	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3933	IO::AIO::min_parallel 8;	4177	IO::AIO::min_parallel 8;
3934	IO::AIO::max_poll_time $TICK * 0.1;	4178	IO::AIO::max_poll_time $TICK * 0.1;
3935	undef $AnyEvent::AIO::WATCHER;	4179	undef $AnyEvent::AIO::WATCHER;
3936	}	4180	}
3937		4181
3938	my $_log_backtrace;	4182	our $_log_backtrace;
		4183	our $_log_backtrace_last;
3939		4184
3940	sub _log_backtrace {	4185	sub _log_backtrace {
3941	my ($msg, @addr) = @_;	4186	my ($msg, @addr) = @_;
3942		4187
3943	$msg =~ s/\n//;	4188	$msg =~ s/\n$//;
3944		4189
		4190	if ($_log_backtrace_last eq $msg) {
		4191	LOG llevInfo, "[ABT] $msg\n";
		4192	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3945	# limit the # of concurrent backtraces	4193	# limit the # of concurrent backtraces
3946	if ($_log_backtrace < 2) {	4194	} elsif ($_log_backtrace < 2) {
		4195	$_log_backtrace_last = $msg;
3947	++$_log_backtrace;	4196	++$_log_backtrace;
3948	my $perl_bt = Carp::longmess $msg;	4197	my $perl_bt = Carp::longmess $msg;
3949	async {	4198	async {
3950	$Coro::current->{desc} = "abt $msg";	4199	$Coro::current->{desc} = "abt $msg";
3951		4200
…		…
3971	LOG llevInfo, "[ABT] $_\n" for @bt;	4220	LOG llevInfo, "[ABT] $_\n" for @bt;
3972	--$_log_backtrace;	4221	--$_log_backtrace;
3973	};	4222	};
3974	} else {	4223	} else {
3975	LOG llevInfo, "[ABT] $msg\n";	4224	LOG llevInfo, "[ABT] $msg\n";
3976	LOG llevInfo, "[ABT] [suppressed]\n";	4225	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3977	}	4226	}
3978	}	4227	}
3979		4228
3980	# load additional modules	4229	# load additional modules
3981	require "cf/$_.pm" for @EXTRA_MODULES;	4230	require "cf/$_.pm" for @EXTRA_MODULES;
		4231	cf::_connect_to_perl_2;
3982		4232
3983	END { cf::emergency_save }	4233	END { cf::emergency_save }
3984		4234
3985	1	4235	1
3986		4236

Diff Legend

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