Skip to content

GitLab

Commit a1e2170a authored by Mark Andrews's avatar Mark Andrews
Browse files
Options

2250. [func] New flag 'memstatistics' to state whether the 

                        memory statistics file should be written or not.
                        Additionally named's -m option will cause the
                        statistics file to be written. [RT #17113]
parent 05d2776f
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 54 deletions
CHANGES
View file @ a1e2170a
2251. [placeholder]
2250. [func] New flag 'memstatistics' to state whether the
memory statistics file should be written or not.
Additionally named's -m option will cause the
statistics file to be written. [RT #17113]
2249. [bug] Only set Authentic Data bit if client requested
DNSSEC, per RFC 3655 [RT #17175]
......
bin/named/include/named/globals.h
View file @ a1e2170a
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: globals.h,v 1.72 2007/06/19 23:46:59 tbox Exp $ */
/* $Id: globals.h,v 1.73 2007/09/26 03:22:43 marka Exp $ */
#ifndef NAMED_GLOBALS_H
#define NAMED_GLOBALS_H 1
......@@ -114,6 +114,7 @@ EXTERN const char * ns_g_username INIT(NULL);
EXTERN int ns_g_listen INIT(3);
EXTERN isc_time_t ns_g_boottime;
EXTERN isc_boolean_t ns_g_memstatistics INIT(ISC_FALSE);
#undef EXTERN
#undef INIT
......
bin/named/main.c
View file @ a1e2170a
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: main.c,v 1.157 2007/06/18 23:47:18 tbox Exp $ */
/* $Id: main.c,v 1.158 2007/09/26 03:22:43 marka Exp $ */
/*! \file */
......@@ -912,7 +912,8 @@ main(int argc, char *argv[]) {
isc_mem_stats(ns_g_mctx, stdout);
isc_mutex_stats(stdout);
}
if (memstats != NULL) {
if (ns_g_memstatistics && memstats != NULL) {
FILE *fp = NULL;
result = isc_stdio_open(memstats, "w", &fp);
if (result == ISC_R_SUCCESS) {
......
bin/named/server.c
View file @ a1e2170a
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: server.c,v 1.490 2007/09/12 01:09:07 each Exp $ */
/* $Id: server.c,v 1.491 2007/09/26 03:22:43 marka Exp $ */
/*! \file */
......@@ -3432,8 +3432,17 @@ load_configuration(const char *filename, ns_server_t *server,
obj = NULL;
if (options != NULL &&
cfg_map_get(options, "memstatistics-file", &obj) == ISC_R_SUCCESS)
cfg_map_get(options, "memstatistics", &obj) == ISC_R_SUCCESS)
ns_g_memstatistics = cfg_obj_asboolean(obj);
else
ns_g_memstatistics =
ISC_TF((isc_mem_debugging & ISC_MEM_DEBUGRECORD) != 0);
obj = NULL;
if (ns_config_get(maps, "memstatistics-file", &obj) == ISC_R_SUCCESS)
ns_main_setmemstats(cfg_obj_asstring(obj));
else if (ns_g_memstatistics)
ns_main_setmemstats("named.memstats");
else
ns_main_setmemstats(NULL);
......
bin/tests/system/cacheclean/clean.sh
View file @ a1e2170a
......@@ -15,11 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:00 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:43 marka Exp $
#
# Clean up after cache cleaner tests.
#
rm -f dig.out.ns2
rm -f */named.memstats
bin/tests/system/checknames/clean.sh
View file @ a1e2170a
......@@ -14,10 +14,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:01 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:43 marka Exp $
rm -f dig.out.ns?.test*
rm -f nsupdate.out.test*
rm -f ns1/*.example.db
rm -f ns1/*.update.db
rm -f ns1/*.update.db.jnl
rm -f */named.memstats
bin/tests/system/dlv/clean.sh
View file @ a1e2170a
......@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.4 2007/06/19 23:47:02 tbox Exp $
# $Id: clean.sh,v 1.5 2007/09/26 03:22:43 marka Exp $
rm -f random.data
rm -f ns*/named.run
......@@ -25,3 +25,4 @@ rm -f ns3/dlvset-*
rm -f ns3/dsset-*
rm -f ns3/keyset-*
rm -f ns3/trusted.conf ns5/trusted.conf
rm -f */named.memstats
bin/tests/system/dnssec/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.19 2007/06/19 23:47:02 tbox Exp $
# $Id: clean.sh,v 1.20 2007/09/26 03:22:43 marka Exp $
rm -f */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp*
rm -f ns1/root.db ns2/example.db ns3/secure.example.db
......@@ -25,4 +25,4 @@ rm -f ns2/private.secure.example.db
rm -f */example.bk
rm -f dig.out.*
rm -f random.data
rm -f ns2/dlv.db
rm -f */named.memstats
bin/tests/system/forward/clean.sh
View file @ a1e2170a
......@@ -13,9 +13,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:02 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:43 marka Exp $
#
# Clean up after forward tests.
#
rm -f dig.out.*
rm -f */named.memstats
bin/tests/system/glue/clean.sh
View file @ a1e2170a
......@@ -15,10 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.8 2007/06/19 23:47:03 tbox Exp $
# $Id: clean.sh,v 1.9 2007/09/26 03:22:43 marka Exp $
#
# Clean up after glue tests.
#
rm -f dig.out ns1/cache
rm -f */named.memstats
bin/tests/system/ixfr/clean.sh
View file @ a1e2170a
......@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:03 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:43 marka Exp $
rm -f ns1/named.conf ns1/myftp.db
rm -f */named.memstats
bin/tests/system/limits/clean.sh
View file @ a1e2170a
......@@ -15,10 +15,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.10 2007/06/19 23:47:03 tbox Exp $
# $Id: clean.sh,v 1.11 2007/09/26 03:22:44 marka Exp $
#
# Clean up after limits tests.
#
rm -f dig.out.*
rm -f */named.memstats
bin/tests/system/masterfile/clean.sh
View file @ a1e2170a
......@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.4 2007/06/19 23:47:04 tbox Exp $
# $Id: clean.sh,v 1.5 2007/09/26 03:22:44 marka Exp $
rm -f dig.out
rm -f */named.memstats
bin/tests/system/masterformat/clean.sh
View file @ a1e2170a
......@@ -14,9 +14,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.4 2007/06/19 23:47:04 tbox Exp $
# $Id: clean.sh,v 1.5 2007/09/26 03:22:44 marka Exp $
rm -f named-compilezone
rm -f ns1/example.db.raw
rm -f ns2/example.db
rm -f dig.out.*
rm -f */named.memstats
bin/tests/system/notify/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.11 2007/06/19 23:47:04 tbox Exp $
# $Id: clean.sh,v 1.12 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer tests.
......@@ -23,4 +23,4 @@
rm -f ns3/example.bk dig.out.ns2 dig.out.ns3
rm -f ns2/example.db
rm -f */named.memstats
bin/tests/system/nsupdate/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.11 2007/06/19 23:47:04 tbox Exp $
# $Id: clean.sh,v 1.12 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer tests.
......@@ -25,7 +25,4 @@ rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1.after ns1/*.jnl ns2/*.jnl \
ns1/example.db ns1/update.db
rm -f ns2/example.bk
rm -f ns2/update.bk
rm -f */named.memstats
bin/tests/system/relay/clean.sh
View file @ a1e2170a
......@@ -15,11 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:04 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
#
# Clean up after relay transfer tests.
#
rm -f ns3/example.bk ns4/example.bk dig.out.ns2 dig.out.ns3 dig.out.ns4
rm -f */named.memstats
bin/tests/system/rrsetorder/clean.sh
View file @ a1e2170a
......@@ -14,9 +14,9 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:05 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
rm -f dig.out.cyclic dig.out.fixed dig.out.random
rm -f ns2/root.bk
rm -f ns?/named.run ns?/named.core
rm -f */named.memstats
bin/tests/system/sortlist/clean.sh
View file @ a1e2170a
......@@ -15,9 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.6 2007/06/19 23:47:05 tbox Exp $
# $Id: clean.sh,v 1.7 2007/09/26 03:22:44 marka Exp $
rm -f *.dig *.good
rm -f */named.memstats
bin/tests/system/stress/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:05 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
rm -f reload.pid
......@@ -26,3 +26,4 @@ rm -f ns1/delegations.db
rm -f ns2/zone0*.db
rm -f ns2/zone0*.jnl
rm -f */named.memstats
bin/tests/system/stub/clean.sh
View file @ a1e2170a
......@@ -15,10 +15,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.9 2007/06/19 23:47:05 tbox Exp $
# $Id: clean.sh,v 1.10 2007/09/26 03:22:44 marka Exp $
#
# Clean up after stub tests.
#
rm -f dig.out.ns3 ns3/child.example.st
rm -f */named.memstats
bin/tests/system/tkey/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,8 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
rm -f dig.out.* random.data ns1/named.conf
rm -f K* ns1/K*
rm -f */named.memstats
bin/tests/system/tsig/clean.sh
View file @ a1e2170a
......@@ -14,10 +14,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
#
# Clean up after tsig tests.
#
rm -f dig.out.*
rm -f */named.memstats
bin/tests/system/unknown/clean.sh
View file @ a1e2170a
......@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.6 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.7 2007/09/26 03:22:44 marka Exp $
rm -f dig.out
rm -f */named.memstats
bin/tests/system/upforwd/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.8 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.9 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer tests.
......@@ -23,7 +23,4 @@
rm -f dig.out.ns1 dig.out.ns2 dig.out.ns1 dig.out.ns3 dig.out.ns1.after
rm -f ns1/*.jnl ns2/*.jnl ns3/*.jnl ns1/example.db ns2/*.bk ns3/*.bk
rm -f */named.memstats
bin/tests/system/v6synth/clean.sh
View file @ a1e2170a
......@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.4 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.5 2007/09/26 03:22:44 marka Exp $
rm -f *.out
rm -f */named.memstats
bin/tests/system/views/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.13 2007/06/19 23:47:06 tbox Exp $
# $Id: clean.sh,v 1.14 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer tests.
......@@ -23,4 +23,4 @@
rm -f ns3/example.bk dig.out.ns?.?
rm -f ns2/named.conf ns2/example.db ns3/named.conf ns3/internal.bk
rm -f */named.memstats
bin/tests/system/xfer/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.13 2007/06/19 23:47:07 tbox Exp $
# $Id: clean.sh,v 1.14 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer tests.
......@@ -24,3 +24,4 @@
rm -f dig.out.ns2 dig.out.ns3
rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl
rm -f ns3/example.bk ns3/tsigzone.bk ns3/example.bk.jnl
rm -f */named.memstats
bin/tests/system/xferquota/clean.sh
View file @ a1e2170a
......@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.13 2007/06/19 23:47:07 tbox Exp $
# $Id: clean.sh,v 1.14 2007/09/26 03:22:44 marka Exp $
#
# Clean up after zone transfer quota tests.
......@@ -25,3 +25,4 @@ rm -f ns1/zone*.example.db ns1/zones.conf
rm -f ns2/zone*.example.bk ns2/zones.conf
rm -f dig.out.* ns2/changing.bk
rm -f ns1/changing.db
rm -f */named.memstats
bin/tests/system/zonechecks/clean.sh
View file @ a1e2170a
......@@ -14,6 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
# $Id: clean.sh,v 1.5 2007/06/19 23:47:07 tbox Exp $
# $Id: clean.sh,v 1.6 2007/09/26 03:22:44 marka Exp $
rm -f *.out
rm -f */named.memstats
doc/arm/Bv9ARM-book.xml
View file @ a1e2170a
......@@ -18,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE.
-->
<!-- File: $Id: Bv9ARM-book.xml,v 1.337 2007/09/18 00:22:30 marka Exp $ -->
<!-- File: $Id: Bv9ARM-book.xml,v 1.338 2007/09/26 03:22:44 marka Exp $ -->
<book xmlns:xi="http://www.w3.org/2001/XInclude">
<title>BIND 9 Administrator Reference Manual</title>
......@@ -4425,6 +4425,7 @@ category notify { null; };
<optional> tkey-dhkey <replaceable>key_name</replaceable> <replaceable>key_tag</replaceable>; </optional>
<optional> cache-file <replaceable>path_name</replaceable>; </optional>
<optional> dump-file <replaceable>path_name</replaceable>; </optional>
<optional> memstatistics <replaceable>yes_or_no</replaceable>; </optional>
<optional> memstatistics-file <replaceable>path_name</replaceable>; </optional>
<optional> pid-file <replaceable>path_name</replaceable>; </optional>
<optional> recursing-file <replaceable>path_name</replaceable>; </optional>
......@@ -4719,8 +4720,7 @@ category notify { null; };
<para>
The pathname of the file the server writes memory
usage statistics to on exit. If not specified,
the default is
<filename>named.memstats</filename>.
the default is <filename>named.memstats</filename>.
</para>
</listitem>
</varlistentry>
......@@ -4932,6 +4932,19 @@ options {
</listitem>
</varlistentry>
<varlistentry>
<term><command>memstatistics</command></term>
<listitem>
<para>
Write memory statistics to the file specfied by
<command>memstatistics-file</command> at exit.
The default is <userinput>no</userinput> unless
'-m record' is specified on the command line in
which case it is <userinput>yes</userinput>.
</para>
</listitem>
</varlistentry>
<varlistentry>
<term><command>dialup</command></term>
<listitem>
......
lib/isccfg/namedconf.c
View file @ a1e2170a
......@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
/* $Id: namedconf.c,v 1.77 2007/09/18 00:22:31 marka Exp $ */
/* $Id: namedconf.c,v 1.78 2007/09/26 03:22:45 marka Exp $ */
/*! \file */
......@@ -630,6 +630,7 @@ options_clauses[] = {
{ "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
{ "match-mapped-addresses", &cfg_type_boolean, 0 },
{ "memstatistics-file", &cfg_type_qstring, 0 },
{ "memstatistics", &cfg_type_boolean, 0 },
{ "multiple-cnames", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
{ "named-xfer", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
{ "pid-file", &cfg_type_qstringornone, 0 },
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment