ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/lib/cf.pm

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.486 by root, Thu Oct 15 21:56:50 2009 UTC vs.
Revision 1.603 by root, Tue Nov 13 01:12:23 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;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
		119
		120	our $OUTPUT_RATE_MIN = 3000;
		121	our $OUTPUT_RATE_MAX = 1000000;
		122
		123	our $MAX_LINKS = 32; # how many chained exits to follow
		124	our $VERBOSE_IO = 1;
112		125
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	126	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	127	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	128	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	129	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	134	our $DB_ENV;
122		135
123	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		137
125	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		140
127	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
129	our $NOW;	144	our $NOW;
130		145
131	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		157
143	our @POST_INIT;	158	our @POST_INIT;
144		159
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
147		165
148	binmode STDOUT;	166	binmode STDOUT;
149	binmode STDERR;	167	binmode STDERR;
150		168
151	# read virtual server time, if available	169	# read virtual server time, if available
…		…
162		180
163	our $EMERGENCY_POSITION;	181	our $EMERGENCY_POSITION;
164		182
165	sub cf::map::normalise;	183	sub cf::map::normalise;
166		184
		185	sub in_main() {
		186	$Coro::current == $Coro::main
		187	}
		188
167	#############################################################################	189	#############################################################################
168		190
169	%REFLECT = ();	191	%REFLECT = ();
170	for (@REFLECT) {	192	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	193	my $reflect = JSON::XS::decode_json $_;
…		…
181		203
182	=over 4	204	=over 4
183		205
184	=item $cf::UPTIME	206	=item $cf::UPTIME
185		207
186	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
187		224
188	=item $cf::RUNTIME	225	=item $cf::RUNTIME
189		226
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	228	every server tick.
192		229
193	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
194	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
195	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
196		233
197	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
200	database environment.	237	database environment.
201		238
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	239	=item $cf::LOADAVG
211		240
212	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
222	Configuration for the server, loaded from C</etc/deliantra-server/config>, or	251	Configuration for the server, loaded from C</etc/deliantra-server/config>, or
223	from wherever your confdir points to.	252	from wherever your confdir points to.
224		253
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		255
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick.
228	returns directly I<after> the tick processing (and consequently, can only wake one process	257	cf::wait_for_tick_begin only returns directly I<after> the tick
		258	processing (and consequently, can only wake one thread per tick), while
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	259	cf::wait_for_tick wakes up all waiters after tick processing.
		260
		261	Note that cf::wait_for_tick will immediately return when the server is not
		262	ticking, making it suitable for small pauses in threads that need to run
		263	when the server is paused. If that is not applicable (i.e. you I<really>
		264	want to wait, use C<$cf::WAIT_FOR_TICK>).
		265
		266	=item $cf::WAIT_FOR_TICK
		267
		268	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		269	variable contains a L<Coro::Signal> that is broadcats after every server
		270	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		271	next server tick.
		272
		273	=cut
		274
		275	sub wait_for_tick();
		276	sub wait_for_tick_begin();
230		277
231	=item @cf::INVOKE_RESULTS	278	=item @cf::INVOKE_RESULTS
232		279
233	This array contains the results of the last C<invoke ()> call. When	280	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	281	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
235	that call.	282	that call.
236		283
237	=item %cf::REFLECT	284	=item %cf::REFLECT
238		285
…		…
242		289
243	=back	290	=back
244		291
245	=cut	292	=cut
246		293
		294	sub error(@) { LOG llevError, join "", @_ }
		295	sub warn (@) { LOG llevWarn , join "", @_ }
		296	sub info (@) { LOG llevInfo , join "", @_ }
		297	sub debug(@) { LOG llevDebug, join "", @_ }
		298	sub trace(@) { LOG llevTrace, join "", @_ }
		299
247	$Coro::State::WARNHOOK = sub {	300	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	301	my $msg = join "", @_;
249		302
250	$msg .= "\n"	303	$msg .= "\n"
251	unless $msg =~ /\n$/;	304	unless $msg =~ /\n$/;
252		305
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	306	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		307
255	LOG llevError, $msg;	308	LOG llevWarn, $msg;
256	};	309	};
257		310
258	$Coro::State::DIEHOOK = sub {	311	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	312	return unless $^S eq 0; # "eq", not "=="
260		313
261	warn Carp::longmess $_[0];	314	error Carp::longmess $_[0];
262		315
263	if ($Coro::current == $Coro::main) {#d#	316	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	317	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	318	return;#d#
266	}#d#	319	}#d#
267		320
268	# kill coroutine otherwise	321	# kill coroutine otherwise
269	Coro::terminate	322	Coro::terminate
…		…
289	)) {	342	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	343	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	344	}
292		345
293	$EV::DIED = sub {	346	$EV::DIED = sub {
294	warn "error in event callback: @_";	347	warn "error in event callback: $@";
295	};	348	};
		349
		350	#############################################################################
		351
		352	sub fork_call(&@);
		353	sub get_slot($;$$);
296		354
297	#############################################################################	355	#############################################################################
298		356
299	=head2 UTILITY FUNCTIONS	357	=head2 UTILITY FUNCTIONS
300		358
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	379	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	380	$d
323	} || "[unable to dump $_[0]: '$@']";	381	} || "[unable to dump $_[0]: '$@']";
324	}	382	}
325		383
		384	=item $scalar = cf::load_file $path
		385
		386	Loads the given file from path and returns its contents. Croaks on error
		387	and can block.
		388
		389	=cut
		390
		391	sub load_file($) {
		392	0 <= aio_load $_[0], my $data
		393	or Carp::croak "$_[0]: $!";
		394
		395	$data
		396	}
		397
		398	=item $success = cf::replace_file $path, $data, $sync
		399
		400	Atomically replaces the file at the given $path with new $data, and
		401	optionally $sync the data to disk before replacing the file.
		402
		403	=cut
		404
		405	sub replace_file($$;$) {
		406	my ($path, $data, $sync) = @_;
		407
		408	my $lock = cf::lock_acquire ("replace_file:$path");
		409
		410	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		411	or return;
		412
		413	$data = $data->() if ref $data;
		414
		415	length $data == aio_write $fh, 0, (length $data), $data, 0
		416	or return;
		417
		418	!$sync
		419	or !aio_fsync $fh
		420	or return;
		421
		422	aio_close $fh
		423	and return;
		424
		425	aio_rename "$path~", $path
		426	and return;
		427
		428	if ($sync) {
		429	$path =~ s%/[^/]*$%%;
		430	aio_pathsync $path;
		431	}
		432
		433	1
		434	}
		435
326	=item $ref = cf::decode_json $json	436	=item $ref = cf::decode_json $json
327		437
328	Converts a JSON string into the corresponding perl data structure.	438	Converts a JSON string into the corresponding perl data structure.
329		439
330	=item $json = cf::encode_json $ref	440	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	446	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		447
338	sub encode_json($) { $json_coder->encode ($_[0]) }	448	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	449	sub decode_json($) { $json_coder->decode ($_[0]) }
340		450
		451	=item $ref = cf::decode_storable $scalar
		452
		453	Same as Coro::Storable::thaw, so blocks.
		454
		455	=cut
		456
		457	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		458
		459	=item $ref = cf::decode_yaml $scalar
		460
		461	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		462
		463	=cut
		464
		465	sub decode_yaml($) {
		466	fork_call { YAML::XS::Load $_[0] } @_
		467	}
		468
		469	=item $scalar = cf::unlzf $scalar
		470
		471	Same as Compress::LZF::compress, but takes server ticks into account, so
		472	blocks.
		473
		474	=cut
		475
		476	sub unlzf($) {
		477	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		478	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		479	Compress::LZF::decompress $_[0]
		480	}
		481
