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.530 by root, Wed Apr 28 21:05:33 2010 UTC vs.
Revision 1.587 by root, Wed Oct 31 19:09:47 2012 UTC

1	#	1	#
2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	#	3	#
4	# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	# Copyright (©) 2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	#	5	#
6	# Deliantra is free software: you can redistribute it and/or modify it under	6	# Deliantra is free software: you can redistribute it and/or modify it under
7	# the terms of the Affero GNU General Public License as published by the	7	# the terms of the Affero GNU General Public License as published by the
8	# Free Software Foundation, either version 3 of the License, or (at your	8	# Free Software Foundation, either version 3 of the License, or (at your
9	# option) any later version.	9	# option) any later version.
10	#	10	#
11	# This program is distributed in the hope that it will be useful,	11	# This program is distributed in the hope that it will be useful,
12	# but WITHOUT ANY WARRANTY; without even the implied warranty of	12	# but WITHOUT ANY WARRANTY; without even the implied warranty of
13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	13	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14	# GNU General Public License for more details.	14	# GNU General Public License for more details.
15	#	15	#
16	# You should have received a copy of the Affero GNU General Public License	16	# You should have received a copy of the Affero GNU General Public License
17	# and the GNU General Public License along with this program. If not, see	17	# and the GNU General Public License along with this program. If not, see
18	# <http://www.gnu.org/licenses/>.	18	# <http://www.gnu.org/licenses/>.
19	#	19	#
20	# The authors can be reached via e-mail to <support@deliantra.net>	20	# The authors can be reached via e-mail to <support@deliantra.net>
21	#	21	#
22		22
23	package cf;	23	package cf;
24		24
25	use 5.10.0;	25	use common::sense;
26	use utf8;
27	use strict qw(vars subs);
28		26
29	use Symbol;	27	use Symbol;
30	use List::Util;	28	use List::Util;
31	use Socket;	29	use Socket;
32	use EV;	30	use EV;
…		…
34	use Safe;	32	use Safe;
35	use Safe::Hole;	33	use Safe::Hole;
36	use Storable ();	34	use Storable ();
37	use Carp ();	35	use Carp ();
38		36
39	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
40	use Coro ();	41	use Coro ();
41	use Coro::State;	42	use Coro::State;
42	use Coro::Handle;	43	use Coro::Handle;
43	use Coro::EV;	44	use Coro::EV;
44	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
50	use Coro::AIO;	51	use Coro::AIO;
51	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
52	use Coro::Storable;	53	use Coro::Storable;
53	use Coro::Util ();	54	use Coro::Util ();
54		55
		56	use Guard ();
55	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
56	use BDB ();	58	use BDB ();
57	use Data::Dumper;	59	use Data::Dumper;
58	use Fcntl;	60	use Fcntl;
59	use YAML::XS ();	61	use YAML::XS ();
…		…
78	# strictly for debugging	80	# strictly for debugging
79	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };	81	$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
80		82
81	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload	83	sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
82		84
		85	our @ORIG_INC;
		86
83	our %COMMAND = ();	87	our %COMMAND = ();
84	our %COMMAND_TIME = ();	88	our %COMMAND_TIME = ();
85		89
86	our @EXTS = (); # list of extension package names	90	our @EXTS = (); # list of extension package names
87	our %EXTCMD = ();	91	our %EXTCMD = ();
…		…
93	our @EVENT;	97	our @EVENT;
94	our @REFLECT; # set by XS	98	our @REFLECT; # set by XS
95	our %REFLECT; # set by us	99	our %REFLECT; # set by us
96		100
97	our $CONFDIR = confdir;	101	our $CONFDIR = confdir;
		102
98	our $DATADIR = datadir;	103	our $DATADIR = datadir;
99	our $LIBDIR = "$DATADIR/ext";	104	our $LIBDIR = "$DATADIR/ext";
100	our $PODDIR = "$DATADIR/pod";	105	our $PODDIR = "$DATADIR/pod";
101	our $MAPDIR = "$DATADIR/" . mapdir;	106	our $MAPDIR = "$DATADIR/" . mapdir;
		107
102	our $LOCALDIR = localdir;	108	our $LOCALDIR = localdir;
103	our $TMPDIR = "$LOCALDIR/" . tmpdir;	109	our $TMPDIR = "$LOCALDIR/" . tmpdir;
104	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;	110	our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
105	our $PLAYERDIR = "$LOCALDIR/" . playerdir;	111	our $PLAYERDIR = "$LOCALDIR/" . playerdir;
106	our $RANDOMDIR = "$LOCALDIR/random";	112	our $RANDOMDIR = "$LOCALDIR/random";
107	our $BDBDIR = "$LOCALDIR/db";	113	our $BDBDIR = "$LOCALDIR/db";
108	our $PIDFILE = "$LOCALDIR/pid";	114	our $PIDFILE = "$LOCALDIR/pid";
109	our $RUNTIMEFILE = "$LOCALDIR/runtime";	115	our $RUNTIMEFILE = "$LOCALDIR/runtime";
110		116
111	our %RESOURCE; # unused	117	#our %RESOURCE; # unused
112		118
113	our $OUTPUT_RATE_MIN = 3000;	119	our $OUTPUT_RATE_MIN = 3000;
114	our $OUTPUT_RATE_MAX = 1000000;	120	our $OUTPUT_RATE_MAX = 1000000;
115		121
116	our $MAX_LINKS = 32; # how many chained exits to follow	122	our $MAX_LINKS = 32; # how many chained exits to follow
…		…
124	our $BDB_DEADLOCK_WATCHER;	130	our $BDB_DEADLOCK_WATCHER;
125	our $BDB_CHECKPOINT_WATCHER;	131	our $BDB_CHECKPOINT_WATCHER;
126	our $BDB_TRICKLE_WATCHER;	132	our $BDB_TRICKLE_WATCHER;
127	our $DB_ENV;	133	our $DB_ENV;
128		134
129	our @EXTRA_MODULES = qw(pod match mapscript);	135	our @EXTRA_MODULES = qw(pod match mapscript incloader);
130		136
131	our %CFG;	137	our %CFG;
		138	our %EXT_CFG; # cfgkeyname => [var-ref, defaultvalue]
132		139
133	our $UPTIME; $UPTIME ||= time;	140	our $UPTIME; $UPTIME ||= time;
134	our $RUNTIME;	141	our $RUNTIME = 0;
		142	our $SERVER_TICK = 0;
135	our $NOW;	143	our $NOW;
136		144
137	our (%PLAYER, %PLAYER_LOADING); # all users	145	our (%PLAYER, %PLAYER_LOADING); # all users
138	our (%MAP, %MAP_LOADING ); # all maps	146	our (%MAP, %MAP_LOADING ); # all maps
139	our $LINK_MAP; # the special {link} map, which is always available	147	our $LINK_MAP; # the special {link} map, which is always available
…		…
148		156
149	our @POST_INIT;	157	our @POST_INIT;
150		158
151	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)	159	our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
152	our $REALLY_UNLOOP; # never set to true, please :)	160	our $REALLY_UNLOOP; # never set to true, please :)
		161
		162	our $WAIT_FOR_TICK = new Coro::Signal;
		163	our @WAIT_FOR_TICK_BEGIN;
153		164
154	binmode STDOUT;	165	binmode STDOUT;
155	binmode STDERR;	166	binmode STDERR;
156		167
157	# read virtual server time, if available	168	# read virtual server time, if available
…		…
191		202
192	=over 4	203	=over 4
193		204
194	=item $cf::UPTIME	205	=item $cf::UPTIME
195		206
196	The timestamp of the server start (so not actually an uptime).	207	The timestamp of the server start (so not actually an "uptime").
		208
		209	=item $cf::SERVER_TICK
		210
		211	An unsigned integer that starts at zero when the server is started and is
		212	incremented on every tick.
		213
		214	=item $cf::NOW
		215
		216	The (real) time of the last (current) server tick - updated before and
		217	after tick processing, so this is useful only as a rough "what time is it
		218	now" estimate.
		219
		220	=item $cf::TICK
		221
		222	The interval between each server tick, in seconds.
