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.499 by root, Sun Jan 10 17:43:46 2010 UTC vs.
Revision 1.619 by root, Tue Aug 11 02:12:12 2015 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;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE;	118	#our %RESOURCE; # unused
		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
…		…
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	Carp::cluck "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
		602	Coro::cede;
		603
437	my $avail = cf::till_tick;	604	my $avail = cf::till_tick;
438	if ($avail > 0.01) {	605
439	for (0 .. $#SLOT_QUEUE) {	606	for (0 .. $#SLOT_QUEUE) {
440	if ($SLOT_QUEUE[$_][0] < $avail) {	607	if ($SLOT_QUEUE[$_][0] <= $avail) {
		608	$busy = 0;
441	my $job = splice @SLOT_QUEUE, $_, 1, ();	609	my $job = splice @SLOT_QUEUE, $_, 1, ();
442	$job->[2]->send;	610	$job->[2]->send;
443	Coro::cede;
444	goto next_job;	611	goto next_job;
445	}	612	} else {
		613	$SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
446	}	614	}
447	}	615	}
448		616
449	if (@SLOT_QUEUE) {	617	if (@SLOT_QUEUE) {
450	# we do not use wait_for_tick() as it returns immediately when tick is inactive	618	wait_for_tick;
451	push @cf::WAIT_FOR_TICK, $signal;
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) {
522	Coro::cede_notself;	690	Coro::cede_notself;
523	} else {	691	} else {
524	EV::loop EV::LOOP_ONESHOT;	692	EV::run EV::RUN_ONCE;
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 {
2150	$Coro::current->{desc} = "map prefetcher";	2386	$Coro::current->{desc} = "map prefetcher";
2151		2387
2152	while (%MAP_PREFETCH) {	2388	while (%MAP_PREFETCH) {
2153	while (my ($k, $v) = each %MAP_PREFETCH) {	2389	for my $k (keys %MAP_PREFETCH) {
2154	if (my $map = find $k) {	2390	if (my $map = find $k) {
2155	$map->load if $v;	2391	$map->load if $v;
2156	}	2392	}
2157		2393
2158	delete $MAP_PREFETCH{$k};	2394	delete $MAP_PREFETCH{$k};
…		…
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
…		…
2405		2650
2406	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.
2407		2652
2408	=item $ob = cf::object::deref ($refstring)	2653	=item $ob = cf::object::deref ($refstring)
2409		2654
2410	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,
2411	even if the object actually exists. May block.	2656	even if the object actually exists. May block.
2412		2657
2413	=cut	2658	=cut
2414		2659
2415	sub deref {	2660	sub deref {
…		…
2497	=item $player_object->may ("access")	2742	=item $player_object->may ("access")
2498		2743
2499	Returns wether the given player is authorized to access resource "access"	2744	Returns wether the given player is authorized to access resource "access"
2500	(e.g. "command_wizcast").	2745	(e.g. "command_wizcast").
2501		2746
		2747	This is implemented by checking a config setting of C<may_access> where
		2748	C<access> is replaced by the access string. The following alternatives are
		2749	possible (and are tested in order):
		2750
		2751	=over 4
		2752
		2753	=item * Player is DM
		2754
		2755	The request will succeed.
		2756
		2757	=item * may_access is an array reference
		2758
		2759	If either the player nickname or UUID is in the array, the request will
		2760	succeed, otherwise it will fail.
		2761
		2762	=item * may_access is a true value
		2763
		2764	The request will succeed.
		2765
		2766	=item * may_access is missing or false
		2767
		2768	The request will fail.
		2769
		2770	=back
		2771
2502	=cut	2772	=cut
2503		2773
2504	sub cf::object::player::may {	2774	sub cf::object::player::may {
2505	my ($self, $access) = @_;	2775	my ($self, $access) = @_;
2506		2776
2507	$self->flag (cf::FLAG_WIZ) ||	2777	$self->flag (cf::FLAG_WIZ) ||
2508	(ref $cf::CFG{"may_$access"}	2778	(ref $cf::CFG{"may_$access"}
2509	? scalar grep $self->name eq $_, @{$cf::CFG{"may_$access"}}	2779	? scalar grep $self->name eq $_ || $self->uuid eq $_, @{$cf::CFG{"may_$access"}}
2510	: $cf::CFG{"may_$access"})	2780	: $cf::CFG{"may_$access"})
2511	}	2781	}
2512		2782
2513	=item $player_object->enter_link	2783	=item $player_object->enter_link
2514		2784
2515	Freezes the player and moves him/her to a special map (C<{link}>).	2785	Freezes the player and moves him/her to a special map (C<{link}>).
2516		2786
2517	The player should be reasonably safe there for short amounts of time (e.g.	2787	The player should be reasonably safe there for short amounts of time (e.g.
2518	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2788	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2519	though, as the palyer cannot control the character while it is on the link	2789	though, as the player cannot control the character while it is on the link
2520	map.	2790	map.
2521		2791
2522	Will never block.	2792	This method will never block, which is the whole reaosn for it's
		2793	existance: you can I<always> put a player onto the link map, which is the
		2794	only place to put objects that is guaranteed to exist.
		2795
		2796	A typical usage pattern is to call C<enter_link> synchronously from the
		2797	server, then start a new thread, do your blocking stuff there and then
		2798	call C<leave_link> from that thread.
2523		2799
2524	=item $player_object->leave_link ($map, $x, $y)	2800	=item $player_object->leave_link ($map, $x, $y)
2525		2801
2526	Moves the player out of the special C<{link}> map onto the specified	2802	Moves the player out of the special C<{link}> map onto the specified
2527	map. If the map is not valid (or omitted), the player will be moved back	2803	map. If the map is not valid (or omitted), the player will be moved back
…		…
2545	sub cf::object::player::enter_link {	2821	sub cf::object::player::enter_link {
2546	my ($self) = @_;	2822	my ($self) = @_;
2547		2823
2548	$self->deactivate_recursive;	2824	$self->deactivate_recursive;
2549		2825
		2826	++$self->{_link_recursion};
		2827
2550	return if UNIVERSAL::isa $self->map, "ext::map_link";	2828	return if UNIVERSAL::isa $self->map, "ext::map_link";
2551		2829
2552	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2830	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2553	if $self->map && $self->map->{path} ne "{link}";	2831	if $self->map && $self->map->{path} ne "{link}";
2554		2832
2555	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2833	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2556	}	2834	}
2557		2835
2558	sub cf::object::player::leave_link {	2836	sub cf::object::player::leave_link {
2559	my ($self, $map, $x, $y) = @_;	2837	my ($self, $map, $x, $y) = @_;
2560		2838
…		…
2580	# use -1 or undef as default coordinates, not 0, 0	2858	# use -1 or undef as default coordinates, not 0, 0
2581	($x, $y) = ($map->enter_x, $map->enter_y)	2859	($x, $y) = ($map->enter_x, $map->enter_y)
2582	if $x <= 0 && $y <= 0;	2860	if $x <= 0 && $y <= 0;
2583		2861
2584	$map->load;	2862	$map->load;
2585	$map->load_neighbours;
2586		2863
2587	return unless $self->contr->active;	2864	return unless $self->contr->active;
2588		2865
2589	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2866	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2590	$self->enter_map ($map, $x, $y);	2867	if ($self->enter_map ($map, $x, $y)) {
2591		2868	# entering was successful
		2869	delete $self->{_link_recursion};
2592	# only activate afterwards, to support waiting in hooks	2870	# only activate afterwards, to support waiting in hooks
2593	$self->activate_recursive;	2871	$self->activate_recursive;
2594	}	2872	}
2595		2873
		2874	}
		2875
2596	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2876	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2597		2877
2598	Moves the player to the given map-path and coordinates by first freezing	2878	Moves the player to the given map-path and coordinates by first freezing
2599	her, loading and preparing them map, calling the provided $check callback	2879	her, loading and preparing them map, calling the provided $check callback
2600	that has to return the map if sucecssful, and then unfreezes the player on	2880	that has to return the map if sucecssful, and then unfreezes the player on
2601	the new (success) or old (failed) map position. In either case, $done will	2881	the new (success) or old (failed) map position. In either case, $done will
…		…
2608		2888
2609	our $GOTOGEN;	2889	our $GOTOGEN;
2610		2890
2611	sub cf::object::player::goto {	2891	sub cf::object::player::goto {
2612	my ($self, $path, $x, $y, $check, $done) = @_;	2892	my ($self, $path, $x, $y, $check, $done) = @_;
		2893
		2894	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2895	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2896	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2897	($path, $x, $y) = @$EMERGENCY_POSITION;
		2898	}
2613		2899
2614	# do generation counting so two concurrent goto's will be executed in-order	2900	# do generation counting so two concurrent goto's will be executed in-order
2615	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2901	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2616		2902
2617	$self->enter_link;	2903	$self->enter_link;
…		…
2637	($path, $x, $y) = (undef, undef, undef);	2923	($path, $x, $y) = (undef, undef, undef);
2638	}	2924	}
2639	}	2925	}
2640		2926
2641	my $map = eval {	2927	my $map = eval {
2642	my $map = defined $path ? cf::map::find $path : undef;	2928	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2643		2929
2644	if ($map) {	2930	if ($map) {
2645	$map = $map->customise_for ($self);	2931	$map = $map->customise_for ($self);
2646	$map = $check->($map) if $check && $map;	2932	$map = $check->($map, $x, $y, $self) if $check && $map;
2647	} else {	2933	} else {
2648	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2934	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2649	}	2935	}
2650		2936
2651	$map	2937	$map
…		…
2659	if ($gen == $self->{_goto_generation}) {	2945	if ($gen == $self->{_goto_generation}) {
2660	delete $self->{_goto_generation};	2946	delete $self->{_goto_generation};
2661	$self->leave_link ($map, $x, $y);	2947	$self->leave_link ($map, $x, $y);
2662	}	2948	}
2663		2949
2664	$done->() if $done;	2950	$done->($self) if $done;
2665	})->prio (1);	2951	})->prio (1);
2666	}	2952	}
2667		2953
2668	=item $player_object->enter_exit ($exit_object)	2954	=item $player_object->enter_exit ($exit_object)
2669		2955
…		…
2737	$Coro::current->{desc} = "enter_exit";	3023	$Coro::current->{desc} = "enter_exit";
2738		3024
2739	unless (eval {	3025	unless (eval {
2740	$self->deactivate_recursive; # just to be sure	3026	$self->deactivate_recursive; # just to be sure
2741		3027
2742	# random map handling
2743	{
2744	my $guard = cf::lock_acquire "exit_prepare:$exit";
2745
2746	prepare_random_map $exit
2747	if $exit->slaying eq "/!";
2748	}
2749
2750	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3028	my $map = cf::map::normalise $exit->slaying, $exit->map;
2751	my $x = $exit->stats->hp;	3029	my $x = $exit->stats->hp;
2752	my $y = $exit->stats->sp;	3030	my $y = $exit->stats->sp;
		3031
		3032	# special map handling
		3033	my $slaying = $exit->slaying;
		3034
		3035	# special map handling
		3036	if ($slaying eq "/!") {
		3037	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3038
		3039	prepare_random_map $exit
		3040	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3041
		3042	$map = $exit->slaying;
		3043
		3044	} elsif ($slaying eq '!up') {
		3045	$map = $exit->map->tile_path (cf::TILE_UP);
		3046	$x = $exit->x;
		3047	$y = $exit->y;
		3048
		3049	} elsif ($slaying eq '!down') {
		3050	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3051	$x = $exit->x;
		3052	$y = $exit->y;
		3053	}
2753		3054
2754	$self->goto ($map, $x, $y);	3055	$self->goto ($map, $x, $y);
2755		3056
2756	# if exit is damned, update players death & WoR home-position	3057	# if exit is damned, update players death & WoR home-position
2757	$self->contr->savebed ($map, $x, $y)	3058	$self->contr->savebed ($map, $x, $y)
…		…
2762	$self->message ("Something went wrong deep within the deliantra server. "	3063	$self->message ("Something went wrong deep within the deliantra server. "
2763	. "I'll try to bring you back to the map you were before. "	3064	. "I'll try to bring you back to the map you were before. "
2764	. "Please report this to the dungeon master!",	3065	. "Please report this to the dungeon master!",
2765	cf::NDI_UNIQUE | cf::NDI_RED);	3066	cf::NDI_UNIQUE | cf::NDI_RED);
2766		3067
2767	warn "ERROR in enter_exit: $@";	3068	error "ERROR in enter_exit: $@";
2768	$self->leave_link;	3069	$self->leave_link;
2769	}	3070	}
2770	})->prio (1);	3071	})->prio (1);
2771	}	3072	}
2772		3073
2773	=head3 cf::client	3074	=head3 cf::client
2774		3075
2775	=over 4	3076	=over 4
2776
2777	=item $client->send_drawinfo ($text, $flags)
2778
2779	Sends a drawinfo packet to the client. Circumvents output buffering so
2780	should not be used under normal circumstances.
2781
2782	=cut
2783
2784	sub cf::client::send_drawinfo {
2785	my ($self, $text, $flags) = @_;
2786
2787	utf8::encode $text;
2788	$self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2789	}
2790		3077
2791	=item $client->send_big_packet ($pkt)	3078	=item $client->send_big_packet ($pkt)
2792		3079
2793	Like C<send_packet>, but tries to compress large packets, and fragments	3080	Like C<send_packet>, but tries to compress large packets, and fragments
2794	them as required.	3081	them as required.
…		…
2813	$self->send_packet ($pkt);	3100	$self->send_packet ($pkt);
2814	}	3101	}
2815		3102
2816	=item $client->send_msg ($channel, $msg, $color, [extra...])	3103	=item $client->send_msg ($channel, $msg, $color, [extra...])
2817		3104
2818	Send a drawinfo or msg packet to the client, formatting the msg for the	3105	Send a msg packet to the client, formatting the msg for the client if
2819	client if neccessary. C<$type> should be a string identifying the type of	3106	necessary. C<$type> should be a string identifying the type of the
2820	the message, with C<log> being the default. If C<$color> is negative, suppress	3107	message, with C<log> being the default. If C<$color> is negative, suppress
2821	the message unless the client supports the msg packet.	3108	the message unless the client supports the msg packet.
2822		3109
2823	=cut	3110	=cut
2824		3111
2825	# non-persistent channels (usually the info channel)	3112	# non-persistent channels (usually the info channel)
…		…
2930	id => "death",	3217	id => "death",
2931	title => "Death",	3218	title => "Death",
2932	reply => undef,	3219	reply => undef,
2933	tooltip => "Reason for and more info about your most recent death",	3220	tooltip => "Reason for and more info about your most recent death",
2934	},	3221	},
		3222	"c/fatal" => {
		3223	id => "fatal",
		3224	title => "Fatal Error",
		3225	reply => undef,
		3226	tooltip => "Reason for the server disconnect",
		3227	},
