BIND 10 master, updated. 793de0ce0c34913c63c9929bab75cce51ac843ec [master] Merge branch 'trac1557'

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Jan 18 18:17:37 UTC 2012


The branch, master has been updated
       via  793de0ce0c34913c63c9929bab75cce51ac843ec (commit)
       via  349a930441b3bf216c25d308a9a31054180b67ce (commit)
       via  33618742d5adfd9c8c064d51845dfacb3e8f7d07 (commit)
       via  8c872c890d607442fd0e44c1c4d5e4827abd0284 (commit)
      from  fe3d37670b71b33c7f146fce15ba22b09a0dedb4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 793de0ce0c34913c63c9929bab75cce51ac843ec
Merge: fe3d376 349a930
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jan 18 10:17:04 2012 -0800

    [master] Merge branch 'trac1557'

-----------------------------------------------------------------------

Summary of changes:
 src/bin/auth/benchmarks/Makefile.am    |    4 ++++
 src/bin/auth/benchmarks/query_bench.cc |    7 +++++++
 2 files changed, 11 insertions(+), 0 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/benchmarks/Makefile.am b/src/bin/auth/benchmarks/Makefile.am
index da6a5c8..2de01ff 100644
--- a/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@ -4,6 +4,10 @@ AM_CPPFLAGS += $(BOOST_INCLUDES)
 
 AM_CXXFLAGS = $(B10_CXXFLAGS)
 
+if USE_STATIC_LINK
+AM_LDFLAGS = -static
+endif
+
 CLEANFILES = *.gcno *.gcda
 
 noinst_PROGRAMS = query_bench
diff --git a/src/bin/auth/benchmarks/query_bench.cc b/src/bin/auth/benchmarks/query_bench.cc
index ba2e7b2..a365085 100644
--- a/src/bin/auth/benchmarks/query_bench.cc
+++ b/src/bin/auth/benchmarks/query_bench.cc
@@ -30,6 +30,8 @@
 #include <dns/question.h>
 #include <dns/rrclass.h>
 
+#include <log/logger_support.h>
+
 #include <xfr/xfrout_client.h>
 
 #include <auth/auth_srv.h>
@@ -44,6 +46,7 @@ using namespace isc;
 using namespace isc::data;
 using namespace isc::auth;
 using namespace isc::dns;
+using namespace isc::log;
 using namespace isc::util;
 using namespace isc::xfr;
 using namespace isc::bench;
@@ -231,6 +234,10 @@ main(int argc, char* argv[]) {
     const char* const datasrc_file = argv[0];
     const char* const query_data_file = argv[1];
 
+    // We disable logging to avoid unwanted noise. (We may eventually want to
+    // make it more configurable)
+    initLogger("query-bench", isc::log::NONE);
+
     DataSrcType datasrc_type = SQLITE3;
     if (strcmp(opt_datasrc_type, "sqlite3") == 0) {
         ;                       // no need to override




More information about the bind10-changes mailing list