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.505 by root, Sun Jan 31 03:46:20 2010 UTC vs.
Revision 1.590 by root, Sun Nov 4 02:20:11 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 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 ();
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE;	117	#our %RESOURCE; # unused
		118
		119	our $OUTPUT_RATE_MIN = 3000;
		120	our $OUTPUT_RATE_MAX = 1000000;
		121
		122	our $MAX_LINKS = 32; # how many chained exits to follow
		123	our $VERBOSE_IO = 1;
112		124
113	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)	125	our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
114	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written	126	our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
115	our $NEXT_TICK;	127	our $NEXT_TICK;
116	our $USE_FSYNC = 1; # use fsync to write maps - default on	128	our $USE_FSYNC = 1; # use fsync to write maps - default on
…		…
118	our $BDB_DEADLOCK_WATCHER;	130	our $BDB_DEADLOCK_WATCHER;
119	our $BDB_CHECKPOINT_WATCHER;	131	our $BDB_CHECKPOINT_WATCHER;
120	our $BDB_TRICKLE_WATCHER;	132	our $BDB_TRICKLE_WATCHER;
121	our $DB_ENV;	133	our $DB_ENV;
122		134
123	our @EXTRA_MODULES = qw(pod match mapscript);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
124		136
125	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
126		139
127	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
128	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
129	our $NOW;	143	our $NOW;
130		144
131	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
132	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
133	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
142		156
143	our @POST_INIT;	157	our @POST_INIT;
144		158
145	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
147		164
148	binmode STDOUT;	165	binmode STDOUT;
149	binmode STDERR;	166	binmode STDERR;
150		167
151	# read virtual server time, if available	168	# read virtual server time, if available
…		…
162		179
163	our $EMERGENCY_POSITION;	180	our $EMERGENCY_POSITION;
164		181
165	sub cf::map::normalise;	182	sub cf::map::normalise;
166		183
		184	sub in_main() {
		185	$Coro::current == $Coro::main
		186	}
		187