2935	"c/say" => $SAY_CHANNEL,	3228	"c/say" => $SAY_CHANNEL,
2936	"c/chat" => $CHAT_CHANNEL,	3229	"c/chat" => $CHAT_CHANNEL,
2937	);	3230	);
2938		3231
2939	sub cf::client::send_msg {	3232	sub cf::client::send_msg {
…		…
2982	=cut	3275	=cut
2983		3276
2984	sub cf::client::ext_msg($$@) {	3277	sub cf::client::ext_msg($$@) {
2985	my ($self, $type, @msg) = @_;	3278	my ($self, $type, @msg) = @_;
2986		3279
2987	if ($self->extcmd == 2) {
2988	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3280	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2989	} elsif ($self->extcmd == 1) { # TODO: remove
2990	push @msg, msgtype => "event_$type";
2991	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2992	}
2993	}
2994
2995	=item $client->ext_reply ($msgid, @msg)
2996
2997	Sends an ext reply to the client.
2998
2999	=cut
3000
3001	sub cf::client::ext_reply($$@) {
3002	my ($self, $id, @msg) = @_;
3003
3004	if ($self->extcmd == 2) {
3005	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3006	} elsif ($self->extcmd == 1) {
3007	#TODO: version 1, remove
3008	unshift @msg, msgtype => "reply", msgid => $id;
3009	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3010	}
3011	}	3281	}
3012		3282
3013	=item $success = $client->query ($flags, "text", \&cb)	3283	=item $success = $client->query ($flags, "text", \&cb)
3014		3284
3015	Queues a query to the client, calling the given callback with	3285	Queues a query to the client, calling the given callback with
…		…
3035		3305
3036	$self->send_packet ($self->{query_queue}[0][0])	3306	$self->send_packet ($self->{query_queue}[0][0])
3037	if @{ $self->{query_queue} } == 1;	3307	if @{ $self->{query_queue} } == 1;
3038		3308
3039	1	3309	1
		3310	}
		3311
		3312	=item $client->update_command_faces
		3313
		3314	=cut
		3315
		3316	our %COMMAND_FACE;
		3317
		3318	sub cf::client::update_command_faces {
		3319	my ($self) = @_;
		3320
		3321	my @faces = grep $_,
		3322	$COMMAND_FACE{preferred},
		3323	$COMMAND_FACE{standard},
		3324	$COMMAND_FACE{skill},
		3325	$self->pl->ob->flag (cf::FLAG_WIZ) ? $COMMAND_FACE{dm} : (),
		3326	$COMMAND_FACE{emote},
		3327	;
		3328
		3329	$self->send_face ($_)
		3330	for @faces;
		3331	$self->flush_fx;
		3332
		3333	$self->ext_msg (command_list => @faces);
		3334	}
		3335
		3336	=item cf::client::set_command_face $type, $commands
		3337
		3338	=cut
		3339
		3340	sub cf::client::set_command_face {
		3341	my ($type, $list) = @_;
		3342
		3343	my $idx = &cf::face::set ( #d# ugly forward reference
		3344	"command_list/$type" => cf::FT_RSRC,
		3345	JSON::XS->new->utf8->encode ([ sort @$list ])
		3346	);
		3347
		3348	$COMMAND_FACE{$type} = $idx;
3040	}	3349	}
3041		3350
3042	cf::client->attach (	3351	cf::client->attach (
3043	on_connect => sub {	3352	on_connect => sub {
3044	my ($ns) = @_;	3353	my ($ns) = @_;
…		…
3070	my ($ns, $buf) = @_;	3379	my ($ns, $buf) = @_;
3071		3380
3072	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3381	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3073		3382
3074	if (ref $msg) {	3383	if (ref $msg) {
3075	my ($type, $reply, @payload) =	3384	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3076	"ARRAY" eq ref $msg
3077	? @$msg
3078	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3079		3385
3080	my @reply;
3081
3082	if (my $cb = $EXTICMD{$type}) {	3386	if (my $cb = $EXTIACMD{$type}) {
		3387	$cb->(
		3388	$ns,
		3389	sub {
		3390	$ns->ext_msg ("reply-$reply", @_)
		3391	if $reply;
		3392	},
		3393	@payload
		3394	);
		3395	} else {
		3396	my @reply;
		3397
		3398	if (my $cb = $EXTICMD{$type}) {
3083	@reply = $cb->($ns, @payload);	3399	@reply = $cb->($ns, @payload);
		3400	}
		3401
		3402	$ns->ext_msg ("reply-$reply", @reply)
		3403	if $reply;
3084	}	3404	}
3085
3086	$ns->ext_reply ($reply, @reply)
3087	if $reply;
3088
3089	} else {	3405	} else {
3090	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3406	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3091	}	3407	}
3092		3408
3093	cf::override;	3409	cf::override;
3094	},	3410	},
3095	);	3411	);
…		…
3115		3431
3116	$coro	3432	$coro
3117	}	3433	}
3118		3434
3119	cf::client->attach (	3435	cf::client->attach (
3120	on_destroy => sub {	3436	on_client_destroy => sub {
3121	my ($ns) = @_;	3437	my ($ns) = @_;
3122		3438
3123	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3439	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3124	},	3440	},
3125	);	3441	);
…		…
3176	decrease split destroy change_exp value msg lore send_msg)],	3492	decrease split destroy change_exp value msg lore send_msg)],
3177	["cf::object::player" => qw(player)],	3493	["cf::object::player" => qw(player)],
3178	["cf::player" => qw(peaceful send_msg)],	3494	["cf::player" => qw(peaceful send_msg)],
3179	["cf::map" => qw(trigger)],	3495	["cf::map" => qw(trigger)],
3180	) {	3496	) {
3181	no strict 'refs';
3182	my ($pkg, @funs) = @$_;	3497	my ($pkg, @funs) = @$_;
3183	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3498	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3184	for @funs;	3499	for @funs;
3185	}	3500	}
3186		3501
…		…
3225	local @cf::_safe_eval_args = values %vars;	3540	local @cf::_safe_eval_args = values %vars;
3226	@res = wantarray ? eval eval : scalar eval $eval;	3541	@res = wantarray ? eval eval : scalar eval $eval;
3227	}	3542	}
3228		3543
3229	if ($@) {	3544	if ($@) {
3230	warn "$@";	3545	warn "$@",
3231	warn "while executing safe code '$code'\n";	3546	"while executing safe code '$code'\n",
3232	warn "with arguments " . (join " ", %vars) . "\n";	3547	"with arguments " . (join " ", %vars) . "\n";
3233	}	3548	}
3234		3549
3235	wantarray ? @res : $res[0]	3550	wantarray ? @res : $res[0]
3236	}	3551	}
3237		3552
…		…
3251	=cut	3566	=cut
3252		3567
3253	sub register_script_function {	3568	sub register_script_function {
3254	my ($fun, $cb) = @_;	3569	my ($fun, $cb) = @_;
3255		3570
3256	no strict 'refs';	3571	$fun = "safe::$fun" if $CFG{safe_eval};
3257	*{"safe::$fun"} = $safe_hole->wrap ($cb);	3572	*$fun = $safe_hole->wrap ($cb);
3258	}	3573	}
3259		3574
3260	=back	3575	=back
3261		3576
3262	=cut	3577	=cut
3263		3578
3264	#############################################################################	3579	#############################################################################
3265	# the server's init and main functions	3580	# the server's init and main functions
3266		3581
		3582	{
		3583	package cf::face;
		3584
		3585	our %HASH; # hash => idx
		3586	our @DATA; # dynamically-created facedata, only faceste 0 used
		3587	our @FOFS; # file offset, if > 0
		3588	our @SIZE; # size of face, in octets
		3589	our @META; # meta hash of face, if any
		3590	our $DATAFH; # facedata filehandle
		3591
		3592	# internal api, not finalised
		3593	sub set {
		3594	my ($name, $type, $data) = @_;
		3595
		3596	my $idx = cf::face::find $name;
		3597
		3598	if ($idx) {
		3599	delete $HASH{cf::face::get_csum $idx};
		3600	} else {
		3601	$idx = cf::face::alloc $name;
		3602	}
		3603
		3604	my $hash = cf::face::mangle_csum Digest::MD5::md5 $data;
		3605
		3606	cf::face::set_type $idx, $type;
		3607	cf::face::set_csum $idx, 0, $hash;
		3608
		3609	# we need to destroy the SV itself, not just modify it, as a running ix
		3610	# might hold a reference to it: "delete" achieves that.
		3611	delete $FOFS[0][$idx];
		3612	delete $DATA[0][$idx];
		3613	$DATA[0][$idx] = $data;
		3614	$SIZE[0][$idx] = length $data;
		3615	delete $META[$idx];
		3616	$HASH{$hash} = $idx;#d#
		3617
		3618	$idx
		3619	}
		3620
		3621	sub _get_data($$$) {
		3622	my ($idx, $set, $cb) = @_;
		3623
		3624	if (defined $DATA[$set][$idx]) {
		3625	$cb->($DATA[$set][$idx]);
		3626	} elsif (my $fofs = $FOFS[$set][$idx]) {
		3627	my $size = $SIZE[$set][$idx];
		3628	my $buf;
		3629	IO::AIO::aio_read $DATAFH, $fofs, $size, $buf, 0, sub {
		3630	if ($_[0] == $size) {
		3631	#cf::debug "read face $idx, $size from $fofs as ", length $buf;#d#
		3632	$cb->($buf);
		3633	} else {
		3634	cf::error "INTERNAL ERROR: unable to read facedata for face $idx#$set ($size, $fofs), ignoring request.";
		3635	}
		3636	};
		3637	} else {
		3638	cf::error "requested facedata for unknown face $idx#$set, ignoring.";
		3639	}
		3640	}
		3641
		3642	# rather ineffient
		3643	sub cf::face::get_data($;$) {
		3644	my ($idx, $set) = @_;
		3645
		3646	_get_data $idx, $set, Coro::rouse_cb;
		3647	Coro::rouse_wait
		3648	}
		3649
		3650	sub cf::face::ix {
		3651	my ($ns, $set, $idx, $pri) = @_;
		3652
		3653	_get_data $idx, $set, sub {
		3654	$ns->ix_send ($idx, $pri, $_[0]);
		3655	};
		3656	}
		3657	}
		3658
