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

Diff Legend

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