341	=item cf::post_init { BLOCK }	482	=item cf::post_init { BLOCK }
342		483
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	484	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	485	but I<before> the server starts ticking again.
345		486
346	The cdoeblock will have a single boolean argument to indicate whether this	487	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	488	is a reload or not.
348		489
349	=cut	490	=cut
350		491
351	sub post_init(&) {	492	sub post_init(&) {
352	push @POST_INIT, shift;	493	push @POST_INIT, shift;
		494	}
		495
		496	sub _post_init {
		497	trace "running post_init jobs";
		498
		499	# run them in parallel...
		500
		501	my @join;
		502
		503	while () {
		504	push @join, map &Coro::async ($_, 0), @POST_INIT;
		505	@POST_INIT = ();
		506
		507	@join or last;
		508
		509	(pop @join)->join;
		510	}
353	}	511	}
354		512
355	=item cf::lock_wait $string	513	=item cf::lock_wait $string
356		514
357	Wait until the given lock is available. See cf::lock_acquire.	515	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	554	}
397		555
398	=item cf::periodic $interval, $cb	556	=item cf::periodic $interval, $cb
399		557
400	Like EV::periodic, but randomly selects a starting point so that the actions	558	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	559	get spread over time.
402		560
403	=cut	561	=cut
404		562
405	sub periodic($$) {	563	sub periodic($$) {
406	my ($interval, $cb) = @_;	564	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	568	EV::periodic $start, $interval, 0, $cb
411	}	569	}
412		570
413	=item cf::get_slot $time[, $priority[, $name]]	571	=item cf::get_slot $time[, $priority[, $name]]
414		572
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	573	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	574	(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.	575	C<$time> seconds of cpu time till the next tick. The slot is only valid
		576	till the next cede.
		577
		578	Background jobs should use a priority less than zero, interactive jobs
		579	should use 100 or more.
418		580
419	The optional C<$name> can be used to identify the job to run. It might be	581	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	582	used for statistical purposes and should identify the same time-class.
421		583
422	Useful for short background jobs.	584	Useful for short background jobs.
423		585
424	=cut	586	=cut
425		587
426	our @SLOT_QUEUE;	588	our @SLOT_QUEUE;
427	our $SLOT_QUEUE;	589	our $SLOT_QUEUE;
		590	our $SLOT_DECAY = 0.9;
428		591
429	$SLOT_QUEUE->cancel if $SLOT_QUEUE;	592	$SLOT_QUEUE->cancel if $SLOT_QUEUE;
430	$SLOT_QUEUE = Coro::async {	593	$SLOT_QUEUE = Coro::async {
431	$Coro::current->desc ("timeslot manager");	594	$Coro::current->desc ("timeslot manager");
432		595
433	my $signal = new Coro::Signal;	596	my $signal = new Coro::Signal;
		597	my $busy;
434		598
435	while () {	599	while () {
436	next_job:	600	next_job:
		601
437	my $avail = cf::till_tick;	602	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	603
439	for (0 .. $#SLOT_QUEUE) {	604	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	605	if ($SLOT_QUEUE[$_][0] <= $avail) {
		606	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	607	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	608	$job->[2]->send;
443	Coro::cede;	609	Coro::cede;
444	goto next_job;	610	goto next_job;
445	}	611	} else {
		612	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	613	}
447	}	614	}
448		615
449	if (@SLOT_QUEUE) {	616	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	617	# we do not use wait_for_tick() as it returns immediately when tick is inactive
451	push @cf::WAIT_FOR_TICK, $signal;	618	$WAIT_FOR_TICK->wait;
452	$signal->wait;
453	} else {	619	} else {
		620	$busy = 0;
454	Coro::schedule;	621	Coro::schedule;
455	}	622	}
456	}	623	}
457	};	624	};
458		625
459	sub get_slot($;$$) {	626	sub get_slot($;$$) {
460	return if tick_inhibit || $Coro::current == $Coro::main;	627	return if tick_inhibit || $Coro::current == $Coro::main;
461		628
462	my ($time, $pri, $name) = @_;	629	my ($time, $pri, $name) = @_;
463		630
464	$time = $TICK * .6 if $time > $TICK * .6;	631	$time = clamp $time, 0.01, $TICK * .6;
		632
465	my $sig = new Coro::Signal;	633	my $sig = new Coro::Signal;
466		634
467	push @SLOT_QUEUE, [$time, $pri, $sig, $name];	635	push @SLOT_QUEUE, [$time, $pri, $sig, $name];
468	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;	636	@SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
469	$SLOT_QUEUE->ready;	637	$SLOT_QUEUE->ready;
…		…
495	=cut	663	=cut
496		664
497	sub sync_job(&) {	665	sub sync_job(&) {
498	my ($job) = @_;	666	my ($job) = @_;
499		667
500	if ($Coro::current == $Coro::main) {	668	if (in_main) {
501	my $time = EV::time;	669	my $time = AE::time;
502		670
503	# this is the main coro, too bad, we have to block	671	# this is the main coro, too bad, we have to block
504	# till the operation succeeds, freezing the server :/	672	# till the operation succeeds, freezing the server :/
505		673
506	LOG llevError, Carp::longmess "sync job";#d#	674	#LOG llevError, Carp::longmess "sync job";#d#
507		675
508	my $freeze_guard = freeze_mainloop;	676	my $freeze_guard = freeze_mainloop;
509		677
510	my $busy = 1;	678	my $busy = 1;
511	my @res;	679	my @res;
512		680
513	(async {	681	(async {
514	$Coro::current->desc ("sync job coro");	682	$Coro::current->desc ("sync job coro");
515	@res = eval { $job->() };	683	@res = eval { $job->() };
516	warn $@ if $@;	684	error $@ if $@;
517	undef $busy;	685	undef $busy;
518	})->prio (Coro::PRIO_MAX);	686	})->prio (Coro::PRIO_MAX);
519		687
520	while ($busy) {	688	while ($busy) {
521	if (Coro::nready) {	689	if (Coro::nready) {
…		…
523	} else {	691	} else {
524	EV::loop EV::LOOP_ONESHOT;	692	EV::loop EV::LOOP_ONESHOT;
525	}	693	}
526	}	694	}
527		695
528	my $time = EV::time - $time;	696	my $time = AE::time - $time;
529		697
530	$TICK_START += $time; # do not account sync jobs to server load	698	$TICK_START += $time; # do not account sync jobs to server load
531		699
532	wantarray ? @res : $res[0]	700	wantarray ? @res : $res[0]
533	} else {	701	} else {
…		…
555	$EXT_CORO{$coro+0} = $coro;	723	$EXT_CORO{$coro+0} = $coro;
556		724
557	$coro	725	$coro
558	}	726	}
559		727
560	=item fork_call { }, $args	728	=item fork_call { }, @args
561		729
562	Executes the given code block with the given arguments in a seperate	730	Executes the given code block with the given arguments in a seperate
563	process, returning the results. Everything must be serialisable with	731	process, returning the results. Everything must be serialisable with
564	Coro::Storable. May, of course, block. Note that the executed sub may	732	Coro::Storable. May, of course, block. Note that the executed sub may
565	never block itself or use any form of event handling.	733	never block itself or use any form of event handling.
566		734
567	=cut	735	=cut
568		736
		737	sub post_fork {
		738	reset_signals;
		739	}
		740
569	sub fork_call(&@) {	741	sub fork_call(&@) {
570	my ($cb, @args) = @_;	742	my ($cb, @args) = @_;
571		743
572	# we seemingly have to make a local copy of the whole thing,
573	# otherwise perl prematurely frees the stuff :/
574	# TODO: investigate and fix (likely this will be rather laborious)
575
576	my @res = Coro::Util::fork_eval {	744	my @res = Coro::Util::fork_eval {
577	reset_signals;	745	cf::post_fork;
578	&$cb	746	&$cb
579	}, @args;	747	} @args;
580		748
581	wantarray ? @res : $res[-1]	749	wantarray ? @res : $res[-1]
		750	}
		751
		752	sub objinfo {
		753	(
		754	"counter value" => cf::object::object_count,
		755	"objects created" => cf::object::create_count,
		756	"objects destroyed" => cf::object::destroy_count,
		757	"freelist size" => cf::object::free_count,
		758	"allocated objects" => cf::object::objects_size,
		759	"active objects" => cf::object::actives_size,
		760	)
582	}	761	}
583		762
584	=item $coin = coin_from_name $name	763	=item $coin = coin_from_name $name
585		764
586	=cut	765	=cut
…		…
623	within each server.	802	within each server.
624		803
625	=cut	804	=cut
626		805
627	sub db_table($) {	806	sub db_table($) {
		807	cf::error "db_get called from main context"
		808	if $Coro::current == $Coro::main;
		809
628	my ($name) = @_;	810	my ($name) = @_;
629	my $db = BDB::db_create $DB_ENV;	811	my $db = BDB::db_create $DB_ENV;
630		812
631	eval {	813	eval {
632	$db->set_flags (BDB::CHKSUM);	814	$db->set_flags (BDB::CHKSUM);
…		…
642	}	824	}
643		825
644	our $DB;	826	our $DB;
645		827
646	sub db_init {	828	sub db_init {
647	cf::sync_job {
648	$DB ||= db_table "db";	829	$DB ||= db_table "db";
649	};
650	}	830	}
651		831
652	sub db_get($$) {	832	sub db_get($$) {
653	my $key = "$_[0]/$_[1]";	833	my $key = "$_[0]/$_[1]";
654		834
655	cf::sync_job {	835	cf::error "db_get called from main context"
		836	if $Coro::current == $Coro::main;
		837
656	BDB::db_get $DB, undef, $key, my $data;	838	BDB::db_get $DB, undef, $key, my $data;
657		839
658	$! ? ()	840	$! ? ()
659	: $data	841	: $data
660	}
661	}	842	}
662		843
663	sub db_put($$$) {	844	sub db_put($$$) {
664	BDB::dbreq_pri 4;	845	BDB::dbreq_pri 4;
665	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	846	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
693		874
694	my @data;	875	my @data;
695	my $md5;	876	my $md5;
696		877
697	for (0 .. $#$src) {	878	for (0 .. $#$src) {
698	0 <= aio_load $src->[$_], $data[$_]	879	$data[$_] = load_file $src->[$_];
699	or Carp::croak "$src->[$_]: $!";
700	}	880	}
701		881
702	# if processing is expensive, check	882	# if processing is expensive, check
703	# checksum first	883	# checksum first
704	if (1) {	884	if (1) {
…		…
717		897
718	return db_get cache => "$id/data";	898	return db_get cache => "$id/data";
719	}	899	}
720	}	900	}
721		901
722	my $t1 = Time::HiRes::time;	902	my $t1 = EV::time;
723	my $data = $process->(\@data);	903	my $data = $process->(\@data);
724	my $t2 = Time::HiRes::time;	904	my $t2 = EV::time;
725		905
726	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	906	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
727		907
728	db_put cache => "$id/data", $data;	908	db_put cache => "$id/data", $data;
729	db_put cache => "$id/md5" , $md5;	909	db_put cache => "$id/md5" , $md5;
730	db_put cache => "$id/meta", $meta;	910	db_put cache => "$id/meta", $meta;
731		911
…		…
741		921
742	=cut	922	=cut
743		923
744	sub datalog($@) {	924	sub datalog($@) {
745	my ($type, %kv) = @_;	925	my ($type, %kv) = @_;
746	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	926	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
747	}	927	}
748		928
749	=back	929	=back
750		930
751	=cut	931	=cut
…		…
946		1126
947	} elsif (exists $cb_id{$type}) {	1127	} elsif (exists $cb_id{$type}) {
948	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1128	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
949		1129
950	} elsif (ref $type) {	1130	} elsif (ref $type) {
951	warn "attaching objects not supported, ignoring.\n";	1131	error "attaching objects not supported, ignoring.\n";
952		1132
953	} else {	1133	} else {
954	shift @arg;	1134	shift @arg;
955	warn "attach argument '$type' not supported, ignoring.\n";	1135	error "attach argument '$type' not supported, ignoring.\n";
956	}	1136	}
957	}	1137	}
958	}	1138	}
959		1139
960	sub _object_attach {	1140	sub _object_attach {
…		…
970	_attach $registry, $klass, @attach;	1150	_attach $registry, $klass, @attach;
971	}	1151	}
972		1152
973	$obj->{$name} = \%arg;	1153	$obj->{$name} = \%arg;
974	} else {	1154	} else {
975	warn "object uses attachment '$name' which is not available, postponing.\n";	1155	info "object uses attachment '$name' which is not available, postponing.\n";
976	}	1156	}
977		1157
978	$obj->{_attachment}{$name} = undef;	1158	$obj->{_attachment}{$name} = undef;
979	}	1159	}
980		1160
…		…
1039		1219
1040	for (@$callbacks) {	1220	for (@$callbacks) {
1041	eval { &{$_->[1]} };	1221	eval { &{$_->[1]} };
1042		1222
1043	if ($@) {	1223	if ($@) {
1044	warn "$@";
1045	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1224	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1046	override;	1225	override;
1047	}	1226	}
1048		1227
1049	return 1 if $override;	1228	return 1 if $override;
1050	}	1229	}
…		…
1129	for (@$attach) {	1308	for (@$attach) {
1130	my ($klass, @attach) = @$_;	1309	my ($klass, @attach) = @$_;
1131	_attach $registry, $klass, @attach;	1310	_attach $registry, $klass, @attach;
1132	}	1311	}
1133	} else {	1312	} else {
1134	warn "object uses attachment '$name' that is not available, postponing.\n";	1313	info "object uses attachment '$name' that is not available, postponing.\n";
1135	}	1314	}
1136	}	1315	}
1137	}	1316	}
1138		1317
1139	cf::attachable->attach (	1318	cf::attachable->attach (
…		…
1166	my ($filename, $rdata, $objs) = @_;	1345	my ($filename, $rdata, $objs) = @_;
1167		1346
1168	sync_job {	1347	sync_job {
1169	if (length $$rdata) {	1348	if (length $$rdata) {
1170	utf8::decode (my $decname = $filename);	1349	utf8::decode (my $decname = $filename);
1171	warn sprintf "saving %s (%d,%d)\n",	1350	trace sprintf "saving %s (%d,%d)\n",
1172	$decname, length $$rdata, scalar @$objs;	1351	$decname, length $$rdata, scalar @$objs
		1352	if $VERBOSE_IO;
1173		1353
1174	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1354	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1175	aio_chmod $fh, SAVE_MODE;	1355	aio_chmod $fh, SAVE_MODE;
1176	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1356	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1177	if ($cf::USE_FSYNC) {	1357	if ($cf::USE_FSYNC) {
…		…
1199	aio_rename "$filename~", $filename;	1379	aio_rename "$filename~", $filename;
1200		1380
1201	$filename =~ s%/[^/]+$%%;	1381	$filename =~ s%/[^/]+$%%;
1202	aio_pathsync $filename if $cf::USE_FSYNC;	1382	aio_pathsync $filename if $cf::USE_FSYNC;
1203	} else {	1383	} else {
1204	warn "unable to save objects: $filename~: $!\n";	1384	error "unable to save objects: $filename~: $!\n";
1205	}	1385	}
1206	} else {	1386	} else {
1207	aio_unlink $filename;	1387	aio_unlink $filename;
1208	aio_unlink "$filename.pst";	1388	aio_unlink "$filename.pst";
1209	}	1389	}
…		…
1233	my $st = eval { Coro::Storable::thaw $av };	1413	my $st = eval { Coro::Storable::thaw $av };
1234	$av = $st->{objs};	1414	$av = $st->{objs};
1235	}	1415	}
1236		1416
1237	utf8::decode (my $decname = $filename);	1417	utf8::decode (my $decname = $filename);
1238	warn sprintf "loading %s (%d,%d)\n",	1418	trace sprintf "loading %s (%d,%d)\n",
1239	$decname, length $data, scalar @{$av || []};	1419	$decname, length $data, scalar @{$av || []}
		1420	if $VERBOSE_IO;
1240		1421
1241	($data, $av)	1422	($data, $av)
1242	}	1423	}
1243		1424
1244	=head2 COMMAND CALLBACKS	1425	=head2 COMMAND CALLBACKS
…		…
1248	=cut	1429	=cut
1249		1430
1250	#############################################################################	1431	#############################################################################
1251	# command handling &c	1432	# command handling &c
1252		1433
1253	=item cf::register_command $name => \&callback($ob,$args);	1434	=item cf::register_command $name => \&callback($ob,$args)
1254		1435
1255	Register a callback for execution when the client sends the user command	1436	Register a callback for execution when the client sends the user command
1256	$name.	1437	$name.
1257		1438
1258	=cut	1439	=cut
…		…
1264	#warn "registering command '$name/$time' to '$caller'";	1445	#warn "registering command '$name/$time' to '$caller'";
1265		1446
1266	push @{ $COMMAND{$name} }, [$caller, $cb];	1447	push @{ $COMMAND{$name} }, [$caller, $cb];
1267	}	1448	}
1268		1449
1269	=item cf::register_extcmd $name => \&callback($pl,$packet);	1450	=item cf::register_extcmd $name => \&callback($pl,@args)
1270		1451
1271	Register a callback for execution when the client sends an (synchronous)	1452	Register a callback for execution when the client sends an (synchronous)
1272	extcmd packet. Ext commands will be processed in the order they are	1453	extcmd packet. Ext commands will be processed in the order they are
1273	received by the server, like other user commands. The first argument is	1454	received by the server, like other user commands. The first argument is
1274	the logged-in player. Ext commands can only be processed after a player	1455	the logged-in player. Ext commands can only be processed after a player
1275	has logged in successfully.	1456	has logged in successfully.
1276		1457
1277	If the callback returns something, it is sent back as if reply was being	1458	The values will be sent back to the client.
1278	called.
1279		1459
		1460	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1461
		1462	Same as C<cf::register_extcmd>, but instead of returning values, the
		1463	callback needs to clal the C<$reply> function.
		1464
1280	=item cf::register_exticmd $name => \&callback($ns,$packet);	1465	=item cf::register_exticmd $name => \&callback($ns,@args)
1281		1466
1282	Register a callback for execution when the client sends an (asynchronous)	1467	Register a callback for execution when the client sends an (asynchronous)
1283	exticmd packet. Exti commands are processed by the server as soon as they	1468	exticmd packet. Exti commands are processed by the server as soon as they
1284	are received, i.e. out of order w.r.t. other commands. The first argument	1469	are received, i.e. out of order w.r.t. other commands. The first argument
1285	is a client socket. Exti commands can be received anytime, even before	1470	is a client socket. Exti commands can be received anytime, even before
1286	log-in.	1471	log-in.
1287		1472
1288	If the callback returns something, it is sent back as if reply was being	1473	The values will be sent back to the client.
1289	called.
1290		1474
1291	=cut	1475	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1292		1476
		1477	Same as C<cf::register_extcmd>, but instead of returning values, the
		1478	callback needs to clal the C<$reply> function.
		1479
		1480	=cut
		1481
1293	sub register_extcmd {	1482	sub register_extcmd($$) {
1294	my ($name, $cb) = @_;	1483	my ($name, $cb) = @_;
1295		1484
1296	$EXTCMD{$name} = $cb;	1485	$EXTCMD{$name} = $cb;
1297	}	1486	}
1298		1487
1299	sub register_exticmd {	1488	sub register_async_extcmd($$) {
1300	my ($name, $cb) = @_;	1489	my ($name, $cb) = @_;
1301		1490
		1491	$EXTACMD{$name} = $cb;
		1492	}
		1493
		1494	sub register_exticmd($$) {
		1495	my ($name, $cb) = @_;
		1496
1302	$EXTICMD{$name} = $cb;	1497	$EXTICMD{$name} = $cb;
1303	}	1498	}
1304		1499
		1500	sub register_async_exticmd($$) {
		1501	my ($name, $cb) = @_;
		1502
		1503	$EXTIACMD{$name} = $cb;
		1504	}
		1505
