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.533 by root, Thu Apr 29 07:59:17 2010 UTC vs.
Revision 1.598 by root, Sun Nov 11 02:38:10 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 ();
60	use IO::AIO ();	62	use IO::AIO ();
61	use Time::HiRes;
62	use Compress::LZF;	63	use Compress::LZF;
63	use Digest::MD5 ();	64	use Digest::MD5 ();
64		65
65	AnyEvent::detect;	66	AnyEvent::detect;
66		67
…		…
78	# strictly for debugging	79	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	80	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		81
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	82	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		83
		84	our @ORIG_INC;
		85
83	our %COMMAND = ();	86	our %COMMAND = ();
84	our %COMMAND_TIME = ();	87	our %COMMAND_TIME = ();
85		88
86	our @EXTS = (); # list of extension package names	89	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	90	our %EXTCMD = ();
		91	our %EXTACMD = ();
88	our %EXTICMD = ();	92	our %EXTICMD = ();
		93	our %EXTIACMD = ();
89	our %EXT_CORO = (); # coroutines bound to extensions	94	our %EXT_CORO = (); # coroutines bound to extensions
90	our %EXT_MAP = (); # pluggable maps	95	our %EXT_MAP = (); # pluggable maps
91		96
92	our $RELOAD; # number of reloads so far, non-zero while in reload	97	our $RELOAD; # number of reloads so far, non-zero while in reload
93	our @EVENT;	98	our @EVENT;
94	our @REFLECT; # set by XS	99	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	100	our %REFLECT; # set by us
96		101
97	our $CONFDIR = confdir;	102	our $CONFDIR = confdir;
		103
98	our $DATADIR = datadir;	104	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	105	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	106	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	107	our $MAPDIR = "$DATADIR/" . mapdir;
		108
102	our $LOCALDIR = localdir;	109	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	110	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	111	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	112	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	113	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	114	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	115	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	116	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		117
111	our %RESOURCE; # unused	118	#our %RESOURCE; # unused
112		119
113	our $OUTPUT_RATE_MIN = 3000;	120	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	121	our $OUTPUT_RATE_MAX = 1000000;
115		122
116	our $MAX_LINKS = 32; # how many chained exits to follow	123	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	131	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	132	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	133	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	134	our $DB_ENV;
128		135
129	our @EXTRA_MODULES = qw(pod match mapscript);	136	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		137
131	our %CFG;	138	our %CFG;
		139	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		140
133	our $UPTIME; $UPTIME ||= time;	141	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	142	our $RUNTIME = 0;
		143	our $SERVER_TICK = 0;
135	our $NOW;	144	our $NOW;
136		145
137	our (%PLAYER, %PLAYER_LOADING); # all users	146	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	147	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	148	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		157
149	our @POST_INIT;	158	our @POST_INIT;
150		159
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	160	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	161	our $REALLY_UNLOOP; # never set to true, please :)
		162
		163	our $WAIT_FOR_TICK = new Coro::Signal;
		164	our @WAIT_FOR_TICK_BEGIN;
153		165
154	binmode STDOUT;	166	binmode STDOUT;
155	binmode STDERR;	167	binmode STDERR;
156		168
157	# read virtual server time, if available	169	# read virtual server time, if available
…		…
191		203
192	=over 4	204	=over 4
193		205
194	=item $cf::UPTIME	206	=item $cf::UPTIME
195		207
196	The timestamp of the server start (so not actually an uptime).	208	The timestamp of the server start (so not actually an "uptime").
		209
		210	=item $cf::SERVER_TICK
		211
		212	An unsigned integer that starts at zero when the server is started and is
		213	incremented on every tick.
		214
		215	=item $cf::NOW
		216
		217	The (real) time of the last (current) server tick - updated before and
		218	after tick processing, so this is useful only as a rough "what time is it
		219	now" estimate.
		220
		221	=item $cf::TICK
		222
		223	The interval between each server tick, in seconds.
197		224
198	=item $cf::RUNTIME	225	=item $cf::RUNTIME
199		226
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	227	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	228	every server tick.
202		229
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	230	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	231	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	232	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		233
207	Various directories - "/etc", read-only install directory, perl-library	234	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	235	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	236	unique-items directory, player file directory, random maps directory and
210	database environment.	237	database environment.
211		238
212	=item $cf::NOW
213
214	The time of the last (current) server tick.
215
216	=item $cf::TICK
217
218	The interval between server ticks, in seconds.
219
220	=item $cf::LOADAVG	239	=item $cf::LOADAVG
221		240
222	The current CPU load on the server (alpha-smoothed), as a value between 0	241	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	242	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	243	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	252	from wherever your confdir points to.
234		253
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	254	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		255
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	256	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	257	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	258	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		259
		260	Note that cf::Wait_for_tick will immediately return when the server is not
		261	ticking, making it suitable for small pauses in threads that need to run
		262	when the server is paused. If that is not applicable (i.e. you I<really>
		263	want to wait, use C<$cf::WAIT_FOR_TICK>).
		264
		265	=item $cf::WAIT_FOR_TICK
		266
		267	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		268	variable contains a L<Coro::Signal> that is broadcats after every server
		269	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		270	next server tick.
		271
		272	=cut
		273
		274	sub wait_for_tick();
		275	sub wait_for_tick_begin();
240		276
241	=item @cf::INVOKE_RESULTS	277	=item @cf::INVOKE_RESULTS
242		278
243	This array contains the results of the last C<invoke ()> call. When	279	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	280	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
305	)) {	341	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	342	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	343	}
308		344
309	$EV::DIED = sub {	345	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	346	warn "error in event callback: $@";
311	};	347	};
		348
		349	#############################################################################
		350
		351	sub fork_call(&@);
		352	sub get_slot($;$$);
312		353
313	#############################################################################	354	#############################################################################
314		355
315	=head2 UTILITY FUNCTIONS	356	=head2 UTILITY FUNCTIONS
316		357
…		…
337	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	378	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
338	$d	379	$d
339	} || "[unable to dump $_[0]: '$@']";	380	} || "[unable to dump $_[0]: '$@']";
340	}	381	}
341		382
		383	=item $scalar = cf::load_file $path
		384
		385	Loads the given file from path and returns its contents. Croaks on error
		386	and can block.
		387
		388	=cut
		389
		390	sub load_file($) {
		391	0 <= aio_load $_[0], my $data
		392	or Carp::croak "$_[0]: $!";
		393
		394	$data
		395	}
		396
		397	=item $success = cf::replace_file $path, $data, $sync
		398
		399	Atomically replaces the file at the given $path with new $data, and
		400	optionally $sync the data to disk before replacing the file.
		401
		402	=cut
		403
		404	sub replace_file($$;$) {
		405	my ($path, $data, $sync) = @_;
		406
		407	my $lock = cf::lock_acquire ("replace_file:$path");
		408
		409	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		410	or return;
		411
		412	$data = $data->() if ref $data;
		413
		414	length $data == aio_write $fh, 0, (length $data), $data, 0
		415	or return;
		416
		417	!$sync
		418	or !aio_fsync $fh
		419	or return;
		420
		421	aio_close $fh
		422	and return;
		423
		424	aio_rename "$path~", $path
		425	and return;
		426
		427	if ($sync) {
		428	$path =~ s%/[^/]*$%%;
		429	aio_pathsync $path;
		430	}
		431
		432	1
		433	}
		434
342	=item $ref = cf::decode_json $json	435	=item $ref = cf::decode_json $json
343		436
344	Converts a JSON string into the corresponding perl data structure.	437	Converts a JSON string into the corresponding perl data structure.
345		438
346	=item $json = cf::encode_json $ref	439	=item $json = cf::encode_json $ref
…		…
352	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	445	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
353		446
354	sub encode_json($) { $json_coder->encode ($_[0]) }	447	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	448	sub decode_json($) { $json_coder->decode ($_[0]) }
356		449
		450	=item $ref = cf::decode_storable $scalar
		451
		452	Same as Coro::Storable::thaw, so blocks.
		453
		454	=cut
		455
		456	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		457
		458	=item $ref = cf::decode_yaml $scalar
		459
		460	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		461
		462	=cut
		463
		464	sub decode_yaml($) {
		465	fork_call { YAML::XS::Load $_[0] } @_
		466	}
		467
		468	=item $scalar = cf::unlzf $scalar
		469
		470	Same as Compress::LZF::compress, but takes server ticks into account, so
		471	blocks.
		472
		473	=cut
		474
		475	sub unlzf($) {
		476	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		477	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		478	Compress::LZF::decompress $_[0]
		479	}
		480
357	=item cf::post_init { BLOCK }	481	=item cf::post_init { BLOCK }
358		482
359	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	483	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
360	but I<before> the server starts ticking again.	484	but I<before> the server starts ticking again.
361		485
362	The cdoeblock will have a single boolean argument to indicate whether this	486	The codeblock will have a single boolean argument to indicate whether this
363	is a reload or not.	487	is a reload or not.
364		488
365	=cut	489	=cut
366		490
367	sub post_init(&) {	491	sub post_init(&) {
368	push @POST_INIT, shift;	492	push @POST_INIT, shift;
		493	}
		494
		495	sub _post_init {
		496	trace "running post_init jobs";
		497
		498	# run them in parallel...
		499
		500	my @join;
		501
		502	while () {
		503	push @join, map &Coro::async ($_, 0), @POST_INIT;
		504	@POST_INIT = ();
		505
		506	@join or last;
		507
		508	(pop @join)->join;
		509	}
369	}	510	}
370		511
371	=item cf::lock_wait $string	512	=item cf::lock_wait $string
372		513
373	Wait until the given lock is available. See cf::lock_acquire.	514	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	567	EV::periodic $start, $interval, 0, $cb
427	}	568	}
428		569
429	=item cf::get_slot $time[, $priority[, $name]]	570	=item cf::get_slot $time[, $priority[, $name]]
430		571
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	572	Allocate $time seconds of blocking CPU time at priority C<$priority>
432	This call blocks and returns only when you have at least C<$time> seconds	573	(default: 0): This call blocks and returns only when you have at least
433	of cpu time till the next tick. The slot is only valid till the next cede.	574	C<$time> seconds of cpu time till the next tick. The slot is only valid
		575	till the next cede.
		576
		577	Background jobs should use a priority les than zero, interactive jobs
		578	should use 100 or more.