3267	sub load_facedata($) {	3659	sub load_facedata($) {
3268	my ($path) = @_;	3660	my ($path) = @_;
3269		3661
3270	# HACK to clear player env face cache, we need some signal framework
3271	# for this (global event?)
3272	%ext::player_env::MUSIC_FACE_CACHE = ();
3273
3274	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3662	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3275		3663
3276	warn "loading facedata from $path\n";	3664	trace "loading facedata from $path\n";
3277		3665
3278	my $facedata;	3666	my $facedata = decode_storable load_file "$path/faceinfo";
3279	0 < aio_load $path, $facedata
3280	or die "$path: $!";
3281
3282	$facedata = Coro::Storable::thaw $facedata;
3283		3667
3284	$facedata->{version} == 2	3668	$facedata->{version} == 2
3285	or cf::cleanup "$path: version mismatch, cannot proceed.";	3669	or cf::cleanup "$path/faceinfo: version mismatch, cannot proceed.";
3286		3670
3287	# patch in the exptable	3671	my $fh = aio_open "$DATADIR/facedata", IO::AIO::O_RDONLY, 0
3288	$facedata->{resource}{"res/exp_table"} = {	3672	or cf::cleanup "$path/facedata: $!, cannot proceed.";
3289	type => FT_RSRC,	3673
3290	data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),	3674	get_slot 1, -100, "load_facedata"; # make sure we get a very big slot
3291	};	3675
3292	cf::cede_to_tick;	3676	# BEGIN ATOMIC
		3677	# from here on, everything must be atomic - no thread switch allowed
		3678	my $t1 = EV::time;
3293		3679
3294	{	3680	{
3295	my $faces = $facedata->{faceinfo};	3681	my $faces = $facedata->{faceinfo};
3296		3682
3297	while (my ($face, $info) = each %$faces) {	3683	for my $face (sort keys %$faces) {
		3684	my $info = $faces->{$face};
3298	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3685	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3299		3686
3300	cf::face::set_visibility $idx, $info->{visibility};	3687	cf::face::set_visibility $idx, $info->{visibility};
3301	cf::face::set_magicmap $idx, $info->{magicmap};	3688	cf::face::set_magicmap $idx, $info->{magicmap};
3302	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3689	cf::face::set_csum $idx, 0, $info->{hash64}; $cf::face::SIZE[0][$idx] = $info->{size64}; $cf::face::FOFS[0][$idx] = $info->{fofs64};
3303	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3690	cf::face::set_csum $idx, 1, $info->{hash32}; $cf::face::SIZE[1][$idx] = $info->{size32}; $cf::face::FOFS[1][$idx] = $info->{fofs32};
3304		3691	cf::face::set_csum $idx, 2, $info->{glyph}; $cf::face::DATA[2][$idx] = $info->{glyph};
3305	cf::cede_to_tick;	3692	$cf::face::HASH{$info->{hash64}} = $idx;
		3693	delete $cf::face::META[$idx];
3306	}	3694	}
3307		3695
3308	while (my ($face, $info) = each %$faces) {	3696	while (my ($face, $info) = each %$faces) {
3309	next unless $info->{smooth};	3697	next unless $info->{smooth};
3310		3698
…		…
3313		3701
3314	if (my $smooth = cf::face::find $info->{smooth}) {	3702	if (my $smooth = cf::face::find $info->{smooth}) {
3315	cf::face::set_smooth $idx, $smooth;	3703	cf::face::set_smooth $idx, $smooth;
3316	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3704	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3317	} else {	3705	} else {
3318	warn "smooth face '$info->{smooth}' not found for face '$face'";	3706	error "smooth face '$info->{smooth}' not found for face '$face'";
3319	}	3707	}
3320
3321	cf::cede_to_tick;
3322	}	3708	}
3323	}	3709	}
3324		3710
3325	{	3711	{
3326	my $anims = $facedata->{animinfo};	3712	my $anims = $facedata->{animinfo};
3327		3713
3328	while (my ($anim, $info) = each %$anims) {	3714	while (my ($anim, $info) = each %$anims) {
3329	cf::anim::set $anim, $info->{frames}, $info->{facings};	3715	cf::anim::set $anim, $info->{frames}, $info->{facings};
3330	cf::cede_to_tick;
3331	}	3716	}
3332		3717
3333	cf::anim::invalidate_all; # d'oh	3718	cf::anim::invalidate_all; # d'oh
3334	}	3719	}
3335		3720
3336	{	3721	{
3337	my $res = $facedata->{resource};	3722	my $res = $facedata->{resource};
3338		3723
3339	while (my ($name, $info) = each %$res) {	3724	while (my ($name, $info) = each %$res) {
3340	if (defined $info->{type}) {	3725	if (defined (my $type = $info->{type})) {
		3726	# TODO: different hash - must free and use new index, or cache ixface data queue
3341	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3727	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3342		3728
3343	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3344	cf::face::set_type $idx, $info->{type};	3729	cf::face::set_type $idx, $type;
		3730	cf::face::set_csum $idx, 0, $info->{hash};
		3731	$cf::face::SIZE[0][$idx] = $info->{size};
		3732	$cf::face::FOFS[0][$idx] = $info->{fofs};
		3733	$cf::face::META[$idx] = $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3734	$cf::face::HASH{$info->{hash}} = $idx;
3345	} else {	3735	} else {
3346	$RESOURCE{$name} = $info;	3736	# $RESOURCE{$name} = $info; # unused
3347	}	3737	}
3348
3349	cf::cede_to_tick;
3350	}	3738	}
3351	}	3739	}
		3740
		3741	($fh, $cf::face::DATAFH) = ($cf::face::DATAFH, $fh);
		3742
		3743	# HACK to clear player env face cache, we need some signal framework
		3744	# for this (global event?)
		3745	%ext::player_env::MUSIC_FACE_CACHE = ();
		3746
		3747	# END ATOMIC
		3748
		3749	cf::debug "facedata atomic update time ", EV::time - $t1;
3352		3750
3353	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3751	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3354		3752
		3753	aio_close $fh if $fh; # close old facedata
		3754
3355	1	3755	1
3356	}	3756	}
3357
3358	cf::global->attach (on_resource_update => sub {
3359	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3360	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3361
3362	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3363	my $sound = $soundconf->{compat}[$_]
3364	or next;
3365
3366	my $face = cf::face::find "sound/$sound->[1]";
3367	cf::sound::set $sound->[0] => $face;
3368	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3369	}
3370
3371	while (my ($k, $v) = each %{$soundconf->{event}}) {
3372	my $face = cf::face::find "sound/$v";
3373	cf::sound::set $k => $face;
3374	}
3375	}
3376	});
3377		3757
3378	register_exticmd fx_want => sub {	3758	register_exticmd fx_want => sub {
3379	my ($ns, $want) = @_;	3759	my ($ns, $want) = @_;
3380		3760
3381	while (my ($k, $v) = each %$want) {	3761	while (my ($k, $v) = each %$want) {
…		…
3389	my $status = load_resource_file_ $_[0];	3769	my $status = load_resource_file_ $_[0];
3390	get_slot 0.1, 100;	3770	get_slot 0.1, 100;
3391	cf::arch::commit_load;	3771	cf::arch::commit_load;
3392		3772
3393	$status	3773	$status
		3774	}
		3775
		3776	sub reload_exp_table {
		3777	_reload_exp_table;
		3778
		3779	cf::face::set
		3780	"res/exp_table" => FT_RSRC,
		3781	JSON::XS->new->utf8->canonical->encode (
		3782	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3783	);
		3784	}
		3785
		3786	sub reload_materials {
		3787	_reload_materials;
3394	}	3788	}
3395		3789
3396	sub reload_regions {	3790	sub reload_regions {
3397	# HACK to clear player env face cache, we need some signal framework	3791	# HACK to clear player env face cache, we need some signal framework
3398	# for this (global event?)	3792	# for this (global event?)
…		…
3406	if exists $_->{match};	3800	if exists $_->{match};
3407	}	3801	}
3408	}	3802	}
3409		3803
3410	sub reload_facedata {	3804	sub reload_facedata {
3411	load_facedata "$DATADIR/facedata"	3805	load_facedata $DATADIR
3412	or die "unable to load facedata\n";	3806	or die "unable to load facedata\n";
3413	}	3807	}
3414		3808
3415	sub reload_archetypes {	3809	sub reload_archetypes {
3416	load_resource_file "$DATADIR/archetypes"	3810	load_resource_file "$DATADIR/archetypes"
3417	or die "unable to load archetypes\n";	3811	or die "unable to load archetypes\n";
		3812
		3813	cf::face::set
		3814	"res/skill_info" => FT_RSRC,
		3815	JSON::XS->new->utf8->canonical->encode (
		3816	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3817	);
		3818
		3819	cf::face::set
		3820	"res/spell_paths" => FT_RSRC,
		3821	JSON::XS->new->utf8->canonical->encode (
		3822	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3823	);
		3824
		3825	# command completion
		3826	my @commands;
		3827
		3828	for (0..cf::arch::skillvec_size - 1) {
		3829	my $skill = cf::arch::skillvec $_;
		3830	my $name = $skill->name;
		3831	my $flags = cf::skill_flags $skill->subtype;
		3832
		3833	push @commands, "ready_skill $name" if $flags & (SF_COMBAT | SF_RANGED | SF_GRACE);
		3834	push @commands, "use_skill $name" if $flags & (SF_USE | SF_AUTARK | SF_GRACE);
		3835	}
		3836
		3837	cf::client::set_command_face skill => \@commands;
3418	}	3838	}
3419		3839
3420	sub reload_treasures {	3840	sub reload_treasures {
3421	load_resource_file "$DATADIR/treasures"	3841	load_resource_file "$DATADIR/treasures"
3422	or die "unable to load treasurelists\n";	3842	or die "unable to load treasurelists\n";
3423	}	3843	}
3424		3844
		3845	sub reload_sound {
		3846	trace "loading sound config from $DATADIR/sound\n";
		3847
		3848	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3849
		3850	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3851	my $sound = $soundconf->{compat}[$_]
		3852	or next;
		3853
		3854	my $face = cf::face::find "sound/$sound->[1]";
		3855	cf::sound::set $sound->[0] => $face;
		3856	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3857	}
		3858
		3859	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3860	my $face = cf::face::find "sound/$v";
		3861	cf::sound::set $k => $face;
		3862	}
		3863	}
		3864
