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.542 by root, Wed May 5 09:05:03 2010 UTC vs.
Revision 1.591 by root, Tue Nov 6 23:33:15 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
…		…
32	use Safe;	32	use Safe;
33	use Safe::Hole;	33	use Safe::Hole;
34	use Storable ();	34	use Storable ();
35	use Carp ();	35	use Carp ();
36		36
37	use Guard ();	37	use AnyEvent ();
		38	use AnyEvent::IO ();
		39	use AnyEvent::DNS ();
		40
38	use Coro ();	41	use Coro ();
39	use Coro::State;	42	use Coro::State;
40	use Coro::Handle;	43	use Coro::Handle;
41	use Coro::EV;	44	use Coro::EV;
42	use Coro::AnyEvent;	45	use Coro::AnyEvent;
…		…
48	use Coro::AIO;	51	use Coro::AIO;
49	use Coro::BDB 1.6;	52	use Coro::BDB 1.6;
50	use Coro::Storable;	53	use Coro::Storable;
51	use Coro::Util ();	54	use Coro::Util ();
52		55
		56	use Guard ();
53	use JSON::XS 2.01 ();	57	use JSON::XS 2.01 ();
54	use BDB ();	58	use BDB ();
55	use Data::Dumper;	59	use Data::Dumper;
56	use Fcntl;	60	use Fcntl;
57	use YAML::XS ();	61	use YAML::XS ();
…		…
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.
202		228
203	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR	229	=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
204	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR	230	$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
205	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR	231	$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
206		232
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
…		…
305	)) {	340	)) {
306	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;	341	@{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
307	}	342	}
308		343
309	$EV::DIED = sub {	344	$EV::DIED = sub {
310	Carp::cluck "error in event callback: @_";	345	warn "error in event callback: $@";
311	};	346	};
		347
		348	#############################################################################
		349
		350	sub fork_call(&@);
		351	sub get_slot($;$$);
312		352
313	#############################################################################	353	#############################################################################
314		354
315	=head2 UTILITY FUNCTIONS	355	=head2 UTILITY FUNCTIONS
316		356
…		…
337	$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;
338	$d	378	$d
339	} || "[unable to dump $_[0]: '$@']";	379	} || "[unable to dump $_[0]: '$@']";
340	}	380	}
341		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
342	=item $ref = cf::decode_json $json	434	=item $ref = cf::decode_json $json
343		435
344	Converts a JSON string into the corresponding perl data structure.	436	Converts a JSON string into the corresponding perl data structure.
345		437
346	=item $json = cf::encode_json $ref	438	=item $json = cf::encode_json $ref
…		…
352	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
353		445
354	sub encode_json($) { $json_coder->encode ($_[0]) }	446	sub encode_json($) { $json_coder->encode ($_[0]) }
355	sub decode_json($) { $json_coder->decode ($_[0]) }	447	sub decode_json($) { $json_coder->decode ($_[0]) }
356		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
357	=item cf::post_init { BLOCK }	480	=item cf::post_init { BLOCK }
358		481
359	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,
360	but I<before> the server starts ticking again.	483	but I<before> the server starts ticking again.
361		484
362	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
363	is a reload or not.	486	is a reload or not.
364		487
365	=cut	488	=cut
366		489
367	sub post_init(&) {	490	sub post_init(&) {
368	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	}
369	}	509	}
370		510
371	=item cf::lock_wait $string	511	=item cf::lock_wait $string
372		512
373	Wait until the given lock is available. See cf::lock_acquire.	513	Wait until the given lock is available. See cf::lock_acquire.
…		…
426	EV::periodic $start, $interval, 0, $cb	566	EV::periodic $start, $interval, 0, $cb
427	}	567	}
428		568
429	=item cf::get_slot $time[, $priority[, $name]]	569	=item cf::get_slot $time[, $priority[, $name]]
430		570
431	Allocate $time seconds of blocking CPU time at priority C<$priority>:	571	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	572	(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.	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.
434		578
435	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
436	used for statistical purposes and should identify the same time-class.	580	used for statistical purposes and should identify the same time-class.
437		581
438	Useful for short background jobs.	582	Useful for short background jobs.
…		…
467	}	611	}
468	}	612	}
469		613
470	if (@SLOT_QUEUE) {	614	if (@SLOT_QUEUE) {
471	# 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
472	push @cf::WAIT_FOR_TICK, $signal;	616	$WAIT_FOR_TICK->wait;
473	$signal->wait;
474	} else {	617	} else {
475	$busy = 0;	618	$busy = 0;
476	Coro::schedule;	619	Coro::schedule;
477	}	620	}
478	}	621	}
…		…
578	$EXT_CORO{$coro+0} = $coro;	721	$EXT_CORO{$coro+0} = $coro;
579		722
580	$coro	723	$coro
581	}	724	}
582		725
583	=item fork_call { }, $args	726	=item fork_call { }, @args
584		727
585	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
586	process, returning the results. Everything must be serialisable with	729	process, returning the results. Everything must be serialisable with
587	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
588	never block itself or use any form of event handling.	731	never block itself or use any form of event handling.
589		732
590	=cut	733	=cut
591		734
		735	sub post_fork {
		736	reset_signals;
		737	}
		738