1305	use File::Glob ();	1506	use File::Glob ();
1306		1507
1307	cf::player->attach (	1508	cf::player->attach (
1308	on_command => sub {	1509	on_unknown_command => sub {
1309	my ($pl, $name, $params) = @_;	1510	my ($pl, $name, $params) = @_;
1310		1511
1311	my $cb = $COMMAND{$name}	1512	my $cb = $COMMAND{$name}
1312	or return;	1513	or return;
1313		1514
…		…
1321	my ($pl, $buf) = @_;	1522	my ($pl, $buf) = @_;
1322		1523
1323	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1524	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1324		1525
1325	if (ref $msg) {	1526	if (ref $msg) {
1326	my ($type, $reply, @payload) =	1527	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		1528
1331	my @reply;
1332
1333	if (my $cb = $EXTCMD{$type}) {	1529	if (my $cb = $EXTACMD{$type}) {
		1530	$cb->(
		1531	$pl,
		1532	sub {
		1533	$pl->ext_msg ("reply-$reply", @_)
		1534	if $reply;
		1535	},
		1536	@payload
		1537	);
		1538	} else {
		1539	my @reply;
		1540
		1541	if (my $cb = $EXTCMD{$type}) {
1334	@reply = $cb->($pl, @payload);	1542	@reply = $cb->($pl, @payload);
		1543	}
		1544
		1545	$pl->ext_msg ("reply-$reply", @reply)
		1546	if $reply;
1335	}	1547	}
1336		1548
1337	$pl->ext_reply ($reply, @reply)
1338	if $reply;
1339
1340	} else {	1549	} else {
1341	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1550	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1342	}	1551	}
1343		1552
1344	cf::override;	1553	cf::override;
1345	},	1554	},
1346	);	1555	);
…		…
1356	};	1565	};
1357		1566
1358	$grp	1567	$grp
1359	}	1568	}
1360		1569
		1570	sub _ext_cfg_reg($$$$) {
		1571	my ($rvar, $varname, $cfgname, $default) = @_;
		1572
		1573	$cfgname = lc $varname
		1574	unless length $cfgname;
		1575
		1576	$EXT_CFG{$cfgname} = [$rvar, $default];
		1577
		1578	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1579	}
		1580
1361	sub load_extensions {	1581	sub load_extensions {
		1582	info "loading extensions...";
		1583
		1584	%EXT_CFG = ();
		1585
1362	cf::sync_job {	1586	cf::sync_job {
1363	my %todo;	1587	my %todo;
1364		1588
1365	for my $path (<$LIBDIR/*.ext>) {	1589	for my $path (<$LIBDIR/*.ext>) {
1366	next unless -r $path;	1590	next unless -r $path;
…		…
1384		1608
1385	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1609	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1386	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1610	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1387		1611
1388	$ext{source} =	1612	$ext{source} =
1389	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1613	"package $pkg; use common::sense;\n"
1390	. "#line 1 \"$path\"\n{\n"	1614	. "#line 1 \"$path\"\n{\n"
1391	. $source	1615	. $source
1392	. "\n};\n1";	1616	. "\n};\n1";
1393		1617
1394	$todo{$base} = \%ext;	1618	$todo{$base} = \%ext;
1395	}	1619	}
1396		1620
		1621	my $pass = 0;
1397	my %done;	1622	my %done;
1398	while (%todo) {	1623	while (%todo) {
1399	my $progress;	1624	my $progress;
1400		1625
		1626	++$pass;
		1627
		1628	ext:
1401	while (my ($k, $v) = each %todo) {	1629	while (my ($k, $v) = each %todo) {
1402	for (split /,\s*/, $v->{meta}{depends}) {	1630	for (split /,\s*/, $v->{meta}{depends}) {
1403	goto skip	1631	next ext
1404	unless exists $done{$_};	1632	unless exists $done{$_};
1405	}	1633	}
1406		1634
1407	warn "... loading '$k' into '$v->{pkg}'\n";	1635	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1408		1636
1409	unless (eval $v->{source}) {	1637	my $source = $v->{source};
		1638
		1639	# support "CONF varname :confname = default" pseudo-statements
		1640	$source =~ s{
		1641	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1642	}{
		1643	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1644	}gmxe;
		1645
		1646	my $active = eval $source;
		1647
		1648	if (length $@) {
1410	my $msg = $@ ? "$v->{path}: $@\n"	1649	error "$v->{path}: $@\n";
1411	: "$v->{base}: extension inactive.\n";
1412		1650
1413	if (exists $v->{meta}{mandatory}) {
1414	warn $msg;
1415	cf::cleanup "mandatory extension failed to load, exiting.";	1651	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1416	}	1652	if exists $v->{meta}{mandatory};
1417		1653
1418	warn $msg;	1654	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1655	delete $todo{$k};
		1656	} else {
		1657	$done{$k} = delete $todo{$k};
		1658	push @EXTS, $v->{pkg};
		1659	$progress = 1;
		1660
		1661	info "$v->{base}: extension inactive.\n"
		1662	unless $active;
1419	}	1663	}
1420
1421	$done{$k} = delete $todo{$k};
1422	push @EXTS, $v->{pkg};
1423	$progress = 1;
1424	}	1664	}
1425		1665
1426	skip:	1666	unless ($progress) {
1427	die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"	1667	warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1428	unless $progress;	1668
		1669	while (my ($k, $v) = each %todo) {
		1670	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
		1671	if exists $v->{meta}{mandatory};
		1672	}
		1673
		1674	last;
		1675	}
1429	}	1676	}
1430	};	1677	};
1431	}	1678	}
1432		1679
1433	#############################################################################	1680	#############################################################################
…		…
1517	$cf::PLAYER{$login} = $pl	1764	$cf::PLAYER{$login} = $pl
1518	}	1765	}
1519	}	1766	}
1520	}	1767	}
1521		1768
		1769	cf::player->attach (
		1770	on_load => sub {
		1771	my ($pl, $path) = @_;
		1772
		1773	# restore slots saved in save, below
		1774	my $slots = delete $pl->{_slots};
		1775
		1776	$pl->ob->current_weapon ($slots->[0]);
		1777	$pl->combat_ob ($slots->[1]);
		1778	$pl->ranged_ob ($slots->[2]);
		1779	},
		1780	);
		1781
1522	sub save($) {	1782	sub save($) {
1523	my ($pl) = @_;	1783	my ($pl) = @_;
1524		1784
1525	return if $pl->{deny_save};	1785	return if $pl->{deny_save};
1526		1786
…		…
1531		1791
1532	aio_mkdir playerdir $pl, 0770;	1792	aio_mkdir playerdir $pl, 0770;
1533	$pl->{last_save} = $cf::RUNTIME;	1793	$pl->{last_save} = $cf::RUNTIME;
1534		1794
1535	cf::get_slot 0.01;	1795	cf::get_slot 0.01;
		1796
		1797	# save slots, to be restored later
		1798	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1536		1799
1537	$pl->save_pl ($path);	1800	$pl->save_pl ($path);
1538	cf::cede_to_tick;	1801	cf::cede_to_tick;
1539	}	1802	}
1540		1803
…		…
1574	my $name = $pl->ob->name;	1837	my $name = $pl->ob->name;
1575		1838
1576	$pl->{deny_save} = 1;	1839	$pl->{deny_save} = 1;
1577	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1840	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1578		1841
1579	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1842	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1580	$pl->deactivate;	1843	$pl->deactivate;
		1844
1581	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1845	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1582	$pl->ob->check_score;
1583	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1846	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1847	ext::highscore::check ($pl->ob);
		1848
1584	$pl->ns->destroy if $pl->ns;	1849	$pl->ns->destroy if $pl->ns;
1585		1850
1586	my $path = playerdir $pl;	1851	my $path = playerdir $pl;
1587	my $temp = "$path~$cf::RUNTIME~deleting~";	1852	my $temp = "$path~$cf::RUNTIME~deleting~";
1588	aio_rename $path, $temp;	1853	aio_rename $path, $temp;
…		…
1642	\@logins	1907	\@logins
1643	}	1908	}
1644		1909
1645	=item $player->maps	1910	=item $player->maps
1646		1911
		1912	=item cf::player::maps $login
		1913
1647	Returns an arrayref of map paths that are private for this	1914	Returns an arrayref of map paths that are private for this
1648	player. May block.	1915	player. May block.
1649		1916
1650	=cut	1917	=cut
1651		1918
…		…
1672		1939
1673	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1940	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1674		1941
1675	Expand deliantra pod fragments into protocol xml.	1942	Expand deliantra pod fragments into protocol xml.
1676		1943
1677	=item $player->ext_reply ($msgid, @msg)
1678
1679	Sends an ext reply to the player.
1680
1681	=cut
1682
1683	sub ext_reply($$@) {
1684	my ($self, $id, @msg) = @_;
1685
1686	$self->ns->ext_reply ($id, @msg)
1687	}
1688
1689	=item $player->ext_msg ($type, @msg)	1944	=item $player->ext_msg ($type, @msg)
1690		1945
1691	Sends an ext event to the client.	1946	Sends an ext event to the client.
1692		1947
1693	=cut	1948	=cut
…		…
1712		1967
1713	=cut	1968	=cut
1714		1969
1715	sub find_by_path($) {	1970	sub find_by_path($) {
1716	my ($path) = @_;	1971	my ($path) = @_;
		1972
		1973	$path =~ s/^~[^\/]*//; # skip ~login
1717		1974
1718	my ($match, $specificity);	1975	my ($match, $specificity);
1719		1976
1720	for my $region (list) {	1977	for my $region (list) {
1721	if ($region->{match} && $path =~ $region->{match}) {	1978	if ($region->{match} && $path =~ $region->{match}) {
…		…
1750	sub generate_random_map {	2007	sub generate_random_map {
1751	my ($self, $rmp) = @_;	2008	my ($self, $rmp) = @_;
1752		2009
1753	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2010	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1754		2011
1755	# mit "rum" bekleckern, nicht
1756	$self->_create_random_map (	2012	$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	}	2013	}
1770		2014
1771	=item cf::map->register ($regex, $prio)	2015	=item cf::map->register ($regex, $prio)
1772		2016
1773	Register a handler for the map path matching the given regex at the	2017	Register a handler for the map path matching the given regex at the
…		…
1778		2022
1779	sub register {	2023	sub register {
1780	my (undef, $regex, $prio) = @_;	2024	my (undef, $regex, $prio) = @_;
1781	my $pkg = caller;	2025	my $pkg = caller;
1782		2026
1783	no strict;
1784	push @{"$pkg\::ISA"}, __PACKAGE__;	2027	push @{"$pkg\::ISA"}, __PACKAGE__;
1785		2028
1786	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2029	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1787	}	2030	}
1788		2031
1789	# also paths starting with '/'	2032	# also paths starting with '/'
1790	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2033	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1791		2034
1792	sub thawer_merge {	2035	sub thawer_merge {
1793	my ($self, $merge) = @_;	2036	my ($self, $merge) = @_;
1794		2037
1795	# we have to keep some variables in memory intact	2038	# we have to keep some variables in memory intact
…		…
1800	}	2043	}
1801		2044
1802	sub normalise {	2045	sub normalise {
1803	my ($path, $base) = @_;	2046	my ($path, $base) = @_;
1804		2047
1805	$path = "$path"; # make sure its a string	2048	$path = "$path"; # make sure it's a string
1806		2049
1807	$path =~ s/\.map$//;	2050	$path =~ s/\.map$//;
1808		2051
1809	# map plan:	2052	# map plan:
1810	#	2053	#
…		…
1825	$base =~ s{[^/]+/?$}{};	2068	$base =~ s{[^/]+/?$}{};
1826	$path = "$base/$path";	2069	$path = "$base/$path";
1827	}	2070	}
1828		2071
1829	for ($path) {	2072	for ($path) {
1830	redo if s{//}{/};
1831	redo if s{/\.?/}{/};	2073	redo if s{/\.?/}{/};
1832	redo if s{/[^/]+/\.\./}{/};	2074	redo if s{/[^/]+/\.\./}{/};
1833	}	2075	}
1834		2076
1835	$path	2077	$path
…		…
1849	$self->init; # pass $1 etc.	2091	$self->init; # pass $1 etc.
1850	return $self;	2092	return $self;
1851	}	2093	}
1852	}	2094	}
1853		2095
1854	Carp::cluck "unable to resolve path '$path' (base '$base').";	2096	Carp::cluck "unable to resolve path '$path' (base '$base')";
1855	()	2097	()
1856	}	2098	}
1857		2099
		2100	# may re-bless or do other evil things
1858	sub init {	2101	sub init {
1859	my ($self) = @_;	2102	my ($self) = @_;
1860		2103
1861	$self	2104	$self
1862	}	2105	}
…		…
1927	$self->{load_path} = $path;	2170	$self->{load_path} = $path;
1928		2171
1929	1	2172	1
1930	}	2173	}
1931		2174
		2175	# used to laod the header of an original map
1932	sub load_header_orig {	2176	sub load_header_orig {
1933	my ($self) = @_;	2177	my ($self) = @_;
1934		2178
1935	$self->load_header_from ($self->load_path)	2179	$self->load_header_from ($self->load_path)
1936	}	2180	}
1937		2181
		2182	# used to laod the header of an instantiated map
1938	sub load_header_temp {	2183	sub load_header_temp {
1939	my ($self) = @_;	2184	my ($self) = @_;
1940		2185
1941	$self->load_header_from ($self->save_path)	2186	$self->load_header_from ($self->save_path)
1942	}	2187	}
1943		2188
		2189	# called after loading the header from an instantiated map