3425	sub reload_resources {	3865	sub reload_resources {
3426	warn "reloading resource files...\n";	3866	trace "reloading resource files...\n";
3427		3867
		3868	reload_materials;
3428	reload_facedata;	3869	reload_facedata;
		3870	reload_exp_table;
		3871	reload_sound;
3429	reload_archetypes;	3872	reload_archetypes;
3430	reload_regions;	3873	reload_regions;
3431	reload_treasures;	3874	reload_treasures;
3432		3875
3433	warn "finished reloading resource files\n";	3876	trace "finished reloading resource files\n";
3434	}	3877	}
3435		3878
3436	sub reload_config {	3879	sub reload_config {
3437	warn "reloading config file...\n";	3880	trace "reloading config file...\n";
3438		3881
3439	open my $fh, "<:utf8", "$CONFDIR/config"	3882	my $config = load_file "$CONFDIR/config";
3440	or return;	3883	utf8::decode $config;
		3884	*CFG = decode_yaml $config;
3441		3885
3442	local $/;
3443	*CFG = YAML::XS::Load scalar <$fh>;
3444
3445	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3886	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3446		3887
3447	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3888	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3448	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3889	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3449		3890
3450	if (exists $CFG{mlockall}) {	3891	if (exists $CFG{mlockall}) {
…		…
3452	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3893	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3453	and die "WARNING: m(un)lockall failed: $!\n";	3894	and die "WARNING: m(un)lockall failed: $!\n";
3454	};	3895	};
3455	warn $@ if $@;	3896	warn $@ if $@;
3456	}	3897	}
3457
3458	warn "finished reloading resource files\n";
3459	}	3898	}
3460		3899
3461	sub pidfile() {	3900	sub pidfile() {
3462	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3901	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3463	or die "$PIDFILE: $!";	3902	or die "$PIDFILE: $!";
…		…
3476	seek $fh, 0, 0;	3915	seek $fh, 0, 0;
3477	print $fh $$;	3916	print $fh $$;
3478	}	3917	}
3479		3918
3480	sub main_loop {	3919	sub main_loop {
3481	warn "EV::loop starting\n";	3920	trace "EV::run starting\n";
3482	if (1) {	3921	if (1) {
3483	EV::loop;	3922	EV::run;
3484	}	3923	}
3485	warn "EV::loop returned\n";	3924	trace "EV::run returned\n";
3486	goto &main_loop unless $REALLY_UNLOOP;	3925	goto &main_loop unless $REALLY_UNLOOP;
3487	}	3926	}
3488		3927
3489	sub main {	3928	sub main {
3490	cf::init_globals; # initialise logging	3929	cf::init_globals; # initialise logging
3491		3930
3492	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3931	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3493	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3932	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3494	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3933	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3495	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3934	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3496		3935
3497	cf::init_experience;
3498	cf::init_anim;
3499	cf::init_attackmess;
3500	cf::init_dynamic;
3501
3502	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3936	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3503		3937
3504	# we must not ever block the main coroutine	3938	# we must not ever block the main coroutine
3505	local $Coro::idle = sub {	3939	$Coro::idle = sub {
3506	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3940	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3507	(async {	3941	(async {
3508	$Coro::current->{desc} = "IDLE BUG HANDLER";	3942	$Coro::current->{desc} = "IDLE BUG HANDLER";
3509	EV::loop EV::LOOP_ONESHOT;	3943	EV::run EV::RUN_ONCE;
3510	})->prio (Coro::PRIO_MAX);	3944	})->prio (Coro::PRIO_MAX);
3511	};	3945	};
3512		3946
3513	evthread_start IO::AIO::poll_fileno;	3947	evthread_start IO::AIO::poll_fileno;
3514		3948
3515	cf::sync_job {	3949	cf::sync_job {
		3950	cf::incloader::init ();
		3951
		3952	db_init;
		3953
		3954	cf::init_anim;
		3955	cf::init_attackmess;
		3956	cf::init_dynamic;
		3957
3516	cf::load_settings;	3958	cf::load_settings;
3517	cf::load_materials;
3518		3959
3519	reload_resources;	3960	reload_resources;
3520	reload_config;	3961	reload_config;
3521	db_init;
3522		3962
3523	cf::init_uuid;	3963	cf::init_uuid;
3524	cf::init_signals;	3964	cf::init_signals;
3525	cf::init_commands;
3526	cf::init_skills;	3965	cf::init_skills;
3527		3966
3528	cf::init_beforeplay;	3967	cf::init_beforeplay;
3529		3968
3530	atomic;	3969	atomic;
…		…
3535		3974
3536	# no (long-running) fork's whatsoever before this point(!)	3975	# no (long-running) fork's whatsoever before this point(!)
3537	use POSIX ();	3976	use POSIX ();
3538	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3977	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3539		3978
3540	(pop @POST_INIT)->(0) while @POST_INIT;	3979	cf::_post_init 0;
3541	};	3980	};
3542		3981
		3982	cf::object::thawer::errors_are_fatal 0;
		3983	info "parse errors in files are no longer fatal from this point on.\n";
		3984
		3985	AE::postpone {
		3986	undef &main; # free gobs of memory :)
		3987	};
		3988
3543	main_loop;	3989	goto &main_loop;
3544	}	3990	}
3545		3991
3546	#############################################################################	3992	#############################################################################
3547	# initialisation and cleanup	3993	# initialisation and cleanup
3548		3994
3549	# install some emergency cleanup handlers	3995	# install some emergency cleanup handlers
3550	BEGIN {	3996	BEGIN {
3551	our %SIGWATCHER = ();	3997	our %SIGWATCHER = ();
3552	for my $signal (qw(INT HUP TERM)) {	3998	for my $signal (qw(INT HUP TERM)) {
3553	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3999	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3554	cf::cleanup "SIG$signal";	4000	cf::cleanup "SIG$signal";
3555	};	4001	};
3556	}	4002	}
3557	}	4003	}
3558		4004
3559	sub write_runtime_sync {	4005	sub write_runtime_sync {
		4006	my $t0 = AE::time;
		4007
3560	# first touch the runtime file to show we are still running:	4008	# first touch the runtime file to show we are still running:
3561	# the fsync below can take a very very long time.	4009	# the fsync below can take a very very long time.
3562		4010
3563	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	4011	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3564		4012
3565	my $guard = cf::lock_acquire "write_runtime";	4013	my $guard = cf::lock_acquire "write_runtime";
3566		4014
3567	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644	4015	my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3568	or return;	4016	or return;
3569		4017
3570	my $value = $cf::RUNTIME + 90 + 10;	4018	my $value = $cf::RUNTIME + 90 + 10;
3571	# 10 is the runtime save interval, for a monotonic clock	4019	# 10 is the runtime save interval, for a monotonic clock
3572	# 60 allows for the watchdog to kill the server.	4020	# 60 allows for the watchdog to kill the server.
…		…
3585	or return;	4033	or return;
3586		4034
3587	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	4035	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3588	and return;	4036	and return;
3589		4037
3590	warn "runtime file written.\n";	4038	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3591		4039
3592	1	4040	1
3593	}	4041	}
3594		4042
3595	our $uuid_lock;	4043	our $uuid_lock;
…		…
3607	or return;	4055	or return;
3608		4056
3609	my $value = uuid_seq uuid_cur;	4057	my $value = uuid_seq uuid_cur;
3610		4058
3611	unless ($value) {	4059	unless ($value) {
3612	warn "cowardly refusing to write zero uuid value!\n";	4060	info "cowardly refusing to write zero uuid value!\n";
3613	return;	4061	return;
3614	}	4062	}
3615		4063
3616	my $value = uuid_str $value + $uuid_skip;	4064	my $value = uuid_str $value + $uuid_skip;
3617	$uuid_skip = 0;	4065	$uuid_skip = 0;
…		…
3627	or return;	4075	or return;
3628		4076
3629	aio_rename "$uuid~", $uuid	4077	aio_rename "$uuid~", $uuid
3630	and return;	4078	and return;
3631		4079
3632	warn "uuid file written ($value).\n";	4080	trace "uuid file written ($value).\n";
3633		4081
3634	1	4082	1
3635		4083
3636	}	4084	}
3637		4085
…		…
3643	}	4091	}
3644		4092
3645	sub emergency_save() {	4093	sub emergency_save() {
3646	my $freeze_guard = cf::freeze_mainloop;	4094	my $freeze_guard = cf::freeze_mainloop;
3647		4095
3648	warn "emergency_perl_save: enter\n";	4096	info "emergency_perl_save: enter\n";
		4097
		4098	# this is a trade-off: we want to be very quick here, so
		4099	# save all maps without fsync, and later call a global sync
		4100	# (which in turn might be very very slow)
		4101	local $USE_FSYNC = 0;
3649		4102
3650	cf::sync_job {	4103	cf::sync_job {
3651	# this is a trade-off: we want to be very quick here, so	4104	cf::write_runtime_sync; # external watchdog should not bark
3652	# save all maps without fsync, and later call a global sync
3653	# (which in turn might be very very slow)
3654	local $USE_FSYNC = 0;
3655		4105
3656	# use a peculiar iteration method to avoid tripping on perl	4106	# use a peculiar iteration method to avoid tripping on perl
3657	# refcount bugs in for. also avoids problems with players	4107	# refcount bugs in for. also avoids problems with players
3658	# and maps saved/destroyed asynchronously.	4108	# and maps saved/destroyed asynchronously.
3659	warn "emergency_perl_save: begin player save\n";	4109	info "emergency_perl_save: begin player save\n";
3660	for my $login (keys %cf::PLAYER) {	4110	for my $login (keys %cf::PLAYER) {
3661	my $pl = $cf::PLAYER{$login} or next;	4111	my $pl = $cf::PLAYER{$login} or next;
3662	$pl->valid or next;	4112	$pl->valid or next;
3663	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	4113	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3664	$pl->save;	4114	$pl->save;
3665	}	4115	}
3666	warn "emergency_perl_save: end player save\n";	4116	info "emergency_perl_save: end player save\n";
3667		4117
		4118	cf::write_runtime_sync; # external watchdog should not bark
		4119
3668	warn "emergency_perl_save: begin map save\n";	4120	info "emergency_perl_save: begin map save\n";
3669	for my $path (keys %cf::MAP) {	4121	for my $path (keys %cf::MAP) {
3670	my $map = $cf::MAP{$path} or next;	4122	my $map = $cf::MAP{$path} or next;
3671	$map->valid or next;	4123	$map->valid or next;
3672	$map->save;	4124	$map->save;
3673	}	4125	}
3674	warn "emergency_perl_save: end map save\n";	4126	info "emergency_perl_save: end map save\n";
3675		4127
		4128	cf::write_runtime_sync; # external watchdog should not bark
		4129
3676	warn "emergency_perl_save: begin database checkpoint\n";	4130	info "emergency_perl_save: begin database checkpoint\n";
3677	BDB::db_env_txn_checkpoint $DB_ENV;	4131	BDB::db_env_txn_checkpoint $DB_ENV;
3678	warn "emergency_perl_save: end database checkpoint\n";	4132	info "emergency_perl_save: end database checkpoint\n";
3679		4133
3680	warn "emergency_perl_save: begin write uuid\n";	4134	info "emergency_perl_save: begin write uuid\n";
3681	write_uuid_sync 1;	4135	write_uuid_sync 1;
3682	warn "emergency_perl_save: end write uuid\n";	4136	info "emergency_perl_save: end write uuid\n";
		4137
		4138	cf::write_runtime_sync; # external watchdog should not bark
		4139
		4140	trace "emergency_perl_save: syncing database to disk";
		4141	BDB::db_env_txn_checkpoint $DB_ENV;
		4142
		4143	info "emergency_perl_save: starting sync\n";
		4144	IO::AIO::aio_sync sub {
		4145	info "emergency_perl_save: finished sync\n";
		4146	};
		4147
		4148	cf::write_runtime_sync; # external watchdog should not bark
		4149
		4150	trace "emergency_perl_save: flushing outstanding aio requests";
		4151	while (IO::AIO::nreqs || BDB::nreqs) {
		4152	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4153	}
		4154
		4155	cf::write_runtime_sync; # external watchdog should not bark
3683	};	4156	};
3684		4157
3685	warn "emergency_perl_save: starting sync()\n";
3686	IO::AIO::aio_sync sub {
3687	warn "emergency_perl_save: finished sync()\n";
3688	};
3689
3690	warn "emergency_perl_save: leave\n";	4158	info "emergency_perl_save: leave\n";
3691	}	4159	}
3692		4160
3693	sub post_cleanup {	4161	sub post_cleanup {
3694	my ($make_core) = @_;	4162	my ($make_core) = @_;
3695		4163
		4164	IO::AIO::flush;
		4165
3696	warn Carp::longmess "post_cleanup backtrace"	4166	error Carp::longmess "post_cleanup backtrace"
3697	if $make_core;	4167	if $make_core;
3698		4168
3699	my $fh = pidfile;	4169	my $fh = pidfile;
3700	unlink $PIDFILE if <$fh> == $$;	4170	unlink $PIDFILE if <$fh> == $$;
3701	}	4171	}
…		…
3721	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4191	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3722	for my $name (keys %$leaf_symtab) {	4192	for my $name (keys %$leaf_symtab) {
3723	_gv_clear *{"$pkg$name"};	4193	_gv_clear *{"$pkg$name"};
3724	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4194	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3725	}	4195	}
3726	warn "cleared package $pkg\n";#d#
3727	}	4196	}
3728		4197
3729	sub do_reload_perl() {	4198	sub do_reload_perl() {
3730	# can/must only be called in main	4199	# can/must only be called in main
3731	if ($Coro::current != $Coro::main) {	4200	unless (in_main) {
3732	warn "can only reload from main coroutine";	4201	error "can only reload from main coroutine";
3733	return;	4202	return;
3734	}	4203	}
3735		4204
3736	return if $RELOAD++;	4205	return if $RELOAD++;
3737		4206
3738	my $t1 = EV::time;	4207	my $t1 = AE::time;
3739		4208
3740	while ($RELOAD) {	4209	while ($RELOAD) {
3741	warn "reloading...";	4210	cf::get_slot 0.1, -1, "reload_perl";
		4211	info "perl_reload: reloading...";
3742		4212
3743	warn "entering sync_job";	4213	trace "perl_reload: entering sync_job";
3744		4214
3745	cf::sync_job {	4215	cf::sync_job {
3746	cf::write_runtime_sync; # external watchdog should not bark
3747	cf::emergency_save;	4216	#cf::emergency_save;
3748	cf::write_runtime_sync; # external watchdog should not bark
3749		4217
3750	warn "syncing database to disk";
3751	BDB::db_env_txn_checkpoint $DB_ENV;
3752
3753	# if anything goes wrong in here, we should simply crash as we already saved
3754
3755	warn "flushing outstanding aio requests";
3756	while (IO::AIO::nreqs || BDB::nreqs) {
3757	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3758	}
3759
3760	warn "cancelling all extension coros";	4218	trace "perl_reload: cancelling all extension coros";
3761	$_->cancel for values %EXT_CORO;	4219	$_->cancel for values %EXT_CORO;
3762	%EXT_CORO = ();	4220	%EXT_CORO = ();
3763		4221
3764	warn "removing commands";	4222	trace "perl_reload: removing commands";
3765	%COMMAND = ();	4223	%COMMAND = ();
3766		4224
3767	warn "removing ext/exti commands";	4225	trace "perl_reload: removing ext/exti commands";
3768	%EXTCMD = ();	4226	%EXTCMD = ();
3769	%EXTICMD = ();	4227	%EXTICMD = ();
3770		4228
3771	warn "unloading/nuking all extensions";	4229	trace "perl_reload: unloading/nuking all extensions";
3772	for my $pkg (@EXTS) {	4230	for my $pkg (@EXTS) {
3773	warn "... unloading $pkg";	4231	trace "... unloading $pkg";
3774		4232
3775	if (my $cb = $pkg->can ("unload")) {	4233	if (my $cb = $pkg->can ("unload")) {
3776	eval {	4234	eval {
3777	$cb->($pkg);	4235	$cb->($pkg);
3778	1	4236	1
3779	} or warn "$pkg unloaded, but with errors: $@";	4237	} or error "$pkg unloaded, but with errors: $@";
3780	}	4238	}
3781		4239
3782	warn "... clearing $pkg";	4240	trace "... clearing $pkg";
3783	clear_package $pkg;	4241	clear_package $pkg;
3784	}	4242	}
3785		4243
3786	warn "unloading all perl modules loaded from $LIBDIR";	4244	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3787	while (my ($k, $v) = each %INC) {	4245	while (my ($k, $v) = each %INC) {
3788	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4246	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3789		4247
3790	warn "... unloading $k";	4248	trace "... unloading $k";
3791	delete $INC{$k};	4249	delete $INC{$k};
3792		4250
3793	$k =~ s/\.pm$//;	4251	$k =~ s/\.pm$//;
3794	$k =~ s/\//::/g;	4252	$k =~ s/\//::/g;
3795		4253
…		…
3798	}	4256	}
3799		4257
3800	clear_package $k;	4258	clear_package $k;
3801	}	4259	}
3802		4260
3803	warn "getting rid of safe::, as good as possible";	4261	trace "perl_reload: getting rid of safe::, as good as possible";
3804	clear_package "safe::$_"	4262	clear_package "safe::$_"
3805	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4263	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3806		4264
3807	warn "unloading cf.pm \"a bit\"";	4265	trace "perl_reload: unloading cf.pm \"a bit\"";
3808	delete $INC{"cf.pm"};	4266	delete $INC{"cf.pm"};
3809	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4267	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3810		4268
3811	# don't, removes xs symbols, too,	4269	# don't, removes xs symbols, too,
3812	# and global variables created in xs	4270	# and global variables created in xs
3813	#clear_package __PACKAGE__;	4271	#clear_package __PACKAGE__;
3814		4272
3815	warn "unload completed, starting to reload now";	4273	info "perl_reload: unload completed, starting to reload now";
3816		4274
3817	warn "reloading cf.pm";	4275	trace "perl_reload: reloading cf.pm";
3818	require cf;	4276	require cf;
3819	cf::_connect_to_perl_1;	4277	cf::_connect_to_perl_1;
3820		4278
3821	warn "loading config and database again";	4279	trace "perl_reload: loading config and database again";
3822	cf::reload_config;	4280	cf::reload_config;
3823		4281
3824	warn "loading extensions";	4282	trace "perl_reload: loading extensions";
3825	cf::load_extensions;	4283	cf::load_extensions;
3826		4284
3827	if ($REATTACH_ON_RELOAD) {	4285	if ($REATTACH_ON_RELOAD) {
3828	warn "reattaching attachments to objects/players";	4286	trace "perl_reload: reattaching attachments to objects/players";
3829	_global_reattach; # objects, sockets	4287	_global_reattach; # objects, sockets
3830	warn "reattaching attachments to maps";	4288	trace "perl_reload: reattaching attachments to maps";
3831	reattach $_ for values %MAP;	4289	reattach $_ for values %MAP;
3832	warn "reattaching attachments to players";	4290	trace "perl_reload: reattaching attachments to players";
3833	reattach $_ for values %PLAYER;	4291	reattach $_ for values %PLAYER;
3834	}	4292	}
3835		4293
3836	warn "running post_init jobs";	4294	cf::_post_init 1;
3837	(pop @POST_INIT)->(1) while @POST_INIT;
3838		4295
3839	warn "leaving sync_job";	4296	trace "perl_reload: leaving sync_job";
3840		4297
3841	1	4298	1
3842	} or do {	4299	} or do {
3843	warn $@;	4300	error $@;
3844	cf::cleanup "error while reloading, exiting.";	4301	cf::cleanup "perl_reload: error, exiting.";
3845	};	4302	};
3846		4303
3847	warn "reloaded";
3848	--$RELOAD;	4304	--$RELOAD;
3849	}	4305	}
3850		4306
3851	$t1 = EV::time - $t1;	4307	$t1 = AE::time - $t1;
3852	warn "reload completed in ${t1}s\n";	4308	info "perl_reload: completed in ${t1}s\n";
3853	};	4309	};
3854		4310
3855	our $RELOAD_WATCHER; # used only during reload	4311	our $RELOAD_WATCHER; # used only during reload
3856		4312
3857	sub reload_perl() {	4313	sub reload_perl() {
…		…
3859	# coro crashes during coro_state_free->destroy here.	4315	# coro crashes during coro_state_free->destroy here.
3860		4316
3861	$RELOAD_WATCHER ||= cf::async {	4317	$RELOAD_WATCHER ||= cf::async {
3862	Coro::AIO::aio_wait cache_extensions;	4318	Coro::AIO::aio_wait cache_extensions;
3863		4319
3864	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4320	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3865	do_reload_perl;	4321	do_reload_perl;
3866	undef $RELOAD_WATCHER;	4322	undef $RELOAD_WATCHER;
3867	};	4323	};
3868	};	4324	};
3869	}	4325	}
…		…
3878	reload_perl;	4334	reload_perl;
3879	};	4335	};
3880	}	4336	}
3881	};	4337	};
3882		4338
3883	unshift @INC, $LIBDIR;	4339	#############################################################################
3884		4340
3885	my $bug_warning = 0;	4341	my $bug_warning = 0;
3886		4342
3887	our @WAIT_FOR_TICK;
3888	our @WAIT_FOR_TICK_BEGIN;
3889
3890	sub wait_for_tick {	4343	sub wait_for_tick() {
3891	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4344	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3892		4345
3893	my $signal = new Coro::Signal;	4346	$WAIT_FOR_TICK->wait;
3894	push @WAIT_FOR_TICK, $signal;
3895	$signal->wait;
3896	}	4347	}
3897		4348
3898	sub wait_for_tick_begin {	4349	sub wait_for_tick_begin() {
3899	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4350	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3900		4351
3901	my $signal = new Coro::Signal;	4352	my $signal = new Coro::Signal;
3902	push @WAIT_FOR_TICK_BEGIN, $signal;	4353	push @WAIT_FOR_TICK_BEGIN, $signal;
3903	$signal->wait;	4354	$signal->wait;
3904	}	4355	}
…		…
3908	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4359	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3909	unless ++$bug_warning > 10;	4360	unless ++$bug_warning > 10;
3910	return;	4361	return;
3911	}	4362	}
3912		4363
3913	cf::server_tick; # one server iteration	4364	cf::one_tick; # one server iteration
		4365
		4366	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3914		4367
