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.490 by root, Sat Oct 24 06:16:40 2009 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

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

Diff Legend

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