1944	sub prepare_temp {	2190	sub prepare_temp {
1945	my ($self) = @_;	2191	my ($self) = @_;
1946		2192
1947	$self->last_access ((delete $self->{last_access})	2193	$self->last_access ((delete $self->{last_access})
1948	|| $cf::RUNTIME); #d#	2194	|| $cf::RUNTIME); #d#
1949	# safety	2195	# safety
1950	$self->{instantiate_time} = $cf::RUNTIME	2196	$self->{instantiate_time} = $cf::RUNTIME
1951	if $self->{instantiate_time} > $cf::RUNTIME;	2197	if $self->{instantiate_time} > $cf::RUNTIME;
1952	}	2198	}
1953		2199
		2200	# called after loading the header from an original map
1954	sub prepare_orig {	2201	sub prepare_orig {
1955	my ($self) = @_;	2202	my ($self) = @_;
1956		2203
1957	$self->{load_original} = 1;	2204	$self->{load_original} = 1;
1958	$self->{instantiate_time} = $cf::RUNTIME;	2205	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1982		2229
1983	sub find;	2230	sub find;
1984	sub find {	2231	sub find {
1985	my ($path, $origin) = @_;	2232	my ($path, $origin) = @_;
1986		2233
		2234	cf::cede_to_tick;
		2235
1987	$path = normalise $path, $origin && $origin->path;	2236	$path = normalise $path, $origin;
1988		2237
1989	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2238	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1990	my $guard2 = cf::lock_acquire "map_find:$path";	2239	my $guard2 = cf::lock_acquire "map_find:$path";
1991		2240
1992	$cf::MAP{$path} || do {	2241	$cf::MAP{$path} || do {
…		…
2009		2258
2010	$cf::MAP{$path} = $map	2259	$cf::MAP{$path} = $map
2011	}	2260	}
2012	}	2261	}
2013		2262
2014	sub pre_load { }	2263	sub pre_load { }
2015	sub post_load { }	2264	#sub post_load { } # XS
2016		2265
2017	sub load {	2266	sub load {
2018	my ($self) = @_;	2267	my ($self) = @_;
2019		2268
2020	local $self->{deny_reset} = 1; # loading can take a long time	2269	local $self->{deny_reset} = 1; # loading can take a long time
…		…
2023		2272
2024	{	2273	{
2025	my $guard = cf::lock_acquire "map_data:$path";	2274	my $guard = cf::lock_acquire "map_data:$path";
2026		2275
2027	return unless $self->valid;	2276	return unless $self->valid;
2028	return unless $self->in_memory == cf::MAP_SWAPPED;	2277	return unless $self->state == cf::MAP_SWAPPED;
2029
2030	$self->in_memory (cf::MAP_LOADING);
2031		2278
2032	$self->alloc;	2279	$self->alloc;
2033		2280
2034	$self->pre_load;	2281	$self->pre_load;
2035	cf::cede_to_tick;	2282	cf::cede_to_tick;
2036		2283
		2284	if (exists $self->{load_path}) {
2037	my $f = new_from_file cf::object::thawer $self->{load_path};	2285	my $f = new_from_file cf::object::thawer $self->{load_path};
2038	$f->skip_block;	2286	$f->skip_block;
2039	$self->_load_objects ($f)	2287	$self->_load_objects ($f)
2040	or return;	2288	or return;
2041		2289
2042	$self->post_load_original	2290	$self->post_load_original
2043	if delete $self->{load_original};	2291	if delete $self->{load_original};
2044		2292
2045	if (my $uniq = $self->uniq_path) {	2293	if (my $uniq = $self->uniq_path) {
2046	utf8::encode $uniq;	2294	utf8::encode $uniq;
2047	unless (aio_stat $uniq) {	2295	unless (aio_stat $uniq) {
2048	if (my $f = new_from_file cf::object::thawer $uniq) {	2296	if (my $f = new_from_file cf::object::thawer $uniq) {
2049	$self->clear_unique_items;	2297	$self->clear_unique_items;
2050	$self->_load_objects ($f);	2298	$self->_load_objects ($f);
2051	$f->resolve_delayed_derefs;	2299	$f->resolve_delayed_derefs;
		2300	}
2052	}	2301	}
2053	}	2302	}
2054	}
2055		2303
2056	$f->resolve_delayed_derefs;	2304	$f->resolve_delayed_derefs;
		2305	} else {
		2306	$self->post_load_original
		2307	if delete $self->{load_original};
		2308	}
		2309
		2310	$self->state (cf::MAP_INACTIVE);
2057		2311
2058	cf::cede_to_tick;	2312	cf::cede_to_tick;
2059	# now do the right thing for maps	2313	# now do the right thing for maps
2060	$self->link_multipart_objects;	2314	$self->link_multipart_objects;
2061	$self->difficulty ($self->estimate_difficulty)	2315	$self->difficulty ($self->estimate_difficulty)
…		…
2065	unless ($self->{deny_activate}) {	2319	unless ($self->{deny_activate}) {
2066	$self->decay_objects;	2320	$self->decay_objects;
2067	$self->fix_auto_apply;	2321	$self->fix_auto_apply;
2068	$self->update_buttons;	2322	$self->update_buttons;
2069	cf::cede_to_tick;	2323	cf::cede_to_tick;
2070	$self->activate;	2324	#$self->activate; # no longer activate maps automatically
2071	}	2325	}
2072		2326
2073	$self->{last_save} = $cf::RUNTIME;	2327	$self->{last_save} = $cf::RUNTIME;
2074	$self->last_access ($cf::RUNTIME);	2328	$self->last_access ($cf::RUNTIME);
2075
2076	$self->in_memory (cf::MAP_ACTIVE);
2077	}	2329	}
2078		2330
2079	$self->post_load;	2331	$self->post_load;
2080	}
2081		2332
		2333	1
		2334	}
		2335
		2336	# customize the map for a given player, i.e.
		2337	# return the _real_ map. used by e.g. per-player
		2338	# maps to change the path to ~playername/mappath
2082	sub customise_for {	2339	sub customise_for {
2083	my ($self, $ob) = @_;	2340	my ($self, $ob) = @_;
2084		2341
2085	return find "~" . $ob->name . "/" . $self->{path}	2342	return find "~" . $ob->name . "/" . $self->{path}
2086	if $self->per_player;	2343	if $self->per_player;
…		…
2089	# if $self->per_party;	2346	# if $self->per_party;
2090		2347
2091	$self	2348	$self
2092	}	2349	}
2093		2350
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 {	2351	sub find_sync {
2121	my ($path, $origin) = @_;	2352	my ($path, $origin) = @_;
2122		2353
2123	cf::sync_job { find $path, $origin }	2354	# it's a bug to call this from the main context
		2355	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2356	if $Coro::current == $Coro::main;
		2357
		2358	find $path, $origin
2124	}	2359	}
2125		2360
2126	sub do_load_sync {	2361	sub do_load_sync {
2127	my ($map) = @_;	2362	my ($map) = @_;
2128		2363
		2364	# it's a bug to call this from the main context
2129	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2365	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2130	if $Coro::current == $Coro::main;	2366	if $Coro::current == $Coro::main;
2131		2367
2132	cf::sync_job { $map->load };	2368	$map->load;
2133	}	2369	}
2134		2370
2135	our %MAP_PREFETCH;	2371	our %MAP_PREFETCH;
2136	our $MAP_PREFETCHER = undef;	2372	our $MAP_PREFETCHER = undef;
2137		2373
2138	sub find_async {	2374	sub find_async {
2139	my ($path, $origin, $load) = @_;	2375	my ($path, $origin, $load) = @_;
2140		2376
2141	$path = normalise $path, $origin && $origin->{path};	2377	$path = normalise $path, $origin;
2142		2378
2143	if (my $map = $cf::MAP{$path}) {	2379	if (my $map = $cf::MAP{$path}) {
2144	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2380	return $map if !$load || $map->linkable;
2145	}	2381	}
2146		2382
2147	$MAP_PREFETCH{$path} |= $load;	2383	$MAP_PREFETCH{$path} |= $load;
2148		2384
2149	$MAP_PREFETCHER ||= cf::async {	2385	$MAP_PREFETCHER ||= cf::async {
…		…
2163	$MAP_PREFETCHER->prio (6);	2399	$MAP_PREFETCHER->prio (6);
2164		2400
2165	()	2401	()
2166	}	2402	}
2167		2403
		2404	# common code, used by both ->save and ->swapout
2168	sub save {	2405	sub _save {
2169	my ($self) = @_;	2406	my ($self) = @_;
2170
2171	my $lock = cf::lock_acquire "map_data:$self->{path}";
2172		2407
2173	$self->{last_save} = $cf::RUNTIME;	2408	$self->{last_save} = $cf::RUNTIME;
2174		2409
2175	return unless $self->dirty;	2410	return unless $self->dirty;
2176		2411
…		…
2196	} else {	2431	} else {
2197	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2432	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2198	}	2433	}
2199	}	2434	}
2200		2435
		2436	sub save {
		2437	my ($self) = @_;
		2438
		2439	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2440
		2441	$self->_save;
		2442	}
		2443
2201	sub swap_out {	2444	sub swap_out {
2202	my ($self) = @_;	2445	my ($self) = @_;
2203		2446
2204	# save first because save cedes
2205	$self->save;
2206
2207	my $lock = cf::lock_acquire "map_data:$self->{path}";	2447	my $lock = cf::lock_acquire "map_data:$self->{path}";
2208		2448
		2449	return if !$self->linkable;
		2450	return if $self->{deny_save};
2209	return if $self->players;	2451	return if $self->players;
2210	return if $self->in_memory != cf::MAP_ACTIVE;	2452
		2453	# first deactivate the map and "unlink" it from the core
		2454	$self->deactivate;
		2455	$_->clear_links_to ($self) for values %cf::MAP;
		2456	$self->state (cf::MAP_SWAPPED);
		2457
		2458	# then atomically save
		2459	$self->_save;
		2460
		2461	# then free the map
		2462	$self->clear;
		2463	}
		2464
		2465	sub reset_at {
		2466	my ($self) = @_;
		2467
		2468	# TODO: safety, remove and allow resettable per-player maps
2211	return if $self->{deny_save};	2469	return 1e99 if $self->{deny_reset};
2212		2470
		2471	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2472	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2473
		2474	$time + $to
		2475	}
		2476
		2477	sub should_reset {
		2478	my ($self) = @_;
		2479
		2480	$self->reset_at <= $cf::RUNTIME
		2481	}
		2482
		2483	sub reset {
		2484	my ($self) = @_;
		2485
		2486	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2487
		2488	return if $self->players;
		2489
		2490	cf::trace "resetting map ", $self->path, "\n";
		2491
2213	$self->in_memory (cf::MAP_SWAPPED);	2492	$self->state (cf::MAP_SWAPPED);
		2493
		2494	# need to save uniques path
		2495	unless ($self->{deny_save}) {
		2496	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2497
		2498	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2499	if $uniq;
		2500	}
		2501
		2502	delete $cf::MAP{$self->path};
2214		2503
2215	$self->deactivate;	2504	$self->deactivate;
2216	$_->clear_links_to ($self) for values %cf::MAP;	2505	$_->clear_links_to ($self) for values %cf::MAP;
2217	$self->clear;	2506	$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		2507
2263	$self->unlink_save;	2508	$self->unlink_save;
2264	$self->destroy;	2509	$self->destroy;
2265	}	2510	}
2266		2511
…		…
2274		2519
2275	delete $cf::MAP{$self->path};	2520	delete $cf::MAP{$self->path};
2276		2521
2277	$self->unlink_save;	2522	$self->unlink_save;
2278		2523
2279	bless $self, "cf::map";	2524	bless $self, "cf::map::wrap";
2280	delete $self->{deny_reset};	2525	delete $self->{deny_reset};
2281	$self->{deny_save} = 1;	2526	$self->{deny_save} = 1;
2282	$self->reset_timeout (1);	2527	$self->reset_timeout (1);
2283	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2528	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2284		2529
…		…
2341	: normalise $_	2586	: normalise $_
2342	} @{ aio_readdir $UNIQUEDIR or [] }	2587	} @{ aio_readdir $UNIQUEDIR or [] }
2343	]	2588	]
2344	}	2589	}
2345		2590
		2591	=item cf::map::static_maps
		2592
		2593	Returns an arrayref if paths of all static maps (all preinstalled F<.map>
		2594	file in the shared directory excluding F</styles> and F</editor>). May
		2595	block.
		2596
		2597	=cut
		2598
		2599	sub static_maps() {
		2600	my @dirs = "";
		2601	my @maps;
		2602
		2603	while (@dirs) {
		2604	my $dir = shift @dirs;
		2605
		2606	next if $dir eq "/styles" || $dir eq "/editor";
		2607
		2608	my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
		2609	or return;
		2610
		2611	for (@$files) {
		2612	s/\.map$// or next;
		2613	utf8::decode $_;
		2614	push @maps, "$dir/$_";
		2615	}
		2616
		2617	push @dirs, map "$dir/$_", @$dirs;
		2618	}
		2619
		2620	\@maps
		2621	}
		2622