3915	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4368	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3916	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4369	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3917	Coro::async_pool {	4370	Coro::async_pool {
3918	$Coro::current->{desc} = "runtime saver";	4371	$Coro::current->{desc} = "runtime saver";
3919	write_runtime_sync	4372	write_runtime_sync
3920	or warn "ERROR: unable to write runtime file: $!";	4373	or error "ERROR: unable to write runtime file: $!";
3921	};	4374	};
3922	}	4375	}
3923		4376
3924	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4377	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3925	$sig->send;	4378	$sig->send;
3926	}	4379	}
3927	while (my $sig = shift @WAIT_FOR_TICK) {	4380	$WAIT_FOR_TICK->broadcast;
3928	$sig->send;
3929	}
3930		4381
3931	$LOAD = ($NOW - $TICK_START) / $TICK;	4382	$LOAD = ($NOW - $TICK_START) / $TICK;
3932	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4383	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3933		4384
3934	if (0) {	4385	if (0) {
3935	if ($NEXT_TICK) {	4386	if ($NEXT_TICK) {
3936	my $jitter = $TICK_START - $NEXT_TICK;	4387	my $jitter = $TICK_START - $NEXT_TICK;
3937	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4388	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3938	warn "jitter $JITTER\n";#d#	4389	debug "jitter $JITTER\n";#d#
3939	}	4390	}
3940	}	4391	}
3941	}	4392	}
3942		4393
3943	{	4394	{
3944	# configure BDB	4395	# configure BDB
		4396	info "initialising database";
3945		4397
3946	BDB::min_parallel 8;	4398	BDB::min_parallel 16;
3947	BDB::max_poll_reqs $TICK * 0.1;	4399	BDB::max_poll_reqs $TICK * 0.1;
3948	$AnyEvent::BDB::WATCHER->priority (1);	4400	#$AnyEvent::BDB::WATCHER->priority (1);
3949		4401
3950	unless ($DB_ENV) {	4402	unless ($DB_ENV) {
3951	$DB_ENV = BDB::db_env_create;	4403	$DB_ENV = BDB::db_env_create;
3952	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4404	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3953	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4405	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
3978	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4430	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3979	};	4431	};
3980	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4432	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3981	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4433	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3982	};	4434	};
		4435
		4436	info "database initialised";