167	#############################################################################	188	#############################################################################
168		189
169	%REFLECT = ();	190	%REFLECT = ();
170	for (@REFLECT) {	191	for (@REFLECT) {
171	my $reflect = JSON::XS::decode_json $_;	192	my $reflect = JSON::XS::decode_json $_;
…		…
181		202
182	=over 4	203	=over 4
183		204
184	=item $cf::UPTIME	205	=item $cf::UPTIME
185		206
186	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
187		223
188	=item $cf::RUNTIME	224	=item $cf::RUNTIME
189		225
190	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
191	every server tick.	227	every server tick.
…		…
197	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
198	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
199	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
200	database environment.	236	database environment.
201		237
202	=item $cf::NOW
203
204	The time of the last (current) server tick.
205
206	=item $cf::TICK
207
208	The interval between server ticks, in seconds.
209
210	=item $cf::LOADAVG	238	=item $cf::LOADAVG
211		239
212	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
213	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
214	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
223	from wherever your confdir points to.	251	from wherever your confdir points to.
224		252
225	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
226		254
227	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
228	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
229	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
230		275
231	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
232		277
233	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
234	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
242		287
243	=back	288	=back
244		289
245	=cut	290	=cut
246		291
		292	sub error(@) { LOG llevError, join "", @_ }
		293	sub warn (@) { LOG llevWarn , join "", @_ }
		294	sub info (@) { LOG llevInfo , join "", @_ }
		295	sub debug(@) { LOG llevDebug, join "", @_ }
		296	sub trace(@) { LOG llevTrace, join "", @_ }
		297
247	$Coro::State::WARNHOOK = sub {	298	$Coro::State::WARNHOOK = sub {
248	my $msg = join "", @_;	299	my $msg = join "", @_;
249		300
250	$msg .= "\n"	301	$msg .= "\n"
251	unless $msg =~ /\n$/;	302	unless $msg =~ /\n$/;
252		303
253	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	304	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
254		305
255	LOG llevError, $msg;	306	LOG llevWarn, $msg;
256	};	307	};
257		308
258	$Coro::State::DIEHOOK = sub {	309	$Coro::State::DIEHOOK = sub {
259	return unless $^S eq 0; # "eq", not "=="	310	return unless $^S eq 0; # "eq", not "=="
260		311
261	warn Carp::longmess $_[0];	312	error Carp::longmess $_[0];
262		313
263	if ($Coro::current == $Coro::main) {#d#	314	if (in_main) {#d#
264	warn "DIEHOOK called in main context, Coro bug?\n";#d#	315	error "DIEHOOK called in main context, Coro bug?\n";#d#
265	return;#d#	316	return;#d#
266	}#d#	317	}#d#
267		318
268	# kill coroutine otherwise	319	# kill coroutine otherwise
269	Coro::terminate	320	Coro::terminate
…		…
289	)) {	340	)) {
290	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
291	}	342	}
292		343
293	$EV::DIED = sub {	344	$EV::DIED = sub {
294	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
295	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
296		352
297	#############################################################################	353	#############################################################################
298		354
299	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
300		356
…		…
321	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
322	$d	378	$d
323	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
324	}	380	}
325		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
326	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
327		435
328	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
329		437
330	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
336	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
337		445
338	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
339	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
340		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
341	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
342		481
343	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
345		484
346	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
347	is a reload or not.	486	is a reload or not.
348		487
349	=cut	488	=cut
350		489
351	sub post_init(&) {	490	sub post_init(&) {
352	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
353	}	509	}
354		510
355	=item cf::lock_wait $string	511	=item cf::lock_wait $string
356		512
357	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
396	}	552	}
397		553
398	=item cf::periodic $interval, $cb	554	=item cf::periodic $interval, $cb
399		555
400	Like EV::periodic, but randomly selects a starting point so that the actions	556	Like EV::periodic, but randomly selects a starting point so that the actions
401	get spread over timer.	557	get spread over time.
402		558
403	=cut	559	=cut
404		560
405	sub periodic($$) {	561	sub periodic($$) {
406	my ($interval, $cb) = @_;	562	my ($interval, $cb) = @_;
…		…
410	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
411	}	567	}
412		568
413	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
414		570
415	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
416	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
417	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
418		578
419	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
420	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
421		581
422	Useful for short background jobs.	582	Useful for short background jobs.
…		…
451	}	611	}
452	}	612	}
453		613
454	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
455	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
456	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
457	$signal->wait;
458	} else {	617	} else {
459	$busy = 0;	618	$busy = 0;
460	Coro::schedule;	619	Coro::schedule;
461	}	620	}
462	}	621	}
…		…
502	=cut	661	=cut
503		662
504	sub sync_job(&) {	663	sub sync_job(&) {
505	my ($job) = @_;	664	my ($job) = @_;
506		665
507	if ($Coro::current == $Coro::main) {	666	if (in_main) {
508	my $time = EV::time;	667	my $time = AE::time;
509		668
510	# this is the main coro, too bad, we have to block	669	# this is the main coro, too bad, we have to block
511	# till the operation succeeds, freezing the server :/	670	# till the operation succeeds, freezing the server :/
512		671
513	LOG llevError, Carp::longmess "sync job";#d#	672	#LOG llevError, Carp::longmess "sync job";#d#
514		673
515	my $freeze_guard = freeze_mainloop;	674	my $freeze_guard = freeze_mainloop;
516		675
517	my $busy = 1;	676	my $busy = 1;
518	my @res;	677	my @res;
519		678
520	(async {	679	(async {
521	$Coro::current->desc ("sync job coro");	680	$Coro::current->desc ("sync job coro");
522	@res = eval { $job->() };	681	@res = eval { $job->() };
523	warn $@ if $@;	682	error $@ if $@;
524	undef $busy;	683	undef $busy;
525	})->prio (Coro::PRIO_MAX);	684	})->prio (Coro::PRIO_MAX);
526		685
527	while ($busy) {	686	while ($busy) {
528	if (Coro::nready) {	687	if (Coro::nready) {
…		…
530	} else {	689	} else {
531	EV::loop EV::LOOP_ONESHOT;	690	EV::loop EV::LOOP_ONESHOT;
532	}	691	}
533	}	692	}
534		693
535	my $time = EV::time - $time;	694	my $time = AE::time - $time;
536		695
537	$TICK_START += $time; # do not account sync jobs to server load	696	$TICK_START += $time; # do not account sync jobs to server load
538		697
539	wantarray ? @res : $res[0]	698	wantarray ? @res : $res[0]
540	} else {	699	} else {
…		…
562	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
563		722
564	$coro	723	$coro
565	}	724	}
566		725
567	=item fork_call { }, $args	726	=item fork_call { }, @args
568		727
569	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
570	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
571	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
572	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
573		732
574	=cut	733	=cut
575		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
576	sub fork_call(&@) {	739	sub fork_call(&@) {
577	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
578		741
579	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
580	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
581	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
582		745
583	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
584	reset_signals;	747	cf::post_fork;
585	&$cb	748	&$cb
586	}, @args;	749	} @args;
587		750
588	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
		752	}
		753
		754	sub objinfo {
		755	(
		756	"counter value" => cf::object::object_count,
		757	"objects created" => cf::object::create_count,
		758	"objects destroyed" => cf::object::destroy_count,
		759	"freelist size" => cf::object::free_count,
		760	"allocated objects" => cf::object::objects_size,
		761	"active objects" => cf::object::actives_size,
		762	)
589	}	763	}
590		764
591	=item $coin = coin_from_name $name	765	=item $coin = coin_from_name $name
592		766
593	=cut	767	=cut
…		…
630	within each server.	804	within each server.
631		805
632	=cut	806	=cut
633		807
634	sub db_table($) {	808	sub db_table($) {
		809	cf::error "db_get called from main context"
		810	if $Coro::current == $Coro::main;
		811
635	my ($name) = @_;	812	my ($name) = @_;
636	my $db = BDB::db_create $DB_ENV;	813	my $db = BDB::db_create $DB_ENV;
637		814
638	eval {	815	eval {
639	$db->set_flags (BDB::CHKSUM);	816	$db->set_flags (BDB::CHKSUM);
…		…
649	}	826	}
650		827
651	our $DB;	828	our $DB;
652		829
653	sub db_init {	830	sub db_init {
654	cf::sync_job {
655	$DB ||= db_table "db";	831	$DB ||= db_table "db";
656	};
657	}	832	}
658		833
659	sub db_get($$) {	834	sub db_get($$) {
660	my $key = "$_[0]/$_[1]";	835	my $key = "$_[0]/$_[1]";
661		836
662	cf::sync_job {	837	cf::error "db_get called from main context"
		838	if $Coro::current == $Coro::main;
		839
663	BDB::db_get $DB, undef, $key, my $data;	840	BDB::db_get $DB, undef, $key, my $data;
664		841
665	$! ? ()	842	$! ? ()
666	: $data	843	: $data
667	}
668	}	844	}
669		845
670	sub db_put($$$) {	846	sub db_put($$$) {
671	BDB::dbreq_pri 4;	847	BDB::dbreq_pri 4;
672	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	848	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
700		876
701	my @data;	877	my @data;
702	my $md5;	878	my $md5;
703		879
704	for (0 .. $#$src) {	880	for (0 .. $#$src) {
705	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
706	or Carp::croak "$src->[$_]: $!";
707	}	882	}
708		883
709	# if processing is expensive, check	884	# if processing is expensive, check
710	# checksum first	885	# checksum first
711	if (1) {	886	if (1) {
…		…
728		903
729	my $t1 = Time::HiRes::time;	904	my $t1 = Time::HiRes::time;
730	my $data = $process->(\@data);	905	my $data = $process->(\@data);
731	my $t2 = Time::HiRes::time;	906	my $t2 = Time::HiRes::time;
732		907
733	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	908	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
734		909
735	db_put cache => "$id/data", $data;	910	db_put cache => "$id/data", $data;
736	db_put cache => "$id/md5" , $md5;	911	db_put cache => "$id/md5" , $md5;
737	db_put cache => "$id/meta", $meta;	912	db_put cache => "$id/meta", $meta;
738		913
…		…
748		923
749	=cut	924	=cut
750		925
751	sub datalog($@) {	926	sub datalog($@) {
752	my ($type, %kv) = @_;	927	my ($type, %kv) = @_;
753	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	928	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
754	}	929	}
755		930
756	=back	931	=back
757		932
758	=cut	933	=cut
…		…
953		1128
954	} elsif (exists $cb_id{$type}) {	1129	} elsif (exists $cb_id{$type}) {
955	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1130	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
956		1131
957	} elsif (ref $type) {	1132	} elsif (ref $type) {
958	warn "attaching objects not supported, ignoring.\n";	1133	error "attaching objects not supported, ignoring.\n";
959		1134
960	} else {	1135	} else {
961	shift @arg;	1136	shift @arg;
962	warn "attach argument '$type' not supported, ignoring.\n";	1137	error "attach argument '$type' not supported, ignoring.\n";
963	}	1138	}
964	}	1139	}
965	}	1140	}
966		1141
967	sub _object_attach {	1142	sub _object_attach {
…		…
977	_attach $registry, $klass, @attach;	1152	_attach $registry, $klass, @attach;
978	}	1153	}
979		1154
980	$obj->{$name} = \%arg;	1155	$obj->{$name} = \%arg;
981	} else {	1156	} else {
982	warn "object uses attachment '$name' which is not available, postponing.\n";	1157	info "object uses attachment '$name' which is not available, postponing.\n";
983	}	1158	}
984		1159
985	$obj->{_attachment}{$name} = undef;	1160	$obj->{_attachment}{$name} = undef;
986	}	1161	}
987		1162
…		…
1046		1221
1047	for (@$callbacks) {	1222	for (@$callbacks) {
1048	eval { &{$_->[1]} };	1223	eval { &{$_->[1]} };
1049		1224
1050	if ($@) {	1225	if ($@) {
1051	warn "$@";
1052	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1226	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1053	override;	1227	override;
1054	}	1228	}
1055		1229
1056	return 1 if $override;	1230	return 1 if $override;
1057	}	1231	}
…		…
1136	for (@$attach) {	1310	for (@$attach) {
1137	my ($klass, @attach) = @$_;	1311	my ($klass, @attach) = @$_;
1138	_attach $registry, $klass, @attach;	1312	_attach $registry, $klass, @attach;
1139	}	1313	}
1140	} else {	1314	} else {
1141	warn "object uses attachment '$name' that is not available, postponing.\n";	1315	info "object uses attachment '$name' that is not available, postponing.\n";
1142	}	1316	}
1143	}	1317	}
1144	}	1318	}
1145		1319
1146	cf::attachable->attach (	1320	cf::attachable->attach (
…		…
1173	my ($filename, $rdata, $objs) = @_;	1347	my ($filename, $rdata, $objs) = @_;
1174		1348
1175	sync_job {	1349	sync_job {
1176	if (length $$rdata) {	1350	if (length $$rdata) {
1177	utf8::decode (my $decname = $filename);	1351	utf8::decode (my $decname = $filename);
1178	warn sprintf "saving %s (%d,%d)\n",	1352	trace sprintf "saving %s (%d,%d)\n",
1179	$decname, length $$rdata, scalar @$objs;	1353	$decname, length $$rdata, scalar @$objs
		1354	if $VERBOSE_IO;
1180		1355
1181	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1356	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1182	aio_chmod $fh, SAVE_MODE;	1357	aio_chmod $fh, SAVE_MODE;
1183	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1358	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1184	if ($cf::USE_FSYNC) {	1359	if ($cf::USE_FSYNC) {
…		…
1206	aio_rename "$filename~", $filename;	1381	aio_rename "$filename~", $filename;
1207		1382
1208	$filename =~ s%/[^/]+$%%;	1383	$filename =~ s%/[^/]+$%%;
1209	aio_pathsync $filename if $cf::USE_FSYNC;	1384	aio_pathsync $filename if $cf::USE_FSYNC;
1210	} else {	1385	} else {
1211	warn "unable to save objects: $filename~: $!\n";	1386	error "unable to save objects: $filename~: $!\n";
1212	}	1387	}
1213	} else {	1388	} else {
1214	aio_unlink $filename;	1389	aio_unlink $filename;
1215	aio_unlink "$filename.pst";	1390	aio_unlink "$filename.pst";
1216	}	1391	}
…		…
1240	my $st = eval { Coro::Storable::thaw $av };	1415	my $st = eval { Coro::Storable::thaw $av };
1241	$av = $st->{objs};	1416	$av = $st->{objs};
1242	}	1417	}
1243		1418
1244	utf8::decode (my $decname = $filename);	1419	utf8::decode (my $decname = $filename);
1245	warn sprintf "loading %s (%d,%d)\n",	1420	trace sprintf "loading %s (%d,%d)\n",
1246	$decname, length $data, scalar @{$av || []};	1421	$decname, length $data, scalar @{$av || []}
		1422	if $VERBOSE_IO;
1247		1423
1248	($data, $av)	1424	($data, $av)
1249	}	1425	}
1250		1426
1251	=head2 COMMAND CALLBACKS	1427	=head2 COMMAND CALLBACKS
…		…
1310	}	1486	}
1311		1487
1312	use File::Glob ();	1488	use File::Glob ();
1313		1489
1314	cf::player->attach (	1490	cf::player->attach (
1315	on_command => sub {	1491	on_unknown_command => sub {
1316	my ($pl, $name, $params) = @_;	1492	my ($pl, $name, $params) = @_;
1317		1493
1318	my $cb = $COMMAND{$name}	1494	my $cb = $COMMAND{$name}
1319	or return;	1495	or return;
1320		1496
…		…
1328	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1329		1505
1330	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1331		1507
1332	if (ref $msg) {	1508	if (ref $msg) {
1333	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1334	"ARRAY" eq ref $msg
1335	? @$msg
1336	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1337		1510
1338	my @reply;	1511	my @reply;
1339		1512
1340	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1341	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
…		…
1343		1516
1344	$pl->ext_reply ($reply, @reply)	1517	$pl->ext_reply ($reply, @reply)
1345	if $reply;	1518	if $reply;
1346		1519
1347	} else {	1520	} else {
1348	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1349	}	1522	}
1350		1523
1351	cf::override;	1524	cf::override;
1352	},	1525	},
1353	);	1526	);
…		…
1363	};	1536	};
1364		1537
1365	$grp	1538	$grp
1366	}	1539	}
1367		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1368	sub load_extensions {	1552	sub load_extensions {
		1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
		1556
1369	cf::sync_job {	1557	cf::sync_job {
1370	my %todo;	1558	my %todo;
1371		1559
1372	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
1373	next unless -r $path;	1561	next unless -r $path;
…		…
1391		1579
1392	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1580	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1393	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1581	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1394		1582
1395	$ext{source} =	1583	$ext{source} =
1396	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1584	"package $pkg; use common::sense;\n"
1397	. "#line 1 \"$path\"\n{\n"	1585	. "#line 1 \"$path\"\n{\n"
1398	. $source	1586	. $source
1399	. "\n};\n1";	1587	. "\n};\n1";
1400		1588
1401	$todo{$base} = \%ext;	1589	$todo{$base} = \%ext;
…		…
1413	for (split /,\s*/, $v->{meta}{depends}) {	1601	for (split /,\s*/, $v->{meta}{depends}) {
1414	next ext	1602	next ext
1415	unless exists $done{$_};	1603	unless exists $done{$_};
1416	}	1604	}
1417		1605
1418	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1419		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1420	my $active = eval $v->{source};	1617	my $active = eval $source;
1421		1618
1422	if (length $@) {	1619	if (length $@) {
1423	warn "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1424		1621
1425	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1426	if exists $v->{meta}{mandatory};	1623	if exists $v->{meta}{mandatory};
		1624
		1625	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
		1626	delete $todo{$k};
1427	} else {	1627	} else {
1428	$done{$k} = delete $todo{$k};	1628	$done{$k} = delete $todo{$k};
1429	push @EXTS, $v->{pkg};	1629	push @EXTS, $v->{pkg};
1430	$progress = 1;	1630	$progress = 1;
1431		1631
1432	warn "$v->{base}: extension inactive.\n"	1632	info "$v->{base}: extension inactive.\n"
1433	unless $active;	1633	unless $active;
1434	}	1634	}
1435	}	1635	}
1436		1636
1437	unless ($progress) {	1637	unless ($progress) {
…		…
1439		1639
1440	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1441	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1442	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1443	}	1643	}
		1644
		1645	last;
1444	}	1646	}
1445	}	1647	}
1446	};	1648	};
1447	}	1649	}
1448		1650
…		…
1533	$cf::PLAYER{$login} = $pl	1735	$cf::PLAYER{$login} = $pl
1534	}	1736	}
1535	}	1737	}
1536	}	1738	}
1537		1739
		1740	cf::player->attach (
		1741	on_load => sub {
		1742	my ($pl, $path) = @_;
		1743
		1744	# restore slots saved in save, below
		1745	my $slots = delete $pl->{_slots};
		1746
		1747	$pl->ob->current_weapon ($slots->[0]);
		1748	$pl->combat_ob ($slots->[1]);
		1749	$pl->ranged_ob ($slots->[2]);
		1750	},
		1751	);
		1752
1538	sub save($) {	1753	sub save($) {
1539	my ($pl) = @_;	1754	my ($pl) = @_;
1540		1755
1541	return if $pl->{deny_save};	1756	return if $pl->{deny_save};
1542		1757
…		…
1547		1762
1548	aio_mkdir playerdir $pl, 0770;	1763	aio_mkdir playerdir $pl, 0770;
1549	$pl->{last_save} = $cf::RUNTIME;	1764	$pl->{last_save} = $cf::RUNTIME;
1550		1765
1551	cf::get_slot 0.01;	1766	cf::get_slot 0.01;
		1767
		1768	# save slots, to be restored later
		1769	local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1552		1770
1553	$pl->save_pl ($path);	1771	$pl->save_pl ($path);
1554	cf::cede_to_tick;	1772	cf::cede_to_tick;
1555	}	1773	}
1556		1774
…		…
1590	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1591		1809
1592	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1593	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1594		1812
1595	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1596	$pl->deactivate;	1814	$pl->deactivate;
		1815