2346	=back	2623	=back
2347		2624
2348	=head3 cf::object	2625	=head3 cf::object
2349		2626
2350	=cut	2627	=cut
…		…
2373		2650
2374	Creates and returns a persistent reference to an object that can be stored as a string.	2651	Creates and returns a persistent reference to an object that can be stored as a string.
2375		2652
2376	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2377		2654
2378	returns the objetc referenced by refstring. may return undef when it cnanot find the object,	2655	returns the objetc referenced by refstring. may return undef when it cannot find the object,
2379	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2380		2657
2381	=cut	2658	=cut
2382		2659
2383	sub deref {	2660	sub deref {
…		…
2482		2759
2483	Freezes the player and moves him/her to a special map (C<{link}>).	2760	Freezes the player and moves him/her to a special map (C<{link}>).
2484		2761
2485	The player should be reasonably safe there for short amounts of time (e.g.	2762	The player should be reasonably safe there for short amounts of time (e.g.
2486	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2763	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2487	though, as the palyer cannot control the character while it is on the link	2764	though, as the player cannot control the character while it is on the link
2488	map.	2765	map.
2489		2766
2490	Will never block.	2767	Will never block.
2491		2768
2492	=item $player_object->leave_link ($map, $x, $y)	2769	=item $player_object->leave_link ($map, $x, $y)
…		…
2513	sub cf::object::player::enter_link {	2790	sub cf::object::player::enter_link {
2514	my ($self) = @_;	2791	my ($self) = @_;
2515		2792
2516	$self->deactivate_recursive;	2793	$self->deactivate_recursive;
2517		2794
		2795	++$self->{_link_recursion};
		2796
2518	return if UNIVERSAL::isa $self->map, "ext::map_link";	2797	return if UNIVERSAL::isa $self->map, "ext::map_link";
2519		2798
2520	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2799	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2521	if $self->map && $self->map->{path} ne "{link}";	2800	if $self->map && $self->map->{path} ne "{link}";
2522		2801
2523	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2802	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2524	}	2803	}
2525		2804
2526	sub cf::object::player::leave_link {	2805	sub cf::object::player::leave_link {
2527	my ($self, $map, $x, $y) = @_;	2806	my ($self, $map, $x, $y) = @_;
2528		2807
…		…
2545	($x, $y) = (-1, -1)	2824	($x, $y) = (-1, -1)
2546	unless (defined $x) && (defined $y);	2825	unless (defined $x) && (defined $y);
2547		2826
2548	# use -1 or undef as default coordinates, not 0, 0	2827	# use -1 or undef as default coordinates, not 0, 0
2549	($x, $y) = ($map->enter_x, $map->enter_y)	2828	($x, $y) = ($map->enter_x, $map->enter_y)
2550	if $x <=0 && $y <= 0;	2829	if $x <= 0 && $y <= 0;
2551		2830
2552	$map->load;	2831	$map->load;
2553	$map->load_neighbours;
2554		2832
2555	return unless $self->contr->active;	2833	return unless $self->contr->active;
2556		2834
2557	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2835	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2558	$self->enter_map ($map, $x, $y);	2836	if ($self->enter_map ($map, $x, $y)) {
2559		2837	# entering was successful
		2838	delete $self->{_link_recursion};
2560	# only activate afterwards, to support waiting in hooks	2839	# only activate afterwards, to support waiting in hooks
2561	$self->activate_recursive;	2840	$self->activate_recursive;
2562	}	2841	}
2563		2842
		2843	}
		2844
2564	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2845	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2565		2846
2566	Moves the player to the given map-path and coordinates by first freezing	2847	Moves the player to the given map-path and coordinates by first freezing
2567	her, loading and preparing them map, calling the provided $check callback	2848	her, loading and preparing them map, calling the provided $check callback
2568	that has to return the map if sucecssful, and then unfreezes the player on	2849	that has to return the map if sucecssful, and then unfreezes the player on
2569	the new (success) or old (failed) map position. In either case, $done will	2850	the new (success) or old (failed) map position. In either case, $done will
…		…
2576		2857
2577	our $GOTOGEN;	2858	our $GOTOGEN;
2578		2859
2579	sub cf::object::player::goto {	2860	sub cf::object::player::goto {
2580	my ($self, $path, $x, $y, $check, $done) = @_;	2861	my ($self, $path, $x, $y, $check, $done) = @_;
		2862
		2863	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2864	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2865	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2866	($path, $x, $y) = @$EMERGENCY_POSITION;
		2867	}
2581		2868
2582	# do generation counting so two concurrent goto's will be executed in-order	2869	# do generation counting so two concurrent goto's will be executed in-order
2583	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2870	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2584		2871
2585	$self->enter_link;	2872	$self->enter_link;
…		…
2605	($path, $x, $y) = (undef, undef, undef);	2892	($path, $x, $y) = (undef, undef, undef);
2606	}	2893	}
2607	}	2894	}
2608		2895
2609	my $map = eval {	2896	my $map = eval {
2610	my $map = defined $path ? cf::map::find $path : undef;	2897	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2611		2898
2612	if ($map) {	2899	if ($map) {
2613	$map = $map->customise_for ($self);	2900	$map = $map->customise_for ($self);
2614	$map = $check->($map) if $check && $map;	2901	$map = $check->($map, $x, $y, $self) if $check && $map;
2615	} else {	2902	} else {
2616	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2903	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2617	}	2904	}
2618		2905
2619	$map	2906	$map
…		…
2627	if ($gen == $self->{_goto_generation}) {	2914	if ($gen == $self->{_goto_generation}) {
2628	delete $self->{_goto_generation};	2915	delete $self->{_goto_generation};
2629	$self->leave_link ($map, $x, $y);	2916	$self->leave_link ($map, $x, $y);
2630	}	2917	}
2631		2918
2632	$done->() if $done;	2919	$done->($self) if $done;
2633	})->prio (1);	2920	})->prio (1);
2634	}	2921	}
2635		2922
2636	=item $player_object->enter_exit ($exit_object)	2923	=item $player_object->enter_exit ($exit_object)
2637		2924
…		…
2705	$Coro::current->{desc} = "enter_exit";	2992	$Coro::current->{desc} = "enter_exit";
2706		2993
2707	unless (eval {	2994	unless (eval {
2708	$self->deactivate_recursive; # just to be sure	2995	$self->deactivate_recursive; # just to be sure
2709		2996
2710	# random map handling
2711	{
2712	my $guard = cf::lock_acquire "exit_prepare:$exit";
2713
2714	prepare_random_map $exit
2715	if $exit->slaying eq "/!";
2716	}
2717
2718	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2997	my $map = cf::map::normalise $exit->slaying, $exit->map;
2719	my $x = $exit->stats->hp;	2998	my $x = $exit->stats->hp;
2720	my $y = $exit->stats->sp;	2999	my $y = $exit->stats->sp;
		3000
		3001	# special map handling
		3002	my $slaying = $exit->slaying;
		3003
		3004	# special map handling
		3005	if ($slaying eq "/!") {
		3006	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3007
		3008	prepare_random_map $exit
		3009	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3010
		3011	$map = $exit->slaying;
		3012
		3013	} elsif ($slaying eq '!up') {
		3014	$map = $exit->map->tile_path (cf::TILE_UP);
		3015	$x = $exit->x;
		3016	$y = $exit->y;
		3017
		3018	} elsif ($slaying eq '!down') {
		3019	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3020	$x = $exit->x;
		3021	$y = $exit->y;
		3022	}
2721		3023
2722	$self->goto ($map, $x, $y);	3024	$self->goto ($map, $x, $y);
2723		3025
2724	# if exit is damned, update players death & WoR home-position	3026	# if exit is damned, update players death & WoR home-position
2725	$self->contr->savebed ($map, $x, $y)	3027	$self->contr->savebed ($map, $x, $y)
…		…
2730	$self->message ("Something went wrong deep within the deliantra server. "	3032	$self->message ("Something went wrong deep within the deliantra server. "
2731	. "I'll try to bring you back to the map you were before. "	3033	. "I'll try to bring you back to the map you were before. "
2732	. "Please report this to the dungeon master!",	3034	. "Please report this to the dungeon master!",
2733	cf::NDI_UNIQUE | cf::NDI_RED);	3035	cf::NDI_UNIQUE | cf::NDI_RED);
2734		3036
2735	warn "ERROR in enter_exit: $@";	3037	error "ERROR in enter_exit: $@";
2736	$self->leave_link;	3038	$self->leave_link;
2737	}	3039	}
2738	})->prio (1);	3040	})->prio (1);
2739	}	3041	}
2740		3042
…		…
2752	sub cf::client::send_drawinfo {	3054	sub cf::client::send_drawinfo {
2753	my ($self, $text, $flags) = @_;	3055	my ($self, $text, $flags) = @_;
2754		3056
2755	utf8::encode $text;	3057	utf8::encode $text;
2756	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);	3058	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
		3059	}
		3060
		3061	=item $client->send_big_packet ($pkt)
		3062
		3063	Like C<send_packet>, but tries to compress large packets, and fragments
		3064	them as required.
		3065
		3066	=cut
		3067
		3068	our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
		3069
		3070	sub cf::client::send_big_packet {
		3071	my ($self, $pkt) = @_;
		3072
		3073	# try lzf for large packets
		3074	$pkt = "lzf " . Compress::LZF::compress $pkt
		3075	if 1024 <= length $pkt and $self->{can_lzf};
		3076
		3077	# split very large packets
		3078	if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
		3079	$self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
		3080	$pkt = "frag";
		3081	}
		3082
		3083	$self->send_packet ($pkt);
2757	}	3084	}
2758		3085
2759	=item $client->send_msg ($channel, $msg, $color, [extra...])	3086	=item $client->send_msg ($channel, $msg, $color, [extra...])
2760		3087
2761	Send a drawinfo or msg packet to the client, formatting the msg for the	3088	Send a drawinfo or msg packet to the client, formatting the msg for the
…		…
2782	"c/examine" => {	3109	"c/examine" => {
2783	id => "infobox",	3110	id => "infobox",
2784	title => "Examine",	3111	title => "Examine",
2785	reply => undef,	3112	reply => undef,
2786	tooltip => "Signs and other items you examined",	3113	tooltip => "Signs and other items you examined",
		3114	},
		3115	"c/shopinfo" => {
		3116	id => "infobox",
		3117	title => "Shop Info",
		3118	reply => undef,
		3119	tooltip => "What your bargaining skill tells you about the shop",
2787	},	3120	},
2788	"c/book" => {	3121	"c/book" => {
2789	id => "infobox",	3122	id => "infobox",
2790	title => "Book",	3123	title => "Book",
2791	reply => undef,	3124	reply => undef,
…		…
2907	my $pkt = "msg "	3240	my $pkt = "msg "
2908	. $self->{json_coder}->encode (	3241	. $self->{json_coder}->encode (
2909	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]	3242	[$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2910	);	3243	);
2911		3244
2912	# try lzf for large packets
2913	$pkt = "lzf " . Compress::LZF::compress $pkt
2914	if 1024 <= length $pkt and $self->{can_lzf};
2915
2916	# split very large packets
2917	if (8192 < length $pkt and $self->{can_lzf}) {
2918	$self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2919	$pkt = "frag";
2920	}
2921
2922	$self->send_packet ($pkt);	3245	$self->send_big_packet ($pkt);
2923	}	3246	}
2924		3247
2925	=item $client->ext_msg ($type, @msg)	3248	=item $client->ext_msg ($type, @msg)
2926		3249
2927	Sends an ext event to the client.	3250	Sends an ext event to the client.
…		…
2929	=cut	3252	=cut
2930		3253
2931	sub cf::client::ext_msg($$@) {	3254	sub cf::client::ext_msg($$@) {
2932	my ($self, $type, @msg) = @_;	3255	my ($self, $type, @msg) = @_;
2933		3256
2934	if ($self->extcmd == 2) {
2935	$self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3257	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2936	} elsif ($self->extcmd == 1) { # TODO: remove
2937	push @msg, msgtype => "event_$type";
2938	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2939	}
2940	}
2941
2942	=item $client->ext_reply ($msgid, @msg)
2943
2944	Sends an ext reply to the client.
2945
2946	=cut
2947
2948	sub cf::client::ext_reply($$@) {
2949	my ($self, $id, @msg) = @_;
2950
2951	if ($self->extcmd == 2) {
2952	$self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2953	} elsif ($self->extcmd == 1) {
2954	#TODO: version 1, remove
2955	unshift @msg, msgtype => "reply", msgid => $id;
2956	$self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2957	}
2958	}	3258	}
2959		3259
2960	=item $success = $client->query ($flags, "text", \&cb)	3260	=item $success = $client->query ($flags, "text", \&cb)
2961		3261
2962	Queues a query to the client, calling the given callback with	3262	Queues a query to the client, calling the given callback with
…		…
3017	my ($ns, $buf) = @_;	3317	my ($ns, $buf) = @_;
3018		3318
3019	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3319	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3020		3320
3021	if (ref $msg) {	3321	if (ref $msg) {
3022	my ($type, $reply, @payload) =	3322	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3023	"ARRAY" eq ref $msg
3024	? @$msg
3025	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3026		3323
3027	my @reply;
3028
3029	if (my $cb = $EXTICMD{$type}) {	3324	if (my $cb = $EXTIACMD{$type}) {
		3325	$cb->(
		3326	$ns,
		3327	sub {
		3328	$ns->ext_msg ("reply-$reply", @_)
		3329	if $reply;
		3330	},
		3331	@payload
		3332	);
		3333	} else {
		3334	my @reply;
		3335
		3336	if (my $cb = $EXTICMD{$type}) {
3030	@reply = $cb->($ns, @payload);	3337	@reply = $cb->($ns, @payload);
		3338	}
		3339
		3340	$ns->ext_msg ("reply-$reply", @reply)
		3341	if $reply;
3031	}	3342	}
3032
3033	$ns->ext_reply ($reply, @reply)
3034	if $reply;
3035
3036	} else {	3343	} else {
3037	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3344	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3038	}	3345	}
3039		3346
3040	cf::override;	3347	cf::override;
3041	},	3348	},
3042	);	3349	);
…		…
3062		3369
3063	$coro	3370	$coro
3064	}	3371	}
3065		3372
3066	cf::client->attach (	3373	cf::client->attach (
3067	on_destroy => sub {	3374	on_client_destroy => sub {
3068	my ($ns) = @_;	3375	my ($ns) = @_;
3069		3376
3070	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3377	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3071	},	3378	},
3072	);	3379	);
…		…
3088	our $safe_hole = new Safe::Hole;	3395	our $safe_hole = new Safe::Hole;
3089		3396
3090	$SIG{FPE} = 'IGNORE';	3397	$SIG{FPE} = 'IGNORE';
3091		3398
3092	$safe->permit_only (Opcode::opset qw(	3399	$safe->permit_only (Opcode::opset qw(
3093	:base_core :base_mem :base_orig :base_math	3400	:base_core :base_mem :base_orig :base_math :base_loop
3094	grepstart grepwhile mapstart mapwhile	3401	grepstart grepwhile mapstart mapwhile
3095	sort time	3402	sort time
3096	));	3403	));
3097		3404
3098	# here we export the classes and methods available to script code	3405	# here we export the classes and methods available to script code
…		…
3123	decrease split destroy change_exp value msg lore send_msg)],	3430	decrease split destroy change_exp value msg lore send_msg)],
3124	["cf::object::player" => qw(player)],	3431	["cf::object::player" => qw(player)],
3125	["cf::player" => qw(peaceful send_msg)],	3432	["cf::player" => qw(peaceful send_msg)],
3126	["cf::map" => qw(trigger)],	3433	["cf::map" => qw(trigger)],
3127	) {	3434	) {
3128	no strict 'refs';
3129	my ($pkg, @funs) = @$_;	3435	my ($pkg, @funs) = @$_;
3130	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3436	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3131	for @funs;	3437	for @funs;
3132	}	3438	}
3133		3439
…		…
3150	$qcode =~ s/"/‟/g; # not allowed in #line filenames	3456	$qcode =~ s/"/‟/g; # not allowed in #line filenames
3151	$qcode =~ s/\n/\\n/g;	3457	$qcode =~ s/\n/\\n/g;
3152		3458
3153	%vars = (_dummy => 0) unless %vars;	3459	%vars = (_dummy => 0) unless %vars;
3154		3460
		3461	my @res;