3983	}	4437	}
3984		4438
3985	{	4439	{
3986	# configure IO::AIO	4440	# configure IO::AIO
3987		4441
		4442	info "initialising aio";
3988	IO::AIO::min_parallel 8;	4443	IO::AIO::min_parallel 8;
3989	IO::AIO::max_poll_time $TICK * 0.1;	4444	IO::AIO::max_poll_time $TICK * 0.1;
3990	undef $AnyEvent::AIO::WATCHER;	4445	undef $AnyEvent::AIO::WATCHER;
		4446	info "aio initialised";
3991	}	4447	}
3992		4448
3993	my $_log_backtrace;	4449	our $_log_backtrace;
		4450	our $_log_backtrace_last;
3994		4451
3995	sub _log_backtrace {	4452	sub _log_backtrace {
3996	my ($msg, @addr) = @_;	4453	my ($msg, @addr) = @_;
3997		4454
3998	$msg =~ s/\n//;	4455	$msg =~ s/\n$//;
3999		4456
		4457	if ($_log_backtrace_last eq $msg) {
		4458	LOG llevInfo, "[ABT] $msg\n";
		4459	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4000	# limit the # of concurrent backtraces	4460	# limit the # of concurrent backtraces
4001	if ($_log_backtrace < 2) {	4461	} elsif ($_log_backtrace < 2) {
		4462	$_log_backtrace_last = $msg;
4002	++$_log_backtrace;	4463	++$_log_backtrace;
4003	my $perl_bt = Carp::longmess $msg;	4464	my $perl_bt = Carp::longmess $msg;
4004	async {	4465	async {
4005	$Coro::current->{desc} = "abt $msg";	4466	$Coro::current->{desc} = "abt $msg";
4006		4467
…		…
4026	LOG llevInfo, "[ABT] $_\n" for @bt;	4487	LOG llevInfo, "[ABT] $_\n" for @bt;
4027	--$_log_backtrace;	4488	--$_log_backtrace;
4028	};	4489	};
4029	} else {	4490	} else {
4030	LOG llevInfo, "[ABT] $msg\n";	4491	LOG llevInfo, "[ABT] $msg\n";
4031	LOG llevInfo, "[ABT] [suppressed]\n";	4492	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4032	}	4493	}
4033	}	4494	}
4034		4495
4035	# load additional modules	4496	# load additional modules
4036	require "cf/$_.pm" for @EXTRA_MODULES;	4497	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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