197		223
198	=item $cf::RUNTIME	224	=item $cf::RUNTIME
199		225
200	The time this server has run, starts at 0 and is increased by $cf::TICK on	226	The time this server has run, starts at 0 and is increased by $cf::TICK on
201	every server tick.	227	every server tick.
…		…
207	Various directories - "/etc", read-only install directory, perl-library	233	Various directories - "/etc", read-only install directory, perl-library
208	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",	234	directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
209	unique-items directory, player file directory, random maps directory and	235	unique-items directory, player file directory, random maps directory and
210	database environment.	236	database environment.
211		237
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	238	=item $cf::LOADAVG
221		239
222	The current CPU load on the server (alpha-smoothed), as a value between 0	240	The current CPU load on the server (alpha-smoothed), as a value between 0
223	(none) and 1 (overloaded), indicating how much time is spent on processing	241	(none) and 1 (overloaded), indicating how much time is spent on processing
224	objects per tick. Healthy values are < 0.5.	242	objects per tick. Healthy values are < 0.5.
…		…
233	from wherever your confdir points to.	251	from wherever your confdir points to.
234		252
235	=item cf::wait_for_tick, cf::wait_for_tick_begin	253	=item cf::wait_for_tick, cf::wait_for_tick_begin
236		254
237	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only	255	These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
238	returns directly I<after> the tick processing (and consequently, can only wake one process	256	returns directly I<after> the tick processing (and consequently, can only wake one thread
239	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.	257	per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
		258
		259	Note that cf::Wait_for_tick will immediately return when the server is not
		260	ticking, making it suitable for small pauses in threads that need to run
		261	when the server is paused. If that is not applicable (i.e. you I<really>
		262	want to wait, use C<$cf::WAIT_FOR_TICK>).
		263
		264	=item $cf::WAIT_FOR_TICK
		265
		266	Note that C<cf::wait_for_tick> is probably the correct thing to use. This
		267	variable contains a L<Coro::Signal> that is broadcats after every server
		268	tick. Calling C<< ->wait >> on it will suspend the caller until after the
		269	next server tick.
		270
		271	=cut
		272
		273	sub wait_for_tick();
		274	sub wait_for_tick_begin();
240		275
241	=item @cf::INVOKE_RESULTS	276	=item @cf::INVOKE_RESULTS
242		277
243	This array contains the results of the last C<invoke ()> call. When	278	This array contains the results of the last C<invoke ()> call. When
244	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of	279	C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
…		…
252		287
253	=back	288	=back
254		289
255	=cut	290	=cut
256		291
		292	sub error(@) { LOG llevError, join "", @_ }
		293	sub warn (@) { LOG llevWarn , join "", @_ }
		294	sub info (@) { LOG llevInfo , join "", @_ }
		295	sub debug(@) { LOG llevDebug, join "", @_ }
		296	sub trace(@) { LOG llevTrace, join "", @_ }
		297
257	$Coro::State::WARNHOOK = sub {	298	$Coro::State::WARNHOOK = sub {
258	my $msg = join "", @_;	299	my $msg = join "", @_;
259		300
260	$msg .= "\n"	301	$msg .= "\n"
261	unless $msg =~ /\n$/;	302	unless $msg =~ /\n$/;
262		303
263	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;	304	$msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
264		305
265	LOG llevError, $msg;	306	LOG llevWarn, $msg;
266	};	307	};
267		308
268	$Coro::State::DIEHOOK = sub {	309	$Coro::State::DIEHOOK = sub {
269	return unless $^S eq 0; # "eq", not "=="	310	return unless $^S eq 0; # "eq", not "=="
270		311
271	warn Carp::longmess $_[0];	312	error Carp::longmess $_[0];
272		313
273	if (in_main) {#d#	314	if (in_main) {#d#
274	warn "DIEHOOK called in main context, Coro bug?\n";#d#	315	error "DIEHOOK called in main context, Coro bug?\n";#d#
275	return;#d#	316	return;#d#
276	}#d#	317	}#d#
277		318
278	# kill coroutine otherwise	319	# kill coroutine otherwise
279	Coro::terminate	320	Coro::terminate
…		…
299	)) {	340	)) {
300	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
301	}	342	}
302		343
303	$EV::DIED = sub {	344	$EV::DIED = sub {
304	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
305	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
306		352
307	#############################################################################	353	#############################################################################
308		354
309	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
310		356
…		…
331	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;	377	$d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
332	$d	378	$d
333	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
334	}	380	}
335		381
		382	=item $scalar = cf::load_file $path
		383
		384	Loads the given file from path and returns its contents. Croaks on error
		385	and can block.
		386
		387	=cut
		388
		389	sub load_file($) {
		390	0 <= aio_load $_[0], my $data
		391	or Carp::croak "$_[0]: $!";
		392
		393	$data
		394	}
		395
		396	=item $success = cf::replace_file $path, $data, $sync
		397
		398	Atomically replaces the file at the given $path with new $data, and
		399	optionally $sync the data to disk before replacing the file.
		400
		401	=cut
		402
		403	sub replace_file($$;$) {
		404	my ($path, $data, $sync) = @_;
		405
		406	my $lock = cf::lock_acquire ("replace_file:$path");
		407
		408	my $fh = aio_open "$path~", Fcntl::O_WRONLY | Fcntl::O_CREAT | Fcntl::O_TRUNC, 0644
		409	or return;
		410
		411	$data = $data->() if ref $data;
		412
		413	length $data == aio_write $fh, 0, (length $data), $data, 0
		414	or return;
		415
		416	!$sync
		417	or !aio_fsync $fh
		418	or return;
		419
		420	aio_close $fh
		421	and return;
		422
		423	aio_rename "$path~", $path
		424	and return;
		425
		426	if ($sync) {
		427	$path =~ s%/[^/]*$%%;
		428	aio_pathsync $path;
		429	}
		430
		431	1
		432	}
		433
336	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
337		435
338	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
339		437
340	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
346	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max	444	our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
347		445
348	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
349	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
350		448
		449	=item $ref = cf::decode_storable $scalar
		450
		451	Same as Coro::Storable::thaw, so blocks.
		452
		453	=cut
		454
		455	BEGIN { *decode_storable = \&Coro::Storable::thaw }
		456
		457	=item $ref = cf::decode_yaml $scalar
		458
		459	Same as YAML::XS::Load, but doesn't leak, because it forks (and thus blocks).
		460
		461	=cut
		462
		463	sub decode_yaml($) {
		464	fork_call { YAML::XS::Load $_[0] } @_
		465	}
		466
		467	=item $scalar = cf::unlzf $scalar
		468
		469	Same as Compress::LZF::compress, but takes server ticks into account, so
		470	blocks.
		471
		472	=cut
		473
		474	sub unlzf($) {
		475	# we assume 100mb/s minimum decompression speed (noncompressible data on a ~2ghz machine)
		476	cf::get_slot +(length $_[0]) / 100_000_000, 0, "unlzf";
		477	Compress::LZF::decompress $_[0]
		478	}
		479
351	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
352		481
353	Execute the given codeblock, I<after> all extensions have been (re-)loaded,	482	Execute the given codeblock, I<after> all extensions have been (re-)loaded,
354	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
355		484
356	The cdoeblock will have a single boolean argument to indicate whether this	485	The codeblock will have a single boolean argument to indicate whether this
357	is a reload or not.	486	is a reload or not.
358		487
359	=cut	488	=cut
360		489
361	sub post_init(&) {	490	sub post_init(&) {
362	push @POST_INIT, shift;	491	push @POST_INIT, shift;
		492	}
		493
		494	sub _post_init {
		495	trace "running post_init jobs";
		496
		497	# run them in parallel...
		498
		499	my @join;
		500
		501	while () {
		502	push @join, map &Coro::async ($_, 0), @POST_INIT;
		503	@POST_INIT = ();
		504
		505	@join or last;
		506
		507	(pop @join)->join;
		508	}
363	}	509	}
364		510
365	=item cf::lock_wait $string	511	=item cf::lock_wait $string
366		512
367	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
420	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
421	}	567	}
422		568
423	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
424		570
425	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	Allocate $time seconds of blocking CPU time at priority C<$priority>
426	This call blocks and returns only when you have at least C<$time> seconds	572	(default: 0): This call blocks and returns only when you have at least
427	of cpu time till the next tick. The slot is only valid till the next cede.	573	C<$time> seconds of cpu time till the next tick. The slot is only valid
		574	till the next cede.
		575
		576	Background jobs should use a priority les than zero, interactive jobs
		577	should use 100 or more.