3155	local $_;	3462	local $_;
3156	local @safe::cf::_safe_eval_args = values %vars;
3157		3463
3158	my $eval =	3464	my $eval =
3159	"do {\n"	3465	"do {\n"
3160	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"	3466	. "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3161	. "#line 0 \"{$qcode}\"\n"	3467	. "#line 0 \"{$qcode}\"\n"
3162	. $code	3468	. $code
3163	. "\n}"	3469	. "\n}"
3164	;	3470	;
3165		3471
		3472	if ($CFG{safe_eval}) {
3166	sub_generation_inc;	3473	sub_generation_inc;
		3474	local @safe::cf::_safe_eval_args = values %vars;
3167	my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);	3475	@res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3168	sub_generation_inc;	3476	sub_generation_inc;
		3477	} else {
		3478	local @cf::_safe_eval_args = values %vars;
		3479	@res = wantarray ? eval eval : scalar eval $eval;
		3480	}
3169		3481
3170	if ($@) {	3482	if ($@) {
3171	warn "$@";	3483	warn "$@",
3172	warn "while executing safe code '$code'\n";	3484	"while executing safe code '$code'\n",
3173	warn "with arguments " . (join " ", %vars) . "\n";	3485	"with arguments " . (join " ", %vars) . "\n";
3174	}	3486	}
3175		3487
3176	wantarray ? @res : $res[0]	3488	wantarray ? @res : $res[0]
3177	}	3489	}
3178		3490
…		…
3192	=cut	3504	=cut
3193		3505
3194	sub register_script_function {	3506	sub register_script_function {
3195	my ($fun, $cb) = @_;	3507	my ($fun, $cb) = @_;
3196		3508
3197	no strict 'refs';	3509	$fun = "safe::$fun" if $CFG{safe_eval};
3198	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3510	*$fun = $safe_hole->wrap ($cb);
3199	}	3511	}
3200		3512
3201	=back	3513	=back
3202		3514
3203	=cut	3515	=cut
3204		3516
3205	#############################################################################	3517	#############################################################################
3206	# the server's init and main functions	3518	# the server's init and main functions
3207		3519
		3520	{
		3521	package cf::face;
		3522
		3523	our %HASH; # hash => idx
		3524	our @DATA; # dynamically-created facedata, only faceste 0 used
		3525	our @FOFS; # file offset, if > 0
		3526	our @SIZE; # size of face, in octets
		3527	our @META; # meta hash of face, if any
		3528	our $DATAFH; # facedata filehandle
		3529
		3530	# internal api, not finalised
		3531	sub set {
		3532	my ($name, $type, $data) = @_;
		3533
		3534	my $idx = cf::face::find $name;
		3535
		3536	if ($idx) {
		3537	delete $HASH{cf::face::get_chksum $idx};
		3538	} else {
		3539	$idx = cf::face::alloc $name;
		3540	}
		3541
		3542	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3543
		3544	cf::face::set_type $idx, $type;
		3545	cf::face::set_csum $idx, 0, $hash;
		3546
		3547	# we need to destroy the SV itself, not just modify it, as a running ix
		3548	# might hold a reference to it: "delete" achieves that.
		3549	delete $FOFS[0][$idx];
		3550	delete $DATA[0][$idx];
		3551	$DATA[0][$idx] = $data;
		3552	$SIZE[0][$idx] = length $data;
		3553	delete $META[$idx];
		3554	$HASH{$hash} = $idx;#d#
		3555
		3556	$idx
		3557	}
		3558
		3559	sub _get_data($$$) {
		3560	my ($idx, $set, $cb) = @_;
		3561
		3562	if (defined $DATA[$set][$idx]) {
		3563	$cb->($DATA[$set][$idx]);
		3564	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3565	my $size = $SIZE[$set][$idx];
		3566	my $buf;
		3567	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3568	if ($_[0] == $size) {
		3569	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3570	$cb->($buf);
		3571	} else {
		3572	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3573	}
		3574	};
		3575	} else {
		3576	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3577	}
		3578	}
		3579
		3580	# rather ineffient
		3581	sub cf::face::get_data($;$) {
		3582	my ($idx, $set) = @_;
		3583
		3584	_get_data $idx, $set, Coro::rouse_cb;
		3585	Coro::rouse_wait
		3586	}
		3587
		3588	sub cf::face::ix {
		3589	my ($ns, $set, $idx, $pri) = @_;
		3590
		3591	_get_data $idx, $set, sub {
		3592	$ns->ix_send ($idx, $pri, $_[0]);
		3593	};
		3594	}
		3595	}
		3596
3208	sub load_facedata($) {	3597	sub load_facedata($) {
3209	my ($path) = @_;	3598	my ($path) = @_;
3210		3599
3211	# HACK to clear player env face cache, we need some signal framework
3212	# for this (global event?)
3213	%ext::player_env::MUSIC_FACE_CACHE = ();
3214
3215	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3600	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3216		3601
3217	warn "loading facedata from $path\n";	3602	trace "loading facedata from $path\n";
3218		3603
3219	my $facedata;	3604	my $facedata = decode_storable load_file "$path/faceinfo";
3220	0 < aio_load $path, $facedata
3221	or die "$path: $!";
3222
3223	$facedata = Coro::Storable::thaw $facedata;
3224		3605
3225	$facedata->{version} == 2	3606	$facedata->{version} == 2
3226	or cf::cleanup "$path: version mismatch, cannot proceed.";	3607	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3227		3608
3228	# patch in the exptable	3609	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3229	$facedata->{resource}{"res/exp_table"} = {	3610	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3230	type => FT_RSRC,	3611
3231	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3612	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3232	};	3613
3233	cf::cede_to_tick;	3614	# BEGIN ATOMIC
		3615	# from here on, everything must be atomic - no thread switch allowed
		3616	my $t1 = EV::time;
3234		3617
3235	{	3618	{
3236	my $faces = $facedata->{faceinfo};	3619	my $faces = $facedata->{faceinfo};
3237		3620
3238	while (my ($face, $info) = each %$faces) {	3621	for my $face (sort keys %$faces) {
		3622	my $info = $faces->{$face};
3239	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3623	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3240		3624
3241	cf::face::set_visibility $idx, $info->{visibility};	3625	cf::face::set_visibility $idx, $info->{visibility};
3242	cf::face::set_magicmap $idx, $info->{magicmap};	3626	cf::face::set_magicmap $idx, $info->{magicmap};
3243	cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};	3627	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3244	cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};	3628	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3245		3629	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3246	cf::cede_to_tick;	3630	$cf::face::HASH{$info->{hash64}} = $idx;
		3631	delete $cf::face::META[$idx];
3247	}	3632	}
3248		3633
3249	while (my ($face, $info) = each %$faces) {	3634	while (my ($face, $info) = each %$faces) {
3250	next unless $info->{smooth};	3635	next unless $info->{smooth};
3251		3636
…		…
3254		3639
3255	if (my $smooth = cf::face::find $info->{smooth}) {	3640	if (my $smooth = cf::face::find $info->{smooth}) {
3256	cf::face::set_smooth $idx, $smooth;	3641	cf::face::set_smooth $idx, $smooth;
3257	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3642	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3258	} else {	3643	} else {
3259	warn "smooth face '$info->{smooth}' not found for face '$face'";	3644	error "smooth face '$info->{smooth}' not found for face '$face'";
3260	}	3645	}
3261
3262	cf::cede_to_tick;
3263	}	3646	}
3264	}	3647	}
3265		3648
3266	{	3649	{
3267	my $anims = $facedata->{animinfo};	3650	my $anims = $facedata->{animinfo};
3268		3651
3269	while (my ($anim, $info) = each %$anims) {	3652	while (my ($anim, $info) = each %$anims) {
3270	cf::anim::set $anim, $info->{frames}, $info->{facings};	3653	cf::anim::set $anim, $info->{frames}, $info->{facings};
3271	cf::cede_to_tick;
3272	}	3654	}
3273		3655
3274	cf::anim::invalidate_all; # d'oh	3656	cf::anim::invalidate_all; # d'oh
3275	}	3657	}
3276		3658
3277	{	3659	{
3278	# TODO: for gcfclient pleasure, we should give resources
3279	# that gcfclient doesn't grok a >10000 face index.
3280	my $res = $facedata->{resource};	3660	my $res = $facedata->{resource};
3281		3661
3282	while (my ($name, $info) = each %$res) {	3662	while (my ($name, $info) = each %$res) {
3283	if (defined $info->{type}) {	3663	if (defined (my $type = $info->{type})) {
		3664	# TODO: different hash - must free and use new index, or cache ixface data queue
3284	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3665	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3285	my $data;
3286		3666
3287	if ($info->{type} & 1) {
3288	# prepend meta info
3289
3290	my $meta = $enc->encode ({
3291	name => $name,
3292	%{ $info->{meta} || {} },
3293	});
3294
3295	$data = pack "(w/a*)*", $meta, $info->{data};
3296	} else {
3297	$data = $info->{data};
3298	}
3299
3300	cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3301	cf::face::set_type $idx, $info->{type};	3667	cf::face::set_type $idx, $type;
		3668	cf::face::set_csum $idx, 0, $info->{hash};
		3669	$cf::face::SIZE[0][$idx] = $info->{size};
		3670	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3671	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3672	$cf::face::HASH{$info->{hash}} = $idx;
3302	} else {	3673	} else {
3303	$RESOURCE{$name} = $info;	3674	# $RESOURCE{$name} = $info; # unused
3304	}	3675	}
3305
3306	cf::cede_to_tick;
3307	}	3676	}
3308	}	3677	}
		3678
		3679	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3680
		3681	# HACK to clear player env face cache, we need some signal framework
		3682	# for this (global event?)
		3683	%ext::player_env::MUSIC_FACE_CACHE = ();
		3684
		3685	# END ATOMIC
		3686
		3687	cf::debug "facedata atomic update time ", EV::time - $t1;
3309		3688
3310	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3689	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3311		3690
		3691	aio_close $fh if $fh; # close old facedata
		3692
3312	1	3693	1
3313	}	3694	}
3314
3315	cf::global->attach (on_resource_update => sub {
3316	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3317	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3318
3319	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3320	my $sound = $soundconf->{compat}[$_]
3321	or next;
3322
3323	my $face = cf::face::find "sound/$sound->[1]";
3324	cf::sound::set $sound->[0] => $face;
3325	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3326	}
3327
3328	while (my ($k, $v) = each %{$soundconf->{event}}) {
3329	my $face = cf::face::find "sound/$v";
3330	cf::sound::set $k => $face;
3331	}
3332	}
3333	});
3334		3695
3335	register_exticmd fx_want => sub {	3696	register_exticmd fx_want => sub {
3336	my ($ns, $want) = @_;	3697	my ($ns, $want) = @_;
3337		3698
3338	while (my ($k, $v) = each %$want) {	3699	while (my ($k, $v) = each %$want) {
…		…
3346	my $status = load_resource_file_ $_[0];	3707	my $status = load_resource_file_ $_[0];
3347	get_slot 0.1, 100;	3708	get_slot 0.1, 100;
3348	cf::arch::commit_load;	3709	cf::arch::commit_load;
3349		3710
3350	$status	3711	$status
		3712	}
		3713
		3714	sub reload_exp_table {
		3715	_reload_exp_table;
		3716
		3717	cf::face::set
		3718	"res/exp_table" => FT_RSRC,
		3719	JSON::XS->new->utf8->canonical->encode (
		3720	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3721	);
		3722	}
		3723
		3724	sub reload_materials {
		3725	_reload_materials;
3351	}	3726	}
3352		3727
3353	sub reload_regions {	3728	sub reload_regions {
3354	# HACK to clear player env face cache, we need some signal framework	3729	# HACK to clear player env face cache, we need some signal framework
3355	# for this (global event?)	3730	# for this (global event?)
…		…
3363	if exists $_->{match};	3738	if exists $_->{match};
3364	}	3739	}
3365	}	3740	}
3366		3741
3367	sub reload_facedata {	3742	sub reload_facedata {
3368	load_facedata "$DATADIR/facedata"	3743	load_facedata $DATADIR
3369	or die "unable to load facedata\n";	3744	or die "unable to load facedata\n";
3370	}	3745	}
3371		3746
3372	sub reload_archetypes {	3747	sub reload_archetypes {
3373	load_resource_file "$DATADIR/archetypes"	3748	load_resource_file "$DATADIR/archetypes"
3374	or die "unable to load archetypes\n";	3749	or die "unable to load archetypes\n";
		3750
		3751	cf::face::set
		3752	"res/skill_info" => FT_RSRC,
		3753	JSON::XS->new->utf8->canonical->encode (
		3754	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3755	);
		3756
		3757	cf::face::set
		3758	"res/spell_paths" => FT_RSRC,
		3759	JSON::XS->new->utf8->canonical->encode (
		3760	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3761	);
3375	}	3762	}
3376		3763
3377	sub reload_treasures {	3764	sub reload_treasures {
3378	load_resource_file "$DATADIR/treasures"	3765	load_resource_file "$DATADIR/treasures"
3379	or die "unable to load treasurelists\n";	3766	or die "unable to load treasurelists\n";
3380	}	3767	}
3381		3768
		3769	sub reload_sound {
		3770	trace "loading sound config from $DATADIR/sound\n";
		3771
		3772	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3773
		3774	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3775	my $sound = $soundconf->{compat}[$_]
		3776	or next;
		3777
		3778	my $face = cf::face::find "sound/$sound->[1]";
		3779	cf::sound::set $sound->[0] => $face;
		3780	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3781	}
		3782
		3783	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3784	my $face = cf::face::find "sound/$v";
		3785	cf::sound::set $k => $face;
		3786	}
		3787	}
		3788