1597	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1598	$pl->ob->check_score;
1599	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1600	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1601		1821
1602	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1603	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1604	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1658	\@logins	1878	\@logins
1659	}	1879	}
1660		1880
1661	=item $player->maps	1881	=item $player->maps
1662		1882
		1883	=item cf::player::maps $login
		1884
1663	Returns an arrayref of map paths that are private for this	1885	Returns an arrayref of map paths that are private for this
1664	player. May block.	1886	player. May block.
1665		1887
1666	=cut	1888	=cut
1667		1889
…		…
1729	=cut	1951	=cut
1730		1952
1731	sub find_by_path($) {	1953	sub find_by_path($) {
1732	my ($path) = @_;	1954	my ($path) = @_;
1733		1955
		1956	$path =~ s/^~[^\/]*//; # skip ~login
		1957
1734	my ($match, $specificity);	1958	my ($match, $specificity);
1735		1959
1736	for my $region (list) {	1960	for my $region (list) {
1737	if ($region->{match} && $path =~ $region->{match}) {	1961	if ($region->{match} && $path =~ $region->{match}) {
1738	($match, $specificity) = ($region, $region->specificity)	1962	($match, $specificity) = ($region, $region->specificity)
…		…
1766	sub generate_random_map {	1990	sub generate_random_map {
1767	my ($self, $rmp) = @_;	1991	my ($self, $rmp) = @_;
1768		1992
1769	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1993	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1770		1994
1771	# mit "rum" bekleckern, nicht
1772	$self->_create_random_map (	1995	$self->_create_random_map ($rmp);
1773	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1774	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1775	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1776	$rmp->{exit_on_final_map},
1777	$rmp->{xsize}, $rmp->{ysize},
1778	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1779	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1780	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1781	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1782	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1783	(cf::region::find $rmp->{region}), $rmp->{custom}
1784	)
1785	}	1996	}
1786		1997
1787	=item cf::map->register ($regex, $prio)	1998	=item cf::map->register ($regex, $prio)
1788		1999
1789	Register a handler for the map path matching the given regex at the	2000	Register a handler for the map path matching the given regex at the
…		…
1794		2005
1795	sub register {	2006	sub register {
1796	my (undef, $regex, $prio) = @_;	2007	my (undef, $regex, $prio) = @_;
1797	my $pkg = caller;	2008	my $pkg = caller;
1798		2009
1799	no strict;
1800	push @{"$pkg\::ISA"}, __PACKAGE__;	2010	push @{"$pkg\::ISA"}, __PACKAGE__;
1801		2011
1802	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2012	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1803	}	2013	}
1804		2014
1805	# also paths starting with '/'	2015	# also paths starting with '/'
1806	$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}];	2016	$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1807		2017
1808	sub thawer_merge {	2018	sub thawer_merge {
1809	my ($self, $merge) = @_;	2019	my ($self, $merge) = @_;
1810		2020
1811	# we have to keep some variables in memory intact	2021	# we have to keep some variables in memory intact
…		…
1816	}	2026	}
1817		2027
1818	sub normalise {	2028	sub normalise {
1819	my ($path, $base) = @_;	2029	my ($path, $base) = @_;
1820		2030
1821	$path = "$path"; # make sure its a string	2031	$path = "$path"; # make sure it's a string
1822		2032
1823	$path =~ s/\.map$//;	2033	$path =~ s/\.map$//;
1824		2034
1825	# map plan:	2035	# map plan:
1826	#	2036	#
…		…
1841	$base =~ s{[^/]+/?$}{};	2051	$base =~ s{[^/]+/?$}{};
1842	$path = "$base/$path";	2052	$path = "$base/$path";
1843	}	2053	}
1844		2054
1845	for ($path) {	2055	for ($path) {
1846	redo if s{//}{/};
1847	redo if s{/\.?/}{/};	2056	redo if s{/\.?/}{/};
1848	redo if s{/[^/]+/\.\./}{/};	2057	redo if s{/[^/]+/\.\./}{/};
1849	}	2058	}
1850		2059
1851	$path	2060	$path
…		…
1865	$self->init; # pass $1 etc.	2074	$self->init; # pass $1 etc.
1866	return $self;	2075	return $self;
1867	}	2076	}
1868	}	2077	}
1869		2078
1870	Carp::cluck "unable to resolve path '$path' (base '$base').";	2079	Carp::cluck "unable to resolve path '$path' (base '$base')";
1871	()	2080	()
1872	}	2081	}
1873		2082
		2083	# may re-bless or do other evil things
1874	sub init {	2084	sub init {
1875	my ($self) = @_;	2085	my ($self) = @_;
1876		2086
1877	$self	2087	$self
1878	}	2088	}
…		…
1943	$self->{load_path} = $path;	2153	$self->{load_path} = $path;
1944		2154
1945	1	2155	1
1946	}	2156	}
1947		2157
		2158	# used to laod the header of an original map
1948	sub load_header_orig {	2159	sub load_header_orig {
1949	my ($self) = @_;	2160	my ($self) = @_;
1950		2161
1951	$self->load_header_from ($self->load_path)	2162	$self->load_header_from ($self->load_path)
1952	}	2163	}
1953		2164
		2165	# used to laod the header of an instantiated map
1954	sub load_header_temp {	2166	sub load_header_temp {
1955	my ($self) = @_;	2167	my ($self) = @_;
1956		2168
1957	$self->load_header_from ($self->save_path)	2169	$self->load_header_from ($self->save_path)
1958	}	2170	}
1959		2171
		2172	# called after loading the header from an instantiated map