428		578
429	The optional C<$name> can be used to identify the job to run. It might be	579	The optional C<$name> can be used to identify the job to run. It might be
430	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
431		581
432	Useful for short background jobs.	582	Useful for short background jobs.
…		…
461	}	611	}
462	}	612	}
463		613
464	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
465	# we do not use wait_for_tick() as it returns immediately when tick is inactive	615	# we do not use wait_for_tick() as it returns immediately when tick is inactive
466	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
467	$signal->wait;
468	} else {	617	} else {
469	$busy = 0;	618	$busy = 0;
470	Coro::schedule;	619	Coro::schedule;
471	}	620	}
472	}	621	}
…		…
512	=cut	661	=cut
513		662
514	sub sync_job(&) {	663	sub sync_job(&) {
515	my ($job) = @_;	664	my ($job) = @_;
516		665
517	if ($Coro::current == $Coro::main) {	666	if (in_main) {
518	my $time = AE::time;	667	my $time = AE::time;
519		668
520	# this is the main coro, too bad, we have to block	669	# this is the main coro, too bad, we have to block
521	# till the operation succeeds, freezing the server :/	670	# till the operation succeeds, freezing the server :/
522		671
523	LOG llevError, Carp::longmess "sync job";#d#	672	#LOG llevError, Carp::longmess "sync job";#d#
524		673
525	my $freeze_guard = freeze_mainloop;	674	my $freeze_guard = freeze_mainloop;
526		675
527	my $busy = 1;	676	my $busy = 1;
528	my @res;	677	my @res;
529		678
530	(async {	679	(async {
531	$Coro::current->desc ("sync job coro");	680	$Coro::current->desc ("sync job coro");
532	@res = eval { $job->() };	681	@res = eval { $job->() };
533	warn $@ if $@;	682	error $@ if $@;
534	undef $busy;	683	undef $busy;
535	})->prio (Coro::PRIO_MAX);	684	})->prio (Coro::PRIO_MAX);
536		685
537	while ($busy) {	686	while ($busy) {
538	if (Coro::nready) {	687	if (Coro::nready) {
…		…
572	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
573		722
574	$coro	723	$coro
575	}	724	}
576		725
577	=item fork_call { }, $args	726	=item fork_call { }, @args
578		727
579	Executes the given code block with the given arguments in a seperate	728	Executes the given code block with the given arguments in a seperate
580	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
581	Coro::Storable. May, of course, block. Note that the executed sub may	730	Coro::Storable. May, of course, block. Note that the executed sub may
582	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
583		732
584	=cut	733	=cut
585		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
586	sub fork_call(&@) {	739	sub fork_call(&@) {
587	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
588		741
589	# we seemingly have to make a local copy of the whole thing,	742	# we seemingly have to make a local copy of the whole thing,
590	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
591	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
592		745
593	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
594	reset_signals;	747	cf::post_fork;
595	&$cb	748	&$cb
596	}, @args;	749	} @args;
597		750
598	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
599	}	752	}
600		753
601	sub objinfo {	754	sub objinfo {
…		…
651	within each server.	804	within each server.
652		805
653	=cut	806	=cut
654		807
655	sub db_table($) {	808	sub db_table($) {
		809	cf::error "db_get called from main context"
		810	if $Coro::current == $Coro::main;
		811
656	my ($name) = @_;	812	my ($name) = @_;
657	my $db = BDB::db_create $DB_ENV;	813	my $db = BDB::db_create $DB_ENV;
658		814
659	eval {	815	eval {
660	$db->set_flags (BDB::CHKSUM);	816	$db->set_flags (BDB::CHKSUM);
…		…
670	}	826	}
671		827
672	our $DB;	828	our $DB;
673		829
674	sub db_init {	830	sub db_init {
675	cf::sync_job {
676	$DB ||= db_table "db";	831	$DB ||= db_table "db";
677	};
678	}	832	}
679		833
680	sub db_get($$) {	834	sub db_get($$) {
681	my $key = "$_[0]/$_[1]";	835	my $key = "$_[0]/$_[1]";
682		836
683	cf::sync_job {	837	cf::error "db_get called from main context"
		838	if $Coro::current == $Coro::main;
		839
684	BDB::db_get $DB, undef, $key, my $data;	840	BDB::db_get $DB, undef, $key, my $data;
685		841
686	$! ? ()	842	$! ? ()
687	: $data	843	: $data
688	}
689	}	844	}
690		845
691	sub db_put($$$) {	846	sub db_put($$$) {
692	BDB::dbreq_pri 4;	847	BDB::dbreq_pri 4;
693	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };	848	BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
…		…
721		876
722	my @data;	877	my @data;
723	my $md5;	878	my $md5;
724		879
725	for (0 .. $#$src) {	880	for (0 .. $#$src) {
726	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
727	or Carp::croak "$src->[$_]: $!";
728	}	882	}
729		883
730	# if processing is expensive, check	884	# if processing is expensive, check
731	# checksum first	885	# checksum first
732	if (1) {	886	if (1) {
…		…
749		903
750	my $t1 = Time::HiRes::time;	904	my $t1 = Time::HiRes::time;
751	my $data = $process->(\@data);	905	my $data = $process->(\@data);
752	my $t2 = Time::HiRes::time;	906	my $t2 = Time::HiRes::time;
753		907
754	warn "cache: '$id' processed in ", $t2 - $t1, "s\n";	908	info "cache: '$id' processed in ", $t2 - $t1, "s\n";
755		909
756	db_put cache => "$id/data", $data;	910	db_put cache => "$id/data", $data;
757	db_put cache => "$id/md5" , $md5;	911	db_put cache => "$id/md5" , $md5;
758	db_put cache => "$id/meta", $meta;	912	db_put cache => "$id/meta", $meta;
759		913
…		…
769		923
770	=cut	924	=cut
771		925
772	sub datalog($@) {	926	sub datalog($@) {
773	my ($type, %kv) = @_;	927	my ($type, %kv) = @_;
774	warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });	928	info "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
775	}	929	}
776		930
777	=back	931	=back
778		932
779	=cut	933	=cut
…		…
974		1128
975	} elsif (exists $cb_id{$type}) {	1129	} elsif (exists $cb_id{$type}) {
976	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;	1130	_attach_cb $registry, $cb_id{$type}, $prio, shift @arg;
977		1131
978	} elsif (ref $type) {	1132	} elsif (ref $type) {
979	warn "attaching objects not supported, ignoring.\n";	1133	error "attaching objects not supported, ignoring.\n";
980		1134
981	} else {	1135	} else {
982	shift @arg;	1136	shift @arg;
983	warn "attach argument '$type' not supported, ignoring.\n";	1137	error "attach argument '$type' not supported, ignoring.\n";
984	}	1138	}
985	}	1139	}
986	}	1140	}
987		1141
988	sub _object_attach {	1142	sub _object_attach {
…		…
998	_attach $registry, $klass, @attach;	1152	_attach $registry, $klass, @attach;
999	}	1153	}
1000		1154
1001	$obj->{$name} = \%arg;	1155	$obj->{$name} = \%arg;
1002	} else {	1156	} else {
1003	warn "object uses attachment '$name' which is not available, postponing.\n";	1157	info "object uses attachment '$name' which is not available, postponing.\n";
1004	}	1158	}
1005		1159
1006	$obj->{_attachment}{$name} = undef;	1160	$obj->{_attachment}{$name} = undef;
1007	}	1161	}
1008		1162
…		…
1067		1221
1068	for (@$callbacks) {	1222	for (@$callbacks) {
1069	eval { &{$_->[1]} };	1223	eval { &{$_->[1]} };
1070		1224
1071	if ($@) {	1225	if ($@) {
1072	warn "$@";
1073	warn "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";	1226	error "$@", "... while processing $EVENT[$event][0](@_) event, skipping processing altogether.\n";
1074	override;	1227	override;
1075	}	1228	}
1076		1229
1077	return 1 if $override;	1230	return 1 if $override;
1078	}	1231	}
…		…
1157	for (@$attach) {	1310	for (@$attach) {
1158	my ($klass, @attach) = @$_;	1311	my ($klass, @attach) = @$_;
1159	_attach $registry, $klass, @attach;	1312	_attach $registry, $klass, @attach;
1160	}	1313	}
1161	} else {	1314	} else {
1162	warn "object uses attachment '$name' that is not available, postponing.\n";	1315	info "object uses attachment '$name' that is not available, postponing.\n";
1163	}	1316	}
1164	}	1317	}
1165	}	1318	}
1166		1319
1167	cf::attachable->attach (	1320	cf::attachable->attach (
…		…
1194	my ($filename, $rdata, $objs) = @_;	1347	my ($filename, $rdata, $objs) = @_;
1195		1348
1196	sync_job {	1349	sync_job {
1197	if (length $$rdata) {	1350	if (length $$rdata) {
1198	utf8::decode (my $decname = $filename);	1351	utf8::decode (my $decname = $filename);
1199	warn sprintf "saving %s (%d,%d)\n",	1352	trace sprintf "saving %s (%d,%d)\n",
1200	$decname, length $$rdata, scalar @$objs	1353	$decname, length $$rdata, scalar @$objs
1201	if $VERBOSE_IO;	1354	if $VERBOSE_IO;
1202		1355
1203	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {	1356	if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1204	aio_chmod $fh, SAVE_MODE;	1357	aio_chmod $fh, SAVE_MODE;
1205	aio_write $fh, 0, (length $$rdata), $$rdata, 0;	1358	aio_write $fh, 0, (length $$rdata), $$rdata, 0;
…		…
1228	aio_rename "$filename~", $filename;	1381	aio_rename "$filename~", $filename;
1229		1382
1230	$filename =~ s%/[^/]+$%%;	1383	$filename =~ s%/[^/]+$%%;
1231	aio_pathsync $filename if $cf::USE_FSYNC;	1384	aio_pathsync $filename if $cf::USE_FSYNC;
1232	} else {	1385	} else {
1233	warn "unable to save objects: $filename~: $!\n";	1386	error "unable to save objects: $filename~: $!\n";
1234	}	1387	}
1235	} else {	1388	} else {
1236	aio_unlink $filename;	1389	aio_unlink $filename;
1237	aio_unlink "$filename.pst";	1390	aio_unlink "$filename.pst";
1238	}	1391	}
…		…
1262	my $st = eval { Coro::Storable::thaw $av };	1415	my $st = eval { Coro::Storable::thaw $av };
1263	$av = $st->{objs};	1416	$av = $st->{objs};
1264	}	1417	}
1265		1418
1266	utf8::decode (my $decname = $filename);	1419	utf8::decode (my $decname = $filename);
1267	warn sprintf "loading %s (%d,%d)\n",	1420	trace sprintf "loading %s (%d,%d)\n",
1268	$decname, length $data, scalar @{$av || []}	1421	$decname, length $data, scalar @{$av || []}
1269	if $VERBOSE_IO;	1422	if $VERBOSE_IO;
1270		1423
1271	($data, $av)	1424	($data, $av)
1272	}	1425	}
1273		1426
…		…
1351	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1352		1505
1353	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1354		1507
1355	if (ref $msg) {	1508	if (ref $msg) {
1356	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1357	"ARRAY" eq ref $msg
1358	? @$msg
1359	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1360		1510
1361	my @reply;	1511	my @reply;
1362		1512
1363	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1364	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
…		…
1366		1516
1367	$pl->ext_reply ($reply, @reply)	1517	$pl->ext_reply ($reply, @reply)
1368	if $reply;	1518	if $reply;
1369		1519
1370	} else {	1520	} else {
1371	warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";	1521	error "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1372	}	1522	}
1373		1523
1374	cf::override;	1524	cf::override;
1375	},	1525	},
1376	);	1526	);
…		…
1386	};	1536	};
1387		1537
1388	$grp	1538	$grp
1389	}	1539	}
1390		1540
		1541	sub _ext_cfg_reg($$$$) {
		1542	my ($rvar, $varname, $cfgname, $default) = @_;
		1543
		1544	$cfgname = lc $varname
		1545	unless length $cfgname;
		1546
		1547	$EXT_CFG{$cfgname} = [$rvar, $default];
		1548
		1549	$$rvar = exists $CFG{$cfgname} ? $CFG{$cfgname} : $default;
		1550	}
		1551
1391	sub load_extensions {	1552	sub load_extensions {
		1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
		1556
1392	cf::sync_job {	1557	cf::sync_job {
1393	my %todo;	1558	my %todo;
1394		1559
1395	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
1396	next unless -r $path;	1561	next unless -r $path;
…		…
1414		1579
1415	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }	1580	$ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1416	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;	1581	if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1417		1582
1418	$ext{source} =	1583	$ext{source} =
1419	"package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"	1584	"package $pkg; use common::sense;\n"
1420	. "#line 1 \"$path\"\n{\n"	1585	. "#line 1 \"$path\"\n{\n"
1421	. $source	1586	. $source
1422	. "\n};\n1";	1587	. "\n};\n1";
1423		1588
1424	$todo{$base} = \%ext;	1589	$todo{$base} = \%ext;
…		…
1436	for (split /,\s*/, $v->{meta}{depends}) {	1601	for (split /,\s*/, $v->{meta}{depends}) {
1437	next ext	1602	next ext
1438	unless exists $done{$_};	1603	unless exists $done{$_};
1439	}	1604	}
1440		1605
1441	warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1442		1607
		1608	my $source = $v->{source};
		1609
		1610	# support "CONF varname :confname = default" pseudo-statements
		1611	$source =~ s{
		1612	^ CONF \s+ ([^\s:=]+) \s* (?:: \s* ([^\s:=]+) \s* )? = ([^\n#]+)
		1613	}{
		1614	"our \$$1; BEGIN { cf::_ext_cfg_reg \\\$$1, q\x00$1\x00, q\x00$2\x00, $3 }";
		1615	}gmxe;
		1616
1443	my $active = eval $v->{source};	1617	my $active = eval $source;
1444		1618
1445	if (length $@) {	1619	if (length $@) {
1446	warn "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1447		1621
1448	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
1449	if exists $v->{meta}{mandatory};	1623	if exists $v->{meta}{mandatory};
1450		1624
1451	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";	1625	warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
…		…
1453	} else {	1627	} else {
1454	$done{$k} = delete $todo{$k};	1628	$done{$k} = delete $todo{$k};
1455	push @EXTS, $v->{pkg};	1629	push @EXTS, $v->{pkg};
1456	$progress = 1;	1630	$progress = 1;
1457		1631
1458	warn "$v->{base}: extension inactive.\n"	1632	info "$v->{base}: extension inactive.\n"
1459	unless $active;	1633	unless $active;
1460	}	1634	}
1461	}	1635	}
1462		1636
1463	unless ($progress) {	1637	unless ($progress) {
…		…
1465		1639
1466	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1467	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1468	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1469	}	1643	}
		1644
		1645	last;
1470	}	1646	}
1471	}	1647	}
1472	};	1648	};
1473	}	1649	}
1474		1650
…		…
1632	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1633		1809
1634	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1635	$pl->password ("*"); # this should lock out the player until we have nuked the dir	1811	$pl->password ("*"); # this should lock out the player until we have nuked the dir
1636		1812
1637	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1638	$pl->deactivate;	1814	$pl->deactivate;
		1815