592	sub fork_call(&@) {	739	sub fork_call(&@) {
593	my ($cb, @args) = @_;	740	my ($cb, @args) = @_;
594		741
595	# 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,
596	# otherwise perl prematurely frees the stuff :/	743	# otherwise perl prematurely frees the stuff :/
597	# TODO: investigate and fix (likely this will be rather laborious)	744	# TODO: investigate and fix (likely this will be rather laborious)
598		745
599	my @res = Coro::Util::fork_eval {	746	my @res = Coro::Util::fork_eval {
600	reset_signals;	747	cf::post_fork;
601	&$cb	748	&$cb
602	}, @args;	749	} @args;
603		750
604	wantarray ? @res : $res[-1]	751	wantarray ? @res : $res[-1]
605	}	752	}
606		753
607	sub objinfo {	754	sub objinfo {
…		…
729		876
730	my @data;	877	my @data;
731	my $md5;	878	my $md5;
732		879
733	for (0 .. $#$src) {	880	for (0 .. $#$src) {
734	0 <= aio_load $src->[$_], $data[$_]	881	$data[$_] = load_file $src->[$_];
735	or Carp::croak "$src->[$_]: $!";
736	}	882	}
737		883
738	# if processing is expensive, check	884	# if processing is expensive, check
739	# checksum first	885	# checksum first
740	if (1) {	886	if (1) {
…		…
1358	my ($pl, $buf) = @_;	1504	my ($pl, $buf) = @_;
1359		1505
1360	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };	1506	my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1361		1507
1362	if (ref $msg) {	1508	if (ref $msg) {
1363	my ($type, $reply, @payload) =	1509	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
1364	"ARRAY" eq ref $msg
1365	? @$msg
1366	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1367		1510
1368	my @reply;	1511	my @reply;
1369		1512
1370	if (my $cb = $EXTCMD{$type}) {	1513	if (my $cb = $EXTCMD{$type}) {
1371	@reply = $cb->($pl, @payload);	1514	@reply = $cb->($pl, @payload);
…		…
1393	};	1536	};
1394		1537
1395	$grp	1538	$grp
1396	}	1539	}
1397		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
1398	sub load_extensions {	1552	sub load_extensions {
1399	info "loading extensions...";	1553	info "loading extensions...";
		1554
		1555	%EXT_CFG = ();
1400		1556
1401	cf::sync_job {	1557	cf::sync_job {
1402	my %todo;	1558	my %todo;
1403		1559
1404	for my $path (<$LIBDIR/*.ext>) {	1560	for my $path (<$LIBDIR/*.ext>) {
…		…
1447	unless exists $done{$_};	1603	unless exists $done{$_};
1448	}	1604	}
1449		1605
1450	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";	1606	trace "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1451		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
1452	my $active = eval $v->{source};	1617	my $active = eval $source;
1453		1618
1454	if (length $@) {	1619	if (length $@) {
1455	error "$v->{path}: $@\n";	1620	error "$v->{path}: $@\n";
1456		1621
1457	cf::cleanup "mandatory extension '$k' failed to load, exiting."	1622	cf::cleanup "mandatory extension '$k' failed to load, exiting."
…		…
1474		1639
1475	while (my ($k, $v) = each %todo) {	1640	while (my ($k, $v) = each %todo) {
1476	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."	1641	cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1477	if exists $v->{meta}{mandatory};	1642	if exists $v->{meta}{mandatory};
1478	}	1643	}
		1644
		1645	last;
1479	}	1646	}
1480	}	1647	}
1481	};	1648	};
1482	}	1649	}
1483		1650
…		…
1641	my $name = $pl->ob->name;	1808	my $name = $pl->ob->name;
1642		1809
1643	$pl->{deny_save} = 1;	1810	$pl->{deny_save} = 1;
1644	$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
1645		1812
1646	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;	1813	$pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->ns;
1647	$pl->deactivate;	1814	$pl->deactivate;
		1815
1648	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;
1649	$pl->invoke (cf::EVENT_PLAYER_QUIT);	1817	$pl->invoke (cf::EVENT_PLAYER_QUIT) if $pl->ns;
		1818	ext::highscore::check ($pl->ob);
		1819
1650	$pl->ns->destroy if $pl->ns;	1820	$pl->ns->destroy if $pl->ns;
1651		1821
1652	my $path = playerdir $pl;	1822	my $path = playerdir $pl;
1653	my $temp = "$path~$cf::RUNTIME~deleting~";	1823	my $temp = "$path~$cf::RUNTIME~deleting~";
1654	aio_rename $path, $temp;	1824	aio_rename $path, $temp;
…		…
1820	sub generate_random_map {	1990	sub generate_random_map {
1821	my ($self, $rmp) = @_;	1991	my ($self, $rmp) = @_;
1822		1992
1823	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
1824		1994
1825	# mit "rum" bekleckern, nicht
1826	$self->_create_random_map (	1995	$self->_create_random_map ($rmp);
1827	$rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1828	$rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1829	$rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1830	$rmp->{exit_on_final_map},
1831	$rmp->{xsize}, $rmp->{ysize},
1832	$rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1833	$rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
1834	$rmp->{dungeon_level}, $rmp->{dungeon_depth}, $rmp->{decoroptions}, $rmp->{orientation},
1835	$rmp->{origin_y}, $rmp->{origin_x}, $rmp->{random_seed}, $rmp->{total_map_hp},
1836	$rmp->{map_layout_style}, $rmp->{treasureoptions}, $rmp->{symmetry_used},
1837	(cf::region::find $rmp->{region}), $rmp->{custom}
1838	)
1839	}	1996	}
1840		1997
1841	=item cf::map->register ($regex, $prio)	1998	=item cf::map->register ($regex, $prio)
1842		1999
1843	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
…		…
1869	}	2026	}
1870		2027
1871	sub normalise {	2028	sub normalise {
1872	my ($path, $base) = @_;	2029	my ($path, $base) = @_;
1873		2030
1874	$path = "$path"; # make sure its a string	2031	$path = "$path"; # make sure it's a string
1875		2032
1876	$path =~ s/\.map$//;	2033	$path =~ s/\.map$//;
1877		2034
1878	# map plan:	2035	# map plan:
1879	#	2036	#
…		…
1894	$base =~ s{[^/]+/?$}{};	2051	$base =~ s{[^/]+/?$}{};
1895	$path = "$base/$path";	2052	$path = "$base/$path";
1896	}	2053	}
1897		2054
1898	for ($path) {	2055	for ($path) {
1899	redo if s{//}{/};
1900	redo if s{/\.?/}{/};	2056	redo if s{/\.?/}{/};
1901	redo if s{/[^/]+/\.\./}{/};	2057	redo if s{/[^/]+/\.\./}{/};
1902	}	2058	}
1903		2059
1904	$path	2060	$path
…		…
1918	$self->init; # pass $1 etc.	2074	$self->init; # pass $1 etc.
1919	return $self;	2075	return $self;
1920	}	2076	}
1921	}	2077	}
1922		2078
1923	Carp::cluck "unable to resolve path '$path' (base '$base').";	2079	Carp::cluck "unable to resolve path '$path' (base '$base')";
1924	()	2080	()
1925	}	2081	}
1926		2082
		2083	# may re-bless or do other evil things
1927	sub init {	2084	sub init {
1928	my ($self) = @_;	2085	my ($self) = @_;
1929		2086
1930	$self	2087	$self
1931	}	2088	}
…		…
1996	$self->{load_path} = $path;	2153	$self->{load_path} = $path;
1997		2154
1998	1	2155	1
1999	}	2156	}
2000		2157
		2158	# used to laod the header of an original map
2001	sub load_header_orig {	2159	sub load_header_orig {
2002	my ($self) = @_;	2160	my ($self) = @_;
2003		2161
2004	$self->load_header_from ($self->load_path)	2162	$self->load_header_from ($self->load_path)
2005	}	2163	}
2006		2164
		2165	# used to laod the header of an instantiated map
2007	sub load_header_temp {	2166	sub load_header_temp {
2008	my ($self) = @_;	2167	my ($self) = @_;
2009		2168
2010	$self->load_header_from ($self->save_path)	2169	$self->load_header_from ($self->save_path)
2011	}	2170	}
2012		2171
		2172	# called after loading the header from an instantiated map
2013	sub prepare_temp {	2173	sub prepare_temp {
2014	my ($self) = @_;	2174	my ($self) = @_;
2015		2175
2016	$self->last_access ((delete $self->{last_access})	2176	$self->last_access ((delete $self->{last_access})
2017	|| $cf::RUNTIME); #d#	2177	|| $cf::RUNTIME); #d#
2018	# safety	2178	# safety
2019	$self->{instantiate_time} = $cf::RUNTIME	2179	$self->{instantiate_time} = $cf::RUNTIME
2020	if $self->{instantiate_time} > $cf::RUNTIME;	2180	if $self->{instantiate_time} > $cf::RUNTIME;
2021	}	2181	}
2022		2182
		2183	# called after loading the header from an original map
2023	sub prepare_orig {	2184	sub prepare_orig {
2024	my ($self) = @_;	2185	my ($self) = @_;
2025		2186
2026	$self->{load_original} = 1;	2187	$self->{load_original} = 1;
2027	$self->{instantiate_time} = $cf::RUNTIME;	2188	$self->{instantiate_time} = $cf::RUNTIME;
…		…
2051		2212
2052	sub find;	2213	sub find;
2053	sub find {	2214	sub find {
2054	my ($path, $origin) = @_;	2215	my ($path, $origin) = @_;
2055		2216
		2217	cf::cede_to_tick;
		2218
2056	$path = normalise $path, $origin && $origin->path;	2219	$path = normalise $path, $origin;
2057		2220
2058	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove	2221	my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2059	my $guard2 = cf::lock_acquire "map_find:$path";	2222	my $guard2 = cf::lock_acquire "map_find:$path";
2060		2223
2061	$cf::MAP{$path} || do {	2224	$cf::MAP{$path} || do {
…		…
2092		2255
2093	{	2256	{
2094	my $guard = cf::lock_acquire "map_data:$path";	2257	my $guard = cf::lock_acquire "map_data:$path";
2095		2258
2096	return unless $self->valid;	2259	return unless $self->valid;
2097	return unless $self->in_memory == cf::MAP_SWAPPED;	2260	return unless $self->state == cf::MAP_SWAPPED;
2098
2099	$self->in_memory (cf::MAP_LOADING);
2100		2261
2101	$self->alloc;	2262	$self->alloc;
2102		2263
2103	$self->pre_load;	2264	$self->pre_load;
2104	cf::cede_to_tick;	2265	cf::cede_to_tick;
2105		2266
		2267	if (exists $self->{load_path}) {
2106	my $f = new_from_file cf::object::thawer $self->{load_path};	2268	my $f = new_from_file cf::object::thawer $self->{load_path};
2107	$f->skip_block;	2269	$f->skip_block;
2108	$self->_load_objects ($f)	2270	$self->_load_objects ($f)
2109	or return;	2271	or return;
2110		2272
2111	$self->post_load_original	2273	$self->post_load_original
2112	if delete $self->{load_original};	2274	if delete $self->{load_original};
2113		2275
2114	if (my $uniq = $self->uniq_path) {	2276	if (my $uniq = $self->uniq_path) {
2115	utf8::encode $uniq;	2277	utf8::encode $uniq;
2116	unless (aio_stat $uniq) {	2278	unless (aio_stat $uniq) {
2117	if (my $f = new_from_file cf::object::thawer $uniq) {	2279	if (my $f = new_from_file cf::object::thawer $uniq) {
2118	$self->clear_unique_items;	2280	$self->clear_unique_items;
2119	$self->_load_objects ($f);	2281	$self->_load_objects ($f);
2120	$f->resolve_delayed_derefs;	2282	$f->resolve_delayed_derefs;
		2283	}
2121	}	2284	}
2122	}	2285	}
2123	}
2124		2286
2125	$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);
2126		2294
2127	cf::cede_to_tick;	2295	cf::cede_to_tick;
2128	# now do the right thing for maps	2296	# now do the right thing for maps
2129	$self->link_multipart_objects;	2297	$self->link_multipart_objects;
2130	$self->difficulty ($self->estimate_difficulty)	2298	$self->difficulty ($self->estimate_difficulty)
…		…
2134	unless ($self->{deny_activate}) {	2302	unless ($self->{deny_activate}) {
2135	$self->decay_objects;	2303	$self->decay_objects;
2136	$self->fix_auto_apply;	2304	$self->fix_auto_apply;
2137	$self->update_buttons;	2305	$self->update_buttons;
2138	cf::cede_to_tick;	2306	cf::cede_to_tick;
2139	$self->activate;	2307	#$self->activate; # no longer activate maps automatically
2140	}	2308	}
2141		2309
2142	$self->{last_save} = $cf::RUNTIME;	2310	$self->{last_save} = $cf::RUNTIME;
2143	$self->last_access ($cf::RUNTIME);	2311	$self->last_access ($cf::RUNTIME);
2144
2145	$self->in_memory (cf::MAP_ACTIVE);
2146	}	2312	}
2147		2313
2148	$self->post_load;	2314	$self->post_load;
		2315
		2316	1
2149	}	2317	}
2150		2318
2151	# customize the map for a given player, i.e.	2319	# customize the map for a given player, i.e.
2152	# return the _real_ map. used by e.g. per-player	2320	# return the _real_ map. used by e.g. per-player
2153	# maps to change the path to ~playername/mappath	2321	# maps to change the path to ~playername/mappath
…		…
2161	# if $self->per_party;	2329	# if $self->per_party;
2162		2330
2163	$self	2331	$self
2164	}	2332	}
2165		2333
2166	# find and load all maps in the 3x3 area around a map
2167	sub load_neighbours {
2168	my ($map) = @_;
2169
2170	my @neigh; # diagonal neighbours
2171
2172	for (0 .. 3) {
2173	my $neigh = $map->tile_path ($_)
2174	or next;
2175	$neigh = find $neigh, $map
2176	or next;
2177	$neigh->load;
2178
2179	# now find the diagonal neighbours
2180	push @neigh,
2181	[$neigh->tile_path (($_ + 3) % 4), $neigh],
2182	[$neigh->tile_path (($_ + 1) % 4), $neigh];
2183	}
2184
2185	for (grep defined $_->[0], @neigh) {
2186	my ($path, $origin) = @$_;
2187	my $neigh = find $path, $origin
2188	or next;
2189	$neigh->load;
2190	}
2191	}
2192
2193	sub find_sync {	2334	sub find_sync {
2194	my ($path, $origin) = @_;	2335	my ($path, $origin) = @_;
2195		2336
		2337	# it's a bug to call this from the main context
2196	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"	2338	return cf::LOG cf::llevError | cf::logBacktrace, "do_find_sync"
2197	if $Coro::current == $Coro::main;	2339	if $Coro::current == $Coro::main;
2198		2340
2199	find $path, $origin	2341	find $path, $origin
2200	}	2342	}
2201		2343
2202	sub do_load_sync {	2344	sub do_load_sync {
2203	my ($map) = @_;	2345	my ($map) = @_;
2204		2346
		2347	# it's a bug to call this from the main context
2205	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"	2348	return cf::LOG cf::llevError | cf::logBacktrace, "do_load_sync"
2206	if $Coro::current == $Coro::main;	2349	if $Coro::current == $Coro::main;
2207		2350
2208	$map->load;	2351	$map->load;
2209	}	2352	}
…		…
2212	our $MAP_PREFETCHER = undef;	2355	our $MAP_PREFETCHER = undef;
2213		2356
2214	sub find_async {	2357	sub find_async {
2215	my ($path, $origin, $load) = @_;	2358	my ($path, $origin, $load) = @_;
2216		2359
2217	$path = normalise $path, $origin && $origin->{path};	2360	$path = normalise $path, $origin;
2218		2361
2219	if (my $map = $cf::MAP{$path}) {	2362	if (my $map = $cf::MAP{$path}) {
2220	return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;	2363	return $map if !$load || $map->linkable;
2221	}	2364	}
2222		2365
2223	$MAP_PREFETCH{$path} |= $load;	2366	$MAP_PREFETCH{$path} |= $load;
2224		2367
2225	$MAP_PREFETCHER ||= cf::async {	2368	$MAP_PREFETCHER ||= cf::async {
…		…
2284	sub swap_out {	2427	sub swap_out {
2285	my ($self) = @_;	2428	my ($self) = @_;
2286		2429
2287	my $lock = cf::lock_acquire "map_data:$self->{path}";	2430	my $lock = cf::lock_acquire "map_data:$self->{path}";
2288		2431
2289	return if $self->in_memory != cf::MAP_ACTIVE;	2432	return if !$self->linkable;
2290	return if $self->{deny_save};	2433	return if $self->{deny_save};
2291	return if $self->players;	2434	return if $self->players;
2292		2435
2293	# first deactivate the map and "unlink" it from the core	2436	# first deactivate the map and "unlink" it from the core
2294	$self->deactivate;	2437	$self->deactivate;
2295	$_->clear_links_to ($self) for values %cf::MAP;	2438	$_->clear_links_to ($self) for values %cf::MAP;
2296	$self->in_memory (cf::MAP_SWAPPED);	2439	$self->state (cf::MAP_SWAPPED);
2297		2440
2298	# then atomically save	2441	# then atomically save
2299	$self->_save;	2442	$self->_save;
2300		2443
2301	# then free the map	2444	# then free the map
…		…
2327		2470
2328	return if $self->players;	2471	return if $self->players;
2329		2472
2330	cf::trace "resetting map ", $self->path, "\n";	2473	cf::trace "resetting map ", $self->path, "\n";
2331		2474
2332	$self->in_memory (cf::MAP_SWAPPED);	2475	$self->state (cf::MAP_SWAPPED);
2333		2476
2334	# need to save uniques path	2477	# need to save uniques path
2335	unless ($self->{deny_save}) {	2478	unless ($self->{deny_save}) {
2336	my $uniq = $self->uniq_path; utf8::encode $uniq;	2479	my $uniq = $self->uniq_path; utf8::encode $uniq;
2337		2480
…		…
2667	# use -1 or undef as default coordinates, not 0, 0	2810	# use -1 or undef as default coordinates, not 0, 0
2668	($x, $y) = ($map->enter_x, $map->enter_y)	2811	($x, $y) = ($map->enter_x, $map->enter_y)
2669	if $x <= 0 && $y <= 0;	2812	if $x <= 0 && $y <= 0;
2670		2813
2671	$map->load;	2814	$map->load;
2672	$map->load_neighbours;
2673		2815
2674	return unless $self->contr->active;	2816	return unless $self->contr->active;
2675		2817
2676	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext	2818	local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2677	if ($self->enter_map ($map, $x, $y)) {	2819	if ($self->enter_map ($map, $x, $y)) {
…		…
2733	($path, $x, $y) = (undef, undef, undef);	2875	($path, $x, $y) = (undef, undef, undef);
2734	}	2876	}
2735	}	2877	}
2736		2878
2737	my $map = eval {	2879	my $map = eval {
2738	my $map = defined $path ? cf::map::find $path : undef;	2880	my $map = defined $path ? cf::map::find $path, $self->map : undef;
2739		2881
2740	if ($map) {	2882	if ($map) {
2741	$map = $map->customise_for ($self);	2883	$map = $map->customise_for ($self);
2742	$map = $check->($map, $x, $y, $self) if $check && $map;	2884	$map = $check->($map, $x, $y, $self) if $check && $map;
2743	} else {	2885	} else {
…		…
2833	$Coro::current->{desc} = "enter_exit";	2975	$Coro::current->{desc} = "enter_exit";
2834		2976
2835	unless (eval {	2977	unless (eval {
2836	$self->deactivate_recursive; # just to be sure	2978	$self->deactivate_recursive; # just to be sure
2837		2979
2838	# random map handling
2839	{
2840	my $guard = cf::lock_acquire "exit_prepare:$exit";
2841
2842	prepare_random_map $exit
2843	if $exit->slaying eq "/!";
2844	}
2845
2846	my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;	2980	my $map = cf::map::normalise $exit->slaying, $exit->map;
2847	my $x = $exit->stats->hp;	2981	my $x = $exit->stats->hp;
2848	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	}
2849		3006
2850	$self->goto ($map, $x, $y);	3007	$self->goto ($map, $x, $y);
2851		3008
2852	# if exit is damned, update players death & WoR home-position	3009	# if exit is damned, update players death & WoR home-position
2853	$self->contr->savebed ($map, $x, $y)	3010	$self->contr->savebed ($map, $x, $y)
…		…
3078	=cut	3235	=cut
3079		3236
3080	sub cf::client::ext_msg($$@) {	3237	sub cf::client::ext_msg($$@) {
3081	my ($self, $type, @msg) = @_;	3238	my ($self, $type, @msg) = @_;
3082		3239
3083	if ($self->extcmd == 2) {
3084	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));	3240	$self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3085	} elsif ($self->extcmd == 1) { # TODO: remove
3086	push @msg, msgtype => "event_$type";
3087	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3088	}
3089	}	3241	}
3090		3242
3091	=item $client->ext_reply ($msgid, @msg)	3243	=item $client->ext_reply ($msgid, @msg)
3092		3244
3093	Sends an ext reply to the client.	3245	Sends an ext reply to the client.
…		…
3095	=cut	3247	=cut
3096		3248
3097	sub cf::client::ext_reply($$@) {	3249	sub cf::client::ext_reply($$@) {
3098	my ($self, $id, @msg) = @_;	3250	my ($self, $id, @msg) = @_;
3099		3251
3100	if ($self->extcmd == 2) {
3101	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));	3252	$self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3102	} elsif ($self->extcmd == 1) {
3103	#TODO: version 1, remove
3104	unshift @msg, msgtype => "reply", msgid => $id;
3105	$self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3106	}
3107	}	3253	}
3108		3254
3109	=item $success = $client->query ($flags, "text", \&cb)	3255	=item $success = $client->query ($flags, "text", \&cb)
3110		3256
3111	Queues a query to the client, calling the given callback with	3257	Queues a query to the client, calling the given callback with
…		…
3166	my ($ns, $buf) = @_;	3312	my ($ns, $buf) = @_;
3167		3313
3168	my $msg = eval { $ns->{json_coder}->decode ($buf) };	3314	my $msg = eval { $ns->{json_coder}->decode ($buf) };
3169		3315
3170	if (ref $msg) {	3316	if (ref $msg) {
3171	my ($type, $reply, @payload) =	3317	my ($type, $reply, @payload) = @$msg; # version 1 used %type, $id, %$hash
3172	"ARRAY" eq ref $msg
3173	? @$msg
3174	: ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3175		3318
3176	my @reply;	3319	my @reply;
3177		3320
3178	if (my $cb = $EXTICMD{$type}) {	3321	if (my $cb = $EXTICMD{$type}) {
3179	@reply = $cb->($ns, @payload);	3322	@reply = $cb->($ns, @payload);
…		…
3357	=cut	3500	=cut
3358		3501
3359	#############################################################################	3502	#############################################################################
3360	# the server's init and main functions	3503	# the server's init and main functions
3361		3504
3362	# async inc loader. yay.	3505	our %FACEHASH; # hash => idx, #d# HACK for http server
3363	sub inc_loader {
3364	my $mod = $_[1];
3365		3506
3366	if (in_main && !tick_inhibit) {	3507	# internal api, not fianlised
3367	Carp::cluck "ERROR: attempted synchronous perl module load ($mod)";	3508	sub add_face {
		3509	my ($name, $type, $data) = @_;
		3510
		3511	my $idx = cf::face::find $name;
		3512
		3513	if ($idx) {
		3514	delete $FACEHASH{cf::face::get_chksum $idx};
3368	} else {	3515	} else {
3369	debug "loading perl module $mod\n";	3516	$idx = cf::face::alloc $name;
3370	}	3517	}
3371		3518
3372	# 1. find real file	3519	my $hash = cf::face::mangle_chksum Digest::MD5::md5 $data;
3373	for my $dir (@ORIG_INC) {
3374	ref $dir and next;
3375	0 <= Coro::AIO::aio_load "$dir/$mod", my $data
3376	or next;
3377		3520
3378	$data = "#line 1 $dir/$mod\n$data";	3521	cf::face::set_type $idx, $type;
		3522	cf::face::set_data $idx, 0, $data, $hash;
		3523	cf::face::set_meta $idx, $type & 1 ? undef : undef;
		3524	$FACEHASH{$hash} = $idx;#d#
3379		3525
3380	open my $fh, "<", \$data or die;	3526	$idx
3381
3382	return $fh;
3383	}
3384
3385	()
3386	}
3387
3388	sub init_inc {
3389	# save original @INC
3390	@ORIG_INC = ($LIBDIR, @INC) unless @ORIG_INC;
3391
3392	# make sure we can do scalar-opens
3393	open my $dummy, "<", \my $dummy2;
3394
3395	# execute some stuff so perl load's some of the core modules
3396	/Ü/ =~ /ü/i;
3397	eval { &Storable::nstore_fd };
3398
3399	@INC = (\&inc_loader, @ORIG_INC); # @ORIG_INC is needed for DynaLoader, AutoLoad etc.
3400
3401	debug "module loading will be asynchronous from this point on.";
3402	}	3527	}
3403		3528
3404	sub load_facedata($) {	3529	sub load_facedata($) {
3405	my ($path) = @_;	3530	my ($path) = @_;
3406		3531
…		…
3410		3535
3411	my $enc = JSON::XS->new->utf8->canonical->relaxed;	3536	my $enc = JSON::XS->new->utf8->canonical->relaxed;
3412		3537
3413	trace "loading facedata from $path\n";	3538	trace "loading facedata from $path\n";
3414		3539
3415	my $facedata;	3540	my $facedata = decode_storable load_file $path;
3416	0 < aio_load $path, $facedata
3417	or die "$path: $!";
3418
3419	$facedata = Coro::Storable::thaw $facedata;
3420		3541
3421	$facedata->{version} == 2	3542	$facedata->{version} == 2
3422	or cf::cleanup "$path: version mismatch, cannot proceed.";	3543	or cf::cleanup "$path: version mismatch, cannot proceed.";
3423		3544
3424	# patch in the exptable
3425	my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3426	$facedata->{resource}{"res/exp_table"} = {
3427	type => FT_RSRC,
3428	data => $exp_table,
3429	hash => (Digest::MD5::md5 $exp_table),
3430	};
3431	cf::cede_to_tick;	3545	cf::cede_to_tick;
3432		3546
3433	{	3547	{
3434	my $faces = $facedata->{faceinfo};	3548	my $faces = $facedata->{faceinfo};
3435		3549
3436	while (my ($face, $info) = each %$faces) {	3550	for my $face (sort keys %$faces) {
		3551	my $info = $faces->{$face};
3437	my $idx = (cf::face::find $face) || cf::face::alloc $face;	3552	my $idx = (cf::face::find $face) || cf::face::alloc $face;
3438		3553
3439	cf::face::set_visibility $idx, $info->{visibility};	3554	cf::face::set_visibility $idx, $info->{visibility};
3440	cf::face::set_magicmap $idx, $info->{magicmap};	3555	cf::face::set_magicmap $idx, $info->{magicmap};
3441	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};	3556	cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3442	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};	3557	cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
		3558	cf::face::set_data $idx, 2, $info->{glyph} , $info->{glyph} ;
		3559	$FACEHASH{$info->{hash64}} = $idx;#d#
3443		3560
3444	cf::cede_to_tick;	3561	cf::cede_to_tick;
3445	}	3562	}
3446		3563
3447	while (my ($face, $info) = each %$faces) {	3564	while (my ($face, $info) = each %$faces) {
…		…
3474		3591
3475	{	3592	{
3476	my $res = $facedata->{resource};	3593	my $res = $facedata->{resource};
3477		3594
3478	while (my ($name, $info) = each %$res) {	3595	while (my ($name, $info) = each %$res) {
3479	if (defined $info->{type}) {	3596	if (defined (my $type = $info->{type})) {
		3597	# TODO: different hash - must free and use new index, or cache ixface data queue
3480	my $idx = (cf::face::find $name) || cf::face::alloc $name;	3598	my $idx = (cf::face::find $name) || cf::face::alloc $name;
3481		3599
		3600	cf::face::set_type $idx, $type;
3482	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};	3601	cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3483	cf::face::set_type $idx, $info->{type};	3602	cf::face::set_meta $idx, $type & 1 ? undef : $info->{meta}; # preserve meta unless prepended already
		3603	$FACEHASH{$info->{hash}} = $idx;#d#
3484	} else {	3604	} else {
3485	$RESOURCE{$name} = $info; # unused	3605	# $RESOURCE{$name} = $info; # unused
3486	}	3606	}
3487		3607
3488	cf::cede_to_tick;	3608	cf::cede_to_tick;
3489	}	3609	}
3490	}	3610	}
…		…
3508	my $status = load_resource_file_ $_[0];	3628	my $status = load_resource_file_ $_[0];
3509	get_slot 0.1, 100;	3629	get_slot 0.1, 100;
3510	cf::arch::commit_load;	3630	cf::arch::commit_load;
3511		3631
3512	$status	3632	$status
		3633	}
		3634
		3635	sub reload_exp_table {
		3636	_reload_exp_table;
		3637
		3638	add_face "res/exp_table" => FT_RSRC,
		3639	JSON::XS->new->utf8->canonical->encode (
		3640	[map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]
		3641	);
		3642	}
		3643
		3644	sub reload_materials {
		3645	_reload_materials;
3513	}	3646	}
3514		3647
3515	sub reload_regions {	3648	sub reload_regions {
3516	# HACK to clear player env face cache, we need some signal framework	3649	# HACK to clear player env face cache, we need some signal framework
3517	# for this (global event?)	3650	# for this (global event?)
…		…
3532	}	3665	}
3533		3666
3534	sub reload_archetypes {	3667	sub reload_archetypes {
3535	load_resource_file "$DATADIR/archetypes"	3668	load_resource_file "$DATADIR/archetypes"
3536	or die "unable to load archetypes\n";	3669	or die "unable to load archetypes\n";
		3670
		3671	add_face "res/skill_info" => FT_RSRC,
		3672	JSON::XS->new->utf8->canonical->encode (
		3673	[map [cf::arch::skillvec ($_)->name], 0 .. cf::arch::skillvec_size - 1]
		3674	);
		3675	add_face "res/spell_paths" => FT_RSRC,
		3676	JSON::XS->new->utf8->canonical->encode (
		3677	[map [cf::spellpathnames ($_)], 0 .. NRSPELLPATHS - 1]
		3678	);
3537	}	3679	}
3538		3680
3539	sub reload_treasures {	3681	sub reload_treasures {
3540	load_resource_file "$DATADIR/treasures"	3682	load_resource_file "$DATADIR/treasures"
3541	or die "unable to load treasurelists\n";	3683	or die "unable to load treasurelists\n";
3542	}	3684	}
3543		3685
3544	sub reload_sound {	3686	sub reload_sound {
3545	trace "loading sound config from $DATADIR/sound\n";	3687	trace "loading sound config from $DATADIR/sound\n";
3546		3688
3547	0 < Coro::AIO::aio_load "$DATADIR/sound", my $data
3548	or die "$DATADIR/sound $!";
3549
3550	my $soundconf = JSON::XS->new->utf8->relaxed->decode ($data);	3689	my $soundconf = JSON::XS->new->utf8->relaxed->decode (load_file "$DATADIR/sound");
3551		3690
3552	for (0 .. SOUND_CAST_SPELL_0 - 1) {	3691	for (0 .. SOUND_CAST_SPELL_0 - 1) {
3553	my $sound = $soundconf->{compat}[$_]	3692	my $sound = $soundconf->{compat}[$_]
3554	or next;	3693	or next;
3555		3694
…		…
3562	my $face = cf::face::find "sound/$v";	3701	my $face = cf::face::find "sound/$v";
3563	cf::sound::set $k => $face;	3702	cf::sound::set $k => $face;
3564	}	3703	}
3565	}	3704	}
3566		3705
		3706	sub reload_pod {
		3707	trace "loading pods $PODDIR\n";
		3708
		3709	my @command_help;
		3710
		3711	for (
		3712	[0, "command_help"],
		3713	[1, "emote_help"],
		3714	[2, "dmcommand_help"],
		3715	) {
		3716	my ($type, $path) = @$_;
		3717
		3718	my $paragraphs = &cf::pod::load_pod ("$PODDIR/$path.pod")
		3719	or die "unable to load $path";
		3720
		3721	my $level = 1e9;
		3722
		3723	for my $par (@$paragraphs) {
		3724	if ($par->{type} eq "head2") {
		3725	# this code taken almost verbatim from DC/Protocol.pm
		3726
		3727	if ($par->{markup} =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x) {
		3728	my $cmd = $1;
		3729	my @args = split /\|/, $2;
		3730	@args = (".*") unless @args;
		3731
		3732	$_ = $_ eq ".*" ? "" : " $_"
		3733	for @args;
		3734
		3735	my @variants = map "$cmd$_", sort { (length $a) <=> (length $b) } @args;
		3736
		3737	push @command_help, [$type, \@variants, &cf::pod::as_cfpod ([$par])];
		3738	$level = $par->{level};
		3739	} else {
		3740	error "$par->{markup}: unparsable command heading";
		3741	}
		3742	} elsif ($par->{level} > $level) {
		3743	$command_help[-1][2] .= &cf::pod::as_cfpod ([$par]);
		3744	}
		3745
		3746	cf::cede_to_tick;
		3747	}
		3748	}
		3749
		3750	@command_help = sort {
		3751	$a->[0] <=> $b->[0]
		3752	or $a->[1] cmp $b->[1]
		3753	} @command_help;
		3754
		3755	cf::cede_to_tick;
		3756
		3757	add_face "res/command_help" => FT_RSRC,
		3758	JSON::XS->new->utf8->encode (\@command_help);
		3759	}
		3760
3567	sub reload_resources {	3761	sub reload_resources {
3568	trace "reloading resource files...\n";	3762	trace "reloading resource files...\n";
3569		3763
		3764	reload_materials;
3570	reload_facedata;	3765	reload_facedata;
		3766	reload_exp_table;
3571	reload_sound;	3767	reload_sound;
3572	reload_archetypes;	3768	reload_archetypes;
3573	reload_regions;	3769	reload_regions;
3574	reload_treasures;	3770	reload_treasures;
		3771	reload_pod;
3575		3772
3576	trace "finished reloading resource files\n";	3773	trace "finished reloading resource files\n";
3577	}	3774	}
3578		3775
3579	sub reload_config {	3776	sub reload_config {
3580	trace "reloading config file...\n";	3777	trace "reloading config file...\n";
3581		3778
3582	open my $fh, "<:utf8", "$CONFDIR/config"	3779	my $config = load_file "$CONFDIR/config";
3583	or return;	3780	utf8::decode $config;
3584		3781	*CFG = decode_yaml $config;
3585	local $/;
3586	*CFG = YAML::XS::Load scalar <$fh>;
3587		3782
3588	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];	3783	$EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_104_115", 49, 38];
3589		3784
3590	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};	3785	$cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3591	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};	3786	$cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
…		…
3595	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"	3790	$CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3596	and die "WARNING: m(un)lockall failed: $!\n";	3791	and die "WARNING: m(un)lockall failed: $!\n";
3597	};	3792	};
3598	warn $@ if $@;	3793	warn $@ if $@;
3599	}	3794	}
3600
3601	trace "finished reloading resource files\n";
3602	}	3795	}
3603		3796
3604	sub pidfile() {	3797	sub pidfile() {
3605	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT	3798	sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3606	or die "$PIDFILE: $!";	3799	or die "$PIDFILE: $!";
…		…
3631		3824
3632	sub main {	3825	sub main {
3633	cf::init_globals; # initialise logging	3826	cf::init_globals; # initialise logging
3634		3827
3635	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;	3828	LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3636	LOG llevInfo, "Copyright (C) 2005-2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";	3829	LOG llevInfo, "Copyright (C) 2005-2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3637	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";	3830	LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3638	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";	3831	LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3639		3832
3640	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority	3833	$Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3641		3834
3642	# we must not ever block the main coroutine	3835	# we must not ever block the main coroutine
3643	local $Coro::idle = sub {	3836	$Coro::idle = sub {
3644	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#	3837	Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3645	(async {	3838	(async {
3646	$Coro::current->{desc} = "IDLE BUG HANDLER";	3839	$Coro::current->{desc} = "IDLE BUG HANDLER";
3647	EV::loop EV::LOOP_ONESHOT;	3840	EV::loop EV::LOOP_ONESHOT;
3648	})->prio (Coro::PRIO_MAX);	3841	})->prio (Coro::PRIO_MAX);
3649	};	3842	};
3650		3843
3651	evthread_start IO::AIO::poll_fileno;	3844	evthread_start IO::AIO::poll_fileno;
3652		3845
3653	cf::sync_job {	3846	cf::sync_job {
		3847	cf::incloader::init ();
		3848
3654	init_inc;	3849	db_init;
3655		3850
3656	cf::init_experience;
3657	cf::init_anim;	3851	cf::init_anim;
3658	cf::init_attackmess;	3852	cf::init_attackmess;
3659	cf::init_dynamic;	3853	cf::init_dynamic;
3660		3854
3661	cf::load_settings;	3855	cf::load_settings;
3662	cf::load_materials;
3663		3856
3664	reload_resources;	3857	reload_resources;
3665	reload_config;	3858	reload_config;
3666	db_init;
3667		3859
3668	cf::init_uuid;	3860	cf::init_uuid;
3669	cf::init_signals;	3861	cf::init_signals;
3670	cf::init_skills;	3862	cf::init_skills;
3671		3863
…		…
3679		3871
3680	# no (long-running) fork's whatsoever before this point(!)	3872	# no (long-running) fork's whatsoever before this point(!)
3681	use POSIX ();	3873	use POSIX ();
3682	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};	3874	POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3683		3875
3684	(pop @POST_INIT)->(0) while @POST_INIT;	3876	cf::_post_init 0;
3685	};	3877	};
3686		3878
3687	cf::object::thawer::errors_are_fatal 0;	3879	cf::object::thawer::errors_are_fatal 0;
3688	info "parse errors in files are no longer fatal from this point on.\n";	3880	info "parse errors in files are no longer fatal from this point on.\n";
3689		3881
3690	my $free_main; $free_main = EV::idle sub {	3882	AE::postpone {
3691	undef $free_main;
3692	undef &main; # free gobs of memory :)	3883	undef &main; # free gobs of memory :)
3693	};	3884	};
3694		3885
3695	goto &main_loop;	3886	goto &main_loop;
3696	}	3887	}
…		…
3853		4044
3854	cf::write_runtime_sync; # external watchdog should not bark	4045	cf::write_runtime_sync; # external watchdog should not bark
3855		4046
3856	trace "emergency_perl_save: flushing outstanding aio requests";	4047	trace "emergency_perl_save: flushing outstanding aio requests";
3857	while (IO::AIO::nreqs || BDB::nreqs) {	4048	while (IO::AIO::nreqs || BDB::nreqs) {
3858	Coro::EV::timer_once 0.01; # let the sync_job do it's thing	4049	Coro::AnyEvent::sleep 0.01; # let the sync_job do it's thing
3859	}	4050	}
3860		4051
3861	cf::write_runtime_sync; # external watchdog should not bark	4052	cf::write_runtime_sync; # external watchdog should not bark
3862	};	4053	};
3863		4054
…		…
3901	}	4092	}
3902	}	4093	}
3903		4094
3904	sub do_reload_perl() {	4095	sub do_reload_perl() {
3905	# can/must only be called in main	4096	# can/must only be called in main
3906	if (in_main) {	4097	unless (in_main) {
3907	error "can only reload from main coroutine";	4098	error "can only reload from main coroutine";
3908	return;	4099	return;
3909	}	4100	}
3910		4101
3911	return if $RELOAD++;	4102	return if $RELOAD++;
3912		4103
3913	my $t1 = AE::time;	4104	my $t1 = AE::time;
3914		4105
3915	while ($RELOAD) {	4106	while ($RELOAD) {
		4107	cf::get_slot 0.1, -1, "reload_perl";
3916	info "reloading...";	4108	info "perl_reload: reloading...";
3917		4109
3918	trace "entering sync_job";	4110	trace "perl_reload: entering sync_job";
3919		4111
3920	cf::sync_job {	4112	cf::sync_job {
3921	cf::emergency_save;	4113	#cf::emergency_save;
3922		4114
3923	trace "cancelling all extension coros";	4115	trace "perl_reload: cancelling all extension coros";
3924	$_->cancel for values %EXT_CORO;	4116	$_->cancel for values %EXT_CORO;
3925	%EXT_CORO = ();	4117	%EXT_CORO = ();
3926		4118
3927	trace "removing commands";	4119	trace "perl_reload: removing commands";
3928	%COMMAND = ();	4120	%COMMAND = ();
3929		4121
3930	trace "removing ext/exti commands";	4122	trace "perl_reload: removing ext/exti commands";
3931	%EXTCMD = ();	4123	%EXTCMD = ();
3932	%EXTICMD = ();	4124	%EXTICMD = ();
3933		4125
3934	trace "unloading/nuking all extensions";	4126	trace "perl_reload: unloading/nuking all extensions";
3935	for my $pkg (@EXTS) {	4127	for my $pkg (@EXTS) {
3936	trace "... unloading $pkg";	4128	trace "... unloading $pkg";
3937		4129
3938	if (my $cb = $pkg->can ("unload")) {	4130	if (my $cb = $pkg->can ("unload")) {
3939	eval {	4131	eval {
…		…
3944		4136
3945	trace "... clearing $pkg";	4137	trace "... clearing $pkg";
3946	clear_package $pkg;	4138	clear_package $pkg;
3947	}	4139	}
3948		4140
3949	trace "unloading all perl modules loaded from $LIBDIR";	4141	trace "perl_reload: unloading all perl modules loaded from $LIBDIR";
3950	while (my ($k, $v) = each %INC) {	4142	while (my ($k, $v) = each %INC) {
3951	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;	4143	next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3952		4144
3953	trace "... unloading $k";	4145	trace "... unloading $k";
3954	delete $INC{$k};	4146	delete $INC{$k};
…		…
3961	}	4153	}
3962		4154
3963	clear_package $k;	4155	clear_package $k;
3964	}	4156	}
3965		4157
3966	trace "getting rid of safe::, as good as possible";	4158	trace "perl_reload: getting rid of safe::, as good as possible";
3967	clear_package "safe::$_"	4159	clear_package "safe::$_"
3968	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);	4160	for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3969		4161
3970	trace "unloading cf.pm \"a bit\"";	4162	trace "perl_reload: unloading cf.pm \"a bit\"";
3971	delete $INC{"cf.pm"};	4163	delete $INC{"cf.pm"};
3972	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;	4164	delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3973		4165
3974	# don't, removes xs symbols, too,	4166	# don't, removes xs symbols, too,
3975	# and global variables created in xs	4167	# and global variables created in xs
3976	#clear_package __PACKAGE__;	4168	#clear_package __PACKAGE__;
3977		4169
3978	info "unload completed, starting to reload now";	4170	info "perl_reload: unload completed, starting to reload now";
3979		4171
3980	trace "reloading cf.pm";	4172	trace "perl_reload: reloading cf.pm";
3981	require cf;	4173	require cf;
3982	cf::_connect_to_perl_1;	4174	cf::_connect_to_perl_1;
3983		4175
3984	trace "loading config and database again";	4176	trace "perl_reload: loading config and database again";
3985	cf::reload_config;	4177	cf::reload_config;
3986		4178
3987	trace "loading extensions";	4179	trace "perl_reload: loading extensions";
3988	cf::load_extensions;	4180	cf::load_extensions;
3989		4181
3990	if ($REATTACH_ON_RELOAD) {	4182	if ($REATTACH_ON_RELOAD) {
3991	trace "reattaching attachments to objects/players";	4183	trace "perl_reload: reattaching attachments to objects/players";
3992	_global_reattach; # objects, sockets	4184	_global_reattach; # objects, sockets
3993	trace "reattaching attachments to maps";	4185	trace "perl_reload: reattaching attachments to maps";
3994	reattach $_ for values %MAP;	4186	reattach $_ for values %MAP;
3995	trace "reattaching attachments to players";	4187	trace "perl_reload: reattaching attachments to players";
3996	reattach $_ for values %PLAYER;	4188	reattach $_ for values %PLAYER;
3997	}	4189	}
3998		4190
3999	trace "running post_init jobs";	4191	cf::_post_init 1;
4000	(pop @POST_INIT)->(1) while @POST_INIT;
4001		4192
4002	trace "leaving sync_job";	4193	trace "perl_reload: leaving sync_job";
4003		4194
4004	1	4195	1
4005	} or do {	4196	} or do {
4006	error $@;	4197	error $@;
4007	cf::cleanup "error while reloading, exiting.";	4198	cf::cleanup "perl_reload: error, exiting.";
4008	};	4199	};
4009		4200
4010	info "reloaded";
4011	--$RELOAD;	4201	--$RELOAD;
4012	}	4202	}
4013		4203
4014	$t1 = AE::time - $t1;	4204	$t1 = AE::time - $t1;
4015	info "reload completed in ${t1}s\n";	4205	info "perl_reload: completed in ${t1}s\n";
4016	};	4206	};
4017		4207
4018	our $RELOAD_WATCHER; # used only during reload	4208	our $RELOAD_WATCHER; # used only during reload
4019		4209
4020	sub reload_perl() {	4210	sub reload_perl() {
…		…
4045		4235
4046	#############################################################################	4236	#############################################################################
4047		4237
4048	my $bug_warning = 0;	4238	my $bug_warning = 0;
4049		4239
4050	our @WAIT_FOR_TICK;
4051	our @WAIT_FOR_TICK_BEGIN;
4052
4053	sub wait_for_tick {	4240	sub wait_for_tick() {
4054	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4241	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4055		4242
4056	my $signal = new Coro::Signal;	4243	$WAIT_FOR_TICK->wait;
4057	push @WAIT_FOR_TICK, $signal;
4058	$signal->wait;
4059	}	4244	}
4060		4245
4061	sub wait_for_tick_begin {	4246	sub wait_for_tick_begin() {
4062	return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;	4247	return Coro::AnyEvent::poll if tick_inhibit || $Coro::current == $Coro::main;
4063		4248
4064	my $signal = new Coro::Signal;	4249	my $signal = new Coro::Signal;
4065	push @WAIT_FOR_TICK_BEGIN, $signal;	4250	push @WAIT_FOR_TICK_BEGIN, $signal;
4066	$signal->wait;	4251	$signal->wait;
4067	}	4252	}
…		…
4071	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"	4256	Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
4072	unless ++$bug_warning > 10;	4257	unless ++$bug_warning > 10;
4073	return;	4258	return;
4074	}	4259	}
4075		4260
4076	cf::server_tick; # one server iteration	4261	cf::one_tick; # one server iteration
4077		4262
4078	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#	4263	#for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
4079		4264
4080	if ($NOW >= $NEXT_RUNTIME_WRITE) {	4265	if ($NOW >= $NEXT_RUNTIME_WRITE) {
4081	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;	4266	$NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
…		…
4087	}	4272	}
4088		4273
4089	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {	4274	if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
4090	$sig->send;	4275	$sig->send;
4091	}	4276	}
4092	while (my $sig = shift @WAIT_FOR_TICK) {	4277	$WAIT_FOR_TICK->broadcast;
4093	$sig->send;
4094	}
4095		4278
4096	$LOAD = ($NOW - $TICK_START) / $TICK;	4279	$LOAD = ($NOW - $TICK_START) / $TICK;
4097	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;	4280	$LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
4098		4281
4099	if (0) {	4282	if (0) {
…		…
4105	}	4288	}
4106	}	4289	}
4107		4290
4108	{	4291	{
4109	# configure BDB	4292	# configure BDB
		4293	info "initialising database";
4110		4294
4111	BDB::min_parallel 16;	4295	BDB::min_parallel 16;
4112	BDB::max_poll_reqs $TICK * 0.1;	4296	BDB::max_poll_reqs $TICK * 0.1;
4113	$AnyEvent::BDB::WATCHER->priority (1);	4297	#$AnyEvent::BDB::WATCHER->priority (1);
4114		4298
4115	unless ($DB_ENV) {	4299	unless ($DB_ENV) {
4116	$DB_ENV = BDB::db_env_create;	4300	$DB_ENV = BDB::db_env_create;
4117	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);	4301	$DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4118	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;	4302	$DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
…		…
4143	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };	4327	BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4144	};	4328	};
4145	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {	4329	$BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4146	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };	4330	BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4147	};	4331	};
		4332
		4333	info "database initialised";
4148	}	4334	}
4149		4335
4150	{	4336	{
4151	# configure IO::AIO	4337	# configure IO::AIO
4152		4338
		4339	info "initialising aio";
4153	IO::AIO::min_parallel 8;	4340	IO::AIO::min_parallel 8;
4154	IO::AIO::max_poll_time $TICK * 0.1;	4341	IO::AIO::max_poll_time $TICK * 0.1;
4155	undef $AnyEvent::AIO::WATCHER;	4342	undef $AnyEvent::AIO::WATCHER;
		4343	info "aio initialised";
4156	}	4344	}
4157		4345
4158	my $_log_backtrace;	4346	our $_log_backtrace;
		4347	our $_log_backtrace_last;
4159		4348
4160	sub _log_backtrace {	4349	sub _log_backtrace {
4161	my ($msg, @addr) = @_;	4350	my ($msg, @addr) = @_;
4162		4351
4163	$msg =~ s/\n//;	4352	$msg =~ s/\n$//;
4164		4353
		4354	if ($_log_backtrace_last eq $msg) {
		4355	LOG llevInfo, "[ABT] $msg\n";
		4356	LOG llevInfo, "[ABT] [duplicate, suppressed]\n";
4165	# limit the # of concurrent backtraces	4357	# limit the # of concurrent backtraces
4166	if ($_log_backtrace < 2) {	4358	} elsif ($_log_backtrace < 2) {
		4359	$_log_backtrace_last = $msg;
4167	++$_log_backtrace;	4360	++$_log_backtrace;
4168	my $perl_bt = Carp::longmess $msg;	4361	my $perl_bt = Carp::longmess $msg;
4169	async {	4362	async {
4170	$Coro::current->{desc} = "abt $msg";	4363	$Coro::current->{desc} = "abt $msg";
4171		4364
…		…
4191	LOG llevInfo, "[ABT] $_\n" for @bt;	4384	LOG llevInfo, "[ABT] $_\n" for @bt;
4192	--$_log_backtrace;	4385	--$_log_backtrace;
4193	};	4386	};
4194	} else {	4387	} else {
4195	LOG llevInfo, "[ABT] $msg\n";	4388	LOG llevInfo, "[ABT] $msg\n";
4196	LOG llevInfo, "[ABT] [suppressed]\n";	4389	LOG llevInfo, "[ABT] [overload, suppressed]\n";
4197	}	4390	}
4198	}	4391	}
4199		4392
4200	# load additional modules	4393	# load additional modules
4201	require "cf/$_.pm" for @EXTRA_MODULES;	4394	require "cf/$_.pm" for @EXTRA_MODULES;

Diff Legend

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