[svn] commit: r2664 - in /trunk: ./ configure.ac doc/Doxyfile src/bin/xfrin/ src/lib/Makefile.am src/lib/bench/ src/lib/bench/tests/Makefile.am src/lib/cc/ src/lib/datasrc/ src/lib/dns/ src/lib/dns/rdata/generic/rrsig_46.cc src/lib/dns/tests/

[BIND 10 source code commits]

Author: jinmei
Date: Mon Aug  9 18:57:03 2010
New Revision: 2664

Log:
merged branches/trac241, benchmark framework.

Added:
    trunk/src/lib/bench/   (props changed)
      - copied from r2663, branches/trac241/src/lib/bench/
Modified:
    trunk/   (props changed)
    trunk/configure.ac
    trunk/doc/Doxyfile
    trunk/src/bin/xfrin/   (props changed)
    trunk/src/lib/Makefile.am
    trunk/src/lib/bench/tests/Makefile.am
    trunk/src/lib/cc/   (props changed)
    trunk/src/lib/datasrc/   (props changed)
    trunk/src/lib/dns/   (props changed)
    trunk/src/lib/dns/rdata/generic/rrsig_46.cc   (props changed)
    trunk/src/lib/dns/tests/   (props changed)

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Mon Aug  9 18:57:03 2010
@@ -413,6 +413,9 @@
                  src/bin/xfrout/tests/Makefile
                  src/bin/usermgr/Makefile
                  src/lib/Makefile
+                 src/lib/bench/Makefile
+                 src/lib/bench/example/Makefile
+                 src/lib/bench/tests/Makefile
                  src/lib/cc/Makefile
                  src/lib/python/Makefile
                  src/lib/python/isc/Makefile

Modified: trunk/doc/Doxyfile
==============================================================================
--- trunk/doc/Doxyfile (original)
+++ trunk/doc/Doxyfile Mon Aug  9 18:57:03 2010
@@ -568,7 +568,7 @@
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth
+INPUT                  = ../src/lib/cc ../src/lib/config ../src/lib/dns ../src/lib/exceptions ../src/lib/datasrc ../src/bin/auth ../src/lib/bench
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

Modified: trunk/src/lib/Makefile.am
==============================================================================
--- trunk/src/lib/Makefile.am (original)
+++ trunk/src/lib/Makefile.am Mon Aug  9 18:57:03 2010
@@ -1,1 +1,1 @@
-SUBDIRS = exceptions dns cc config datasrc python xfr
+SUBDIRS = exceptions dns cc config datasrc python xfr bench

Modified: trunk/src/lib/bench/tests/Makefile.am
==============================================================================
--- trunk/src/lib/bench/tests/Makefile.am (original)
+++ trunk/src/lib/bench/tests/Makefile.am Mon Aug  9 18:57:03 2010
@@ -14,7 +14,7 @@
 run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(top_builddir)/src/lib/exceptions/libexceptions.la
-run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns.la
+run_unittests_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
 run_unittests_LDADD += $(top_builddir)/src/lib/bench/libbench.la
 run_unittests_LDADD += $(GTEST_LDADD)
 endif