1639	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;	1816	my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1640	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1641	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1642		1821
1643	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1644	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1645	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1811	sub generate_random_map {	1990	sub generate_random_map {
1812	my ($self, $rmp) = @_;	1991	my ($self, $rmp) = @_;
1813		1992
1814	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM	1993	my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1815		1994
1816	# mit "rum" bekleckern, nicht
1817	$self->_create_random_map (	1995	$self->_create_random_map ($rmp);
1818	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1819	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1820	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1821	$rmp->{exit_on_final_map},
1822	$rmp->{xsize}, $rmp->{ysize},
1823	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1824	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1825	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1826	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1827	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1828	(cf::region::find $rmp->{region}), $rmp->{custom}
1829	)
1830	}	1996	}
1831		1997
1832	=item cf::map->register ($regex, $prio)	1998	=item cf::map->register ($regex, $prio)
1833		1999
1834	Register a handler for the map path matching the given regex at the	2000	Register a handler for the map path matching the given regex at the
…		…
1839		2005
1840	sub register {	2006	sub register {
1841	my (undef, $regex, $prio) = @_;	2007	my (undef, $regex, $prio) = @_;
1842	my $pkg = caller;	2008	my $pkg = caller;
1843		2009
1844	no strict;
1845	push @{"$pkg\::ISA"}, __PACKAGE__;	2010	push @{"$pkg\::ISA"}, __PACKAGE__;
1846		2011
1847	$EXT_MAP{$pkg} = [$prio, qr<$regex>];	2012	$EXT_MAP{$pkg} = [$prio, qr<$regex>];
1848	}	2013	}
1849		2014
…		…
1861	}	2026	}
1862		2027
1863	sub normalise {	2028	sub normalise {
1864	my ($path, $base) = @_;	2029	my ($path, $base) = @_;
1865		2030
1866	$path = "$path"; # make sure its a string	2031	$path = "$path"; # make sure it's a string
1867		2032
1868	$path =~ s/\.map$//;	2033	$path =~ s/\.map$//;
1869		2034
1870	# map plan:	2035	# map plan:
1871	#	2036	#
…		…
1886	$base =~ s{[^/]+/?$}{};	2051	$base =~ s{[^/]+/?$}{};
1887	$path = "$base/$path";	2052	$path = "$base/$path";
1888	}	2053	}
1889		2054
1890	for ($path) {	2055	for ($path) {
1891	redo if s{//}{/};
1892	redo if s{/\.?/}{/};	2056	redo if s{/\.?/}{/};
1893	redo if s{/[^/]+/\.\./}{/};	2057	redo if s{/[^/]+/\.\./}{/};
1894	}	2058	}
1895		2059
1896	$path	2060	$path
…		…
1910	$self->init; # pass $1 etc.	2074	$self->init; # pass $1 etc.
1911	return $self;	2075	return $self;
1912	}	2076	}
1913	}	2077	}
1914		2078
1915	Carp::cluck "unable to resolve path '$path' (base '$base').";	2079	Carp::cluck "unable to resolve path '$path' (base '$base')";
1916	()	2080	()
1917	}	2081	}
1918		2082
		2083	# may re-bless or do other evil things
1919	sub init {	2084	sub init {
1920	my ($self) = @_;	2085	my ($self) = @_;
1921		2086
1922	$self	2087	$self
1923	}	2088	}
…		…
1988	$self->{load_path} = $path;	2153	$self->{load_path} = $path;
1989		2154
1990	1	2155	1
1991	}	2156	}
1992		2157
		2158	# used to laod the header of an original map
1993	sub load_header_orig {	2159	sub load_header_orig {
1994	my ($self) = @_;	2160	my ($self) = @_;
1995		2161
1996	$self->load_header_from ($self->load_path)	2162	$self->load_header_from ($self->load_path)
1997	}	2163	}
1998		2164
		2165	# used to laod the header of an instantiated map
1999	sub load_header_temp {	2166	sub load_header_temp {
2000	my ($self) = @_;	2167	my ($self) = @_;
2001		2168
2002	$self->load_header_from ($self->save_path)	2169	$self->load_header_from ($self->save_path)
2003	}	2170	}
2004		2171
		2172	# called after loading the header from an instantiated map