1960	sub prepare_temp {	2173	sub prepare_temp {
1961	my ($self) = @_;	2174	my ($self) = @_;
1962		2175
1963	$self->last_access ((delete $self->{last_access})	2176	$self->last_access ((delete $self->{last_access})
1964	|| $cf::RUNTIME); #d#	2177	|| $cf::RUNTIME); #d#
1965	# safety	2178	# safety
1966	$self->{instantiate_time} = $cf::RUNTIME	2179	$self->{instantiate_time} = $cf::RUNTIME
1967	if $self->{instantiate_time} > $cf::RUNTIME;	2180	if $self->{instantiate_time} > $cf::RUNTIME;
1968	}	2181	}
1969		2182
		2183	# called after loading the header from an original map
1970	sub prepare_orig {	2184	sub prepare_orig {
1971	my ($self) = @_;	2185	my ($self) = @_;
1972		2186
1973	$self->{load_original} = 1;	2187	$self->{load_original} = 1;
1974	$self->{instantiate_time} = $cf::RUNTIME;	2188	$self->{instantiate_time} = $cf::RUNTIME;
…		…
1998		2212
1999	sub find;	2213	sub find;
2000	sub find {	2214	sub find {
2001	my ($path, $origin) = @_;	2215	my ($path, $origin) = @_;
2002		2216
		2217	cf::cede_to_tick;
		2218
2003	$path = normalise $path, $origin && $origin->path;	2219	$path = normalise $path, $origin;
2004		2220
2005	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2221	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2006	my $guard2 = cf::lock_acquire "map_find:$path";	2222	my $guard2 = cf::lock_acquire "map_find:$path";
2007		2223
2008	$cf::MAP{$path} || do {	2224	$cf::MAP{$path} || do {
…		…
2039		2255
2040	{	2256	{
2041	my $guard = cf::lock_acquire "map_data:$path";	2257	my $guard = cf::lock_acquire "map_data:$path";
2042		2258
2043	return unless $self->valid;	2259	return unless $self->valid;
2044	return unless $self->in_memory == cf::MAP_SWAPPED;	2260	return unless $self->state == cf::MAP_SWAPPED;
2045
2046	$self->in_memory (cf::MAP_LOADING);
2047		2261
2048	$self->alloc;	2262	$self->alloc;
2049		2263
2050	$self->pre_load;	2264	$self->pre_load;
2051	cf::cede_to_tick;	2265	cf::cede_to_tick;
2052		2266
		2267	if (exists $self->{load_path}) {
2053	my $f = new_from_file cf::object::thawer $self->{load_path};	2268	my $f = new_from_file cf::object::thawer $self->{load_path};
2054	$f->skip_block;	2269	$f->skip_block;
2055	$self->_load_objects ($f)	2270	$self->_load_objects ($f)
2056	or return;	2271	or return;
2057		2272
2058	$self->post_load_original	2273	$self->post_load_original
2059	if delete $self->{load_original};	2274	if delete $self->{load_original};
2060		2275
2061	if (my $uniq = $self->uniq_path) {	2276	if (my $uniq = $self->uniq_path) {
2062	utf8::encode $uniq;	2277	utf8::encode $uniq;
2063	unless (aio_stat $uniq) {	2278	unless (aio_stat $uniq) {
2064	if (my $f = new_from_file cf::object::thawer $uniq) {	2279	if (my $f = new_from_file cf::object::thawer $uniq) {
2065	$self->clear_unique_items;	2280	$self->clear_unique_items;
2066	$self->_load_objects ($f);	2281	$self->_load_objects ($f);
2067	$f->resolve_delayed_derefs;	2282	$f->resolve_delayed_derefs;
		2283	}
2068	}	2284	}
2069	}	2285	}
2070	}
2071		2286
2072	$f->resolve_delayed_derefs;	2287	$f->resolve_delayed_derefs;
		2288	} else {
		2289	$self->post_load_original
		2290	if delete $self->{load_original};
		2291	}
		2292
		2293	$self->state (cf::MAP_INACTIVE);
2073		2294
2074	cf::cede_to_tick;	2295	cf::cede_to_tick;
2075	# now do the right thing for maps	2296	# now do the right thing for maps
2076	$self->link_multipart_objects;	2297	$self->link_multipart_objects;
2077	$self->difficulty ($self->estimate_difficulty)	2298	$self->difficulty ($self->estimate_difficulty)
…		…
2081	unless ($self->{deny_activate}) {	2302	unless ($self->{deny_activate}) {
2082	$self->decay_objects;	2303	$self->decay_objects;
2083	$self->fix_auto_apply;	2304	$self->fix_auto_apply;
2084	$self->update_buttons;	2305	$self->update_buttons;
2085	cf::cede_to_tick;	2306	cf::cede_to_tick;
2086	$self->activate;	2307	#$self->activate; # no longer activate maps automatically
2087	}	2308	}
2088		2309
2089	$self->{last_save} = $cf::RUNTIME;	2310	$self->{last_save} = $cf::RUNTIME;
2090	$self->last_access ($cf::RUNTIME);	2311	$self->last_access ($cf::RUNTIME);
2091
2092	$self->in_memory (cf::MAP_ACTIVE);
2093	}	2312	}
2094		2313
2095	$self->post_load;	2314	$self->post_load;
2096	}
2097		2315
		2316	1
		2317	}
		2318
		2319	# customize the map for a given player, i.e.
		2320	# return the _real_ map. used by e.g. per-player
		2321	# maps to change the path to ~playername/mappath
2098	sub customise_for {	2322	sub customise_for {
2099	my ($self, $ob) = @_;	2323	my ($self, $ob) = @_;
2100		2324
2101	return find "~" . $ob->name . "/" . $self->{path}	2325	return find "~" . $ob->name . "/" . $self->{path}
2102	if $self->per_player;	2326	if $self->per_player;
…		…
2105	# if $self->per_party;	2329	# if $self->per_party;
2106		2330
2107	$self	2331	$self
2108	}	2332	}
2109		2333
2110	# find and load all maps in the 3x3 area around a map
2111	sub load_neighbours {
2112	my ($map) = @_;
2113
2114	my @neigh; # diagonal neighbours
2115
2116	for (0 .. 3) {
2117	my $neigh = $map->tile_path ($_)
2118	or next;
2119	$neigh = find $neigh, $map
2120	or next;
2121	$neigh->load;
2122
2123	push @neigh,
2124	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2125	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2126	}
2127
2128	for (grep defined $_->[0], @neigh) {
2129	my ($path, $origin) = @$_;
2130	my $neigh = find $path, $origin
2131	or next;
2132	$neigh->load;
2133	}
2134	}
2135
2136	sub find_sync {	2334	sub find_sync {
2137	my ($path, $origin) = @_;	2335	my ($path, $origin) = @_;
2138		2336
2139	cf::sync_job { find $path, $origin }	2337	# it's a bug to call this from the main context
		2338	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2339	if $Coro::current == $Coro::main;
		2340
		2341	find $path, $origin
2140	}	2342	}
2141		2343
2142	sub do_load_sync {	2344	sub do_load_sync {
2143	my ($map) = @_;	2345	my ($map) = @_;
2144		2346
		2347	# it's a bug to call this from the main context
2145	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2348	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2146	if $Coro::current == $Coro::main;	2349	if $Coro::current == $Coro::main;
2147		2350
2148	cf::sync_job { $map->load };	2351	$map->load;
2149	}	2352	}
2150		2353
2151	our %MAP_PREFETCH;	2354	our %MAP_PREFETCH;
2152	our $MAP_PREFETCHER = undef;	2355	our $MAP_PREFETCHER = undef;
2153		2356
2154	sub find_async {	2357	sub find_async {
2155	my ($path, $origin, $load) = @_;	2358	my ($path, $origin, $load) = @_;
2156		2359
2157	$path = normalise $path, $origin && $origin->{path};	2360	$path = normalise $path, $origin;
2158		2361
2159	if (my $map = $cf::MAP{$path}) {	2362	if (my $map = $cf::MAP{$path}) {
2160	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2363	return $map if !$load || $map->linkable;
2161	}	2364	}
2162		2365
2163	$MAP_PREFETCH{$path} |= $load;	2366	$MAP_PREFETCH{$path} |= $load;
2164		2367
2165	$MAP_PREFETCHER ||= cf::async {	2368	$MAP_PREFETCHER ||= cf::async {
…		…
2179	$MAP_PREFETCHER->prio (6);	2382	$MAP_PREFETCHER->prio (6);
2180		2383
2181	()	2384	()
2182	}	2385	}
2183		2386
		2387	# common code, used by both ->save and ->swapout
2184	sub save {	2388	sub _save {
2185	my ($self) = @_;	2389	my ($self) = @_;
2186
2187	my $lock = cf::lock_acquire "map_data:$self->{path}";
2188		2390
2189	$self->{last_save} = $cf::RUNTIME;	2391	$self->{last_save} = $cf::RUNTIME;
2190		2392
2191	return unless $self->dirty;	2393	return unless $self->dirty;
2192		2394
…		…
2212	} else {	2414	} else {
2213	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);	2415	$self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2214	}	2416	}
2215	}	2417	}
2216		2418
		2419	sub save {
		2420	my ($self) = @_;
		2421
		2422	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2423
		2424	$self->_save;
		2425	}
		2426
2217	sub swap_out {	2427	sub swap_out {
2218	my ($self) = @_;	2428	my ($self) = @_;
2219		2429
2220	# save first because save cedes
2221	$self->save;
2222
2223	my $lock = cf::lock_acquire "map_data:$self->{path}";	2430	my $lock = cf::lock_acquire "map_data:$self->{path}";
2224		2431
		2432	return if !$self->linkable;
		2433	return if $self->{deny_save};
2225	return if $self->players;	2434	return if $self->players;
2226	return if $self->in_memory != cf::MAP_ACTIVE;	2435
		2436	# first deactivate the map and "unlink" it from the core
		2437	$self->deactivate;
		2438	$_->clear_links_to ($self) for values %cf::MAP;
		2439	$self->state (cf::MAP_SWAPPED);
		2440
		2441	# then atomically save
		2442	$self->_save;
		2443
		2444	# then free the map
		2445	$self->clear;
		2446	}
		2447
		2448	sub reset_at {
		2449	my ($self) = @_;
		2450
		2451	# TODO: safety, remove and allow resettable per-player maps
2227	return if $self->{deny_save};	2452	return 1e99 if $self->{deny_reset};
2228		2453
		2454	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
		2455	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
		2456
		2457	$time + $to
		2458	}
		2459
		2460	sub should_reset {
		2461	my ($self) = @_;
		2462
		2463	$self->reset_at <= $cf::RUNTIME
		2464	}
		2465
		2466	sub reset {
		2467	my ($self) = @_;
		2468
		2469	my $lock = cf::lock_acquire "map_data:$self->{path}";
		2470
		2471	return if $self->players;
		2472
		2473	cf::trace "resetting map ", $self->path, "\n";
		2474
2229	$self->in_memory (cf::MAP_SWAPPED);	2475	$self->state (cf::MAP_SWAPPED);
		2476
		2477	# need to save uniques path
		2478	unless ($self->{deny_save}) {
		2479	my $uniq = $self->uniq_path; utf8::encode $uniq;
		2480
		2481	$self->_save_objects ($uniq, cf::IO_UNIQUES)
		2482	if $uniq;
		2483	}
		2484
		2485	delete $cf::MAP{$self->path};
2230		2486
2231	$self->deactivate;	2487	$self->deactivate;
2232	$_->clear_links_to ($self) for values %cf::MAP;	2488	$_->clear_links_to ($self) for values %cf::MAP;
2233	$self->clear;	2489	$self->clear;
2234	}
2235
2236	sub reset_at {
2237	my ($self) = @_;
2238
2239	# TODO: safety, remove and allow resettable per-player maps
2240	return 1e99 if $self->{deny_reset};
2241
2242	my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
2243	my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
2244
2245	$time + $to
2246	}
2247
2248	sub should_reset {
2249	my ($self) = @_;
2250
2251	$self->reset_at <= $cf::RUNTIME
2252	}
2253
2254	sub reset {
2255	my ($self) = @_;
2256
2257	my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2259	return if $self->players;
2260
2261	warn "resetting map ", $self->path, "\n";
2262
2263	$self->in_memory (cf::MAP_SWAPPED);
2264
2265	# need to save uniques path
2266	unless ($self->{deny_save}) {
2267	my $uniq = $self->uniq_path; utf8::encode $uniq;
2268
2269	$self->_save_objects ($uniq, cf::IO_UNIQUES)
2270	if $uniq;
2271	}
2272
2273	delete $cf::MAP{$self->path};
2274
2275	$self->deactivate;
2276	$_->clear_links_to ($self) for values %cf::MAP;
2277	$self->clear;
2278		2490
2279	$self->unlink_save;	2491	$self->unlink_save;
2280	$self->destroy;	2492	$self->destroy;
2281	}	2493	}
2282		2494
…		…
2290		2502
2291	delete $cf::MAP{$self->path};	2503	delete $cf::MAP{$self->path};
2292		2504
2293	$self->unlink_save;	2505	$self->unlink_save;
2294		2506
2295	bless $self, "cf::map";	2507	bless $self, "cf::map::wrap";
2296	delete $self->{deny_reset};	2508	delete $self->{deny_reset};
2297	$self->{deny_save} = 1;	2509	$self->{deny_save} = 1;
2298	$self->reset_timeout (1);	2510	$self->reset_timeout (1);
2299	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));	2511	$self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2300		2512
…		…
2530		2742
2531	Freezes the player and moves him/her to a special map (C<{link}>).	2743	Freezes the player and moves him/her to a special map (C<{link}>).
2532		2744
2533	The player should be reasonably safe there for short amounts of time (e.g.	2745	The player should be reasonably safe there for short amounts of time (e.g.
2534	for loading a map). You I<MUST> call C<leave_link> as soon as possible,	2746	for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2535	though, as the palyer cannot control the character while it is on the link	2747	though, as the player cannot control the character while it is on the link
2536	map.	2748	map.
2537		2749
2538	Will never block.	2750	Will never block.
2539		2751
2540	=item $player_object->leave_link ($map, $x, $y)	2752	=item $player_object->leave_link ($map, $x, $y)
…		…
2561	sub cf::object::player::enter_link {	2773	sub cf::object::player::enter_link {
2562	my ($self) = @_;	2774	my ($self) = @_;
2563		2775
2564	$self->deactivate_recursive;	2776	$self->deactivate_recursive;
2565		2777
		2778	++$self->{_link_recursion};
		2779
2566	return if UNIVERSAL::isa $self->map, "ext::map_link";	2780	return if UNIVERSAL::isa $self->map, "ext::map_link";
2567		2781
2568	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]	2782	$self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2569	if $self->map && $self->map->{path} ne "{link}";	2783	if $self->map && $self->map->{path} ne "{link}";
2570		2784
2571	$self->enter_map ($LINK_MAP || link_map, 10, 10);	2785	$self->enter_map ($LINK_MAP || link_map, 3, 3);
2572	}	2786	}
2573		2787
2574	sub cf::object::player::leave_link {	2788	sub cf::object::player::leave_link {
2575	my ($self, $map, $x, $y) = @_;	2789	my ($self, $map, $x, $y) = @_;
2576		2790
…		…
2596	# use -1 or undef as default coordinates, not 0, 0	2810	# use -1 or undef as default coordinates, not 0, 0
2597	($x, $y) = ($map->enter_x, $map->enter_y)	2811	($x, $y) = ($map->enter_x, $map->enter_y)
2598	if $x <= 0 && $y <= 0;	2812	if $x <= 0 && $y <= 0;
2599		2813
2600	$map->load;	2814	$map->load;
2601	$map->load_neighbours;
2602		2815
2603	return unless $self->contr->active;	2816	return unless $self->contr->active;
2604		2817
2605	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2818	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2606	$self->enter_map ($map, $x, $y);	2819	if ($self->enter_map ($map, $x, $y)) {
2607		2820	# entering was successful
		2821	delete $self->{_link_recursion};
2608	# only activate afterwards, to support waiting in hooks	2822	# only activate afterwards, to support waiting in hooks
2609	$self->activate_recursive;	2823	$self->activate_recursive;
2610	}	2824	}
2611		2825
		2826	}
		2827
2612	=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])	2828	=item $player_object->goto ($path, $x, $y[, $check->($map, $x, $y, $player)[, $done->($player)]])
2613		2829
2614	Moves the player to the given map-path and coordinates by first freezing	2830	Moves the player to the given map-path and coordinates by first freezing
2615	her, loading and preparing them map, calling the provided $check callback	2831	her, loading and preparing them map, calling the provided $check callback
2616	that has to return the map if sucecssful, and then unfreezes the player on	2832	that has to return the map if sucecssful, and then unfreezes the player on
2617	the new (success) or old (failed) map position. In either case, $done will	2833	the new (success) or old (failed) map position. In either case, $done will
…		…
2624		2840
2625	our $GOTOGEN;	2841	our $GOTOGEN;
2626		2842
2627	sub cf::object::player::goto {	2843	sub cf::object::player::goto {
2628	my ($self, $path, $x, $y, $check, $done) = @_;	2844	my ($self, $path, $x, $y, $check, $done) = @_;
		2845
		2846	if ($self->{_link_recursion} >= $MAX_LINKS) {
		2847	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
		2848	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
		2849	($path, $x, $y) = @$EMERGENCY_POSITION;
		2850	}
2629		2851
2630	# do generation counting so two concurrent goto's will be executed in-order	2852	# do generation counting so two concurrent goto's will be executed in-order
2631	my $gen = $self->{_goto_generation} = ++$GOTOGEN;	2853	my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2632		2854
2633	$self->enter_link;	2855	$self->enter_link;
…		…
2653	($path, $x, $y) = (undef, undef, undef);	2875	($path, $x, $y) = (undef, undef, undef);
2654	}	2876	}
2655	}	2877	}
2656		2878
2657	my $map = eval {	2879	my $map = eval {
2658	my $map = defined $path ? cf::map::find $path : undef;	2880	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2659		2881
2660	if ($map) {	2882	if ($map) {
2661	$map = $map->customise_for ($self);	2883	$map = $map->customise_for ($self);
2662	$map = $check->($map) if $check && $map;	2884	$map = $check->($map, $x, $y, $self) if $check && $map;
2663	} else {	2885	} else {
2664	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);	2886	$self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2665	}	2887	}
2666		2888
2667	$map	2889	$map
…		…
2675	if ($gen == $self->{_goto_generation}) {	2897	if ($gen == $self->{_goto_generation}) {
2676	delete $self->{_goto_generation};	2898	delete $self->{_goto_generation};
2677	$self->leave_link ($map, $x, $y);	2899	$self->leave_link ($map, $x, $y);
2678	}	2900	}
2679		2901
2680	$done->() if $done;	2902	$done->($self) if $done;
2681	})->prio (1);	2903	})->prio (1);
2682	}	2904	}
2683		2905
2684	=item $player_object->enter_exit ($exit_object)	2906	=item $player_object->enter_exit ($exit_object)
2685		2907
…		…
2753	$Coro::current->{desc} = "enter_exit";	2975	$Coro::current->{desc} = "enter_exit";
2754		2976
2755	unless (eval {	2977	unless (eval {
2756	$self->deactivate_recursive; # just to be sure	2978	$self->deactivate_recursive; # just to be sure
2757		2979
2758	# random map handling
2759	{
2760	my $guard = cf::lock_acquire "exit_prepare:$exit";
2761
2762	prepare_random_map $exit
2763	if $exit->slaying eq "/!";
2764	}
2765
2766	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2980	my $map = cf::map::normalise $exit->slaying, $exit->map;
2767	my $x = $exit->stats->hp;	2981	my $x = $exit->stats->hp;
2768	my $y = $exit->stats->sp;	2982	my $y = $exit->stats->sp;
		2983
		2984	# special map handling
		2985	my $slaying = $exit->slaying;
		2986
		2987	# special map handling
		2988	if ($slaying eq "/!") {
		2989	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2990
		2991	prepare_random_map $exit
		2992	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2993
		2994	$map = $exit->slaying;
		2995
		2996	} elsif ($slaying eq '!up') {
		2997	$map = $exit->map->tile_path (cf::TILE_UP);
		2998	$x = $exit->x;
		2999	$y = $exit->y;
		3000
		3001	} elsif ($slaying eq '!down') {
		3002	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3003	$x = $exit->x;
		3004	$y = $exit->y;
		3005	}
2769		3006
2770	$self->goto ($map, $x, $y);	3007	$self->goto ($map, $x, $y);
2771		3008
2772	# if exit is damned, update players death & WoR home-position	3009	# if exit is damned, update players death & WoR home-position
2773	$self->contr->savebed ($map, $x, $y)	3010	$self->contr->savebed ($map, $x, $y)
…		…
2778	$self->message ("Something went wrong deep within the deliantra server. "	3015	$self->message ("Something went wrong deep within the deliantra server. "
2779	. "I'll try to bring you back to the map you were before. "	3016	. "I'll try to bring you back to the map you were before. "
2780	. "Please report this to the dungeon master!",	3017	. "Please report this to the dungeon master!",
2781	cf::NDI_UNIQUE | cf::NDI_RED);	3018	cf::NDI_UNIQUE | cf::NDI_RED);
2782		3019
2783	warn "ERROR in enter_exit: $@";	3020	error "ERROR in enter_exit: $@";
2784	$self->leave_link;	3021	$self->leave_link;
2785	}	3022	}
2786	})->prio (1);	3023	})->prio (1);
2787	}	3024	}
2788		3025
…		…
2998	=cut	3235	=cut
2999		3236
3000	sub cf::client::ext_msg($$@) {	3237	sub cf::client::ext_msg($$@) {
3001	my ($self, $type, @msg) = @_;	3238	my ($self, $type, @msg) = @_;
3002		3239
3003	if ($self->extcmd == 2) {
3004	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3005	} elsif ($self->extcmd == 1) { # TODO: remove
3006	push @msg, msgtype => "event_$type";
3007	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3008	}
3009	}	3241	}
3010		3242
3011	=item $client->ext_reply ($msgid, @msg)	3243	=item $client->ext_reply ($msgid, @msg)
3012		3244
3013	Sends an ext reply to the client.	3245	Sends an ext reply to the client.
…		…
3015	=cut	3247	=cut
3016		3248
3017	sub cf::client::ext_reply($$@) {	3249	sub cf::client::ext_reply($$@) {
3018	my ($self, $id, @msg) = @_;	3250	my ($self, $id, @msg) = @_;
3019		3251
3020	if ($self->extcmd == 2) {
3021	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3252	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3022	} elsif ($self->extcmd == 1) {
3023	#TODO: version 1, remove
3024	unshift @msg, msgtype => "reply", msgid => $id;
3025	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3026	}
3027	}	3253	}
3028		3254
3029	=item $success = $client->query ($flags, "text", \&cb)	3255	=item $success = $client->query ($flags, "text", \&cb)
3030		3256
3031	Queues a query to the client, calling the given callback with	3257	Queues a query to the client, calling the given callback with
…		…
3086	my ($ns, $buf) = @_;	3312	my ($ns, $buf) = @_;
3087		3313
3088	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3314	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3089		3315
3090	if (ref $msg) {	3316	if (ref $msg) {
3091	my ($type, $reply, @payload) =	3317	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3092	"ARRAY" eq ref $msg
3093	? @$msg
3094	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3095		3318
3096	my @reply;	3319	my @reply;
3097		3320
3098	if (my $cb = $EXTICMD{$type}) {	3321	if (my $cb = $EXTICMD{$type}) {
3099	@reply = $cb->($ns, @payload);	3322	@reply = $cb->($ns, @payload);
…		…
3101		3324
3102	$ns->ext_reply ($reply, @reply)	3325	$ns->ext_reply ($reply, @reply)
3103	if $reply;	3326	if $reply;
3104		3327
3105	} else {	3328	} else {
3106	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3329	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3107	}	3330	}
3108		3331
3109	cf::override;	3332	cf::override;
3110	},	3333	},
3111	);	3334	);
…		…
3131		3354
3132	$coro	3355	$coro
3133	}	3356	}
3134		3357
3135	cf::client->attach (	3358	cf::client->attach (
3136	on_destroy => sub {	3359	on_client_destroy => sub {
3137	my ($ns) = @_;	3360	my ($ns) = @_;
3138		3361
3139	$_->cancel for values %{ (delete $ns->{_coro}) || {} };	3362	$_->cancel for values %{ (delete $ns->{_coro}) || {} };
3140	},	3363	},
3141	);	3364	);
…		…
3192	decrease split destroy change_exp value msg lore send_msg)],	3415	decrease split destroy change_exp value msg lore send_msg)],
3193	["cf::object::player" => qw(player)],	3416	["cf::object::player" => qw(player)],
3194	["cf::player" => qw(peaceful send_msg)],	3417	["cf::player" => qw(peaceful send_msg)],
3195	["cf::map" => qw(trigger)],	3418	["cf::map" => qw(trigger)],
3196	) {	3419	) {
3197	no strict 'refs';
3198	my ($pkg, @funs) = @$_;	3420	my ($pkg, @funs) = @$_;
3199	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3421	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3200	for @funs;	3422	for @funs;
3201	}	3423	}
3202		3424
…		…
3241	local @cf::_safe_eval_args = values %vars;	3463	local @cf::_safe_eval_args = values %vars;
3242	@res = wantarray ? eval eval : scalar eval $eval;	3464	@res = wantarray ? eval eval : scalar eval $eval;
3243	}	3465	}
3244		3466
3245	if ($@) {	3467	if ($@) {
3246	warn "$@";	3468	warn "$@",
3247	warn "while executing safe code '$code'\n";	3469	"while executing safe code '$code'\n",
3248	warn "with arguments " . (join " ", %vars) . "\n";	3470	"with arguments " . (join " ", %vars) . "\n";
3249	}	3471	}
3250		3472
3251	wantarray ? @res : $res[0]	3473	wantarray ? @res : $res[0]
3252	}	3474	}
3253		3475
…		…
3278	=cut	3500	=cut
3279		3501
3280	#############################################################################	3502	#############################################################################
3281	# the server's init and main functions	3503	# the server's init and main functions
3282		3504
		3505	our %FACEHASH; # hash => idx, #d# HACK for http server
		3506
		3507	# internal api, not fianlised
		3508	sub add_face {
		3509	my ($name, $type, $data) = @_;
		3510
		3511	my $idx = cf::face::find $name;
		3512
		3513	if ($idx) {
		3514	delete $FACEHASH{cf::face::get_chksum $idx};
		3515	} else {
		3516	$idx = cf::face::alloc $name;
		3517	}
		3518
		3519	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3520
		3521	cf::face::set_type $idx, $type;
		3522	cf::face::set_data $idx, 0, $data, $hash;
		3523	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3524	$FACEHASH{$hash} = $idx;#d#
		3525
		3526	$idx
		3527	}
		3528