434		579
435	The optional C<$name> can be used to identify the job to run. It might be	580	The optional C<$name> can be used to identify the job to run. It might be
436	used for statistical purposes and should identify the same time-class.	581	used for statistical purposes and should identify the same time-class.
437		582
438	Useful for short background jobs.	583	Useful for short background jobs.
…		…
467	}	612	}
468	}	613	}
469		614
470	if (@SLOT_QUEUE) {	615	if (@SLOT_QUEUE) {
471	# we do not use wait_for_tick() as it returns immediately when tick is inactive	616	# we do not use wait_for_tick() as it returns immediately when tick is inactive
472	push @cf::WAIT_FOR_TICK, $signal;	617	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	618	} else {
475	$busy = 0;	619	$busy = 0;
476	Coro::schedule;	620	Coro::schedule;
477	}	621	}
478	}	622	}
…		…
518	=cut	662	=cut
519		663
520	sub sync_job(&) {	664	sub sync_job(&) {
521	my ($job) = @_;	665	my ($job) = @_;
522		666
523	if ($Coro::current == $Coro::main) {	667	if (in_main) {
524	my $time = AE::time;	668	my $time = AE::time;
525		669
526	# this is the main coro, too bad, we have to block	670	# this is the main coro, too bad, we have to block
527	# till the operation succeeds, freezing the server :/	671	# till the operation succeeds, freezing the server :/
528		672
529	LOG llevError, Carp::longmess "sync job";#d#	673	#LOG llevError, Carp::longmess "sync job";#d#
530		674
531	my $freeze_guard = freeze_mainloop;	675	my $freeze_guard = freeze_mainloop;
532		676
533	my $busy = 1;	677	my $busy = 1;
534	my @res;	678	my @res;
…		…
578	$EXT_CORO{$coro+0} = $coro;	722	$EXT_CORO{$coro+0} = $coro;
579		723
580	$coro	724	$coro
581	}	725	}
582		726
583	=item fork_call { }, $args	727	=item fork_call { }, @args
584		728
585	Executes the given code block with the given arguments in a seperate	729	Executes the given code block with the given arguments in a seperate
586	process, returning the results. Everything must be serialisable with	730	process, returning the results. Everything must be serialisable with
587	Coro::Storable. May, of course, block. Note that the executed sub may	731	Coro::Storable. May, of course, block. Note that the executed sub may
588	never block itself or use any form of event handling.	732	never block itself or use any form of event handling.
589		733
590	=cut	734	=cut
591		735
		736	sub post_fork {
		737	reset_signals;
		738	}
		739
592	sub fork_call(&@) {	740	sub fork_call(&@) {
593	my ($cb, @args) = @_;	741	my ($cb, @args) = @_;
594		742
595	# we seemingly have to make a local copy of the whole thing,	743	# we seemingly have to make a local copy of the whole thing,
596	# otherwise perl prematurely frees the stuff :/	744	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	745	# TODO: investigate and fix (likely this will be rather laborious)
598		746
599	my @res = Coro::Util::fork_eval {	747	my @res = Coro::Util::fork_eval {
600	reset_signals;	748	cf::post_fork;
601	&$cb	749	&$cb
602	}, @args;	750	} @args;
603		751
604	wantarray ? @res : $res[-1]	752	wantarray ? @res : $res[-1]
605	}	753	}
606		754
607	sub objinfo {	755	sub objinfo {
…		…
657	within each server.	805	within each server.
658		806
659	=cut	807	=cut
660		808
661	sub db_table($) {	809	sub db_table($) {
		810	cf::error "db_get called from main context"
		811	if $Coro::current == $Coro::main;
		812
662	my ($name) = @_;	813	my ($name) = @_;
663	my $db = BDB::db_create $DB_ENV;	814	my $db = BDB::db_create $DB_ENV;
664		815
665	eval {	816	eval {
666	$db->set_flags (BDB::CHKSUM);	817	$db->set_flags (BDB::CHKSUM);
…		…
676	}	827	}
677		828
678	our $DB;	829	our $DB;
679		830
680	sub db_init {	831	sub db_init {
681	cf::sync_job {
682	$DB ||= db_table "db";	832	$DB ||= db_table "db";
683	};
684	}	833	}
685		834
686	sub db_get($$) {	835	sub db_get($$) {
687	my $key = "$_[0]/$_[1]";	836	my $key = "$_[0]/$_[1]";
688		837
689	cf::sync_job {	838	cf::error "db_get called from main context"
		839	if $Coro::current == $Coro::main;
		840
690	BDB::db_get $DB, undef, $key, my $data;	841	BDB::db_get $DB, undef, $key, my $data;
691		842
692	$! ? ()	843	$! ? ()
693	: $data	844	: $data
694	}
695	}	845	}
696		846
697	sub db_put($$$) {	847	sub db_put($$$) {
698	BDB::dbreq_pri 4;	848	BDB::dbreq_pri 4;
699	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	849	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
727		877
728	my @data;	878	my @data;
729	my $md5;	879	my $md5;
730		880
731	for (0 .. $#$src) {	881	for (0 .. $#$src) {
732	0 <= aio_load $src->[$_], $data[$_]	882	$data[$_] = load_file $src->[$_];
733	or Carp::croak "$src->[$_]: $!";
734	}	883	}
735		884
736	# if processing is expensive, check	885	# if processing is expensive, check
737	# checksum first	886	# checksum first
738	if (1) {	887	if (1) {
…		…
751		900
752	return db_get cache => "$id/data";	901	return db_get cache => "$id/data";
753	}	902	}
754	}	903	}
755		904
756	my $t1 = Time::HiRes::time;	905	my $t1 = EV::time;
757	my $data = $process->(\@data);	906	my $data = $process->(\@data);
758	my $t2 = Time::HiRes::time;	907	my $t2 = EV::time;
759		908
760	info "cache: '$id' processed in ", $t2 - $t1, "s\n";	909	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
761		910
762	db_put cache => "$id/data", $data;	911	db_put cache => "$id/data", $data;
763	db_put cache => "$id/md5" , $md5;	912	db_put cache => "$id/md5" , $md5;
…		…
1283	=cut	1432	=cut
1284		1433
1285	#############################################################################	1434	#############################################################################
1286	# command handling &c	1435	# command handling &c
1287		1436
1288	=item cf::register_command $name => \&callback($ob,$args);	1437	=item cf::register_command $name => \&callback($ob,$args)
1289		1438
1290	Register a callback for execution when the client sends the user command	1439	Register a callback for execution when the client sends the user command
1291	$name.	1440	$name.
1292		1441
1293	=cut	1442	=cut
…		…
1299	#warn "registering command '$name/$time' to '$caller'";	1448	#warn "registering command '$name/$time' to '$caller'";
1300		1449
1301	push @{ $COMMAND{$name} }, [$caller, $cb];	1450	push @{ $COMMAND{$name} }, [$caller, $cb];
1302	}	1451	}
1303		1452
1304	=item cf::register_extcmd $name => \&callback($pl,$packet);	1453	=item cf::register_extcmd $name => \&callback($pl,@args)
1305		1454
1306	Register a callback for execution when the client sends an (synchronous)	1455	Register a callback for execution when the client sends an (synchronous)
1307	extcmd packet. Ext commands will be processed in the order they are	1456	extcmd packet. Ext commands will be processed in the order they are
1308	received by the server, like other user commands. The first argument is	1457	received by the server, like other user commands. The first argument is
1309	the logged-in player. Ext commands can only be processed after a player	1458	the logged-in player. Ext commands can only be processed after a player
1310	has logged in successfully.	1459	has logged in successfully.
1311		1460
1312	If the callback returns something, it is sent back as if reply was being	1461	The values will be sent back to the client.
1313	called.
1314		1462
		1463	=item cf::register_async_extcmd $name => \&callback($pl,$reply->(...),@args)
		1464
		1465	Same as C<cf::register_extcmd>, but instead of returning values, the
		1466	callback needs to clal the C<$reply> function.
		1467
1315	=item cf::register_exticmd $name => \&callback($ns,$packet);	1468	=item cf::register_exticmd $name => \&callback($ns,@args)
1316		1469
1317	Register a callback for execution when the client sends an (asynchronous)	1470	Register a callback for execution when the client sends an (asynchronous)
1318	exticmd packet. Exti commands are processed by the server as soon as they	1471	exticmd packet. Exti commands are processed by the server as soon as they
1319	are received, i.e. out of order w.r.t. other commands. The first argument	1472	are received, i.e. out of order w.r.t. other commands. The first argument
1320	is a client socket. Exti commands can be received anytime, even before	1473	is a client socket. Exti commands can be received anytime, even before
1321	log-in.	1474	log-in.
1322		1475
1323	If the callback returns something, it is sent back as if reply was being	1476	The values will be sent back to the client.
1324	called.
1325		1477
1326	=cut	1478	=item cf::register_async_exticmd $name => \&callback($ns,$reply->(...),@args)
1327		1479
		1480	Same as C<cf::register_extcmd>, but instead of returning values, the
		1481	callback needs to clal the C<$reply> function.
		1482
		1483	=cut
		1484
1328	sub register_extcmd {	1485	sub register_extcmd($$) {
1329	my ($name, $cb) = @_;	1486	my ($name, $cb) = @_;
1330		1487
1331	$EXTCMD{$name} = $cb;	1488	$EXTCMD{$name} = $cb;
1332	}	1489	}
1333		1490
1334	sub register_exticmd {	1491	sub register_async_extcmd($$) {
1335	my ($name, $cb) = @_;	1492	my ($name, $cb) = @_;
1336		1493
		1494	$EXTACMD{$name} = $cb;
		1495	}
		1496
		1497	sub register_exticmd($$) {
		1498	my ($name, $cb) = @_;
		1499
1337	$EXTICMD{$name} = $cb;	1500	$EXTICMD{$name} = $cb;
		1501	}
		1502
		1503	sub register_async_exticmd($$) {
		1504	my ($name, $cb) = @_;
		1505
		1506	$EXTIACMD{$name} = $cb;
1338	}	1507	}
1339		1508
1340	use File::Glob ();	1509	use File::Glob ();
1341		1510
1342	cf::player->attach (	1511	cf::player->attach (
…		…
1356	my ($pl, $buf) = @_;	1525	my ($pl, $buf) = @_;
1357		1526
1358	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1527	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1359		1528
1360	if (ref $msg) {	1529	if (ref $msg) {
1361	my ($type, $reply, @payload) =	1530	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1362	"ARRAY" eq ref $msg
1363	? @$msg
1364	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1365		1531
1366	my @reply;
1367
1368	if (my $cb = $EXTCMD{$type}) {	1532	if (my $cb = $EXTACMD{$type}) {
		1533	$cb->(
		1534	$pl,
		1535	sub {
		1536	$pl->ext_msg ("reply-$reply", @_)
		1537	if $reply;
		1538	},
		1539	@payload
		1540	);
		1541	} else {
		1542	my @reply;
		1543
		1544	if (my $cb = $EXTCMD{$type}) {
1369	@reply = $cb->($pl, @payload);	1545	@reply = $cb->($pl, @payload);
		1546	}
		1547
		1548	$pl->ext_msg ("reply-$reply", @reply)
		1549	if $reply;
1370	}	1550	}
1371
1372	$pl->ext_reply ($reply, @reply)
1373	if $reply;
1374		1551
1375	} else {	1552	} else {
1376	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1553	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1377	}	1554	}
1378		1555
…		…
1391	};	1568	};
1392		1569
1393	$grp	1570	$grp
1394	}	1571	}
1395		1572
		1573	sub _ext_cfg_reg($$$$) {
		1574	my ($rvar, $varname, $cfgname, $default) = @_;
		1575
		1576	$cfgname = lc $varname
		1577	unless length $cfgname;
		1578
		1579	$EXT_CFG{$cfgname} = [$rvar, $default];
		1580
		1581	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1582	}
		1583
1396	sub load_extensions {	1584	sub load_extensions {
1397	info "loading extensions...";	1585	info "loading extensions...";
		1586
		1587	%EXT_CFG = ();
1398		1588
1399	cf::sync_job {	1589	cf::sync_job {
1400	my %todo;	1590	my %todo;
1401		1591
1402	for my $path (<$LIBDIR/*.ext>) {	1592	for my $path (<$LIBDIR/*.ext>) {
…		…
1421		1611
1422	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1612	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1423	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1613	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1424		1614
1425	$ext{source} =	1615	$ext{source} =
1426	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1616	"package $pkg; use common::sense;\n"
1427	. "#line 1 \"$path\"\n{\n"	1617	. "#line 1 \"$path\"\n{\n"
1428	. $source	1618	. $source
1429	. "\n};\n1";	1619	. "\n};\n1";
1430		1620
1431	$todo{$base} = \%ext;	1621	$todo{$base} = \%ext;
…		…
1445	unless exists $done{$_};	1635	unless exists $done{$_};
1446	}	1636	}
1447		1637
1448	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1638	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1449		1639
		1640	my $source = $v->{source};
		1641
		1642	# support "CONF varname :confname = default" pseudo-statements
		1643	$source =~ s{
		1644	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1645	}{
		1646	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1647	}gmxe;
		1648
1450	my $active = eval $v->{source};	1649	my $active = eval $source;
1451		1650
1452	if (length $@) {	1651	if (length $@) {
1453	error "$v->{path}: $@\n";	1652	error "$v->{path}: $@\n";
1454		1653
1455	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1654	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1472		1671
1473	while (my ($k, $v) = each %todo) {	1672	while (my ($k, $v) = each %todo) {
1474	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1673	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1475	if exists $v->{meta}{mandatory};	1674	if exists $v->{meta}{mandatory};
1476	}	1675	}
		1676
		1677	last;
1477	}	1678	}
1478	}	1679	}
1479	};	1680	};
1480	}	1681	}
1481		1682
…		…
1639	my $name = $pl->ob->name;	1840	my $name = $pl->ob->name;
1640		1841
1641	$pl->{deny_save} = 1;	1842	$pl->{deny_save} = 1;
1642	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1843	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1643		1844
1644	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1845	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1645	$pl->deactivate;	1846	$pl->deactivate;
		1847
1646	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1848	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1647	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1849	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1850	ext::highscore::check ($pl->ob);
		1851
1648	$pl->ns->destroy if $pl->ns;	1852	$pl->ns->destroy if $pl->ns;
1649		1853
1650	my $path = playerdir $pl;	1854	my $path = playerdir $pl;
1651	my $temp = "$path~$cf::RUNTIME~deleting~";	1855	my $temp = "$path~$cf::RUNTIME~deleting~";
1652	aio_rename $path, $temp;	1856	aio_rename $path, $temp;
…		…
1738		1942
1739	=item $protocol_xml = $player->expand_cfpod ($cfpod)	1943	=item $protocol_xml = $player->expand_cfpod ($cfpod)
1740		1944
1741	Expand deliantra pod fragments into protocol xml.	1945	Expand deliantra pod fragments into protocol xml.
1742		1946
1743	=item $player->ext_reply ($msgid, @msg)
1744
1745	Sends an ext reply to the player.
1746
1747	=cut
1748
1749	sub ext_reply($$@) {
1750	my ($self, $id, @msg) = @_;
1751
1752	$self->ns->ext_reply ($id, @msg)
1753	}
1754
1755	=item $player->ext_msg ($type, @msg)	1947	=item $player->ext_msg ($type, @msg)
1756		1948
1757	Sends an ext event to the client.	1949	Sends an ext event to the client.
1758		1950
1759	=cut	1951	=cut
…		…
1818	sub generate_random_map {	2010	sub generate_random_map {
1819	my ($self, $rmp) = @_;	2011	my ($self, $rmp) = @_;
1820		2012
1821	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	2013	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1822		2014
1823	# mit "rum" bekleckern, nicht
1824	$self->_create_random_map (	2015	$self->_create_random_map ($rmp);
1825	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1826	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1827	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1828	$rmp->{exit_on_final_map},
1829	$rmp->{xsize}, $rmp->{ysize},
1830	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1831	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1832	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1833	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1834	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1835	(cf::region::find $rmp->{region}), $rmp->{custom}
1836	)
1837	}	2016	}
1838		2017
1839	=item cf::map->register ($regex, $prio)	2018	=item cf::map->register ($regex, $prio)
1840		2019
1841	Register a handler for the map path matching the given regex at the	2020	Register a handler for the map path matching the given regex at the
…		…
1846		2025
1847	sub register {	2026	sub register {
1848	my (undef, $regex, $prio) = @_;	2027	my (undef, $regex, $prio) = @_;
1849	my $pkg = caller;	2028	my $pkg = caller;
1850		2029
1851	no strict;
1852	push @{"$pkg\::ISA"}, __PACKAGE__;	2030	push @{"$pkg\::ISA"}, __PACKAGE__;
1853		2031
1854	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2032	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1855	}	2033	}
1856		2034
…		…
1868	}	2046	}
1869		2047
1870	sub normalise {	2048	sub normalise {
1871	my ($path, $base) = @_;	2049	my ($path, $base) = @_;
1872		2050
1873	$path = "$path"; # make sure its a string	2051	$path = "$path"; # make sure it's a string
1874		2052
1875	$path =~ s/\.map$//;	2053	$path =~ s/\.map$//;
1876		2054
1877	# map plan:	2055	# map plan:
1878	#	2056	#
…		…
1893	$base =~ s{[^/]+/?$}{};	2071	$base =~ s{[^/]+/?$}{};
1894	$path = "$base/$path";	2072	$path = "$base/$path";
1895	}	2073	}
1896		2074
1897	for ($path) {	2075	for ($path) {
1898	redo if s{//}{/};
1899	redo if s{/\.?/}{/};	2076	redo if s{/\.?/}{/};
1900	redo if s{/[^/]+/\.\./}{/};	2077	redo if s{/[^/]+/\.\./}{/};
1901	}	2078	}
1902		2079
1903	$path	2080	$path
…		…
1917	$self->init; # pass $1 etc.	2094	$self->init; # pass $1 etc.
1918	return $self;	2095	return $self;
1919	}	2096	}
1920	}	2097	}
1921		2098
1922	Carp::cluck "unable to resolve path '$path' (base '$base').";	2099	Carp::cluck "unable to resolve path '$path' (base '$base')";
1923	()	2100	()
1924	}	2101	}
1925		2102
		2103	# may re-bless or do other evil things
1926	sub init {	2104	sub init {
1927	my ($self) = @_;	2105	my ($self) = @_;
1928		2106
1929	$self	2107	$self
1930	}	2108	}
…		…
1995	$self->{load_path} = $path;	2173	$self->{load_path} = $path;
1996		2174
1997	1	2175	1
1998	}	2176	}
1999		2177
		2178	# used to laod the header of an original map
2000	sub load_header_orig {	2179	sub load_header_orig {
2001	my ($self) = @_;	2180	my ($self) = @_;
2002		2181
2003	$self->load_header_from ($self->load_path)	2182	$self->load_header_from ($self->load_path)
2004	}	2183	}
2005		2184
		2185	# used to laod the header of an instantiated map
2006	sub load_header_temp {	2186	sub load_header_temp {
2007	my ($self) = @_;	2187	my ($self) = @_;
2008		2188
2009	$self->load_header_from ($self->save_path)	2189	$self->load_header_from ($self->save_path)
2010	}	2190	}
2011		2191
		2192	# called after loading the header from an instantiated map
2012	sub prepare_temp {	2193	sub prepare_temp {
2013	my ($self) = @_;	2194	my ($self) = @_;
2014		2195
2015	$self->last_access ((delete $self->{last_access})	2196	$self->last_access ((delete $self->{last_access})
2016	|| $cf::RUNTIME); #d#	2197	|| $cf::RUNTIME); #d#
2017	# safety	2198	# safety
2018	$self->{instantiate_time} = $cf::RUNTIME	2199	$self->{instantiate_time} = $cf::RUNTIME
2019	if $self->{instantiate_time} > $cf::RUNTIME;	2200	if $self->{instantiate_time} > $cf::RUNTIME;
2020	}	2201	}
2021		2202
		2203	# called after loading the header from an original map
2022	sub prepare_orig {	2204	sub prepare_orig {
2023	my ($self) = @_;	2205	my ($self) = @_;
2024		2206
2025	$self->{load_original} = 1;	2207	$self->{load_original} = 1;
2026	$self->{instantiate_time} = $cf::RUNTIME;	2208	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2050		2232
2051	sub find;	2233	sub find;
2052	sub find {	2234	sub find {
2053	my ($path, $origin) = @_;	2235	my ($path, $origin) = @_;
2054		2236
		2237	cf::cede_to_tick;
		2238
2055	$path = normalise $path, $origin && $origin->path;	2239	$path = normalise $path, $origin;
2056		2240
2057	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2241	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2058	my $guard2 = cf::lock_acquire "map_find:$path";	2242	my $guard2 = cf::lock_acquire "map_find:$path";
2059		2243
2060	$cf::MAP{$path} || do {	2244	$cf::MAP{$path} || do {
…		…
2091		2275
2092	{	2276	{
2093	my $guard = cf::lock_acquire "map_data:$path";	2277	my $guard = cf::lock_acquire "map_data:$path";
2094		2278
2095	return unless $self->valid;	2279	return unless $self->valid;
2096	return unless $self->in_memory == cf::MAP_SWAPPED;	2280	return unless $self->state == cf::MAP_SWAPPED;
2097
2098	$self->in_memory (cf::MAP_LOADING);
2099		2281
2100	$self->alloc;	2282	$self->alloc;
2101		2283
2102	$self->pre_load;	2284	$self->pre_load;
2103	cf::cede_to_tick;	2285	cf::cede_to_tick;
2104		2286
		2287	if (exists $self->{load_path}) {
2105	my $f = new_from_file cf::object::thawer $self->{load_path};	2288	my $f = new_from_file cf::object::thawer $self->{load_path};
2106	$f->skip_block;	2289	$f->skip_block;
2107	$self->_load_objects ($f)	2290	$self->_load_objects ($f)
2108	or return;	2291	or return;
2109		2292
2110	$self->post_load_original	2293	$self->post_load_original
2111	if delete $self->{load_original};	2294	if delete $self->{load_original};
2112		2295
2113	if (my $uniq = $self->uniq_path) {	2296	if (my $uniq = $self->uniq_path) {
2114	utf8::encode $uniq;	2297	utf8::encode $uniq;
2115	unless (aio_stat $uniq) {	2298	unless (aio_stat $uniq) {
2116	if (my $f = new_from_file cf::object::thawer $uniq) {	2299	if (my $f = new_from_file cf::object::thawer $uniq) {
2117	$self->clear_unique_items;	2300	$self->clear_unique_items;
2118	$self->_load_objects ($f);	2301	$self->_load_objects ($f);
2119	$f->resolve_delayed_derefs;	2302	$f->resolve_delayed_derefs;
		2303	}
2120	}	2304	}
2121	}	2305	}
2122	}
2123		2306
2124	$f->resolve_delayed_derefs;	2307	$f->resolve_delayed_derefs;
		2308	} else {
		2309	$self->post_load_original
		2310	if delete $self->{load_original};
		2311	}
		2312
		2313	$self->state (cf::MAP_INACTIVE);
2125		2314
2126	cf::cede_to_tick;	2315	cf::cede_to_tick;
2127	# now do the right thing for maps	2316	# now do the right thing for maps
2128	$self->link_multipart_objects;	2317	$self->link_multipart_objects;
2129	$self->difficulty ($self->estimate_difficulty)	2318	$self->difficulty ($self->estimate_difficulty)
…		…
2133	unless ($self->{deny_activate}) {	2322	unless ($self->{deny_activate}) {
2134	$self->decay_objects;	2323	$self->decay_objects;
2135	$self->fix_auto_apply;	2324	$self->fix_auto_apply;
2136	$self->update_buttons;	2325	$self->update_buttons;
2137	cf::cede_to_tick;	2326	cf::cede_to_tick;
2138	$self->activate;	2327	#$self->activate; # no longer activate maps automatically
2139	}	2328	}
2140		2329
2141	$self->{last_save} = $cf::RUNTIME;	2330	$self->{last_save} = $cf::RUNTIME;
2142	$self->last_access ($cf::RUNTIME);	2331	$self->last_access ($cf::RUNTIME);
2143
2144	$self->in_memory (cf::MAP_ACTIVE);
2145	}	2332	}
2146		2333
2147	$self->post_load;	2334	$self->post_load;
		2335
		2336	1
2148	}	2337	}
2149		2338
2150	# customize the map for a given player, i.e.	2339	# customize the map for a given player, i.e.
2151	# return the _real_ map. used by e.g. per-player	2340	# return the _real_ map. used by e.g. per-player
2152	# maps to change the path to ~playername/mappath	2341	# maps to change the path to ~playername/mappath
…		…
2160	# if $self->per_party;	2349	# if $self->per_party;
2161		2350
2162	$self	2351	$self
2163	}	2352	}
2164		2353
2165	# find and load all maps in the 3x3 area around a map
2166	sub load_neighbours {
2167	my ($map) = @_;
2168
2169	my @neigh; # diagonal neighbours
2170
2171	for (0 .. 3) {
2172	my $neigh = $map->tile_path ($_)
2173	or next;
2174	$neigh = find $neigh, $map
2175	or next;
2176	$neigh->load;
2177
2178	# now find the diagonal neighbours
2179	push @neigh,
2180	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2181	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2182	}
2183
2184	for (grep defined $_->[0], @neigh) {
2185	my ($path, $origin) = @$_;
2186	my $neigh = find $path, $origin
2187	or next;
2188	$neigh->load;
2189	}
2190	}
2191
2192	sub find_sync {	2354	sub find_sync {
2193	my ($path, $origin) = @_;	2355	my ($path, $origin) = @_;
2194		2356
2195	cf::sync_job { find $path, $origin }	2357	# it's a bug to call this from the main context
		2358	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2359	if $Coro::current == $Coro::main;
		2360
		2361	find $path, $origin
2196	}	2362	}
2197		2363
2198	sub do_load_sync {	2364	sub do_load_sync {
2199	my ($map) = @_;	2365	my ($map) = @_;
2200		2366
		2367	# it's a bug to call this from the main context
2201	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2368	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2202	if $Coro::current == $Coro::main;	2369	if $Coro::current == $Coro::main;
2203		2370
2204	cf::sync_job { $map->load };	2371	$map->load;
2205	}	2372	}
2206		2373
2207	our %MAP_PREFETCH;	2374	our %MAP_PREFETCH;
2208	our $MAP_PREFETCHER = undef;	2375	our $MAP_PREFETCHER = undef;
2209		2376
2210	sub find_async {	2377	sub find_async {
2211	my ($path, $origin, $load) = @_;	2378	my ($path, $origin, $load) = @_;
2212		2379
2213	$path = normalise $path, $origin && $origin->{path};	2380	$path = normalise $path, $origin;
2214		2381
2215	if (my $map = $cf::MAP{$path}) {	2382	if (my $map = $cf::MAP{$path}) {
2216	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2383	return $map if !$load || $map->linkable;
2217	}	2384	}
2218		2385
2219	$MAP_PREFETCH{$path} |= $load;	2386	$MAP_PREFETCH{$path} |= $load;
2220		2387
2221	$MAP_PREFETCHER ||= cf::async {	2388	$MAP_PREFETCHER ||= cf::async {
…		…
2280	sub swap_out {	2447	sub swap_out {
2281	my ($self) = @_;	2448	my ($self) = @_;
2282		2449
2283	my $lock = cf::lock_acquire "map_data:$self->{path}";	2450	my $lock = cf::lock_acquire "map_data:$self->{path}";
2284		2451
2285	return if $self->in_memory != cf::MAP_ACTIVE;	2452	return if !$self->linkable;
2286	return if $self->{deny_save};	2453	return if $self->{deny_save};
2287	return if $self->players;	2454	return if $self->players;
2288		2455
2289	# first deactivate the map and "unlink" it from the core	2456	# first deactivate the map and "unlink" it from the core
2290	$self->deactivate;	2457	$self->deactivate;
2291	$_->clear_links_to ($self) for values %cf::MAP;	2458	$_->clear_links_to ($self) for values %cf::MAP;
2292	$self->in_memory (cf::MAP_SWAPPED);	2459	$self->state (cf::MAP_SWAPPED);
2293		2460
2294	# then atomically save	2461	# then atomically save
2295	$self->_save;	2462	$self->_save;
2296		2463
2297	# then free the map	2464	# then free the map
…		…
2323		2490
2324	return if $self->players;	2491	return if $self->players;
2325		2492
2326	cf::trace "resetting map ", $self->path, "\n";	2493	cf::trace "resetting map ", $self->path, "\n";
2327		2494
2328	$self->in_memory (cf::MAP_SWAPPED);	2495	$self->state (cf::MAP_SWAPPED);
2329		2496
2330	# need to save uniques path	2497	# need to save uniques path
2331	unless ($self->{deny_save}) {	2498	unless ($self->{deny_save}) {
2332	my $uniq = $self->uniq_path; utf8::encode $uniq;	2499	my $uniq = $self->uniq_path; utf8::encode $uniq;
2333		2500
…		…
2663	# use -1 or undef as default coordinates, not 0, 0	2830	# use -1 or undef as default coordinates, not 0, 0
2664	($x, $y) = ($map->enter_x, $map->enter_y)	2831	($x, $y) = ($map->enter_x, $map->enter_y)
2665	if $x <= 0 && $y <= 0;	2832	if $x <= 0 && $y <= 0;
2666		2833
2667	$map->load;	2834	$map->load;
2668	$map->load_neighbours;
2669		2835
2670	return unless $self->contr->active;	2836	return unless $self->contr->active;
2671		2837
2672	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2838	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2673	if ($self->enter_map ($map, $x, $y)) {	2839	if ($self->enter_map ($map, $x, $y)) {
…		…
2729	($path, $x, $y) = (undef, undef, undef);	2895	($path, $x, $y) = (undef, undef, undef);
2730	}	2896	}
2731	}	2897	}
2732		2898
2733	my $map = eval {	2899	my $map = eval {
2734	my $map = defined $path ? cf::map::find $path : undef;	2900	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2735		2901
2736	if ($map) {	2902	if ($map) {
2737	$map = $map->customise_for ($self);	2903	$map = $map->customise_for ($self);
2738	$map = $check->($map, $x, $y, $self) if $check && $map;	2904	$map = $check->($map, $x, $y, $self) if $check && $map;
2739	} else {	2905	} else {
…		…
2829	$Coro::current->{desc} = "enter_exit";	2995	$Coro::current->{desc} = "enter_exit";
2830		2996
2831	unless (eval {	2997	unless (eval {
2832	$self->deactivate_recursive; # just to be sure	2998	$self->deactivate_recursive; # just to be sure
2833		2999
2834	# random map handling
2835	{
2836	my $guard = cf::lock_acquire "exit_prepare:$exit";
2837
2838	prepare_random_map $exit
2839	if $exit->slaying eq "/!";
2840	}
2841
2842	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	3000	my $map = cf::map::normalise $exit->slaying, $exit->map;
2843	my $x = $exit->stats->hp;	3001	my $x = $exit->stats->hp;
2844	my $y = $exit->stats->sp;	3002	my $y = $exit->stats->sp;
		3003
		3004	# special map handling
		3005	my $slaying = $exit->slaying;
		3006
		3007	# special map handling
		3008	if ($slaying eq "/!") {
		3009	my $guard = cf::lock_acquire "exit_prepare:$exit";
		3010
		3011	prepare_random_map $exit
		3012	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		3013
		3014	$map = $exit->slaying;
		3015
		3016	} elsif ($slaying eq '!up') {
		3017	$map = $exit->map->tile_path (cf::TILE_UP);
		3018	$x = $exit->x;
		3019	$y = $exit->y;
		3020
		3021	} elsif ($slaying eq '!down') {
		3022	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3023	$x = $exit->x;
		3024	$y = $exit->y;
		3025	}
2845		3026
2846	$self->goto ($map, $x, $y);	3027	$self->goto ($map, $x, $y);
2847		3028
2848	# if exit is damned, update players death & WoR home-position	3029	# if exit is damned, update players death & WoR home-position
2849	$self->contr->savebed ($map, $x, $y)	3030	$self->contr->savebed ($map, $x, $y)
…		…
3074	=cut	3255	=cut
3075		3256
3076	sub cf::client::ext_msg($$@) {	3257	sub cf::client::ext_msg($$@) {
3077	my ($self, $type, @msg) = @_;	3258	my ($self, $type, @msg) = @_;
3078		3259
3079	if ($self->extcmd == 2) {
3080	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3260	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3081	} elsif ($self->extcmd == 1) { # TODO: remove
3082	push @msg, msgtype => "event_$type";
3083	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3084	}
3085	}
3086
3087	=item $client->ext_reply ($msgid, @msg)
3088
3089	Sends an ext reply to the client.
3090
3091	=cut
3092
3093	sub cf::client::ext_reply($$@) {
3094	my ($self, $id, @msg) = @_;
3095
3096	if ($self->extcmd == 2) {
3097	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3098	} elsif ($self->extcmd == 1) {
3099	#TODO: version 1, remove
3100	unshift @msg, msgtype => "reply", msgid => $id;
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3102	}
3103	}	3261	}
3104		3262
3105	=item $success = $client->query ($flags, "text", \&cb)	3263	=item $success = $client->query ($flags, "text", \&cb)
3106		3264
3107	Queues a query to the client, calling the given callback with	3265	Queues a query to the client, calling the given callback with
…		…
3162	my ($ns, $buf) = @_;	3320	my ($ns, $buf) = @_;
3163		3321
3164	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3322	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3165		3323
3166	if (ref $msg) {	3324	if (ref $msg) {
3167	my ($type, $reply, @payload) =	3325	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3168	"ARRAY" eq ref $msg
3169	? @$msg
3170	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3171		3326
3172	my @reply;
3173
3174	if (my $cb = $EXTICMD{$type}) {	3327	if (my $cb = $EXTIACMD{$type}) {
		3328	$cb->(
		3329	$ns,
		3330	sub {
		3331	$ns->ext_msg ("reply-$reply", @_)
		3332	if $reply;
		3333	},
		3334	@payload
		3335	);
		3336	} else {
		3337	my @reply;
		3338
		3339	if (my $cb = $EXTICMD{$type}) {
3175	@reply = $cb->($ns, @payload);	3340	@reply = $cb->($ns, @payload);
		3341	}
		3342
		3343	$ns->ext_msg ("reply-$reply", @reply)
		3344	if $reply;
3176	}	3345	}
3177
3178	$ns->ext_reply ($reply, @reply)
3179	if $reply;
3180
3181	} else {	3346	} else {
3182	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3347	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3183	}	3348	}
3184		3349
3185	cf::override;	3350	cf::override;
…		…
3268	decrease split destroy change_exp value msg lore send_msg)],	3433	decrease split destroy change_exp value msg lore send_msg)],
3269	["cf::object::player" => qw(player)],	3434	["cf::object::player" => qw(player)],
3270	["cf::player" => qw(peaceful send_msg)],	3435	["cf::player" => qw(peaceful send_msg)],
3271	["cf::map" => qw(trigger)],	3436	["cf::map" => qw(trigger)],
3272	) {	3437	) {
3273	no strict 'refs';
3274	my ($pkg, @funs) = @$_;	3438	my ($pkg, @funs) = @$_;
3275	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3439	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3276	for @funs;	3440	for @funs;
3277	}	3441	}
3278		3442
…		…
3354	=cut	3518	=cut
3355		3519
3356	#############################################################################	3520	#############################################################################
3357	# the server's init and main functions	3521	# the server's init and main functions
3358		3522
		3523	our %FACEHASH; # hash => idx, #d# HACK for http server
		3524
		3525	# internal api, not fianlised
		3526	sub set_face {
		3527	my ($name, $type, $data) = @_;
		3528
		3529	my $idx = cf::face::find $name;
		3530
		3531	if ($idx) {
		3532	delete $FACEHASH{cf::face::get_chksum $idx};
		3533	} else {
		3534	$idx = cf::face::alloc $name;
		3535	}
		3536
		3537	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
		3538
		3539	cf::face::set_type $idx, $type;
		3540	cf::face::set_data $idx, 0, $data, $hash;
		3541	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3542	$FACEHASH{$hash} = $idx;#d#
		3543
		3544	$idx
		3545	}
		3546
3359	sub load_facedata($) {	3547	sub load_facedata($) {
3360	my ($path) = @_;	3548	my ($path) = @_;
3361		3549
3362	# HACK to clear player env face cache, we need some signal framework	3550	# HACK to clear player env face cache, we need some signal framework
3363	# for this (global event?)	3551	# for this (global event?)
…		…
3365		3553
3366	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3554	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3367		3555
3368	trace "loading facedata from $path\n";	3556	trace "loading facedata from $path\n";
3369		3557
3370	my $facedata;	3558	my $facedata = decode_storable load_file $path;
3371	0 < aio_load $path, $facedata
3372	or die "$path: $!";
3373
3374	$facedata = Coro::Storable::thaw $facedata;
3375		3559
3376	$facedata->{version} == 2	3560	$facedata->{version} == 2
3377	or cf::cleanup "$path: version mismatch, cannot proceed.";	3561	or cf::cleanup "$path: version mismatch, cannot proceed.";
3378		3562
3379	# patch in the exptable
3380	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3381	$facedata->{resource}{"res/exp_table"} = {
3382	type => FT_RSRC,
3383	data => $exp_table,
3384	hash => (Digest::MD5::md5 $exp_table),
3385	};
3386	cf::cede_to_tick;	3563	cf::cede_to_tick;
3387		3564
3388	{	3565	{
3389	my $faces = $facedata->{faceinfo};	3566	my $faces = delete $facedata->{faceinfo};
3390		3567
3391	while (my ($face, $info) = each %$faces) {	3568	for my $face (sort keys %$faces) {
		3569	my $info = $faces->{$face};
3392	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3570	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3393		3571
3394	cf::face::set_visibility $idx, $info->{visibility};	3572	cf::face::set_visibility $idx, $info->{visibility};
3395	cf::face::set_magicmap $idx, $info->{magicmap};	3573	cf::face::set_magicmap $idx, $info->{magicmap};
3396	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3574	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3397	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3575	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3398		3576	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3577	$FACEHASH{$info->{hash64}} = $idx;#d#
		3578
3399	cf::cede_to_tick;	3579	cf::cede_to_tick;
3400	}	3580	}
3401		3581
3402	while (my ($face, $info) = each %$faces) {	3582	while (my ($face, $info) = each %$faces) {
3403	next unless $info->{smooth};	3583	next unless $info->{smooth};
…		…
3415	cf::cede_to_tick;	3595	cf::cede_to_tick;
3416	}	3596	}
3417	}	3597	}
3418		3598
3419	{	3599	{
3420	my $anims = $facedata->{animinfo};	3600	my $anims = delete $facedata->{animinfo};
3421		3601
3422	while (my ($anim, $info) = each %$anims) {	3602	while (my ($anim, $info) = each %$anims) {
3423	cf::anim::set $anim, $info->{frames}, $info->{facings};	3603	cf::anim::set $anim, $info->{frames}, $info->{facings};
3424	cf::cede_to_tick;	3604	cf::cede_to_tick;
3425	}	3605	}
3426		3606
3427	cf::anim::invalidate_all; # d'oh	3607	cf::anim::invalidate_all; # d'oh
3428	}	3608	}
3429		3609
3430	{	3610	{
3431	my $res = $facedata->{resource};	3611	my $res = delete $facedata->{resource};
3432		3612
3433	while (my ($name, $info) = each %$res) {	3613	while (my ($name, $info) = each %$res) {
3434	if (defined $info->{type}) {	3614	if (defined (my $type = $info->{type})) {
		3615	# TODO: different hash - must free and use new index, or cache ixface data queue
3435	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3616	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3436		3617
		3618	cf::face::set_type $idx, $type;
3437	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3619	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3438	cf::face::set_type $idx, $info->{type};	3620	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3621	$FACEHASH{$info->{hash}} = $idx;#d#
3439	} else {	3622	} else {
3440	$RESOURCE{$name} = $info; # unused	3623	# $RESOURCE{$name} = $info; # unused
3441	}	3624	}
3442		3625
3443	cf::cede_to_tick;	3626	cf::cede_to_tick;
3444	}	3627	}
3445	}	3628	}
…		…
3463	my $status = load_resource_file_ $_[0];	3646	my $status = load_resource_file_ $_[0];
3464	get_slot 0.1, 100;	3647	get_slot 0.1, 100;
3465	cf::arch::commit_load;	3648	cf::arch::commit_load;
3466		3649
3467	$status	3650	$status
		3651	}
		3652
		3653	sub reload_exp_table {
		3654	_reload_exp_table;
		3655
		3656	set_face "res/exp_table" => FT_RSRC,
		3657	JSON::XS->new->utf8->canonical->encode (
		3658	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3659	);
		3660	}
		3661
		3662	sub reload_materials {
		3663	_reload_materials;
3468	}	3664	}
3469		3665
3470	sub reload_regions {	3666	sub reload_regions {
3471	# HACK to clear player env face cache, we need some signal framework	3667	# HACK to clear player env face cache, we need some signal framework
3472	# for this (global event?)	3668	# for this (global event?)
…		…
3487	}	3683	}
3488		3684
3489	sub reload_archetypes {	3685	sub reload_archetypes {
3490	load_resource_file "$DATADIR/archetypes"	3686	load_resource_file "$DATADIR/archetypes"
3491	or die "unable to load archetypes\n";	3687	or die "unable to load archetypes\n";
		3688
		3689	set_face "res/skill_info" => FT_RSRC,
		3690	JSON::XS->new->utf8->canonical->encode (
		3691	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3692	);
		3693	set_face "res/spell_paths" => FT_RSRC,
		3694	JSON::XS->new->utf8->canonical->encode (
		3695	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3696	);
3492	}	3697	}
3493		3698
3494	sub reload_treasures {	3699	sub reload_treasures {
3495	load_resource_file "$DATADIR/treasures"	3700	load_resource_file "$DATADIR/treasures"
3496	or die "unable to load treasurelists\n";	3701	or die "unable to load treasurelists\n";
3497	}	3702	}
3498		3703
3499	sub reload_sound {	3704	sub reload_sound {
3500	trace "loading sound config from $DATADIR/sound\n";	3705	trace "loading sound config from $DATADIR/sound\n";
3501		3706
3502	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3503	or die "$DATADIR/sound $!";
3504
3505	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3707	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3506		3708
3507	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3709	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3508	my $sound = $soundconf->{compat}[$_]	3710	my $sound = $soundconf->{compat}[$_]
3509	or next;	3711	or next;
3510		3712
…		…
3520	}	3722	}
3521		3723
3522	sub reload_resources {	3724	sub reload_resources {
3523	trace "reloading resource files...\n";	3725	trace "reloading resource files...\n";
3524		3726
		3727	reload_materials;
3525	reload_facedata;	3728	reload_facedata;
		3729	reload_exp_table;
3526	reload_sound;	3730	reload_sound;
3527	reload_archetypes;	3731	reload_archetypes;
3528	reload_regions;	3732	reload_regions;
3529	reload_treasures;	3733	reload_treasures;
3530		3734
…		…
3532	}	3736	}
3533		3737
3534	sub reload_config {	3738	sub reload_config {
3535	trace "reloading config file...\n";	3739	trace "reloading config file...\n";
3536		3740
3537	open my $fh, "<:utf8", "$CONFDIR/config"	3741	my $config = load_file "$CONFDIR/config";
3538	or return;	3742	utf8::decode $config;
3539		3743	*CFG = decode_yaml $config;
3540	local $/;
3541	*CFG = YAML::XS::Load scalar <$fh>;
3542		3744
3543	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3745	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3544		3746
3545	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3747	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3546	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3748	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3550	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3752	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3551	and die "WARNING: m(un)lockall failed: $!\n";	3753	and die "WARNING: m(un)lockall failed: $!\n";
3552	};	3754	};
3553	warn $@ if $@;	3755	warn $@ if $@;
3554	}	3756	}
3555
3556	trace "finished reloading resource files\n";
3557	}	3757	}
3558		3758
3559	sub pidfile() {	3759	sub pidfile() {
3560	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3760	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3561	or die "$PIDFILE: $!";	3761	or die "$PIDFILE: $!";
…		…
3586		3786
3587	sub main {	3787	sub main {
3588	cf::init_globals; # initialise logging	3788	cf::init_globals; # initialise logging
3589		3789
3590	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3790	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3591	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3791	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3592	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3792	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3593	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3793	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3594		3794
3595	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3795	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3596		3796
3597	# we must not ever block the main coroutine	3797	# we must not ever block the main coroutine
3598	local $Coro::idle = sub {	3798	$Coro::idle = sub {
3599	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3799	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3600	(async {	3800	(async {
3601	$Coro::current->{desc} = "IDLE BUG HANDLER";	3801	$Coro::current->{desc} = "IDLE BUG HANDLER";
3602	EV::loop EV::LOOP_ONESHOT;	3802	EV::loop EV::LOOP_ONESHOT;
3603	})->prio (Coro::PRIO_MAX);	3803	})->prio (Coro::PRIO_MAX);
3604	};	3804	};
3605		3805
3606	evthread_start IO::AIO::poll_fileno;	3806	evthread_start IO::AIO::poll_fileno;
3607		3807
3608	cf::sync_job {	3808	cf::sync_job {
3609	cf::init_experience;	3809	cf::incloader::init ();
		3810
		3811	db_init;
		3812
3610	cf::init_anim;	3813	cf::init_anim;
3611	cf::init_attackmess;	3814	cf::init_attackmess;
3612	cf::init_dynamic;	3815	cf::init_dynamic;
3613		3816
3614	cf::load_settings;	3817	cf::load_settings;
3615	cf::load_materials;
3616		3818
3617	reload_resources;	3819	reload_resources;
3618	reload_config;	3820	reload_config;
3619	db_init;
3620		3821
3621	cf::init_uuid;	3822	cf::init_uuid;
3622	cf::init_signals;	3823	cf::init_signals;
3623	cf::init_skills;	3824	cf::init_skills;
3624		3825
…		…
3632		3833
3633	# no (long-running) fork's whatsoever before this point(!)	3834	# no (long-running) fork's whatsoever before this point(!)
3634	use POSIX ();	3835	use POSIX ();
3635	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3836	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3636		3837
3637	(pop @POST_INIT)->(0) while @POST_INIT;	3838	cf::_post_init 0;
3638	};	3839	};
3639		3840
3640	cf::object::thawer::errors_are_fatal 0;	3841	cf::object::thawer::errors_are_fatal 0;
3641	info "parse errors in files are no longer fatal from this point on.\n";	3842	info "parse errors in files are no longer fatal from this point on.\n";
3642		3843
		3844	AE::postpone {
		3845	undef &main; # free gobs of memory :)
		3846	};
		3847
3643	main_loop;	3848	goto &main_loop;
3644	}	3849	}
3645		3850
3646	#############################################################################	3851	#############################################################################
3647	# initialisation and cleanup	3852	# initialisation and cleanup
3648		3853
…		…
3747	sub emergency_save() {	3952	sub emergency_save() {
3748	my $freeze_guard = cf::freeze_mainloop;	3953	my $freeze_guard = cf::freeze_mainloop;
3749		3954
3750	info "emergency_perl_save: enter\n";	3955	info "emergency_perl_save: enter\n";
3751		3956
		3957	# this is a trade-off: we want to be very quick here, so
		3958	# save all maps without fsync, and later call a global sync
		3959	# (which in turn might be very very slow)
		3960	local $USE_FSYNC = 0;
		3961
3752	cf::sync_job {	3962	cf::sync_job {
3753	# this is a trade-off: we want to be very quick here, so	3963	cf::write_runtime_sync; # external watchdog should not bark
3754	# save all maps without fsync, and later call a global sync
3755	# (which in turn might be very very slow)
3756	local $USE_FSYNC = 0;
3757		3964
3758	# use a peculiar iteration method to avoid tripping on perl	3965	# use a peculiar iteration method to avoid tripping on perl
3759	# refcount bugs in for. also avoids problems with players	3966	# refcount bugs in for. also avoids problems with players
3760	# and maps saved/destroyed asynchronously.	3967	# and maps saved/destroyed asynchronously.
3761	info "emergency_perl_save: begin player save\n";	3968	info "emergency_perl_save: begin player save\n";
…		…
3765	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3972	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3766	$pl->save;	3973	$pl->save;
3767	}	3974	}
3768	info "emergency_perl_save: end player save\n";	3975	info "emergency_perl_save: end player save\n";
3769		3976
		3977	cf::write_runtime_sync; # external watchdog should not bark
		3978
3770	info "emergency_perl_save: begin map save\n";	3979	info "emergency_perl_save: begin map save\n";
3771	for my $path (keys %cf::MAP) {	3980	for my $path (keys %cf::MAP) {
3772	my $map = $cf::MAP{$path} or next;	3981	my $map = $cf::MAP{$path} or next;
3773	$map->valid or next;	3982	$map->valid or next;
3774	$map->save;	3983	$map->save;
3775	}	3984	}
3776	info "emergency_perl_save: end map save\n";	3985	info "emergency_perl_save: end map save\n";
3777		3986
		3987	cf::write_runtime_sync; # external watchdog should not bark
		3988
3778	info "emergency_perl_save: begin database checkpoint\n";	3989	info "emergency_perl_save: begin database checkpoint\n";
3779	BDB::db_env_txn_checkpoint $DB_ENV;	3990	BDB::db_env_txn_checkpoint $DB_ENV;
3780	info "emergency_perl_save: end database checkpoint\n";	3991	info "emergency_perl_save: end database checkpoint\n";
3781		3992
3782	info "emergency_perl_save: begin write uuid\n";	3993	info "emergency_perl_save: begin write uuid\n";
3783	write_uuid_sync 1;	3994	write_uuid_sync 1;
3784	info "emergency_perl_save: end write uuid\n";	3995	info "emergency_perl_save: end write uuid\n";
3785	};
3786		3996
		3997	cf::write_runtime_sync; # external watchdog should not bark
		3998
		3999	trace "emergency_perl_save: syncing database to disk";
		4000	BDB::db_env_txn_checkpoint $DB_ENV;
		4001
3787	info "emergency_perl_save: starting sync()\n";	4002	info "emergency_perl_save: starting sync\n";
3788	IO::AIO::aio_sync sub {	4003	IO::AIO::aio_sync sub {
3789	info "emergency_perl_save: finished sync()\n";	4004	info "emergency_perl_save: finished sync\n";
		4005	};
		4006
		4007	cf::write_runtime_sync; # external watchdog should not bark
		4008
		4009	trace "emergency_perl_save: flushing outstanding aio requests";
		4010	while (IO::AIO::nreqs || BDB::nreqs) {
		4011	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		4012	}
		4013
		4014	cf::write_runtime_sync; # external watchdog should not bark
3790	};	4015	};
3791		4016
3792	info "emergency_perl_save: leave\n";	4017	info "emergency_perl_save: leave\n";
3793	}	4018	}
3794		4019
3795	sub post_cleanup {	4020	sub post_cleanup {
3796	my ($make_core) = @_;	4021	my ($make_core) = @_;
		4022
		4023	IO::AIO::flush;
3797		4024
3798	error Carp::longmess "post_cleanup backtrace"	4025	error Carp::longmess "post_cleanup backtrace"
3799	if $make_core;	4026	if $make_core;
3800		4027
3801	my $fh = pidfile;	4028	my $fh = pidfile;
…		…
3827	}	4054	}
3828	}	4055	}
3829		4056
3830	sub do_reload_perl() {	4057	sub do_reload_perl() {
3831	# can/must only be called in main	4058	# can/must only be called in main
3832	if (in_main) {	4059	unless (in_main) {
3833	error "can only reload from main coroutine";	4060	error "can only reload from main coroutine";
3834	return;	4061	return;
3835	}	4062	}
3836		4063
3837	return if $RELOAD++;	4064	return if $RELOAD++;
3838		4065
3839	my $t1 = AE::time;	4066	my $t1 = AE::time;
3840		4067
3841	while ($RELOAD) {	4068	while ($RELOAD) {
		4069	cf::get_slot 0.1, -1, "reload_perl";
3842	info "reloading...";	4070	info "perl_reload: reloading...";
3843		4071
3844	trace "entering sync_job";	4072	trace "perl_reload: entering sync_job";
3845		4073
3846	cf::sync_job {	4074	cf::sync_job {
3847	cf::write_runtime_sync; # external watchdog should not bark
3848	cf::emergency_save;	4075	#cf::emergency_save;
3849	cf::write_runtime_sync; # external watchdog should not bark
3850		4076
3851	trace "syncing database to disk";
3852	BDB::db_env_txn_checkpoint $DB_ENV;
3853
3854	# if anything goes wrong in here, we should simply crash as we already saved
3855
3856	trace "flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3859	}
3860
3861	trace "cancelling all extension coros";	4077	trace "perl_reload: cancelling all extension coros";
3862	$_->cancel for values %EXT_CORO;	4078	$_->cancel for values %EXT_CORO;
3863	%EXT_CORO = ();	4079	%EXT_CORO = ();
3864		4080
3865	trace "removing commands";	4081	trace "perl_reload: removing commands";
3866	%COMMAND = ();	4082	%COMMAND = ();
3867		4083
3868	trace "removing ext/exti commands";	4084	trace "perl_reload: removing ext/exti commands";
3869	%EXTCMD = ();	4085	%EXTCMD = ();
3870	%EXTICMD = ();	4086	%EXTICMD = ();
3871		4087
3872	trace "unloading/nuking all extensions";	4088	trace "perl_reload: unloading/nuking all extensions";
3873	for my $pkg (@EXTS) {	4089	for my $pkg (@EXTS) {
3874	trace "... unloading $pkg";	4090	trace "... unloading $pkg";
3875		4091
3876	if (my $cb = $pkg->can ("unload")) {	4092	if (my $cb = $pkg->can ("unload")) {
3877	eval {	4093	eval {
…		…
3882		4098
3883	trace "... clearing $pkg";	4099	trace "... clearing $pkg";
3884	clear_package $pkg;	4100	clear_package $pkg;
3885	}	4101	}
3886		4102
3887	trace "unloading all perl modules loaded from $LIBDIR";	4103	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3888	while (my ($k, $v) = each %INC) {	4104	while (my ($k, $v) = each %INC) {
3889	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4105	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3890		4106
3891	trace "... unloading $k";	4107	trace "... unloading $k";
3892	delete $INC{$k};	4108	delete $INC{$k};
…		…
3899	}	4115	}
3900		4116
3901	clear_package $k;	4117	clear_package $k;
3902	}	4118	}
3903		4119
3904	trace "getting rid of safe::, as good as possible";	4120	trace "perl_reload: getting rid of safe::, as good as possible";
3905	clear_package "safe::$_"	4121	clear_package "safe::$_"
3906	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4122	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3907		4123
3908	trace "unloading cf.pm \"a bit\"";	4124	trace "perl_reload: unloading cf.pm \"a bit\"";
3909	delete $INC{"cf.pm"};	4125	delete $INC{"cf.pm"};
3910	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4126	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3911		4127
3912	# don't, removes xs symbols, too,	4128	# don't, removes xs symbols, too,
3913	# and global variables created in xs	4129	# and global variables created in xs
3914	#clear_package __PACKAGE__;	4130	#clear_package __PACKAGE__;
3915		4131
3916	info "unload completed, starting to reload now";	4132	info "perl_reload: unload completed, starting to reload now";
3917		4133
3918	trace "reloading cf.pm";	4134	trace "perl_reload: reloading cf.pm";
3919	require cf;	4135	require cf;
3920	cf::_connect_to_perl_1;	4136	cf::_connect_to_perl_1;
3921		4137
3922	trace "loading config and database again";	4138	trace "perl_reload: loading config and database again";
3923	cf::reload_config;	4139	cf::reload_config;
3924		4140
3925	trace "loading extensions";	4141	trace "perl_reload: loading extensions";
3926	cf::load_extensions;	4142	cf::load_extensions;
3927		4143
3928	if ($REATTACH_ON_RELOAD) {	4144	if ($REATTACH_ON_RELOAD) {
3929	trace "reattaching attachments to objects/players";	4145	trace "perl_reload: reattaching attachments to objects/players";
3930	_global_reattach; # objects, sockets	4146	_global_reattach; # objects, sockets
3931	trace "reattaching attachments to maps";	4147	trace "perl_reload: reattaching attachments to maps";
3932	reattach $_ for values %MAP;	4148	reattach $_ for values %MAP;
3933	trace "reattaching attachments to players";	4149	trace "perl_reload: reattaching attachments to players";
3934	reattach $_ for values %PLAYER;	4150	reattach $_ for values %PLAYER;
3935	}	4151	}
3936		4152
3937	trace "running post_init jobs";	4153	cf::_post_init 1;
3938	(pop @POST_INIT)->(1) while @POST_INIT;
3939		4154
3940	trace "leaving sync_job";	4155	trace "perl_reload: leaving sync_job";
3941		4156
3942	1	4157	1
3943	} or do {	4158	} or do {
3944	error $@;	4159	error $@;
3945	cf::cleanup "error while reloading, exiting.";	4160	cf::cleanup "perl_reload: error, exiting.";
3946	};	4161	};
3947		4162
3948	info "reloaded";
3949	--$RELOAD;	4163	--$RELOAD;
3950	}	4164	}
3951		4165
3952	$t1 = AE::time - $t1;	4166	$t1 = AE::time - $t1;
3953	info "reload completed in ${t1}s\n";	4167	info "perl_reload: completed in ${t1}s\n";
3954	};	4168	};
3955		4169
3956	our $RELOAD_WATCHER; # used only during reload	4170	our $RELOAD_WATCHER; # used only during reload
3957		4171
3958	sub reload_perl() {	4172	sub reload_perl() {
…		…
3979	reload_perl;	4193	reload_perl;
3980	};	4194	};
3981	}	4195	}
3982	};	4196	};
3983		4197
3984	unshift @INC, $LIBDIR;	4198	#############################################################################
3985		4199
3986	my $bug_warning = 0;	4200	my $bug_warning = 0;
3987		4201
3988	our @WAIT_FOR_TICK;
3989	our @WAIT_FOR_TICK_BEGIN;
3990
3991	sub wait_for_tick {	4202	sub wait_for_tick() {
3992	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4203	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3993		4204
3994	my $signal = new Coro::Signal;	4205	$WAIT_FOR_TICK->wait;
3995	push @WAIT_FOR_TICK, $signal;
3996	$signal->wait;
3997	}	4206	}
3998		4207
3999	sub wait_for_tick_begin {	4208	sub wait_for_tick_begin() {
4000	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4209	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4001		4210
4002	my $signal = new Coro::Signal;	4211	my $signal = new Coro::Signal;
4003	push @WAIT_FOR_TICK_BEGIN, $signal;	4212	push @WAIT_FOR_TICK_BEGIN, $signal;
4004	$signal->wait;	4213	$signal->wait;
4005	}	4214	}
…		…
4009	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4218	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4010	unless ++$bug_warning > 10;	4219	unless ++$bug_warning > 10;
4011	return;	4220	return;
4012	}	4221	}
4013		4222
4014	cf::server_tick; # one server iteration	4223	cf::one_tick; # one server iteration
4015		4224
4016	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4225	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4017		4226
4018	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4227	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4019	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4228	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4025	}	4234	}
4026		4235
4027	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4236	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4028	$sig->send;	4237	$sig->send;
4029	}	4238	}
4030	while (my $sig = shift @WAIT_FOR_TICK) {	4239	$WAIT_FOR_TICK->broadcast;
4031	$sig->send;
4032	}
4033		4240
4034	$LOAD = ($NOW - $TICK_START) / $TICK;	4241	$LOAD = ($NOW - $TICK_START) / $TICK;
4035	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4242	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4036		4243
4037	if (0) {	4244	if (0) {
…		…
4043	}	4250	}
4044	}	4251	}
4045		4252
4046	{	4253	{
4047	# configure BDB	4254	# configure BDB
		4255	info "initialising database";
4048		4256
4049	BDB::min_parallel 16;	4257	BDB::min_parallel 16;
4050	BDB::max_poll_reqs $TICK * 0.1;	4258	BDB::max_poll_reqs $TICK * 0.1;
4051	$AnyEvent::BDB::WATCHER->priority (1);	4259	#$AnyEvent::BDB::WATCHER->priority (1);
4052		4260
4053	unless ($DB_ENV) {	4261	unless ($DB_ENV) {
4054	$DB_ENV = BDB::db_env_create;	4262	$DB_ENV = BDB::db_env_create;
4055	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4263	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4056	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4264	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4057	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;	4265	$DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4058	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);	4266	$DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4059	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);	4267	$DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
4060		4268
4061	(Coro::async { # async to keep sync_job from complaining
4062	cf::sync_job {	4269	cf::sync_job {
4063	eval {	4270	eval {
4064	BDB::db_env_open	4271	BDB::db_env_open
4065	$DB_ENV,	4272	$DB_ENV,
4066	$BDBDIR,	4273	$BDBDIR,
4067	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN	4274	BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
4068	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,	4275	| BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
4069	0666;	4276	0666;
4070		4277
4071	cf::cleanup "db_env_open($BDBDIR): $!" if $!;	4278	cf::cleanup "db_env_open($BDBDIR): $!" if $!;
4072	};
4073
4074	cf::cleanup "db_env_open(db): $@" if $@;
4075	};	4279	};
4076	})->join;	4280
		4281	cf::cleanup "db_env_open(db): $@" if $@;
		4282	};
4077	}	4283	}
4078		4284
4079	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {	4285	$BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4080	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };	4286	BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4081	};	4287	};
…		…
4083	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4289	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4084	};	4290	};
4085	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4291	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4086	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4292	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4087	};	4293	};
		4294
		4295	info "database initialised";
4088	}	4296	}
4089		4297
4090	{	4298	{
4091	# configure IO::AIO	4299	# configure IO::AIO
4092		4300
		4301	info "initialising aio";
4093	IO::AIO::min_parallel 8;	4302	IO::AIO::min_parallel 8;
4094	IO::AIO::max_poll_time $TICK * 0.1;	4303	IO::AIO::max_poll_time $TICK * 0.1;
4095	undef $AnyEvent::AIO::WATCHER;	4304	undef $AnyEvent::AIO::WATCHER;
		4305	info "aio initialised";
4096	}	4306	}
4097		4307
4098	my $_log_backtrace;	4308	our $_log_backtrace;
		4309	our $_log_backtrace_last;
4099		4310
4100	sub _log_backtrace {	4311	sub _log_backtrace {
4101	my ($msg, @addr) = @_;	4312	my ($msg, @addr) = @_;
4102		4313
4103	$msg =~ s/\n//;	4314	$msg =~ s/\n$//;
4104		4315
		4316	if ($_log_backtrace_last eq $msg) {
		4317	LOG llevInfo, "[ABT] $msg\n";
		4318	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4105	# limit the # of concurrent backtraces	4319	# limit the # of concurrent backtraces
4106	if ($_log_backtrace < 2) {	4320	} elsif ($_log_backtrace < 2) {
		4321	$_log_backtrace_last = $msg;
4107	++$_log_backtrace;	4322	++$_log_backtrace;
4108	my $perl_bt = Carp::longmess $msg;	4323	my $perl_bt = Carp::longmess $msg;
4109	async {	4324	async {
4110	$Coro::current->{desc} = "abt $msg";	4325	$Coro::current->{desc} = "abt $msg";
4111		4326
…		…
4131	LOG llevInfo, "[ABT] $_\n" for @bt;	4346	LOG llevInfo, "[ABT] $_\n" for @bt;
4132	--$_log_backtrace;	4347	--$_log_backtrace;
4133	};	4348	};
4134	} else {	4349	} else {
4135	LOG llevInfo, "[ABT] $msg\n";	4350	LOG llevInfo, "[ABT] $msg\n";
4136	LOG llevInfo, "[ABT] [suppressed]\n";	4351	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4137	}	4352	}
4138	}	4353	}
4139		4354
4140	# load additional modules	4355	# load additional modules
4141	require "cf/$_.pm" for @EXTRA_MODULES;	4356	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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