2005	sub prepare_temp {	2173	sub prepare_temp {
2006	my ($self) = @_;	2174	my ($self) = @_;
2007		2175
2008	$self->last_access ((delete $self->{last_access})	2176	$self->last_access ((delete $self->{last_access})
2009	|| $cf::RUNTIME); #d#	2177	|| $cf::RUNTIME); #d#
2010	# safety	2178	# safety
2011	$self->{instantiate_time} = $cf::RUNTIME	2179	$self->{instantiate_time} = $cf::RUNTIME
2012	if $self->{instantiate_time} > $cf::RUNTIME;	2180	if $self->{instantiate_time} > $cf::RUNTIME;
2013	}	2181	}
2014		2182
		2183	# called after loading the header from an original map
2015	sub prepare_orig {	2184	sub prepare_orig {
2016	my ($self) = @_;	2185	my ($self) = @_;
2017		2186
2018	$self->{load_original} = 1;	2187	$self->{load_original} = 1;
2019	$self->{instantiate_time} = $cf::RUNTIME;	2188	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2043		2212
2044	sub find;	2213	sub find;
2045	sub find {	2214	sub find {
2046	my ($path, $origin) = @_;	2215	my ($path, $origin) = @_;
2047		2216
		2217	cf::cede_to_tick;
		2218
2048	$path = normalise $path, $origin && $origin->path;	2219	$path = normalise $path, $origin;
2049		2220
2050	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2221	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2051	my $guard2 = cf::lock_acquire "map_find:$path";	2222	my $guard2 = cf::lock_acquire "map_find:$path";
2052		2223
2053	$cf::MAP{$path} || do {	2224	$cf::MAP{$path} || do {
…		…
2084		2255
2085	{	2256	{
2086	my $guard = cf::lock_acquire "map_data:$path";	2257	my $guard = cf::lock_acquire "map_data:$path";
2087		2258
2088	return unless $self->valid;	2259	return unless $self->valid;
2089	return unless $self->in_memory == cf::MAP_SWAPPED;	2260	return unless $self->state == cf::MAP_SWAPPED;
2090
2091	$self->in_memory (cf::MAP_LOADING);
2092		2261
2093	$self->alloc;	2262	$self->alloc;
2094		2263
2095	$self->pre_load;	2264	$self->pre_load;
2096	cf::cede_to_tick;	2265	cf::cede_to_tick;
2097		2266
		2267	if (exists $self->{load_path}) {
2098	my $f = new_from_file cf::object::thawer $self->{load_path};	2268	my $f = new_from_file cf::object::thawer $self->{load_path};
2099	$f->skip_block;	2269	$f->skip_block;
2100	$self->_load_objects ($f)	2270	$self->_load_objects ($f)
2101	or return;	2271	or return;
2102		2272
2103	$self->post_load_original	2273	$self->post_load_original
2104	if delete $self->{load_original};	2274	if delete $self->{load_original};
2105		2275
2106	if (my $uniq = $self->uniq_path) {	2276	if (my $uniq = $self->uniq_path) {
2107	utf8::encode $uniq;	2277	utf8::encode $uniq;
2108	unless (aio_stat $uniq) {	2278	unless (aio_stat $uniq) {
2109	if (my $f = new_from_file cf::object::thawer $uniq) {	2279	if (my $f = new_from_file cf::object::thawer $uniq) {
2110	$self->clear_unique_items;	2280	$self->clear_unique_items;
2111	$self->_load_objects ($f);	2281	$self->_load_objects ($f);
2112	$f->resolve_delayed_derefs;	2282	$f->resolve_delayed_derefs;
		2283	}
2113	}	2284	}
2114	}	2285	}
2115	}
2116		2286
2117	$f->resolve_delayed_derefs;	2287	$f->resolve_delayed_derefs;
		2288	} else {
		2289	$self->post_load_original
		2290	if delete $self->{load_original};
		2291	}
		2292
		2293	$self->state (cf::MAP_INACTIVE);
2118		2294
2119	cf::cede_to_tick;	2295	cf::cede_to_tick;
2120	# now do the right thing for maps	2296	# now do the right thing for maps
2121	$self->link_multipart_objects;	2297	$self->link_multipart_objects;
2122	$self->difficulty ($self->estimate_difficulty)	2298	$self->difficulty ($self->estimate_difficulty)
…		…
2126	unless ($self->{deny_activate}) {	2302	unless ($self->{deny_activate}) {
2127	$self->decay_objects;	2303	$self->decay_objects;
2128	$self->fix_auto_apply;	2304	$self->fix_auto_apply;
2129	$self->update_buttons;	2305	$self->update_buttons;
2130	cf::cede_to_tick;	2306	cf::cede_to_tick;
2131	$self->activate;	2307	#$self->activate; # no longer activate maps automatically
2132	}	2308	}
2133		2309
2134	$self->{last_save} = $cf::RUNTIME;	2310	$self->{last_save} = $cf::RUNTIME;
2135	$self->last_access ($cf::RUNTIME);	2311	$self->last_access ($cf::RUNTIME);
2136
2137	$self->in_memory (cf::MAP_ACTIVE);
2138	}	2312	}
2139		2313
2140	$self->post_load;	2314	$self->post_load;
		2315
		2316	1
2141	}	2317	}
2142		2318
2143	# customize the map for a given player, i.e.	2319	# customize the map for a given player, i.e.
2144	# return the _real_ map. used by e.g. per-player	2320	# return the _real_ map. used by e.g. per-player
2145	# maps to change the path to ~playername/mappath	2321	# maps to change the path to ~playername/mappath
…		…
2153	# if $self->per_party;	2329	# if $self->per_party;
2154		2330
2155	$self	2331	$self
2156	}	2332	}
2157		2333
2158	# find and load all maps in the 3x3 area around a map
2159	sub load_neighbours {
2160	my ($map) = @_;
2161
2162	my @neigh; # diagonal neighbours
2163
2164	for (0 .. 3) {
2165	my $neigh = $map->tile_path ($_)
2166	or next;
2167	$neigh = find $neigh, $map
2168	or next;
2169	$neigh->load;
2170
2171	# now find the diagonal neighbours
2172	push @neigh,
2173	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2174	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2175	}
2176
2177	for (grep defined $_->[0], @neigh) {
2178	my ($path, $origin) = @$_;
2179	my $neigh = find $path, $origin
2180	or next;
2181	$neigh->load;
2182	}
2183	}
2184
2185	sub find_sync {	2334	sub find_sync {
2186	my ($path, $origin) = @_;	2335	my ($path, $origin) = @_;
2187		2336
2188	cf::sync_job { find $path, $origin }	2337	# it's a bug to call this from the main context
		2338	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
		2339	if $Coro::current == $Coro::main;
		2340
		2341	find $path, $origin
2189	}	2342	}
2190		2343
2191	sub do_load_sync {	2344	sub do_load_sync {
2192	my ($map) = @_;	2345	my ($map) = @_;
2193		2346
		2347	# it's a bug to call this from the main context
2194	cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"	2348	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2195	if $Coro::current == $Coro::main;	2349	if $Coro::current == $Coro::main;
2196		2350
2197	cf::sync_job { $map->load };	2351	$map->load;
2198	}	2352	}
2199		2353
2200	our %MAP_PREFETCH;	2354	our %MAP_PREFETCH;
2201	our $MAP_PREFETCHER = undef;	2355	our $MAP_PREFETCHER = undef;
2202		2356
2203	sub find_async {	2357	sub find_async {
2204	my ($path, $origin, $load) = @_;	2358	my ($path, $origin, $load) = @_;
2205		2359
2206	$path = normalise $path, $origin && $origin->{path};	2360	$path = normalise $path, $origin;
2207		2361
2208	if (my $map = $cf::MAP{$path}) {	2362	if (my $map = $cf::MAP{$path}) {
2209	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2363	return $map if !$load || $map->linkable;
2210	}	2364	}
2211		2365
2212	$MAP_PREFETCH{$path} |= $load;	2366	$MAP_PREFETCH{$path} |= $load;
2213		2367
2214	$MAP_PREFETCHER ||= cf::async {	2368	$MAP_PREFETCHER ||= cf::async {
…		…
2273	sub swap_out {	2427	sub swap_out {
2274	my ($self) = @_;	2428	my ($self) = @_;
2275		2429
2276	my $lock = cf::lock_acquire "map_data:$self->{path}";	2430	my $lock = cf::lock_acquire "map_data:$self->{path}";
2277		2431
2278	return if $self->in_memory != cf::MAP_ACTIVE;	2432	return if !$self->linkable;
2279	return if $self->{deny_save};	2433	return if $self->{deny_save};
2280	return if $self->players;	2434	return if $self->players;
2281		2435
2282	# first deactivate the map and "unlink" it from the core	2436	# first deactivate the map and "unlink" it from the core
2283	$self->deactivate;	2437	$self->deactivate;
2284	$_->clear_links_to ($self) for values %cf::MAP;	2438	$_->clear_links_to ($self) for values %cf::MAP;
2285	$self->in_memory (cf::MAP_SWAPPED);	2439	$self->state (cf::MAP_SWAPPED);
2286		2440
2287	# then atomically save	2441	# then atomically save
2288	$self->_save;	2442	$self->_save;
2289		2443
2290	# then free the map	2444	# then free the map
…		…
2314		2468
2315	my $lock = cf::lock_acquire "map_data:$self->{path}";	2469	my $lock = cf::lock_acquire "map_data:$self->{path}";
2316		2470
2317	return if $self->players;	2471	return if $self->players;
2318		2472
2319	warn "resetting map ", $self->path, "\n";	2473	cf::trace "resetting map ", $self->path, "\n";
2320		2474
2321	$self->in_memory (cf::MAP_SWAPPED);	2475	$self->state (cf::MAP_SWAPPED);
2322		2476
2323	# need to save uniques path	2477	# need to save uniques path
2324	unless ($self->{deny_save}) {	2478	unless ($self->{deny_save}) {
2325	my $uniq = $self->uniq_path; utf8::encode $uniq;	2479	my $uniq = $self->uniq_path; utf8::encode $uniq;
2326		2480
…		…
2656	# use -1 or undef as default coordinates, not 0, 0	2810	# use -1 or undef as default coordinates, not 0, 0
2657	($x, $y) = ($map->enter_x, $map->enter_y)	2811	($x, $y) = ($map->enter_x, $map->enter_y)
2658	if $x <= 0 && $y <= 0;	2812	if $x <= 0 && $y <= 0;
2659		2813
2660	$map->load;	2814	$map->load;
2661	$map->load_neighbours;
2662		2815
2663	return unless $self->contr->active;	2816	return unless $self->contr->active;
2664		2817
2665	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2818	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2666	if ($self->enter_map ($map, $x, $y)) {	2819	if ($self->enter_map ($map, $x, $y)) {
…		…
2689		2842
2690	sub cf::object::player::goto {	2843	sub cf::object::player::goto {
2691	my ($self, $path, $x, $y, $check, $done) = @_;	2844	my ($self, $path, $x, $y, $check, $done) = @_;
2692		2845
2693	if ($self->{_link_recursion} >= $MAX_LINKS) {	2846	if ($self->{_link_recursion} >= $MAX_LINKS) {
2694	warn "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";	2847	error "FATAL: link recursion exceeded, ", $self->name, " goto $path $x $y, redirecting.";
2695	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");	2848	$self->failmsg ("Something went wrong inside the server - please contact an administrator!");
2696	($path, $x, $y) = @$EMERGENCY_POSITION;	2849	($path, $x, $y) = @$EMERGENCY_POSITION;
2697	}	2850	}
2698		2851
2699	# do generation counting so two concurrent goto's will be executed in-order	2852	# do generation counting so two concurrent goto's will be executed in-order
…		…
2722	($path, $x, $y) = (undef, undef, undef);	2875	($path, $x, $y) = (undef, undef, undef);
2723	}	2876	}
2724	}	2877	}
2725		2878
2726	my $map = eval {	2879	my $map = eval {
2727	my $map = defined $path ? cf::map::find $path : undef;	2880	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2728		2881
2729	if ($map) {	2882	if ($map) {
2730	$map = $map->customise_for ($self);	2883	$map = $map->customise_for ($self);
2731	$map = $check->($map, $x, $y, $self) if $check && $map;	2884	$map = $check->($map, $x, $y, $self) if $check && $map;
2732	} else {	2885	} else {
…		…
2822	$Coro::current->{desc} = "enter_exit";	2975	$Coro::current->{desc} = "enter_exit";
2823		2976
2824	unless (eval {	2977	unless (eval {
2825	$self->deactivate_recursive; # just to be sure	2978	$self->deactivate_recursive; # just to be sure
2826		2979
2827	# random map handling
2828	{
2829	my $guard = cf::lock_acquire "exit_prepare:$exit";
2830
2831	prepare_random_map $exit
2832	if $exit->slaying eq "/!";
2833	}
2834
2835	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2980	my $map = cf::map::normalise $exit->slaying, $exit->map;
2836	my $x = $exit->stats->hp;	2981	my $x = $exit->stats->hp;
2837	my $y = $exit->stats->sp;	2982	my $y = $exit->stats->sp;
		2983
		2984	# special map handling
		2985	my $slaying = $exit->slaying;
		2986
		2987	# special map handling
		2988	if ($slaying eq "/!") {
		2989	my $guard = cf::lock_acquire "exit_prepare:$exit";
		2990
		2991	prepare_random_map $exit
		2992	if $exit->slaying eq "/!"; # need to re-check after getting the lock
		2993
		2994	$map = $exit->slaying;
		2995
		2996	} elsif ($slaying eq '!up') {
		2997	$map = $exit->map->tile_path (cf::TILE_UP);
		2998	$x = $exit->x;
		2999	$y = $exit->y;
		3000
		3001	} elsif ($slaying eq '!down') {
		3002	$map = $exit->map->tile_path (cf::TILE_DOWN);
		3003	$x = $exit->x;
		3004	$y = $exit->y;
		3005	}
2838		3006
2839	$self->goto ($map, $x, $y);	3007	$self->goto ($map, $x, $y);
2840		3008
2841	# if exit is damned, update players death & WoR home-position	3009	# if exit is damned, update players death & WoR home-position
2842	$self->contr->savebed ($map, $x, $y)	3010	$self->contr->savebed ($map, $x, $y)
…		…
2847	$self->message ("Something went wrong deep within the deliantra server. "	3015	$self->message ("Something went wrong deep within the deliantra server. "
2848	. "I'll try to bring you back to the map you were before. "	3016	. "I'll try to bring you back to the map you were before. "
2849	. "Please report this to the dungeon master!",	3017	. "Please report this to the dungeon master!",
2850	cf::NDI_UNIQUE | cf::NDI_RED);	3018	cf::NDI_UNIQUE | cf::NDI_RED);
2851		3019
2852	warn "ERROR in enter_exit: $@";	3020	error "ERROR in enter_exit: $@";
2853	$self->leave_link;	3021	$self->leave_link;
2854	}	3022	}
2855	})->prio (1);	3023	})->prio (1);
2856	}	3024	}
2857		3025
…		…
3084	=cut	3252	=cut
3085		3253
3086	sub cf::client::ext_reply($$@) {	3254	sub cf::client::ext_reply($$@) {
3087	my ($self, $id, @msg) = @_;	3255	my ($self, $id, @msg) = @_;
3088		3256
3089	if ($self->extcmd == 2) {	3257	return unless $self->extcmd == 2;
		3258
3090	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3259	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3091	} elsif ($self->extcmd == 1) {
3092	#TODO: version 1, remove
3093	unshift @msg, msgtype => "reply", msgid => $id;
3094	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3095	}
3096	}	3260	}
3097		3261
3098	=item $success = $client->query ($flags, "text", \&cb)	3262	=item $success = $client->query ($flags, "text", \&cb)
3099		3263
3100	Queues a query to the client, calling the given callback with	3264	Queues a query to the client, calling the given callback with
…		…
3155	my ($ns, $buf) = @_;	3319	my ($ns, $buf) = @_;
3156		3320
3157	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3321	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3158		3322
3159	if (ref $msg) {	3323	if (ref $msg) {
3160	my ($type, $reply, @payload) =	3324	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3161	"ARRAY" eq ref $msg
3162	? @$msg
3163	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3164		3325
3165	my @reply;	3326	my @reply;
3166		3327
3167	if (my $cb = $EXTICMD{$type}) {	3328	if (my $cb = $EXTICMD{$type}) {
3168	@reply = $cb->($ns, @payload);	3329	@reply = $cb->($ns, @payload);
…		…
3170		3331
3171	$ns->ext_reply ($reply, @reply)	3332	$ns->ext_reply ($reply, @reply)
3172	if $reply;	3333	if $reply;
3173		3334
3174	} else {	3335	} else {
3175	warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";	3336	error "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3176	}	3337	}
3177		3338
3178	cf::override;	3339	cf::override;
3179	},	3340	},
3180	);	3341	);
…		…
3261	decrease split destroy change_exp value msg lore send_msg)],	3422	decrease split destroy change_exp value msg lore send_msg)],
3262	["cf::object::player" => qw(player)],	3423	["cf::object::player" => qw(player)],
3263	["cf::player" => qw(peaceful send_msg)],	3424	["cf::player" => qw(peaceful send_msg)],
3264	["cf::map" => qw(trigger)],	3425	["cf::map" => qw(trigger)],
3265	) {	3426	) {
3266	no strict 'refs';
3267	my ($pkg, @funs) = @$_;	3427	my ($pkg, @funs) = @$_;
3268	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})	3428	*{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3269	for @funs;	3429	for @funs;
3270	}	3430	}
3271		3431
…		…
3310	local @cf::_safe_eval_args = values %vars;	3470	local @cf::_safe_eval_args = values %vars;
3311	@res = wantarray ? eval eval : scalar eval $eval;	3471	@res = wantarray ? eval eval : scalar eval $eval;
3312	}	3472	}
3313		3473
3314	if ($@) {	3474	if ($@) {
3315	warn "$@";	3475	warn "$@",
3316	warn "while executing safe code '$code'\n";	3476	"while executing safe code '$code'\n",
3317	warn "with arguments " . (join " ", %vars) . "\n";	3477	"with arguments " . (join " ", %vars) . "\n";
3318	}	3478	}
3319		3479
3320	wantarray ? @res : $res[0]	3480	wantarray ? @res : $res[0]
3321	}	3481	}
3322		3482
…		…
3347	=cut	3507	=cut
3348		3508
3349	#############################################################################	3509	#############################################################################
3350	# the server's init and main functions	3510	# the server's init and main functions
3351		3511
		3512	our %FACEHASH; # hash => idx, #d# HACK for http server
		3513
