mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 22:15:20 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
memory statistics file should be written or not.
                        Additionally named's -m option will cause the
                        statistics file to be written. [RT #17113]
This commit is contained in:
Mark Andrews
2007-09-26 03:22:45 +00:00
parent 05d2776f6f
commit a1e2170ad5
32 changed files with 93 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGES
View File

@@ -1,3 +1,10 @@
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 2249. [bug] Only set Authentic Data bit if client requested
DNSSEC, per RFC 3655 [RT #17175] DNSSEC, per RFC 3655 [RT #17175]

3
bin/named/include/named/globals.h
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 #ifndef NAMED_GLOBALS_H
#define NAMED_GLOBALS_H 1 #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 int ns_g_listen INIT(3);
EXTERN isc_time_t ns_g_boottime; EXTERN isc_time_t ns_g_boottime;
EXTERN isc_boolean_t ns_g_memstatistics INIT(ISC_FALSE);
#undef EXTERN #undef EXTERN
#undef INIT #undef INIT

5
bin/named/main.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
@@ -912,7 +912,8 @@ main(int argc, char *argv[]) {
isc_mem_stats(ns_g_mctx, stdout); isc_mem_stats(ns_g_mctx, stdout);
isc_mutex_stats(stdout); isc_mutex_stats(stdout);
} }
if (memstats != NULL) {
if (ns_g_memstatistics && memstats != NULL) {
FILE *fp = NULL; FILE *fp = NULL;
result = isc_stdio_open(memstats, "w", &fp); result = isc_stdio_open(memstats, "w", &fp);
if (result == ISC_R_SUCCESS) { if (result == ISC_R_SUCCESS) {

13
bin/named/server.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
@@ -3432,8 +3432,17 @@ load_configuration(const char *filename, ns_server_t *server,
obj = NULL; obj = NULL;
if (options != 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)); ns_main_setmemstats(cfg_obj_asstring(obj));
else if (ns_g_memstatistics)
ns_main_setmemstats("named.memstats");
else else
ns_main_setmemstats(NULL); ns_main_setmemstats(NULL);

4
bin/tests/system/cacheclean/clean.sh
View File

@@ -15,11 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after cache cleaner tests.
# #
rm -f dig.out.ns2 rm -f dig.out.ns2
rm -f */named.memstats

3
bin/tests/system/checknames/clean.sh
View File

@@ -14,10 +14,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 dig.out.ns?.test*
rm -f nsupdate.out.test* rm -f nsupdate.out.test*
rm -f ns1/*.example.db rm -f ns1/*.example.db
rm -f ns1/*.update.db rm -f ns1/*.update.db
rm -f ns1/*.update.db.jnl rm -f ns1/*.update.db.jnl
rm -f */named.memstats

3
bin/tests/system/dlv/clean.sh
View File

@@ -14,7 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 random.data
rm -f ns*/named.run rm -f ns*/named.run
@@ -25,3 +25,4 @@ rm -f ns3/dlvset-*
rm -f ns3/dsset-* rm -f ns3/dsset-*
rm -f ns3/keyset-* rm -f ns3/keyset-*
rm -f ns3/trusted.conf ns5/trusted.conf rm -f ns3/trusted.conf ns5/trusted.conf
rm -f */named.memstats

4
bin/tests/system/dnssec/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 */K* */keyset-* */dsset-* */dlvset-* */signedkey-* */*.signed */trusted.conf */tmp*
rm -f ns1/root.db ns2/example.db ns3/secure.example.db 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 */example.bk
rm -f dig.out.* rm -f dig.out.*
rm -f random.data rm -f random.data
rm -f ns2/dlv.db rm -f */named.memstats

3
bin/tests/system/forward/clean.sh
View File

@@ -13,9 +13,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after forward tests.
# #
rm -f dig.out.* rm -f dig.out.*
rm -f */named.memstats

3
bin/tests/system/glue/clean.sh
View File

@@ -15,10 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after glue tests.
# #
rm -f dig.out ns1/cache rm -f dig.out ns1/cache
rm -f */named.memstats

3
bin/tests/system/ixfr/clean.sh
View File

@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 ns1/named.conf ns1/myftp.db
rm -f */named.memstats

4
bin/tests/system/limits/clean.sh
View File

@@ -15,10 +15,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after limits tests.
# #
rm -f dig.out.* rm -f dig.out.*
rm -f */named.memstats

3
bin/tests/system/masterfile/clean.sh
View File

@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 dig.out
rm -f */named.memstats

3
bin/tests/system/masterformat/clean.sh
View File

@@ -14,9 +14,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 named-compilezone
rm -f ns1/example.db.raw rm -f ns1/example.db.raw
rm -f ns2/example.db rm -f ns2/example.db
rm -f dig.out.* rm -f dig.out.*
rm -f */named.memstats

4
bin/tests/system/notify/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after zone transfer tests.
@@ -23,4 +23,4 @@
rm -f ns3/example.bk dig.out.ns2 dig.out.ns3 rm -f ns3/example.bk dig.out.ns2 dig.out.ns3
rm -f ns2/example.db rm -f ns2/example.db
rm -f */named.memstats

7
bin/tests/system/nsupdate/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # 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 ns1/example.db ns1/update.db
rm -f ns2/example.bk rm -f ns2/example.bk
rm -f ns2/update.bk rm -f ns2/update.bk
rm -f */named.memstats

4
bin/tests/system/relay/clean.sh
View File

@@ -15,11 +15,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # 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 ns3/example.bk ns4/example.bk dig.out.ns2 dig.out.ns3 dig.out.ns4
rm -f */named.memstats

4
bin/tests/system/rrsetorder/clean.sh
View File

@@ -14,9 +14,9 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 dig.out.cyclic dig.out.fixed dig.out.random
rm -f ns2/root.bk rm -f ns2/root.bk
rm -f ns?/named.run ns?/named.core rm -f ns?/named.run ns?/named.core
rm -f */named.memstats

6
bin/tests/system/sortlist/clean.sh
View File

@@ -15,9 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 *.dig *.good
rm -f */named.memstats

3
bin/tests/system/stress/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 rm -f reload.pid
@@ -26,3 +26,4 @@ rm -f ns1/delegations.db
rm -f ns2/zone0*.db rm -f ns2/zone0*.db
rm -f ns2/zone0*.jnl rm -f ns2/zone0*.jnl
rm -f */named.memstats

4
bin/tests/system/stub/clean.sh
View File

@@ -15,10 +15,10 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after stub tests.
# #
rm -f dig.out.ns3 ns3/child.example.st rm -f dig.out.ns3 ns3/child.example.st
rm -f */named.memstats

3
bin/tests/system/tkey/clean.sh
View File

@@ -15,7 +15,8 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 dig.out.* random.data ns1/named.conf
rm -f K* ns1/K* rm -f K* ns1/K*
rm -f */named.memstats

3
bin/tests/system/tsig/clean.sh
View File

@@ -14,10 +14,11 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after tsig tests.
# #
rm -f dig.out.* rm -f dig.out.*
rm -f */named.memstats

3
bin/tests/system/unknown/clean.sh
View File

@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 dig.out
rm -f */named.memstats

7
bin/tests/system/upforwd/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # 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 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 ns1/*.jnl ns2/*.jnl ns3/*.jnl ns1/example.db ns2/*.bk ns3/*.bk
rm -f */named.memstats

3
bin/tests/system/v6synth/clean.sh
View File

@@ -15,6 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 *.out
rm -f */named.memstats

4
bin/tests/system/views/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after zone transfer tests.
@@ -23,4 +23,4 @@
rm -f ns3/example.bk dig.out.ns?.? rm -f ns3/example.bk dig.out.ns?.?
rm -f ns2/named.conf ns2/example.db ns3/named.conf ns3/internal.bk rm -f ns2/named.conf ns2/example.db ns3/named.conf ns3/internal.bk
rm -f */named.memstats

3
bin/tests/system/xfer/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # Clean up after zone transfer tests.
@@ -24,3 +24,4 @@
rm -f dig.out.ns2 dig.out.ns3 rm -f dig.out.ns2 dig.out.ns3
rm -f ns2/example.db ns2/tsigzone.db ns2/example.db.jnl 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 ns3/example.bk ns3/tsigzone.bk ns3/example.bk.jnl
rm -f */named.memstats

3
bin/tests/system/xferquota/clean.sh
View File

@@ -15,7 +15,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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. # 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 ns2/zone*.example.bk ns2/zones.conf
rm -f dig.out.* ns2/changing.bk rm -f dig.out.* ns2/changing.bk
rm -f ns1/changing.db rm -f ns1/changing.db
rm -f */named.memstats

3
bin/tests/system/zonechecks/clean.sh
View File

@@ -14,6 +14,7 @@
# OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # 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 *.out
rm -f */named.memstats

19
doc/arm/Bv9ARM-book.xml
View File

@@ -18,7 +18,7 @@
- PERFORMANCE OF THIS SOFTWARE. - 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"> <book xmlns:xi="http://www.w3.org/2001/XInclude">
<title>BIND 9 Administrator Reference Manual</title> <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> tkey-dhkey <replaceable>key_name</replaceable> <replaceable>key_tag</replaceable>; </optional>
<optional> cache-file <replaceable>path_name</replaceable>; </optional> <optional> cache-file <replaceable>path_name</replaceable>; </optional>
<optional> dump-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> memstatistics-file <replaceable>path_name</replaceable>; </optional>
<optional> pid-file <replaceable>path_name</replaceable>; </optional> <optional> pid-file <replaceable>path_name</replaceable>; </optional>
<optional> recursing-file <replaceable>path_name</replaceable>; </optional> <optional> recursing-file <replaceable>path_name</replaceable>; </optional>
@@ -4719,8 +4720,7 @@ category notify { null; };
<para> <para>
The pathname of the file the server writes memory The pathname of the file the server writes memory
usage statistics to on exit. If not specified, usage statistics to on exit. If not specified,
the default is the default is <filename>named.memstats</filename>.
<filename>named.memstats</filename>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
@@ -4932,6 +4932,19 @@ options {
</listitem> </listitem>
</varlistentry> </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> <varlistentry>
<term><command>dialup</command></term> <term><command>dialup</command></term>
<listitem> <listitem>

3
lib/isccfg/namedconf.c
View File

@@ -15,7 +15,7 @@
* PERFORMANCE OF THIS SOFTWARE. * 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 */ /*! \file */
@@ -630,6 +630,7 @@ options_clauses[] = {
{ "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI }, { "listen-on-v6", &cfg_type_listenon, CFG_CLAUSEFLAG_MULTI },
{ "match-mapped-addresses", &cfg_type_boolean, 0 }, { "match-mapped-addresses", &cfg_type_boolean, 0 },
{ "memstatistics-file", &cfg_type_qstring, 0 }, { "memstatistics-file", &cfg_type_qstring, 0 },
{ "memstatistics", &cfg_type_boolean, 0 },
{ "multiple-cnames", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE }, { "multiple-cnames", &cfg_type_boolean, CFG_CLAUSEFLAG_OBSOLETE },
{ "named-xfer", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE }, { "named-xfer", &cfg_type_qstring, CFG_CLAUSEFLAG_OBSOLETE },
{ "pid-file", &cfg_type_qstringornone, 0 }, { "pid-file", &cfg_type_qstringornone, 0 },