3382	sub reload_resources {	3789	sub reload_resources {
3383	warn "reloading resource files...\n";	3790	trace "reloading resource files...\n";
3384		3791
		3792	reload_materials;
3385	reload_facedata;	3793	reload_facedata;
		3794	reload_exp_table;
		3795	reload_sound;
3386	reload_archetypes;	3796	reload_archetypes;
3387	reload_regions;	3797	reload_regions;
3388	reload_treasures;	3798	reload_treasures;
3389		3799
3390	warn "finished reloading resource files\n";	3800	trace "finished reloading resource files\n";
3391	}	3801	}
3392		3802
3393	sub reload_config {	3803	sub reload_config {
3394	warn "reloading config file...\n";	3804	trace "reloading config file...\n";
3395		3805
3396	open my $fh, "<:utf8", "$CONFDIR/config"	3806	my $config = load_file "$CONFDIR/config";
3397	or return;	3807	utf8::decode $config;
		3808	*CFG = decode_yaml $config;
3398		3809
3399	local $/;
3400	*CFG = YAML::XS::Load scalar <$fh>;
3401
3402	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3810	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3403		3811
3404	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3812	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3405	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3813	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3406		3814
3407	if (exists $CFG{mlockall}) {	3815	if (exists $CFG{mlockall}) {
…		…
3409	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3817	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3410	and die "WARNING: m(un)lockall failed: $!\n";	3818	and die "WARNING: m(un)lockall failed: $!\n";
3411	};	3819	};
3412	warn $@ if $@;	3820	warn $@ if $@;
3413	}	3821	}
3414
3415	warn "finished reloading resource files\n";
3416	}	3822	}
3417		3823
3418	sub pidfile() {	3824	sub pidfile() {
3419	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3825	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3420	or die "$PIDFILE: $!";	3826	or die "$PIDFILE: $!";
…		…
3433	seek $fh, 0, 0;	3839	seek $fh, 0, 0;
3434	print $fh $$;	3840	print $fh $$;
3435	}	3841	}
3436		3842
3437	sub main_loop {	3843	sub main_loop {
3438	warn "EV::loop starting\n";	3844	trace "EV::loop starting\n";
3439	if (1) {	3845	if (1) {
3440	EV::loop;	3846	EV::loop;
3441	}	3847	}
3442	warn "EV::loop returned\n";	3848	trace "EV::loop returned\n";
3443	goto &main_loop unless $REALLY_UNLOOP;	3849	goto &main_loop unless $REALLY_UNLOOP;
3444	}	3850	}
3445		3851
3446	sub main {	3852	sub main {
3447	cf::init_globals; # initialise logging	3853	cf::init_globals; # initialise logging
3448		3854
3449	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3855	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3450	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3856	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3451	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3857	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3452	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3858	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3453		3859
3454	cf::init_experience;
3455	cf::init_anim;
3456	cf::init_attackmess;
3457	cf::init_dynamic;
3458
3459	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3860	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3460		3861
3461	# we must not ever block the main coroutine	3862	# we must not ever block the main coroutine
3462	local $Coro::idle = sub {	3863	$Coro::idle = sub {
3463	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3864	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3464	(async {	3865	(async {
3465	$Coro::current->{desc} = "IDLE BUG HANDLER";	3866	$Coro::current->{desc} = "IDLE BUG HANDLER";
3466	EV::loop EV::LOOP_ONESHOT;	3867	EV::loop EV::LOOP_ONESHOT;
3467	})->prio (Coro::PRIO_MAX);	3868	})->prio (Coro::PRIO_MAX);
3468	};	3869	};
3469		3870
3470	evthread_start IO::AIO::poll_fileno;	3871	evthread_start IO::AIO::poll_fileno;
3471		3872
3472	cf::sync_job {	3873	cf::sync_job {
		3874	cf::incloader::init ();
		3875
		3876	db_init;
		3877
		3878	cf::init_anim;
		3879	cf::init_attackmess;
		3880	cf::init_dynamic;
		3881
		3882	cf::load_settings;
		3883
3473	reload_resources;	3884	reload_resources;
3474	reload_config;	3885	reload_config;
3475	db_init;
3476		3886
3477	cf::load_settings;
3478	cf::load_materials;
3479	cf::init_uuid;	3887	cf::init_uuid;
3480	cf::init_signals;	3888	cf::init_signals;
3481	cf::init_commands;
3482	cf::init_skills;	3889	cf::init_skills;
3483		3890
3484	cf::init_beforeplay;	3891	cf::init_beforeplay;
3485		3892
3486	atomic;	3893	atomic;
…		…
3491		3898
3492	# no (long-running) fork's whatsoever before this point(!)	3899	# no (long-running) fork's whatsoever before this point(!)
3493	use POSIX ();	3900	use POSIX ();
3494	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3901	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3495		3902
3496	(pop @POST_INIT)->(0) while @POST_INIT;	3903	cf::_post_init 0;
3497	};	3904	};
3498		3905
		3906	cf::object::thawer::errors_are_fatal 0;
		3907	info "parse errors in files are no longer fatal from this point on.\n";
		3908
		3909	AE::postpone {
		3910	undef &main; # free gobs of memory :)
		3911	};
		3912
3499	main_loop;	3913	goto &main_loop;
3500	}	3914	}
3501		3915
3502	#############################################################################	3916	#############################################################################
3503	# initialisation and cleanup	3917	# initialisation and cleanup
3504		3918
3505	# install some emergency cleanup handlers	3919	# install some emergency cleanup handlers
3506	BEGIN {	3920	BEGIN {
3507	our %SIGWATCHER = ();	3921	our %SIGWATCHER = ();
3508	for my $signal (qw(INT HUP TERM)) {	3922	for my $signal (qw(INT HUP TERM)) {
3509	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3923	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3510	cf::cleanup "SIG$signal";	3924	cf::cleanup "SIG$signal";
3511	};	3925	};
3512	}	3926	}
3513	}	3927	}
3514		3928
3515	sub write_runtime_sync {	3929	sub write_runtime_sync {
		3930	my $t0 = AE::time;
		3931
3516	# first touch the runtime file to show we are still running:	3932	# first touch the runtime file to show we are still running:
3517	# the fsync below can take a very very long time.	3933	# the fsync below can take a very very long time.
3518		3934
3519	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3935	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3520		3936
3521	my $guard = cf::lock_acquire "write_runtime";	3937	my $guard = cf::lock_acquire "write_runtime";
3522		3938
3523	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	3939	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3524	or return;	3940	or return;
3525		3941
3526	my $value = $cf::RUNTIME + 90 + 10;	3942	my $value = $cf::RUNTIME + 90 + 10;
3527	# 10 is the runtime save interval, for a monotonic clock	3943	# 10 is the runtime save interval, for a monotonic clock
3528	# 60 allows for the watchdog to kill the server.	3944	# 60 allows for the watchdog to kill the server.
…		…
3541	or return;	3957	or return;
3542		3958
3543	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3959	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3544	and return;	3960	and return;
3545		3961
3546	warn "runtime file written.\n";	3962	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3547		3963
3548	1	3964	1
3549	}	3965	}
3550		3966
3551	our $uuid_lock;	3967	our $uuid_lock;
…		…
3563	or return;	3979	or return;
3564		3980
3565	my $value = uuid_seq uuid_cur;	3981	my $value = uuid_seq uuid_cur;
3566		3982
3567	unless ($value) {	3983	unless ($value) {
3568	warn "cowardly refusing to write zero uuid value!\n";	3984	info "cowardly refusing to write zero uuid value!\n";
3569	return;	3985	return;
3570	}	3986	}
3571		3987
3572	my $value = uuid_str $value + $uuid_skip;	3988	my $value = uuid_str $value + $uuid_skip;
3573	$uuid_skip = 0;	3989	$uuid_skip = 0;
…		…
3583	or return;	3999	or return;
3584		4000
3585	aio_rename "$uuid~", $uuid	4001	aio_rename "$uuid~", $uuid
3586	and return;	4002	and return;
3587		4003
3588	warn "uuid file written ($value).\n";	4004	trace "uuid file written ($value).\n";
3589		4005
3590	1	4006	1
3591		4007
3592	}	4008	}
3593		4009
…		…
3599	}	4015	}
3600		4016
3601	sub emergency_save() {	4017	sub emergency_save() {
3602	my $freeze_guard = cf::freeze_mainloop;	4018	my $freeze_guard = cf::freeze_mainloop;
3603		4019
3604	warn "emergency_perl_save: enter\n";	4020	info "emergency_perl_save: enter\n";
		4021
		4022	# this is a trade-off: we want to be very quick here, so
		4023	# save all maps without fsync, and later call a global sync
		4024	# (which in turn might be very very slow)
		4025	local $USE_FSYNC = 0;
3605		4026
3606	cf::sync_job {	4027	cf::sync_job {
3607	# this is a trade-off: we want to be very quick here, so	4028	cf::write_runtime_sync; # external watchdog should not bark
3608	# save all maps without fsync, and later call a global sync
3609	# (which in turn might be very very slow)
3610	local $USE_FSYNC = 0;
3611		4029
3612	# use a peculiar iteration method to avoid tripping on perl	4030	# use a peculiar iteration method to avoid tripping on perl
3613	# refcount bugs in for. also avoids problems with players	4031	# refcount bugs in for. also avoids problems with players
3614	# and maps saved/destroyed asynchronously.	4032	# and maps saved/destroyed asynchronously.
3615	warn "emergency_perl_save: begin player save\n";	4033	info "emergency_perl_save: begin player save\n";
3616	for my $login (keys %cf::PLAYER) {	4034	for my $login (keys %cf::PLAYER) {
3617	my $pl = $cf::PLAYER{$login} or next;	4035	my $pl = $cf::PLAYER{$login} or next;
3618	$pl->valid or next;	4036	$pl->valid or next;
3619	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4037	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3620	$pl->save;	4038	$pl->save;
3621	}	4039	}
3622	warn "emergency_perl_save: end player save\n";	4040	info "emergency_perl_save: end player save\n";
3623		4041
		4042	cf::write_runtime_sync; # external watchdog should not bark
		4043
3624	warn "emergency_perl_save: begin map save\n";	4044	info "emergency_perl_save: begin map save\n";
3625	for my $path (keys %cf::MAP) {	4045	for my $path (keys %cf::MAP) {
3626	my $map = $cf::MAP{$path} or next;	4046	my $map = $cf::MAP{$path} or next;
3627	$map->valid or next;	4047	$map->valid or next;
3628	$map->save;	4048	$map->save;
3629	}	4049	}
3630	warn "emergency_perl_save: end map save\n";	4050	info "emergency_perl_save: end map save\n";
3631		4051
		4052	cf::write_runtime_sync; # external watchdog should not bark
		4053
3632	warn "emergency_perl_save: begin database checkpoint\n";	4054	info "emergency_perl_save: begin database checkpoint\n";
3633	BDB::db_env_txn_checkpoint $DB_ENV;	4055	BDB::db_env_txn_checkpoint $DB_ENV;
3634	warn "emergency_perl_save: end database checkpoint\n";	4056	info "emergency_perl_save: end database checkpoint\n";
3635		4057
3636	warn "emergency_perl_save: begin write uuid\n";	4058	info "emergency_perl_save: begin write uuid\n";
3637	write_uuid_sync 1;	4059	write_uuid_sync 1;
3638	warn "emergency_perl_save: end write uuid\n";	4060	info "emergency_perl_save: end write uuid\n";
		4061
		4062	cf::write_runtime_sync; # external watchdog should not bark
		4063
		4064	trace "emergency_perl_save: syncing database to disk";
		4065	BDB::db_env_txn_checkpoint $DB_ENV;
		4066
		4067	info "emergency_perl_save: starting sync\n";
		4068	IO::AIO::aio_sync sub {
		4069	info "emergency_perl_save: finished sync\n";
		4070	};
		4071
		4072	cf::write_runtime_sync; # external watchdog should not bark
		4073
		4074	trace "emergency_perl_save: flushing outstanding aio requests";
		4075	while (IO::AIO::nreqs || BDB::nreqs) {
		4076	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4077	}
		4078
		4079	cf::write_runtime_sync; # external watchdog should not bark
3639	};	4080	};
3640		4081
3641	warn "emergency_perl_save: starting sync()\n";
3642	IO::AIO::aio_sync sub {
3643	warn "emergency_perl_save: finished sync()\n";
3644	};
3645
3646	warn "emergency_perl_save: leave\n";	4082	info "emergency_perl_save: leave\n";
3647	}	4083	}
3648		4084
3649	sub post_cleanup {	4085	sub post_cleanup {
3650	my ($make_core) = @_;	4086	my ($make_core) = @_;
3651		4087
		4088	IO::AIO::flush;
		4089
3652	warn Carp::longmess "post_cleanup backtrace"	4090	error Carp::longmess "post_cleanup backtrace"
3653	if $make_core;	4091	if $make_core;
3654		4092
3655	my $fh = pidfile;	4093	my $fh = pidfile;
3656	unlink $PIDFILE if <$fh> == $$;	4094	unlink $PIDFILE if <$fh> == $$;
3657	}	4095	}
…		…
3677	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4115	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3678	for my $name (keys %$leaf_symtab) {	4116	for my $name (keys %$leaf_symtab) {
3679	_gv_clear *{"$pkg$name"};	4117	_gv_clear *{"$pkg$name"};
3680	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4118	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3681	}	4119	}
3682	warn "cleared package $pkg\n";#d#
3683	}	4120	}
3684		4121
3685	sub do_reload_perl() {	4122	sub do_reload_perl() {
3686	# can/must only be called in main	4123	# can/must only be called in main
3687	if ($Coro::current != $Coro::main) {	4124	unless (in_main) {
3688	warn "can only reload from main coroutine";	4125	error "can only reload from main coroutine";
3689	return;	4126	return;
3690	}	4127	}
3691		4128
3692	return if $RELOAD++;	4129	return if $RELOAD++;
3693		4130
3694	my $t1 = EV::time;	4131	my $t1 = AE::time;
3695		4132
3696	while ($RELOAD) {	4133	while ($RELOAD) {
3697	warn "reloading...";	4134	cf::get_slot 0.1, -1, "reload_perl";
		4135	info "perl_reload: reloading...";
3698		4136
3699	warn "entering sync_job";	4137	trace "perl_reload: entering sync_job";
3700		4138
3701	cf::sync_job {	4139	cf::sync_job {
3702	cf::write_runtime_sync; # external watchdog should not bark
3703	cf::emergency_save;	4140	#cf::emergency_save;
3704	cf::write_runtime_sync; # external watchdog should not bark
3705		4141
3706	warn "syncing database to disk";
3707	BDB::db_env_txn_checkpoint $DB_ENV;
3708
3709	# if anything goes wrong in here, we should simply crash as we already saved
3710
3711	warn "flushing outstanding aio requests";
3712	while (IO::AIO::nreqs || BDB::nreqs) {
3713	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3714	}
3715
3716	warn "cancelling all extension coros";	4142	trace "perl_reload: cancelling all extension coros";
3717	$_->cancel for values %EXT_CORO;	4143	$_->cancel for values %EXT_CORO;
3718	%EXT_CORO = ();	4144	%EXT_CORO = ();
3719		4145
3720	warn "removing commands";	4146	trace "perl_reload: removing commands";
3721	%COMMAND = ();	4147	%COMMAND = ();
3722		4148
3723	warn "removing ext/exti commands";	4149	trace "perl_reload: removing ext/exti commands";
3724	%EXTCMD = ();	4150	%EXTCMD = ();
3725	%EXTICMD = ();	4151	%EXTICMD = ();
3726		4152
3727	warn "unloading/nuking all extensions";	4153	trace "perl_reload: unloading/nuking all extensions";
3728	for my $pkg (@EXTS) {	4154	for my $pkg (@EXTS) {
3729	warn "... unloading $pkg";	4155	trace "... unloading $pkg";
3730		4156
3731	if (my $cb = $pkg->can ("unload")) {	4157	if (my $cb = $pkg->can ("unload")) {
3732	eval {	4158	eval {
3733	$cb->($pkg);	4159	$cb->($pkg);
3734	1	4160	1
3735	} or warn "$pkg unloaded, but with errors: $@";	4161	} or error "$pkg unloaded, but with errors: $@";
3736	}	4162	}
3737		4163
3738	warn "... clearing $pkg";	4164	trace "... clearing $pkg";
3739	clear_package $pkg;	4165	clear_package $pkg;
3740	}	4166	}
3741		4167
3742	warn "unloading all perl modules loaded from $LIBDIR";	4168	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3743	while (my ($k, $v) = each %INC) {	4169	while (my ($k, $v) = each %INC) {
3744	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4170	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3745		4171
3746	warn "... unloading $k";	4172	trace "... unloading $k";
3747	delete $INC{$k};	4173	delete $INC{$k};
3748		4174
3749	$k =~ s/\.pm$//;	4175	$k =~ s/\.pm$//;
3750	$k =~ s/\//::/g;	4176	$k =~ s/\//::/g;
3751		4177
…		…
3754	}	4180	}
3755		4181
3756	clear_package $k;	4182	clear_package $k;
3757	}	4183	}
3758		4184
3759	warn "getting rid of safe::, as good as possible";	4185	trace "perl_reload: getting rid of safe::, as good as possible";
3760	clear_package "safe::$_"	4186	clear_package "safe::$_"
3761	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4187	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3762		4188
3763	warn "unloading cf.pm \"a bit\"";	4189	trace "perl_reload: unloading cf.pm \"a bit\"";
3764	delete $INC{"cf.pm"};	4190	delete $INC{"cf.pm"};
3765	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4191	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3766		4192
3767	# don't, removes xs symbols, too,	4193	# don't, removes xs symbols, too,
3768	# and global variables created in xs	4194	# and global variables created in xs
3769	#clear_package __PACKAGE__;	4195	#clear_package __PACKAGE__;
3770		4196
3771	warn "unload completed, starting to reload now";	4197	info "perl_reload: unload completed, starting to reload now";
3772		4198
3773	warn "reloading cf.pm";	4199	trace "perl_reload: reloading cf.pm";
3774	require cf;	4200	require cf;
3775	cf::_connect_to_perl_1;	4201	cf::_connect_to_perl_1;
3776		4202
3777	warn "loading config and database again";	4203	trace "perl_reload: loading config and database again";
3778	cf::reload_config;	4204	cf::reload_config;
3779		4205
3780	warn "loading extensions";	4206	trace "perl_reload: loading extensions";
3781	cf::load_extensions;	4207	cf::load_extensions;
3782		4208
3783	if ($REATTACH_ON_RELOAD) {	4209	if ($REATTACH_ON_RELOAD) {
3784	warn "reattaching attachments to objects/players";	4210	trace "perl_reload: reattaching attachments to objects/players";
3785	_global_reattach; # objects, sockets	4211	_global_reattach; # objects, sockets
3786	warn "reattaching attachments to maps";	4212	trace "perl_reload: reattaching attachments to maps";
3787	reattach $_ for values %MAP;	4213	reattach $_ for values %MAP;
3788	warn "reattaching attachments to players";	4214	trace "perl_reload: reattaching attachments to players";
3789	reattach $_ for values %PLAYER;	4215	reattach $_ for values %PLAYER;
3790	}	4216	}
3791		4217
3792	warn "running post_init jobs";	4218	cf::_post_init 1;
3793	(pop @POST_INIT)->(1) while @POST_INIT;
3794		4219
3795	warn "leaving sync_job";	4220	trace "perl_reload: leaving sync_job";
3796		4221
3797	1	4222	1
3798	} or do {	4223	} or do {
3799	warn $@;	4224	error $@;
3800	cf::cleanup "error while reloading, exiting.";	4225	cf::cleanup "perl_reload: error, exiting.";
3801	};	4226	};
3802		4227
3803	warn "reloaded";
3804	--$RELOAD;	4228	--$RELOAD;
3805	}	4229	}
3806		4230
3807	$t1 = EV::time - $t1;	4231	$t1 = AE::time - $t1;
3808	warn "reload completed in ${t1}s\n";	4232	info "perl_reload: completed in ${t1}s\n";
3809	};	4233	};
3810		4234
3811	our $RELOAD_WATCHER; # used only during reload	4235	our $RELOAD_WATCHER; # used only during reload
3812		4236
3813	sub reload_perl() {	4237	sub reload_perl() {
…		…
3815	# coro crashes during coro_state_free->destroy here.	4239	# coro crashes during coro_state_free->destroy here.
3816		4240
3817	$RELOAD_WATCHER ||= cf::async {	4241	$RELOAD_WATCHER ||= cf::async {
3818	Coro::AIO::aio_wait cache_extensions;	4242	Coro::AIO::aio_wait cache_extensions;
3819		4243
3820	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4244	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3821	do_reload_perl;	4245	do_reload_perl;
3822	undef $RELOAD_WATCHER;	4246	undef $RELOAD_WATCHER;
3823	};	4247	};
3824	};	4248	};
3825	}	4249	}
…		…
3834	reload_perl;	4258	reload_perl;
3835	};	4259	};
3836	}	4260	}
3837	};	4261	};
3838		4262
3839	unshift @INC, $LIBDIR;	4263	#############################################################################
3840		4264
3841	my $bug_warning = 0;	4265	my $bug_warning = 0;
3842		4266
3843	our @WAIT_FOR_TICK;
3844	our @WAIT_FOR_TICK_BEGIN;
3845
3846	sub wait_for_tick {	4267	sub wait_for_tick() {
3847	return if tick_inhibit || $Coro::current == $Coro::main;	4268	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3848		4269
3849	my $signal = new Coro::Signal;	4270	$WAIT_FOR_TICK->wait;
3850	push @WAIT_FOR_TICK, $signal;
3851	$signal->wait;
3852	}	4271	}
3853		4272
3854	sub wait_for_tick_begin {	4273	sub wait_for_tick_begin() {
3855	return if tick_inhibit || $Coro::current == $Coro::main;	4274	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3856		4275
3857	my $signal = new Coro::Signal;	4276	my $signal = new Coro::Signal;
3858	push @WAIT_FOR_TICK_BEGIN, $signal;	4277	push @WAIT_FOR_TICK_BEGIN, $signal;
3859	$signal->wait;	4278	$signal->wait;
3860	}	4279	}
…		…
3864	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4283	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3865	unless ++$bug_warning > 10;	4284	unless ++$bug_warning > 10;
3866	return;	4285	return;
3867	}	4286	}
3868		4287
3869	cf::server_tick; # one server iteration	4288	cf::one_tick; # one server iteration
		4289
		4290	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3870		4291
3871	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4292	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3872	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4293	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3873	Coro::async_pool {	4294	Coro::async_pool {
3874	$Coro::current->{desc} = "runtime saver";	4295	$Coro::current->{desc} = "runtime saver";
3875	write_runtime_sync	4296	write_runtime_sync
3876	or warn "ERROR: unable to write runtime file: $!";	4297	or error "ERROR: unable to write runtime file: $!";
3877	};	4298	};
3878	}	4299	}
3879		4300
3880	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4301	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3881	$sig->send;	4302	$sig->send;
3882	}	4303	}
3883	while (my $sig = shift @WAIT_FOR_TICK) {	4304	$WAIT_FOR_TICK->broadcast;
3884	$sig->send;
3885	}
3886		4305
3887	$LOAD = ($NOW - $TICK_START) / $TICK;	4306	$LOAD = ($NOW - $TICK_START) / $TICK;
3888	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4307	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3889		4308
3890	if (0) {	4309	if (0) {
3891	if ($NEXT_TICK) {	4310	if ($NEXT_TICK) {
3892	my $jitter = $TICK_START - $NEXT_TICK;	4311	my $jitter = $TICK_START - $NEXT_TICK;
3893	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4312	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3894	warn "jitter $JITTER\n";#d#	4313	debug "jitter $JITTER\n";#d#
3895	}	4314	}
3896	}	4315	}
3897	}	4316	}
3898		4317
3899	{	4318	{
3900	# configure BDB	4319	# configure BDB
		4320	info "initialising database";
3901		4321
3902	BDB::min_parallel 8;	4322	BDB::min_parallel 16;
3903	BDB::max_poll_reqs $TICK * 0.1;	4323	BDB::max_poll_reqs $TICK * 0.1;
3904	$AnyEvent::BDB::WATCHER->priority (1);	4324	#$AnyEvent::BDB::WATCHER->priority (1);
3905		4325
3906	unless ($DB_ENV) {	4326	unless ($DB_ENV) {
3907	$DB_ENV = BDB::db_env_create;	4327	$DB_ENV = BDB::db_env_create;
3908	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4328	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3909	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4329	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3934	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4354	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3935	};	4355	};
3936	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4356	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3937	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4357	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3938	};	4358	};
		4359
		4360	info "database initialised";
3939	}	4361	}
3940		4362
3941	{	4363	{
3942	# configure IO::AIO	4364	# configure IO::AIO
3943		4365
		4366	info "initialising aio";
3944	IO::AIO::min_parallel 8;	4367	IO::AIO::min_parallel 8;
3945	IO::AIO::max_poll_time $TICK * 0.1;	4368	IO::AIO::max_poll_time $TICK * 0.1;
3946	undef $AnyEvent::AIO::WATCHER;	4369	undef $AnyEvent::AIO::WATCHER;
		4370	info "aio initialised";
3947	}	4371	}
3948		4372
3949	my $_log_backtrace;	4373	our $_log_backtrace;
		4374	our $_log_backtrace_last;
3950		4375
3951	sub _log_backtrace {	4376	sub _log_backtrace {
3952	my ($msg, @addr) = @_;	4377	my ($msg, @addr) = @_;
3953		4378
3954	$msg =~ s/\n//;	4379	$msg =~ s/\n$//;
3955		4380
		4381	if ($_log_backtrace_last eq $msg) {
		4382	LOG llevInfo, "[ABT] $msg\n";
		4383	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
3956	# limit the # of concurrent backtraces	4384	# limit the # of concurrent backtraces
3957	if ($_log_backtrace < 2) {	4385	} elsif ($_log_backtrace < 2) {
		4386	$_log_backtrace_last = $msg;
3958	++$_log_backtrace;	4387	++$_log_backtrace;
3959	my $perl_bt = Carp::longmess $msg;	4388	my $perl_bt = Carp::longmess $msg;
3960	async {	4389	async {
3961	$Coro::current->{desc} = "abt $msg";	4390	$Coro::current->{desc} = "abt $msg";
3962		4391
…		…
3982	LOG llevInfo, "[ABT] $_\n" for @bt;	4411	LOG llevInfo, "[ABT] $_\n" for @bt;
3983	--$_log_backtrace;	4412	--$_log_backtrace;
3984	};	4413	};
3985	} else {	4414	} else {
3986	LOG llevInfo, "[ABT] $msg\n";	4415	LOG llevInfo, "[ABT] $msg\n";
3987	LOG llevInfo, "[ABT] [suppressed]\n";	4416	LOG llevInfo, "[ABT] [overload, suppressed]\n";
3988	}	4417	}
3989	}	4418	}
3990		4419
3991	# load additional modules	4420	# load additional modules
3992	require "cf/$_.pm" for @EXTRA_MODULES;	4421	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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