3352	sub load_facedata($) {	3514	sub load_facedata($) {
3353	my ($path) = @_;	3515	my ($path) = @_;
3354		3516
3355	# HACK to clear player env face cache, we need some signal framework	3517	# HACK to clear player env face cache, we need some signal framework
3356	# for this (global event?)	3518	# for this (global event?)
3357	%ext::player_env::MUSIC_FACE_CACHE = ();	3519	%ext::player_env::MUSIC_FACE_CACHE = ();
3358		3520
3359	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3521	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3360		3522
3361	warn "loading facedata from $path\n";	3523	trace "loading facedata from $path\n";
3362		3524
3363	my $facedata;	3525	my $facedata = decode_storable load_file $path;
3364	0 < aio_load $path, $facedata
3365	or die "$path: $!";
3366
3367	$facedata = Coro::Storable::thaw $facedata;
3368		3526
3369	$facedata->{version} == 2	3527	$facedata->{version} == 2
3370	or cf::cleanup "$path: version mismatch, cannot proceed.";	3528	or cf::cleanup "$path: version mismatch, cannot proceed.";
3371		3529
3372	# patch in the exptable	3530	# patch in the exptable
…		…
3379	cf::cede_to_tick;	3537	cf::cede_to_tick;
3380		3538
3381	{	3539	{
3382	my $faces = $facedata->{faceinfo};	3540	my $faces = $facedata->{faceinfo};
3383		3541
3384	while (my ($face, $info) = each %$faces) {	3542	for my $face (sort keys %$faces) {
		3543	my $info = $faces->{$face};
3385	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3544	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3386		3545
3387	cf::face::set_visibility $idx, $info->{visibility};	3546	cf::face::set_visibility $idx, $info->{visibility};
3388	cf::face::set_magicmap $idx, $info->{magicmap};	3547	cf::face::set_magicmap $idx, $info->{magicmap};
3389	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3548	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3390	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3549	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3550	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3551	$FACEHASH{$info->{hash64}} = $idx;#d#
3391		3552
3392	cf::cede_to_tick;	3553	cf::cede_to_tick;
3393	}	3554	}
3394		3555
3395	while (my ($face, $info) = each %$faces) {	3556	while (my ($face, $info) = each %$faces) {
…		…
3400		3561
3401	if (my $smooth = cf::face::find $info->{smooth}) {	3562	if (my $smooth = cf::face::find $info->{smooth}) {
3402	cf::face::set_smooth $idx, $smooth;	3563	cf::face::set_smooth $idx, $smooth;
3403	cf::face::set_smoothlevel $idx, $info->{smoothlevel};	3564	cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3404	} else {	3565	} else {
3405	warn "smooth face '$info->{smooth}' not found for face '$face'";	3566	error "smooth face '$info->{smooth}' not found for face '$face'";
3406	}	3567	}
3407		3568
3408	cf::cede_to_tick;	3569	cf::cede_to_tick;
3409	}	3570	}
3410	}	3571	}
…		…
3422		3583
3423	{	3584	{
3424	my $res = $facedata->{resource};	3585	my $res = $facedata->{resource};
3425		3586
3426	while (my ($name, $info) = each %$res) {	3587	while (my ($name, $info) = each %$res) {
3427	if (defined $info->{type}) {	3588	if (defined (my $type = $info->{type})) {
		3589	# TODO: different hash - must free and use new index, or cache ixface data queue
3428	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3590	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3429		3591
3430	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3592	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3431	cf::face::set_type $idx, $info->{type};	3593	cf::face::set_type $idx, $type;
		3594	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3595	$FACEHASH{$info->{hash}} = $idx;#d#
3432	} else {	3596	} else {
3433	$RESOURCE{$name} = $info; # unused	3597	# $RESOURCE{$name} = $info; # unused
3434	}	3598	}
3435		3599
3436	cf::cede_to_tick;	3600	cf::cede_to_tick;
3437	}	3601	}
3438	}	3602	}
…		…
3488	load_resource_file "$DATADIR/treasures"	3652	load_resource_file "$DATADIR/treasures"
3489	or die "unable to load treasurelists\n";	3653	or die "unable to load treasurelists\n";
3490	}	3654	}
3491		3655
3492	sub reload_sound {	3656	sub reload_sound {
3493	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data	3657	trace "loading sound config from $DATADIR/sound\n";
3494	or die "$DATADIR/sound $!";
3495		3658
3496	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3659	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3497		3660
3498	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3661	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3499	my $sound = $soundconf->{compat}[$_]	3662	my $sound = $soundconf->{compat}[$_]
3500	or next;	3663	or next;
3501		3664
…		…
3509	cf::sound::set $k => $face;	3672	cf::sound::set $k => $face;
3510	}	3673	}
3511	}	3674	}
3512		3675
3513	sub reload_resources {	3676	sub reload_resources {
3514	warn "reloading resource files...\n";	3677	trace "reloading resource files...\n";
3515		3678
		3679	reload_exp_table;
		3680	reload_materials;
3516	reload_facedata;	3681	reload_facedata;
3517	reload_sound;	3682	reload_sound;
3518	reload_archetypes;	3683	reload_archetypes;
3519	reload_regions;	3684	reload_regions;
3520	reload_treasures;	3685	reload_treasures;
3521		3686
3522	warn "finished reloading resource files\n";	3687	trace "finished reloading resource files\n";
3523	}	3688	}
3524		3689
3525	sub reload_config {	3690	sub reload_config {
3526	warn "reloading config file...\n";	3691	trace "reloading config file...\n";
3527		3692
3528	open my $fh, "<:utf8", "$CONFDIR/config"	3693	my $config = load_file "$CONFDIR/config";
3529	or return;	3694	utf8::decode $config;
3530		3695	*CFG = decode_yaml $config;
3531	local $/;
3532	*CFG = YAML::XS::Load scalar <$fh>;
3533		3696
3534	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3697	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3535		3698
3536	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3699	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3537	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3700	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3541	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3704	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3542	and die "WARNING: m(un)lockall failed: $!\n";	3705	and die "WARNING: m(un)lockall failed: $!\n";
3543	};	3706	};
3544	warn $@ if $@;	3707	warn $@ if $@;
3545	}	3708	}
3546
3547	warn "finished reloading resource files\n";
3548	}	3709	}
3549		3710
3550	sub pidfile() {	3711	sub pidfile() {
3551	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3712	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3552	or die "$PIDFILE: $!";	3713	or die "$PIDFILE: $!";
…		…
3565	seek $fh, 0, 0;	3726	seek $fh, 0, 0;
3566	print $fh $$;	3727	print $fh $$;
3567	}	3728	}
3568		3729
3569	sub main_loop {	3730	sub main_loop {
3570	warn "EV::loop starting\n";	3731	trace "EV::loop starting\n";
3571	if (1) {	3732	if (1) {
3572	EV::loop;	3733	EV::loop;
3573	}	3734	}
3574	warn "EV::loop returned\n";	3735	trace "EV::loop returned\n";
3575	goto &main_loop unless $REALLY_UNLOOP;	3736	goto &main_loop unless $REALLY_UNLOOP;
3576	}	3737	}
3577		3738
3578	sub main {	3739	sub main {
3579	cf::init_globals; # initialise logging	3740	cf::init_globals; # initialise logging
3580		3741
3581	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3742	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3582	LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3743	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3583	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3744	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3584	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3745	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3585		3746
3586	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3747	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3587		3748
3588	# we must not ever block the main coroutine	3749	# we must not ever block the main coroutine
3589	local $Coro::idle = sub {	3750	$Coro::idle = sub {
3590	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3751	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3591	(async {	3752	(async {
3592	$Coro::current->{desc} = "IDLE BUG HANDLER";	3753	$Coro::current->{desc} = "IDLE BUG HANDLER";
3593	EV::loop EV::LOOP_ONESHOT;	3754	EV::loop EV::LOOP_ONESHOT;
3594	})->prio (Coro::PRIO_MAX);	3755	})->prio (Coro::PRIO_MAX);
3595	};	3756	};
3596		3757
3597	evthread_start IO::AIO::poll_fileno;	3758	evthread_start IO::AIO::poll_fileno;
3598		3759
3599	cf::sync_job {	3760	cf::sync_job {
3600	cf::init_experience;	3761	cf::incloader::init ();
		3762
3601	cf::init_anim;	3763	cf::init_anim;
3602	cf::init_attackmess;	3764	cf::init_attackmess;
3603	cf::init_dynamic;	3765	cf::init_dynamic;
3604		3766
3605	cf::load_settings;	3767	cf::load_settings;
3606	cf::load_materials;
3607		3768
3608	reload_resources;	3769	reload_resources;
3609	reload_config;	3770	reload_config;
3610	db_init;	3771	db_init;
3611		3772
…		…
3623		3784
3624	# no (long-running) fork's whatsoever before this point(!)	3785	# no (long-running) fork's whatsoever before this point(!)
3625	use POSIX ();	3786	use POSIX ();
3626	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3787	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3627		3788
3628	(pop @POST_INIT)->(0) while @POST_INIT;	3789	cf::_post_init 0;
3629	};	3790	};
3630		3791
3631	cf::object::thawer::errors_are_fatal 0;	3792	cf::object::thawer::errors_are_fatal 0;
3632	warn "parse errors in files are no longer fatal from this point on.\n";	3793	info "parse errors in files are no longer fatal from this point on.\n";
3633		3794
		3795	AE::postpone {
		3796	undef &main; # free gobs of memory :)
		3797	};
		3798
3634	main_loop;	3799	goto &main_loop;
3635	}	3800	}
3636		3801
3637	#############################################################################	3802	#############################################################################
3638	# initialisation and cleanup	3803	# initialisation and cleanup
3639		3804
…		…
3678	or return;	3843	or return;
3679		3844
3680	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE	3845	aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3681	and return;	3846	and return;
3682		3847
3683	warn sprintf "runtime file written (%gs).\n", AE::time - $t0;	3848	trace sprintf "runtime file written (%gs).\n", AE::time - $t0;
3684		3849
3685	1	3850	1
3686	}	3851	}
3687		3852
3688	our $uuid_lock;	3853	our $uuid_lock;
…		…
3700	or return;	3865	or return;
3701		3866
3702	my $value = uuid_seq uuid_cur;	3867	my $value = uuid_seq uuid_cur;
3703		3868
3704	unless ($value) {	3869	unless ($value) {
3705	warn "cowardly refusing to write zero uuid value!\n";	3870	info "cowardly refusing to write zero uuid value!\n";
3706	return;	3871	return;
3707	}	3872	}
3708		3873
3709	my $value = uuid_str $value + $uuid_skip;	3874	my $value = uuid_str $value + $uuid_skip;
3710	$uuid_skip = 0;	3875	$uuid_skip = 0;
…		…
3720	or return;	3885	or return;
3721		3886
3722	aio_rename "$uuid~", $uuid	3887	aio_rename "$uuid~", $uuid
3723	and return;	3888	and return;
3724		3889
3725	warn "uuid file written ($value).\n";	3890	trace "uuid file written ($value).\n";
3726		3891
3727	1	3892	1
3728		3893
3729	}	3894	}
3730		3895
…		…
3736	}	3901	}
3737		3902
3738	sub emergency_save() {	3903	sub emergency_save() {
3739	my $freeze_guard = cf::freeze_mainloop;	3904	my $freeze_guard = cf::freeze_mainloop;
3740		3905
3741	warn "emergency_perl_save: enter\n";	3906	info "emergency_perl_save: enter\n";
		3907
		3908	# this is a trade-off: we want to be very quick here, so
		3909	# save all maps without fsync, and later call a global sync
		3910	# (which in turn might be very very slow)
		3911	local $USE_FSYNC = 0;
3742		3912
3743	cf::sync_job {	3913	cf::sync_job {
3744	# this is a trade-off: we want to be very quick here, so	3914	cf::write_runtime_sync; # external watchdog should not bark
3745	# save all maps without fsync, and later call a global sync
3746	# (which in turn might be very very slow)
3747	local $USE_FSYNC = 0;
3748		3915
3749	# use a peculiar iteration method to avoid tripping on perl	3916	# use a peculiar iteration method to avoid tripping on perl
3750	# refcount bugs in for. also avoids problems with players	3917	# refcount bugs in for. also avoids problems with players
3751	# and maps saved/destroyed asynchronously.	3918	# and maps saved/destroyed asynchronously.
3752	warn "emergency_perl_save: begin player save\n";	3919	info "emergency_perl_save: begin player save\n";
3753	for my $login (keys %cf::PLAYER) {	3920	for my $login (keys %cf::PLAYER) {
3754	my $pl = $cf::PLAYER{$login} or next;	3921	my $pl = $cf::PLAYER{$login} or next;
3755	$pl->valid or next;	3922	$pl->valid or next;
3756	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt	3923	delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3757	$pl->save;	3924	$pl->save;
3758	}	3925	}
3759	warn "emergency_perl_save: end player save\n";	3926	info "emergency_perl_save: end player save\n";
3760		3927
		3928	cf::write_runtime_sync; # external watchdog should not bark
		3929
3761	warn "emergency_perl_save: begin map save\n";	3930	info "emergency_perl_save: begin map save\n";
3762	for my $path (keys %cf::MAP) {	3931	for my $path (keys %cf::MAP) {
3763	my $map = $cf::MAP{$path} or next;	3932	my $map = $cf::MAP{$path} or next;
3764	$map->valid or next;	3933	$map->valid or next;
3765	$map->save;	3934	$map->save;
3766	}	3935	}
3767	warn "emergency_perl_save: end map save\n";	3936	info "emergency_perl_save: end map save\n";
3768		3937
		3938	cf::write_runtime_sync; # external watchdog should not bark
		3939
3769	warn "emergency_perl_save: begin database checkpoint\n";	3940	info "emergency_perl_save: begin database checkpoint\n";
3770	BDB::db_env_txn_checkpoint $DB_ENV;	3941	BDB::db_env_txn_checkpoint $DB_ENV;
3771	warn "emergency_perl_save: end database checkpoint\n";	3942	info "emergency_perl_save: end database checkpoint\n";
3772		3943
3773	warn "emergency_perl_save: begin write uuid\n";	3944	info "emergency_perl_save: begin write uuid\n";
3774	write_uuid_sync 1;	3945	write_uuid_sync 1;
3775	warn "emergency_perl_save: end write uuid\n";	3946	info "emergency_perl_save: end write uuid\n";
		3947
		3948	cf::write_runtime_sync; # external watchdog should not bark
		3949
		3950	trace "emergency_perl_save: syncing database to disk";
		3951	BDB::db_env_txn_checkpoint $DB_ENV;
		3952
		3953	info "emergency_perl_save: starting sync\n";
		3954	IO::AIO::aio_sync sub {
		3955	info "emergency_perl_save: finished sync\n";
		3956	};
		3957
		3958	cf::write_runtime_sync; # external watchdog should not bark
		3959
		3960	trace "emergency_perl_save: flushing outstanding aio requests";
		3961	while (IO::AIO::nreqs || BDB::nreqs) {
		3962	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
		3963	}
		3964
		3965	cf::write_runtime_sync; # external watchdog should not bark
3776	};	3966	};
3777		3967
3778	warn "emergency_perl_save: starting sync()\n";
3779	IO::AIO::aio_sync sub {
3780	warn "emergency_perl_save: finished sync()\n";
3781	};
3782
3783	warn "emergency_perl_save: leave\n";	3968	info "emergency_perl_save: leave\n";
3784	}	3969	}
3785		3970
3786	sub post_cleanup {	3971	sub post_cleanup {
3787	my ($make_core) = @_;	3972	my ($make_core) = @_;
3788		3973
		3974	IO::AIO::flush;
		3975
3789	warn Carp::longmess "post_cleanup backtrace"	3976	error Carp::longmess "post_cleanup backtrace"
3790	if $make_core;	3977	if $make_core;
3791		3978
3792	my $fh = pidfile;	3979	my $fh = pidfile;
3793	unlink $PIDFILE if <$fh> == $$;	3980	unlink $PIDFILE if <$fh> == $$;
3794	}	3981	}
…		…
3818	}	4005	}
3819	}	4006	}
3820		4007
3821	sub do_reload_perl() {	4008	sub do_reload_perl() {
3822	# can/must only be called in main	4009	# can/must only be called in main
3823	if (in_main) {	4010	unless (in_main) {
3824	warn "can only reload from main coroutine";	4011	error "can only reload from main coroutine";
3825	return;	4012	return;
3826	}	4013	}
3827		4014
3828	return if $RELOAD++;	4015	return if $RELOAD++;
3829		4016
3830	my $t1 = AE::time;	4017	my $t1 = AE::time;
3831		4018
3832	while ($RELOAD) {	4019	while ($RELOAD) {
3833	warn "reloading...";	4020	cf::get_slot 0.1, -1, "reload_perl";
		4021	info "perl_reload: reloading...";
3834		4022
3835	warn "entering sync_job";	4023	trace "perl_reload: entering sync_job";
3836		4024
3837	cf::sync_job {	4025	cf::sync_job {
3838	cf::write_runtime_sync; # external watchdog should not bark
3839	cf::emergency_save;	4026	#cf::emergency_save;
3840	cf::write_runtime_sync; # external watchdog should not bark
3841		4027
3842	warn "syncing database to disk";
3843	BDB::db_env_txn_checkpoint $DB_ENV;
3844
3845	# if anything goes wrong in here, we should simply crash as we already saved
3846
3847	warn "flushing outstanding aio requests";
3848	while (IO::AIO::nreqs || BDB::nreqs) {
3849	Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3850	}
3851
3852	warn "cancelling all extension coros";	4028	trace "perl_reload: cancelling all extension coros";
3853	$_->cancel for values %EXT_CORO;	4029	$_->cancel for values %EXT_CORO;
3854	%EXT_CORO = ();	4030	%EXT_CORO = ();
3855		4031
3856	warn "removing commands";	4032	trace "perl_reload: removing commands";
3857	%COMMAND = ();	4033	%COMMAND = ();
3858		4034
3859	warn "removing ext/exti commands";	4035	trace "perl_reload: removing ext/exti commands";
3860	%EXTCMD = ();	4036	%EXTCMD = ();
3861	%EXTICMD = ();	4037	%EXTICMD = ();
3862		4038
3863	warn "unloading/nuking all extensions";	4039	trace "perl_reload: unloading/nuking all extensions";
3864	for my $pkg (@EXTS) {	4040	for my $pkg (@EXTS) {
3865	warn "... unloading $pkg";	4041	trace "... unloading $pkg";
3866		4042
3867	if (my $cb = $pkg->can ("unload")) {	4043	if (my $cb = $pkg->can ("unload")) {
3868	eval {	4044	eval {
3869	$cb->($pkg);	4045	$cb->($pkg);
3870	1	4046	1
3871	} or warn "$pkg unloaded, but with errors: $@";	4047	} or error "$pkg unloaded, but with errors: $@";
3872	}	4048	}
3873		4049
3874	warn "... clearing $pkg";	4050	trace "... clearing $pkg";
3875	clear_package $pkg;	4051	clear_package $pkg;
3876	}	4052	}
3877		4053
3878	warn "unloading all perl modules loaded from $LIBDIR";	4054	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3879	while (my ($k, $v) = each %INC) {	4055	while (my ($k, $v) = each %INC) {
3880	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4056	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3881		4057
3882	warn "... unloading $k";	4058	trace "... unloading $k";
3883	delete $INC{$k};	4059	delete $INC{$k};
3884		4060
3885	$k =~ s/\.pm$//;	4061	$k =~ s/\.pm$//;
3886	$k =~ s/\//::/g;	4062	$k =~ s/\//::/g;
3887		4063
…		…
3890	}	4066	}
3891		4067
3892	clear_package $k;	4068	clear_package $k;
3893	}	4069	}
3894		4070
3895	warn "getting rid of safe::, as good as possible";	4071	trace "perl_reload: getting rid of safe::, as good as possible";
3896	clear_package "safe::$_"	4072	clear_package "safe::$_"
3897	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4073	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3898		4074
3899	warn "unloading cf.pm \"a bit\"";	4075	trace "perl_reload: unloading cf.pm \"a bit\"";
3900	delete $INC{"cf.pm"};	4076	delete $INC{"cf.pm"};
3901	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4077	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3902		4078
3903	# don't, removes xs symbols, too,	4079	# don't, removes xs symbols, too,
3904	# and global variables created in xs	4080	# and global variables created in xs
3905	#clear_package __PACKAGE__;	4081	#clear_package __PACKAGE__;
3906		4082
3907	warn "unload completed, starting to reload now";	4083	info "perl_reload: unload completed, starting to reload now";
3908		4084
3909	warn "reloading cf.pm";	4085	trace "perl_reload: reloading cf.pm";
3910	require cf;	4086	require cf;
3911	cf::_connect_to_perl_1;	4087	cf::_connect_to_perl_1;
3912		4088
3913	warn "loading config and database again";	4089	trace "perl_reload: loading config and database again";
3914	cf::reload_config;	4090	cf::reload_config;
3915		4091
3916	warn "loading extensions";	4092	trace "perl_reload: loading extensions";
3917	cf::load_extensions;	4093	cf::load_extensions;
3918		4094
3919	if ($REATTACH_ON_RELOAD) {	4095	if ($REATTACH_ON_RELOAD) {
3920	warn "reattaching attachments to objects/players";	4096	trace "perl_reload: reattaching attachments to objects/players";
3921	_global_reattach; # objects, sockets	4097	_global_reattach; # objects, sockets
3922	warn "reattaching attachments to maps";	4098	trace "perl_reload: reattaching attachments to maps";
3923	reattach $_ for values %MAP;	4099	reattach $_ for values %MAP;
3924	warn "reattaching attachments to players";	4100	trace "perl_reload: reattaching attachments to players";
3925	reattach $_ for values %PLAYER;	4101	reattach $_ for values %PLAYER;
3926	}	4102	}
3927		4103
3928	warn "running post_init jobs";	4104	cf::_post_init 1;
3929	(pop @POST_INIT)->(1) while @POST_INIT;
3930		4105
3931	warn "leaving sync_job";	4106	trace "perl_reload: leaving sync_job";
3932		4107
3933	1	4108	1
3934	} or do {	4109	} or do {
3935	warn $@;	4110	error $@;
3936	cf::cleanup "error while reloading, exiting.";	4111	cf::cleanup "perl_reload: error, exiting.";
3937	};	4112	};
3938		4113
3939	warn "reloaded";
3940	--$RELOAD;	4114	--$RELOAD;
3941	}	4115	}
3942		4116
3943	$t1 = AE::time - $t1;	4117	$t1 = AE::time - $t1;
3944	warn "reload completed in ${t1}s\n";	4118	info "perl_reload: completed in ${t1}s\n";
3945	};	4119	};
3946		4120
3947	our $RELOAD_WATCHER; # used only during reload	4121	our $RELOAD_WATCHER; # used only during reload
3948		4122
3949	sub reload_perl() {	4123	sub reload_perl() {
…		…
3970	reload_perl;	4144	reload_perl;
3971	};	4145	};
3972	}	4146	}
3973	};	4147	};
3974		4148
3975	unshift @INC, $LIBDIR;	4149	#############################################################################
3976		4150
3977	my $bug_warning = 0;	4151	my $bug_warning = 0;
3978		4152
3979	our @WAIT_FOR_TICK;
3980	our @WAIT_FOR_TICK_BEGIN;
3981
3982	sub wait_for_tick {	4153	sub wait_for_tick() {
3983	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4154	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3984		4155
3985	my $signal = new Coro::Signal;	4156	$WAIT_FOR_TICK->wait;
3986	push @WAIT_FOR_TICK, $signal;
3987	$signal->wait;
3988	}	4157	}
3989		4158
3990	sub wait_for_tick_begin {	4159	sub wait_for_tick_begin() {
3991	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4160	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
3992		4161
3993	my $signal = new Coro::Signal;	4162	my $signal = new Coro::Signal;
3994	push @WAIT_FOR_TICK_BEGIN, $signal;	4163	push @WAIT_FOR_TICK_BEGIN, $signal;
3995	$signal->wait;	4164	$signal->wait;
3996	}	4165	}
…		…
4000	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4169	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4001	unless ++$bug_warning > 10;	4170	unless ++$bug_warning > 10;
4002	return;	4171	return;
4003	}	4172	}
4004		4173
4005	cf::server_tick; # one server iteration	4174	cf::one_tick; # one server iteration
4006		4175
4007	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4176	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4008		4177
4009	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4178	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4010	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4179	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
4011	Coro::async_pool {	4180	Coro::async_pool {
4012	$Coro::current->{desc} = "runtime saver";	4181	$Coro::current->{desc} = "runtime saver";
4013	write_runtime_sync	4182	write_runtime_sync
4014	or warn "ERROR: unable to write runtime file: $!";	4183	or error "ERROR: unable to write runtime file: $!";
4015	};	4184	};
4016	}	4185	}
4017		4186
4018	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4187	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4019	$sig->send;	4188	$sig->send;
4020	}	4189	}
4021	while (my $sig = shift @WAIT_FOR_TICK) {	4190	$WAIT_FOR_TICK->broadcast;
4022	$sig->send;
4023	}
4024		4191
4025	$LOAD = ($NOW - $TICK_START) / $TICK;	4192	$LOAD = ($NOW - $TICK_START) / $TICK;
4026	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4193	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4027		4194
4028	if (0) {	4195	if (0) {
4029	if ($NEXT_TICK) {	4196	if ($NEXT_TICK) {
4030	my $jitter = $TICK_START - $NEXT_TICK;	4197	my $jitter = $TICK_START - $NEXT_TICK;
4031	$JITTER = $JITTER * 0.75 + $jitter * 0.25;	4198	$JITTER = $JITTER * 0.75 + $jitter * 0.25;
4032	warn "jitter $JITTER\n";#d#	4199	debug "jitter $JITTER\n";#d#
4033	}	4200	}
4034	}	4201	}
4035	}	4202	}
4036		4203
4037	{	4204	{
4038	# configure BDB	4205	# configure BDB
4039		4206
4040	BDB::min_parallel 16;	4207	BDB::min_parallel 16;
4041	BDB::max_poll_reqs $TICK * 0.1;	4208	BDB::max_poll_reqs $TICK * 0.1;
4042	$AnyEvent::BDB::WATCHER->priority (1);	4209	#$AnyEvent::BDB::WATCHER->priority (1);
4043		4210
4044	unless ($DB_ENV) {	4211	unless ($DB_ENV) {
4045	$DB_ENV = BDB::db_env_create;	4212	$DB_ENV = BDB::db_env_create;
4046	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4213	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4047	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4214	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4082	IO::AIO::min_parallel 8;	4249	IO::AIO::min_parallel 8;
4083	IO::AIO::max_poll_time $TICK * 0.1;	4250	IO::AIO::max_poll_time $TICK * 0.1;
4084	undef $AnyEvent::AIO::WATCHER;	4251	undef $AnyEvent::AIO::WATCHER;
4085	}	4252	}
4086		4253
4087	my $_log_backtrace;	4254	our $_log_backtrace;
		4255	our $_log_backtrace_last;
4088		4256
4089	sub _log_backtrace {	4257	sub _log_backtrace {
4090	my ($msg, @addr) = @_;	4258	my ($msg, @addr) = @_;
4091		4259
4092	$msg =~ s/\n//;	4260	$msg =~ s/\n$//;
4093		4261
		4262	if ($_log_backtrace_last eq $msg) {
		4263	LOG llevInfo, "[ABT] $msg\n";
		4264	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4094	# limit the # of concurrent backtraces	4265	# limit the # of concurrent backtraces
4095	if ($_log_backtrace < 2) {	4266	} elsif ($_log_backtrace < 2) {
		4267	$_log_backtrace_last = $msg;
4096	++$_log_backtrace;	4268	++$_log_backtrace;
4097	my $perl_bt = Carp::longmess $msg;	4269	my $perl_bt = Carp::longmess $msg;
4098	async {	4270	async {
4099	$Coro::current->{desc} = "abt $msg";	4271	$Coro::current->{desc} = "abt $msg";
4100		4272
…		…
4120	LOG llevInfo, "[ABT] $_\n" for @bt;	4292	LOG llevInfo, "[ABT] $_\n" for @bt;
4121	--$_log_backtrace;	4293	--$_log_backtrace;
4122	};	4294	};
4123	} else {	4295	} else {
4124	LOG llevInfo, "[ABT] $msg\n";	4296	LOG llevInfo, "[ABT] $msg\n";
4125	LOG llevInfo, "[ABT] [suppressed]\n";	4297	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4126	}	4298	}
4127	}	4299	}
4128		4300
4129	# load additional modules	4301	# load additional modules
4130	require "cf/$_.pm" for @EXTRA_MODULES;	4302	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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