3283	sub load_facedata($) {	3529	sub load_facedata($) {
3284	my ($path) = @_;	3530	my ($path) = @_;
3285		3531
3286	# HACK to clear player env face cache, we need some signal framework	3532	# HACK to clear player env face cache, we need some signal framework
3287	# for this (global event?)	3533	# for this (global event?)
3288	%ext::player_env::MUSIC_FACE_CACHE = ();	3534	%ext::player_env::MUSIC_FACE_CACHE = ();
3289		3535
3290	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3536	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3291		3537
3292	warn "loading facedata from $path\n";	3538	trace "loading facedata from $path\n";
3293		3539
3294	my $facedata;	3540	my $facedata = decode_storable load_file $path;
3295	0 < aio_load $path, $facedata
3296	or die "$path: $!";
3297
3298	$facedata = Coro::Storable::thaw $facedata;
3299		3541
3300	$facedata->{version} == 2	3542	$facedata->{version} == 2
3301	or cf::cleanup "$path: version mismatch, cannot proceed.";	3543	or cf::cleanup "$path: version mismatch, cannot proceed.";
3302		3544
3303	# patch in the exptable
3304	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3305	$facedata->{resource}{"res/exp_table"} = {
3306	type => FT_RSRC,
3307	data => $exp_table,
3308	hash => (Digest::MD5::md5 $exp_table),
3309	};
3310	cf::cede_to_tick;	3545	cf::cede_to_tick;
3311		3546
3312	{	3547	{
3313	my $faces = $facedata->{faceinfo};	3548	my $faces = $facedata->{faceinfo};
3314		3549
3315	while (my ($face, $info) = each %$faces) {	3550	for my $face (sort keys %$faces) {
		3551	my $info = $faces->{$face};
3316	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3552	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3317		3553
3318	cf::face::set_visibility $idx, $info->{visibility};	3554	cf::face::set_visibility $idx, $info->{visibility};
3319	cf::face::set_magicmap $idx, $info->{magicmap};	3555	cf::face::set_magicmap $idx, $info->{magicmap};
3320	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3556	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3321	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3557	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3558	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3559	$FACEHASH{$info->{hash64}} = $idx;#d#
3322		3560
3323	cf::cede_to_tick;	3561	cf::cede_to_tick;
3324	}	3562	}
3325		3563
3326	while (my ($face, $info) = each %$faces) {	3564	while (my ($face, $info) = each %$faces) {
…		…
3331		3569
3332	if (my $smooth = cf::face::find $info->{smooth}) {	3570	if (my $smooth = cf::face::find $info->{smooth}) {
3333	cf::face::set_smooth $idx, $smooth;	3571	cf::face::set_smooth $idx, $smooth;
3334	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3572	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3335	} else {	3573	} else {
3336	warn "smooth face '$info->{smooth}' not found for face '$face'";	3574	error "smooth face '$info->{smooth}' not found for face '$face'";
3337	}	3575	}
3338		3576
3339	cf::cede_to_tick;	3577	cf::cede_to_tick;
3340	}	3578	}
3341	}	3579	}
…		…
3353		3591
3354	{	3592	{
3355	my $res = $facedata->{resource};	3593	my $res = $facedata->{resource};
3356		3594
3357	while (my ($name, $info) = each %$res) {	3595	while (my ($name, $info) = each %$res) {
3358	if (defined $info->{type}) {	3596	if (defined (my $type = $info->{type})) {
		3597	# TODO: different hash - must free and use new index, or cache ixface data queue
3359	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3598	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3360		3599
		3600	cf::face::set_type $idx, $type;
3361	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3601	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3362	cf::face::set_type $idx, $info->{type};	3602	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3603	$FACEHASH{$info->{hash}} = $idx;#d#
3363	} else {	3604	} else {
3364	$RESOURCE{$name} = $info;	3605	# $RESOURCE{$name} = $info; # unused
3365	}	3606	}
3366		3607
3367	cf::cede_to_tick;	3608	cf::cede_to_tick;
3368	}	3609	}
3369	}	3610	}
3370		3611
3371	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);	3612	cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3372		3613
3373	1	3614	1
3374	}	3615	}
3375
3376	cf::global->attach (on_resource_update => sub {
3377	if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3378	$soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3379
3380	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3381	my $sound = $soundconf->{compat}[$_]
3382	or next;
3383
3384	my $face = cf::face::find "sound/$sound->[1]";
3385	cf::sound::set $sound->[0] => $face;
3386	cf::sound::old_sound_index $_, $face; # gcfclient-compat
3387	}
3388
3389	while (my ($k, $v) = each %{$soundconf->{event}}) {
3390	my $face = cf::face::find "sound/$v";
3391	cf::sound::set $k => $face;
3392	}
3393	}
3394	});
3395		3616
3396	register_exticmd fx_want => sub {	3617	register_exticmd fx_want => sub {
3397	my ($ns, $want) = @_;	3618	my ($ns, $want) = @_;
3398		3619
3399	while (my ($k, $v) = each %$want) {	3620	while (my ($k, $v) = each %$want) {
…		…
3407	my $status = load_resource_file_ $_[0];	3628	my $status = load_resource_file_ $_[0];
3408	get_slot 0.1, 100;	3629	get_slot 0.1, 100;
3409	cf::arch::commit_load;	3630	cf::arch::commit_load;
3410		3631
3411	$status	3632	$status
		3633	}
		3634
		3635	sub reload_exp_table {
		3636	_reload_exp_table;
		3637
		3638	add_face "res/exp_table" => FT_RSRC,
		3639	JSON::XS->new->utf8->canonical->encode (
		3640	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3641	);
		3642	}
		3643
		3644	sub reload_materials {
		3645	_reload_materials;
3412	}	3646	}
3413		3647
3414	sub reload_regions {	3648	sub reload_regions {
3415	# HACK to clear player env face cache, we need some signal framework	3649	# HACK to clear player env face cache, we need some signal framework
3416	# for this (global event?)	3650	# for this (global event?)
…		…
3431	}	3665	}
3432		3666
3433	sub reload_archetypes {	3667	sub reload_archetypes {
3434	load_resource_file "$DATADIR/archetypes"	3668	load_resource_file "$DATADIR/archetypes"
3435	or die "unable to load archetypes\n";	3669	or die "unable to load archetypes\n";
		3670
		3671	add_face "res/skill_info" => FT_RSRC,
		3672	JSON::XS->new->utf8->canonical->encode (
		3673	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3674	);
		3675	add_face "res/spell_paths" => FT_RSRC,
		3676	JSON::XS->new->utf8->canonical->encode (
		3677	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3678	);
3436	}	3679	}
3437		3680
3438	sub reload_treasures {	3681	sub reload_treasures {
3439	load_resource_file "$DATADIR/treasures"	3682	load_resource_file "$DATADIR/treasures"
3440	or die "unable to load treasurelists\n";	3683	or die "unable to load treasurelists\n";
3441	}	3684	}
3442		3685
		3686	sub reload_sound {
		3687	trace "loading sound config from $DATADIR/sound\n";
		3688
		3689	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
		3690
		3691	for (0 .. SOUND_CAST_SPELL_0 - 1) {
		3692	my $sound = $soundconf->{compat}[$_]
		3693	or next;
		3694
		3695	my $face = cf::face::find "sound/$sound->[1]";
		3696	cf::sound::set $sound->[0] => $face;
		3697	cf::sound::old_sound_index $_, $face; # gcfclient-compat
		3698	}
		3699
		3700	while (my ($k, $v) = each %{$soundconf->{event}}) {
		3701	my $face = cf::face::find "sound/$v";
		3702	cf::sound::set $k => $face;
		3703	}
		3704	}
		3705
3443	sub reload_resources {	3706	sub reload_resources {
3444	warn "reloading resource files...\n";	3707	trace "reloading resource files...\n";
3445		3708
		3709	reload_materials;
3446	reload_facedata;	3710	reload_facedata;
		3711	reload_exp_table;
		3712	reload_sound;
3447	reload_archetypes;	3713	reload_archetypes;
3448	reload_regions;	3714	reload_regions;
3449	reload_treasures;	3715	reload_treasures;
3450		3716
3451	warn "finished reloading resource files\n";	3717	trace "finished reloading resource files\n";
3452	}	3718	}
3453		3719
3454	sub reload_config {	3720	sub reload_config {
3455	warn "reloading config file...\n";	3721	trace "reloading config file...\n";
3456		3722
3457	open my $fh, "<:utf8", "$CONFDIR/config"	3723	my $config = load_file "$CONFDIR/config";
3458	or return;	3724	utf8::decode $config;
		3725	*CFG = decode_yaml $config;
3459		3726
3460	local $/;
3461	*CFG = YAML::XS::Load scalar <$fh>;
3462
3463	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];	3727	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3464		3728
3465	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3729	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3466	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3730	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3467		3731
3468	if (exists $CFG{mlockall}) {	3732	if (exists $CFG{mlockall}) {
…		…
3470	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3734	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3471	and die "WARNING: m(un)lockall failed: $!\n";	3735	and die "WARNING: m(un)lockall failed: $!\n";
3472	};	3736	};
3473	warn $@ if $@;	3737	warn $@ if $@;
3474	}	3738	}
3475
3476	warn "finished reloading resource files\n";
3477	}	3739	}
3478		3740
3479	sub pidfile() {	3741	sub pidfile() {
3480	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3742	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3481	or die "$PIDFILE: $!";	3743	or die "$PIDFILE: $!";
…		…
3494	seek $fh, 0, 0;	3756	seek $fh, 0, 0;
3495	print $fh $$;	3757	print $fh $$;
3496	}	3758	}
3497		3759
3498	sub main_loop {	3760	sub main_loop {
3499	warn "EV::loop starting\n";	3761	trace "EV::loop starting\n";
3500	if (1) {	3762	if (1) {
3501	EV::loop;	3763	EV::loop;
3502	}	3764	}
3503	warn "EV::loop returned\n";	3765	trace "EV::loop returned\n";
3504	goto &main_loop unless $REALLY_UNLOOP;	3766	goto &main_loop unless $REALLY_UNLOOP;
3505	}	3767	}
3506		3768
3507	sub main {	3769	sub main {
3508	cf::init_globals; # initialise logging	3770	cf::init_globals; # initialise logging
3509		3771
3510	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3772	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3511	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3773	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3512	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3774	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3513	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3775	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3514		3776
3515	cf::init_experience;
3516	cf::init_anim;
3517	cf::init_attackmess;
3518	cf::init_dynamic;
3519
3520	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3777	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3521		3778
3522	# we must not ever block the main coroutine	3779	# we must not ever block the main coroutine
3523	local $Coro::idle = sub {	3780	$Coro::idle = sub {
3524	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3781	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3525	(async {	3782	(async {
3526	$Coro::current->{desc} = "IDLE BUG HANDLER";	3783	$Coro::current->{desc} = "IDLE BUG HANDLER";
3527	EV::loop EV::LOOP_ONESHOT;	3784	EV::loop EV::LOOP_ONESHOT;
3528	})->prio (Coro::PRIO_MAX);	3785	})->prio (Coro::PRIO_MAX);
3529	};	3786	};
3530		3787
3531	evthread_start IO::AIO::poll_fileno;	3788	evthread_start IO::AIO::poll_fileno;
3532		3789
3533	cf::sync_job {	3790	cf::sync_job {
		3791	cf::incloader::init ();
		3792
		3793	cf::init_anim;
		3794	cf::init_attackmess;
		3795	cf::init_dynamic;
		3796
3534	cf::load_settings;	3797	cf::load_settings;
3535	cf::load_materials;
3536		3798
3537	reload_resources;	3799	reload_resources;
3538	reload_config;	3800	reload_config;
3539	db_init;	3801	db_init;
3540		3802
3541	cf::init_uuid;	3803	cf::init_uuid;
3542	cf::init_signals;	3804	cf::init_signals;
3543	cf::init_commands;
3544	cf::init_skills;	3805	cf::init_skills;
3545		3806
3546	cf::init_beforeplay;	3807	cf::init_beforeplay;
3547		3808
3548	atomic;	3809	atomic;
…		…
3553		3814
3554	# no (long-running) fork's whatsoever before this point(!)	3815	# no (long-running) fork's whatsoever before this point(!)
3555	use POSIX ();	3816	use POSIX ();
3556	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3817	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3557		3818
3558	(pop @POST_INIT)->(0) while @POST_INIT;	3819	cf::_post_init 0;
3559	};	3820	};
3560		3821
		3822	cf::object::thawer::errors_are_fatal 0;
		3823	info "parse errors in files are no longer fatal from this point on.\n";
		3824
		3825	AE::postpone {
		3826	undef &main; # free gobs of memory :)
		3827	};
		3828
3561	main_loop;	3829	goto &main_loop;
3562	}	3830	}
3563		3831
3564	#############################################################################	3832	#############################################################################
3565	# initialisation and cleanup	3833	# initialisation and cleanup
3566		3834
3567	# install some emergency cleanup handlers	3835	# install some emergency cleanup handlers
3568	BEGIN {	3836	BEGIN {
3569	our %SIGWATCHER = ();	3837	our %SIGWATCHER = ();
3570	for my $signal (qw(INT HUP TERM)) {	3838	for my $signal (qw(INT HUP TERM)) {
3571	$SIGWATCHER{$signal} = EV::signal $signal, sub {	3839	$SIGWATCHER{$signal} = AE::signal $signal, sub {
3572	cf::cleanup "SIG$signal";	3840	cf::cleanup "SIG$signal";
3573	};	3841	};
3574	}	3842	}
3575	}	3843	}
3576		3844
3577	sub write_runtime_sync {	3845	sub write_runtime_sync {
		3846	my $t0 = AE::time;
		3847
3578	# first touch the runtime file to show we are still running:	3848	# first touch the runtime file to show we are still running:
3579	# the fsync below can take a very very long time.	3849	# the fsync below can take a very very long time.
3580		3850
3581	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;	3851	IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3582		3852
…		…
3603	or return;	3873	or return;
3604		3874
3605	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3875	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3606	and return;	3876	and return;
3607		3877
3608	warn "runtime file written.\n";	3878	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3609		3879
3610	1	3880	1
3611	}	3881	}
3612		3882
3613	our $uuid_lock;	3883	our $uuid_lock;
…		…
3625	or return;	3895	or return;
3626		3896
3627	my $value = uuid_seq uuid_cur;	3897	my $value = uuid_seq uuid_cur;
3628		3898
3629	unless ($value) {	3899	unless ($value) {
3630	warn "cowardly refusing to write zero uuid value!\n";	3900	info "cowardly refusing to write zero uuid value!\n";
3631	return;	3901	return;
3632	}	3902	}
3633		3903
3634	my $value = uuid_str $value + $uuid_skip;	3904	my $value = uuid_str $value + $uuid_skip;
3635	$uuid_skip = 0;	3905	$uuid_skip = 0;
…		…
3645	or return;	3915	or return;
3646		3916
3647	aio_rename "$uuid~", $uuid	3917	aio_rename "$uuid~", $uuid
3648	and return;	3918	and return;
3649		3919
3650	warn "uuid file written ($value).\n";	3920	trace "uuid file written ($value).\n";
3651		3921
3652	1	3922	1
3653		3923
3654	}	3924	}
3655		3925
…		…
3661	}	3931	}
3662		3932
3663	sub emergency_save() {	3933	sub emergency_save() {
3664	my $freeze_guard = cf::freeze_mainloop;	3934	my $freeze_guard = cf::freeze_mainloop;
3665		3935
3666	warn "emergency_perl_save: enter\n";	3936	info "emergency_perl_save: enter\n";
		3937
		3938	# this is a trade-off: we want to be very quick here, so
		3939	# save all maps without fsync, and later call a global sync
		3940	# (which in turn might be very very slow)
		3941	local $USE_FSYNC = 0;
3667		3942
3668	cf::sync_job {	3943	cf::sync_job {
3669	# this is a trade-off: we want to be very quick here, so	3944	cf::write_runtime_sync; # external watchdog should not bark
3670	# save all maps without fsync, and later call a global sync
3671	# (which in turn might be very very slow)
3672	local $USE_FSYNC = 0;
3673		3945
3674	# use a peculiar iteration method to avoid tripping on perl	3946	# use a peculiar iteration method to avoid tripping on perl
3675	# refcount bugs in for. also avoids problems with players	3947	# refcount bugs in for. also avoids problems with players
3676	# and maps saved/destroyed asynchronously.	3948	# and maps saved/destroyed asynchronously.
3677	warn "emergency_perl_save: begin player save\n";	3949	info "emergency_perl_save: begin player save\n";
3678	for my $login (keys %cf::PLAYER) {	3950	for my $login (keys %cf::PLAYER) {
3679	my $pl = $cf::PLAYER{$login} or next;	3951	my $pl = $cf::PLAYER{$login} or next;
3680	$pl->valid or next;	3952	$pl->valid or next;
3681	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3953	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3682	$pl->save;	3954	$pl->save;
3683	}	3955	}
3684	warn "emergency_perl_save: end player save\n";	3956	info "emergency_perl_save: end player save\n";
3685		3957
		3958	cf::write_runtime_sync; # external watchdog should not bark
		3959
3686	warn "emergency_perl_save: begin map save\n";	3960	info "emergency_perl_save: begin map save\n";
3687	for my $path (keys %cf::MAP) {	3961	for my $path (keys %cf::MAP) {
3688	my $map = $cf::MAP{$path} or next;	3962	my $map = $cf::MAP{$path} or next;
3689	$map->valid or next;	3963	$map->valid or next;
3690	$map->save;	3964	$map->save;
3691	}	3965	}
3692	warn "emergency_perl_save: end map save\n";	3966	info "emergency_perl_save: end map save\n";
3693		3967
		3968	cf::write_runtime_sync; # external watchdog should not bark
		3969
3694	warn "emergency_perl_save: begin database checkpoint\n";	3970	info "emergency_perl_save: begin database checkpoint\n";
3695	BDB::db_env_txn_checkpoint $DB_ENV;	3971	BDB::db_env_txn_checkpoint $DB_ENV;
3696	warn "emergency_perl_save: end database checkpoint\n";	3972	info "emergency_perl_save: end database checkpoint\n";
3697		3973
3698	warn "emergency_perl_save: begin write uuid\n";	3974	info "emergency_perl_save: begin write uuid\n";
3699	write_uuid_sync 1;	3975	write_uuid_sync 1;
3700	warn "emergency_perl_save: end write uuid\n";	3976	info "emergency_perl_save: end write uuid\n";
		3977
		3978	cf::write_runtime_sync; # external watchdog should not bark
		3979
		3980	trace "emergency_perl_save: syncing database to disk";
		3981	BDB::db_env_txn_checkpoint $DB_ENV;
		3982
		3983	info "emergency_perl_save: starting sync\n";
		3984	IO::AIO::aio_sync sub {
		3985	info "emergency_perl_save: finished sync\n";
		3986	};
		3987
		3988	cf::write_runtime_sync; # external watchdog should not bark
		3989
		3990	trace "emergency_perl_save: flushing outstanding aio requests";
		3991	while (IO::AIO::nreqs || BDB::nreqs) {
		3992	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3993	}
		3994
		3995	cf::write_runtime_sync; # external watchdog should not bark
3701	};	3996	};
3702		3997
3703	warn "emergency_perl_save: starting sync()\n";
3704	IO::AIO::aio_sync sub {
3705	warn "emergency_perl_save: finished sync()\n";
3706	};
3707
3708	warn "emergency_perl_save: leave\n";	3998	info "emergency_perl_save: leave\n";
3709	}	3999	}
3710		4000
3711	sub post_cleanup {	4001	sub post_cleanup {
3712	my ($make_core) = @_;	4002	my ($make_core) = @_;
3713		4003
		4004	IO::AIO::flush;
		4005
3714	warn Carp::longmess "post_cleanup backtrace"	4006	error Carp::longmess "post_cleanup backtrace"
3715	if $make_core;	4007	if $make_core;
3716		4008
3717	my $fh = pidfile;	4009	my $fh = pidfile;
3718	unlink $PIDFILE if <$fh> == $$;	4010	unlink $PIDFILE if <$fh> == $$;
3719	}	4011	}
…		…
3739	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};	4031	my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3740	for my $name (keys %$leaf_symtab) {	4032	for my $name (keys %$leaf_symtab) {
3741	_gv_clear *{"$pkg$name"};	4033	_gv_clear *{"$pkg$name"};
3742	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};	4034	# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3743	}	4035	}
3744	warn "cleared package $pkg\n";#d#
3745	}	4036	}
3746		4037
3747	sub do_reload_perl() {	4038	sub do_reload_perl() {
3748	# can/must only be called in main	4039	# can/must only be called in main
3749	if ($Coro::current != $Coro::main) {	4040	unless (in_main) {
3750	warn "can only reload from main coroutine";	4041	error "can only reload from main coroutine";
3751	return;	4042	return;
3752	}	4043	}
3753		4044
3754	return if $RELOAD++;	4045	return if $RELOAD++;
3755		4046
3756	my $t1 = EV::time;	4047	my $t1 = AE::time;
3757		4048
3758	while ($RELOAD) {	4049	while ($RELOAD) {
3759	warn "reloading...";	4050	cf::get_slot 0.1, -1, "reload_perl";
		4051	info "perl_reload: reloading...";
3760		4052
3761	warn "entering sync_job";	4053	trace "perl_reload: entering sync_job";
3762		4054
3763	cf::sync_job {	4055	cf::sync_job {
3764	cf::write_runtime_sync; # external watchdog should not bark
3765	cf::emergency_save;	4056	#cf::emergency_save;
3766	cf::write_runtime_sync; # external watchdog should not bark
3767		4057
3768	warn "syncing database to disk";
3769	BDB::db_env_txn_checkpoint $DB_ENV;
3770
3771	# if anything goes wrong in here, we should simply crash as we already saved
3772
3773	warn "flushing outstanding aio requests";
3774	while (IO::AIO::nreqs || BDB::nreqs) {
3775	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3776	}
3777
3778	warn "cancelling all extension coros";	4058	trace "perl_reload: cancelling all extension coros";
3779	$_->cancel for values %EXT_CORO;	4059	$_->cancel for values %EXT_CORO;
3780	%EXT_CORO = ();	4060	%EXT_CORO = ();
3781		4061
3782	warn "removing commands";	4062	trace "perl_reload: removing commands";
3783	%COMMAND = ();	4063	%COMMAND = ();
3784		4064
3785	warn "removing ext/exti commands";	4065	trace "perl_reload: removing ext/exti commands";
3786	%EXTCMD = ();	4066	%EXTCMD = ();
3787	%EXTICMD = ();	4067	%EXTICMD = ();
3788		4068
3789	warn "unloading/nuking all extensions";	4069	trace "perl_reload: unloading/nuking all extensions";
3790	for my $pkg (@EXTS) {	4070	for my $pkg (@EXTS) {
3791	warn "... unloading $pkg";	4071	trace "... unloading $pkg";
3792		4072
3793	if (my $cb = $pkg->can ("unload")) {	4073	if (my $cb = $pkg->can ("unload")) {
3794	eval {	4074	eval {
3795	$cb->($pkg);	4075	$cb->($pkg);
3796	1	4076	1
3797	} or warn "$pkg unloaded, but with errors: $@";	4077	} or error "$pkg unloaded, but with errors: $@";
3798	}	4078	}
3799		4079
3800	warn "... clearing $pkg";	4080	trace "... clearing $pkg";
3801	clear_package $pkg;	4081	clear_package $pkg;
3802	}	4082	}
3803		4083
3804	warn "unloading all perl modules loaded from $LIBDIR";	4084	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3805	while (my ($k, $v) = each %INC) {	4085	while (my ($k, $v) = each %INC) {
3806	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4086	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3807		4087
3808	warn "... unloading $k";	4088	trace "... unloading $k";
3809	delete $INC{$k};	4089	delete $INC{$k};
3810		4090
3811	$k =~ s/\.pm$//;	4091	$k =~ s/\.pm$//;
3812	$k =~ s/\//::/g;	4092	$k =~ s/\//::/g;
3813		4093
…		…
3816	}	4096	}
3817		4097
3818	clear_package $k;	4098	clear_package $k;
3819	}	4099	}
3820		4100
3821	warn "getting rid of safe::, as good as possible";	4101	trace "perl_reload: getting rid of safe::, as good as possible";
3822	clear_package "safe::$_"	4102	clear_package "safe::$_"
3823	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4103	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3824		4104
3825	warn "unloading cf.pm \"a bit\"";	4105	trace "perl_reload: unloading cf.pm \"a bit\"";
3826	delete $INC{"cf.pm"};	4106	delete $INC{"cf.pm"};
3827	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4107	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3828		4108
3829	# don't, removes xs symbols, too,	4109	# don't, removes xs symbols, too,
3830	# and global variables created in xs	4110	# and global variables created in xs
3831	#clear_package __PACKAGE__;	4111	#clear_package __PACKAGE__;
3832		4112
3833	warn "unload completed, starting to reload now";	4113	info "perl_reload: unload completed, starting to reload now";
3834		4114
3835	warn "reloading cf.pm";	4115	trace "perl_reload: reloading cf.pm";
3836	require cf;	4116	require cf;
3837	cf::_connect_to_perl_1;	4117	cf::_connect_to_perl_1;
3838		4118
3839	warn "loading config and database again";	4119	trace "perl_reload: loading config and database again";
3840	cf::reload_config;	4120	cf::reload_config;
3841		4121
3842	warn "loading extensions";	4122	trace "perl_reload: loading extensions";
3843	cf::load_extensions;	4123	cf::load_extensions;
3844		4124
3845	if ($REATTACH_ON_RELOAD) {	4125	if ($REATTACH_ON_RELOAD) {
3846	warn "reattaching attachments to objects/players";	4126	trace "perl_reload: reattaching attachments to objects/players";
3847	_global_reattach; # objects, sockets	4127	_global_reattach; # objects, sockets
3848	warn "reattaching attachments to maps";	4128	trace "perl_reload: reattaching attachments to maps";
3849	reattach $_ for values %MAP;	4129	reattach $_ for values %MAP;
3850	warn "reattaching attachments to players";	4130	trace "perl_reload: reattaching attachments to players";
3851	reattach $_ for values %PLAYER;	4131	reattach $_ for values %PLAYER;
3852	}	4132	}
3853		4133
3854	warn "running post_init jobs";	4134	cf::_post_init 1;
3855	(pop @POST_INIT)->(1) while @POST_INIT;
3856		4135
3857	warn "leaving sync_job";	4136	trace "perl_reload: leaving sync_job";
3858		4137
3859	1	4138	1
3860	} or do {	4139	} or do {
3861	warn $@;	4140	error $@;
3862	cf::cleanup "error while reloading, exiting.";	4141	cf::cleanup "perl_reload: error, exiting.";
3863	};	4142	};
3864		4143
3865	warn "reloaded";
3866	--$RELOAD;	4144	--$RELOAD;
3867	}	4145	}
3868		4146
3869	$t1 = EV::time - $t1;	4147	$t1 = AE::time - $t1;
3870	warn "reload completed in ${t1}s\n";	4148	info "perl_reload: completed in ${t1}s\n";
3871	};	4149	};
3872		4150
3873	our $RELOAD_WATCHER; # used only during reload	4151	our $RELOAD_WATCHER; # used only during reload
3874		4152
3875	sub reload_perl() {	4153	sub reload_perl() {
…		…
3877	# coro crashes during coro_state_free->destroy here.	4155	# coro crashes during coro_state_free->destroy here.
3878		4156
3879	$RELOAD_WATCHER ||= cf::async {	4157	$RELOAD_WATCHER ||= cf::async {
3880	Coro::AIO::aio_wait cache_extensions;	4158	Coro::AIO::aio_wait cache_extensions;
3881		4159
3882	$RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {	4160	$RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3883	do_reload_perl;	4161	do_reload_perl;
3884	undef $RELOAD_WATCHER;	4162	undef $RELOAD_WATCHER;
3885	};	4163	};
3886	};	4164	};
3887	}	4165	}
…		…
3896	reload_perl;	4174	reload_perl;
3897	};	4175	};
3898	}	4176	}
3899	};	4177	};
3900		4178
3901	unshift @INC, $LIBDIR;	4179	#############################################################################
3902		4180
3903	my $bug_warning = 0;	4181	my $bug_warning = 0;
3904		4182
3905	our @WAIT_FOR_TICK;
3906	our @WAIT_FOR_TICK_BEGIN;
3907
3908	sub wait_for_tick {	4183	sub wait_for_tick() {
3909	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4184	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3910		4185
3911	my $signal = new Coro::Signal;	4186	$WAIT_FOR_TICK->wait;
3912	push @WAIT_FOR_TICK, $signal;
3913	$signal->wait;
3914	}	4187	}
3915		4188
3916	sub wait_for_tick_begin {	4189	sub wait_for_tick_begin() {
3917	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4190	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3918		4191
3919	my $signal = new Coro::Signal;	4192	my $signal = new Coro::Signal;
3920	push @WAIT_FOR_TICK_BEGIN, $signal;	4193	push @WAIT_FOR_TICK_BEGIN, $signal;
3921	$signal->wait;	4194	$signal->wait;
3922	}	4195	}
…		…
3926	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4199	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3927	unless ++$bug_warning > 10;	4200	unless ++$bug_warning > 10;
3928	return;	4201	return;
3929	}	4202	}
3930		4203
3931	cf::server_tick; # one server iteration	4204	cf::one_tick; # one server iteration
3932		4205
3933	#for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#	4206	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3934		4207
3935	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4208	if ($NOW >= $NEXT_RUNTIME_WRITE) {
3936	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4209	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3937	Coro::async_pool {	4210	Coro::async_pool {
3938	$Coro::current->{desc} = "runtime saver";	4211	$Coro::current->{desc} = "runtime saver";
3939	write_runtime_sync	4212	write_runtime_sync
3940	or warn "ERROR: unable to write runtime file: $!";	4213	or error "ERROR: unable to write runtime file: $!";
3941	};	4214	};
3942	}	4215	}
3943		4216
3944	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4217	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3945	$sig->send;	4218	$sig->send;
3946	}	4219	}
3947	while (my $sig = shift @WAIT_FOR_TICK) {	4220	$WAIT_FOR_TICK->broadcast;
3948	$sig->send;
3949	}
3950		4221
3951	$LOAD = ($NOW - $TICK_START) / $TICK;	4222	$LOAD = ($NOW - $TICK_START) / $TICK;
3952	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4223	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3953		4224
3954	if (0) {	4225	if (0) {
3955	if ($NEXT_TICK) {	4226	if ($NEXT_TICK) {
3956	my $jitter = $TICK_START - $NEXT_TICK;	4227	my $jitter = $TICK_START - $NEXT_TICK;
3957	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4228	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
3958	warn "jitter $JITTER\n";#d#	4229	debug "jitter $JITTER\n";#d#
3959	}	4230	}
3960	}	4231	}
3961	}	4232	}
3962		4233
3963	{	4234	{
3964	# configure BDB	4235	# configure BDB
3965		4236
3966	BDB::min_parallel 16;	4237	BDB::min_parallel 16;
3967	BDB::max_poll_reqs $TICK * 0.1;	4238	BDB::max_poll_reqs $TICK * 0.1;
3968	$AnyEvent::BDB::WATCHER->priority (1);	4239	#$AnyEvent::BDB::WATCHER->priority (1);
3969		4240
3970	unless ($DB_ENV) {	4241	unless ($DB_ENV) {
3971	$DB_ENV = BDB::db_env_create;	4242	$DB_ENV = BDB::db_env_create;
3972	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4243	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3973	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4244	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4008	IO::AIO::min_parallel 8;	4279	IO::AIO::min_parallel 8;
4009	IO::AIO::max_poll_time $TICK * 0.1;	4280	IO::AIO::max_poll_time $TICK * 0.1;
4010	undef $AnyEvent::AIO::WATCHER;	4281	undef $AnyEvent::AIO::WATCHER;
4011	}	4282	}
4012		4283
4013	my $_log_backtrace;	4284	our $_log_backtrace;
		4285	our $_log_backtrace_last;
4014		4286
4015	sub _log_backtrace {	4287	sub _log_backtrace {
4016	my ($msg, @addr) = @_;	4288	my ($msg, @addr) = @_;
4017		4289
4018	$msg =~ s/\n//;	4290	$msg =~ s/\n$//;
4019		4291
		4292	if ($_log_backtrace_last eq $msg) {
		4293	LOG llevInfo, "[ABT] $msg\n";
		4294	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4020	# limit the # of concurrent backtraces	4295	# limit the # of concurrent backtraces
4021	if ($_log_backtrace < 2) {	4296	} elsif ($_log_backtrace < 2) {
		4297	$_log_backtrace_last = $msg;
4022	++$_log_backtrace;	4298	++$_log_backtrace;
4023	my $perl_bt = Carp::longmess $msg;	4299	my $perl_bt = Carp::longmess $msg;
4024	async {	4300	async {
4025	$Coro::current->{desc} = "abt $msg";	4301	$Coro::current->{desc} = "abt $msg";
4026		4302
…		…
4046	LOG llevInfo, "[ABT] $_\n" for @bt;	4322	LOG llevInfo, "[ABT] $_\n" for @bt;
4047	--$_log_backtrace;	4323	--$_log_backtrace;
4048	};	4324	};
4049	} else {	4325	} else {
4050	LOG llevInfo, "[ABT] $msg\n";	4326	LOG llevInfo, "[ABT] $msg\n";
4051	LOG llevInfo, "[ABT] [suppressed]\n";	4327	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4052	}	4328	}
4053	}	4329	}
4054		4330
4055	# load additional modules	4331	# load additional modules
4056	require "cf/$_.pm" for @EXTRA_MODULES;	4332	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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